convert dStage_stageDt_c methods

This commit is contained in:
Pheenoh
2021-01-09 17:00:47 -05:00
parent f1ff8a45ee
commit 9349690253
4 changed files with 408 additions and 422 deletions
+75 -57
View File
@@ -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*);
-1
View File
@@ -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);
+91 -91
View File
@@ -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
+242 -273
View File
File diff suppressed because it is too large Load Diff