diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-05-28 10:21:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-28 00:21:28 -0700 |
| commit | fcb6ae541fa4773b2db436e85daa9cdbb9ae45a5 (patch) | |
| tree | d5a67cd217fa0d593f714d766c3b9dee8ca754c2 /include/d | |
| parent | 2baa07dbf6452e8dc5d241c6d5982be1df354e61 (diff) | |
setFadeColor fix, some d_msg_flow functions (#339)
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 5 | ||||
| -rw-r--r-- | include/d/d_model.h | 2 | ||||
| -rw-r--r-- | include/d/file/d_file_select.h | 4 | ||||
| -rw-r--r-- | include/d/s/d_s_logo.h | 3 | ||||
| -rw-r--r-- | include/d/save/d_save.h | 2 |
5 files changed, 12 insertions, 4 deletions
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index e03010cf77..9b5384406c 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -1744,6 +1744,11 @@ static dAttCatch_c* dComIfGp_att_getCatghTarget(); static void dComIfGp_setBottleStatus(u8 param_0, u8 param_1); bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle); + +inline void dComIfGp_itemDataInit() { + g_dComIfG_gameInfo.play.itemInit(); +} + inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); } diff --git a/include/d/d_model.h b/include/d/d_model.h index 2a68d5bf39..4623c46053 100644 --- a/include/d/d_model.h +++ b/include/d/d_model.h @@ -46,7 +46,7 @@ public: /* 8009C8D8 */ dMdl_c* entry(J3DModelData*, u16, int); /* 8009C7AC */ static void create(); /* 8009C864 */ void remove(); - /* 8009C8C0 */ void reset(); + /* 8009C8C0 */ static void reset(); static dMdl_mng_c* m_myObj; diff --git a/include/d/file/d_file_select.h b/include/d/file/d_file_select.h index b1113c2011..5c274e7574 100644 --- a/include/d/file/d_file_select.h +++ b/include/d/file/d_file_select.h @@ -395,8 +395,8 @@ public: /* 0x0250 */ char* field_0x0250; /* 0x0254 */ STControl* mStick; /* 0x0258 */ u8 mDataNew[3]; - /* 0x025B */ u8 field_0x025b; - /* 0x025C */ u8 field_0x025c[0x0264 - 0x025C]; + /* 0x025B */ u8 field_0x025b[3]; + /* 0x025C */ u8 field_0x025e[0x0264 - 0x025E]; /* 0x0264 */ u8 field_0x0264; /* 0x0265 */ u8 mSelectNum; /* 0x0266 */ u8 field_0x0266; diff --git a/include/d/s/d_s_logo.h b/include/d/s/d_s_logo.h index 9f6502979c..a4d5f249cb 100644 --- a/include/d/s/d_s_logo.h +++ b/include/d/s/d_s_logo.h @@ -39,6 +39,7 @@ public: /* 0xF */ EXEC_SCENE_CHANGE, }; + dScnLogo_c() {} /* 802560B4 */ void preLoad_dyl_create(); /* 802560F8 */ void preLoad_dyl_remove(); /* 8025611C */ bool preLoad_dyl(); @@ -128,4 +129,6 @@ static int phase_0(dScnLogo_c* logo); static int phase_1(dScnLogo_c* logo); static int phase_2(dScnLogo_c* logo); +typedef int (*dScnLogo_Method)(dScnLogo_c*);; + #endif /* D_S_D_S_LOGO_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index fa3f80cdea..f5934842ce 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1111,7 +1111,7 @@ public: void removeZone(int zoneNo) { mZone[zoneNo].reset(); } void setNoFile(u8 file) { mNoFile = file; } u8 getNewFile() const { return mNewFile; } - void setNewFile(u8 file) { mNewFile |= file; } + void setNewFile(u8 file) { mNewFile = file; } static const int MEMORY_SWITCH = 0x80; static const int DAN_SWITCH = 0x40; |