diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h index d11afb11057..5a99a932318 100644 --- a/include/d/d_stage/d_stage.h +++ b/include/d/d_stage/d_stage.h @@ -64,44 +64,54 @@ class stage_pure_lightvec_info_class {}; class dStage_stageDt_c { public: - stage_camera_class* getCamera(void); - stage_arrow_class* getArrow(void); - stage_actor_class* getPlayer(void); - roomRead_class* getRoom(void); - stage_map_info_class* getMapInfo(void); - stage_map_info_dummy_class* getMapInfoBase(void); - stage_palette_info_class* getPaletteInfo(void); - stage_pselect_info_class* getPselectInfo(void); - stage_envr_info_class* getEnvrInfo(void); - stage_vrbox_info_class* getVrboxInfo(void); - stage_vrboxcol_info_class* getVrboxcolInfo(void); - stage_plight_info_class* getPlightInfo(void); - dStage_MapEventInfo_c* getMapEventInfo(void); - u32 getPaletteNumInfo(void); - u32 getPselectNumInfo(void); - u32 getEnvrNumInfo(void); - u32 getVrboxNumInfo(void); - int getVrboxcolNumInfo(void); - u32 getPlightNumInfo(void); - u16 getPlayerNum(void); - stage_stag_info_class* getStagInfo(void); - stage_scls_info_dummy_class* getSclsInfo(void); - dStage_dPnt_c* getPntInfo(void); - dStage_dPath_c* getPathInfo(void); - dStage_dPnt_c* getPnt2Inf(void); - dStage_dPath_c* getPath2Info(void); - dStage_SoundInfo_c* getSoundInf(void); - dStage_SoundInfo_c* getSoundInfCL(void); - dStage_FloorInfo_c* getFloorInfo(void); - dStage_MemoryConfig_c* getMemoryConfig(void); - dStage_MemoryMap_c* getMemoryMap(void); - dStage_Multi_c* getMulti(void); - dStage_Multi_c* getOldMulti(void); - stage_tresure_class* getTreasure(void); - dStage_DMap_c* getDMap(void); - stage_tgsc_class* getDrTg(void); - stage_tgsc_class* getDoor(void); + stage_camera_class* getCamera(void) const; + stage_arrow_class* getArrow(void) const; + stage_actor_class* getPlayer(void) const; + roomRead_class* getRoom(void) const; + stage_map_info_class* getMapInfo(void) const; + stage_map_info_dummy_class* getMapInfoBase(void) const; + stage_palette_info_class* getPaletteInfo(void) const; + stage_pselect_info_class* getPselectInfo(void) const; + stage_envr_info_class* getEnvrInfo(void) const; + stage_vrbox_info_class* getVrboxInfo(void) const; + stage_vrboxcol_info_class* getVrboxcolInfo(void) const; + dStage_FileList2_dt_c* getFileList2Info(void) const; + dStage_FileList_dt_c* getFileListInfo(void) const; + stage_plight_info_class* getPlightInfo(void) const; + dStage_MapEventInfo_c* getMapEventInfo(void) const; + int getPaletteNumInfo(void) const; + int getPselectNumInfo(void) const; + int getEnvrNumInfo(void) const; + int getVrboxNumInfo(void) const; + int getVrboxcolNumInfo(void) const; + int getPlightNumInfo(void) const; + u16 getPlayerNum(void) const; + int getMapInfo2(int) const; + stage_stag_info_class* getStagInfo(void) const; + stage_scls_info_dummy_class* getSclsInfo(void) const; + dStage_Lbnk_c* getLbnk(void) const; + dStage_dPnt_c* getPntInf(void) const; + dStage_dPath_c* getPathInf(void) const; + dStage_dPnt_c* getPnt2Inf(void) const; + dStage_dPath_c* getPath2Inf(void) const; + dStage_SoundInfo_c* getSoundInf(void) const; + dStage_SoundInfo_c* getSoundInfCL(void) const; + dStage_FloorInfo_c* getFloorInfo(void) const; + dStage_MemoryConfig_c* getMemoryConfig(void) const; + dStage_MemoryMap_c* getMemoryMap(void) const; + dStage_Multi_c* getMulti(void) const; + dStage_Multi_c* getOldMulti(void) const; + stage_tresure_class* getTresure(void) const; + dStage_DMap_c* getDMap(void) const; + stage_tgsc_class* getDrTg(void) const; + stage_tgsc_class* getDoor(void) const; dStage_Elst_c* getElst(void); + stage_pure_lightvec_info_class* getLightVecInfo(void) const; + int getLightVecInfoNum(void) const; + int getMapPath(void); + + void init(void); + void resetOldMulti(void); void setCamera(stage_camera_class*); void setArrow(stage_arrow_class*); @@ -114,20 +124,23 @@ public: void setEnvrInfo(stage_envr_info_class*); void setVrboxInfo(stage_vrbox_info_class*); void setVrboxcolInfo(stage_vrboxcol_info_class*); + void setFileList2Info(dStage_FileList2_dt_c*); + void setFileListInfo(dStage_FileList_dt_c*); void setPlightInfo(stage_plight_info_class*); void setMapEventInfo(dStage_MapEventInfo_c*); - void setPaletteNumInfo(u32); - void setPselectNumInfo(u32); - void setEnvrNumInfo(u32); - void setVrboxNumInfo(u32); + void setPaletteNumInfo(int); + void setPselectNumInfo(int); + void setEnvrNumInfo(int); + void setVrboxNumInfo(int); void setVrboxcolNumInfo(int); - void setPlightNumInfo(u32); + void setPlightNumInfo(int); void setPlayerNum(u16); void setStagInfo(stage_stag_info_class*); void setSclsInfo(stage_scls_info_dummy_class*); + void setLbnk(dStage_Lbnk_c*); void setPntInfo(dStage_dPnt_c*); void setPathInfo(dStage_dPath_c*); - void setPnt2Inf(dStage_dPnt_c*); + void setPnt2Info(dStage_dPnt_c*); void setPath2Info(dStage_dPath_c*); void setSoundInf(dStage_SoundInfo_c*); void setSoundInfCL(dStage_SoundInfo_c*); @@ -135,12 +148,16 @@ public: void setMemoryConfig(dStage_MemoryConfig_c*); void setMemoryMap(dStage_MemoryMap_c*); void setMulti(dStage_Multi_c*); - void setOldMulti(dStage_Multi_c*); + void setOldMulti(void); void setTreasure(stage_tresure_class*); void setDMap(dStage_DMap_c*); void setDrTg(stage_tgsc_class*); void setDoor(stage_tgsc_class*); void setElst(dStage_Elst_c*); + void setLightVecInfo(stage_pure_lightvec_info_class*); + void setLightVecInfoNum(int); + void setTresure(stage_tresure_class*); + void setMapPath(void*); private: u8 field_0x0[0x8]; @@ -191,8 +208,9 @@ class dStage_roomDt_c { public: stage_pure_lightvec_info_class* getLightVecInfo(void); int getLightVecInfoNum(void); - stage_map_info_class* getMapInfo(void); - stage_map_info_dummy_class* getMapInfoBase(void); + stage_map_info_class* getMapInfo(void) const; + stage_map_info_dummy_class* getMapInfoBase(void) const; + int getMapPath(void); stage_vrbox_info_class* getVrboxInfo(void); stage_vrboxcol_info_class* getVrboxcolInfo(void); dStage_FileList2_dt_c* getFileList2Info(void); @@ -200,21 +218,21 @@ public: stage_actor_class* getPlayer(void); dStage_dPnt_c* getPnt2Info(void); dStage_dPath_c* getPath2Info(void); - stage_camera_class* getCamera(void); - stage_arrow_class* getArrow(void); - dStage_MapEventInfo_c* getMapEventInfo(void); - dStage_SoundInfo_c* getSoundInfo(void); - dStage_SoundInfo_c* getSoundInfCL(void); - stage_scls_info_dummy_class* getSclsInfo(void); - dStage_Lbnk_c* getLbnk(void); - stage_tresure_class* getTreasure(void); + stage_camera_class* getCamera(void) const; + stage_arrow_class* getArrow(void) const; + dStage_MapEventInfo_c* getMapEventInfo(void) const; + dStage_SoundInfo_c* getSoundInfo(void) const; + dStage_SoundInfo_c* getSoundInfCL(void) const; + stage_scls_info_dummy_class* getSclsInfo(void) const; + dStage_Lbnk_c* getLbnk(void) const; + stage_tresure_class* getTresure(void); stage_tgsc_class* getDrTg(void); stage_tgsc_class* getDoor(void); dStage_FloorInfo_c* getFloorInfo(void); - u16 getPlayerNum(void); + u16 getPlayerNum(void) const; int getVrboxNumInfo(void); int getVrboxcolNumInfo(void); - + int getMapInfo2(int) const; void setLightVecInfo(stage_pure_lightvec_info_class*); void setLightVecInfoNum(int); void setMapInfo(stage_map_info_class*); @@ -224,7 +242,7 @@ public: void setFileList2Info(dStage_FileList2_dt_c*); void setFileListInfo(dStage_FileList_dt_c*); void setPlayer(stage_actor_class*); - void setPnt2Info(dStage_dPnt_c*); + void setPnt2Inf(dStage_dPnt_c*); void setPath2Info(dStage_dPath_c*); void setCamera(stage_camera_class*); void setArrow(stage_arrow_class*); diff --git a/include/functions.h b/include/functions.h index 653b77dbb10..43850cfea57 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1854,7 +1854,6 @@ void func_801415E4(void); void func_8011E9F8(void); void daAlink_c_NS_procHangWaitInit(void); void func_8013BD54(void); -void dComIfGs_isItemFirstBit__FUc(u8); void daAlink_c_NS_checkLetterItem(void); void fopAcM_searchActorDistanceXZ(void); void checkBottle__17dSv_player_item_cFUc(void); diff --git a/ldscript.lcf b/ldscript.lcf index 307975a7bf6..b54398d8b9c 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -2812,87 +2812,87 @@ func_802C4FFC func_802C4928 __mi__FsRC7cSAngle func_8002824C -func_80028244 -func_8002823C -func_80028238 -func_80028230 -func_80028228 -func_80028220 -func_80028218 -func_80028210 -func_80028208 -func_80028200 -func_800281F8 -func_800281C4 -func_80028190 -func_80028188 -func_80028180 -func_80028178 -func_80028170 -func_80028168 -func_80028160 -func_80028158 -func_80028150 -func_80028148 -func_80028114 -func_800280E0 -func_800280AC -func_80028078 -func_80028070 -func_80028068 -func_80028060 -func_80028058 -func_80028050 -func_80028048 -func_80028040 -func_80028038 -func_80028030 -func_80028028 -func_80028020 -func_80028018 -func_80028010 -func_80028008 -func_80028000 -func_80027FF8 -func_80027FF0 -func_80027FE8 -func_80027FB4 -func_80027F80 -func_80027F4C -func_80027F18 -func_80027F10 -func_80027F08 -func_80027F00 -func_80027EF8 -func_80027EF0 -func_80027EE8 -func_80027EE0 -func_80027ED8 -func_80027ED0 -func_80027EC8 -func_80027EC0 -func_80027EB8 -func_80027EB0 -func_80027EA8 -func_80027EA0 -func_80027E98 -func_80027E90 -func_80027E88 -func_80027E80 -func_80027E78 -func_80027E70 -func_80027E68 -func_80027E60 -func_80027E58 -func_80027E50 -func_80027E48 -func_80027E40 -func_80027E38 -func_80027E30 -func_80027E28 -func_80027E20 -func_80027E18 -func_80027E10 +setElst__16dStage_stageDt_cFP13dStage_Elst_c +getMapPath__16dStage_stageDt_cFv +setMapPath__16dStage_stageDt_cFPv +getDoor__16dStage_stageDt_cCFv +setDoor__16dStage_stageDt_cFP16stage_tgsc_class +getDrTg__16dStage_stageDt_cCFv +setDrTg__16dStage_stageDt_cFP16stage_tgsc_class +getDMap__16dStage_stageDt_cCFv +setDMap__16dStage_stageDt_cFP13dStage_DMap_c +getTresure__16dStage_stageDt_cCFv +setTresure__16dStage_stageDt_cFP19stage_tresure_class +getLbnk__16dStage_stageDt_cCFv +setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c +getOldMulti__16dStage_stageDt_cCFv +getMulti__16dStage_stageDt_cCFv +setMulti__16dStage_stageDt_cFP14dStage_Multi_c +getMemoryMap__16dStage_stageDt_cCFv +setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c +getMemoryConfig__16dStage_stageDt_cCFv +setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c +getFloorInfo__16dStage_stageDt_cCFv +setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c +getFileListInfo__16dStage_stageDt_cCFv +setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c +getFileList2Info__16dStage_stageDt_cCFv +setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c +getMapEventInfo__16dStage_stageDt_cCFv +setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c +getSoundInfCL__16dStage_stageDt_cCFv +setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c +getSoundInf__16dStage_stageDt_cCFv +setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c +getPath2Inf__16dStage_stageDt_cCFv +setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c +getPnt2Inf__16dStage_stageDt_cCFv +setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c +getPathInf__16dStage_stageDt_cCFv +setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c +getPntInf__16dStage_stageDt_cCFv +setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c +setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class +setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class +getPlightNumInfo__16dStage_stageDt_cCFv +setPlightNumInfo__16dStage_stageDt_cFi +getLightVecInfoNum__16dStage_stageDt_cCFv +setLightVecInfoNum__16dStage_stageDt_cFi +getLightVecInfo__16dStage_stageDt_cCFv +setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class +getVrboxcolNumInfo__16dStage_stageDt_cCFv +setVrboxcolNumInfo__16dStage_stageDt_cFi +getVrboxNumInfo__16dStage_stageDt_cCFv +setVrboxNumInfo__16dStage_stageDt_cFi +getEnvrNumInfo__16dStage_stageDt_cCFv +setEnvrNumInfo__16dStage_stageDt_cFi +getPselectNumInfo__16dStage_stageDt_cCFv +setPselectNumInfo__16dStage_stageDt_cFi +getPaletteNumInfo__16dStage_stageDt_cCFv +setPaletteNumInfo__16dStage_stageDt_cFi +getPlightInfo__16dStage_stageDt_cCFv +setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class +getVrboxcolInfo__16dStage_stageDt_cCFv +setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class +getVrboxInfo__16dStage_stageDt_cCFv +setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class +getEnvrInfo__16dStage_stageDt_cCFv +setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class +getPselectInfo__16dStage_stageDt_cCFv +setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class +getPaletteInfo__16dStage_stageDt_cCFv +setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class +setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class +getMapInfo__16dStage_stageDt_cCFv +setMapInfo__16dStage_stageDt_cFP20stage_map_info_class +setRoom__16dStage_stageDt_cFP14roomRead_class +getPlayerNum__16dStage_stageDt_cCFv +setPlayerNum__16dStage_stageDt_cFUs +setPlayer__16dStage_stageDt_cFP17stage_actor_class +getArrow__16dStage_stageDt_cCFv +setArrow__16dStage_stageDt_cFP17stage_arrow_class +getCamera__16dStage_stageDt_cCFv +setCamera__16dStage_stageDt_cFP18stage_camera_class func_80027DD8 func_80027DA4 func_80027D70 @@ -2978,10 +2978,10 @@ func_8002753C func_80027534 func_8002752C func_80027524 -func_800272E8 +getSclsInfo__16dStage_stageDt_cCFv func_800272E0 -func_80026FDC -func_80026AE8 +setOldMulti__16dStage_stageDt_cFv +getElst__16dStage_stageDt_cFv func_80026844 func_800267DC func_80026764 @@ -3011,7 +3011,7 @@ func_80025B24 func_80025958 func_8002586C func_80025838 -func_8002582C +resetOldMulti__16dStage_stageDt_cFv func_80025744 func_800256AC func_80025648 @@ -3023,20 +3023,20 @@ func_80025534 func_80025500 func_800254CC func_80025498 -func_80025490 -func_80025404 +getMapInfoBase__16dStage_stageDt_cCFv +getMapInfo2__16dStage_stageDt_cCFi func_800253FC func_80025370 func_8002533C func_80025308 func_800252B8 func_80025014 -func_8002500C +getPlayer__16dStage_stageDt_cCFv func_80025004 -func_80024DB8 +getRoom__16dStage_stageDt_cCFv func_80024CB4 -func_80024C1C -func_8002483C +init__16dStage_stageDt_cFv +getStagInfo__16dStage_stageDt_cCFv func_800244E8 func_80024424 func_80024174 diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index da25c8000b3..578c8e5ef04 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1,6 +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 "f/f_pc/f_pc_stdcreate_req.h" #include "global.h" @@ -168,9 +169,7 @@ asm void dStage_roomControl_c_NS_zoneCountCheck(void) { #include "d/d_stage/asm/func_8002471C.s" } -// getStagInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getStagInfo(void) const -asm void func_8002483C(void) { +asm stage_stag_info_class* dStage_stageDt_c::getStagInfo(void) const { nofralloc #include "d/d_stage/asm/func_8002483C.s" } @@ -231,9 +230,7 @@ asm void dStage_roomControl_c_NS_roomDzs_c_NS_add(void) { #include "d/d_stage/asm/func_80024B44.s" } -// init__16dStage_stageDt_cFv -// dStage_stageDt_c::init(void) -asm void func_80024C1C(void) { +asm void dStage_stageDt_c::init(void) { nofralloc #include "d/d_stage/asm/func_80024C1C.s" } @@ -266,9 +263,7 @@ asm void dStage_roomControl_c_NS_SetTimePass(void) { #include "d/d_stage/asm/func_80024DB0.s" } -// getRoom__16dStage_stageDt_cCFv -// dStage_stageDt_c::getRoom(void) const -asm void func_80024DB8(void) { +asm roomRead_class* dStage_stageDt_c::getRoom(void) const { nofralloc #include "d/d_stage/asm/func_80024DB8.s" } @@ -315,9 +310,7 @@ asm void func_80025004(void) { #include "d/d_stage/asm/func_80025004.s" } -// getPlayer__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPlayer(void) const -asm void func_8002500C(void) { +asm stage_actor_class* dStage_stageDt_c::getPlayer(void) const { nofralloc #include "d/d_stage/asm/func_8002500C.s" } @@ -364,16 +357,12 @@ asm void func_800253FC(void) { #include "d/d_stage/asm/func_800253FC.s" } -// getMapInfo2__16dStage_stageDt_cCFi -// dStage_stageDt_c::getMapInfo2(int) const -asm void func_80025404(void) { +asm int dStage_stageDt_c::getMapInfo2(int) const { nofralloc #include "d/d_stage/asm/func_80025404.s" } -// getMapInfoBase__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMapInfoBase(void) const -asm void func_80025490(void) { +asm stage_map_info_dummy_class* dStage_stageDt_c::getMapInfoBase(void) const { nofralloc #include "d/d_stage/asm/func_80025490.s" } @@ -462,9 +451,7 @@ asm void func_80025744(void) { #include "d/d_stage/asm/func_80025744.s" } -// resetOldMulti__16dStage_stageDt_cFv -// dStage_stageDt_c::resetOldMulti(void) -asm void func_8002582C(void) { +asm void dStage_stageDt_c::resetOldMulti(void) { nofralloc #include "d/d_stage/asm/func_8002582C.s" } @@ -756,9 +743,7 @@ asm void layerTableLoader(void) { #include "d/d_stage/asm/func_800269B4.s" } -// getElst__16dStage_stageDt_cFv -// dStage_stageDt_c::getElst(void) -asm void func_80026AE8(void) { +asm dStage_Elst_c* dStage_stageDt_c::getElst(void) { nofralloc #include "d/d_stage/asm/func_80026AE8.s" } @@ -819,9 +804,7 @@ asm void dStage_Delete(void) { #include "d/d_stage/asm/func_80026DF8.s" } -// setOldMulti__16dStage_stageDt_cFv -// dStage_stageDt_c::setOldMulti(void) -asm void func_80026FDC(void) { +asm void dStage_stageDt_c::setOldMulti(void) { nofralloc #include "d/d_stage/asm/func_80026FDC.s" } @@ -854,9 +837,7 @@ asm void func_800272E0(void) { #include "d/d_stage/asm/func_800272E0.s" } -// getSclsInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getSclsInfo(void) const -asm void func_800272E8(void) { +asm stage_scls_info_dummy_class* dStage_stageDt_c::getSclsInfo(void) const { nofralloc #include "d/d_stage/asm/func_800272E8.s" } @@ -1470,569 +1451,557 @@ asm void func_80027DD8(void) { #include "d/d_stage/asm/func_80027DD8.s" } -// setCamera__16dStage_stageDt_cFP18stage_camera_class -// dStage_stageDt_c::setCamera(stage_camera_class*) -asm void func_80027E10(void) { +asm void dStage_stageDt_c::setCamera(stage_camera_class*) { nofralloc #include "d/d_stage/asm/func_80027E10.s" } -// getCamera__16dStage_stageDt_cCFv -// dStage_stageDt_c::getCamera(void) const -asm void func_80027E18(void) { +asm stage_camera_class* dStage_stageDt_c::getCamera(void) const { nofralloc #include "d/d_stage/asm/func_80027E18.s" } -// setArrow__16dStage_stageDt_cFP17stage_arrow_class -// dStage_stageDt_c::setArrow(stage_arrow_class*) -asm void func_80027E20(void) { +asm void dStage_stageDt_c::setArrow(stage_arrow_class*) { nofralloc #include "d/d_stage/asm/func_80027E20.s" } -// getArrow__16dStage_stageDt_cCFv -// dStage_stageDt_c::getArrow(void) const -asm void func_80027E28(void) { +asm stage_arrow_class* dStage_stageDt_c::getArrow(void) const { nofralloc #include "d/d_stage/asm/func_80027E28.s" } -// setPlayer__16dStage_stageDt_cFP17stage_actor_class -// dStage_stageDt_c::setPlayer(stage_actor_class*) -asm void func_80027E30(void) { +asm void dStage_stageDt_c::setPlayer(stage_actor_class*) { nofralloc #include "d/d_stage/asm/func_80027E30.s" } -// setPlayerNum__16dStage_stageDt_cFUs -// dStage_stageDt_c::setPlayerNum(unsigned short) -asm void func_80027E38(void) { +asm void dStage_stageDt_c::setPlayerNum(u16) { nofralloc #include "d/d_stage/asm/func_80027E38.s" } -// getPlayerNum__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPlayerNum(void) const -asm void func_80027E40(void) { +// +// +asm u16 dStage_stageDt_c::getPlayerNum(void) const { nofralloc #include "d/d_stage/asm/func_80027E40.s" } -// setRoom__16dStage_stageDt_cFP14roomRead_class -// dStage_stageDt_c::setRoom(roomRead_class*) -asm void func_80027E48(void) { +// +// +asm void dStage_stageDt_c::setRoom(roomRead_class*) { nofralloc #include "d/d_stage/asm/func_80027E48.s" } -// setMapInfo__16dStage_stageDt_cFP20stage_map_info_class -// dStage_stageDt_c::setMapInfo(stage_map_info_class*) -asm void func_80027E50(void) { +// +// +asm void dStage_stageDt_c::setMapInfo(stage_map_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E50.s" } -// getMapInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMapInfo(void) const -asm void func_80027E58(void) { +// +// +asm stage_map_info_class* dStage_stageDt_c::getMapInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E58.s" } -// setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class -// dStage_stageDt_c::setMapInfoBase(stage_map_info_dummy_class*) -asm void func_80027E60(void) { +// +// +asm void dStage_stageDt_c::setMapInfoBase(stage_map_info_dummy_class*) { nofralloc #include "d/d_stage/asm/func_80027E60.s" } -// setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class -// dStage_stageDt_c::setPaletteInfo(stage_palette_info_class*) -asm void func_80027E68(void) { +// +// +asm void dStage_stageDt_c::setPaletteInfo(stage_palette_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E68.s" } -// getPaletteInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPaletteInfo(void) const -asm void func_80027E70(void) { +// +// +asm stage_palette_info_class* dStage_stageDt_c::getPaletteInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E70.s" } -// setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class -// dStage_stageDt_c::setPselectInfo(stage_pselect_info_class*) -asm void func_80027E78(void) { +// +// +asm void dStage_stageDt_c::setPselectInfo(stage_pselect_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E78.s" } -// getPselectInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPselectInfo(void) const -asm void func_80027E80(void) { +// +// +asm stage_pselect_info_class* dStage_stageDt_c::getPselectInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E80.s" } -// setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class -// dStage_stageDt_c::setEnvrInfo(stage_envr_info_class*) -asm void func_80027E88(void) { +// +// +asm void dStage_stageDt_c::setEnvrInfo(stage_envr_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E88.s" } -// getEnvrInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getEnvrInfo(void) const -asm void func_80027E90(void) { +// +// +asm stage_envr_info_class* dStage_stageDt_c::getEnvrInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027E90.s" } -// setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class -// dStage_stageDt_c::setVrboxInfo(stage_vrbox_info_class*) -asm void func_80027E98(void) { +// +// +asm void dStage_stageDt_c::setVrboxInfo(stage_vrbox_info_class*) { nofralloc #include "d/d_stage/asm/func_80027E98.s" } -// getVrboxInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getVrboxInfo(void) const -asm void func_80027EA0(void) { +// +// +asm stage_vrbox_info_class* dStage_stageDt_c::getVrboxInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EA0.s" } -// setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class -// dStage_stageDt_c::setVrboxcolInfo(stage_vrboxcol_info_class*) -asm void func_80027EA8(void) { +// +// +asm void dStage_stageDt_c::setVrboxcolInfo(stage_vrboxcol_info_class*) { nofralloc #include "d/d_stage/asm/func_80027EA8.s" } -// getVrboxcolInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getVrboxcolInfo(void) const -asm void func_80027EB0(void) { +// +// +asm stage_vrboxcol_info_class* dStage_stageDt_c::getVrboxcolInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EB0.s" } -// setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class -// dStage_stageDt_c::setPlightInfo(stage_plight_info_class*) -asm void func_80027EB8(void) { +// +// +asm void dStage_stageDt_c::setPlightInfo(stage_plight_info_class*) { nofralloc #include "d/d_stage/asm/func_80027EB8.s" } -// getPlightInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPlightInfo(void) const -asm void func_80027EC0(void) { +// +// +asm stage_plight_info_class* dStage_stageDt_c::getPlightInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EC0.s" } -// setPaletteNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setPaletteNumInfo(int) -asm void func_80027EC8(void) { +// +// +asm void dStage_stageDt_c::setPaletteNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027EC8.s" } -// getPaletteNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPaletteNumInfo(void) const -asm void func_80027ED0(void) { +// +// +asm int dStage_stageDt_c::getPaletteNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027ED0.s" } -// setPselectNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setPselectNumInfo(int) -asm void func_80027ED8(void) { +// +// +asm void dStage_stageDt_c::setPselectNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027ED8.s" } -// getPselectNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPselectNumInfo(void) const -asm void func_80027EE0(void) { +// +// +asm int dStage_stageDt_c::getPselectNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EE0.s" } -// setEnvrNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setEnvrNumInfo(int) -asm void func_80027EE8(void) { +// +// +asm void dStage_stageDt_c::setEnvrNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027EE8.s" } -// getEnvrNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getEnvrNumInfo(void) const -asm void func_80027EF0(void) { +// +// +asm int dStage_stageDt_c::getEnvrNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027EF0.s" } -// setVrboxNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setVrboxNumInfo(int) -asm void func_80027EF8(void) { +// +// +asm void dStage_stageDt_c::setVrboxNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027EF8.s" } -// getVrboxNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getVrboxNumInfo(void) const -asm void func_80027F00(void) { +// +// +asm int dStage_stageDt_c::getVrboxNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027F00.s" } -// setVrboxcolNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setVrboxcolNumInfo(int) -asm void func_80027F08(void) { +// +// +asm void dStage_stageDt_c::setVrboxcolNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027F08.s" } -// getVrboxcolNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getVrboxcolNumInfo(void) const -asm void func_80027F10(void) { +// +// +asm int dStage_stageDt_c::getVrboxcolNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027F10.s" } -// setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class -// dStage_stageDt_c::setLightVecInfo(stage_pure_lightvec_info_class*) -asm void func_80027F18(void) { +// +// +asm void dStage_stageDt_c::setLightVecInfo(stage_pure_lightvec_info_class*) { nofralloc #include "d/d_stage/asm/func_80027F18.s" } -// getLightVecInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getLightVecInfo(void) const -asm void func_80027F4C(void) { +// +// +asm stage_pure_lightvec_info_class* dStage_stageDt_c::getLightVecInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027F4C.s" } -// setLightVecInfoNum__16dStage_stageDt_cFi -// dStage_stageDt_c::setLightVecInfoNum(int) -asm void func_80027F80(void) { +// +// +asm void dStage_stageDt_c::setLightVecInfoNum(int) { nofralloc #include "d/d_stage/asm/func_80027F80.s" } -// getLightVecInfoNum__16dStage_stageDt_cCFv -// dStage_stageDt_c::getLightVecInfoNum(void) const -asm void func_80027FB4(void) { +// +// +asm int dStage_stageDt_c::getLightVecInfoNum(void) const { nofralloc #include "d/d_stage/asm/func_80027FB4.s" } -// setPlightNumInfo__16dStage_stageDt_cFi -// dStage_stageDt_c::setPlightNumInfo(int) -asm void func_80027FE8(void) { +// +// +asm void dStage_stageDt_c::setPlightNumInfo(int) { nofralloc #include "d/d_stage/asm/func_80027FE8.s" } -// getPlightNumInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPlightNumInfo(void) const -asm void func_80027FF0(void) { +// +// +asm int dStage_stageDt_c::getPlightNumInfo(void) const { nofralloc #include "d/d_stage/asm/func_80027FF0.s" } -// setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class -// dStage_stageDt_c::setStagInfo(stage_stag_info_class*) -asm void func_80027FF8(void) { +// +// +asm void dStage_stageDt_c::setStagInfo(stage_stag_info_class*) { nofralloc #include "d/d_stage/asm/func_80027FF8.s" } -// setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class -// dStage_stageDt_c::setSclsInfo(stage_scls_info_dummy_class*) -asm void func_80028000(void) { +// +// +asm void dStage_stageDt_c::setSclsInfo(stage_scls_info_dummy_class*) { nofralloc #include "d/d_stage/asm/func_80028000.s" } -// setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c -// dStage_stageDt_c::setPntInfo(dStage_dPnt_c*) -asm void func_80028008(void) { +// +// +asm void dStage_stageDt_c::setPntInfo(dStage_dPnt_c*) { nofralloc #include "d/d_stage/asm/func_80028008.s" } -// getPntInf__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPntInf(void) const -asm void func_80028010(void) { +// +// +asm dStage_dPnt_c* dStage_stageDt_c::getPntInf(void) const { nofralloc #include "d/d_stage/asm/func_80028010.s" } -// setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c -// dStage_stageDt_c::setPathInfo(dStage_dPath_c*) -asm void func_80028018(void) { +// +// +asm void dStage_stageDt_c::setPathInfo(dStage_dPath_c*) { nofralloc #include "d/d_stage/asm/func_80028018.s" } -// getPathInf__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPathInf(void) const -asm void func_80028020(void) { +// +// +asm dStage_dPath_c* dStage_stageDt_c::getPathInf(void) const { nofralloc #include "d/d_stage/asm/func_80028020.s" } -// setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c -// dStage_stageDt_c::setPnt2Info(dStage_dPnt_c*) -asm void func_80028028(void) { +// +// +asm void dStage_stageDt_c::setPnt2Info(dStage_dPnt_c*) { nofralloc #include "d/d_stage/asm/func_80028028.s" } -// getPnt2Inf__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPnt2Inf(void) const -asm void func_80028030(void) { +// +// +asm dStage_dPnt_c* dStage_stageDt_c::getPnt2Inf(void) const { nofralloc #include "d/d_stage/asm/func_80028030.s" } -// setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c -// dStage_stageDt_c::setPath2Info(dStage_dPath_c*) -asm void func_80028038(void) { +// +// +asm void dStage_stageDt_c::setPath2Info(dStage_dPath_c*) { nofralloc #include "d/d_stage/asm/func_80028038.s" } -// getPath2Inf__16dStage_stageDt_cCFv -// dStage_stageDt_c::getPath2Inf(void) const -asm void func_80028040(void) { +// +// +asm dStage_dPath_c* dStage_stageDt_c::getPath2Inf(void) const { nofralloc #include "d/d_stage/asm/func_80028040.s" } -// setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c -// dStage_stageDt_c::setSoundInf(dStage_SoundInfo_c*) -asm void func_80028048(void) { +// +// +asm void dStage_stageDt_c::setSoundInf(dStage_SoundInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028048.s" } -// getSoundInf__16dStage_stageDt_cCFv -// dStage_stageDt_c::getSoundInf(void) const -asm void func_80028050(void) { +// +// +asm dStage_SoundInfo_c* dStage_stageDt_c::getSoundInf(void) const { nofralloc #include "d/d_stage/asm/func_80028050.s" } -// setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c -// dStage_stageDt_c::setSoundInfCL(dStage_SoundInfo_c*) -asm void func_80028058(void) { +// +// +asm void dStage_stageDt_c::setSoundInfCL(dStage_SoundInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028058.s" } -// getSoundInfCL__16dStage_stageDt_cCFv -// dStage_stageDt_c::getSoundInfCL(void) const -asm void func_80028060(void) { +// +// +asm dStage_SoundInfo_c* dStage_stageDt_c::getSoundInfCL(void) const { nofralloc #include "d/d_stage/asm/func_80028060.s" } -// setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c -// dStage_stageDt_c::setMapEventInfo(dStage_MapEventInfo_c*) -asm void func_80028068(void) { +// +// +asm void dStage_stageDt_c::setMapEventInfo(dStage_MapEventInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028068.s" } -// getMapEventInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMapEventInfo(void) const -asm void func_80028070(void) { +// +// +asm dStage_MapEventInfo_c* dStage_stageDt_c::getMapEventInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028070.s" } -// setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c -// dStage_stageDt_c::setFileList2Info(dStage_FileList2_dt_c*) -asm void func_80028078(void) { +// +// +asm void dStage_stageDt_c::setFileList2Info(dStage_FileList2_dt_c*) { nofralloc #include "d/d_stage/asm/func_80028078.s" } -// getFileList2Info__16dStage_stageDt_cCFv -// dStage_stageDt_c::getFileList2Info(void) const -asm void func_800280AC(void) { +// +// +asm dStage_FileList2_dt_c* dStage_stageDt_c::getFileList2Info(void) const { nofralloc #include "d/d_stage/asm/func_800280AC.s" } -// setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c -// dStage_stageDt_c::setFileListInfo(dStage_FileList_dt_c*) -asm void func_800280E0(void) { +// +// +asm void dStage_stageDt_c::setFileListInfo(dStage_FileList_dt_c*) { nofralloc #include "d/d_stage/asm/func_800280E0.s" } -// getFileListInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getFileListInfo(void) const -asm void func_80028114(void) { +// +// +asm dStage_FileList_dt_c* dStage_stageDt_c::getFileListInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028114.s" } -// setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c -// dStage_stageDt_c::setFloorInfo(dStage_FloorInfo_c*) -asm void func_80028148(void) { +// +// +asm void dStage_stageDt_c::setFloorInfo(dStage_FloorInfo_c*) { nofralloc #include "d/d_stage/asm/func_80028148.s" } -// getFloorInfo__16dStage_stageDt_cCFv -// dStage_stageDt_c::getFloorInfo(void) const -asm void func_80028150(void) { +// +// +asm dStage_FloorInfo_c* dStage_stageDt_c::getFloorInfo(void) const { nofralloc #include "d/d_stage/asm/func_80028150.s" } -// setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c -// dStage_stageDt_c::setMemoryConfig(dStage_MemoryConfig_c*) -asm void func_80028158(void) { +// +// +asm void dStage_stageDt_c::setMemoryConfig(dStage_MemoryConfig_c*) { nofralloc #include "d/d_stage/asm/func_80028158.s" } -// getMemoryConfig__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMemoryConfig(void) const -asm void func_80028160(void) { +// +// +asm dStage_MemoryConfig_c* dStage_stageDt_c::getMemoryConfig(void) const { nofralloc #include "d/d_stage/asm/func_80028160.s" } -// setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c -// dStage_stageDt_c::setMemoryMap(dStage_MemoryMap_c*) -asm void func_80028168(void) { +// +// +asm void dStage_stageDt_c::setMemoryMap(dStage_MemoryMap_c*) { nofralloc #include "d/d_stage/asm/func_80028168.s" } -// getMemoryMap__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMemoryMap(void) const -asm void func_80028170(void) { +// +// +asm dStage_MemoryMap_c* dStage_stageDt_c::getMemoryMap(void) const { nofralloc #include "d/d_stage/asm/func_80028170.s" } -// setMulti__16dStage_stageDt_cFP14dStage_Multi_c -// dStage_stageDt_c::setMulti(dStage_Multi_c*) -asm void func_80028178(void) { +// +// +asm void dStage_stageDt_c::setMulti(dStage_Multi_c*) { nofralloc #include "d/d_stage/asm/func_80028178.s" } -// getMulti__16dStage_stageDt_cCFv -// dStage_stageDt_c::getMulti(void) const -asm void func_80028180(void) { +// +// +asm dStage_Multi_c* dStage_stageDt_c::getMulti(void) const { nofralloc #include "d/d_stage/asm/func_80028180.s" } -// getOldMulti__16dStage_stageDt_cCFv -// dStage_stageDt_c::getOldMulti(void) const -asm void func_80028188(void) { +// +// +asm dStage_Multi_c* dStage_stageDt_c::getOldMulti(void) const { nofralloc #include "d/d_stage/asm/func_80028188.s" } -// setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c -// dStage_stageDt_c::setLbnk(dStage_Lbnk_c*) -asm void func_80028190(void) { +// +// +asm void dStage_stageDt_c::setLbnk(dStage_Lbnk_c*) { nofralloc #include "d/d_stage/asm/func_80028190.s" } -// getLbnk__16dStage_stageDt_cCFv -// dStage_stageDt_c::getLbnk(void) const -asm void func_800281C4(void) { +// +// +asm dStage_Lbnk_c* dStage_stageDt_c::getLbnk(void) const { nofralloc #include "d/d_stage/asm/func_800281C4.s" } -// setTresure__16dStage_stageDt_cFP19stage_tresure_class -// dStage_stageDt_c::setTresure(stage_tresure_class*) -asm void func_800281F8(void) { +// +// +asm void dStage_stageDt_c::setTresure(stage_tresure_class*) { nofralloc #include "d/d_stage/asm/func_800281F8.s" } -// getTresure__16dStage_stageDt_cCFv -// dStage_stageDt_c::getTresure(void) const -asm void func_80028200(void) { +// +// +asm stage_tresure_class* dStage_stageDt_c::getTresure(void) const { nofralloc #include "d/d_stage/asm/func_80028200.s" } -// setDMap__16dStage_stageDt_cFP13dStage_DMap_c -// dStage_stageDt_c::setDMap(dStage_DMap_c*) -asm void func_80028208(void) { +// +// +asm void dStage_stageDt_c::setDMap(dStage_DMap_c*) { nofralloc #include "d/d_stage/asm/func_80028208.s" } -// getDMap__16dStage_stageDt_cCFv -// dStage_stageDt_c::getDMap(void) const -asm void func_80028210(void) { +// +// +asm dStage_DMap_c* dStage_stageDt_c::getDMap(void) const { nofralloc #include "d/d_stage/asm/func_80028210.s" } -// setDrTg__16dStage_stageDt_cFP16stage_tgsc_class -// dStage_stageDt_c::setDrTg(stage_tgsc_class*) -asm void func_80028218(void) { +// +// +asm void dStage_stageDt_c::setDrTg(stage_tgsc_class*) { nofralloc #include "d/d_stage/asm/func_80028218.s" } -// getDrTg__16dStage_stageDt_cCFv -// dStage_stageDt_c::getDrTg(void) const -asm void func_80028220(void) { +// +// +asm stage_tgsc_class* dStage_stageDt_c::getDrTg(void) const { nofralloc #include "d/d_stage/asm/func_80028220.s" } -// setDoor__16dStage_stageDt_cFP16stage_tgsc_class -// dStage_stageDt_c::setDoor(stage_tgsc_class*) -asm void func_80028228(void) { +// +// +asm void dStage_stageDt_c::setDoor(stage_tgsc_class*) { nofralloc #include "d/d_stage/asm/func_80028228.s" } -// getDoor__16dStage_stageDt_cCFv -// dStage_stageDt_c::getDoor(void) const -asm void func_80028230(void) { +// +// +asm stage_tgsc_class* dStage_stageDt_c::getDoor(void) const { nofralloc #include "d/d_stage/asm/func_80028230.s" } -// setMapPath__16dStage_stageDt_cFPv -// dStage_stageDt_c::setMapPath(void*) -asm void func_80028238(void) { +// +// +asm void dStage_stageDt_c::setMapPath(void*) { nofralloc #include "d/d_stage/asm/func_80028238.s" } -// getMapPath__16dStage_stageDt_cFv -// dStage_stageDt_c::getMapPath(void) -asm void func_8002823C(void) { +// +// +asm int dStage_stageDt_c::getMapPath(void) { nofralloc #include "d/d_stage/asm/func_8002823C.s" } -// setElst__16dStage_stageDt_cFP13dStage_Elst_c -// dStage_stageDt_c::setElst(dStage_Elst_c*) -asm void func_80028244(void) { +// +// +asm void dStage_stageDt_c::setElst(dStage_Elst_c*) { nofralloc #include "d/d_stage/asm/func_80028244.s" }