diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-06-27 03:14:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-27 13:14:58 +0300 |
| commit | 79c56b254885b006f0fdec184b0ba06fbd3746a3 (patch) | |
| tree | 3b10ab9144abba0e644d026bcc12c0cf5d3efcb3 /include | |
| parent | 028c07d47d41b10ba8fbef0ef4240751db74776f (diff) | |
add wii usa rev0 support (#2505)
* wii usa rev0 dol building ok
* wii dol cleanup
* some wii tests
* most rels building
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JKernel/JKRHeap.h | 13 | ||||
| -rw-r--r-- | include/Z2AudioLib/Z2SeMgr.h | 4 | ||||
| -rw-r--r-- | include/d/d_attention.h | 4 | ||||
| -rw-r--r-- | include/d/d_com_inf_game.h | 9 | ||||
| -rw-r--r-- | include/d/d_event.h | 2 | ||||
| -rw-r--r-- | include/d/d_home_button.h | 22 | ||||
| -rw-r--r-- | include/d/d_procname.h | 1588 | ||||
| -rw-r--r-- | include/d/d_save.h | 1 | ||||
| -rw-r--r-- | include/d/d_stage.h | 4 | ||||
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/m_Do/m_Re_controller_pad.h | 13 | ||||
| -rw-r--r-- | include/revolution/hbm.h | 43 | ||||
| -rw-r--r-- | include/revolution/types.h | 58 |
13 files changed, 964 insertions, 799 deletions
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index ac66a84ec1..6dcd20d389 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -3,6 +3,7 @@ #include "JSystem/JKernel/JKRDisposer.h" #include <dolphin/os.h> +#include "global.h" class JKRHeap; typedef void (*JKRErrorHandler)(void*, u32, int); @@ -149,7 +150,8 @@ public: static void* getUserRamEnd(void) { return mUserRamEnd; } static u32 getMemorySize(void) { return mMemorySize; } static JKRHeap* getRootHeap() { return sRootHeap; } -#ifdef DEBUG + +#if PLATFORM_WII || PLATFORM_SHIELD static JKRHeap* getRootHeap2() { return sRootHeap2; } #endif @@ -173,7 +175,8 @@ public: static u32 mMemorySize; static JKRHeap* sRootHeap; -#ifdef DEBUG + +#if PLATFORM_WII || PLATFORM_SHIELD static JKRHeap* sRootHeap2; #endif @@ -250,6 +253,12 @@ inline JKRHeap* JKRGetRootHeap() { return JKRHeap::getRootHeap(); } +#if PLATFORM_WII || PLATFORM_SHIELD +inline JKRHeap* JKRGetRootHeap2() { + return JKRHeap::getRootHeap2(); +} +#endif + #ifdef DEBUG inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } inline void JKRSetDebugFillNew(u8 status) { data_804508B2 = status; } diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h index fac5cfb0be..e0af0cc7fb 100644 --- a/include/Z2AudioLib/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr.h @@ -83,6 +83,10 @@ public: /* 802AE5B0 */ bool isSoundCulling(JAISoundID); /* 802B9AC4 */ void resetCrowdSize() { mCrowdSize = 0; } +#if PLATFORM_WII + void homeMenuSeCallback(s32); +#endif + private: /* 0x000 */ JAISoundHandle mSoundHandle[24]; /* 0x060 */ JAISoundHandles mSoundHandles; diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 188102f919..59ef174650 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -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]; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 5c043d1be6..f7697928d8 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -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(); } diff --git a/include/d/d_event.h b/include/d/d_event.h index d47e8da71c..cc0bf739f4 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -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 diff --git a/include/d/d_home_button.h b/include/d/d_home_button.h new file mode 100644 index 0000000000..ebb40dbfa7 --- /dev/null +++ b/include/d/d_home_button.h @@ -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 */ diff --git a/include/d/d_procname.h b/include/d/d_procname.h index fe95a88b96..5c37388c00 100644 --- a/include/d/d_procname.h +++ b/include/d/d_procname.h @@ -1,799 +1,803 @@ #ifndef D_PROCNAME_H #define D_PROCNAME_H +#include "global.h" + enum { - PROC_OVERLAP0 = 0x0000, - PROC_OVERLAP1 = 0x0001, - PROC_OVERLAP3 = 0x0002, - PROC_OVERLAP6 = 0x0003, - PROC_OVERLAP7 = 0x0004, - PROC_OVERLAP8 = 0x0005, - PROC_OVERLAP9 = 0x0006, - PROC_OVERLAP10 = 0x0007, - PROC_OVERLAP11 = 0x0008, - PROC_LOGO_SCENE = 0x0009, - PROC_MENU_SCENE = 0x000A, - PROC_PLAY_SCENE = 0x000B, - PROC_OPENING_SCENE = 0x000C, - PROC_NAME_SCENE = 0x000D, - PROC_NAMEEX_SCENE = 0x000E, - PROC_WARNING_SCENE = 0x000F, - PROC_WARNING2_SCENE = 0x0010, - PROC_OVERLAP2 = 0x0011, - PROC_ROOM_SCENE = 0x0012, - PROC_KANKYO = 0x0013, - PROC_ALLDIE = 0x0014, - PROC_ENVSE = 0x0015, - PROC_Obj_Swpush = 0x0016, - PROC_Obj_Swpush2 = 0x0017, - PROC_Obj_Swpush5 = 0x0018, - PROC_Tag_Gstart = 0x0019, - PROC_NO_CHG_ROOM = 0x001A, - PROC_Obj_Lv6ElevtA = 0x001B, - PROC_OBJ_SO = 0x001C, - PROC_Obj_Movebox = 0x001D, - PROC_Obj_SwTurn = 0x001E, - PROC_Obj_Lv6SwTurn = 0x001F, - PROC_OBJ_SEKIZOA = 0x0020, - PROC_OBJ_GRA = 0x0021, - PROC_TAG_GRA = 0x0022, - PROC_TAG_YAMI = 0x0023, - PROC_Obj_Ladder = 0x0024, - PROC_OBJ_BEF = 0x0025, - PROC_OBJ_FMOBJ = 0x0026, - PROC_OBJ_LBOX = 0x0027, - PROC_OBJ_WEB0 = 0x0028, - PROC_OBJ_WEB1 = 0x0029, - PROC_OBJ_CB = 0x002A, - PROC_OBJ_MAKI = 0x002B, - PROC_OBJ_BRG = 0x002C, - PROC_OBJ_GB = 0x002D, - PROC_OBJ_GM = 0x002E, - PROC_OBJ_TOBY = 0x002F, - PROC_OBJ_TP = 0x0030, - PROC_TREESH = 0x0031, - PROC_Obj_ZDoor = 0x0032, - PROC_Obj_Pillar = 0x0033, - PROC_Obj_Cdoor = 0x0034, - PROC_GRDWATER = 0x0035, - PROC_Obj_RotBridge = 0x0036, - PROC_Obj_MagLift = 0x0037, - PROC_Obj_MagLiftRot = 0x0038, - PROC_Obj_Lv1Cdl00 = 0x0039, - PROC_Obj_Lv1Cdl01 = 0x003A, - PROC_Obj_TvCdlst = 0x003B, - PROC_Obj_HsTarget = 0x003C, - PROC_Obj_HeavySw = 0x003D, - PROC_Obj_GoGate = 0x003E, - PROC_Obj_TaFence = 0x003F, - PROC_Obj_Saidan = 0x0040, - PROC_Obj_SpinLift = 0x0041, - PROC_Obj_BmWindow = 0x0042, - PROC_Obj_RfHole = 0x0043, - PROC_Obj_WaterPillar = 0x0044, - PROC_Obj_SyRock = 0x0045, - PROC_Obj_BsGate = 0x0046, - PROC_Obj_AmiShutter = 0x0047, - PROC_Obj_WtGate = 0x0048, - PROC_Obj_Lv2Candle = 0x0049, - PROC_Obj_TogeTrap = 0x004A, - PROC_Obj_RotTrap = 0x004B, - PROC_Obj_SwallShutter = 0x004C, - PROC_Obj_IceWall = 0x004D, - PROC_Obj_Lv5SwIce = 0x004E, - PROC_Obj_Lv5FBoard = 0x004F, - PROC_Obj_Turara = 0x0050, - PROC_Obj_TwGate = 0x0051, - PROC_Obj_Digholl = 0x0052, - PROC_Obj_Digpl = 0x0053, - PROC_Obj_TestCube = 0x0054, - PROC_Obj_Kshutter = 0x0055, - PROC_NPC_COACH = 0x0056, - PROC_NPC_THEB = 0x0057, - PROC_COACH_FIRE = 0x0058, - PROC_COACH2D = 0x0059, - PROC_BALLOON2D = 0x005A, - PROC_SKIP2D = 0x005B, - PROC_Obj_MvStair = 0x005C, - PROC_Obj_Cowdoor = 0x005D, - PROC_Obj_Swpropeller = 0x005E, - PROC_Obj_BoomShutter = 0x005F, - PROC_NPC_KS = 0x0060, - PROC_Obj_Hfuta = 0x0061, - PROC_Obj_BkDoor = 0x0062, - PROC_Obj_Cboard = 0x0063, - PROC_Obj_MGate = 0x0064, - PROC_Obj_Ikada = 0x0065, - PROC_Obj_Ice_l = 0x0066, - PROC_Obj_Ice_s = 0x0067, - PROC_Obj_E_CREATE = 0x0068, - PROC_Obj_Bhbridge = 0x0069, - PROC_Obj_Kaisou = 0x006A, - PROC_Obj_HHASHI = 0x006B, - PROC_Obj_BHASHI = 0x006C, - PROC_OCTHASHI = 0x006D, - PROC_Obj_THASHI = 0x006E, - PROC_Obj_CRVGATE = 0x006F, - PROC_Obj_CRVFENCE = 0x0070, - PROC_Obj_CRVHAHEN = 0x0071, - PROC_Obj_CRVSTEEL = 0x0072, - PROC_Obj_CRVLH_UP = 0x0073, - PROC_Obj_CRVLH_DW = 0x0074, - PROC_Obj_RIVERROCK = 0x0075, - PROC_Obj_DUST = 0x0076, - PROC_Obj_ITA = 0x0077, - PROC_Obj_Window = 0x0078, - PROC_Obj_MetalBox = 0x0079, - PROC_Obj_BBox = 0x007A, - PROC_OBJ_MSIMA = 0x007B, - PROC_OBJ_MYOGAN = 0x007C, - PROC_B_ZANTS = 0x007D, - PROC_Obj_ChainBlock = 0x007E, - PROC_Obj_ChainWall = 0x007F, - PROC_Obj_KkrGate = 0x0080, - PROC_Obj_RiderGate = 0x0081, - PROC_Obj_Onsen = 0x0082, - PROC_Obj_Chest = 0x0083, - PROC_Obj_Bemos = 0x0084, - PROC_Obj_RopeBridge = 0x0085, - PROC_Obj_WellCover = 0x0086, - PROC_Obj_GraveStone = 0x0087, - PROC_Obj_ZraRock = 0x0088, - PROC_Obj_GraRock = 0x0089, - PROC_Obj_GrzRock = 0x008A, - PROC_GRA_WALL = 0x008B, - PROC_OBJ_ONSEN_FIRE = 0x008C, - PROC_Obj_Lv6bemos = 0x008D, - PROC_Obj_Lv6bemos2 = 0x008E, - PROC_Obj_BarDesk = 0x008F, - PROC_Obj_DigSnow = 0x0090, - PROC_Obj_Ytaihou = 0x0091, - PROC_Obj_Elevator = 0x0092, - PROC_Obj_Lv6TogeRoll = 0x0093, - PROC_Obj_Lv6TogeTrap = 0x0094, - PROC_Obj_Lv6Tenbin = 0x0095, - PROC_Obj_Lv6SwGate = 0x0096, - PROC_Obj_Lv6Lblock = 0x0097, - PROC_Obj_Lv6ChgGate = 0x0098, - PROC_Obj_Lv6FuriTrap = 0x0099, - PROC_Obj_Lv6SzGate = 0x009A, - PROC_Obj_Lv4EdShutter = 0x009B, - PROC_Obj_Lv4Gate = 0x009C, - PROC_Obj_Lv4PoGate = 0x009D, - PROC_Obj_Lv4SlideWall = 0x009E, - PROC_Obj_Lv4HsTarget = 0x009F, - PROC_Obj_Lv7PropY = 0x00A0, - PROC_Obj_Lv7BsGate = 0x00A1, - PROC_Obj_Lv8OptiLift = 0x00A2, - PROC_Obj_Lv8KekkaiTrap = 0x00A3, - PROC_Obj_Lv8Lift = 0x00A4, - PROC_Obj_Lv8UdFloor = 0x00A5, - PROC_Obj_Lv9SwShutter = 0x00A6, - PROC_Obj_TobyHouse = 0x00A7, - PROC_Obj_poCandle = 0x00A8, - PROC_Obj_Lv4DigSand = 0x00A9, - PROC_Obj_FallObj = 0x00AA, - PROC_Obj_SmgDoor = 0x00AB, - PROC_Obj_SwLight = 0x00AC, - PROC_Obj_Avalanche = 0x00AD, - PROC_Obj_MirrorScrew = 0x00AE, - PROC_Obj_MirrorSand = 0x00AF, - PROC_Obj_MirrorTable = 0x00B0, - PROC_Obj_MirrorChain = 0x00B1, - PROC_Obj_Mirror6Pole = 0x00B2, - PROC_Obj_SwSpinner = 0x00B3, - PROC_Obj_TDoor = 0x00B4, - PROC_Obj_Lv7Bridge = 0x00B5, - PROC_Obj_zrTurara = 0x00B6, - PROC_Obj_TakaraDai = 0x00B7, - PROC_Obj_Table = 0x00B8, - PROC_Obj_CatDoor = 0x00B9, - PROC_Obj_Gake = 0x00BA, - PROC_CSTAF = 0x00BB, - PROC_Obj_Lv4RailWall = 0x00BC, - PROC_Obj_Lv4Sand = 0x00BD, - PROC_Obj_PushDoor = 0x00BE, - PROC_PushDoor = 0x00BF, - PROC_Obj_GanonWall2 = 0x00C0, - PROC_Obj_Lv4Bridge = 0x00C1, - PROC_Obj_Lv4Floor = 0x00C2, - PROC_Tag_Spinner = 0x00C3, - PROC_Obj_SwHang = 0x00C4, - PROC_Obj_RotStair = 0x00C5, - PROC_Obj_MagneArm = 0x00C6, - PROC_Obj_KWheel00 = 0x00C7, - PROC_Obj_KWheel01 = 0x00C8, - PROC_Obj_Ychndlr = 0x00C9, - PROC_Obj_PRElvtr = 0x00CA, - PROC_Obj_MHasu = 0x00CB, - PROC_Obj_YIblltray = 0x00CC, - PROC_Obj_Lv6EGate = 0x00CD, - PROC_Obj_PDtile = 0x00CE, - PROC_Obj_PDwall = 0x00CF, - PROC_Obj_Lv4PRwall = 0x00D0, - PROC_Obj_KLift00 = 0x00D1, - PROC_B_OH = 0x00D2, - PROC_Obj_Lv4Chan = 0x00D3, - PROC_Obj_Lv3R10Saka = 0x00D4, - PROC_Obj_Lv3Water = 0x00D5, - PROC_Obj_Lv3Water2 = 0x00D6, - PROC_OBJ_LV3WATERB = 0x00D7, - PROC_Obj_HBombkoya = 0x00D8, - PROC_Obj_SZbridge = 0x00D9, - PROC_Obj_KakarikoBrg = 0x00DA, - PROC_Obj_OrdinBrg = 0x00DB, - PROC_Obj_BurnBox = 0x00DC, - PROC_Obj_KJgjs = 0x00DD, - PROC_OBJ_IHASI = 0x00DE, - PROC_Obj_IceBlock = 0x00DF, - PROC_Obj_VolcanicBall = 0x00E0, - PROC_Obj_VolcanicBomb = 0x00E1, - PROC_Obj_VolcGnd = 0x00E2, - PROC_Obj_KKanban = 0x00E3, - PROC_E_PH = 0x00E4, - PROC_NPC_ZRA = 0x00E5, - PROC_Obj_Chandelier = 0x00E6, - PROC_Obj_Stopper2 = 0x00E7, - PROC_DOOR20 = 0x00E8, - PROC_Tag_Hinit = 0x00E9, - PROC_Tag_Hjump = 0x00EA, - PROC_Tag_AJnot = 0x00EB, - PROC_Tag_Hstop = 0x00EC, - PROC_CANOE = 0x00ED, - PROC_HORSE = 0x00EE, - PROC_E_WB = 0x00EF, - PROC_OBJ_ITO = 0x00F0, - PROC_OBJ_SW = 0x00F1, - PROC_SPINNER = 0x00F2, - PROC_B_OB = 0x00F3, - PROC_KAGO = 0x00F4, - PROC_E_YC = 0x00F5, - PROC_B_DS = 0x00F6, - PROC_B_DR = 0x00F7, - PROC_B_ZANTZ = 0x00F8, - PROC_B_ZANT = 0x00F9, - PROC_B_ZANTM = 0x00FA, - PROC_TBOX = 0x00FB, - PROC_TBOX2 = 0x00FC, - PROC_ALINK = 0x00FD, - PROC_BOOMERANG = 0x00FE, - PROC_MIDNA = 0x00FF, - PROC_NPC_TK = 0x0100, - PROC_NPC_WORM = 0x0101, - PROC_PPolamp = 0x0102, - PROC_BkyRock = 0x0103, - PROC_HITOBJ = 0x0104, - PROC_EP = 0x0105, - PROC_COW = 0x0106, - PROC_PERU = 0x0107, - PROC_NI = 0x0108, - PROC_NPC_TKJ2 = 0x0109, - PROC_SQ = 0x010A, - PROC_NPC_SQ = 0x010B, - PROC_DO = 0x010C, - PROC_NPC_NE = 0x010D, - PROC_NPC_TR = 0x010E, - PROC_NPC_LF = 0x010F, - PROC_OBJ_FOOD = 0x0110, - PROC_OBJ_KI = 0x0111, - PROC_OBJ_KITA = 0x0112, - PROC_OBJ_KEY = 0x0113, - PROC_OBJ_KEYHOLE = 0x0114, - PROC_Obj_Lv5Key = 0x0115, - PROC_OBJ_LP = 0x0116, - PROC_OBJ_TATIGI = 0x0117, - PROC_OBJ_ROCK = 0x0118, - PROC_OBJ_WFLAG = 0x0119, - PROC_OBJ_KAGE = 0x011A, - PROC_OBJ_KANBAN2 = 0x011B, - PROC_OBJ_BALLOON = 0x011C, - PROC_OBJ_SUISYA = 0x011D, - PROC_OBJ_OILTUBO = 0x011E, - PROC_OBJ_ROTEN = 0x011F, - PROC_OBJ_SSDRINK = 0x0120, - PROC_OBJ_SSITEM = 0x0121, - PROC_TAG_SSDRINK = 0x0122, - PROC_TAG_BTLITM = 0x0123, - PROC_TAG_LV5SOUP = 0x0124, - PROC_TAG_MNLIGHT = 0x0125, - PROC_TAG_SHOPCAM = 0x0126, - PROC_TAG_SHOPITM = 0x0127, - PROC_OBJ_NDOOR = 0x0128, - PROC_OBJ_UDOOR = 0x0129, - PROC_OBJ_USAKU = 0x012A, - PROC_Obj_SM_DOOR = 0x012B, - PROC_OBJ_BED = 0x012C, - PROC_OBJ_BOUMATO = 0x012D, - PROC_OBJ_ITAMATO = 0x012E, - PROC_OBJ_NOUGU = 0x012F, - PROC_OBJ_STICK = 0x0130, - PROC_OBJ_MIE = 0x0131, - PROC_OBJ_SEKIDOOR = 0x0132, - PROC_OBJ_SEKIZO = 0x0133, - PROC_OBJ_SMTILE = 0x0134, - PROC_NPC_FISH = 0x0135, - PROC_MG_FISH = 0x0136, - PROC_FSHOP = 0x0137, - PROC_NPC_DU = 0x0138, - PROC_DISAPPEAR = 0x0139, - PROC_Obj_Mato = 0x013A, - PROC_Obj_Flag = 0x013B, - PROC_Obj_Flag2 = 0x013C, - PROC_Obj_Flag3 = 0x013D, - PROC_Obj_GOMIKABE = 0x013E, - PROC_Obj_Yousei = 0x013F, - PROC_Obj_Kabuto = 0x0140, - PROC_Obj_Cho = 0x0141, - PROC_Obj_Kuw = 0x0142, - PROC_Obj_Nan = 0x0143, - PROC_Obj_Dan = 0x0144, - PROC_Obj_Kam = 0x0145, - PROC_Obj_Ten = 0x0146, - PROC_Obj_Ari = 0x0147, - PROC_Obj_Kag = 0x0148, - PROC_Obj_Batta = 0x0149, - PROC_Obj_Tombo = 0x014A, - PROC_Obj_Kat = 0x014B, - PROC_Obj_H_Saku = 0x014C, - PROC_Obj_Yobikusa = 0x014D, - PROC_Obj_KazeNeko = 0x014E, - PROC_Obj_KznkArm = 0x014F, - PROC_Obj_NamePlate = 0x0150, - PROC_Obj_OnCloth = 0x0151, - PROC_Obj_LndRope = 0x0152, - PROC_Obj_ItaRope = 0x0153, - PROC_Obj_Sakuita = 0x0154, - PROC_Obj_Laundry = 0x0155, - PROC_WarpBug = 0x0156, - PROC_Izumi_Gate = 0x0157, - PROC_Obj_Fchain = 0x0158, - PROC_Obj_Wchain = 0x0159, - PROC_Tag_Attp = 0x015A, - PROC_Obj_Tornado = 0x015B, - PROC_Obj_Tornado2 = 0x015C, - PROC_Obj_FirePillar = 0x015D, - PROC_Obj_FirePillar2 = 0x015E, - PROC_Obj_InoBone = 0x015F, - PROC_Obj_Stopper = 0x0160, - PROC_Obj_MHole = 0x0161, - PROC_Tag_Magne = 0x0162, - PROC_Obj_BossWarp = 0x0163, - PROC_Obj_WoodPendulum = 0x0164, - PROC_Obj_WdStick = 0x0165, - PROC_Obj_StairBlock = 0x0166, - PROC_Obj_Geyser = 0x0167, - PROC_Tag_KtOnFire = 0x0168, - PROC_Obj_FireWood = 0x0169, - PROC_Obj_FireWood2 = 0x016A, - PROC_Obj_GpTaru = 0x016B, - PROC_Obj_OnsenTaru = 0x016C, - PROC_Obj_KiPot = 0x016D, - PROC_TBOX_SW = 0x016E, - PROC_Obj_SwChain = 0x016F, - PROC_Obj_WoodenSword = 0x0170, - PROC_Obj_StoneMark = 0x0171, - PROC_Obj_Lv3Candle = 0x0172, - PROC_Tag_Lv4Candle = 0x0173, - PROC_Tag_Lv4CandleDm = 0x0174, - PROC_Obj_DamCps = 0x0175, - PROC_Obj_Smoke = 0x0176, - PROC_Obj_WaterFall = 0x0177, - PROC_Obj_ZoraCloth = 0x0178, - PROC_Obj_poFire = 0x0179, - PROC_Tag_poFire = 0x017A, - PROC_Obj_glowSphere = 0x017B, - PROC_Tag_LightBall = 0x017C, - PROC_SwLBall = 0x017D, - PROC_SwBall = 0x017E, - PROC_Obj_WaterEff = 0x017F, - PROC_Tag_RiverBack = 0x0180, - PROC_Tag_KagoFall = 0x0181, - PROC_Tag_Lv2PrChk = 0x0182, - PROC_Obj_Lv4Gear = 0x0183, - PROC_Obj_MasterSword = 0x0184, - PROC_Obj_WoodStatue = 0x0185, - PROC_Obj_Fan = 0x0186, - PROC_Obj_IceLeaf = 0x0187, - PROC_Obj_zrTuraraRc = 0x0188, - PROC_Tag_RetRoom = 0x0189, - PROC_Obj_WindStone = 0x018A, - PROC_Tag_WaraHowl = 0x018B, - PROC_Obj_SCannon = 0x018C, - PROC_Obj_SmWStone = 0x018D, - PROC_Obj_SCannonCrs = 0x018E, - PROC_Tag_SnowEff = 0x018F, - PROC_Tag_CstaSw = 0x0190, - PROC_Tag_Lv6CstaSw = 0x0191, - PROC_Obj_awaPlar = 0x0192, - PROC_Obj_poTbox = 0x0193, - PROC_Obj_TimeFire = 0x0194, - PROC_Obj_TMoon = 0x0195, - PROC_Obj_GanonWall = 0x0196, - PROC_Obj_Prop = 0x0197, - PROC_CSTATUE = 0x0198, - PROC_Obj_SwBallA = 0x0199, - PROC_Obj_SwBallB = 0x019A, - PROC_Obj_SnowSoup = 0x019B, - PROC_Obj_Nagaisu = 0x019C, - PROC_Obj_RCircle = 0x019D, - PROC_Obj_Picture = 0x019E, - PROC_Tag_SetBall = 0x019F, - PROC_Tag_SmkEmt = 0x01A0, - PROC_SwTime = 0x01A1, - PROC_Obj_HFtr = 0x01A2, - PROC_Obj_HBarrel = 0x01A3, - PROC_Obj_Crystal = 0x01A4, - PROC_Obj_SCannonTen = 0x01A5, - PROC_Obj_SwBallC = 0x01A6, - PROC_SCENE_EXIT2 = 0x01A7, - PROC_Obj_Hata = 0x01A8, - PROC_Obj_ToaruMaki = 0x01A9, - PROC_Tag_AttackItem = 0x01AA, - PROC_Tag_RmbitSw = 0x01AB, - PROC_Obj_Sword = 0x01AC, - PROC_Tag_Spring = 0x01AD, - PROC_Tag_Statue = 0x01AE, - PROC_E_AI = 0x01AF, - PROC_E_GS = 0x01B0, - PROC_E_GOB = 0x01B1, - PROC_E_DD = 0x01B2, - PROC_E_DN = 0x01B3, - PROC_E_S1 = 0x01B4, - PROC_E_MF = 0x01B5, - PROC_E_SG = 0x01B6, - PROC_E_BS = 0x01B7, - PROC_E_SF = 0x01B8, - PROC_E_SH = 0x01B9, - PROC_E_DF = 0x01BA, - PROC_E_GM = 0x01BB, - PROC_E_MD = 0x01BC, - PROC_E_SM = 0x01BD, - PROC_E_SM2 = 0x01BE, - PROC_E_ST = 0x01BF, - PROC_E_ST_LINE = 0x01C0, - PROC_E_SB = 0x01C1, - PROC_E_TH = 0x01C2, - PROC_E_CR = 0x01C3, - PROC_E_CR_EGG = 0x01C4, - PROC_E_DB = 0x01C5, - PROC_E_DB_LEAF = 0x01C6, - PROC_E_GA = 0x01C7, - PROC_E_GB = 0x01C8, - PROC_E_HB = 0x01C9, - PROC_E_HB_LEAF = 0x01CA, - PROC_E_HZELDA = 0x01CB, - PROC_E_YD = 0x01CC, - PROC_E_YH = 0x01CD, - PROC_E_YD_LEAF = 0x01CE, - PROC_E_HM = 0x01CF, - PROC_E_TK = 0x01D0, - PROC_E_TK2 = 0x01D1, - PROC_E_TK_BALL = 0x01D2, - PROC_E_RB = 0x01D3, - PROC_E_RD = 0x01D4, - PROC_E_RDB = 0x01D5, - PROC_E_RDY = 0x01D6, - PROC_E_FM = 0x01D7, - PROC_E_FS = 0x01D8, - PROC_E_PM = 0x01D9, - PROC_E_PO = 0x01DA, - PROC_E_MB = 0x01DB, - PROC_E_MK = 0x01DC, - PROC_E_MM = 0x01DD, - PROC_E_FZ = 0x01DE, - PROC_E_ZS = 0x01DF, - PROC_E_KK = 0x01E0, - PROC_E_HP = 0x01E1, - PROC_E_ZH = 0x01E2, - PROC_E_ZM = 0x01E3, - PROC_E_PZ = 0x01E4, - PROC_E_FB = 0x01E5, - PROC_E_FK = 0x01E6, - PROC_E_MS = 0x01E7, - PROC_E_NEST = 0x01E8, - PROC_E_NZ = 0x01E9, - PROC_E_BA = 0x01EA, - PROC_E_BU = 0x01EB, - PROC_E_BUG = 0x01EC, - PROC_E_BEE = 0x01ED, - PROC_E_IS = 0x01EE, - PROC_E_KG = 0x01EF, - PROC_E_KR = 0x01F0, - PROC_E_SW = 0x01F1, - PROC_E_GE = 0x01F2, - PROC_Tag_WatchGe = 0x01F3, - PROC_E_YM = 0x01F4, - PROC_E_YM_TAG = 0x01F5, - PROC_E_YMB = 0x01F6, - PROC_Tag_FWall = 0x01F7, - PROC_Tag_WaterFall = 0x01F8, - PROC_E_YK = 0x01F9, - PROC_E_YR = 0x01FA, - PROC_E_YG = 0x01FB, - PROC_E_HZ = 0x01FC, - PROC_E_WS = 0x01FD, - PROC_E_OC = 0x01FE, - PROC_E_OT = 0x01FF, - PROC_E_DT = 0x0200, - PROC_E_BG = 0x0201, - PROC_E_OctBg = 0x0202, - PROC_DR = 0x0203, - PROC_L7lowDr = 0x0204, - PROC_L7ODR = 0x0205, - PROC_E_TT = 0x0206, - PROC_E_DK = 0x0207, - PROC_E_VT = 0x0208, - PROC_E_WW = 0x0209, - PROC_E_GI = 0x020A, - PROC_B_BH = 0x020B, - PROC_B_BQ = 0x020C, - PROC_B_GM = 0x020D, - PROC_B_GND = 0x020E, - PROC_B_GO = 0x020F, - PROC_B_OH2 = 0x0210, - PROC_B_YO = 0x0211, - PROC_B_YOI = 0x0212, - PROC_B_TN = 0x0213, - PROC_B_GG = 0x0214, - PROC_B_DRE = 0x0215, - PROC_B_MGN = 0x0216, - PROC_E_WAP = 0x0217, - PROC_ITEM = 0x0218, - PROC_Obj_SmallKey = 0x0219, - PROC_Obj_Kantera = 0x021A, - PROC_Obj_LifeContainer = 0x021B, - PROC_Obj_Shield = 0x021C, - PROC_Demo_Item = 0x021D, - PROC_ShopItem = 0x021E, - PROC_Obj_Drop = 0x021F, - PROC_OBJ_RW = 0x0220, - PROC_NBOMB = 0x0221, - PROC_TAG_CSW = 0x0222, - PROC_TAG_QS = 0x0223, - PROC_HOZELDA = 0x0224, - PROC_SWC00 = 0x0225, - PROC_KNOB20 = 0x0226, - PROC_DBDOOR = 0x0227, - PROC_BOSS_DOOR = 0x0228, - PROC_L1BOSS_DOOR = 0x0229, - PROC_L1MBOSS_DOOR = 0x022A, - PROC_L5BOSS_DOOR = 0x022B, - PROC_DSHUTTER = 0x022C, - PROC_SPIRAL_DOOR = 0x022D, - PROC_Tag_ChgRestart = 0x022E, - PROC_Tag_Restart = 0x022F, - PROC_ANDSW = 0x0230, - PROC_ANDSW2 = 0x0231, - PROC_MYNA = 0x0232, - PROC_NPC_GND = 0x0233, - PROC_NPC_GRA = 0x0234, - PROC_NPC_GRC = 0x0235, - PROC_NPC_GRD = 0x0236, - PROC_NPC_GRM = 0x0237, - PROC_NPC_GRMC = 0x0238, - PROC_NPC_GRO = 0x0239, - PROC_NPC_GRR = 0x023A, - PROC_NPC_GRS = 0x023B, - PROC_NPC_GRZ = 0x023C, - PROC_NPC_YAMID = 0x023D, - PROC_NPC_YAMIT = 0x023E, - PROC_NPC_YAMIS = 0x023F, - PROC_NPC_BLUENS = 0x0240, - PROC_NPC_KAKASHI = 0x0241, - PROC_NPC_KDK = 0x0242, - PROC_NPC_ARU = 0x0243, - PROC_NPC_BANS = 0x0244, - PROC_NPC_BESU = 0x0245, - PROC_NPC_BOU = 0x0246, - PROC_NPC_BOU_S = 0x0247, - PROC_NPC_CLERKA = 0x0248, - PROC_NPC_CLERKB = 0x0249, - PROC_NPC_CLERKT = 0x024A, - PROC_NPC_WRESTLER = 0x024B, - PROC_Tag_Arena = 0x024C, - PROC_Tag_Instruction = 0x024D, - PROC_NPC_DOC = 0x024E, - PROC_NPC_GWOLF = 0x024F, - PROC_NPC_LEN = 0x0250, - PROC_NPC_LUD = 0x0251, - PROC_NPC_FAIRY_SEIREI = 0x0252, - PROC_NPC_FAIRY = 0x0253, - PROC_NPC_HANJO = 0x0254, - PROC_NPC_HENNA = 0x0255, - PROC_NPC_HENNA0 = 0x0256, - PROC_NPC_HOZ = 0x0257, - PROC_NPC_JAGAR = 0x0258, - PROC_NPC_KKRI = 0x0259, - PROC_NPC_KN = 0x025A, - PROC_KN_BULLET = 0x025B, - PROC_NPC_KNJ = 0x025C, - PROC_NPC_KOLIN = 0x025D, - PROC_NPC_KOLINB = 0x025E, - PROC_NPC_KYURY = 0x025F, - PROC_NPC_MARO = 0x0260, - PROC_NPC_MIDP = 0x0261, - PROC_NPC_MOI = 0x0262, - PROC_NPC_RACA = 0x0263, - PROC_NPC_SARU = 0x0264, - PROC_NPC_SEIB = 0x0265, - PROC_NPC_SEIC = 0x0266, - PROC_NPC_SEID = 0x0267, - PROC_NPC_SEIRA = 0x0268, - PROC_NPC_SERA2 = 0x0269, - PROC_NPC_SEIREI = 0x026A, - PROC_NPC_SHAMAN = 0x026B, - PROC_NPC_SMARO = 0x026C, - PROC_NPC_SOLA = 0x026D, - PROC_NPC_TARO = 0x026E, - PROC_NPC_PACHI_BESU = 0x026F, - PROC_NPC_PACHI_TARO = 0x0270, - PROC_NPC_PACHI_MARO = 0x0271, - PROC_TAG_PATI = 0x0272, - PROC_NPC_THE = 0x0273, - PROC_NPC_TKJ = 0x0274, - PROC_NPC_TKS = 0x0275, - PROC_NPC_TKC = 0x0276, - PROC_OBJ_TKS = 0x0277, - PROC_NPC_TOBY = 0x0278, - PROC_NPC_URI = 0x0279, - PROC_NPC_YELIA = 0x027A, - PROC_NPC_YKM = 0x027B, - PROC_NPC_YKW = 0x027C, - PROC_NPC_ZANB = 0x027D, - PROC_NPC_ZANT = 0x027E, - PROC_NPC_ZELDA = 0x027F, - PROC_NPC_ZELR = 0x0280, - PROC_NPC_ZELRO = 0x0281, - PROC_OBJ_ZRAFREEZE = 0x0282, - PROC_NPC_ZRC = 0x0283, - PROC_NPC_ZRZ = 0x0284, - PROC_ZRA_MARK = 0x0285, - PROC_MYNA2 = 0x0286, - PROC_TAG_MYNA2 = 0x0287, - PROC_NPC_CD3 = 0x0288, - PROC_Tag_Schedule = 0x0289, - PROC_Tag_Escape = 0x028A, - PROC_NPC_CHAT = 0x028B, - PROC_NPC_SOLDIERa = 0x028C, - PROC_NPC_SOLDIERb = 0x028D, - PROC_PASSER_MNG = 0x028E, - PROC_NPC_PASSER = 0x028F, - PROC_NPC_PASSER2 = 0x0290, - PROC_NPC_POST = 0x0291, - PROC_NPC_POUYA = 0x0292, - PROC_FORMATION_MNG = 0x0293, - PROC_NPC_FGUARD = 0x0294, - PROC_GUARD_MNG = 0x0295, - PROC_TAG_GUARD = 0x0296, - PROC_NPC_GUARD = 0x0297, - PROC_NPC_ASH = 0x0298, - PROC_NPC_ASHB = 0x0299, - PROC_NPC_SHAD = 0x029A, - PROC_NPC_RAFREL = 0x029B, - PROC_NPC_MOIR = 0x029C, - PROC_NPC_IMPAL = 0x029D, - PROC_NPC_SHOE = 0x029E, - PROC_NPC_DOORBOY = 0x029F, - PROC_NPC_PRAYER = 0x02A0, - PROC_NPC_KASIHANA = 0x02A1, - PROC_NPC_KASIKYU = 0x02A2, - PROC_NPC_KASIMICH = 0x02A3, - PROC_NPC_DRSOL = 0x02A4, - PROC_NPC_CHIN = 0x02A5, - PROC_NPC_INS = 0x02A6, - PROC_NPC_SHOP0 = 0x02A7, - PROC_NPC_MK = 0x02A8, - PROC_NPC_P2 = 0x02A9, - PROC_KYTAG00 = 0x02AA, - PROC_KYTAG01 = 0x02AB, - PROC_KYTAG02 = 0x02AC, - PROC_KYTAG03 = 0x02AD, - PROC_KYTAG04 = 0x02AE, - PROC_KYTAG05 = 0x02AF, - PROC_KYTAG06 = 0x02B0, - PROC_KYTAG07 = 0x02B1, - PROC_KYTAG08 = 0x02B2, - PROC_KYTAG09 = 0x02B3, - PROC_KYTAG10 = 0x02B4, - PROC_KYTAG11 = 0x02B5, - PROC_KYTAG12 = 0x02B6, - PROC_KYTAG13 = 0x02B7, - PROC_KYTAG14 = 0x02B8, - PROC_KYTAG15 = 0x02B9, - PROC_KYTAG16 = 0x02BA, - PROC_KYTAG17 = 0x02BB, - PROC_Ykgr = 0x02BC, - PROC_TALK = 0x02BD, - PROC_Obj_Crope = 0x02BE, - PROC_Obj_Bombf = 0x02BF, - PROC_Obj_BkLeaf = 0x02C0, - PROC_Tag_Mhint = 0x02C1, - PROC_Tag_Mmsg = 0x02C2, - PROC_Tag_Mwait = 0x02C3, - PROC_Tag_Mstop = 0x02C4, - PROC_Tag_Stream = 0x02C5, - PROC_Tag_Sppath = 0x02C6, - PROC_Tag_Wljump = 0x02C7, - PROC_Tag_TWGate = 0x02C8, - PROC_Tag_Lv6Gate = 0x02C9, - PROC_Tag_Lv7Gate = 0x02CA, - PROC_Tag_Lv8Gate = 0x02CB, - PROC_Tag_TheBHint = 0x02CC, - PROC_Tag_Assist = 0x02CD, - PROC_DEMO00 = 0x02CE, - PROC_TAG_CAMERA = 0x02CF, - PROC_TAG_CHKPOINT = 0x02D0, - PROC_TAG_EVENT = 0x02D1, - PROC_TAG_EVT = 0x02D2, - PROC_TAG_TELOP = 0x02D3, - PROC_TAG_HOWL = 0x02D4, - PROC_TAG_MSG = 0x02D5, - PROC_TAG_LANTERN = 0x02D6, - PROC_Tag_Mist = 0x02D7, - PROC_DMIDNA = 0x02D8, - PROC_KY_THUNDER = 0x02D9, - PROC_VRBOX = 0x02DA, - PROC_VRBOX2 = 0x02DB, - PROC_BG = 0x02DC, - PROC_SET_BG_OBJ = 0x02DD, - PROC_BG_OBJ = 0x02DE, - PROC_MIRROR = 0x02DF, - PROC_MOVIE_PLAYER = 0x02E0, - PROC_TITLE = 0x02E1, - PROC_FR = 0x02E2, - PROC_ECONT = 0x02E3, - PROC_MG_ROD = 0x02E4, - PROC_E_ARROW = 0x02E5, - PROC_BULLET = 0x02E6, - PROC_SWHIT0 = 0x02E7, - PROC_E_TH_BALL = 0x02E8, - PROC_TAG_EVTAREA = 0x02E9, - PROC_TAG_EVTMSG = 0x02EA, - PROC_TAG_KMSG = 0x02EB, - PROC_TAG_PUSH = 0x02EC, - PROC_E_MK_BO = 0x02ED, - PROC_E_MM_MT = 0x02EE, - PROC_OBJ_KBOX = 0x02EF, - PROC_OBJ_FW = 0x02F0, - PROC_B_GOS = 0x02F1, - PROC_OBJ_YSTONE = 0x02F2, - PROC_MANT = 0x02F3, - PROC_CROD = 0x02F4, - PROC_OBJ_PLEAF = 0x02F5, - PROC_OBJ_KBACKET = 0x02F6, - PROC_OBJ_YBAG = 0x02F7, - PROC_OBJ_PUMPKIN = 0x02F8, - PROC_OBJ_AUTOMATA = 0x02F9, - PROC_OBJ_GADGET = 0x02FA, - PROC_OBJ_KAGO = 0x02FB, - PROC_Obj_Carry = 0x02FC, - PROC_Obj_Stone = 0x02FD, - PROC_OBJ_HB = 0x02FE, - PROC_NPC_INKO = 0x02FF, - PROC_BD = 0x0300, - PROC_Obj_Eff = 0x0301, - PROC_WPILLAR = 0x0302, - PROC_WMARK = 0x0303, - PROC_E_BI = 0x0304, - PROC_E_BI_LEAF = 0x0305, - PROC_START_AND_GOAL = 0x0306, - PROC_NPC_DF = 0x0307, - PROC_ARROW = 0x0308, - PROC_PATH_LINE = 0x0309, - PROC_TAG_ALLMATO = 0x030A, - PROC_Obj_Timer = 0x030B, - PROC_SCENE_EXIT = 0x030C, - PROC_CAMERA = 0x030D, - PROC_CAMERA2 = 0x030E, - PROC_SUSPEND = 0x030F, - PROC_GRASS = 0x0310, - PROC_KYEFF = 0x0311, - PROC_KYEFF2 = 0x0312, - PROC_MSG_OBJECT = 0x0313, - PROC_MENUWINDOW = 0x0314, - PROC_TIMER = 0x0315, - PROC_METER2 = 0x0316, - PROC_GAMEOVER = 0x0317, + PROC_OVERLAP0, + PROC_OVERLAP1, + PROC_OVERLAP3, + PROC_OVERLAP6, + PROC_OVERLAP7, + PROC_OVERLAP8, + PROC_OVERLAP9, + PROC_OVERLAP10, + PROC_OVERLAP11, + PROC_LOGO_SCENE, + PROC_MENU_SCENE, + PROC_PLAY_SCENE, + PROC_OPENING_SCENE, + PROC_NAME_SCENE, + PROC_NAMEEX_SCENE, +#if VERSION != VERSION_WII_USA_R0 + PROC_WARNING_SCENE, + PROC_WARNING2_SCENE, +#endif + PROC_OVERLAP2, + PROC_ROOM_SCENE, + PROC_KANKYO, + PROC_ALLDIE, + PROC_ENVSE, + PROC_Obj_Swpush, + PROC_Obj_Swpush2, + PROC_Obj_Swpush5, + PROC_Tag_Gstart, + PROC_NO_CHG_ROOM, + PROC_Obj_Lv6ElevtA, + PROC_OBJ_SO, + PROC_Obj_Movebox, + PROC_Obj_SwTurn, + PROC_Obj_Lv6SwTurn, + PROC_OBJ_SEKIZOA, + PROC_OBJ_GRA, + PROC_TAG_GRA, + PROC_TAG_YAMI, + PROC_Obj_Ladder, + PROC_OBJ_BEF, + PROC_OBJ_FMOBJ, + PROC_OBJ_LBOX, + PROC_OBJ_WEB0, + PROC_OBJ_WEB1, + PROC_OBJ_CB, + PROC_OBJ_MAKI, + PROC_OBJ_BRG, + PROC_OBJ_GB, + PROC_OBJ_GM, + PROC_OBJ_TOBY, + PROC_OBJ_TP, + PROC_TREESH, + PROC_Obj_ZDoor, + PROC_Obj_Pillar, + PROC_Obj_Cdoor, + PROC_GRDWATER, + PROC_Obj_RotBridge, + PROC_Obj_MagLift, + PROC_Obj_MagLiftRot, + PROC_Obj_Lv1Cdl00, + PROC_Obj_Lv1Cdl01, + PROC_Obj_TvCdlst, + PROC_Obj_HsTarget, + PROC_Obj_HeavySw, + PROC_Obj_GoGate, + PROC_Obj_TaFence, + PROC_Obj_Saidan, + PROC_Obj_SpinLift, + PROC_Obj_BmWindow, + PROC_Obj_RfHole, + PROC_Obj_WaterPillar, + PROC_Obj_SyRock, + PROC_Obj_BsGate, + PROC_Obj_AmiShutter, + PROC_Obj_WtGate, + PROC_Obj_Lv2Candle, + PROC_Obj_TogeTrap, + PROC_Obj_RotTrap, + PROC_Obj_SwallShutter, + PROC_Obj_IceWall, + PROC_Obj_Lv5SwIce, + PROC_Obj_Lv5FBoard, + PROC_Obj_Turara, + PROC_Obj_TwGate, + PROC_Obj_Digholl, + PROC_Obj_Digpl, + PROC_Obj_TestCube, + PROC_Obj_Kshutter, + PROC_NPC_COACH, + PROC_NPC_THEB, + PROC_COACH_FIRE, + PROC_COACH2D, + PROC_BALLOON2D, + PROC_SKIP2D, + PROC_Obj_MvStair, + PROC_Obj_Cowdoor, + PROC_Obj_Swpropeller, + PROC_Obj_BoomShutter, + PROC_NPC_KS, + PROC_Obj_Hfuta, + PROC_Obj_BkDoor, + PROC_Obj_Cboard, + PROC_Obj_MGate, + PROC_Obj_Ikada, + PROC_Obj_Ice_l, + PROC_Obj_Ice_s, + PROC_Obj_E_CREATE, + PROC_Obj_Bhbridge, + PROC_Obj_Kaisou, + PROC_Obj_HHASHI, + PROC_Obj_BHASHI, + PROC_OCTHASHI, + PROC_Obj_THASHI, + PROC_Obj_CRVGATE, + PROC_Obj_CRVFENCE, + PROC_Obj_CRVHAHEN, + PROC_Obj_CRVSTEEL, + PROC_Obj_CRVLH_UP, + PROC_Obj_CRVLH_DW, + PROC_Obj_RIVERROCK, + PROC_Obj_DUST, + PROC_Obj_ITA, + PROC_Obj_Window, + PROC_Obj_MetalBox, + PROC_Obj_BBox, + PROC_OBJ_MSIMA, + PROC_OBJ_MYOGAN, + PROC_B_ZANTS, + PROC_Obj_ChainBlock, + PROC_Obj_ChainWall, + PROC_Obj_KkrGate, + PROC_Obj_RiderGate, + PROC_Obj_Onsen, + PROC_Obj_Chest, + PROC_Obj_Bemos, + PROC_Obj_RopeBridge, + PROC_Obj_WellCover, + PROC_Obj_GraveStone, + PROC_Obj_ZraRock, + PROC_Obj_GraRock, + PROC_Obj_GrzRock, + PROC_GRA_WALL, + PROC_OBJ_ONSEN_FIRE, + PROC_Obj_Lv6bemos, + PROC_Obj_Lv6bemos2, + PROC_Obj_BarDesk, + PROC_Obj_DigSnow, + PROC_Obj_Ytaihou, + PROC_Obj_Elevator, + PROC_Obj_Lv6TogeRoll, + PROC_Obj_Lv6TogeTrap, + PROC_Obj_Lv6Tenbin, + PROC_Obj_Lv6SwGate, + PROC_Obj_Lv6Lblock, + PROC_Obj_Lv6ChgGate, + PROC_Obj_Lv6FuriTrap, + PROC_Obj_Lv6SzGate, + PROC_Obj_Lv4EdShutter, + PROC_Obj_Lv4Gate, + PROC_Obj_Lv4PoGate, + PROC_Obj_Lv4SlideWall, + PROC_Obj_Lv4HsTarget, + PROC_Obj_Lv7PropY, + PROC_Obj_Lv7BsGate, + PROC_Obj_Lv8OptiLift, + PROC_Obj_Lv8KekkaiTrap, + PROC_Obj_Lv8Lift, + PROC_Obj_Lv8UdFloor, + PROC_Obj_Lv9SwShutter, + PROC_Obj_TobyHouse, + PROC_Obj_poCandle, + PROC_Obj_Lv4DigSand, + PROC_Obj_FallObj, + PROC_Obj_SmgDoor, + PROC_Obj_SwLight, + PROC_Obj_Avalanche, + PROC_Obj_MirrorScrew, + PROC_Obj_MirrorSand, + PROC_Obj_MirrorTable, + PROC_Obj_MirrorChain, + PROC_Obj_Mirror6Pole, + PROC_Obj_SwSpinner, + PROC_Obj_TDoor, + PROC_Obj_Lv7Bridge, + PROC_Obj_zrTurara, + PROC_Obj_TakaraDai, + PROC_Obj_Table, + PROC_Obj_CatDoor, + PROC_Obj_Gake, + PROC_CSTAF, + PROC_Obj_Lv4RailWall, + PROC_Obj_Lv4Sand, + PROC_Obj_PushDoor, + PROC_PushDoor, + PROC_Obj_GanonWall2, + PROC_Obj_Lv4Bridge, + PROC_Obj_Lv4Floor, + PROC_Tag_Spinner, + PROC_Obj_SwHang, + PROC_Obj_RotStair, + PROC_Obj_MagneArm, + PROC_Obj_KWheel00, + PROC_Obj_KWheel01, + PROC_Obj_Ychndlr, + PROC_Obj_PRElvtr, + PROC_Obj_MHasu, + PROC_Obj_YIblltray, + PROC_Obj_Lv6EGate, + PROC_Obj_PDtile, + PROC_Obj_PDwall, + PROC_Obj_Lv4PRwall, + PROC_Obj_KLift00, + PROC_B_OH, + PROC_Obj_Lv4Chan, + PROC_Obj_Lv3R10Saka, + PROC_Obj_Lv3Water, + PROC_Obj_Lv3Water2, + PROC_OBJ_LV3WATERB, + PROC_Obj_HBombkoya, + PROC_Obj_SZbridge, + PROC_Obj_KakarikoBrg, + PROC_Obj_OrdinBrg, + PROC_Obj_BurnBox, + PROC_Obj_KJgjs, + PROC_OBJ_IHASI, + PROC_Obj_IceBlock, + PROC_Obj_VolcanicBall, + PROC_Obj_VolcanicBomb, + PROC_Obj_VolcGnd, + PROC_Obj_KKanban, + PROC_E_PH, + PROC_NPC_ZRA, + PROC_Obj_Chandelier, + PROC_Obj_Stopper2, + PROC_DOOR20, + PROC_Tag_Hinit, + PROC_Tag_Hjump, + PROC_Tag_AJnot, + PROC_Tag_Hstop, + PROC_CANOE, + PROC_HORSE, + PROC_E_WB, + PROC_OBJ_ITO, + PROC_OBJ_SW, + PROC_SPINNER, + PROC_B_OB, + PROC_KAGO, + PROC_E_YC, + PROC_B_DS, + PROC_B_DR, + PROC_B_ZANTZ, + PROC_B_ZANT, + PROC_B_ZANTM, + PROC_TBOX, + PROC_TBOX2, + PROC_ALINK, + PROC_BOOMERANG, + PROC_MIDNA, + PROC_NPC_TK, + PROC_NPC_WORM, + PROC_PPolamp, + PROC_BkyRock, + PROC_HITOBJ, + PROC_EP, + PROC_COW, + PROC_PERU, + PROC_NI, + PROC_NPC_TKJ2, + PROC_SQ, + PROC_NPC_SQ, + PROC_DO, + PROC_NPC_NE, + PROC_NPC_TR, + PROC_NPC_LF, + PROC_OBJ_FOOD, + PROC_OBJ_KI, + PROC_OBJ_KITA, + PROC_OBJ_KEY, + PROC_OBJ_KEYHOLE, + PROC_Obj_Lv5Key, + PROC_OBJ_LP, + PROC_OBJ_TATIGI, + PROC_OBJ_ROCK, + PROC_OBJ_WFLAG, + PROC_OBJ_KAGE, + PROC_OBJ_KANBAN2, + PROC_OBJ_BALLOON, + PROC_OBJ_SUISYA, + PROC_OBJ_OILTUBO, + PROC_OBJ_ROTEN, + PROC_OBJ_SSDRINK, + PROC_OBJ_SSITEM, + PROC_TAG_SSDRINK, + PROC_TAG_BTLITM, + PROC_TAG_LV5SOUP, + PROC_TAG_MNLIGHT, + PROC_TAG_SHOPCAM, + PROC_TAG_SHOPITM, + PROC_OBJ_NDOOR, + PROC_OBJ_UDOOR, + PROC_OBJ_USAKU, + PROC_Obj_SM_DOOR, + PROC_OBJ_BED, + PROC_OBJ_BOUMATO, + PROC_OBJ_ITAMATO, + PROC_OBJ_NOUGU, + PROC_OBJ_STICK, + PROC_OBJ_MIE, + PROC_OBJ_SEKIDOOR, + PROC_OBJ_SEKIZO, + PROC_OBJ_SMTILE, + PROC_NPC_FISH, + PROC_MG_FISH, + PROC_FSHOP, + PROC_NPC_DU, + PROC_DISAPPEAR, + PROC_Obj_Mato, + PROC_Obj_Flag, + PROC_Obj_Flag2, + PROC_Obj_Flag3, + PROC_Obj_GOMIKABE, + PROC_Obj_Yousei, + PROC_Obj_Kabuto, + PROC_Obj_Cho, + PROC_Obj_Kuw, + PROC_Obj_Nan, + PROC_Obj_Dan, + PROC_Obj_Kam, + PROC_Obj_Ten, + PROC_Obj_Ari, + PROC_Obj_Kag, + PROC_Obj_Batta, + PROC_Obj_Tombo, + PROC_Obj_Kat, + PROC_Obj_H_Saku, + PROC_Obj_Yobikusa, + PROC_Obj_KazeNeko, + PROC_Obj_KznkArm, + PROC_Obj_NamePlate, + PROC_Obj_OnCloth, + PROC_Obj_LndRope, + PROC_Obj_ItaRope, + PROC_Obj_Sakuita, + PROC_Obj_Laundry, + PROC_WarpBug, + PROC_Izumi_Gate, + PROC_Obj_Fchain, + PROC_Obj_Wchain, + PROC_Tag_Attp, + PROC_Obj_Tornado, + PROC_Obj_Tornado2, + PROC_Obj_FirePillar, + PROC_Obj_FirePillar2, + PROC_Obj_InoBone, + PROC_Obj_Stopper, + PROC_Obj_MHole, + PROC_Tag_Magne, + PROC_Obj_BossWarp, + PROC_Obj_WoodPendulum, + PROC_Obj_WdStick, + PROC_Obj_StairBlock, + PROC_Obj_Geyser, + PROC_Tag_KtOnFire, + PROC_Obj_FireWood, + PROC_Obj_FireWood2, + PROC_Obj_GpTaru, + PROC_Obj_OnsenTaru, + PROC_Obj_KiPot, + PROC_TBOX_SW, + PROC_Obj_SwChain, + PROC_Obj_WoodenSword, + PROC_Obj_StoneMark, + PROC_Obj_Lv3Candle, + PROC_Tag_Lv4Candle, + PROC_Tag_Lv4CandleDm, + PROC_Obj_DamCps, + PROC_Obj_Smoke, + PROC_Obj_WaterFall, + PROC_Obj_ZoraCloth, + PROC_Obj_poFire, + PROC_Tag_poFire, + PROC_Obj_glowSphere, + PROC_Tag_LightBall, + PROC_SwLBall, + PROC_SwBall, + PROC_Obj_WaterEff, + PROC_Tag_RiverBack, + PROC_Tag_KagoFall, + PROC_Tag_Lv2PrChk, + PROC_Obj_Lv4Gear, + PROC_Obj_MasterSword, + PROC_Obj_WoodStatue, + PROC_Obj_Fan, + PROC_Obj_IceLeaf, + PROC_Obj_zrTuraraRc, + PROC_Tag_RetRoom, + PROC_Obj_WindStone, + PROC_Tag_WaraHowl, + PROC_Obj_SCannon, + PROC_Obj_SmWStone, + PROC_Obj_SCannonCrs, + PROC_Tag_SnowEff, + PROC_Tag_CstaSw, + PROC_Tag_Lv6CstaSw, + PROC_Obj_awaPlar, + PROC_Obj_poTbox, + PROC_Obj_TimeFire, + PROC_Obj_TMoon, + PROC_Obj_GanonWall, + PROC_Obj_Prop, + PROC_CSTATUE, + PROC_Obj_SwBallA, + PROC_Obj_SwBallB, + PROC_Obj_SnowSoup, + PROC_Obj_Nagaisu, + PROC_Obj_RCircle, + PROC_Obj_Picture, + PROC_Tag_SetBall, + PROC_Tag_SmkEmt, + PROC_SwTime, + PROC_Obj_HFtr, + PROC_Obj_HBarrel, + PROC_Obj_Crystal, + PROC_Obj_SCannonTen, + PROC_Obj_SwBallC, + PROC_SCENE_EXIT2, + PROC_Obj_Hata, + PROC_Obj_ToaruMaki, + PROC_Tag_AttackItem, + PROC_Tag_RmbitSw, + PROC_Obj_Sword, + PROC_Tag_Spring, + PROC_Tag_Statue, + PROC_E_AI, + PROC_E_GS, + PROC_E_GOB, + PROC_E_DD, + PROC_E_DN, + PROC_E_S1, + PROC_E_MF, + PROC_E_SG, + PROC_E_BS, + PROC_E_SF, + PROC_E_SH, + PROC_E_DF, + PROC_E_GM, + PROC_E_MD, + PROC_E_SM, + PROC_E_SM2, + PROC_E_ST, + PROC_E_ST_LINE, + PROC_E_SB, + PROC_E_TH, + PROC_E_CR, + PROC_E_CR_EGG, + PROC_E_DB, + PROC_E_DB_LEAF, + PROC_E_GA, + PROC_E_GB, + PROC_E_HB, + PROC_E_HB_LEAF, + PROC_E_HZELDA, + PROC_E_YD, + PROC_E_YH, + PROC_E_YD_LEAF, + PROC_E_HM, + PROC_E_TK, + PROC_E_TK2, + PROC_E_TK_BALL, + PROC_E_RB, + PROC_E_RD, + PROC_E_RDB, + PROC_E_RDY, + PROC_E_FM, + PROC_E_FS, + PROC_E_PM, + PROC_E_PO, + PROC_E_MB, + PROC_E_MK, + PROC_E_MM, + PROC_E_FZ, + PROC_E_ZS, + PROC_E_KK, + PROC_E_HP, + PROC_E_ZH, + PROC_E_ZM, + PROC_E_PZ, + PROC_E_FB, + PROC_E_FK, + PROC_E_MS, + PROC_E_NEST, + PROC_E_NZ, + PROC_E_BA, + PROC_E_BU, + PROC_E_BUG, + PROC_E_BEE, + PROC_E_IS, + PROC_E_KG, + PROC_E_KR, + PROC_E_SW, + PROC_E_GE, + PROC_Tag_WatchGe, + PROC_E_YM, + PROC_E_YM_TAG, + PROC_E_YMB, + PROC_Tag_FWall, + PROC_Tag_WaterFall, + PROC_E_YK, + PROC_E_YR, + PROC_E_YG, + PROC_E_HZ, + PROC_E_WS, + PROC_E_OC, + PROC_E_OT, + PROC_E_DT, + PROC_E_BG, + PROC_E_OctBg, + PROC_DR, + PROC_L7lowDr, + PROC_L7ODR, + PROC_E_TT, + PROC_E_DK, + PROC_E_VT, + PROC_E_WW, + PROC_E_GI, + PROC_B_BH, + PROC_B_BQ, + PROC_B_GM, + PROC_B_GND, + PROC_B_GO, + PROC_B_OH2, + PROC_B_YO, + PROC_B_YOI, + PROC_B_TN, + PROC_B_GG, + PROC_B_DRE, + PROC_B_MGN, + PROC_E_WAP, + PROC_ITEM, + PROC_Obj_SmallKey, + PROC_Obj_Kantera, + PROC_Obj_LifeContainer, + PROC_Obj_Shield, + PROC_Demo_Item, + PROC_ShopItem, + PROC_Obj_Drop, + PROC_OBJ_RW, + PROC_NBOMB, + PROC_TAG_CSW, + PROC_TAG_QS, + PROC_HOZELDA, + PROC_SWC00, + PROC_KNOB20, + PROC_DBDOOR, + PROC_BOSS_DOOR, + PROC_L1BOSS_DOOR, + PROC_L1MBOSS_DOOR, + PROC_L5BOSS_DOOR, + PROC_DSHUTTER, + PROC_SPIRAL_DOOR, + PROC_Tag_ChgRestart, + PROC_Tag_Restart, + PROC_ANDSW, + PROC_ANDSW2, + PROC_MYNA, + PROC_NPC_GND, + PROC_NPC_GRA, + PROC_NPC_GRC, + PROC_NPC_GRD, + PROC_NPC_GRM, + PROC_NPC_GRMC, + PROC_NPC_GRO, + PROC_NPC_GRR, + PROC_NPC_GRS, + PROC_NPC_GRZ, + PROC_NPC_YAMID, + PROC_NPC_YAMIT, + PROC_NPC_YAMIS, + PROC_NPC_BLUENS, + PROC_NPC_KAKASHI, + PROC_NPC_KDK, + PROC_NPC_ARU, + PROC_NPC_BANS, + PROC_NPC_BESU, + PROC_NPC_BOU, + PROC_NPC_BOU_S, + PROC_NPC_CLERKA, + PROC_NPC_CLERKB, + PROC_NPC_CLERKT, + PROC_NPC_WRESTLER, + PROC_Tag_Arena, + PROC_Tag_Instruction, + PROC_NPC_DOC, + PROC_NPC_GWOLF, + PROC_NPC_LEN, + PROC_NPC_LUD, + PROC_NPC_FAIRY_SEIREI, + PROC_NPC_FAIRY, + PROC_NPC_HANJO, + PROC_NPC_HENNA, + PROC_NPC_HENNA0, + PROC_NPC_HOZ, + PROC_NPC_JAGAR, + PROC_NPC_KKRI, + PROC_NPC_KN, + PROC_KN_BULLET, + PROC_NPC_KNJ, + PROC_NPC_KOLIN, + PROC_NPC_KOLINB, + PROC_NPC_KYURY, + PROC_NPC_MARO, + PROC_NPC_MIDP, + PROC_NPC_MOI, + PROC_NPC_RACA, + PROC_NPC_SARU, + PROC_NPC_SEIB, + PROC_NPC_SEIC, + PROC_NPC_SEID, + PROC_NPC_SEIRA, + PROC_NPC_SERA2, + PROC_NPC_SEIREI, + PROC_NPC_SHAMAN, + PROC_NPC_SMARO, + PROC_NPC_SOLA, + PROC_NPC_TARO, + PROC_NPC_PACHI_BESU, + PROC_NPC_PACHI_TARO, + PROC_NPC_PACHI_MARO, + PROC_TAG_PATI, + PROC_NPC_THE, + PROC_NPC_TKJ, + PROC_NPC_TKS, + PROC_NPC_TKC, + PROC_OBJ_TKS, + PROC_NPC_TOBY, + PROC_NPC_URI, + PROC_NPC_YELIA, + PROC_NPC_YKM, + PROC_NPC_YKW, + PROC_NPC_ZANB, + PROC_NPC_ZANT, + PROC_NPC_ZELDA, + PROC_NPC_ZELR, + PROC_NPC_ZELRO, + PROC_OBJ_ZRAFREEZE, + PROC_NPC_ZRC, + PROC_NPC_ZRZ, + PROC_ZRA_MARK, + PROC_MYNA2, + PROC_TAG_MYNA2, + PROC_NPC_CD3, + PROC_Tag_Schedule, + PROC_Tag_Escape, + PROC_NPC_CHAT, + PROC_NPC_SOLDIERa, + PROC_NPC_SOLDIERb, + PROC_PASSER_MNG, + PROC_NPC_PASSER, + PROC_NPC_PASSER2, + PROC_NPC_POST, + PROC_NPC_POUYA, + PROC_FORMATION_MNG, + PROC_NPC_FGUARD, + PROC_GUARD_MNG, + PROC_TAG_GUARD, + PROC_NPC_GUARD, + PROC_NPC_ASH, + PROC_NPC_ASHB, + PROC_NPC_SHAD, + PROC_NPC_RAFREL, + PROC_NPC_MOIR, + PROC_NPC_IMPAL, + PROC_NPC_SHOE, + PROC_NPC_DOORBOY, + PROC_NPC_PRAYER, + PROC_NPC_KASIHANA, + PROC_NPC_KASIKYU, + PROC_NPC_KASIMICH, + PROC_NPC_DRSOL, + PROC_NPC_CHIN, + PROC_NPC_INS, + PROC_NPC_SHOP0, + PROC_NPC_MK, + PROC_NPC_P2, + PROC_KYTAG00, + PROC_KYTAG01, + PROC_KYTAG02, + PROC_KYTAG03, + PROC_KYTAG04, + PROC_KYTAG05, + PROC_KYTAG06, + PROC_KYTAG07, + PROC_KYTAG08, + PROC_KYTAG09, + PROC_KYTAG10, + PROC_KYTAG11, + PROC_KYTAG12, + PROC_KYTAG13, + PROC_KYTAG14, + PROC_KYTAG15, + PROC_KYTAG16, + PROC_KYTAG17, + PROC_Ykgr, + PROC_TALK, + PROC_Obj_Crope, + PROC_Obj_Bombf, + PROC_Obj_BkLeaf, + PROC_Tag_Mhint, + PROC_Tag_Mmsg, + PROC_Tag_Mwait, + PROC_Tag_Mstop, + PROC_Tag_Stream, + PROC_Tag_Sppath, + PROC_Tag_Wljump, + PROC_Tag_TWGate, + PROC_Tag_Lv6Gate, + PROC_Tag_Lv7Gate, + PROC_Tag_Lv8Gate, + PROC_Tag_TheBHint, + PROC_Tag_Assist, + PROC_DEMO00, + PROC_TAG_CAMERA, + PROC_TAG_CHKPOINT, + PROC_TAG_EVENT, + PROC_TAG_EVT, + PROC_TAG_TELOP, + PROC_TAG_HOWL, + PROC_TAG_MSG, + PROC_TAG_LANTERN, + PROC_Tag_Mist, + PROC_DMIDNA, + PROC_KY_THUNDER, + PROC_VRBOX, + PROC_VRBOX2, + PROC_BG, + PROC_SET_BG_OBJ, + PROC_BG_OBJ, + PROC_MIRROR, + PROC_MOVIE_PLAYER, + PROC_TITLE, + PROC_FR, + PROC_ECONT, + PROC_MG_ROD, + PROC_E_ARROW, + PROC_BULLET, + PROC_SWHIT0, + PROC_E_TH_BALL, + PROC_TAG_EVTAREA, + PROC_TAG_EVTMSG, + PROC_TAG_KMSG, + PROC_TAG_PUSH, + PROC_E_MK_BO, + PROC_E_MM_MT, + PROC_OBJ_KBOX, + PROC_OBJ_FW, + PROC_B_GOS, + PROC_OBJ_YSTONE, + PROC_MANT, + PROC_CROD, + PROC_OBJ_PLEAF, + PROC_OBJ_KBACKET, + PROC_OBJ_YBAG, + PROC_OBJ_PUMPKIN, + PROC_OBJ_AUTOMATA, + PROC_OBJ_GADGET, + PROC_OBJ_KAGO, + PROC_Obj_Carry, + PROC_Obj_Stone, + PROC_OBJ_HB, + PROC_NPC_INKO, + PROC_BD, + PROC_Obj_Eff, + PROC_WPILLAR, + PROC_WMARK, + PROC_E_BI, + PROC_E_BI_LEAF, + PROC_START_AND_GOAL, + PROC_NPC_DF, + PROC_ARROW, + PROC_PATH_LINE, + PROC_TAG_ALLMATO, + PROC_Obj_Timer, + PROC_SCENE_EXIT, + PROC_CAMERA, + PROC_CAMERA2, + PROC_SUSPEND, + PROC_GRASS, + PROC_KYEFF, + PROC_KYEFF2, + PROC_MSG_OBJECT, + PROC_MENUWINDOW, + PROC_TIMER, + PROC_METER2, + PROC_GAMEOVER, }; #endif /* D_PROCNAME_H */ diff --git a/include/d/d_save.h b/include/d/d_save.h index db085a3906..1255d051bb 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -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; } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 1e6fdd7e40..c51b438887 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -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; } diff --git a/include/global.h b/include/global.h index fde8844360..d919f2109b 100644 --- a/include/global.h +++ b/include/global.h @@ -48,7 +48,7 @@ #define GLUE(a, b) a##b #define GLUE2(a, b) GLUE(a, b) -#if VERSION != VERSION_SHIELD_DEBUG +#if VERSION == VERSION_GCN_USA #define STATIC_ASSERT(cond) typedef char GLUE2(static_assertion_failed, __LINE__)[(cond) ? 1 : -1] #else #define STATIC_ASSERT(...) diff --git a/include/m_Do/m_Re_controller_pad.h b/include/m_Do/m_Re_controller_pad.h new file mode 100644 index 0000000000..c388f95ddc --- /dev/null +++ b/include/m_Do/m_Re_controller_pad.h @@ -0,0 +1,13 @@ +#ifndef M_RE_CONTROLLER_PAD_H +#define M_RE_CONTROLLER_PAD_H + +#include <dolphin.h> + +class mReCPd { +public: + struct Pad { + struct Acc {}; + }; +}; + +#endif /* M_RE_CONTROLLER_PAD_H */ diff --git a/include/revolution/hbm.h b/include/revolution/hbm.h new file mode 100644 index 0000000000..c6685bcd13 --- /dev/null +++ b/include/revolution/hbm.h @@ -0,0 +1,43 @@ +#ifndef _REVOLUTION_HBM_H_ +#define _REVOLUTION_HBM_H_ + +#include <revolution/types.h> + +#ifdef __cplusplus +extern "C" { +#endif + +// TODO: properly setup later + +typedef struct Vec2 { + f32 x; // size 0x04, offset 0x00 + f32 y; // size 0x04, offset 0x04 +} Vec2; // size 0x08 + +typedef struct MEMAllocator MEMAllocator; + +typedef int HBMSoundCallback(int evt, int num); + +typedef struct HBMDataInfo { + void *layoutBuf; // size 0x04, offset 0x00 + void *spkSeBuf; // size 0x04, offset 0x04 + void *msgBuf; // size 0x04, offset 0x08 + void *configBuf; // size 0x04, offset 0x0c + void *mem; // size 0x04, offset 0x10 + HBMSoundCallback *sound_callback; // size 0x04, offset 0x14 + int backFlag; // size 0x04, offset 0x18 + int region; // size 0x04, offset 0x1c + int cursor; // size 0x04, offset 0x20 + u32 memSize; // size 0x04, offset 0x24 + f32 frameDelta; // size 0x04, offset 0x28 + Vec2 adjust; // size 0x08, offset 0x2c + MEMAllocator *pAllocator; // size 0x04, offset 0x34 +} HBMDataInfo; // size 0x40 + +void HBMCreate(const HBMDataInfo *pHBInfo); + +#ifdef __cplusplus +} +#endif + +#endif // _REVOLUTION_HBM_H_ diff --git a/include/revolution/types.h b/include/revolution/types.h new file mode 100644 index 0000000000..9d061526b5 --- /dev/null +++ b/include/revolution/types.h @@ -0,0 +1,58 @@ +#ifndef _DOLPHIN_TYPES_H_ +#define _DOLPHIN_TYPES_H_ + +typedef signed char s8; +typedef unsigned char u8; +typedef signed short int s16; +typedef unsigned short int u16; +typedef signed long s32; +typedef unsigned long u32; +typedef signed long long int s64; +typedef unsigned long long int u64; + +typedef volatile u8 vu8; +typedef volatile u16 vu16; +typedef volatile u32 vu32; +typedef volatile u64 vu64; +typedef volatile s8 vs8; +typedef volatile s16 vs16; +typedef volatile s32 vs32; +typedef volatile s64 vs64; + +typedef float f32; +typedef double f64; + +typedef volatile f32 vf32; +typedef volatile f64 vf64; + +typedef char *Ptr; + +typedef int BOOL; + +typedef unsigned int uint; + +#define FALSE 0 +#define TRUE 1 + +#if defined(__MWERKS__) +#define AT_ADDRESS(addr) : (addr) +#elif defined(__GNUC__) +//#define AT_ADDRESS(addr) __attribute__((address((addr)))) +#define AT_ADDRESS(addr) // was removed in GCC. define in linker script instead. +#else +#error unknown compiler +#endif + +#define ATTRIBUTE_ALIGN(num) __attribute__((aligned(num))) + +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void*)0) +#endif +#endif + +#include "stddef.h" + +#endif |
