diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h index db06c821745..0f7cbff3761 100644 --- a/include/d/d_stage/d_stage.h +++ b/include/d/d_stage/d_stage.h @@ -321,7 +321,7 @@ private: stage_camera_class* mCamera; stage_arrow_class* mArrow; dStage_MapEventInfo_c* mMapEventInfo; - dStage_SoundInfo_c* mSoundInfo; + dStage_SoundInfo_c* mSoundInf; dStage_SoundInfo_c* mSoundInfCL; stage_scls_info_dummy_class* mSclsInfo; dStage_Lbnk_c* mLbnk; diff --git a/include/variables.h b/include/variables.h index 09b98eb42b2..0b38b2ee132 100644 --- a/include/variables.h +++ b/include/variables.h @@ -2930,7 +2930,7 @@ extern u8 lbl_80450878; // additional symbols needed for d_stage.cpp // autogenerated by split.py v0.3 at 2021-01-08 16:07:10.282857 -extern u8 lbl_80378A50; +extern char lbl_80378A50[0x3F8]; // d_stage string literals extern u8 lbl_803A3B18; extern u8 lbl_803A65CC; extern u8 lbl_803A65FC; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 44a88af687d..e3cfb748924 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1,7 +1,7 @@ /* d_stage.cpp autogenerated by split.py v0.3 at 2021-01-08 16:07:11.385669 */ -#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "d/d_stage/d_stage.h" +#include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_pc/f_pc_stdcreate_req.h" #include "global.h" @@ -235,15 +235,11 @@ asm void dStage_stageDt_c::init(void) { #include "d/d_stage/asm/func_80024C1C.s" } -// -// asm void dStage_roomDt_c::initFileList2(void) { nofralloc #include "d/d_stage/asm/func_80024CA8.s" } -// -// asm void dStage_roomDt_c::init(void) { nofralloc #include "d/d_stage/asm/func_80024CB4.s" @@ -341,15 +337,15 @@ asm void func_8002533C(void) { #include "d/d_stage/asm/func_8002533C.s" } -// -// +// +// asm int dStage_roomDt_c::getMapInfo2(int) const { nofralloc #include "d/d_stage/asm/func_80025370.s" } -// -// +// +// asm stage_map_info_dummy_class* dStage_roomDt_c::getMapInfoBase(void) const { nofralloc #include "d/d_stage/asm/func_800253FC.s" @@ -828,8 +824,6 @@ asm void dStage_changeScene(void) { #include "d/d_stage/asm/func_80027170.s" } -// -// asm stage_scls_info_dummy_class* dStage_roomDt_c::getSclsInfo(void) const { nofralloc #include "d/d_stage/asm/func_800272E0.s" @@ -854,429 +848,376 @@ asm void dStage_restartRoom(void) { #include "d/d_stage/asm/func_800274B0.s" } -asm void dStage_roomDt_c::setCamera(stage_camera_class*) { - nofralloc -#include "d/d_stage/asm/func_80027524.s" +void dStage_roomDt_c::setCamera(stage_camera_class* i_Camera) { + mCamera = i_Camera; } -asm stage_camera_class* dStage_roomDt_c::getCamera(void) const { - nofralloc -#include "d/d_stage/asm/func_8002752C.s" +stage_camera_class* dStage_roomDt_c::getCamera(void) const { + return mCamera; } -asm void dStage_roomDt_c::setArrow(stage_arrow_class*) { - nofralloc -#include "d/d_stage/asm/func_80027534.s" +void dStage_roomDt_c::setArrow(stage_arrow_class* i_Arrow) { + mArrow = i_Arrow; } -asm stage_arrow_class* dStage_roomDt_c::getArrow(void) const { - nofralloc -#include "d/d_stage/asm/func_8002753C.s" +stage_arrow_class* dStage_roomDt_c::getArrow(void) const { + return mArrow; } -asm void dStage_roomDt_c::setPlayer(stage_actor_class*) { - nofralloc -#include "d/d_stage/asm/func_80027544.s" +void dStage_roomDt_c::setPlayer(stage_actor_class* i_Player) { + mPlayer = i_Player; } -asm void dStage_roomDt_c::setPlayerNum(unsigned short) { - nofralloc -#include "d/d_stage/asm/func_8002754C.s" +void dStage_roomDt_c::setPlayerNum(u16 i_PlayerNum) { + mPlayerNum = i_PlayerNum; } -asm u16 dStage_roomDt_c::getPlayerNum(void) const { - nofralloc -#include "d/d_stage/asm/func_80027554.s" +u16 dStage_roomDt_c::getPlayerNum(void) const { + return mPlayerNum; } -asm void dStage_roomDt_c::setRoom(roomRead_class*) { - nofralloc -#include "d/d_stage/asm/func_8002755C.s" +void dStage_roomDt_c::setRoom(roomRead_class* i_Room) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 367); } -asm roomRead_class* dStage_roomDt_c::getRoom(void) const { - nofralloc -#include "d/d_stage/asm/func_80027590.s" +roomRead_class* dStage_roomDt_c::getRoom(void) const { + OSReport(lbl_80378A50 + 367); + return NULL; } -asm void dStage_roomDt_c::setMapInfo(stage_map_info_class*) { - nofralloc -#include "d/d_stage/asm/func_800275C4.s" +void dStage_roomDt_c::setMapInfo(stage_map_info_class* i_MapInfo) { + mMapInfo = i_MapInfo; } -asm stage_map_info_class* dStage_roomDt_c::getMapInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800275CC.s" +stage_map_info_class* dStage_roomDt_c::getMapInfo(void) const { + return mMapInfo; } -asm void dStage_roomDt_c::setMapInfoBase(stage_map_info_dummy_class*) { - nofralloc -#include "d/d_stage/asm/func_800275D4.s" +void dStage_roomDt_c::setMapInfoBase(stage_map_info_dummy_class* i_MapInfoBase) { + mMapInfoBase = i_MapInfoBase; } -asm void dStage_roomDt_c::setPaletteInfo(stage_palette_info_class*) { - nofralloc -#include "d/d_stage/asm/func_800275DC.s" +void dStage_roomDt_c::setPaletteInfo(stage_palette_info_class*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 390); } -asm stage_palette_info_class* dStage_roomDt_c::getPaletteInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027610.s" +stage_palette_info_class* dStage_roomDt_c::getPaletteInfo(void) const { + OSReport(lbl_80378A50 + 390); + return NULL; } -asm void dStage_roomDt_c::setPselectInfo(stage_pselect_info_class*) { - nofralloc -#include "d/d_stage/asm/func_80027644.s" +void dStage_roomDt_c::setPselectInfo(stage_pselect_info_class*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 414); } -asm stage_pselect_info_class* dStage_roomDt_c::getPselectInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027678.s" +stage_pselect_info_class* dStage_roomDt_c::getPselectInfo(void) const { + OSReport(lbl_80378A50 + 414); + return NULL; } -asm void dStage_roomDt_c::setEnvrInfo(stage_envr_info_class*) { - nofralloc -#include "d/d_stage/asm/func_800276AC.s" +void dStage_roomDt_c::setEnvrInfo(stage_envr_info_class*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 440); } -asm stage_envr_info_class* dStage_roomDt_c::getEnvrInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800276E0.s" +stage_envr_info_class* dStage_roomDt_c::getEnvrInfo(void) const { + OSReport(lbl_80378A50 + 440); + return NULL; } -asm void dStage_roomDt_c::setVrboxInfo(stage_vrbox_info_class*) { - nofralloc -#include "d/d_stage/asm/func_80027714.s" +void dStage_roomDt_c::setVrboxInfo(stage_vrbox_info_class* i_VrboxInfo) { + mVrboxInfo = i_VrboxInfo; } -asm stage_vrbox_info_class* dStage_roomDt_c::getVrboxInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_8002771C.s" +stage_vrbox_info_class* dStage_roomDt_c::getVrboxInfo(void) const { + return mVrboxInfo; } -asm void dStage_roomDt_c::setVrboxcolInfo(stage_vrboxcol_info_class*) { - nofralloc -#include "d/d_stage/asm/func_80027724.s" +void dStage_roomDt_c::setVrboxcolInfo(stage_vrboxcol_info_class* i_VrboxcolInfo) { + mVrboxcolInfo = i_VrboxcolInfo; } -asm stage_vrboxcol_info_class* dStage_roomDt_c::getVrboxcolInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_8002772C.s" +stage_vrboxcol_info_class* dStage_roomDt_c::getVrboxcolInfo(void) const { + return mVrboxcolInfo; } -asm void dStage_roomDt_c::setPlightInfo(stage_plight_info_class*) { - nofralloc -#include "d/d_stage/asm/func_80027734.s" +void dStage_roomDt_c::setPlightInfo(stage_plight_info_class* i_PlightInfo) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 463); } -asm stage_plight_info_class* dStage_roomDt_c::getPlightInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027768.s" +stage_plight_info_class* dStage_roomDt_c::getPlightInfo(void) const { + OSReport(lbl_80378A50 + 463); + return NULL; } -asm void dStage_roomDt_c::setPaletteNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_8002779C.s" +void dStage_roomDt_c::setPaletteNumInfo(int) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 488); } -asm int dStage_roomDt_c::getPaletteNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800277D0.s" +int dStage_roomDt_c::getPaletteNumInfo(void) const { + OSReport(lbl_80378A50 + 488); + return NULL; } -asm void dStage_roomDt_c::setPselectNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_80027804.s" +void dStage_roomDt_c::setPselectNumInfo(int) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 518); } -asm int dStage_roomDt_c::getPselectNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027838.s" +int dStage_roomDt_c::getPselectNumInfo(void) const { + OSReport(lbl_80378A50 + 518); + return NULL; } -asm void dStage_roomDt_c::setEnvrNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_8002786C.s" +void dStage_roomDt_c::setEnvrNumInfo(int) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 548); } -asm int dStage_roomDt_c::getEnvrNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800278A0.s" +int dStage_roomDt_c::getEnvrNumInfo(void) const { + OSReport(lbl_80378A50 + 548); + return NULL; } -asm void dStage_roomDt_c::setVrboxNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_800278D4.s" +void dStage_roomDt_c::setVrboxNumInfo(int i_VrboxNumInfo) { + mVrboxNumInfo = i_VrboxNumInfo; } - -asm int dStage_roomDt_c::getVrboxNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800278DC.s" + +int dStage_roomDt_c::getVrboxNumInfo(void) const { + return mVrboxNumInfo; } - -asm void dStage_roomDt_c::setVrboxcolNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_800278E4.s" + +void dStage_roomDt_c::setVrboxcolNumInfo(int i_VrboxcolNumInfo) { + mVrboxcolNumInfo = i_VrboxcolNumInfo; } -asm int dStage_roomDt_c::getVrboxcolNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800278EC.s" +int dStage_roomDt_c::getVrboxcolNumInfo(void) const { + return mVrboxcolNumInfo; } -asm void dStage_roomDt_c::setPlightNumInfo(int) { - nofralloc -#include "d/d_stage/asm/func_800278F4.s" +void dStage_roomDt_c::setPlightNumInfo(int) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 575); } -asm int dStage_roomDt_c::getPlightNumInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027928.s" +int dStage_roomDt_c::getPlightNumInfo(void) const { + OSReport(lbl_80378A50 + 575); + return NULL; } -asm void dStage_roomDt_c::setLightVecInfo(stage_pure_lightvec_info_class*) { - nofralloc -#include "d/d_stage/asm/func_8002795C.s" +void dStage_roomDt_c::setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { + mLightVecInfo = i_LightVecInfo; } - -asm stage_pure_lightvec_info_class* dStage_roomDt_c::getLightVecInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027964.s" + +stage_pure_lightvec_info_class* dStage_roomDt_c::getLightVecInfo(void) const { + return mLightVecInfo; } -asm void dStage_roomDt_c::setLightVecInfoNum(int) { - nofralloc -#include "d/d_stage/asm/func_8002796C.s" +void dStage_roomDt_c::setLightVecInfoNum(int i_LightVecInfoNum) { + mLightVecInfoNum = i_LightVecInfoNum; } -asm int dStage_roomDt_c::getLightVecInfoNum(void) const { - nofralloc -#include "d/d_stage/asm/func_80027974.s" +int dStage_roomDt_c::getLightVecInfoNum(void) const { + return mLightVecInfoNum; } -asm void dStage_roomDt_c::setStagInfo(stage_stag_info_class*) { - nofralloc -#include "d/d_stage/asm/func_8002797C.s" +void dStage_roomDt_c::setStagInfo(stage_stag_info_class*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 604); } - -asm stage_stag_info_class* dStage_roomDt_c::getStagInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_800279B0.s" + +stage_stag_info_class* dStage_roomDt_c::getStagInfo(void) const { + OSReport(lbl_80378A50 + 604); + return NULL; } -asm void dStage_roomDt_c::setSclsInfo(stage_scls_info_dummy_class*) { - nofralloc -#include "d/d_stage/asm/func_800279E4.s" +void dStage_roomDt_c::setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { + mSclsInfo = i_SclsInfo; } -asm void dStage_roomDt_c::setPntInfo(dStage_dPnt_c*) { - nofralloc -#include "d/d_stage/asm/func_800279EC.s" +void dStage_roomDt_c::setPntInfo(dStage_dPnt_c*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 627); } -asm dStage_dPnt_c* dStage_roomDt_c::getPntInf(void) const { - nofralloc -#include "d/d_stage/asm/func_80027A20.s" +dStage_dPnt_c* dStage_roomDt_c::getPntInf(void) const { + OSReport(lbl_80378A50 + 648); + return NULL; } -asm void dStage_roomDt_c::setPathInfo(dStage_dPath_c*) { - nofralloc -#include "d/d_stage/asm/func_80027A54.s" +void dStage_roomDt_c::setPathInfo(dStage_dPath_c*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 670); } -asm dStage_dPath_c* dStage_roomDt_c::getPathInf(void) const { - nofralloc -#include "d/d_stage/asm/func_80027A88.s" +dStage_dPath_c* dStage_roomDt_c::getPathInf(void) const { + OSReport(lbl_80378A50 + 670); + return NULL; } - -asm void dStage_roomDt_c::setPnt2Info(dStage_dPnt_c*) { - nofralloc -#include "d/d_stage/asm/func_80027ABC.s" + +void dStage_roomDt_c::setPnt2Info(dStage_dPnt_c* i_Pnt2Info) { + mPnt2Info = i_Pnt2Info; } - -asm dStage_dPnt_c* dStage_roomDt_c::getPnt2Inf(void) const { - nofralloc -#include "d/d_stage/asm/func_80027AC4.s" + +dStage_dPnt_c* dStage_roomDt_c::getPnt2Inf(void) const { + return mPnt2Info; } -asm void dStage_roomDt_c::setPath2Info(dStage_dPath_c*) { - nofralloc -#include "d/d_stage/asm/func_80027ACC.s" +void dStage_roomDt_c::setPath2Info(dStage_dPath_c* i_Path2Info) { + mPath2Info = i_Path2Info; } -asm dStage_dPath_c* dStage_roomDt_c::getPath2Inf(void) const { - nofralloc -#include "d/d_stage/asm/func_80027AD4.s" +dStage_dPath_c* dStage_roomDt_c::getPath2Inf(void) const { + return mPath2Info; } - -asm void dStage_roomDt_c::setSoundInf(dStage_SoundInfo_c*) { - nofralloc -#include "d/d_stage/asm/func_80027ADC.s" + +void dStage_roomDt_c::setSoundInf(dStage_SoundInfo_c* i_SoundInf) { + mSoundInf = i_SoundInf; } -asm dStage_SoundInfo_c* dStage_roomDt_c::getSoundInf(void) const { - nofralloc -#include "d/d_stage/asm/func_80027AE4.s" +dStage_SoundInfo_c* dStage_roomDt_c::getSoundInf(void) const { + return mSoundInf; } -asm void dStage_roomDt_c::setSoundInfCL(dStage_SoundInfo_c*) { - nofralloc -#include "d/d_stage/asm/func_80027AEC.s" +void dStage_roomDt_c::setSoundInfCL(dStage_SoundInfo_c* i_SoundInfCL) { + mSoundInfCL = i_SoundInfCL; } -asm dStage_SoundInfo_c* dStage_roomDt_c::getSoundInfCL(void) const { - nofralloc -#include "d/d_stage/asm/func_80027AF4.s" +dStage_SoundInfo_c* dStage_roomDt_c::getSoundInfCL(void) const { + return mSoundInfCL; } -asm void dStage_roomDt_c::setMapEventInfo(dStage_MapEventInfo_c*) { - nofralloc -#include "d/d_stage/asm/func_80027AFC.s" +void dStage_roomDt_c::setMapEventInfo(dStage_MapEventInfo_c* i_MapEventInfo) { + mMapEventInfo = i_MapEventInfo; } -asm dStage_MapEventInfo_c* dStage_roomDt_c::getMapEventInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027B04.s" +dStage_MapEventInfo_c* dStage_roomDt_c::getMapEventInfo(void) const { + return mMapEventInfo; } -asm void dStage_roomDt_c::setFileList2Info(dStage_FileList2_dt_c*) { - nofralloc -#include "d/d_stage/asm/func_80027B0C.s" +void dStage_roomDt_c::setFileList2Info(dStage_FileList2_dt_c* i_FileList2Info) { + mFileList2Info = i_FileList2Info; } - -asm dStage_FileList2_dt_c* dStage_roomDt_c::getFileList2Info(void) const { - nofralloc -#include "d/d_stage/asm/func_80027B14.s" + +dStage_FileList2_dt_c* dStage_roomDt_c::getFileList2Info(void) const { + return mFileList2Info; } -asm void dStage_roomDt_c::setFileListInfo(dStage_FileList_dt_c*) { - nofralloc -#include "d/d_stage/asm/func_80027B1C.s" +void dStage_roomDt_c::setFileListInfo(dStage_FileList_dt_c* i_FileListInfo) { + mFileListInfo = i_FileListInfo; } -asm void dStage_roomDt_c::setFloorInfo(dStage_FloorInfo_c*) { - nofralloc -#include "d/d_stage/asm/func_80027B24.s" +void dStage_roomDt_c::setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { + mFloorInfo = i_FloorInfo; } -asm dStage_FloorInfo_c* dStage_roomDt_c::getFloorInfo(void) const { - nofralloc -#include "d/d_stage/asm/func_80027B2C.s" +dStage_FloorInfo_c* dStage_roomDt_c::getFloorInfo(void) const { + return mFloorInfo; } -asm void dStage_roomDt_c::setMemoryConfig(dStage_MemoryConfig_c*) { - nofralloc -#include "d/d_stage/asm/func_80027B34.s" +void dStage_roomDt_c::setMemoryConfig(dStage_MemoryConfig_c*) { + OSReport(lbl_80378A50 + 692); } -asm dStage_MemoryConfig_c* dStage_roomDt_c::getMemoryConfig(void) const { - nofralloc -#include "d/d_stage/asm/func_80027B64.s" +dStage_MemoryConfig_c* dStage_roomDt_c::getMemoryConfig(void) const { + OSReport(lbl_80378A50 + 692); + return NULL; } -asm void dStage_roomDt_c::setMemoryMap(dStage_MemoryMap_c*) { - nofralloc -#include "d/d_stage/asm/func_80027B98.s" +void dStage_roomDt_c::setMemoryMap(dStage_MemoryMap_c*) { + OSReport(lbl_80378A50 + 722); } -asm dStage_MemoryMap_c* dStage_roomDt_c::getMemoryMap(void) const { - nofralloc -#include "d/d_stage/asm/func_80027BC8.s" +dStage_MemoryMap_c* dStage_roomDt_c::getMemoryMap(void) const { + OSReport(lbl_80378A50 + 722); + return NULL; } -asm void dStage_roomDt_c::setMulti(dStage_Multi_c*) { - nofralloc -#include "d/d_stage/asm/func_80027BFC.s" +void dStage_roomDt_c::setMulti(dStage_Multi_c*) { + OSReport(lbl_80378A50 + 749); } -asm dStage_Multi_c* dStage_roomDt_c::getMulti(void) const { - nofralloc -#include "d/d_stage/asm/func_80027C2C.s" +dStage_Multi_c* dStage_roomDt_c::getMulti(void) const { + OSReport(lbl_80378A50 + 749); + return NULL; } -asm void dStage_roomDt_c::setOldMulti(void) { - nofralloc -#include "d/d_stage/asm/func_80027C60.s" +void dStage_roomDt_c::setOldMulti(void) { + OSReport(lbl_80378A50 + 771); } -asm void dStage_roomDt_c::resetOldMulti(void) { - nofralloc -#include "d/d_stage/asm/func_80027C90.s" +void dStage_roomDt_c::resetOldMulti(void) { + OSReport(lbl_80378A50 + 771); } -asm dStage_Multi_c* dStage_roomDt_c::getOldMulti(void) const { - nofralloc -#include "d/d_stage/asm/func_80027CC0.s" +dStage_Multi_c* dStage_roomDt_c::getOldMulti(void) const { + OSReport(lbl_80378A50 + 771); + return NULL; } -asm void dStage_roomDt_c::setLbnk(dStage_Lbnk_c*){ - nofralloc -#include "d/d_stage/asm/func_80027CF4.s" +void dStage_roomDt_c::setLbnk(dStage_Lbnk_c* i_Lbnk) { + mLbnk = i_Lbnk; } -asm dStage_Lbnk_c* dStage_roomDt_c::getLbnk(void) const { - nofralloc -#include "d/d_stage/asm/func_80027CFC.s" +dStage_Lbnk_c* dStage_roomDt_c::getLbnk(void) const { + return mLbnk; } -asm void dStage_roomDt_c::setTresure(stage_tresure_class*) { - nofralloc -#include "d/d_stage/asm/func_80027D04.s" +void dStage_roomDt_c::setTresure(stage_tresure_class* i_Treasure) { + mTreasure = i_Treasure; } -asm stage_tresure_class* dStage_roomDt_c::getTresure(void) const { - nofralloc -#include "d/d_stage/asm/func_80027D0C.s" +stage_tresure_class* dStage_roomDt_c::getTresure(void) const { + return mTreasure; } -asm void dStage_roomDt_c::setDMap(dStage_DMap_c*) { - nofralloc -#include "d/d_stage/asm/func_80027D14.s" +void dStage_roomDt_c::setDMap(dStage_DMap_c*) { + return; } -asm dStage_DMap_c* dStage_roomDt_c::getDMap(void) const { - nofralloc -#include "d/d_stage/asm/func_80027D18.s" +dStage_DMap_c* dStage_roomDt_c::getDMap(void) const { + return 0; } -asm void dStage_roomDt_c::setDrTg(stage_tgsc_class*){ - nofralloc -#include "d/d_stage/asm/func_80027D20.s" +void dStage_roomDt_c::setDrTg(stage_tgsc_class* i_DrTg) { + mDrTg = i_DrTg; } -asm stage_tgsc_class* dStage_roomDt_c::getDrTg(void) const { - nofralloc -#include "d/d_stage/asm/func_80027D28.s" +stage_tgsc_class* dStage_roomDt_c::getDrTg(void) const { + return mDrTg; } -asm void dStage_roomDt_c::setDoor(stage_tgsc_class*) { - nofralloc -#include "d/d_stage/asm/func_80027D30.s" +void dStage_roomDt_c::setDoor(stage_tgsc_class* i_Door) { + mDoor = i_Door; } -asm stage_tgsc_class* dStage_roomDt_c::getDoor(void) const { - nofralloc -#include "d/d_stage/asm/func_80027D38.s" +stage_tgsc_class* dStage_roomDt_c::getDoor(void) const { + return mDoor; } - -asm void dStage_roomDt_c::setMapPath(void*) { - nofralloc -#include "d/d_stage/asm/func_80027D40.s" + +void dStage_roomDt_c::setMapPath(void*) { + OSReport(lbl_80378A50 + 797); } -asm int dStage_roomDt_c::getMapPath(void) { - nofralloc -#include "d/d_stage/asm/func_80027D70.s" +int dStage_roomDt_c::getMapPath(void) { + OSReport(lbl_80378A50 + 797); + return NULL; } -asm void dStage_roomDt_c::setElst(dStage_Elst_c*) { - nofralloc -#include "d/d_stage/asm/func_80027DA4.s" +void dStage_roomDt_c::setElst(dStage_Elst_c*) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 828); } -asm dStage_Elst_c* dStage_roomDt_c::getElst(void) { - nofralloc -#include "d/d_stage/asm/func_80027DD8.s" +dStage_Elst_c* dStage_roomDt_c::getElst(void) { + dStage_SetErrorRoom(); + OSReport(lbl_80378A50 + 856); + return NULL; } asm void dStage_stageDt_c::setCamera(stage_camera_class*) { @@ -1338,7 +1279,7 @@ asm void dStage_stageDt_c::setPaletteInfo(stage_palette_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E68.s" } - + asm stage_palette_info_class* dStage_stageDt_c::getPaletteInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E70.s" @@ -1353,12 +1294,12 @@ asm stage_pselect_info_class* dStage_stageDt_c::getPselectInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E80.s" } - + asm void dStage_stageDt_c::setEnvrInfo(stage_envr_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E88.s" } - + asm stage_envr_info_class* dStage_stageDt_c::getEnvrInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E90.s" @@ -1368,7 +1309,7 @@ asm void dStage_stageDt_c::setVrboxInfo(stage_vrbox_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E98.s" } - + asm stage_vrbox_info_class* dStage_stageDt_c::getVrboxInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EA0.s" @@ -1378,12 +1319,12 @@ asm void dStage_stageDt_c::setVrboxcolInfo(stage_vrboxcol_info_class*) { nofralloc #include "d/d_stage/asm/func_80027EA8.s" } - + asm stage_vrboxcol_info_class* dStage_stageDt_c::getVrboxcolInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EB0.s" } - + asm void dStage_stageDt_c::setPlightInfo(stage_plight_info_class*) { nofralloc #include "d/d_stage/asm/func_80027EB8.s" @@ -1403,7 +1344,7 @@ asm int dStage_stageDt_c::getPaletteNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027ED0.s" } - + asm void dStage_stageDt_c::setPselectNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027ED8.s" @@ -1453,7 +1394,7 @@ asm stage_pure_lightvec_info_class* dStage_stageDt_c::getLightVecInfo(void) cons nofralloc #include "d/d_stage/asm/func_80027F4C.s" } - + asm void dStage_stageDt_c::setLightVecInfoNum(int) { nofralloc #include "d/d_stage/asm/func_80027F80.s" @@ -1473,7 +1414,7 @@ asm int dStage_stageDt_c::getPlightNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027FF0.s" } - + asm void dStage_stageDt_c::setStagInfo(stage_stag_info_class*) { nofralloc #include "d/d_stage/asm/func_80027FF8.s" @@ -1493,7 +1434,7 @@ asm dStage_dPnt_c* dStage_stageDt_c::getPntInf(void) const { nofralloc #include "d/d_stage/asm/func_80028010.s" } - + asm void dStage_stageDt_c::setPathInfo(dStage_dPath_c*) { nofralloc #include "d/d_stage/asm/func_80028018.s" @@ -1533,7 +1474,7 @@ asm dStage_SoundInfo_c* dStage_stageDt_c::getSoundInf(void) const { nofralloc #include "d/d_stage/asm/func_80028050.s" } - + asm void dStage_stageDt_c::setSoundInfCL(dStage_SoundInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028058.s" @@ -1548,7 +1489,7 @@ asm void dStage_stageDt_c::setMapEventInfo(dStage_MapEventInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028068.s" } - + asm dStage_MapEventInfo_c* dStage_stageDt_c::getMapEventInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028070.s" @@ -1563,7 +1504,7 @@ asm dStage_FileList2_dt_c* dStage_stageDt_c::getFileList2Info(void) const { nofralloc #include "d/d_stage/asm/func_800280AC.s" } - + asm void dStage_stageDt_c::setFileListInfo(dStage_FileList_dt_c*) { nofralloc #include "d/d_stage/asm/func_800280E0.s" @@ -1573,7 +1514,7 @@ asm dStage_FileList_dt_c* dStage_stageDt_c::getFileListInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028114.s" } - + asm void dStage_stageDt_c::setFloorInfo(dStage_FloorInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028148.s" @@ -1583,12 +1524,12 @@ asm dStage_FloorInfo_c* dStage_stageDt_c::getFloorInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028150.s" } - + asm void dStage_stageDt_c::setMemoryConfig(dStage_MemoryConfig_c*) { nofralloc #include "d/d_stage/asm/func_80028158.s" } - + asm dStage_MemoryConfig_c* dStage_stageDt_c::getMemoryConfig(void) const { nofralloc #include "d/d_stage/asm/func_80028160.s" @@ -1598,7 +1539,7 @@ asm void dStage_stageDt_c::setMemoryMap(dStage_MemoryMap_c*) { nofralloc #include "d/d_stage/asm/func_80028168.s" } - + asm dStage_MemoryMap_c* dStage_stageDt_c::getMemoryMap(void) const { nofralloc #include "d/d_stage/asm/func_80028170.s"