mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

convert dStage_roomDt_c methods

Browse Source
This commit is contained in:
Pheenoh
2021-01-09 19:20:36 -05:00
parent 9349690253
commit 872cd076aa
6 changed files with 287 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage/asm/func_800241E8.s
+1 -1
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)
include/d/d_stage/asm/func_80026D38.s
+1 -1
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
include/d/d_stage/d_stage.h
+63 -17
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];
include/functions.h
+2 -2
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);