mirror of
https://github.com/zeldaret/tp
synced 2026-08-08 10:34:08 -04:00
add wii usa rev0 support (#2505)
* wii usa rev0 dol building ok * wii dol cleanup * some wii tests * most rels building
This commit is contained in:
@@ -315,11 +315,11 @@ public:
|
||||
/* 0x49C */ dAttCatch_c mCatghTarget;
|
||||
/* 0x4B4 */ dAttLook_c mLookTarget;
|
||||
/* 0x4C4 */ int mAttnBlockTimer;
|
||||
#ifdef DEBUG
|
||||
#if PLATFORM_WII || PLATFORM_SHIELD
|
||||
/* 0x4C8 */ u8 field_0x4c8[0x4D0 - 0x4C8];
|
||||
#endif
|
||||
/* 0x4C8 */ dAttParam_c mAttParam;
|
||||
#ifdef DEBUG
|
||||
#if PLATFORM_WII || PLATFORM_SHIELD
|
||||
/* 0x51C */ u8 field_0x50c[0x520 - 0x51C];
|
||||
#else
|
||||
/* 0x50C */ u8 field_0x50c[0x514 - 0x50c];
|
||||
|
||||
@@ -215,7 +215,7 @@ public:
|
||||
/* 0x04F47 */ u8 field_0x4f47[2];
|
||||
/* 0x04F49 */ u8 mDirection;
|
||||
/* 0x04F4A */ u8 field_0x4f4a;
|
||||
#ifdef DEBUG
|
||||
#if PLATFORM_WII || PLATFORM_SHIELD
|
||||
/* 0x04FE3 */ u8 unk_0x4fe3;
|
||||
#endif
|
||||
/* 0x04F4B */ u8 field_0x4f4b; // related to itemInit
|
||||
@@ -772,6 +772,9 @@ public:
|
||||
/* 0x04780 */ dAttention_c mAttention;
|
||||
/* 0x04C9C */ dVibration_c mVibration;
|
||||
/* 0x04D2C */ u8 field_0x4d2c[4];
|
||||
#if PLATFORM_WII
|
||||
/* 0x04D38 */ u8 unk_0x4d38[8];
|
||||
#endif
|
||||
/* 0x04D30 */ JKRArchive* mFieldMapArchive2;
|
||||
/* 0x04D34 */ JKRArchive* mMsgArchive[11];
|
||||
/* 0x04D60 */ JKRArchive* mDemoMsgArchive;
|
||||
@@ -1817,6 +1820,10 @@ inline s16 dComIfGs_getTurnRestartAngleY() {
|
||||
return g_dComIfG_gameInfo.info.getTurnRestart().getAngleY();
|
||||
}
|
||||
|
||||
inline s8 dComIfGs_getTurnRestartRoomNo() {
|
||||
return g_dComIfG_gameInfo.info.getTurnRestart().getRoomNo();
|
||||
}
|
||||
|
||||
inline u32 dComIfGs_getRestartRoomParam() {
|
||||
return g_dComIfG_gameInfo.info.getRestart().getRoomParam();
|
||||
}
|
||||
|
||||
+1
-1
@@ -174,7 +174,7 @@ public:
|
||||
/* 0x128 */ u8 mCompulsory;
|
||||
/* 0x129 */ bool mRoomInfoSet;
|
||||
/* 0x12C */ int mRoomNo;
|
||||
#ifdef DEBUG
|
||||
#if PLATFORM_WII || PLATFORM_SHIELD
|
||||
/* 0x130 */ u8 field_0x130;
|
||||
#endif
|
||||
}; // Size = 0x130
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
#ifndef D_HOME_BUTTON_H
|
||||
#define D_HOME_BUTTON_H
|
||||
|
||||
#include <revolution/hbm.h>
|
||||
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
|
||||
|
||||
class dHomeButton_c {
|
||||
public:
|
||||
void create_(int, void*);
|
||||
int execute_();
|
||||
void initHomeButtonInfo(int, void*);
|
||||
void initCursorPos();
|
||||
void calcCursorPos();
|
||||
void onReset();
|
||||
void create(int, void*);
|
||||
int execute();
|
||||
void drawCapture(u8, void (*)(J2DOrthoGraph&, void*), void*);
|
||||
|
||||
/* 0x00 */ HBMDataInfo m_info;
|
||||
};
|
||||
|
||||
#endif /* D_HOME_BUTTON_H */
|
||||
+796
-792
File diff suppressed because it is too large
Load Diff
@@ -835,6 +835,7 @@ public:
|
||||
u32 getParam() const { return mParam; }
|
||||
cXyz& getPos() { return mPosition; }
|
||||
s16 getAngleY() const { return mAngleY; }
|
||||
s8 getRoomNo() const { return unk18; }
|
||||
|
||||
f32 getCameraFvy() const { return mCameraFvy; }
|
||||
void setCameraFvy(f32 i_fvy) { mCameraFvy = i_fvy; }
|
||||
|
||||
@@ -1277,6 +1277,10 @@ dStage_KeepDoorInfo* dStage_GetKeepDoorInfo();
|
||||
dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo();
|
||||
void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage);
|
||||
|
||||
#if VERSION == VERSION_WII_USA_R0
|
||||
void dStage_escapeRestart();
|
||||
#endif
|
||||
|
||||
inline s32 dStage_roomRead_dt_c_ChkBg(u8 param_0) {
|
||||
return param_0 & 0x80;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user