mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-09 18:57:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge in changes to main

Browse Source
This commit is contained in:
WilliamArnett
2025-05-22 01:23:45 -05:00
parent 37d7ef5b07 936a47461d
commit e96ca610be
1459 changed files with 100421 additions and 4518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/DynamicLink.h
+10 -1
View File
@@ -18,12 +18,16 @@ struct DynamicModuleControlBase {
virtual const char* getModuleName() const { return NULL; }
virtual int getModuleSize() const { return 0; }
virtual const char* getModuleTypeString() const { return "Base"; }
#if VERSION == VERSION_DEMO
static void dump();
#else
#if __MWERKS__ && __MWERKS__ < 0x4200
// This is illegal function overloading, but MWCC for GC allows it. MWCC for Wii does not.
virtual void dump();
#endif
static void dump();
virtual void dump2() {}
#endif
virtual bool do_load() { return true; }
virtual BOOL do_load_async() { return TRUE; }
virtual bool do_unload() { return true; }
@@ -48,7 +52,9 @@ struct DynamicModuleControl : DynamicModuleControlBase {
virtual const char* getModuleName() const { return mName; }
virtual int getModuleSize() const;
virtual const char* getModuleTypeString() const;
#if VERSION != VERSION_DEMO
virtual void dump2();
#endif
virtual bool do_load();
virtual BOOL do_load_async();
virtual bool do_unload();
@@ -56,6 +62,7 @@ struct DynamicModuleControl : DynamicModuleControlBase {
virtual bool do_unlink();
DynamicModuleControl(char const*);
static JKRArchive* mountCallback(void*);
static void mountCreate();
static bool initialize();
static bool callback(void*);
@@ -66,12 +73,14 @@ struct DynamicModuleControl : DynamicModuleControlBase {
/* 0x20 */ u8 mResourceType;
/* 0x21 */ u8 unk_33;
/* 0x22 */ u16 mChecksum;
#if VERSION != VERSION_DEMO
/* 0x24 */ s32 mSize;
#endif
/* 0x28 */ mDoDvdThd_callback_c* mAsyncLoadCallback;
static u32 sAllocBytes;
static JKRArchive* sArchive;
static JKRFileCache* sFileCache;
};
}; // Size: 0x2C
#endif /* DYNAMICLINK_H */
include/JAZelAudio/JAIZelBasic.h
+3 -3
View File
@@ -202,7 +202,7 @@ public:
/* 0x0021 */ u8 field_0x0021;
/* 0x0022 */ u8 field_0x0022[0x0024 - 0x0022];
/* 0x0024 */ u8* field_0x0024;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x0028 */ int field_0x0028;
#endif
/* Offsets below are for USA/PAL */
@@ -228,7 +228,7 @@ public:
/* 0x0054 */ Vec field_0x0054;
/* 0x0060 */ u8 mbLandingDemoStarted;
/* 0x0061 */ u8 field_0x0061;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x0062 */ u8 field_0x0062;
#endif
/* 0x0063 */ u8 field_0x0063;
@@ -266,7 +266,7 @@ public:
/* 0x00BC */ u8 field_0x00bc;
/* 0x00BD */ u8 field_0x00bd;
/* 0x00BE */ u8 field_0x00be;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x00BF */ u8 field_0x00bf;
#endif
/* 0x00C0 */ u8 field_0x00c0;
include/JSystem/J2DGraph/J2DPane.h
+5 -2
View File
@@ -91,9 +91,12 @@ public:
void getBounds() {}
void getGlbBounds() {}
void getRotate() const {}
f32 getRotate() const { return mRotation; }
void place(const JGeometry::TBox2<f32>&) {}
void rotate(f32) {}
void rotate(f32 angle) {
mRotation = angle;
calcMtx();
}
void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) {
mBasePosition.x = offsetX;
mBasePosition.y = offsetY;
include/JSystem/J2DGraph/J2DTextBox.h
+2 -1
View File
@@ -52,7 +52,8 @@ public:
void setCharColor(JUtility::TColor c) { mCharColor.set(c); }
void setGradColor(JUtility::TColor c) { mGradColor.set(c); }
void setBlack(JUtility::TColor c) { mBlack = c; }
void setWhite(JUtility::TColor c) { mBlack = c; }
void setWhite(JUtility::TColor c) { mWhite = c; }
void setLineSpace(f32 x) { mLineSpace = x; }
f32 getLineSpace() const { return mLineSpace; }
f32 getCharSpace() const { return mCharSpace; }
include/JSystem/JAudio/JAISequenceMgr.h
+1 -1
View File
@@ -94,7 +94,7 @@ namespace JAInter {
/* 0x0660 */ MoveParaSet mTrackPitches[32];
/* 0x0860 */ MoveParaSetInitZero mTrackFxmixes[32];
/* 0x0A60 */ MoveParaSetInitZero mTrackDolbys[32];
/* 0x0C60 */ MoveParaSet field_0xc60[32];
/* 0x0C60 */ MoveParaSetInitZero field_0xc60[32];
/* 0x0E60 */ u8 field_0xe60[0x1261 - 0xe60];
/* 0x1261 */ u8 field_0x1261;
/* 0x1262 */ u8 field_0x1262[0x1268 - 0x1262];
include/JSystem/JKernel/JKRFileCache.h
+4
View File
@@ -63,4 +63,8 @@ inline JKRFileCache* JKRMountDvdDrive(const char* path, JKRHeap* heap, const cha
return JKRFileCache::mount(path, heap, param_2);
}
inline void JKRUnmountDvdDrive(JKRFileCache* cache) {
cache->unmount();
}
#endif /* JKRFILECACHE_H */
include/JSystem/JUtility/JUTAssert.h
+1 -1
View File
@@ -6,7 +6,7 @@
#define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND)
#define JUT_ASSERT(LINE, COND) (void)((COND) || (JUT_SHOW_ASSERT(LINE, COND), OSPanic(__FILE__, LINE, "Halt"), 0));
#define JUT_ASSERT(LINE, COND) (COND) ? (void)0 : (JUT_SHOW_ASSERT(LINE, COND), OSPanic(__FILE__, LINE, "Halt"));
// Favored by JAI (JAudio)
#define JUT_ASSERT_MSG(LINE, COND, MSG) \
include/JSystem/JUtility/JUTException.h
+6 -4
View File
@@ -34,6 +34,8 @@ STATIC_ASSERT(sizeof(JUTExternalFB) == 0x14);
#define JUT_PRINT_FLOAT 8
#define JUT_PRINT_STACK 16
typedef void (*JUTExceptionUserCallback)(OSError, OSContext*, u32, u32);
class JUTException : public JKRThread {
public:
enum EInfoPage {
@@ -79,8 +81,8 @@ public:
static void panic_f(char const*, int, char const*, ...);
static void setFPException(u32);
static bool searchPartialModule(u32, u32*, u32*, u32*, u32*);
static OSErrorHandler setPreUserCallback(OSErrorHandler);
static OSErrorHandler setPostUserCallback(OSErrorHandler);
static JUTExceptionUserCallback setPreUserCallback(JUTExceptionUserCallback);
static JUTExceptionUserCallback setPostUserCallback(JUTExceptionUserCallback);
static void appendMapFile(char const*);
static bool queryMapAddress(char*, u32, s32, u32*, u32*, char*, u32, bool, bool);
static bool queryMapAddress_single(char*, u32, s32, u32*, u32*, char*, u32, bool,
@@ -109,8 +111,8 @@ private:
static JSUList<JUTException::JUTExMapFile> sMapFileList;
static OSMessage sMessageBuffer[1];
static JUTException* sErrorManager;
static OSErrorHandler sPreUserCallback;
static OSErrorHandler sPostUserCallback;
static JUTExceptionUserCallback sPreUserCallback;
static JUTExceptionUserCallback sPostUserCallback;
static void* sConsoleBuffer;
static u32 sConsoleBufferSize;
static JUTConsole* sConsole;
include/SSystem/SComponent/c_bg_s.h
+1 -3
View File
@@ -2,11 +2,9 @@
#define C_BG_S_H
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "SSystem/SComponent/c_m3d.h"
#include "dolphin/types.h"
#define C_BG_MIN_HEIGHT (-1e+9f)
#define C_BG_MAX_HEIGHT (1e+9f)
class fopAc_ac_c;
class cBgS_ShdwDraw;
class cBgS_LinChk;
include/SSystem/SComponent/c_m3d.h
+5
View File
@@ -19,6 +19,11 @@ class cXyz;
struct Vec;
extern const f32 G_CM3D_F_ABS_MIN;
#if VERSION == VERSION_DEMO
extern const f32 G_CM3D_F_INF;
#else
#define G_CM3D_F_INF 1e+9f
#endif
extern const u32 BPCP_OUTCODE0;
extern const u32 BPCP_OUTCODE1;
include/SSystem/SComponent/c_m3d_g_aab.h
+3 -4
View File
@@ -1,10 +1,9 @@
#ifndef C_M3D_G_AAB_H
#define C_M3D_G_AAB_H
#include "SSystem/SComponent/c_bg_s.h"
#include "SSystem/SComponent/c_xyz.h"
#include "SSystem/SComponent/c_m3d.h"
#include "SSystem/SComponent/c_m3d_g_lin.h"
#include "SSystem/SComponent/c_xyz.h"
#include "global.h"
// Axis aligned bounding box
@@ -62,8 +61,8 @@ public:
mMax.x = -1000000000.0f;
}
void ClearForMinMaxY() {
mMin.y = C_BG_MAX_HEIGHT;
mMax.y = C_BG_MIN_HEIGHT;
mMin.y = G_CM3D_F_INF;
mMax.y = -G_CM3D_F_INF;
}
void SetMinMaxY(f32 y) {
if (mMin.y > y) {
include/SSystem/SComponent/c_m3d_g_cyl.h
+6
View File
@@ -25,9 +25,15 @@ public:
cM3dGCyl() {}
cM3dGCyl(const cXyz*, f32, f32);
virtual ~cM3dGCyl() {}
#if VERSION == VERSION_DEMO
void SetC(const cXyz& pos) { mCenter = pos; }
void SetH(f32 h) { mHeight = h; }
void SetR(f32 r) { mRadius = r; }
#else
void SetC(const cXyz& pos);
void SetH(f32 h);
void SetR(f32 r);
#endif
void Set(const cM3dGCylS & src) {
SetC(src.mCenter);
SetR(src.mRadius);
include/c/c_damagereaction.h
+4 -4
View File
@@ -17,7 +17,7 @@ public:
/* 0x007 */ u8 m007[0x008 - 0x007];
/* 0x008 */ f32 mYOffset;
/* 0x00C */ s8 m00C;
/* 0x00D */ s8 mState;
/* 0x00D */ s8 mMode;
/* 0x00E */ s16 mFreezeTimer;
/* 0x010 */ s16 mMoveDelayTimer;
/* 0x012 */ s16 mAngleY;
@@ -46,7 +46,7 @@ struct enemyfire {
public:
/* 0x000 */ fopAc_ac_c* mpActor;
/* 0x004 */ s16 mFireDuration;
/* 0x006 */ s8 mState;
/* 0x006 */ s8 mMode;
/* 0x007 */ u8 m007[0x008 - 0x007];
/* 0x008 */ s16 mFireTimer;
/* 0x00A */ u8 m00A[0x00C - 0x00A];
@@ -77,8 +77,8 @@ public:
};
/* 0x000 */ fopEn_enemy_c* mpEnemy;
/* 0x004 */ s16 m004;
/* 0x006 */ s16 mState;
/* 0x004 */ s16 mMode;
/* 0x006 */ s16 mAction;
/* 0x008 */ s16 mEnemyType;
/* 0x00A */ u8 m00A[0x00C - 0x00A];
/* 0x00C */ int mTimer;
include/d/actor/d_a_agb.h
+3 -3
View File
@@ -60,7 +60,7 @@ public:
/* 0x6 */ UpAct_UNK6,
/* 0x7 */ UpAct_UNK7,
/* 0x8 */ UpAct_UNK8,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x9 */ UpAct_UNK9,
#endif
/* 0xA */ UpAct_UNKA,
@@ -172,7 +172,7 @@ public:
static int mEffect;
static daAgb_ItemBuy mItemBuy;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
static daAgb_GbaFlg mGbaFlg;
static daAgb_Switch mSwitch;
static daAgb_Item mItem;
@@ -241,7 +241,7 @@ public:
/* 0x628 */ f32 field_0x628;
/* 0x62C */ f32 field_0x62c;
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
/* 0x630 */ daAgb_Switch mSwitch;
/* 0x638 */ daAgb_Item mItem;
/* 0x63C */ daAgb_Shop mShop;
include/d/actor/d_a_agbsw0.h
+1 -1
View File
@@ -54,7 +54,7 @@ public:
BOOL ExeSubM();
BOOL ExeSubM2();
BOOL ExeSubM3();
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
u32 TriforceCheck();
#else
u32 TriforceCheck(daAgb_c*);
include/d/actor/d_a_am.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
/* 0x02C2 */ u8 mStartsInactive;
/* 0x02C3 */ u8 mSwitch;
/* 0x02C4 */ u8 mAction;
/* 0x02C5 */ u8 mState;
/* 0x02C5 */ u8 mMode;
/* 0x02C6 */ u8 mHugeKnockback;
/* 0x02C7 */ bool mbIsBodyBeingHit;
/* 0x02C8 */ s16 mCountDownTimers[4];
include/d/actor/d_a_am2.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
/* 0x2CA */ u8 mStartsInactive;
/* 0x2CB */ u8 mSwitch;
/* 0x2CC */ u8 mAction;
/* 0x2CD */ u8 mState;
/* 0x2CD */ u8 mMode;
/* 0x2CE */ u8 m2CE;
/* 0x2CF */ bool mbIsWeakBeingHit;
/* 0x2D0 */ bool mbNotInHomeRoom;
include/d/actor/d_a_btd.h
+3 -1
View File
@@ -6,7 +6,9 @@
class btd_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x0290 */ u8 field_0x290[0x6e16 - 0x290];
/* 0x0290 */ u8 field_0x290[0x2e4 - 0x290];
/* 0x02E4 */ s16 field_0x2e4;
/* 0x02E6 */ u8 field_0x2e6[0x6e16 - 0x2e6];
/* 0x6E16 */ s16 field_0x6e16;
};
include/d/actor/d_a_demo_item.h
+7
View File
@@ -9,6 +9,13 @@ class JPABaseEmitter;
class daDitem_c : public daItemBase_c {
public:
enum ArgFlag {
FLAG_UNK01 = 0x01,
FLAG_UNK02 = 0x02,
FLAG_UNK04 = 0x04,
FLAG_UNK08 = 0x08,
};
BOOL chkArgFlag(u8 flag) { return mArgFlag & flag; }
void clrFlag() { cLib_setBit(mFlag, (u8)0); }
void setOffsetPos(cXyz pos) { mOffsetPos = pos; }
include/d/actor/d_a_dr.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
/* 0x290 */ u8 m290[0x2AC - 0x290];
/* 0x2AC */ request_of_phase_process_class mPhs;
/* 0x2B4 */ mDoExt_McaMorf* mpMorf;
/* 0x2B8 */ u8 mState;
/* 0x2B8 */ u8 mMode;
/* 0x2B9 */ u8 m2B9[0x2BA - 0x2B9];
/* 0x2BA */ s16 mCountDownTimers[3];
/* 0x2C0 */ int mCurrBckIdx;
include/d/actor/d_a_dr2.h
+5 -1
View File
@@ -5,7 +5,11 @@
class dr2_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x290 */ u8 field_0x290[0x3B0 - 0x290];
/* 0x3B0 */ cXyz field_0x3B0;
/* 0x3BC */ u8 field_0x3BC[0x4BA - 0x3BC];
/* 0x4BA */ s16 field_0x4BA;
/* 0x4BC */ u8 field_0x4BC[0x50C - 0x4BC];
};
class daDr2_HIO_c {
include/d/actor/d_a_fganon.h
+2 -2
View File
@@ -30,8 +30,8 @@ public:
/* 0x2D1 */ u8 m2D1[0x2D4 - 0x2D1];
/* 0x2D4 */ dKy_tevstr_c mKenTevStr;
/* 0x384 */ s16 m384;
/* 0x386 */ s16 m386;
/* 0x388 */ s16 m388;
/* 0x386 */ s16 mAction;
/* 0x388 */ s16 mMode;
/* 0x38A */ s16 m38A;
/* 0x38C */ cXyz m38C;
/* 0x398 */ s16 m398;
include/d/actor/d_a_hys.h
+17 -1
View File
@@ -19,8 +19,24 @@ public:
void mode_wait_init();
virtual BOOL Draw();
static const char* m_arcname[];
static const s16 m_bdlidx[];
static const s16 m_btpidx[];
static const s16 m_dzbidx[];
static const u32 m_heapsize[];
static const f32 m_tg_r[];
public:
/* Place member variables here */
/* 0x2C8 */ request_of_phase_process_class mPhs;
/* 0x2D0 */ J3DModel* mpModel;
/* 0x2D4 */ mDoExt_btpAnm mBtpAnm;
/* 0x2E8 */ dCcD_Stts mStts;
/* 0x324 */ dCcD_Sph mSph;
/* 0x450 */ u32 field_0x450;
/* 0x454 */ u32 mSwitchNo;
/* 0x458 */ u8 field_0x458;
/* 0x459 */ u8 mType;
/* 0x45A */ u8 field_0x45A[0x45C - 0x45A];
};
#endif /* D_A_HYS_H */
include/d/actor/d_a_kamome2.h
+12
View File
@@ -0,0 +1,12 @@
#ifndef D_A_KAMOME2_H
#define D_A_KAMOME2_H
#include "f_op/f_op_actor.h"
class kamome2_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x290 */ u8 m290[0x690 - 0x290];
}; // Size: 0x690
#endif /* D_A_KAMOME2_H */
include/d/actor/d_a_kita.h
+44 -2
View File
@@ -1,11 +1,53 @@
#ifndef D_A_KITA_H
#define D_A_KITA_H
#include "JSystem/JParticle/JPAEmitter.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_w.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor.h"
class kita_class : public fopAc_ac_c {
public:
/* Place member variables here */
public: // Methods
kita_class() {};
public: // Attributes
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ short mMoveCounter;
/* 0x29A */ short field_29A;
/* 0x29C */ J3DModel* mModel;
/* 0x2A0 */ u8 field_2A0;
/* 0x2A1 */ u8 field_2A1;
/* 0x2A4 */ cXyz mPosRel;
/* 0x2A8 */ cXyz field_2B0;
/* 0x2B4 */ cXyz field_2BC;
/* 0x2C8 */ csXyz field_2C8;
/* 0x2D0 */ float mHeight;
/* 0x2D4 */ fpc_ProcID field_2D4[4];
/* 0x2E4 */ u8 field_2E4[4];
/* 0x2E8 */ cXyz field_2E8[4];
/* 0x318 */ u8 field_318[4];
/* 0x31C */ short mRotY;
/* 0x31E */ short mRotX;
/* 0x320 */ float field_320;
/* 0x324 */ int unused_324;
/* 0x328 */ Mtx mBgwMtx;
/* 0x358 */ dBgW* pm_bgw;
/* 0x35C */ float field_35C;
/* 0x360 */ u8 field_360;
/* 0x362 */ short mPlayerAngle;
/* 0x364 */ float field_364;
/* 0x368 */ float mAngleYSpeed;
/* 0x36C */ float field_36C;
/* 0x370 */ float field_370;
/* 0x374 */ short field_374;
/* 0x376 */ short mExecuteCount;
/* 0x378 */ JPABaseEmitter* mBaseEmitter;
/* 0x37C */ dCcD_Stts mStts;
/* 0x3B8 */ dCcD_Sph mSph;
/* 0x4E4 */ dBgS_AcchCir mAcchCir;
/* 0x524 */ dBgS_ObjAcch mAcch;
};
#endif /* D_A_KITA_H */
include/d/actor/d_a_ks.h
+2 -2
View File
@@ -20,8 +20,8 @@ public:
/* 0x2C8 */ u8 m2C8;
/* 0x2C9 */ u8 m2C9;
/* 0x2CA */ u8 m2CA;
/* 0x2CB */ u8 m2CB;
/* 0x2CC */ u8 m2CC;
/* 0x2CB */ u8 mAction;
/* 0x2CC */ u8 mMode;
/* 0x2CD */ u8 m2CD;
/* 0x2CE */ u8 m2CE;
/* 0x2CF */ u8 m2CF;
include/d/actor/d_a_kt.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
/* 0x308 */ cXyz mHomePos;
/* 0x314 */ s16 mTimer[3];
/* 0x31A */ s16 mAngleRoll;
/* 0x31C */ s8 mState;
/* 0x31C */ s8 mMode;
/* 0x31D */ u8 field_0x31d;
/* 0x31E */ bool mHitGround;
/* 0x31E */ u8 field_0x31f;
include/d/actor/d_a_kui.h
+25 -1
View File
@@ -3,9 +3,33 @@
#include "f_op/f_op_actor.h"
class dBgW;
class kui_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel2;
/* 0x29C */ J3DModel* mpModel;
/* 0x2A0 */ u8 type;
/* 0x2A1 */ u8 field_0x2A1;
/* 0x2A2 */ u8 field_0x2A2;
/* 0x2A3 */ u8 mSwitchNo;
/* 0x2A4 */ u8 field_0x2A4[0x2A8 - 0x2A4];
/* 0x2A8 */ Mtx field_0x2A8;
/* 0x2D8 */ dBgW* field_0x2D8;
/* 0x2DC */ s16 field_0x2DC[3];
/* 0x2E2 */ s16 field_0x2E2;
/* 0x2E4 */ s16 field_0x2E4;
/* 0x2E6 */ s16 field_0x2E6;
/* 0x2E8 */ s8 field_0x2E8;
/* 0x2E9 */ u8 field_0x2E9[0x2EA - 0x2E9];
/* 0x2EA */ s16 field_0x2EA;
/* 0x2EC */ cXyz field_0x2EC;
/* 0x2F8 */ cXyz field_0x2F8;
/* 0x304 */ u8 field_0x304[0x308 - 0x304];
/* 0x308 */ s16 field_0x308;
/* 0x30A */ u8 field_0x30A[0x30C - 0x30A];
/* 0x30C */ f32 field_0x30C;
};
#endif /* D_A_KUI_H */
include/d/actor/d_a_npc_ba1.h
+1 -1
View File
@@ -108,7 +108,7 @@ public:
public:
/* 0x290 */ u8 m290[0x7F8 - 0x290];
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x7F8 */ u8 m7F8;
#endif
/* Offsets below are for USA/PAL */
include/d/actor/d_a_obj_eskban.h
-4
View File
@@ -1,11 +1,7 @@
#ifndef D_A_OBJ_ESKBAN_H
#define D_A_OBJ_ESKBAN_H
#include "f_op/f_op_actor.h"
#include "d/d_a_obj.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_particle.h"
namespace daObjEskban {
include/d/actor/d_a_obj_ladder.h
+1 -3
View File
@@ -1,10 +1,8 @@
#ifndef D_A_OBJ_LADDER_H
#define D_A_OBJ_LADDER_H
#include "d/d_a_obj.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor.h"
#include "d/d_bg_s_gnd_chk.h"
namespace daObjLadder {
enum Type_e {
include/d/actor/d_a_obj_movebox.h
+2 -3
View File
@@ -1,14 +1,13 @@
#ifndef D_A_OBJ_MOVEBOX_H
#define D_A_OBJ_MOVEBOX_H
#include "d/d_a_obj.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_bg_s_gnd_chk.h"
#include "d/d_bg_s_wtr_chk.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_particle.h"
#include "d/d_bg_w.h"
#include "d/d_path.h"
struct dPath;
namespace daObjMovebox {
class Act_c;
include/d/actor/d_a_obj_mtest.h
-3
View File
@@ -1,10 +1,7 @@
#ifndef D_A_OBJ_MTEST_H
#define D_A_OBJ_MTEST_H
#include "f_op/f_op_actor.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "d/d_a_obj.h"
namespace daObjMtest {
class Act_c : public dBgS_MoveBgActor {
include/d/actor/d_a_obj_swhammer.h
-2
View File
@@ -1,9 +1,7 @@
#ifndef D_A_OBJ_SWHAMMER_H
#define D_A_OBJ_SWHAMMER_H
#include "d/d_a_obj.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_particle.h"
class J3DNode;
include/d/actor/d_a_player_main.h
+1 -1
View File
@@ -326,7 +326,7 @@ public:
/* 0x030 */ f32 field_0x030;
/* 0x034 */ dBgS_LinkGndChk field_0x034;
/* 0x088 */ Mtx field_0x088[3];
};
}; // Size: 0x118
struct daPy_aura_c {
public:
include/d/actor/d_a_pw.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
/* 0x359 */ u8 mPathIndex;
/* 0x35A */ u8 m35A[0x366 - 0x35A];
/* 0x366 */ s16 mAction;
/* 0x368 */ s16 mState;
/* 0x368 */ s16 mMode;
/* 0x36A */ u8 m36A[0x36C - 0x36A];
/* 0x36C */ fpc_ProcID mJalhallaID;
/* 0x370 */ fpc_ProcID mKanteraID;
include/d/actor/d_a_tag_kk1.h
+7 -3
View File
@@ -26,10 +26,14 @@ class daTag_Kk1_HIO_c : public JORReflexible{
virtual ~daTag_Kk1_HIO_c(){};
public:
struct hio_prm_c {
/* 0x08 */ f32 mHorizontalDistance;
/* 0x0C */ f32 mVerticalDistance;
/* 0x10 */ u8 field_0x10;
};
/* 0x04 */ s8 mNo;
/* 0x08 */ f32 mHorizontalDistance;
/* 0x0C */ f32 mVerticalDistance;
/* 0x10 */ u8 mUnusedU8;
/* 0x08 */ hio_prm_c prm;
};
#endif /* D_A_TAG_KK1_H */
include/d/d_bg_s.h
+1 -1
View File
@@ -121,7 +121,7 @@ public:
mWallRadius = 0.0f;
pm_pos = NULL;
pm_old_pos = NULL;
mGroundH = C_BG_MIN_HEIGHT;
mGroundH = -G_CM3D_F_INF;
field_0x60 = 0;
field_0x68 = 20.0f;
field_0x58 = NULL;
include/d/d_bg_s_movebg_actor.h
+7
View File
@@ -3,6 +3,13 @@
#include "SSystem/SComponent/c_bg_s_poly_info.h"
#include "f_op/f_op_actor.h"
// Fakematch to fix weak func order/.text section splitting of some TUs that include this header.
// Some affected TUs: d_a_hys, d_a_obj_swhammer, d_a_obj_eskban, d_a_obj_mtest, d_a_obj_movebox.
#pragma push
#pragma sym off
#include "d/d_a_obj.h"
#include "d/d_particle.h"
#pragma pop
class dBgW;
typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo&, bool, cXyz*, csXyz*, csXyz*);
include/d/d_cam_param.h
+3 -3
View File
@@ -64,7 +64,7 @@ enum dCamStyle_e {
/* 0x37 */ dCamStyle_LW01_e,
/* 0x38 */ dCamStyle_GN01_e,
/* 0x39 */ dCamStyle_MM01_e,
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dCamStyle_MM03_e,
#endif
/* Value comments below are for USA/PAL */
@@ -120,7 +120,7 @@ enum dCamStyle_e {
/* 0x6B */ dCamStyle_FN35_e,
/* 0x6C */ dCamStyle_LL17_e,
/* 0x6D */ dCamStyle_FN37_e,
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dCamStyle_FN38_e,
#endif
/* 0x6E */ dCamStyle_BE08_e,
@@ -155,7 +155,7 @@ enum dCamStyle_e {
/* 0x8B */ dCamStyle_MM22_e,
/* 0x8C */ dCamStyle_MM18_e,
/* 0x8D */ dCamStyle_MM17_e,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x8E */ dCamStyle_MM03_e,
/* 0x8F */ dCamStyle_MM23_e,
/* 0x90 */ dCamStyle_FN38_e,
include/d/d_cc_d.h
+3 -3
View File
@@ -371,7 +371,7 @@ public:
virtual ~dCcD_GObjInf();
virtual cCcD_GObjInf* GetGObjInf();
virtual void ClrAtHit();
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
u32 ChkAtHit();
#endif
void ResetAtHit();
@@ -379,7 +379,7 @@ public:
cCcD_GObjInf* GetAtHitGObj();
u8 ChkAtNoGuard();
virtual void ClrTgHit();
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
u32 ChkTgHit();
#endif
void ResetTgHit();
@@ -387,7 +387,7 @@ public:
dCcD_GObjInf* GetTgHitGObj();
u8 GetTgHitObjSe();
virtual void ClrCoHit();
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
u32 ChkCoHit();
#endif
void ResetCoHit();
include/d/d_com_inf_game.h
+45 -25
View File
@@ -226,7 +226,7 @@ public:
class dComIfG_play_c {
public:
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dComIfG_play_c();
#else
dComIfG_play_c() { ct(); }
@@ -554,7 +554,7 @@ public:
inline u8 getNowVibration() { return mNowVibration; }
inline void setNowVibration(u8 vibration) { mNowVibration = vibration; }
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
// Inline name is fake (not present in JP debug maps), but was guessed based on the similar
// dSv_player_config_c::getPalLanguage() const inline in TP debug.
inline u8 getPalLanguage() { return mPalLanguage; }
@@ -562,10 +562,13 @@ public:
#endif
void setMsgArchive(JKRArchive * pArc) { mpMsgArchive = pArc; }
JKRArchive* getMsgArchive() { return mpMsgArchive; }
#if VERSION > VERSION_DEMO
void setDmsgArchive(JKRArchive * pArc) { mpDmsgArchive = pArc; }
JKRArchive* getDmsgArchive() { return mpDmsgArchive; }
void setTmsgArchive(JKRArchive * pArc) { mpTmsgArchive = pArc; }
JKRArchive* getTmsgArchive() { return mpTmsgArchive; }
#endif
void setTactMsgArchive(JKRArchive * pArc) { mTactMsgArchive = pArc; }
JKRArchive* getTactMsgArchive() { return mTactMsgArchive; }
void setMenuArchive(JKRArchive * pArc) { mpMenuArchive = pArc; }
JKRArchive* getMenuArchive() { return mpMenuArchive; }
void setFont0Archive(JKRArchive * pArc) { mpFont0Archive = pArc; }
@@ -577,10 +580,10 @@ public:
void setLkDArc(JKRArchive * pArc) { mpLkDArc = pArc; }
void setFmapArchive(JKRArchive * pArc) { mpFmapArchive = pArc; }
void setItemResArchive(JKRArchive * pArc) { mpItemResArchive = pArc; }
void setClctResArchive(JKRArchive * pArc) { mpClctResArchive = pArc; }
void setCollectResArchive(JKRArchive * pArc) { mpCollectResArchive = pArc; }
void setFmapResArchive(JKRArchive * pArc) { mpFmapResArchive = pArc; }
void setDmapResArchive(JKRArchive * pArc) { mpDmapResArchive = pArc; }
void setOptResArchive(JKRArchive * pArc) { mpOptResArchive = pArc; }
void setOptionResArchive(JKRArchive * pArc) { mpOptionResArchive = pArc; }
JKRArchive* getClothResArchive() { return mpClothResArchive; }
void setClothResArchive(JKRArchive * pArc) { mpClothResArchive = pArc; }
void setSaveResArchive(JKRArchive * pArc) { mpSaveResArchive = pArc; }
@@ -591,13 +594,13 @@ public:
void setActionIconArchive(JKRArchive * pArc) { mpActionIconArchive = pArc; }
JKRArchive* getActionIconArchive() { return mpActionIconArchive; }
void setScopeResArchive(JKRArchive * pArc) { mpScopeResArchive = pArc; }
void setCamResArchive(JKRArchive * pArc) { mpCamResArchive = pArc; }
void setCameraResArchive(JKRArchive * pArc) { mpCameraResArchive = pArc; }
void setSwimResArchive(JKRArchive * pArc) { mpSwimResArchive = pArc; }
void setWindResArchive(JKRArchive * pArc) { mpWindResArchive = pArc; }
void setFontArchive(JKRArchive * pArc) { mpFont0Archive = pArc; }
void setMsgDtArchive(JKRArchive * pArc) { mpEnglishTextArchive = pArc; }
JKRArchive* getMsgDtArchive() { return mpEnglishTextArchive; }
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
void setMsgDt2Archive(JKRArchive * pArc) { mpHyruleTextArchive = pArc; }
JKRArchive* getMsgDt2Archive() { return mpHyruleTextArchive; }
#endif
@@ -676,8 +679,12 @@ public:
/* 0x4700 */ dVibration_c mVibration;
/* 0x4784 */ dDetect_c mDetect;
/* 0x4798 */ JKRArchive* mpMsgArchive;
#if VERSION > VERSION_DEMO
/* 0x479C */ JKRArchive* mpDmsgArchive;
/* 0x47A0 */ JKRArchive* mpTmsgArchive;
#endif
/* Offsets below are for retail JPN/USA/PAL */
/* 0x47A0 */ JKRArchive* mTactMsgArchive;
/* 0x47A4 */ JKRArchive* mpMenuArchive;
/* 0x47A8 */ JKRArchive* mpFont0Archive;
/* 0x47AC */ JKRArchive* mpFont1Archive;
@@ -685,10 +692,10 @@ public:
/* 0x47B4 */ JKRArchive* mpLkDArc;
/* 0x47B8 */ JKRArchive* mpFmapArchive;
/* 0x47BC */ JKRArchive* mpItemResArchive;
/* 0x47C0 */ JKRArchive* mpClctResArchive;
/* 0x47C0 */ JKRArchive* mpCollectResArchive;
/* 0x47C4 */ JKRArchive* mpFmapResArchive;
/* 0x47C8 */ JKRArchive* mpDmapResArchive;
/* 0x47CC */ JKRArchive* mpOptResArchive;
/* 0x47CC */ JKRArchive* mpOptionResArchive;
/* 0x47D0 */ JKRArchive* mpClothResArchive;
/* 0x47D4 */ JKRArchive* mpSaveResArchive;
/* 0x47D8 */ JKRArchive* mpItemIconArchive;
@@ -696,11 +703,11 @@ public:
/* 0x47E0 */ JKRArchive* mpErrorResArchive;
/* 0x47E4 */ JKRArchive* mpActionIconArchive;
/* 0x47E8 */ JKRArchive* mpScopeResArchive;
/* 0x47EC */ JKRArchive* mpCamResArchive;
/* 0x47EC */ JKRArchive* mpCameraResArchive;
/* 0x47F0 */ JKRArchive* mpSwimResArchive;
/* 0x47F4 */ JKRArchive* mpWindResArchive;
/* 0x47F8 */ JKRArchive* mpEnglishTextArchive;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x47FC */ JKRArchive* mpHyruleTextArchive;
/* 0x4800 */ JKRAramBlock* mPictureBoxData[3];
/* 0x480C */ JKRAramBlock* mBossBattleData[4];
@@ -804,7 +811,7 @@ public:
/* 0x4961 */ u8 field_0x4961;
/* 0x4962 */ u8 mHeapLockFlag;
/* 0x4963 */ u8 mNowVibration;
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x4964 */ u8 mPalLanguage;
#endif
/* 0x4965 */ u8 field_0x4965;
@@ -840,7 +847,7 @@ public:
class dComIfG_inf_c {
public:
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
dComIfG_inf_c();
#else
dComIfG_inf_c() { ct(); }
@@ -858,7 +865,7 @@ public:
/* 0x1D1C1 */ u8 mBrightness;
};
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
STATIC_ASSERT(sizeof(dComIfG_inf_c) == 0x1D1C8);
#endif
@@ -1142,6 +1149,10 @@ inline void dComIfGs_offCompleteCollectMap(int i_no) {
g_dComIfG_gameInfo.save.getPlayer().getMap().offCompleteMap(i_no - 1);
}
inline s32 dComIfGs_getCollectMapNum() {
return g_dComIfG_gameInfo.save.getPlayer().getMap().getCollectMapNum();
}
inline void dComIfGs_onSaveArriveGridForAgb(int i_no) {
g_dComIfG_gameInfo.save.getPlayer().getMap().onSaveArriveGridForAgb(i_no);
}
@@ -1298,6 +1309,10 @@ inline s16 dComIfGs_getRestartOptionAngleY() {
return g_dComIfG_gameInfo.save.getRestart().getRestartOptionAngleY();
}
inline f32 dComIfGs_getLastSceneSpeedF() {
return g_dComIfG_gameInfo.save.getRestart().getLastSpeedF();
}
inline u32 dComIfGs_getLastSceneMode() {
return g_dComIfG_gameInfo.save.getRestart().getLastMode();
}
@@ -1351,6 +1366,7 @@ inline s16 dComIfGs_getTurnRestartShipAngleY() {
return g_dComIfG_gameInfo.save.getTurnRestart().getShipAngleY();
}
#if VERSION > VERSION_DEMO
// The "HasShip" name is fake. These inlines don't exist in the demo, but must exist in the final release.
inline BOOL dComIfGs_getTurnRestartHasShip() {
return g_dComIfG_gameInfo.save.getTurnRestart().getHasShip();
@@ -1359,6 +1375,7 @@ inline BOOL dComIfGs_getTurnRestartHasShip() {
inline void dComIfGs_setTurnRestartHasShip(BOOL hasShip) {
g_dComIfG_gameInfo.save.getTurnRestart().setHasShip(hasShip);
}
#endif
inline void dComIfGs_setTurnRestart(const cXyz& i_pos, s16 i_angle, s8 i_roomNo, u32 i_param) {
g_dComIfG_gameInfo.save.getTurnRestart().set(i_pos, i_angle, i_roomNo, i_param, i_pos, i_angle, FALSE);
@@ -2005,7 +2022,7 @@ inline s8 dComIfGp_getStartStageLayer() {
return g_dComIfG_gameInfo.play.getStartStageLayer();
}
inline s32 dComIfGp_getStartStagePoint() {
inline s16 dComIfGp_getStartStagePoint() {
return g_dComIfG_gameInfo.play.getStartStagePoint();
}
@@ -2235,7 +2252,7 @@ inline u8 dComIfGp_getShipId() {
return g_dComIfG_gameInfo.play.getShipId();
}
inline u8 dComIfGp_getShipRoomId() {
inline int dComIfGp_getShipRoomId() {
return g_dComIfG_gameInfo.play.getShipRoomId();
}
@@ -2790,7 +2807,7 @@ inline void dComIfGp_setNowVibration(u8 vibration) {
g_dComIfG_gameInfo.play.setNowVibration(vibration);
}
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
// Inline name is official because while it's not present in the JPN debug maps, it is present in
// the USA release maps because there was one TU where it failed to get inlined (f_op_msg_mng).
inline u8 dComIfGs_getPalLanguage() {
@@ -3498,10 +3515,13 @@ inline void dComIfGd_reset() { g_dComIfG_gameInfo.drawlist.reset(); }
inline void dComIfGp_setAnmArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setAnmArchive(pArc); }
inline JKRArchive* dComIfGp_getAnmArchive() { return g_dComIfG_gameInfo.play.getAnmArchive(); }
inline void dComIfGp_setMsgArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgArchive(pArc); }
inline JKRArchive* dComIfGp_getMsgArchive() { return g_dComIfG_gameInfo.play.getMsgArchive(); }
#if VERSION > VERSION_DEMO
inline void dComIfGp_setDmsgArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setDmsgArchive(pArc); }
inline JKRArchive* dComIfGp_getDmsgArchive() { return g_dComIfG_gameInfo.play.getDmsgArchive(); }
inline void dComIfGp_setTmsgArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setTmsgArchive(pArc); }
inline JKRArchive* dComIfGp_getTmsgArchive() { return g_dComIfG_gameInfo.play.getTmsgArchive(); }
#endif
inline void dComIfGp_setTactMsgArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setTactMsgArchive(pArc); }
inline JKRArchive* dComIfGp_getTactMsgArchive() { return g_dComIfG_gameInfo.play.getTactMsgArchive(); }
inline void dComIfGp_setMenuArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMenuArchive(pArc); }
inline JKRArchive* dComIfGp_getMenuArchive() { return g_dComIfG_gameInfo.play.getMenuArchive(); }
inline void dComIfGp_setFont0Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFont0Archive(pArc); }
@@ -3511,10 +3531,10 @@ inline JKRArchive* dComIfGp_getRubyArchive() { return g_dComIfG_gameInfo.play.ge
inline void dComIfGp_setLkDArc(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setLkDArc(pArc); }
inline void dComIfGp_setFmapArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFmapArchive(pArc); }
inline void dComIfGp_setItemResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setItemResArchive(pArc); }
inline void dComIfGp_setClctResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setClctResArchive(pArc); }
inline void dComIfGp_setCollectResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setCollectResArchive(pArc); }
inline void dComIfGp_setFmapResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFmapResArchive(pArc); }
inline void dComIfGp_setDmapResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setDmapResArchive(pArc); }
inline void dComIfGp_setOptResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setOptResArchive(pArc); }
inline void dComIfGp_setOptionResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setOptionResArchive(pArc); }
inline JKRArchive* dComIfGp_getClothResArchive() { return g_dComIfG_gameInfo.play.getClothResArchive(); }
inline void dComIfGp_setClothResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setClothResArchive(pArc); }
inline void dComIfGp_setSaveResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setSaveResArchive(pArc); }
@@ -3525,13 +3545,13 @@ inline void dComIfGp_setErrorResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.
inline void dComIfGp_setActionIconArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setActionIconArchive(pArc); }
inline JKRArchive* dComIfGp_getActionIconArchive() { return g_dComIfG_gameInfo.play.getActionIconArchive(); }
inline void dComIfGp_setScopeResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setScopeResArchive(pArc); }
inline void dComIfGp_setCamResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setCamResArchive(pArc); }
inline void dComIfGp_setCameraResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setCameraResArchive(pArc); }
inline void dComIfGp_setSwimResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setSwimResArchive(pArc); }
inline void dComIfGp_setWindResArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setWindResArchive(pArc); }
inline void dComIfGp_setFontArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setFontArchive(pArc); }
inline void dComIfGp_setMsgDtArchive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDtArchive(pArc); }
inline JKRArchive* dComIfGp_getMsgDtArchive() { return g_dComIfG_gameInfo.play.getMsgDtArchive(); }
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
inline void dComIfGp_setMsgDt2Archive(JKRArchive * pArc) { g_dComIfG_gameInfo.play.setMsgDt2Archive(pArc); }
inline JKRArchive* dComIfGp_getMsgDt2Archive() { return g_dComIfG_gameInfo.play.getMsgDt2Archive(); }
#endif
include/d/d_gameover.h
+1 -1
View File
@@ -57,7 +57,7 @@ public:
private:
/* 0x004 */ J2DScreen* scrn;
/* 0x008 */ fopMsgM_pane_class letter[8];
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
/* 0x1C8 */ u8 field_0x1c8[0x318 - 0x1c8];
#endif
/* Offsets below are for USA/PAL */
include/d/d_lib.h
+1 -1
View File
@@ -25,7 +25,7 @@ public:
void Yinit();
virtual f32 getValueStick();
virtual s16 getAngleStick();
s32 checkTrigger();
u8 checkTrigger();
bool checkLeftTrigger();
bool checkRightTrigger();
bool checkUpTrigger();
include/d/d_menu_collect.h
+95
View File
@@ -2,6 +2,10 @@
#define D_MENU_COLLECT_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "f_op/f_op_msg_mng.h"
#include "d/d_2dnumber.h"
struct fopMsgM_pane_class;
class JKRArchive;
@@ -84,11 +88,102 @@ public:
void animeStep4(short, short);
void _open2();
void _close2();
/* 0x000 */ u8 m000[0x004 - 0x000];
/* 0x004 */ J2DScreen* m004;
/* 0x008 */ fopMsgM_pane_class m008;
/* 0x040 */ fopMsgM_pane_class m040;
/* 0x078 */ fopMsgM_pane_class m078;
/* 0x0B0 */ fopMsgM_pane_class m0B0[15];
/* 0x3F8 */ fopMsgM_pane_class m3F8[15];
/* 0x740 */ fopMsgM_pane_class m740;
/* 0x778 */ fopMsgM_pane_class m778;
/* 0x7B0 */ fopMsgM_pane_class m7B0;
/* 0x7E8 */ fopMsgM_pane_class m7E8;
/* 0x820 */ fopMsgM_pane_class m820;
/* 0x858 */ fopMsgM_pane_class m858;
/* 0x890 */ fopMsgM_pane_class m890;
/* 0x8C8 */ fopMsgM_pane_class m8C8;
/* 0x900 */ fopMsgM_pane_class m900;
/* 0x938 */ fopMsgM_pane_class m938;
/* 0x970 */ fopMsgM_pane_class m970;
/* 0x9A8 */ fopMsgM_pane_class m9A8;
/* 0x9E0 */ fopMsgM_pane_class m9E0;
/* 0xA18 */ fopMsgM_pane_class mA18[4];
/* 0xAF8 */ fopMsgM_pane_class mAF8;
/* 0xB30 */ fopMsgM_pane_class mB30;
/* 0xB68 */ fopMsgM_pane_class mB68[4];
/* 0xC48 */ fopMsgM_pane_class mC48;
/* 0xC80 */ fopMsgM_pane_class mC80;
/* 0xCB8 */ fopMsgM_pane_class mCB8;
/* 0xCF0 */ fopMsgM_pane_class mCF0;
/* 0xD28 */ fopMsgM_pane_class mD28;
/* 0xD60 */ fopMsgM_pane_class mD60;
/* 0xD98 */ fopMsgM_pane_class mD98;
/* 0xDD0 */ fopMsgM_pane_class mDD0;
/* 0xE08 */ fopMsgM_pane_class mE08[8];
/* 0xFC8 */ fopMsgM_pane_class mFC8;
/* 0x1000 */ fopMsgM_pane_class m1000[3];
/* 0x10A8 */ fopMsgM_pane_class m10A8[3];
/* 0x1150 */ fopMsgM_pane_class m1150[11];
/* 0x13B8 */ fopMsgM_pane_class m13B8[3];
/* 0x1460 */ fopMsgM_pane_class m1460;
/* 0x1498 */ fopMsgM_pane_class m1498[6];
/* 0x15E8 */ fopMsgM_pane_class m15E8[6];
/* 0x1738 */ fopMsgM_pane_class m1738;
/* 0x1770 */ fopMsgM_pane_class m1770;
/* 0x17A8 */ fopMsgM_pane_class m17A8[6];
/* 0x18F8 */ fopMsgM_pane_class m18F8[6];
/* 0x1A48 */ fopMsgM_pane_class m1A48[6];
/* 0x1B98 */ fopMsgM_pane_class m1B98[6];
/* 0x1CE8 */ fopMsgM_pane_class m1CE8[6];
/* 0x1E38 */ fopMsgM_pane_class m1E38[6];
/* 0x1460 */ fopMsgM_pane_class m1F88;
/* 0x1460 */ fopMsgM_pane_class m1FC0;
/* 0x1460 */ fopMsgM_pane_class m1FF8;
/* 0x2030 */ fopMsgM_pane_class m2030[5];
/* 0x2148 */ fopMsgM_pane_class m2148[5];
/* 0x2260 */ fopMsgM_pane_class m2260[5];
/* 0x2378 */ fopMsgM_pane_class m2378;
/* 0x23B0 */ fopMsgM_pane_class m23B0;
/* 0x23E8 */ fopMsgM_pane_class m23E8;
/* 0x2420 */ fopMsgM_pane_class m2420;
/* 0x2458 */ u8 m2458[0x2460 - 0x2458];
/* 0x2460 */ dDlst_2DOutFont_c* m2460;
/* 0x2464 */ u8 m2464[0x2470 - 0x2464];
/* 0x2470 */ JUTFont* m2470;
/* 0x2474 */ JUTFont* m2474;
/* 0x2478 */ J2DPane* m2478;
/* 0x247C */ u8 m247C[0x2498 - 0x247C];
/* 0x2498 */ ResTIMG* m2498;
/* 0x249C */ ResTIMG* m249C;
/* 0x24A0 */ ResTIMG* m24A0[6];
/* 0x24B8 */ u8 m24B8[0x27A8 - 0x24B8];
/* 0x27A8 */ f32 m27A8;
/* 0x27AC */ f32 m27AC;
};
class dMc_HIO_c {
public:
dMc_HIO_c();
virtual ~dMc_HIO_c() {}
public:
/* 0x00 */ // vtable
/* 0x04 */ u8 m04[0x44 - 0x04];
/* 0x44 */ s16 m44;
/* 0x46 */ s16 m46;
/* 0x48 */ s16 m48;
/* 0x4A */ s16 m4A;
/* 0x4C */ s16 m4C;
/* 0x4E */ s16 m4E;
/* 0x50 */ s16 m50;
/* 0x52 */ u8 m52;
/* 0x53 */ u8 m53;
/* 0x54 */ f32 m54;
/* 0x58 */ JUtility::TColor m58;
/* 0x5C */ u8 m5C;
/* 0x5D */ u8 m5D;
};
#endif /* D_MENU_COLLECT_H */
include/d/d_menu_option.h
+30 -21
View File
@@ -10,14 +10,25 @@
struct fopMsgM_pane_class;
class JKRArchive;
class JUTFont;
struct mesg_entry;
class dMenu_Option_c : public dDlst_base_c {
public:
void alphaChange(fopMsgM_pane_class*, f32) {}
void getQuitStatus() {}
void setArchive(JKRArchive*) {}
void setFont(JUTFont*, JUTFont*) {}
void setTextArea(char*, char*, char*, char*) {}
void setArchive(JKRArchive* archive) {
mpArchive = archive;
}
void setFont(JUTFont* font_1, JUTFont* font_2) {
mD2C = font_1;
mD30 = font_2;
}
void setTextArea(char* param_1, char* param_2, char* param_3, char* param_4) {
mD38 = param_1;
mD3C = param_2;
mD40 = param_3;
mD44 = param_4;
}
void screenSet();
void mainInit();
@@ -36,7 +47,7 @@ public:
void outFontInit();
void outFontMove();
void outFontDraw();
void stringlength(fopMsgM_pane_class*, char*);
f32 stringlength(fopMsgM_pane_class*, char*);
void changeScaleCenter(fopMsgM_pane_class*, char*);
void setSoundMode(u32);
void changeScaleRight(fopMsgM_pane_class*, char*);
@@ -45,8 +56,8 @@ public:
void _delete();
void _move();
void _draw();
void _open();
void _close();
bool _open();
bool _close();
private:
/* 0x004 */ J2DScreen* scrn;
@@ -55,31 +66,26 @@ private:
/* 0x078 */ fopMsgM_pane_class m078;
/* 0x0B0 */ fopMsgM_pane_class m0B0[15];
/* 0x3F8 */ fopMsgM_pane_class m3F8[15];
/* 0x740 */ fopMsgM_pane_class m740;
/* 0x778 */ fopMsgM_pane_class m778;
/* 0x740 */ fopMsgM_pane_class m740[2];
/* 0x7B0 */ fopMsgM_pane_class m7B0;
/* 0x7E8 */ fopMsgM_pane_class m7E8;
/* 0x820 */ fopMsgM_pane_class m820;
/* 0x858 */ fopMsgM_pane_class m858;
/* 0x890 */ fopMsgM_pane_class m890;
/* 0x858 */ fopMsgM_pane_class m858[2];
/* 0x8C8 */ fopMsgM_pane_class m8C8[4];
/* 0x9A8 */ fopMsgM_pane_class m9A8[2];
/* 0xA18 */ fopMsgM_pane_class mA18[3];
/* 0xAC0 */ fopMsgM_pane_class mAC0[2];
/* 0xB30 */ fopMsgM_pane_class mB30;
/* 0xB68 */ fopMsgM_pane_class mB68;
/* 0xBA0 */ fopMsgM_pane_class mBA0;
/* 0xBD8 */ fopMsgM_pane_class mBD8;
/* 0xC10 */ fopMsgM_pane_class mC10;
/* 0xC48 */ fopMsgM_pane_class mC48;
/* 0xC80 */ fopMsgM_pane_class mC80;
/* 0xCB8 */ fopMsgM_pane_class mCB8;
/* 0xB30 */ fopMsgM_pane_class mB30[6];
/* 0xC80 */ fopMsgM_pane_class mC80[2];
/* 0xCF0 */ fopMsgM_pane_class mCF0;
/* 0xD28 */ JKRArchive* mpArchive;
/* 0xD2C */ JUTFont* mD2C;
/* 0xD30 */ JUTFont* mD30;
/* 0xD34 */ STControl* stick;
/* 0xD38 */ u8 mD38[0xD48 - 0xD38];
/* 0xD38 */ char* mD38;
/* 0xD3C */ char* mD3C;
/* 0xD40 */ char* mD40;
/* 0xD44 */ char* mD44;
/* 0xD48 */ char mD48[20];
/* 0xD5C */ char mD5C[2][20];
/* 0xD84 */ char mD84[2][20];
@@ -89,9 +95,12 @@ private:
/* 0xE39 */ u8 mE39;
/* 0xE3A */ u8 mE3A;
/* 0xE3B */ u8 mE3B;
/* 0xE3C */ u8 mE3C[0xE40 - 0xE3C];
/* 0xE3C */ u8 mE3C;
/* 0xE3D */ u8 mE3D;
/* 0xE3E */ u8 mE3E;
/* 0xE3F */ u8 mE3F;
/* 0xE40 */ u8 mE40;
/* 0xE41 */ u8 mE41[0xE42 - 0xE41];
/* 0xE41 */ u8 mE41;
}; // Size: 0xE42
class dMo_HIO_c : public JORReflexible {
include/d/d_meter.h
+1
View File
@@ -596,5 +596,6 @@ extern dMeter_msg_HIO_c g_msgHIO;
extern dMeter_message_HIO_c g_messageHIO;
void dMeter_mtrShow();
void dMenu_setPushMenuButton(u8);
#endif /* D_METER_H */
include/d/d_priority.h
+500
View File
@@ -0,0 +1,500 @@
#ifndef D_PRIORITY_H
#define D_PRIORITY_H
enum {
/* 0x0000 */ PRIO_CAMERA,
/* 0x0001 */ PRIO_CAMERA2,
/* 0x0002 */ PRIO_KANKYO,
/* 0x0003 */ PRIO_KYEFF2,
/* 0x0004 */ PRIO_VRBOX2,
/* 0x0005 */ PRIO_KYEFF,
/* 0x0006 */ PRIO_KY_THUNDER,
/* 0x0007 */ PRIO_VRBOX,
/* 0x0008 */ PRIO_WPILLAR,
/* 0x0009 */ PRIO_TORNADO,
/* 0x000A */ PRIO_TITLE,
/* 0x000B */ PRIO_MP,
/* 0x000C */ PRIO_AGB,
/* 0x000D */ PRIO_AGBSW0,
/* 0x000E */ PRIO_BB,
/* 0x000F */ PRIO_Obj_Ice,
/* 0x0010 */ PRIO_Obj_Swpush,
/* 0x0011 */ PRIO_Obj_Swheavy,
/* 0x0012 */ PRIO_Obj_Swflat,
/* 0x0013 */ PRIO_Obj_Swlight,
/* 0x0014 */ PRIO_Obj_Quake,
/* 0x0015 */ PRIO_Obj_Movebox,
/* 0x0016 */ PRIO_Obj_Tribox,
/* 0x0017 */ PRIO_Obj_Shelf,
/* 0x0018 */ PRIO_Obj_Hlift,
/* 0x0019 */ PRIO_Obj_Hami2,
/* 0x001A */ PRIO_Obj_Hami3,
/* 0x001B */ PRIO_Obj_Hami4,
/* 0x001C */ PRIO_Obj_Hbrf1,
/* 0x001D */ PRIO_Obj_Dmgroom,
/* 0x001E */ PRIO_Obj_Doguu,
/* 0x001F */ PRIO_Obj_Volcano,
/* 0x0020 */ PRIO_Obj_Vfan,
/* 0x0021 */ PRIO_Obj_Pbco,
/* 0x0022 */ PRIO_Obj_Vmc,
/* 0x0023 */ PRIO_Obj_Usovmc,
/* 0x0024 */ PRIO_Obj_Iceisland,
/* 0x0025 */ PRIO_Obj_Dragonhead,
/* 0x0026 */ PRIO_Obj_Correct,
/* 0x0027 */ PRIO_Obj_Coming,
/* 0x0028 */ PRIO_Coming2,
/* 0x0029 */ PRIO_Coming3,
/* 0x002A */ PRIO_Obj_Timer,
/* 0x002B */ PRIO_Obj_Mtest,
/* 0x002C */ PRIO_Obj_Nest,
/* 0x002D */ PRIO_Obj_Ojtree,
/* 0x002E */ PRIO_Obj_Drift,
/* 0x002F */ PRIO_Obj_Ospbox,
/* 0x0030 */ PRIO_Obj_Ladder,
/* 0x0031 */ PRIO_Obj_Jump,
/* 0x0032 */ PRIO_Obj_Smplbg,
/* 0x0033 */ PRIO_Obj_Akabe,
/* 0x0034 */ PRIO_Obj_Ashut,
/* 0x0035 */ PRIO_Obj_Mmrr,
/* 0x0036 */ PRIO_Obj_Mkie,
/* 0x0037 */ PRIO_Obj_Mkiek,
/* 0x0038 */ PRIO_Obj_Msdan,
/* 0x0039 */ PRIO_Obj_MsdanSub,
/* 0x003A */ PRIO_Obj_Msdan2,
/* 0x003B */ PRIO_Obj_MsdanSub2,
/* 0x003C */ PRIO_Obj_Ferris,
/* 0x003D */ PRIO_Obj_Xfuta,
/* 0x003E */ PRIO_Obj_Rforce,
/* 0x003F */ PRIO_Obj_Gaship,
/* 0x0040 */ PRIO_Obj_Gaship2,
/* 0x0041 */ PRIO_Obj_Light,
/* 0x0042 */ PRIO_Obj_Homen,
/* 0x0043 */ PRIO_Obj_Homensmk,
/* 0x0044 */ PRIO_Obj_Ftree,
/* 0x0045 */ PRIO_Obj_Vds,
/* 0x0046 */ PRIO_Obj_Vyasi,
/* 0x0047 */ PRIO_Obj_Ajav,
/* 0x0048 */ PRIO_Obj_Trap,
/* 0x0049 */ PRIO_Obj_Hha,
/* 0x004A */ PRIO_Obj_Htetu1,
/* 0x004B */ PRIO_Obj_Shmrgrd,
/* 0x004C */ PRIO_Obj_Eayogn,
/* 0x004D */ PRIO_Obj_Vmsms,
/* 0x004E */ PRIO_Obj_Vmsdz,
/* 0x004F */ PRIO_Ygcwp,
/* 0x0050 */ PRIO_Obj_Vgnfd,
/* 0x0051 */ PRIO_Obj_Gnntakis,
/* 0x0052 */ PRIO_Obj_Gnntakie,
/* 0x0053 */ PRIO_Obj_Gnnbtaki,
/* 0x0054 */ PRIO_Obj_Rcloud,
/* 0x0055 */ PRIO_Obj_Gryw00,
/* 0x0056 */ PRIO_Obj_AjavW,
/* 0x0057 */ PRIO_Obj_Leaves,
/* 0x0058 */ PRIO_Obj_YLzou,
/* 0x0059 */ PRIO_Obj_Gbed,
/* 0x005A */ PRIO_Obj_Vteng,
/* 0x005B */ PRIO_Obj_Hfuck1,
/* 0x005C */ PRIO_Obj_Ohatch,
/* 0x005D */ PRIO_Obj_Hcbh,
/* 0x005E */ PRIO_Obj_Ygush00,
/* 0x005F */ PRIO_Tag_Ret,
/* 0x0060 */ PRIO_Dummy,
/* 0x0061 */ PRIO_Tag_Volcano,
/* 0x0062 */ PRIO_TAG_EVSW,
/* 0x0063 */ PRIO_Tag_Light,
/* 0x0064 */ PRIO_Tag_Attention,
/* 0x0065 */ PRIO_TAG_SO,
/* 0x0066 */ PRIO_TAG_GSHIP,
/* 0x0067 */ PRIO_FM,
/* 0x0068 */ PRIO_PLAYER,
/* 0x0069 */ PRIO_SAIL,
/* 0x006A */ PRIO_PIRATE_FLAG,
/* 0x006B */ PRIO_MAJUU_FLAG,
/* 0x006C */ PRIO_Tori_Flag,
/* 0x006D */ PRIO_Sie_Flag,
/* 0x006E */ PRIO_Obj_Stair,
/* 0x006F */ PRIO_Obj_Lpalm,
/* 0x0070 */ PRIO_Obj_Pbka,
/* 0x0071 */ PRIO_Obj_Plant,
/* 0x0072 */ PRIO_Obj_Gtaki,
/* 0x0073 */ PRIO_Obj_Yboil,
/* 0x0074 */ PRIO_Obj_Rflw,
/* 0x0075 */ PRIO_Obj_Table,
/* 0x0076 */ PRIO_Obj_Tenmado,
/* 0x0077 */ PRIO_Obj_Cafelmp,
/* 0x0078 */ PRIO_Obj_Kanoke,
/* 0x0079 */ PRIO_Obj_Kanat,
/* 0x007A */ PRIO_Obj_Eskban,
/* 0x007B */ PRIO_Obj_Ekskz,
/* 0x007C */ PRIO_Obj_Ebomzo,
/* 0x007D */ PRIO_Obj_Apzl,
/* 0x007E */ PRIO_Obj_Adnno,
/* 0x007F */ PRIO_Obj_Auzu,
/* 0x0080 */ PRIO_Obj_Aygr,
/* 0x0081 */ PRIO_Obj_Gong,
/* 0x0082 */ PRIO_Obj_Swhammer,
/* 0x0083 */ PRIO_Obj_Barrier,
/* 0x0084 */ PRIO_Obj_Firewall,
/* 0x0085 */ PRIO_Obj_TnTrap,
/* 0x0086 */ PRIO_Obj_Monument,
/* 0x0087 */ PRIO_Obj_Tapestry,
/* 0x0088 */ PRIO_Obj_HSH,
/* 0x0089 */ PRIO_BRIDGE,
/* 0x008A */ PRIO_MSW,
/* 0x008B */ PRIO_MFLFT,
/* 0x008C */ PRIO_KLFT,
/* 0x008D */ PRIO_Hmlif,
/* 0x008E */ PRIO_LEAF_LIFT,
/* 0x008F */ PRIO_ICE_LIFT,
/* 0x0090 */ PRIO_AMI_PROP,
/* 0x0091 */ PRIO_PEDESTAL,
/* 0x0092 */ PRIO_FLOOR,
/* 0x0093 */ PRIO_KITA,
/* 0x0094 */ PRIO_KOKIIE,
/* 0x0095 */ PRIO_SHAND,
/* 0x0096 */ PRIO_BITA,
/* 0x0097 */ PRIO_SK,
/* 0x0098 */ PRIO_SK2,
/* 0x0099 */ PRIO_SSK,
/* 0x009A */ PRIO_SEA,
/* 0x009B */ PRIO_Obj_Tide,
/* 0x009C */ PRIO_SHIP,
/* 0x009D */ PRIO_OSHIP,
/* 0x009E */ PRIO_AYUSH,
/* 0x009F */ PRIO_RECTANGLE,
/* 0x00A0 */ PRIO_KYTAG00,
/* 0x00A1 */ PRIO_KYTAG01,
/* 0x00A2 */ PRIO_KYTAG02,
/* 0x00A3 */ PRIO_KYTAG03,
/* 0x00A4 */ PRIO_KYTAG04,
/* 0x00A5 */ PRIO_KYTAG05,
/* 0x00A6 */ PRIO_KYTAG06,
/* 0x00A7 */ PRIO_KYTAG07,
/* 0x00A8 */ PRIO_WindTag,
/* 0x00A9 */ PRIO_ENVSE,
/* 0x00AA */ PRIO_KANBAN,
/* 0x00AB */ PRIO_HITOBJ,
/* 0x00AC */ PRIO_KT,
/* 0x00AD */ PRIO_EP,
/* 0x00AE */ PRIO_LAMP,
/* 0x00AF */ PRIO_MO2,
/* 0x00B0 */ PRIO_BK,
/* 0x00B1 */ PRIO_ST,
/* 0x00B2 */ PRIO_TN,
/* 0x00B3 */ PRIO_MANT,
/* 0x00B4 */ PRIO_KANTERA,
/* 0x00B5 */ PRIO_KAMOME,
#if VERSION == VERSION_DEMO
/* 0x00B6 */ PRIO_KAMOME2,
#endif
/* 0x00B6 */ PRIO_NPC_KAM,
/* 0x00B7 */ PRIO_WBIRD,
/* 0x00B8 */ PRIO_DEMO_KMM,
/* 0x00B9 */ PRIO_NZ,
/* 0x00BA */ PRIO_NZG,
/* 0x00BB */ PRIO_KN,
/* 0x00BC */ PRIO_DEMO_DK,
/* 0x00BD */ PRIO_AM,
/* 0x00BE */ PRIO_AM2,
/* 0x00BF */ PRIO_GM,
/* 0x00C0 */ PRIO_KS,
/* 0x00C1 */ PRIO_CC,
/* 0x00C2 */ PRIO_BL,
/* 0x00C3 */ PRIO_WZ,
/* 0x00C4 */ PRIO_PH,
/* 0x00C5 */ PRIO_PZ,
/* 0x00C6 */ PRIO_BPW,
/* 0x00C7 */ PRIO_PW,
/* 0x00C8 */ PRIO_JBO,
/* 0x00C9 */ PRIO_BO,
/* 0x00CA */ PRIO_KI,
/* 0x00CB */ PRIO_MT,
/* 0x00CC */ PRIO_BWD,
/* 0x00CD */ PRIO_BWDS,
/* 0x00CE */ PRIO_BWDG,
/* 0x00CF */ PRIO_KB,
/* 0x00D0 */ PRIO_ESA,
/* 0x00D1 */ PRIO_MOZO,
/* 0x00D2 */ PRIO_DR,
/* 0x00D3 */ PRIO_DR2,
/* 0x00D4 */ PRIO_RD,
/* 0x00D5 */ PRIO_DAIOCTA,
/* 0x00D6 */ PRIO_DAIOCTA_EYE,
/* 0x00D7 */ PRIO_OQ,
/* 0x00D8 */ PRIO_GY,
/* 0x00D9 */ PRIO_GY_CTRL,
/* 0x00DA */ PRIO_GY_CTRLB,
/* 0x00DB */ PRIO_Hot_Floor,
/* 0x00DC */ PRIO_Beam,
/* 0x00DD */ PRIO_Bemos,
/* 0x00DE */ PRIO_BTD,
/* 0x00DF */ PRIO_BMD,
/* 0x00E0 */ PRIO_BMDHAND,
/* 0x00E1 */ PRIO_BMDFOOT,
/* 0x00E2 */ PRIO_DK,
/* 0x00E3 */ PRIO_BDK,
/* 0x00E4 */ PRIO_BDKOBJ,
/* 0x00E5 */ PRIO_BST,
/* 0x00E6 */ PRIO_FGANON,
/* 0x00E7 */ PRIO_FGMAHOU,
/* 0x00E8 */ PRIO_BGN,
/* 0x00E9 */ PRIO_BGN2,
/* 0x00EA */ PRIO_BGN3,
/* 0x00EB */ PRIO_GND,
/* 0x00EC */ PRIO_PT,
/* 0x00ED */ PRIO_SWTDOOR,
/* 0x00EE */ PRIO_FF,
/* 0x00EF */ PRIO_SYAN,
/* 0x00F0 */ PRIO_KUI,
/* 0x00F1 */ PRIO_SS,
/* 0x00F2 */ PRIO_SSS,
/* 0x00F3 */ PRIO_SITEM,
/* 0x00F4 */ PRIO_MACHINE,
/* 0x00F5 */ PRIO_ITEM,
/* 0x00F6 */ PRIO_Mmusic,
/* 0x00F7 */ PRIO_Komore,
/* 0x00F8 */ PRIO_Tpota,
/* 0x00F9 */ PRIO_Obj_Itnak,
/* 0x00FA */ PRIO_Obj_Zouk,
/* 0x00FB */ PRIO_BOSSITEM,
/* 0x00FC */ PRIO_Demo_Item,
/* 0x00FD */ PRIO_RACEITEM,
/* 0x00FE */ PRIO_ShopItem,
/* 0x00FF */ PRIO_DEKU_ITEM,
/* 0x0100 */ PRIO_SPC_ITEM01,
/* 0x0101 */ PRIO_STANDITEM,
/* 0x0102 */ PRIO_GRID,
/* 0x0103 */ PRIO_TSUBO,
/* 0x0104 */ PRIO_STONE,
/* 0x0105 */ PRIO_Stone2,
/* 0x0106 */ PRIO_Obj_Try,
/* 0x0107 */ PRIO_Obj_Vtil,
/* 0x0108 */ PRIO_Obj_Paper,
/* 0x0109 */ PRIO_Obj_Barrel,
/* 0x010A */ PRIO_Obj_Barrel2,
/* 0x010B */ PRIO_Obj_Eff,
/* 0x010C */ PRIO_Obj_Buoyrace,
/* 0x010D */ PRIO_Obj_Buoyflag,
/* 0x010E */ PRIO_Goal_Flag,
/* 0x010F */ PRIO_Obj_Demo_Barrel,
/* 0x0110 */ PRIO_Obj_Wood,
/* 0x0111 */ PRIO_Obj_Flame,
/* 0x0112 */ PRIO_Obj_Mshokki,
/* 0x0113 */ PRIO_TBOX,
/* 0x0114 */ PRIO_SBOX,
/* 0x0115 */ PRIO_BOMB,
/* 0x0116 */ PRIO_Bomb2,
/* 0x0117 */ PRIO_BOMB_FLOWER,
/* 0x0118 */ PRIO_ACORN_LEAF,
/* 0x0119 */ PRIO_SWHIT0,
/* 0x011A */ PRIO_SWC00,
/* 0x011B */ PRIO_FAN,
/* 0x011C */ PRIO_WINDMILL,
/* 0x011D */ PRIO_ALLDIE,
/* 0x011E */ PRIO_TAG_EVENT,
/* 0x011F */ PRIO_TAG_MK,
/* 0x0120 */ PRIO_TAG_HINT,
/* 0x0121 */ PRIO_TAG_MSG,
/* 0x0122 */ PRIO_TAG_ETC,
/* 0x0123 */ PRIO_TAG_ISLAND,
/* 0x0124 */ PRIO_TAG_KF1,
/* 0x0125 */ PRIO_TAG_KK1,
/* 0x0126 */ PRIO_TAG_PHOTO,
/* 0x0127 */ PRIO_TAG_KB_ITEM,
/* 0x0128 */ PRIO_Tag_Waterlevel,
/* 0x0129 */ PRIO_TAG_MDCB,
/* 0x012A */ PRIO_TAG_BA1,
/* 0x012B */ PRIO_BIGELF,
/* 0x012C */ PRIO_TAMA,
/* 0x012D */ PRIO_DOOR10,
/* 0x012E */ PRIO_DOOR12,
/* 0x012F */ PRIO_ATDOOR,
/* 0x0130 */ PRIO_MDOOR,
/* 0x0131 */ PRIO_KDDOOR,
/* 0x0132 */ PRIO_MBDOOR,
/* 0x0133 */ PRIO_KNOB00,
/* 0x0134 */ PRIO_MTOGE,
/* 0x0135 */ PRIO_ANDSW0,
/* 0x0136 */ PRIO_ANDSW2,
/* 0x0137 */ PRIO_Hys,
/* 0x0138 */ PRIO_DAI,
/* 0x0139 */ PRIO_SW_ATTACK,
/* 0x013A */ PRIO_SW_ITEM,
/* 0x013B */ PRIO_SW_TACT,
/* 0x013C */ PRIO_NH,
/* 0x013D */ PRIO_NPC_OS,
/* 0x013E */ PRIO_NPC_YM1,
/* 0x013F */ PRIO_NPC_YM2,
/* 0x0140 */ PRIO_NPC_YW1,
/* 0x0141 */ PRIO_NPC_JI1,
/* 0x0142 */ PRIO_NPC_KO1,
/* 0x0143 */ PRIO_NPC_KO2,
/* 0x0144 */ PRIO_NPC_LS1,
/* 0x0145 */ PRIO_NPC_P1,
/* 0x0146 */ PRIO_NPC_P2,
/* 0x0147 */ PRIO_NPC_SARACE,
/* 0x0148 */ PRIO_NPC_TC,
/* 0x0149 */ PRIO_NPC_SO,
/* 0x014A */ PRIO_NPC_NZ,
/* 0x014B */ PRIO_NPC_BM1,
/* 0x014C */ PRIO_NPC_BM2,
/* 0x014D */ PRIO_NPC_BM3,
/* 0x014E */ PRIO_NPC_BM4,
/* 0x014F */ PRIO_NPC_BM5,
/* 0x0150 */ PRIO_NPC_OB1,
/* 0x0151 */ PRIO_NPC_AJ1,
/* 0x0152 */ PRIO_NPC_KM1,
/* 0x0153 */ PRIO_NPC_CB1,
/* 0x0154 */ PRIO_NPC_BA1,
/* 0x0155 */ PRIO_NPC_BJ1,
/* 0x0156 */ PRIO_NPC_BJ2,
/* 0x0157 */ PRIO_NPC_BJ3,
/* 0x0158 */ PRIO_NPC_BJ4,
/* 0x0159 */ PRIO_NPC_BJ5,
/* 0x015A */ PRIO_NPC_BJ6,
/* 0x015B */ PRIO_NPC_BJ7,
/* 0x015C */ PRIO_NPC_BJ8,
/* 0x015D */ PRIO_NPC_BJ9,
/* 0x015E */ PRIO_NPC_BS1,
/* 0x015F */ PRIO_NPC_BMCON1,
/* 0x0160 */ PRIO_NPC_BMS1,
/* 0x0161 */ PRIO_NPC_BMSW,
/* 0x0162 */ PRIO_NPC_BTSW,
/* 0x0163 */ PRIO_NPC_BTSW2,
/* 0x0164 */ PRIO_NPC_DS1,
/* 0x0165 */ PRIO_NPC_RSH1,
/* 0x0166 */ PRIO_NPC_KK1,
/* 0x0167 */ PRIO_NPC_PM1,
/* 0x0168 */ PRIO_NPC_KP1,
/* 0x0169 */ PRIO_NPC_PF1,
/* 0x016A */ PRIO_NPC_GP1,
/* 0x016B */ PRIO_NPC_JB1,
/* 0x016C */ PRIO_NPC_KF1,
/* 0x016D */ PRIO_NPC_DE1,
/* 0x016E */ PRIO_NPC_FA1,
/* 0x016F */ PRIO_NPC_AUCTION,
/* 0x0170 */ PRIO_NPC_KG1,
/* 0x0171 */ PRIO_NPC_KG2,
/* 0x0172 */ PRIO_NPC_HR,
/* 0x0173 */ PRIO_NPC_HO,
/* 0x0174 */ PRIO_NPC_TT,
/* 0x0175 */ PRIO_NPC_MD,
/* 0x0176 */ PRIO_NPC_MK,
/* 0x0177 */ PRIO_NPC_UK,
/* 0x0178 */ PRIO_NPC_CO1,
/* 0x0179 */ PRIO_NPC_ZK1,
/* 0x017A */ PRIO_NPC_ROTEN,
/* 0x017B */ PRIO_NPC_PEOPLE,
/* 0x017C */ PRIO_NPC_GK1,
/* 0x017D */ PRIO_NPC_PHOTO,
/* 0x017E */ PRIO_NPC_AC1,
/* 0x017F */ PRIO_NPC_HI1,
/* 0x0180 */ PRIO_NPC_SV,
/* 0x0181 */ PRIO_NPC_MT,
/* 0x0182 */ PRIO_NPC_MN,
/* 0x0183 */ PRIO_NPC_AH,
/* 0x0184 */ PRIO_YOUGAN,
/* 0x0185 */ PRIO_Ykgr,
/* 0x0186 */ PRIO_SAKU,
/* 0x0187 */ PRIO_Iball,
/* 0x0188 */ PRIO_DISAPPEAR,
/* 0x0189 */ PRIO_Salvage,
/* 0x018A */ PRIO_SALVAGE_TBOX,
/* 0x018B */ PRIO_Kmon,
/* 0x018C */ PRIO_TOGE,
/* 0x018D */ PRIO_DEMO00,
/* 0x018E */ PRIO_Lwood,
/* 0x018F */ PRIO_TagRock,
/* 0x0190 */ PRIO_FallRock,
/* 0x0191 */ PRIO_SteamTag,
/* 0x0192 */ PRIO_Fire,
/* 0x0193 */ PRIO_BRANCH,
/* 0x0194 */ PRIO_NPC_ZL1,
/* 0x0195 */ PRIO_WATERFALL,
/* 0x0196 */ PRIO_LIGHTBRIDGE,
/* 0x0197 */ PRIO_LIGHTSTAIR,
/* 0x0198 */ PRIO_WALL,
/* 0x0199 */ PRIO_SW_PROPELLER,
/* 0x019A */ PRIO_HIMO2,
/* 0x019B */ PRIO_HIMO3,
/* 0x019C */ PRIO_ATT,
/* 0x019D */ PRIO_IKARI,
/* 0x019E */ PRIO_HOOKSHOT,
/* 0x019F */ PRIO_BOOMERANG,
/* 0x01A0 */ PRIO_BOKO,
/* 0x01A1 */ PRIO_SCENECHG,
/* 0x01A2 */ PRIO_WARPFLOWER,
/* 0x01A3 */ PRIO_WARPFOUT,
/* 0x01A4 */ PRIO_WARPLIGHT,
/* 0x01A5 */ PRIO_WARPHYRULE,
/* 0x01A6 */ PRIO_WARPDEMO20,
/* 0x01A7 */ PRIO_WARPGANON,
/* 0x01A8 */ PRIO_WARPMAJYUU,
/* 0x01A9 */ PRIO_Obj_Magmarock,
/* 0x01AA */ PRIO_Obj_Pirateship,
/* 0x01AB */ PRIO_Obj_Tousekiki,
/* 0x01AC */ PRIO_Kaji,
/* 0x01AD */ PRIO_Canon,
/* 0x01AE */ PRIO_MGBOARD,
/* 0x01AF */ PRIO_OBJ_CANON,
/* 0x01B0 */ PRIO_OBJ_OTBLE,
/* 0x01B1 */ PRIO_OBJ_WARPT,
/* 0x01B2 */ PRIO_OBJ_SEARCH,
/* 0x01B3 */ PRIO_OBJ_TORIPOST,
/* 0x01B4 */ PRIO_OBJ_IKADA,
/* 0x01B5 */ PRIO_OBJ_MJDOOR,
/* 0x01B6 */ PRIO_OBJ_PFALL,
/* 0x01B7 */ PRIO_OBJ_HOLE,
/* 0x01B8 */ PRIO_Balancelift,
/* 0x01B9 */ PRIO_Obj_Roten,
/* 0x01BA */ PRIO_SHUTTER,
/* 0x01BB */ PRIO_SHUTTER2,
/* 0x01BC */ PRIO_MAGMA,
/* 0x01BD */ PRIO_GRASS,
/* 0x01BE */ PRIO_Obj_Bscurtain,
/* 0x01BF */ PRIO_ARROW,
/* 0x01C0 */ PRIO_ARROW_ICEEFF,
/* 0x01C1 */ PRIO_ARROW_LIGHTEFF,
/* 0x01C2 */ PRIO_BG,
/* 0x01C3 */ PRIO_LODBG,
/* 0x01C4 */ PRIO_Obj_Tower,
/* 0x01C5 */ PRIO_Obj_DoguuD,
/* 0x01C6 */ PRIO_Obj_MknjD,
/* 0x01C7 */ PRIO_OBJ_FIGURE,
/* 0x01C8 */ PRIO_OBJ_HAT,
/* 0x01C9 */ PRIO_SPOTBOX,
/* 0x01CA */ PRIO_WATER_MARK,
/* 0x01CB */ PRIO_WIND_ARROW,
/* 0x01CC */ PRIO_WPOT_WATER,
/* 0x01CD */ PRIO_LEVEL_SE,
/* 0x01CE */ PRIO_THROWSTONE,
/* 0x01CF */ PRIO_OPERATE_WIND,
/* 0x01D0 */ PRIO_Menu_Cloth,
/* 0x01D1 */ PRIO_MENUWINDOW,
/* 0x01D2 */ PRIO_TIMER,
/* 0x01D3 */ PRIO_MINIGAME_STARTER,
/* 0x01D4 */ PRIO_MINIGAME_TERMINATER,
/* 0x01D5 */ PRIO_SCP,
/* 0x01D6 */ PRIO_PB,
/* 0x01D7 */ PRIO_METER,
/* 0x01D8 */ PRIO_MESG,
/* 0x01D9 */ PRIO_MSG,
/* 0x01DA */ PRIO_MSG2,
/* 0x01DB */ PRIO_MSG3,
/* 0x01DC */ PRIO_AUCTION_SCREEN,
/* 0x01DD */ PRIO_PLACE_NAME,
/* 0x01DE */ PRIO_GAMEOVER,
/* 0x01DF */ PRIO_SEATAG,
/* 0x01E0 */ PRIO_AUCTION,
/* 0x01E1 */ PRIO_OVERLAP0,
/* 0x01E2 */ PRIO_OVERLAP1,
/* 0x01E3 */ PRIO_OVERLAP2,
/* 0x01E4 */ PRIO_OVERLAP3,
/* 0x01E5 */ PRIO_OVERLAP4,
/* 0x01E6 */ PRIO_OVERLAP5,
/* 0x01E7 */ PRIO_OVERLAP6,
/* 0x01E8 */ PRIO_OVERLAP7,
/* 0x01E9 */ PRIO_OVERLAP8,
};
#endif /* D_PRIORITY_H */
include/d/d_procname.h
+505 -502
View File
File diff suppressed because it is too large Load Diff
include/d/d_save.h
+7 -1
View File
@@ -783,8 +783,8 @@ public:
}
s16 getStartPoint() { return mStartCode; }
u32 getLastMode() { return mLastMode; }
f32 getLastSpeedF() { return mLastSpeedF; }
u32 getLastMode() { return mLastMode; }
s8 getRoomNo() { return mRestartRoom; }
u32 getRoomParam() { return mRestartParam; }
cXyz& getRoomPos() { return mRestartPos; }
@@ -819,9 +819,11 @@ public:
s8 getRoomNo() { return mRoomNo; }
cXyz& getShipPos() { return mShipPos; }
s16 getShipAngleY() { return mShipAngleY; }
#if VERSION > VERSION_DEMO
// The "HasShip" name is fake. These inlines don't exist in the demo, but probably do in the final release.
BOOL getHasShip() { return mHasShip; }
void setHasShip(BOOL hasShip) { mHasShip = hasShip; }
#endif
/* 0x00 */ cXyz mPosition;
/* 0x0C */ u32 mParam;
@@ -831,7 +833,9 @@ public:
/* 0x14 */ u8 field_0x14[0x24 - 0x14];
/* 0x24 */ cXyz mShipPos;
/* 0x30 */ s16 mShipAngleY;
#if VERSION > VERSION_DEMO
/* 0x34 */ BOOL mHasShip;
#endif
}; // Size: 0x38
class dSv_save_c {
@@ -955,7 +959,9 @@ public:
/* 0x1298 */ s64 field_0x1298;
}; // Size: 0x12A0
#if VERSION > VERSION_DEMO
STATIC_ASSERT(sizeof(dSv_info_c) == 0x12A0);
#endif
#include "d/d_save_event_bit.inc"
include/d/res/res_demo06.h
+4 -4
View File
@@ -10,7 +10,7 @@ enum DEMO06_RES_FILE_ID {
DEMO06_BTK_02_ZL_CD=0xB,
DEMO06_BTK_02_ZL_EW=0xC,
DEMO06_BTK_CENTER=0xD,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO06_BTK_02_ZL_LOOK_MAJUTOU=0x30,
#endif
@@ -22,7 +22,7 @@ enum DEMO06_RES_FILE_ID {
DEMO06_BTP_02_ZL_CW=0x12,
DEMO06_BTP_02_ZL_EW=0x13,
DEMO06_BTP_HANG=0x14,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO06_BTP_02_ZL_LOOK_MAJUTOU=0x31,
#endif
@@ -44,7 +44,7 @@ enum DEMO06_RES_FILE_ID {
DEMO06_BCK_02_TR_FL=0x2C,
DEMO06_BCK_02_TR_IN=0x2D,
DEMO06_BCK_02_TR_RL=0x2E,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO06_BCK_02_ZL_LOOK_MAJUTOU=0x32,
#endif
@@ -54,7 +54,7 @@ enum DEMO06_RES_FILE_ID {
DEMO06_BDL_KTARU_02=0x2F,
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum DEMO06_RES_FILE_INDEX {
/* BTK */
DEMO06_INDEX_BTK_02_ZL_BC=0x7,
include/d/res/res_demo07.h
+3 -3
View File
@@ -44,7 +44,7 @@ enum DEMO07_RES_FILE_ID {
DEMO07_BCK_WAIT=0x21,
DEMO07_BCK_07B_GND_CUT06_WAIT_L=0x24,
DEMO07_BCK_07B_GND_CUT09_AGO_O=0x25,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO07_BCK_FN_SET=0x2C,
#endif
@@ -58,7 +58,7 @@ enum DEMO07_RES_FILE_ID {
/* BDL */
DEMO07_BDL_PM=0x28,
DEMO07_BDL_KM=0x29,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO07_BDL_SDOOR01=0x2D,
DEMO07_BDL_FN_COMP=0x2E,
#endif
@@ -67,7 +67,7 @@ enum DEMO07_RES_FILE_ID {
DEMO07_BRK_FADE_OUT30F=0x2B,
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum DEMO07_RES_FILE_INDEX {
/* BTK */
DEMO07_INDEX_BTK_LS_DEMOLOOK=0x9,
include/d/res/res_demo30.h
+3 -3
View File
@@ -23,14 +23,14 @@ enum DEMO30_RES_FILE_ID {
/* BRK */
DEMO30_BRK_30_FD_LOOP_L=0x7,
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
DEMO30_BRK_30_FD_TOIKAKE_O=0x8,
DEMO30_BRK_30_FD_TOIKAKEB_O=0xA,
#endif
DEMO30_BRK_30_FD_TOIKAKE2_O=0xB,
DEMO30_BRK_30_FD_TOIKAKEB2_L=0xC,
DEMO30_BRK_GDEMO27_TFG00=0x15,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO30_BRK_30_FD_IBARI_L=0x19,
#endif
@@ -43,7 +43,7 @@ enum DEMO30_RES_FILE_ID {
DEMO30_BTK_GDEMO27_APPR00=0x18,
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum DEMO30_RES_FILE_INDEX {
/* STB */
DEMO30_INDEX_STB_DANCE_KOKIRI=0x8,
include/d/res/res_demo31.h
+4 -4
View File
@@ -40,23 +40,23 @@ enum DEMO31_RES_FILE_ID {
/* BRK */
DEMO31_BRK_30_FD_TOIKAKEB2_L=0x8,
DEMO31_BRK_30_FD_TOIKAKE2_O=0x9,
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
DEMO31_BRK_30_FD_LOOP_L=0xA,
#endif
DEMO31_BRK_30_FD_TOIKAKE_O=0x13,
DEMO31_BRK_30_FD_TOIKAKEB_O=0x14,
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
DEMO31_BRK_27_ZS_WAITA_L=0x15,
DEMO31_BRK_27_ZS_WAITAA_O=0x16,
DEMO31_BRK_27_ZS_WAITAB_O=0x17,
#endif
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO31_BRK_30_FD_IBARI_L=0x24,
DEMO31_BRK_30_FD_LOOP_L=0x26,
#endif
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum DEMO31_RES_FILE_INDEX {
/* STB */
DEMO31_INDEX_STB_AWAKE_KOKIRI=0x8,
include/d/res/res_demo32.h
+2 -2
View File
@@ -45,7 +45,7 @@ enum DEMO32_RES_FILE_ID {
DEMO32_BRK_GDEMO29_A01=0x26,
DEMO32_BRK_GDEMO29_C00=0x2E,
DEMO32_BRK_GDEMO29_C01=0x2F,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
DEMO32_BRK_30_FD_IBARI_L=0x33,
#endif
@@ -67,7 +67,7 @@ enum DEMO32_RES_FILE_ID {
DEMO32_BTK_GDEMO29_B00=0x2C,
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum DEMO32_RES_FILE_INDEX {
/* STB */
DEMO32_INDEX_STB_PRAY_KOKIRI=0x9,
include/d/res/res_kaisen_e.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
enum KAISEN_E_RES_FILE_ID { // IDs and indexes are synced
/* BDL */
KAISEN_E_BDL_AK2SH=0x4,
include/d/res/res_lkd00.h
+4 -4
View File
@@ -158,7 +158,7 @@ enum LKD00_RES_FILE_ID {
LKD00_BTP_47_CL_WAKEUPWAIT_L=0x26F,
LKD00_BTP_TWARPIN=0x27D,
LKD00_BTP_30_CL_UNAZUKI_O=0x27F,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
LKD00_BTP_44_CL_KYOROKYORO_L=0x283,
#endif
@@ -294,7 +294,7 @@ enum LKD00_RES_FILE_ID {
LKD00_BTK_47_CL_WAKEUP_O=0x274,
LKD00_BTK_47_CL_WAKEUPWAIT_L=0x275,
LKD00_BTK_30_CL_UNAZUKI_O=0x280,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
LKD00_BTK_44_CL_KYOROKYORO_L=0x284,
#endif
@@ -456,13 +456,13 @@ enum LKD00_RES_FILE_ID {
LKD00_BCK_47_CL_WAKEUPWAIT_L=0x27C,
LKD00_BCK_WARPIN=0x27E,
LKD00_BCK_30_CL_UNAZUKI_O=0x281,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
LKD00_BCK_37_CL_CUT12_FAINTAWAY_L=0x282,
LKD00_BCK_44_CL_KYOROKYORO_L=0x285,
#endif
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum LKD00_RES_FILE_INDEX {
/* BTP */
LKD00_INDEX_BTP_02_CL_C1=0x5,
include/d/res/res_lkd01.h
+3 -3
View File
@@ -156,7 +156,7 @@ enum LKD01_RES_FILE_ID {
LKD01_BCK_WARPOUTFIRST=0x19F,
LKD01_BCK_35_CL_CUT5_HAKKENWAIT_O=0x1A2,
LKD01_BCK_21_CL_CUT12A_O=0x1A9,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
LKD01_BCK_TAKTCHISIN_B=0x1AC,
LKD01_BCK_TAKTFUJIN_B=0x1AD,
LKD01_BCK_PRESENTATIONB=0x1B0,
@@ -289,7 +289,7 @@ enum LKD01_RES_FILE_ID {
LKD01_BTK_35_CL_CUT5_HAKKEN_O=0x1A6,
LKD01_BTK_35_CL_CUT18_MAWARIKUMI_L=0x1A7,
LKD01_BTK_21_CL_CUT12A_O=0x1AA,
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
LKD01_BTK_TPRESENTATIONB=0x1B1,
#endif
@@ -446,7 +446,7 @@ enum LKD01_RES_FILE_ID {
LKD01_BTP_21_CL_CUT12A_O=0x1AB,
};
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum LKD01_RES_FILE_INDEX {
/* BCKS */
LKD01_INDEX_BCK_24_CL_CUT01_RUNSTOP_O=0x5,
include/d/res/res_mgtem.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum MGTEM_RES_FILE_ID { // IDs and indexes are synced
/* SCRN */
MGTEM_BLO_SHIP_RACE2=0x4,
include/d/res/res_timer.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
#if VERSION == VERSION_JPN
#if VERSION <= VERSION_JPN
enum TIMER_RES_FILE_ID { // IDs and indexes are synced
/* SCRN */
TIMER_BLO_SHIP_RACE0=0x3,
include/dolphin/gx/GXFifo.h
+3 -3
View File
@@ -24,9 +24,9 @@ GXBreakPtCallback GXSetBreakPtCallback(GXBreakPtCallback cb);
void __GXFifoInit(void);
void __GXFifoReadEnable(void);
void __GXFifoReadDisable(void);
void __GXFifoLink(u8);
void __GXWriteFifoIntEnable(u32 p1, u32 p2);
void __GXWriteFifoIntReset(u32 p1, u32 p2);
void __GXFifoLink(u8 en);
void __GXWriteFifoIntEnable(u8 hiWatermarkEn, u8 loWatermarkEn);
void __GXWriteFifoIntReset(u8 hiWatermarkClr, u8 loWatermarkClr);
void __GXCleanGPFifo(void);
OSThread* GXSetCurrentGXThread(void);
OSThread* GXGetCurrentGXThread(void);
include/dolphin/os/OSError.h
+1 -3
View File
@@ -53,9 +53,7 @@ typedef enum {
typedef u8 __OSException;
typedef void (*OSErrorHandler)(OSError error, OSContext* context, u32, u32);
// Using this type for the C++ handlers makes stuff not match
typedef void (*OSErrorHandlerEx)(OSError error, OSContext* context, u32, u32, ...);
typedef void (*OSErrorHandler)(OSError error, OSContext* context, ...);
OSErrorHandler OSSetErrorHandler(OSError error, OSErrorHandler handler);
void __OSUnhandledException(__OSException exception, OSContext* context, u32 dsisr, u32 dar);
include/dolphin/os/OSThread.h
-1
View File
@@ -109,7 +109,6 @@ s32 OSGetThreadPriority(OSThread* thread);
static s32 CheckThreadQueue(OSThreadQueue* thread);
s32 OSCheckActiveThreads(void);
static void OSClearStack(u8 value);
extern u8 data_804516D0[8];
#ifdef __cplusplus
};
include/dolphin/os/__start.h
+4 -4
View File
@@ -31,12 +31,12 @@ extern void InitMetroTRK_BBA(void);
extern void OSInit(void);
extern void OSResetSystem(BOOL reset, u32 resetCode, BOOL forceMenu);
SECTION_INIT extern void __check_pad3(void);
SECTION_INIT static void __check_pad3(void);
SECTION_INIT extern void __set_debug_bba(void);
SECTION_INIT extern u8 __get_debug_bba(void);
SECTION_INIT extern void __start(void);
SECTION_INIT extern void __init_registers(void);
SECTION_INIT extern void __init_data(void);
SECTION_INIT extern __declspec(weak) void __start(void);
SECTION_INIT static void __init_registers(void);
SECTION_INIT static void __init_data(void);
SECTION_INIT extern void __init_hardware(void);
SECTION_INIT extern void __flush_cache(void* addr, u32 size);
include/f_op/f_op_msg_mng.h
+24 -1
View File
@@ -17,7 +17,28 @@ class JUTFont;
struct mesg_header;
struct mesg_data;
struct mesg_info;
struct mesg_entry;
struct mesg_entry {
// mesg_entry() {} // fixes fopMsgM_selectMessageGet, but messes up getMesgEntry
/* 0x00 */ u32 mDataOffs;
/* 0x04 */ u16 mMesgID;
/* 0x06 */ s16 mItemPrice;
/* 0x08 */ u16 mNextMessageID;
/* 0x0A */ u16 field_0x0a;
/* 0x0C */ u8 mTextboxType;
/* 0x0D */ u8 mDrawType;
/* 0x0E */ u8 mTextboxPosition;
/* 0x0F */ u8 mItemImage;
/* 0x10 */ u8 field_0x10;
/* 0x11 */ u8 mInitialSound;
/* 0x12 */ u8 mInitialCamera;
/* 0x13 */ u8 mInitialAnimation;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
/* 0x16 */ u8 field_0x16;
/* 0x17 */ u8 field_0x17;
};
struct msg_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
@@ -356,6 +377,8 @@ void fopMsgM_setFontsizeCenter(char* param_1, char* param_2, char* param_3, char
void fopMsgM_setFontsizeCenter2(char* a, char* b, char* c, char* d, int, int size, int, int);
void fopMsgM_outFontSet(J2DPicture*, J2DPicture*, s16*, u32, u8);
void fopMsgM_outFontSet(J2DPicture*, s16*, u32, u8);
void fopMsgM_outFontDraw(J2DPicture*, J2DPicture*, int, int, int, s16*, u8, u8);
void fopMsgM_outFontDraw2(J2DPicture*, J2DPicture*, int, int, int, int, s16*, u8, u8);
#endif /* F_OP_MSG_MNG_H */
include/f_pc/f_pc_priority.h
-2
View File
@@ -34,6 +34,4 @@ s32 fpcPi_Handler(void);
s32 fpcPi_Init(process_priority_class* i_procPriority, void* pUserData, uint i_layer, u16 i_listID,
u16 i_priority);
extern s8 data_804505F0; // roomReadId
#endif
include/f_pc/f_pc_profile_lst.h
+3
View File
@@ -199,6 +199,9 @@ extern process_profile_definition g_profile_TN;
extern process_profile_definition g_profile_MANT;
extern process_profile_definition g_profile_KANTERA;
extern process_profile_definition g_profile_KAMOME;
#if VERSION == VERSION_DEMO
extern process_profile_definition g_profile_KAMOME2;
#endif
extern process_profile_definition g_profile_NPC_KAM;
extern process_profile_definition g_profile_WBIRD;
extern process_profile_definition g_profile_DEMO_KMM;
include/global.h
+15 -8
View File
@@ -45,16 +45,23 @@ extern int __cntlzw(uint);
extern int __rlwimi(int, int, int, int, int);
extern void __dcbz(void*, int);
#define VERSION_JPN 0
#define VERSION_USA 1
#define VERSION_PAL 2
#ifndef __MWERKS__
extern void __sync();
#endif
#if VERSION == VERSION_USA
#define VERSION_SELECT(JPN, USA, PAL) (USA)
#define VERSION_DEMO 0
#define VERSION_JPN 1
#define VERSION_USA 2
#define VERSION_PAL 3
#if VERSION == VERSION_DEMO
#define VERSION_SELECT(DEMO, JPN, USA, PAL) (DEMO)
#elif VERSION <= VERSION_JPN
#define VERSION_SELECT(DEMO, JPN, USA, PAL) (JPN)
#elif VERSION == VERSION_USA
#define VERSION_SELECT(DEMO, JPN, USA, PAL) (USA)
#elif VERSION == VERSION_PAL
#define VERSION_SELECT(JPN, USA, PAL) (PAL)
#elif VERSION == VERSION_JPN
#define VERSION_SELECT(JPN, USA, PAL) (JPN)
#define VERSION_SELECT(DEMO, JPN, USA, PAL) (PAL)
#endif
#endif
include/m_Do/m_Do_Reset.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef M_DO_M_DO_RESET_H
#define M_DO_M_DO_RESET_H
#include "dolphin/types.h"
#include "global.h"
void mDoRst_reset(int, u32, int);
void mDoRst_resetCallBack(int, void*);
@@ -17,7 +17,7 @@ struct mDoRstData {
class mDoRst {
public:
#if VERSION != VERSION_JPN
#if VERSION > VERSION_JPN
static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; }
static void off3ButtonReset() { mResetData->m3ButtonReset = 0; }
static void offResetPrepare() { mResetData->mResetPrepare = 0; }