mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

dStage_startStage_c::set OK

Browse Source
This commit is contained in:
Pheenoh
2021-01-10 02:25:21 -05:00
parent 1eb2cc39a8
commit adf65faa28
8 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_stage/asm/func_80023E28.s
+1 -1
View File
@@ -10,7 +10,7 @@
/* 80023E4C 00020D8C 98 03 00 0E */ stb r0, 0xe(r3)
/* 80023E50 00020D90 99 03 00 0F */ stb r8, 0xf(r3)
/* 80023E54 00020D94 99 23 00 10 */ stb r9, 0x10(r3)
/* 80023E58 00020D98 48 00 03 45 */ bl dStage_startStage_c_NS_set
/* 80023E58 00020D98 48 00 03 45 */ bl set__19dStage_startStage_cFPCcScsSc
/* 80023E5C 00020D9C 7F E3 FB 78 */ mr r3, r31
/* 80023E60 00020DA0 3C 80 80 38 */ lis r4, lbl_80378A50@ha
/* 80023E64 00020DA4 38 84 8A 50 */ addi r4, r4, lbl_80378A50@l
include/d/d_stage/asm/func_80025014.s
+1 -1
View File
@@ -152,7 +152,7 @@ lbl_80025208:
/* 80025240 00022180 A8 C6 4E 08 */ lha r6, 0x4e08(r6)
/* 80025244 00022184 88 07 4E 0B */ lbz r0, 0x4e0b(r7)
/* 80025248 00022188 7C 07 07 74 */ extsb r7, r0
/* 8002524C 0002218C 4B FF EF 51 */ bl dStage_startStage_c_NS_set
/* 8002524C 0002218C 4B FF EF 51 */ bl set__19dStage_startStage_cFPCcScsSc
/* 80025250 00022190 7F C3 F3 78 */ mr r3, r30
/* 80025254 00022194 7F A4 EB 78 */ mr r4, r29
/* 80025258 00022198 4B FF FC A5 */ bl dStage_actorCreate
include/d/d_stage/d_stage.h
+3 -1
View File
@@ -344,6 +344,7 @@ private:
#pragma pack(push, 1)
class dStage_nextStage_c {
public:
void set(const char*, s8, s16, s8, s8, u8);
private:
u8 field_0x0;
u8 field_0x1;
@@ -359,7 +360,7 @@ private:
u8 field_0xb;
u8 field_0xc;
u8 field_0xd;
u8 enabled;
s8 enabled;
u8 wipe;
u8 wipe_speed;
};
@@ -368,6 +369,7 @@ private:
#pragma pack(push, 1)
class dStage_startStage_c {
public:
void set(const char*, s8, s16, s8);
private:
/* 0x0 */ char mStage[8];
/* 0x8 */ s16 mPoint;
include/functions.h
+2 -2
View File
@@ -6196,7 +6196,7 @@ void dStage_getName2(void);
void dStage_infoCreate(void);
void dStage_initRoomKeepDoorInfo(void);
void dStage_isBossStage(void);
void dStage_nextStage_c_NS_set(void);
void set__18dStage_nextStage_cFPCcScsScScUc(void);
void dStage_roomControl_c_NS_SetTimePass(void);
void dStage_roomControl_c_NS_createMemoryBlock(void);
void dStage_roomControl_c_NS_destroyMemoryBlock(void);
@@ -6218,7 +6218,7 @@ void dStage_roomStatus_c_NS_dtor(void);
void dStage_searchName(void);
void dStage_setLayerTagName(void);
void dStage_stagInfo_GetParticleNo(void);
void dStage_startStage_c_NS_set(void);
void set__19dStage_startStage_cFPCcScsSc(const char*, s8, s16, s8);
void dStage_tgscInfoInit(void);
void dSvBit_HIO_c_NS_init(void);
void dTres_c_NS_addData(void);
include/m_Do/m_Do_Reset/m_Do_Reset.h
+2
View File
@@ -26,4 +26,6 @@ struct mDoRst {
void mDoRst_reset(int p1, u32 p2, int p3);
void mDoRst_resetCallBack(int p1, void* p2);
extern ResetData* m_Do_Reset_NS_mDoRst_NS_mResetData;
#endif
include/variables.h
+1 -2
View File
@@ -59,8 +59,7 @@ extern u8 __ct__12dSv_memory_cFv;
extern u8 __ct__13dSv_memory2_cFv;
extern u8 lbl_803D3420;
extern u8 lbl_80450B0C;
struct ResetData;
extern ResetData* m_Do_Reset_NS_mDoRst_NS_mResetData;
//struct ResetData;
extern u8 lbl_80450B08;
extern u8 lbl_803DB420;
extern u8 main01__Fv;