setFadeColor fix, some d_msg_flow functions (#339)

This commit is contained in:
hatal175
2023-05-28 10:21:28 +03:00
committed by GitHub
parent 2baa07dbf6
commit fcb6ae541f
29 changed files with 166 additions and 686 deletions
+5
View File
@@ -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);
}
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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;
+3
View File
@@ -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 */
+1 -1
View File
@@ -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;