d_a_npc_ks equivalent (#2481)

This commit is contained in:
YunataSavior
2025-06-10 09:19:55 -07:00
committed by GitHub
parent 40298997cc
commit 7fdbc22fea
7 changed files with 738 additions and 720 deletions
+2 -2
View File
@@ -44,7 +44,7 @@ public:
/* 0x5F8 */ s16 field_0x5f8;
/* 0x5FA */ s16 field_0x5fa;
/* 0x5FC */ s8 field_0x5fc;
/* 0x5FD */ u8 field_0x5fd;
/* 0x5FD */ s8 field_0x5fd;
/* 0x5FE */ s16 field_0x5fe;
/* 0x600 */ s16 field_0x600;
/* 0x602 */ s16 field_0x602;
@@ -88,7 +88,7 @@ public:
/* 0x98C */ dCcD_Cyl field_0x98c;
/* 0xAC8 */ u8 field_0xac8[0xaec - 0xac8];
/* 0xAEC */ s8 field_0xaec;
/* 0xAED */ u8 field_0xaed;
/* 0xAED */ s8 field_0xaed;
/* 0xAEE */ s16 field_0xaee;
/* 0xAF0 */ s16 field_0xaf0;
/* 0xAF4 */ dMsgFlow_c mMsgFlow;
+1 -1
View File
@@ -1164,7 +1164,7 @@ public:
void setGiantPuzzle() { mSpecialMode = SMODE_WOLF_PUZZLE; }
void setGiantPuzzleEnd() { mSpecialMode = 0; }
BOOL checkAutoJumpStart() { return checkResetFlg0(RFLG0_UNK_100); }
BOOL checkAutoJumpStart() const { return checkResetFlg0(RFLG0_UNK_100); }
};
int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4);
+8 -5
View File
@@ -446,12 +446,15 @@ public:
/* 0x000 */ camera_class* field_0x0;
#if VERSION == VERSION_SHIELD_DEBUG
// In the debug rom, there's D8 bytes preceeding the following members.
// The following is a stopgap:
u8 mFillerBytes[0xD8];
cXyz dbg_field_0x04[16];
u8 dbg_field_c4[0xDC - 0xC4];
#endif
/* 0x004 */ int mRoomNo;
/* 0x008 */ u8 field_0x8[0x20 - 0x8];
struct {
/* 0x00 */ int mRoomNo;
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ cXyz field_0x10;
}
/* 0x004 */ field_0x004;
/* 0x020 */ u8 field_0x20;
/* 0x021 */ u8 field_0x21;
/* 0x022 */ u8 field_0x22[2];