falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

convert dStage_roomDt_c methods

This commit is contained in:
Pheenoh 2021-01-09 19:20:36 -05:00
parent 9349690253
commit 872cd076aa
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
6 changed files with 287 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/d/d_stage/asm/func_800241E8.s
View File

@ -32,7 +32,7 @@ lbl_8002424C:
/* 80024258 00021198 7D 89 03 A6 */ mtctr r12
/* 8002425C 0002119C 4E 80 04 21 */ bctrl
/* 80024260 000211A0 7F C3 F3 78 */ mr r3, r30
/* 80024264 000211A4 48 00 0A 45 */ bl dStage_roomDt_c_NS_initFileList2
/* 80024264 000211A4 48 00 0A 45 */ bl initFileList2__15dStage_roomDt_cFv
/* 80024268 000211A8 38 00 00 00 */ li r0, 0
/* 8002426C 000211AC 7C 7F E2 14 */ add r3, r31, r28
/* 80024270 000211B0 98 03 03 F4 */ stb r0, 0x3f4(r3)

2
include/d/d_stage/asm/func_80026D38.s
View File

@ -16,7 +16,7 @@
/* 80026D74 00023CB4 88 03 4E 0A */ lbz r0, 0x4e0a(r3)
/* 80026D78 00023CB8 7C 03 07 75 */ extsb. r3, r0
/* 80026D7C 00023CBC 41 80 00 08 */ blt lbl_80026D84
/* 80026D80 00023CC0 4B FF DF 91 */ bl dStage_roomInit
/* 80026D80 00023CC0 4B FF DF 91 */ bl func_80024D10
lbl_80026D84:
/* 80026D84 00023CC4 38 00 00 00 */ li r0, 0
/* 80026D88 00023CC8 3C 60 80 40 */ lis r3, lbl_80406194@ha

80
include/d/d_stage/d_stage.h
View File

@ -206,33 +206,57 @@ private:
class dStage_roomDt_c {
public:
stage_pure_lightvec_info_class* getLightVecInfo(void);
int getLightVecInfoNum(void);
stage_pure_lightvec_info_class* getLightVecInfo(void) const;
int getLightVecInfoNum(void) const;
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);
dStage_FileList_dt_c* getFileListInfo(void);
stage_actor_class* getPlayer(void);
dStage_dPnt_c* getPnt2Info(void);
dStage_dPath_c* getPath2Info(void);
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_actor_class* getPlayer(void) const;
dStage_dPnt_c* getPnt2Inf(void) const;
dStage_dPath_c* getPath2Inf(void) const;
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* getSoundInf(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);
stage_tresure_class* getTresure(void) const;
stage_tgsc_class* getDrTg(void) const;
stage_tgsc_class* getDoor(void) const;
dStage_FloorInfo_c* getFloorInfo(void) const;
u16 getPlayerNum(void) const;
int getVrboxNumInfo(void);
int getVrboxcolNumInfo(void);
int getEnvrNumInfo(void) const;
int getVrboxNumInfo(void) const;
int getVrboxcolNumInfo(void) const;
int getMapInfo2(int) const;
int getPlightNumInfo(void) const;
stage_stag_info_class* getStagInfo(void) const;
dStage_dPnt_c* getPntInf(void) const;
dStage_dPath_c* getPathInf(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;
dStage_DMap_c* getDMap(void) const;
dStage_Elst_c* getElst(void);
roomRead_class* getRoom(void) const;
stage_palette_info_class* getPaletteInfo(void) const;
stage_pselect_info_class* getPselectInfo(void) const;
stage_envr_info_class* getEnvrInfo(void) const;
stage_plight_info_class* getPlightInfo(void) const;
int getPaletteNumInfo(void) const;
int getPselectNumInfo(void) const;
void initFileList2(void);
void init(void);
void setLightVecInfo(stage_pure_lightvec_info_class*);
void setLightVecInfoNum(int);
void setMapInfo(stage_map_info_class*);
@ -247,7 +271,7 @@ public:
void setCamera(stage_camera_class*);
void setArrow(stage_arrow_class*);
void setMapEventInfo(dStage_MapEventInfo_c*);
void setSoundInfo(dStage_SoundInfo_c*);
void setSoundInf(dStage_SoundInfo_c*);
void setSoundInfCL(dStage_SoundInfo_c*);
void setSclsInfo(stage_scls_info_dummy_class*);
void setLbnk(dStage_Lbnk_c*);
@ -258,6 +282,28 @@ public:
void setPlayerNum(u16);
void setVrboxNumInfo(int);
void setVrboxcolNumInfo(int);
void setStagInfo(stage_stag_info_class*);
void setPntInfo(dStage_dPnt_c*);
void setPathInfo(dStage_dPath_c*);
void setPnt2Info(dStage_dPnt_c*);
void setPlightNumInfo(int);
void setMemoryConfig(dStage_MemoryConfig_c*);
void setMemoryMap(dStage_MemoryMap_c*);
void setMulti(dStage_Multi_c*);
void setOldMulti(void);
void resetOldMulti(void);
void setTresure(stage_tresure_class*);
void setDMap(dStage_DMap_c*);
void setMapPath(void*);
void setElst(dStage_Elst_c*);
void setRoom(roomRead_class*);
void setPaletteInfo(stage_palette_info_class*);
void setPselectInfo(stage_pselect_info_class*);
void setEnvrInfo(stage_envr_info_class*);
void setPlightInfo(stage_plight_info_class*);
void setPaletteNumInfo(int);
void setPselectNumInfo(int);
void setEnvrNumInfo(int);
private:
u8 field_0x0[0x8];

4
include/functions.h
View File

@ -6221,8 +6221,8 @@ void dStage_roomControl_c_NS_roomDzs_c_NS_remove(void);
void dStage_roomControl_c_NS_setArcBank(void);
void dStage_roomControl_c_NS_setStayNo(void);
void dStage_roomControl_c_NS_zoneCountCheck(void);
void dStage_roomDt_c_NS_initFileList2(void);
void dStage_roomInit(void);
void initFileList2__15dStage_roomDt_cFv(void);
void init__15dStage_roomDt_cFv(void);
void dStage_roomRead_dt_c_GetReverbStage(void);
void dStage_roomStatus_c(void);
void dStage_roomStatus_c_NS_dtor(void);

182
ldscript.lcf
View File

@ -2893,93 +2893,93 @@ 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
func_80027D40
func_80027D38
func_80027D30
func_80027D28
func_80027D20
func_80027D18
func_80027D14
func_80027D0C
func_80027D04
func_80027CFC
func_80027CF4
func_80027CC0
func_80027C90
func_80027C60
func_80027C2C
func_80027BFC
func_80027BC8
func_80027B98
func_80027B64
func_80027B34
func_80027B2C
func_80027B24
func_80027B1C
func_80027B14
func_80027B0C
func_80027B04
func_80027AFC
func_80027AF4
func_80027AEC
func_80027AE4
func_80027ADC
func_80027AD4
func_80027ACC
func_80027AC4
func_80027ABC
func_80027A88
func_80027A54
func_80027A20
func_800279EC
func_800279E4
func_800279B0
func_8002797C
func_80027974
func_8002796C
func_80027964
func_8002795C
func_80027928
func_800278F4
func_800278EC
func_800278E4
func_800278DC
func_800278D4
func_800278A0
func_8002786C
func_80027838
func_80027804
func_800277D0
func_8002779C
func_80027768
func_80027734
func_8002772C
func_80027724
func_8002771C
func_80027714
func_800276E0
func_800276AC
func_80027678
func_80027644
func_80027610
func_800275DC
func_800275D4
func_800275CC
func_800275C4
func_80027590
func_8002755C
func_80027554
func_8002754C
func_80027544
func_8002753C
func_80027534
func_8002752C
func_80027524
getElst__15dStage_roomDt_cFv
setElst__15dStage_roomDt_cFP13dStage_Elst_c
getMapPath__15dStage_roomDt_cFv
setMapPath__15dStage_roomDt_cFPv
getDoor__15dStage_roomDt_cCFv
setDoor__15dStage_roomDt_cFP16stage_tgsc_class
getDrTg__15dStage_roomDt_cCFv
setDrTg__15dStage_roomDt_cFP16stage_tgsc_class
getDMap__15dStage_roomDt_cCFv
setDMap__15dStage_roomDt_cFP13dStage_DMap_c
getTresure__15dStage_roomDt_cCFv
setTresure__15dStage_roomDt_cFP19stage_tresure_class
getLbnk__15dStage_roomDt_cCFv
setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c
getOldMulti__15dStage_roomDt_cCFv
resetOldMulti__15dStage_roomDt_cFv
setOldMulti__15dStage_roomDt_cFv
getMulti__15dStage_roomDt_cCFv
setMulti__15dStage_roomDt_cFP14dStage_Multi_c
getMemoryMap__15dStage_roomDt_cCFv
setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c
getMemoryConfig__15dStage_roomDt_cCFv
setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c
getFloorInfo__15dStage_roomDt_cCFv
setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c
setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c
getFileList2Info__15dStage_roomDt_cCFv
setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c
getMapEventInfo__15dStage_roomDt_cCFv
setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c
getSoundInfCL__15dStage_roomDt_cCFv
setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c
getSoundInf__15dStage_roomDt_cCFv
setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c
getPath2Inf__15dStage_roomDt_cCFv
setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c
getPnt2Inf__15dStage_roomDt_cCFv
setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c
getPathInf__15dStage_roomDt_cCFv
setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c
getPntInf__15dStage_roomDt_cCFv
setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c
setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class
getStagInfo__15dStage_roomDt_cCFv
setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class
getLightVecInfoNum__15dStage_roomDt_cCFv
setLightVecInfoNum__15dStage_roomDt_cFi
getLightVecInfo__15dStage_roomDt_cCFv
setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class
getPlightNumInfo__15dStage_roomDt_cCFv
setPlightNumInfo__15dStage_roomDt_cFi
getVrboxcolNumInfo__15dStage_roomDt_cCFv
setVrboxcolNumInfo__15dStage_roomDt_cFi
getVrboxNumInfo__15dStage_roomDt_cCFv
setVrboxNumInfo__15dStage_roomDt_cFi
getEnvrNumInfo__15dStage_roomDt_cCFv
setEnvrNumInfo__15dStage_roomDt_cFi
getPselectNumInfo__15dStage_roomDt_cCFv
setPselectNumInfo__15dStage_roomDt_cFi
getPaletteNumInfo__15dStage_roomDt_cCFv
setPaletteNumInfo__15dStage_roomDt_cFi
getPlightInfo__15dStage_roomDt_cCFv
setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class
getVrboxcolInfo__15dStage_roomDt_cCFv
setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class
getVrboxInfo__15dStage_roomDt_cCFv
setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class
getEnvrInfo__15dStage_roomDt_cCFv
setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class
getPselectInfo__15dStage_roomDt_cCFv
setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class
getPaletteInfo__15dStage_roomDt_cCFv
setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class
setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class
getMapInfo__15dStage_roomDt_cCFv
setMapInfo__15dStage_roomDt_cFP20stage_map_info_class
getRoom__15dStage_roomDt_cCFv
setRoom__15dStage_roomDt_cFP14roomRead_class
getPlayerNum__15dStage_roomDt_cCFv
setPlayerNum__15dStage_roomDt_cFUs
setPlayer__15dStage_roomDt_cFP17stage_actor_class
getArrow__15dStage_roomDt_cCFv
setArrow__15dStage_roomDt_cFP17stage_arrow_class
getCamera__15dStage_roomDt_cCFv
setCamera__15dStage_roomDt_cFP18stage_camera_class
getSclsInfo__16dStage_stageDt_cCFv
func_800272E0
getSclsInfo__15dStage_roomDt_cCFv
setOldMulti__16dStage_stageDt_cFv
getElst__16dStage_stageDt_cFv
func_80026844
@ -3025,21 +3025,23 @@ func_800254CC
func_80025498
getMapInfoBase__16dStage_stageDt_cCFv
getMapInfo2__16dStage_stageDt_cCFi
func_800253FC
func_80025370
getMapInfoBase__15dStage_roomDt_cCFv
getMapInfo2__15dStage_roomDt_cCFi
func_8002533C
func_80025308
func_800252B8
func_80025014
getPlayer__16dStage_stageDt_cCFv
func_80025004
getPlayer__15dStage_roomDt_cCFv
getRoom__16dStage_stageDt_cCFv
func_80024CB4
init__15dStage_roomDt_cFv
init__16dStage_stageDt_cFv
getStagInfo__16dStage_stageDt_cCFv
func_800244E8
func_80024424
func_80024174
func_80024D10
initFileList2__15dStage_roomDt_cFv
}
/*
.init 80003100 - 80005600

578
src/d/d_stage.cpp
View File

File diff suppressed because it is too large Load Diff