diff --git a/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFRC10JAISoundID.s b/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFRC10JAISoundID.s deleted file mode 100644 index b252d474614..00000000000 --- a/asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFRC10JAISoundID.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802B995C: -/* 802B995C 80 04 00 00 */ lwz r0, 0(r4) -/* 802B9960 90 03 00 00 */ stw r0, 0(r3) -/* 802B9964 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeMgrFv.s deleted file mode 100644 index 23858d6d86b..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeMgrFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802AEB04: -/* 802AEB04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AEB08 7C 08 02 A6 */ mflr r0 -/* 802AEB0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AEB10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AEB14 7C 7F 1B 78 */ mr r31, r3 -/* 802AEB18 48 00 01 A5 */ bl resetMultiSePos__12Z2MultiSeMgrFv -/* 802AEB1C 7F E3 FB 78 */ mr r3, r31 -/* 802AEB20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AEB24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AEB28 7C 08 03 A6 */ mtlr r0 -/* 802AEB2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AEB30 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeObjFv.s b/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeObjFv.s deleted file mode 100644 index e3985797dda..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeObjFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802AB710: -/* 802AB710 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB714 7C 08 02 A6 */ mflr r0 -/* 802AB718 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB71C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB720 7C 7F 1B 78 */ mr r31, r3 -/* 802AB724 48 00 33 E1 */ bl __ct__12Z2MultiSeMgrFv -/* 802AB728 38 00 FF FF */ li r0, -1 -/* 802AB72C 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802AB730 38 00 00 00 */ li r0, 0 -/* 802AB734 98 1F 00 20 */ stb r0, 0x20(r31) -/* 802AB738 7F E3 FB 78 */ mr r3, r31 -/* 802AB73C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB740 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB744 7C 08 03 A6 */ mtlr r0 -/* 802AB748 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB74C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/__dt__12Z2MultiSeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/__dt__12Z2MultiSeMgrFv.s deleted file mode 100644 index 360c66531d9..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/__dt__12Z2MultiSeMgrFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802AEB34: -/* 802AEB34 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AEB38 7C 08 02 A6 */ mflr r0 -/* 802AEB3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AEB40 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AEB44 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802AEB48 41 82 00 10 */ beq lbl_802AEB58 -/* 802AEB4C 7C 80 07 35 */ extsh. r0, r4 -/* 802AEB50 40 81 00 08 */ ble lbl_802AEB58 -/* 802AEB54 48 02 01 E9 */ bl __dl__FPv -lbl_802AEB58: -/* 802AEB58 7F E3 FB 78 */ mr r3, r31 -/* 802AEB5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AEB60 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AEB64 7C 08 03 A6 */ mtlr r0 -/* 802AEB68 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AEB6C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/decrCrowdSize__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/decrCrowdSize__7Z2SeMgrFv.s deleted file mode 100644 index 715e8c97034..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/decrCrowdSize__7Z2SeMgrFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802AB960: -/* 802AB960 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB964 38 04 FF FF */ addi r0, r4, -1 -/* 802AB968 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB96C 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB970 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB974 4C 81 00 20 */ blelr -/* 802AB978 38 00 00 00 */ li r0, 0 -/* 802AB97C 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB980 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/incrCrowdSize__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/incrCrowdSize__7Z2SeMgrFv.s deleted file mode 100644 index 8199259d69d..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/incrCrowdSize__7Z2SeMgrFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802AB93C: -/* 802AB93C 88 83 03 CC */ lbz r4, 0x3cc(r3) -/* 802AB940 38 04 00 01 */ addi r0, r4, 1 -/* 802AB944 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB948 88 03 03 CC */ lbz r0, 0x3cc(r3) -/* 802AB94C 28 00 00 64 */ cmplwi r0, 0x64 -/* 802AB950 4C 81 00 20 */ blelr -/* 802AB954 38 00 00 64 */ li r0, 0x64 -/* 802AB958 98 03 03 CC */ stb r0, 0x3cc(r3) -/* 802AB95C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/resetModY__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/resetModY__7Z2SeMgrFv.s deleted file mode 100644 index b90802d5721..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/resetModY__7Z2SeMgrFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_802AB80C: -/* 802AB80C 38 80 00 00 */ li r4, 0 -/* 802AB810 7C 85 23 78 */ mr r5, r4 -/* 802AB814 38 00 00 08 */ li r0, 8 -/* 802AB818 7C 09 03 A6 */ mtctr r0 -lbl_802AB81C: -/* 802AB81C 38 04 03 A0 */ addi r0, r4, 0x3a0 -/* 802AB820 7C A3 01 2E */ stwx r5, r3, r0 -/* 802AB824 38 84 00 04 */ addi r4, r4, 4 -/* 802AB828 42 00 FF F4 */ bdnz lbl_802AB81C -/* 802AB82C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SeMgr/resetMultiSePos__12Z2MultiSeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/resetMultiSePos__12Z2MultiSeMgrFv.s deleted file mode 100644 index 33ad0fb6a61..00000000000 --- a/asm/Z2AudioLib/Z2SeMgr/resetMultiSePos__12Z2MultiSeMgrFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802AECBC: -/* 802AECBC 38 00 FF FF */ li r0, -1 -/* 802AECC0 98 03 00 18 */ stb r0, 0x18(r3) -/* 802AECC4 C0 02 BE 78 */ lfs f0, lit_4040(r2) -/* 802AECC8 D0 03 00 08 */ stfs f0, 8(r3) -/* 802AECCC D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802AECD0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 802AECD4 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 802AECD8 D0 03 00 04 */ stfs f0, 4(r3) -/* 802AECDC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/__ct__14Z2SoundHandlesFv.s b/asm/Z2AudioLib/Z2SoundHandles/__ct__14Z2SoundHandlesFv.s deleted file mode 100644 index 2456b05b67c..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/__ct__14Z2SoundHandlesFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802AB07C: -/* 802AB07C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB080 7C 08 02 A6 */ mflr r0 -/* 802AB084 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB088 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB08C 7C 7F 1B 78 */ mr r31, r3 -/* 802AB090 48 03 0E 85 */ bl initiate__10JSUPtrListFv -/* 802AB094 38 00 00 00 */ li r0, 0 -/* 802AB098 98 1F 00 0C */ stb r0, 0xc(r31) -/* 802AB09C 7F E3 FB 78 */ mr r3, r31 -/* 802AB0A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB0A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB0A8 7C 08 03 A6 */ mtlr r0 -/* 802AB0AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB0B0 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/__dt__14Z2SoundHandlesFv.s b/asm/Z2AudioLib/Z2SoundHandles/__dt__14Z2SoundHandlesFv.s deleted file mode 100644 index 6011ac3fd31..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/__dt__14Z2SoundHandlesFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802AB0B4: -/* 802AB0B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB0B8 7C 08 02 A6 */ mflr r0 -/* 802AB0BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB0C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB0C4 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB0C8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802AB0CC 7C 9F 23 78 */ mr r31, r4 -/* 802AB0D0 41 82 00 2C */ beq lbl_802AB0FC -/* 802AB0D4 48 00 00 4D */ bl deleteHandlesPool__14Z2SoundHandlesFv -/* 802AB0D8 28 1E 00 00 */ cmplwi r30, 0 -/* 802AB0DC 41 82 00 10 */ beq lbl_802AB0EC -/* 802AB0E0 7F C3 F3 78 */ mr r3, r30 -/* 802AB0E4 38 80 00 00 */ li r4, 0 -/* 802AB0E8 48 03 0D C5 */ bl __dt__10JSUPtrListFv -lbl_802AB0EC: -/* 802AB0EC 7F E0 07 35 */ extsh. r0, r31 -/* 802AB0F0 40 81 00 0C */ ble lbl_802AB0FC -/* 802AB0F4 7F C3 F3 78 */ mr r3, r30 -/* 802AB0F8 48 02 3C 45 */ bl __dl__FPv -lbl_802AB0FC: -/* 802AB0FC 7F C3 F3 78 */ mr r3, r30 -/* 802AB100 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB104 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB108 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB10C 7C 08 03 A6 */ mtlr r0 -/* 802AB110 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB114 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s deleted file mode 100644 index 3ce4cc0bf23..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802AB254: -/* 802AB254 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB258 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB25C 80 04 00 00 */ lwz r0, 0(r4) -/* 802AB260 48 00 00 2C */ b lbl_802AB28C -lbl_802AB264: -/* 802AB264 80 65 00 00 */ lwz r3, 0(r5) -/* 802AB268 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB26C 28 04 00 00 */ cmplwi r4, 0 -/* 802AB270 41 82 00 18 */ beq lbl_802AB288 -/* 802AB274 80 84 00 18 */ lwz r4, 0x18(r4) -/* 802AB278 90 81 00 08 */ stw r4, 8(r1) -/* 802AB27C 7C 04 00 40 */ cmplw r4, r0 -/* 802AB280 40 82 00 08 */ bne lbl_802AB288 -/* 802AB284 48 00 00 14 */ b lbl_802AB298 -lbl_802AB288: -/* 802AB288 80 A5 00 0C */ lwz r5, 0xc(r5) -lbl_802AB28C: -/* 802AB28C 28 05 00 00 */ cmplwi r5, 0 -/* 802AB290 40 82 FF D4 */ bne lbl_802AB264 -/* 802AB294 38 60 00 00 */ li r3, 0 -lbl_802AB298: -/* 802AB298 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB29C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s b/asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s deleted file mode 100644 index 71881ad4502..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802AB2A0: -/* 802AB2A0 80 C3 00 00 */ lwz r6, 0(r3) -/* 802AB2A4 48 00 00 24 */ b lbl_802AB2C8 -lbl_802AB2A8: -/* 802AB2A8 80 66 00 00 */ lwz r3, 0(r6) -/* 802AB2AC 80 A3 00 00 */ lwz r5, 0(r3) -/* 802AB2B0 28 05 00 00 */ cmplwi r5, 0 -/* 802AB2B4 41 82 00 10 */ beq lbl_802AB2C4 -/* 802AB2B8 80 05 00 20 */ lwz r0, 0x20(r5) -/* 802AB2BC 7C 04 00 40 */ cmplw r4, r0 -/* 802AB2C0 4D 82 00 20 */ beqlr -lbl_802AB2C4: -/* 802AB2C4 80 C6 00 0C */ lwz r6, 0xc(r6) -lbl_802AB2C8: -/* 802AB2C8 28 06 00 00 */ cmplwi r6, 0 -/* 802AB2CC 40 82 FF DC */ bne lbl_802AB2A8 -/* 802AB2D0 38 60 00 00 */ li r3, 0 -/* 802AB2D4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s b/asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s deleted file mode 100644 index 7e2ceafae05..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_802AB504: -/* 802AB504 80 83 00 00 */ lwz r4, 0(r3) -/* 802AB508 48 00 00 20 */ b lbl_802AB528 -lbl_802AB50C: -/* 802AB50C 80 64 00 00 */ lwz r3, 0(r4) -/* 802AB510 80 03 00 00 */ lwz r0, 0(r3) -/* 802AB514 28 00 00 00 */ cmplwi r0, 0 -/* 802AB518 41 82 00 0C */ beq lbl_802AB524 -/* 802AB51C 38 60 00 01 */ li r3, 1 -/* 802AB520 4E 80 00 20 */ blr -lbl_802AB524: -/* 802AB524 80 84 00 0C */ lwz r4, 0xc(r4) -lbl_802AB528: -/* 802AB528 28 04 00 00 */ cmplwi r4, 0 -/* 802AB52C 40 82 FF E0 */ bne lbl_802AB50C -/* 802AB530 38 60 00 00 */ li r3, 0 -/* 802AB534 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundHandles/stopAllSounds__14Z2SoundHandlesFUl.s b/asm/Z2AudioLib/Z2SoundHandles/stopAllSounds__14Z2SoundHandlesFUl.s deleted file mode 100644 index c3c197ed6bd..00000000000 --- a/asm/Z2AudioLib/Z2SoundHandles/stopAllSounds__14Z2SoundHandlesFUl.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_802AB4A0: -/* 802AB4A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802AB4A4 7C 08 02 A6 */ mflr r0 -/* 802AB4A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802AB4AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802AB4B0 93 C1 00 08 */ stw r30, 8(r1) -/* 802AB4B4 7C 9E 23 78 */ mr r30, r4 -/* 802AB4B8 83 E3 00 00 */ lwz r31, 0(r3) -/* 802AB4BC 48 00 00 28 */ b lbl_802AB4E4 -lbl_802AB4C0: -/* 802AB4C0 80 7F 00 00 */ lwz r3, 0(r31) -/* 802AB4C4 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4C8 41 82 00 18 */ beq lbl_802AB4E0 -/* 802AB4CC 80 63 00 00 */ lwz r3, 0(r3) -/* 802AB4D0 28 03 00 00 */ cmplwi r3, 0 -/* 802AB4D4 41 82 00 0C */ beq lbl_802AB4E0 -/* 802AB4D8 7F C4 F3 78 */ mr r4, r30 -/* 802AB4DC 4B FF 70 01 */ bl stop__8JAISoundFUl -lbl_802AB4E0: -/* 802AB4E0 83 FF 00 0C */ lwz r31, 0xc(r31) -lbl_802AB4E4: -/* 802AB4E4 28 1F 00 00 */ cmplwi r31, 0 -/* 802AB4E8 40 82 FF D8 */ bne lbl_802AB4C0 -/* 802AB4EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802AB4F0 83 C1 00 08 */ lwz r30, 8(r1) -/* 802AB4F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802AB4F8 7C 08 03 A6 */ mtlr r0 -/* 802AB4FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802AB500 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObjMgr/deleteEnemyAll__13Z2SoundObjMgrFv.s b/asm/Z2AudioLib/Z2SoundObjMgr/deleteEnemyAll__13Z2SoundObjMgrFv.s deleted file mode 100644 index 8fe018495c4..00000000000 --- a/asm/Z2AudioLib/Z2SoundObjMgr/deleteEnemyAll__13Z2SoundObjMgrFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_802C013C: -/* 802C013C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802C0140 7C 08 02 A6 */ mflr r0 -/* 802C0144 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802C014C 7C 7F 1B 78 */ mr r31, r3 -/* 802C0150 48 00 00 20 */ b lbl_802C0170 -lbl_802C0154: -/* 802C0154 80 63 00 00 */ lwz r3, 0(r3) -/* 802C0158 28 03 00 00 */ cmplwi r3, 0 -/* 802C015C 41 82 00 14 */ beq lbl_802C0170 -/* 802C0160 81 83 00 00 */ lwz r12, 0(r3) -/* 802C0164 81 8C 00 08 */ lwz r12, 8(r12) -/* 802C0168 7D 89 03 A6 */ mtctr r12 -/* 802C016C 4E 80 04 21 */ bctrl -lbl_802C0170: -/* 802C0170 80 7F 00 00 */ lwz r3, 0(r31) -/* 802C0174 28 03 00 00 */ cmplwi r3, 0 -/* 802C0178 40 82 FF DC */ bne lbl_802C0154 -/* 802C017C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0180 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0184 7C 08 03 A6 */ mtlr r0 -/* 802C0188 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C018C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObjMgr/setGhostEnemyState__13Z2SoundObjMgrFUc.s b/asm/Z2AudioLib/Z2SoundObjMgr/setGhostEnemyState__13Z2SoundObjMgrFUc.s deleted file mode 100644 index 565ac2dfad0..00000000000 --- a/asm/Z2AudioLib/Z2SoundObjMgr/setGhostEnemyState__13Z2SoundObjMgrFUc.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_802BFFEC: -/* 802BFFEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BFFF0 7C 08 02 A6 */ mflr r0 -/* 802BFFF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BFFF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BFFFC 93 C1 00 08 */ stw r30, 8(r1) -/* 802C0000 7C 7E 1B 78 */ mr r30, r3 -/* 802C0004 7C 9F 23 78 */ mr r31, r4 -/* 802C0008 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802C000C 28 00 00 20 */ cmplwi r0, 0x20 -/* 802C0010 40 82 00 24 */ bne lbl_802C0034 -/* 802C0014 88 7E 00 1A */ lbz r3, 0x1a(r30) -/* 802C0018 88 1E 00 16 */ lbz r0, 0x16(r30) -/* 802C001C 7C 03 00 40 */ cmplw r3, r0 -/* 802C0020 41 80 00 2C */ blt lbl_802C004C -/* 802C0024 80 6D 86 04 */ lwz r3, data_80450B84(r13) -/* 802C0028 38 80 00 01 */ li r4, 1 -/* 802C002C 4B FF 43 B5 */ bl setBattleGhostMute__8Z2SeqMgrFb -/* 802C0030 48 00 00 1C */ b lbl_802C004C -lbl_802C0034: -/* 802C0034 88 1E 00 1A */ lbz r0, 0x1a(r30) -/* 802C0038 28 00 00 00 */ cmplwi r0, 0 -/* 802C003C 40 82 00 10 */ bne lbl_802C004C -/* 802C0040 38 00 00 00 */ li r0, 0 -/* 802C0044 98 1E 00 19 */ stb r0, 0x19(r30) -/* 802C0048 48 00 00 14 */ b lbl_802C005C -lbl_802C004C: -/* 802C004C 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 802C0050 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 802C0054 7C 1F 02 14 */ add r0, r31, r0 -/* 802C0058 98 1E 00 19 */ stb r0, 0x19(r30) -lbl_802C005C: -/* 802C005C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802C0060 83 C1 00 08 */ lwz r30, 8(r1) -/* 802C0064 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802C0068 7C 08 03 A6 */ mtlr r0 -/* 802C006C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802C0070 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s b/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s deleted file mode 100644 index 1e60b03bbf5..00000000000 --- a/asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802BDEF0: -/* 802BDEF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDEF4 7C 08 02 A6 */ mflr r0 -/* 802BDEF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDEFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF00 7C 7F 1B 78 */ mr r31, r3 -/* 802BDF04 4B FE D1 79 */ bl __ct__14Z2SoundHandlesFv -/* 802BDF08 3C 60 80 3D */ lis r3, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */ -/* 802BDF0C 38 03 AD 50 */ addi r0, r3, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */ -/* 802BDF10 90 1F 00 10 */ stw r0, 0x10(r31) -/* 802BDF14 38 60 00 00 */ li r3, 0 -/* 802BDF18 90 7F 00 18 */ stw r3, 0x18(r31) -/* 802BDF1C 98 7F 00 1F */ stb r3, 0x1f(r31) -/* 802BDF20 80 0D 85 F4 */ lwz r0, data_80450B74(r13) -/* 802BDF24 90 1F 00 14 */ stw r0, 0x14(r31) -/* 802BDF28 B0 7F 00 1C */ sth r3, 0x1c(r31) -/* 802BDF2C 98 7F 00 1E */ stb r3, 0x1e(r31) -/* 802BDF30 7F E3 FB 78 */ mr r3, r31 -/* 802BDF34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDF3C 7C 08 03 A6 */ mtlr r0 -/* 802BDF40 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDF44 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s b/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s deleted file mode 100644 index 2be00306532..00000000000 --- a/asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_802BDF48: -/* 802BDF48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDF4C 7C 08 02 A6 */ mflr r0 -/* 802BDF50 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDF54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDF58 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDF5C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802BDF60 7C 9F 23 78 */ mr r31, r4 -/* 802BDF64 41 82 00 30 */ beq lbl_802BDF94 -/* 802BDF68 3C 80 80 3D */ lis r4, __vt__14Z2SoundObjBase@ha /* 0x803CAD50@ha */ -/* 802BDF6C 38 04 AD 50 */ addi r0, r4, __vt__14Z2SoundObjBase@l /* 0x803CAD50@l */ -/* 802BDF70 90 1E 00 10 */ stw r0, 0x10(r30) -/* 802BDF74 48 00 00 85 */ bl deleteObject__14Z2SoundObjBaseFv -/* 802BDF78 7F C3 F3 78 */ mr r3, r30 -/* 802BDF7C 38 80 00 00 */ li r4, 0 -/* 802BDF80 4B FE D1 35 */ bl __dt__14Z2SoundHandlesFv -/* 802BDF84 7F E0 07 35 */ extsh. r0, r31 -/* 802BDF88 40 81 00 0C */ ble lbl_802BDF94 -/* 802BDF8C 7F C3 F3 78 */ mr r3, r30 -/* 802BDF90 48 01 0D AD */ bl __dl__FPv -lbl_802BDF94: -/* 802BDF94 7F C3 F3 78 */ mr r3, r30 -/* 802BDF98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDF9C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFA4 7C 08 03 A6 */ mtlr r0 -/* 802BDFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFAC 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s b/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s deleted file mode 100644 index 4e03518fd54..00000000000 --- a/asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802BE038: -/* 802BE038 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE03C 7C 08 02 A6 */ mflr r0 -/* 802BE040 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE044 88 03 00 1F */ lbz r0, 0x1f(r3) -/* 802BE048 28 00 00 00 */ cmplwi r0, 0 -/* 802BE04C 41 82 00 14 */ beq lbl_802BE060 -/* 802BE050 B0 83 00 1C */ sth r4, 0x1c(r3) -/* 802BE054 98 A3 00 1E */ stb r5, 0x1e(r3) -/* 802BE058 80 83 00 18 */ lwz r4, 0x18(r3) -/* 802BE05C 4B FE D4 DD */ bl func_802AB538 -lbl_802BE060: -/* 802BE060 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE064 7C 08 03 A6 */ mtlr r0 -/* 802BE068 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE06C 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s b/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s deleted file mode 100644 index 8d5215d6a0b..00000000000 --- a/asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_802BDFB0: -/* 802BDFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BDFB4 7C 08 02 A6 */ mflr r0 -/* 802BDFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BDFBC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BDFC0 93 C1 00 08 */ stw r30, 8(r1) -/* 802BDFC4 7C 7E 1B 78 */ mr r30, r3 -/* 802BDFC8 7C 9F 23 78 */ mr r31, r4 -/* 802BDFCC 7C A4 2B 78 */ mr r4, r5 -/* 802BDFD0 4B FE D1 49 */ bl initHandlesPool__14Z2SoundHandlesFUc -/* 802BDFD4 93 FE 00 18 */ stw r31, 0x18(r30) -/* 802BDFD8 38 00 00 01 */ li r0, 1 -/* 802BDFDC 98 1E 00 1F */ stb r0, 0x1f(r30) -/* 802BDFE0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802BDFE4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802BDFE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BDFEC 7C 08 03 A6 */ mtlr r0 -/* 802BDFF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BDFF4 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s b/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s deleted file mode 100644 index d35d2a9a303..00000000000 --- a/asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_802BE880: -/* 802BE880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802BE884 7C 08 02 A6 */ mflr r0 -/* 802BE888 90 01 00 14 */ stw r0, 0x14(r1) -/* 802BE88C 4B FF F7 25 */ bl init__14Z2SoundObjBaseFP3VecUc -/* 802BE890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802BE894 7C 08 03 A6 */ mtlr r0 -/* 802BE898 38 21 00 10 */ addi r1, r1, 0x10 -/* 802BE89C 4E 80 00 20 */ blr diff --git a/asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s b/asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s deleted file mode 100644 index d175d36a3c2..00000000000 --- a/asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80031FCC: -/* 80031FCC 38 80 00 00 */ li r4, 0 -/* 80031FD0 A8 03 00 08 */ lha r0, 8(r3) -/* 80031FD4 2C 00 02 21 */ cmpwi r0, 0x221 -/* 80031FD8 40 82 00 14 */ bne lbl_80031FEC -/* 80031FDC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80031FE0 28 00 00 04 */ cmplwi r0, 4 -/* 80031FE4 40 82 00 08 */ bne lbl_80031FEC -/* 80031FE8 38 80 00 01 */ li r4, 1 -lbl_80031FEC: -/* 80031FEC 7C 83 23 78 */ mr r3, r4 -/* 80031FF0 4E 80 00 20 */ blr diff --git a/asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s b/asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s deleted file mode 100644 index d0a0fa7d86f..00000000000 --- a/asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003201C: -/* 8003201C 38 80 00 00 */ li r4, 0 -/* 80032020 A8 03 00 08 */ lha r0, 8(r3) -/* 80032024 2C 00 02 21 */ cmpwi r0, 0x221 -/* 80032028 40 82 00 14 */ bne lbl_8003203C -/* 8003202C 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80032030 28 00 00 07 */ cmplwi r0, 7 -/* 80032034 40 82 00 08 */ bne lbl_8003203C -/* 80032038 38 80 00 01 */ li r4, 1 -lbl_8003203C: -/* 8003203C 7C 83 23 78 */ mr r3, r4 -/* 80032040 4E 80 00 20 */ blr diff --git a/asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s b/asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s deleted file mode 100644 index 8788ebadd46..00000000000 --- a/asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80031F94: -/* 80031F94 38 80 00 00 */ li r4, 0 -/* 80031F98 80 A3 04 9C */ lwz r5, 0x49c(r3) -/* 80031F9C 54 A0 04 A5 */ rlwinm. r0, r5, 0, 0x12, 0x12 -/* 80031FA0 40 82 00 20 */ bne lbl_80031FC0 -/* 80031FA4 54 A0 02 D7 */ rlwinm. r0, r5, 0, 0xb, 0xb -/* 80031FA8 40 82 00 18 */ bne lbl_80031FC0 -/* 80031FAC 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 80031FB0 28 00 00 02 */ cmplwi r0, 2 -/* 80031FB4 41 82 00 0C */ beq lbl_80031FC0 -/* 80031FB8 28 00 00 01 */ cmplwi r0, 1 -/* 80031FBC 40 82 00 08 */ bne lbl_80031FC4 -lbl_80031FC0: -/* 80031FC0 38 80 00 01 */ li r4, 1 -lbl_80031FC4: -/* 80031FC4 7C 83 23 78 */ mr r3, r4 -/* 80031FC8 4E 80 00 20 */ blr diff --git a/asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s b/asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s deleted file mode 100644 index 79d655a18c3..00000000000 --- a/asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80031FF4: -/* 80031FF4 38 80 00 00 */ li r4, 0 -/* 80031FF8 A8 03 00 08 */ lha r0, 8(r3) -/* 80031FFC 2C 00 02 21 */ cmpwi r0, 0x221 -/* 80032000 40 82 00 14 */ bne lbl_80032014 -/* 80032004 80 03 0B 4C */ lwz r0, 0xb4c(r3) -/* 80032008 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8003200C 41 82 00 08 */ beq lbl_80032014 -/* 80032010 38 80 00 01 */ li r4, 1 -lbl_80032014: -/* 80032014 7C 83 23 78 */ mr r3, r4 -/* 80032018 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/__ct__11dEvt_info_cFv.s b/asm/d/event/d_event/__ct__11dEvt_info_cFv.s deleted file mode 100644 index 2740f00a71f..00000000000 --- a/asm/d/event/d_event/__ct__11dEvt_info_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800433F0: -/* 800433F0 3C 80 80 3A */ lis r4, __vt__11dEvt_info_c@ha /* 0x803A35D0@ha */ -/* 800433F4 38 04 35 D0 */ addi r0, r4, __vt__11dEvt_info_c@l /* 0x803A35D0@l */ -/* 800433F8 90 03 00 00 */ stw r0, 0(r3) -/* 800433FC 38 80 00 00 */ li r4, 0 -/* 80043400 B0 83 00 04 */ sth r4, 4(r3) -/* 80043404 38 00 00 02 */ li r0, 2 -/* 80043408 B0 03 00 06 */ sth r0, 6(r3) -/* 8004340C 38 00 FF FF */ li r0, -1 -/* 80043410 B0 03 00 08 */ sth r0, 8(r3) -/* 80043414 38 00 00 FF */ li r0, 0xff -/* 80043418 98 03 00 0A */ stb r0, 0xa(r3) -/* 8004341C 90 83 00 0C */ stw r4, 0xc(r3) -/* 80043420 98 83 00 0B */ stb r4, 0xb(r3) -/* 80043424 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/__ct__14dEvt_control_cFv.s b/asm/d/event/d_event/__ct__14dEvt_control_cFv.s deleted file mode 100644 index 78eff05da20..00000000000 --- a/asm/d/event/d_event/__ct__14dEvt_control_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80041580: -/* 80041580 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80041584 7C 08 02 A6 */ mflr r0 -/* 80041588 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004158C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80041590 7C 7F 1B 78 */ mr r31, r3 -/* 80041594 38 7F 00 04 */ addi r3, r31, 4 -/* 80041598 3C 80 80 04 */ lis r4, __ct__12dEvt_order_cFv@ha /* 0x800415D4@ha */ -/* 8004159C 38 84 15 D4 */ addi r4, r4, __ct__12dEvt_order_cFv@l /* 0x800415D4@l */ -/* 800415A0 3C A0 80 03 */ lis r5, __dt__12dEvt_order_cFv@ha /* 0x80030154@ha */ -/* 800415A4 38 A5 01 54 */ addi r5, r5, __dt__12dEvt_order_cFv@l /* 0x80030154@l */ -/* 800415A8 38 C0 00 18 */ li r6, 0x18 -/* 800415AC 38 E0 00 08 */ li r7, 8 -/* 800415B0 48 32 07 B1 */ bl __construct_array -/* 800415B4 7F E3 FB 78 */ mr r3, r31 -/* 800415B8 48 00 1C 31 */ bl remove__14dEvt_control_cFv -/* 800415BC 7F E3 FB 78 */ mr r3, r31 -/* 800415C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800415C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800415C8 7C 08 03 A6 */ mtlr r0 -/* 800415CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800415D0 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/beforeProc__11dEvt_info_cFv.s b/asm/d/event/d_event/beforeProc__11dEvt_info_cFv.s deleted file mode 100644 index b04c6dc2385..00000000000 --- a/asm/d/event/d_event/beforeProc__11dEvt_info_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800434CC: -/* 800434CC 38 00 00 02 */ li r0, 2 -/* 800434D0 B0 03 00 06 */ sth r0, 6(r3) -/* 800434D4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/clearSkipSystem__14dEvt_control_cFv.s b/asm/d/event/d_event/clearSkipSystem__14dEvt_control_cFv.s deleted file mode 100644 index 4eb9253beab..00000000000 --- a/asm/d/event/d_event/clearSkipSystem__14dEvt_control_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800425B4: -/* 800425B4 38 80 00 00 */ li r4, 0 -/* 800425B8 90 83 01 00 */ stw r4, 0x100(r3) -/* 800425BC 38 00 FF FF */ li r0, -1 -/* 800425C0 90 03 01 04 */ stw r0, 0x104(r3) -/* 800425C4 90 83 01 0C */ stw r4, 0x10c(r3) -/* 800425C8 90 83 01 08 */ stw r4, 0x108(r3) -/* 800425CC A0 03 00 DA */ lhz r0, 0xda(r3) -/* 800425D0 54 00 07 BF */ clrlwi. r0, r0, 0x1e -/* 800425D4 40 82 00 08 */ bne lbl_800425DC -/* 800425D8 90 83 01 10 */ stw r4, 0x110(r3) -lbl_800425DC: -/* 800425DC 38 00 00 00 */ li r0, 0 -/* 800425E0 98 03 01 14 */ stb r0, 0x114(r3) -/* 800425E4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/getPId__14dEvt_control_cFPv.s b/asm/d/event/d_event/getPId__14dEvt_control_cFPv.s deleted file mode 100644 index 9bb78652165..00000000000 --- a/asm/d/event/d_event/getPId__14dEvt_control_cFPv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800432C8: -/* 800432C8 28 04 00 00 */ cmplwi r4, 0 -/* 800432CC 40 82 00 0C */ bne lbl_800432D8 -/* 800432D0 38 60 FF FF */ li r3, -1 -/* 800432D4 4E 80 00 20 */ blr -lbl_800432D8: -/* 800432D8 41 82 00 0C */ beq lbl_800432E4 -/* 800432DC 80 64 00 04 */ lwz r3, 4(r4) -/* 800432E0 4E 80 00 20 */ blr -lbl_800432E4: -/* 800432E4 38 60 FF FF */ li r3, -1 -/* 800432E8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/getSkipEventName__14dEvt_control_cFv.s b/asm/d/event/d_event/getSkipEventName__14dEvt_control_cFv.s deleted file mode 100644 index f6409c4eeb8..00000000000 --- a/asm/d/event/d_event/getSkipEventName__14dEvt_control_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_8004290C: -/* 8004290C 38 63 01 14 */ addi r3, r3, 0x114 -/* 80042910 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/getStageEventDt__14dEvt_control_cFv.s b/asm/d/event/d_event/getStageEventDt__14dEvt_control_cFv.s deleted file mode 100644 index 712014547cf..00000000000 --- a/asm/d/event/d_event/getStageEventDt__14dEvt_control_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80043278: -/* 80043278 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 8004327C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/offSkipFade__14dEvt_control_cFv.s b/asm/d/event/d_event/offSkipFade__14dEvt_control_cFv.s deleted file mode 100644 index 5ec531e8619..00000000000 --- a/asm/d/event/d_event/offSkipFade__14dEvt_control_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800429B4: -/* 800429B4 80 03 01 10 */ lwz r0, 0x110(r3) -/* 800429B8 2C 00 00 00 */ cmpwi r0, 0 -/* 800429BC 41 82 00 0C */ beq lbl_800429C8 -/* 800429C0 38 00 00 00 */ li r0, 0 -/* 800429C4 90 03 01 10 */ stw r0, 0x110(r3) -lbl_800429C8: -/* 800429C8 38 00 00 00 */ li r0, 0 -/* 800429CC 90 03 01 10 */ stw r0, 0x110(r3) -/* 800429D0 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/onSkipFade__14dEvt_control_cFv.s b/asm/d/event/d_event/onSkipFade__14dEvt_control_cFv.s deleted file mode 100644 index 74e77160bcf..00000000000 --- a/asm/d/event/d_event/onSkipFade__14dEvt_control_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800429A8: -/* 800429A8 38 00 00 01 */ li r0, 1 -/* 800429AC 90 03 01 10 */ stw r0, 0x110(r3) -/* 800429B0 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/potentialCheck__14dEvt_control_cFP12dEvt_order_c.s b/asm/d/event/d_event/potentialCheck__14dEvt_control_cFP12dEvt_order_c.s deleted file mode 100644 index 14d4bb4c261..00000000000 --- a/asm/d/event/d_event/potentialCheck__14dEvt_control_cFP12dEvt_order_c.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80041FA0: -/* 80041FA0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80041FA4 7C 08 02 A6 */ mflr r0 -/* 80041FA8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80041FAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80041FB0 48 32 02 2D */ bl _savegpr_29 -/* 80041FB4 7C 7D 1B 78 */ mr r29, r3 -/* 80041FB8 7C 9E 23 78 */ mr r30, r4 -/* 80041FBC 83 E4 00 08 */ lwz r31, 8(r4) -/* 80041FC0 4B FF F9 75 */ bl beforeFlagProc__14dEvt_control_cFP12dEvt_order_c -/* 80041FC4 2C 03 00 00 */ cmpwi r3, 0 -/* 80041FC8 40 82 00 0C */ bne lbl_80041FD4 -/* 80041FCC 38 60 00 00 */ li r3, 0 -/* 80041FD0 48 00 00 2C */ b lbl_80041FFC -lbl_80041FD4: -/* 80041FD4 38 00 00 02 */ li r0, 2 -/* 80041FD8 B0 1F 00 F8 */ sth r0, 0xf8(r31) -/* 80041FDC 98 1D 00 E4 */ stb r0, 0xe4(r29) -/* 80041FE0 7F A3 EB 78 */ mr r3, r29 -/* 80041FE4 7F C4 F3 78 */ mr r4, r30 -/* 80041FE8 4B FF F8 1D */ bl setParam__14dEvt_control_cFP12dEvt_order_c -/* 80041FEC 7F A3 EB 78 */ mr r3, r29 -/* 80041FF0 7F C4 F3 78 */ mr r4, r30 -/* 80041FF4 4B FF F9 71 */ bl afterFlagProc__14dEvt_control_cFP12dEvt_order_c -/* 80041FF8 38 60 00 01 */ li r3, 1 -lbl_80041FFC: -/* 80041FFC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80042000 48 32 02 29 */ bl _restgpr_29 -/* 80042004 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80042008 7C 08 03 A6 */ mtlr r0 -/* 8004200C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80042010 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/remove__14dEvt_control_cFv.s b/asm/d/event/d_event/remove__14dEvt_control_cFv.s deleted file mode 100644 index 3395697e96d..00000000000 --- a/asm/d/event/d_event/remove__14dEvt_control_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_800431E8: -/* 800431E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800431EC 7C 08 02 A6 */ mflr r0 -/* 800431F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800431F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800431F8 7C 7F 1B 78 */ mr r31, r3 -/* 800431FC 38 80 00 00 */ li r4, 0 -/* 80043200 98 83 00 E4 */ stb r4, 0xe4(r3) -/* 80043204 98 83 00 E5 */ stb r4, 0xe5(r3) -/* 80043208 98 83 00 E2 */ stb r4, 0xe2(r3) -/* 8004320C 98 83 00 E9 */ stb r4, 0xe9(r3) -/* 80043210 98 83 00 E6 */ stb r4, 0xe6(r3) -/* 80043214 98 83 00 E7 */ stb r4, 0xe7(r3) -/* 80043218 C0 02 84 CC */ lfs f0, lit_5095(r2) -/* 8004321C D0 03 00 F0 */ stfs f0, 0xf0(r3) -/* 80043220 38 00 00 FF */ li r0, 0xff -/* 80043224 98 03 00 EA */ stb r0, 0xea(r3) -/* 80043228 98 03 00 EB */ stb r0, 0xeb(r3) -/* 8004322C 98 03 00 EC */ stb r0, 0xec(r3) -/* 80043230 90 83 00 F4 */ stw r4, 0xf4(r3) -/* 80043234 B0 03 00 E0 */ sth r0, 0xe0(r3) -/* 80043238 98 83 00 ED */ stb r4, 0xed(r3) -/* 8004323C 98 03 00 EE */ stb r0, 0xee(r3) -/* 80043240 B0 83 00 D8 */ sth r4, 0xd8(r3) -/* 80043244 B0 83 00 DA */ sth r4, 0xda(r3) -/* 80043248 90 83 00 F8 */ stw r4, 0xf8(r3) -/* 8004324C 4B FF F3 69 */ bl clearSkipSystem__14dEvt_control_cFv -/* 80043250 38 00 00 00 */ li r0, 0 -/* 80043254 98 1F 01 28 */ stb r0, 0x128(r31) -/* 80043258 98 1F 01 29 */ stb r0, 0x129(r31) -/* 8004325C 38 00 FF FF */ li r0, -1 -/* 80043260 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 80043264 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80043268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8004326C 7C 08 03 A6 */ mtlr r0 -/* 80043270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043274 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/runningEventID__14dEvt_control_cFs.s b/asm/d/event/d_event/runningEventID__14dEvt_control_cFs.s deleted file mode 100644 index a62a9d2cc3c..00000000000 --- a/asm/d/event/d_event/runningEventID__14dEvt_control_cFs.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_8004360C: -/* 8004360C 7C 85 07 34 */ extsh r5, r4 -/* 80043610 A8 03 00 E0 */ lha r0, 0xe0(r3) -/* 80043614 7C 05 00 00 */ cmpw r5, r0 -/* 80043618 40 82 00 0C */ bne lbl_80043624 -/* 8004361C A8 63 00 DE */ lha r3, 0xde(r3) -/* 80043620 4E 80 00 20 */ blr -lbl_80043624: -/* 80043624 7C 83 23 78 */ mr r3, r4 -/* 80043628 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/sceneChange__14dEvt_control_cFi.s b/asm/d/event/d_event/sceneChange__14dEvt_control_cFi.s deleted file mode 100644 index ec21a094ceb..00000000000 --- a/asm/d/event/d_event/sceneChange__14dEvt_control_cFi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80043280: -/* 80043280 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80043284 7C 08 02 A6 */ mflr r0 -/* 80043288 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004328C 7C 66 1B 78 */ mr r6, r3 -/* 80043290 7C 83 23 78 */ mr r3, r4 -/* 80043294 80 06 01 2C */ lwz r0, 0x12c(r6) -/* 80043298 7C 04 07 74 */ extsb r4, r0 -/* 8004329C 38 A0 FF FF */ li r5, -1 -/* 800432A0 88 C6 01 29 */ lbz r6, 0x129(r6) -/* 800432A4 C0 22 84 CC */ lfs f1, lit_5095(r2) -/* 800432A8 38 E0 00 00 */ li r7, 0 -/* 800432AC 39 00 00 00 */ li r8, 0 -/* 800432B0 39 20 FF FF */ li r9, -1 -/* 800432B4 4B FE 40 3D */ bl dStage_changeScene4Event__FiScibfUlsi -/* 800432B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800432BC 7C 08 03 A6 */ mtlr r0 -/* 800432C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800432C4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPt1__14dEvt_control_cFPv.s b/asm/d/event/d_event/setPt1__14dEvt_control_cFPv.s deleted file mode 100644 index 01aa8c27c03..00000000000 --- a/asm/d/event/d_event/setPt1__14dEvt_control_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8004362C: -/* 8004362C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80043630 7C 08 02 A6 */ mflr r0 -/* 80043634 90 01 00 14 */ stw r0, 0x14(r1) -/* 80043638 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8004363C 7C 7F 1B 78 */ mr r31, r3 -/* 80043640 4B FF FC 89 */ bl getPId__14dEvt_control_cFPv -/* 80043644 90 7F 00 C4 */ stw r3, 0xc4(r31) -/* 80043648 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8004364C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80043650 7C 08 03 A6 */ mtlr r0 -/* 80043654 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043658 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPt2__14dEvt_control_cFPv.s b/asm/d/event/d_event/setPt2__14dEvt_control_cFPv.s deleted file mode 100644 index 5c6ff5bf8c3..00000000000 --- a/asm/d/event/d_event/setPt2__14dEvt_control_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8004365C: -/* 8004365C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80043660 7C 08 02 A6 */ mflr r0 -/* 80043664 90 01 00 14 */ stw r0, 0x14(r1) -/* 80043668 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8004366C 7C 7F 1B 78 */ mr r31, r3 -/* 80043670 4B FF FC 59 */ bl getPId__14dEvt_control_cFPv -/* 80043674 90 7F 00 C8 */ stw r3, 0xc8(r31) -/* 80043678 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8004367C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80043680 7C 08 03 A6 */ mtlr r0 -/* 80043684 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043688 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPtD__14dEvt_control_cFPv.s b/asm/d/event/d_event/setPtD__14dEvt_control_cFPv.s deleted file mode 100644 index 45b8a4a90dd..00000000000 --- a/asm/d/event/d_event/setPtD__14dEvt_control_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800436F4: -/* 800436F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800436F8 7C 08 02 A6 */ mflr r0 -/* 800436FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80043700 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80043704 7C 7F 1B 78 */ mr r31, r3 -/* 80043708 4B FF FB C1 */ bl getPId__14dEvt_control_cFPv -/* 8004370C 90 7F 00 D4 */ stw r3, 0xd4(r31) -/* 80043710 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80043714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80043718 7C 08 03 A6 */ mtlr r0 -/* 8004371C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80043720 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPtI__14dEvt_control_cFPv.s b/asm/d/event/d_event/setPtI__14dEvt_control_cFPv.s deleted file mode 100644 index 83a53b281c4..00000000000 --- a/asm/d/event/d_event/setPtI__14dEvt_control_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800436BC: -/* 800436BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800436C0 7C 08 02 A6 */ mflr r0 -/* 800436C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800436C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800436CC 7C 7F 1B 78 */ mr r31, r3 -/* 800436D0 4B FF FB F9 */ bl getPId__14dEvt_control_cFPv -/* 800436D4 90 7F 00 D0 */ stw r3, 0xd0(r31) -/* 800436D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800436DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800436E0 7C 08 03 A6 */ mtlr r0 -/* 800436E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800436E8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setPtT__14dEvt_control_cFPv.s b/asm/d/event/d_event/setPtT__14dEvt_control_cFPv.s deleted file mode 100644 index 5ffa1cdb090..00000000000 --- a/asm/d/event/d_event/setPtT__14dEvt_control_cFPv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8004368C: -/* 8004368C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80043690 7C 08 02 A6 */ mflr r0 -/* 80043694 90 01 00 14 */ stw r0, 0x14(r1) -/* 80043698 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8004369C 7C 7F 1B 78 */ mr r31, r3 -/* 800436A0 4B FF FC 29 */ bl getPId__14dEvt_control_cFPv -/* 800436A4 90 7F 00 CC */ stw r3, 0xcc(r31) -/* 800436A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800436AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800436B0 7C 08 03 A6 */ mtlr r0 -/* 800436B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800436B8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s b/asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s deleted file mode 100644 index 7dd304ccc2b..00000000000 --- a/asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80042914: -/* 80042914 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80042918 7C 08 02 A6 */ mflr r0 -/* 8004291C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80042920 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80042924 93 C1 00 08 */ stw r30, 8(r1) -/* 80042928 7C 7E 1B 78 */ mr r30, r3 -/* 8004292C 7C DF 33 78 */ mr r31, r6 -/* 80042930 90 A3 01 00 */ stw r5, 0x100(r3) -/* 80042934 48 00 09 95 */ bl getPId__14dEvt_control_cFPv -/* 80042938 90 7E 01 04 */ stw r3, 0x104(r30) -/* 8004293C 93 FE 01 0C */ stw r31, 0x10c(r30) -/* 80042940 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80042944 83 C1 00 08 */ lwz r30, 8(r1) -/* 80042948 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8004294C 7C 08 03 A6 */ mtlr r0 -/* 80042950 38 21 00 10 */ addi r1, r1, 0x10 -/* 80042954 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event/setSkipZev__14dEvt_control_cFPvPc.s b/asm/d/event/d_event/setSkipZev__14dEvt_control_cFPvPc.s deleted file mode 100644 index 7700fb81e1b..00000000000 --- a/asm/d/event/d_event/setSkipZev__14dEvt_control_cFPvPc.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80042958: -/* 80042958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8004295C 7C 08 02 A6 */ mflr r0 -/* 80042960 90 01 00 14 */ stw r0, 0x14(r1) -/* 80042964 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80042968 93 C1 00 08 */ stw r30, 8(r1) -/* 8004296C 7C 7E 1B 78 */ mr r30, r3 -/* 80042970 7C BF 2B 78 */ mr r31, r5 -/* 80042974 3C A0 80 04 */ lis r5, dEv_defaultSkipZev__FPvi@ha /* 0x8004261C@ha */ -/* 80042978 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev__FPvi@l /* 0x8004261C@l */ -/* 8004297C 38 C0 00 01 */ li r6, 1 -/* 80042980 4B FF FF 95 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii -/* 80042984 38 7E 01 14 */ addi r3, r30, 0x114 -/* 80042988 7F E4 FB 78 */ mr r4, r31 -/* 8004298C 48 32 61 A1 */ bl strcpy -/* 80042990 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80042994 83 C1 00 08 */ lwz r30, 8(r1) -/* 80042998 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8004299C 7C 08 03 A6 */ mtlr r0 -/* 800429A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800429A4 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s b/asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s deleted file mode 100644 index 70e2d7dc403..00000000000 --- a/asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80043E30: -/* 80043E30 2C 04 FF FF */ cmpwi r4, -1 -/* 80043E34 40 82 00 0C */ bne lbl_80043E40 -/* 80043E38 38 60 00 01 */ li r3, 1 -/* 80043E3C 4E 80 00 20 */ blr -lbl_80043E40: -/* 80043E40 38 00 28 00 */ li r0, 0x2800 -/* 80043E44 7C 85 FE 70 */ srawi r5, r4, 0x1f -/* 80043E48 54 03 0F FE */ srwi r3, r0, 0x1f -/* 80043E4C 7C 00 20 10 */ subfc r0, r0, r4 -/* 80043E50 7C 65 19 14 */ adde r3, r5, r3 -/* 80043E54 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s b/asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s deleted file mode 100644 index 79b77819991..00000000000 --- a/asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_80043E58: -/* 80043E58 38 80 00 00 */ li r4, 0 -/* 80043E5C 7C 85 23 78 */ mr r5, r4 -/* 80043E60 38 00 01 40 */ li r0, 0x140 -/* 80043E64 7C 09 03 A6 */ mtctr r0 -lbl_80043E68: -/* 80043E68 7C A3 21 2E */ stwx r5, r3, r4 -/* 80043E6C 38 84 00 04 */ addi r4, r4, 4 -/* 80043E70 42 00 FF F8 */ bdnz lbl_80043E68 -/* 80043E74 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/__ct__11dEvDtBase_cFv.s b/asm/d/event/d_event_manager/__ct__11dEvDtBase_cFv.s deleted file mode 100644 index f25510471a1..00000000000 --- a/asm/d/event/d_event_manager/__ct__11dEvDtBase_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800466E0: -/* 800466E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800466E4 7C 08 02 A6 */ mflr r0 -/* 800466E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800466EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800466F0 7C 7F 1B 78 */ mr r31, r3 -/* 800466F4 4B FF FA 45 */ bl init__11dEvDtBase_cFv -/* 800466F8 7F E3 FB 78 */ mr r3, r31 -/* 800466FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80046700 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80046704 7C 08 03 A6 */ mtlr r0 -/* 80046708 38 21 00 10 */ addi r1, r1, 0x10 -/* 8004670C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/__ct__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/__ct__16dEvent_manager_cFv.s deleted file mode 100644 index 51ebce1913e..00000000000 --- a/asm/d/event/d_event_manager/__ct__16dEvent_manager_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80046688: -/* 80046688 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8004668C 7C 08 02 A6 */ mflr r0 -/* 80046690 90 01 00 14 */ stw r0, 0x14(r1) -/* 80046694 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80046698 7C 7F 1B 78 */ mr r31, r3 -/* 8004669C 3C 80 80 04 */ lis r4, __ct__11dEvDtBase_cFv@ha /* 0x800466E0@ha */ -/* 800466A0 38 84 66 E0 */ addi r4, r4, __ct__11dEvDtBase_cFv@l /* 0x800466E0@l */ -/* 800466A4 3C A0 80 03 */ lis r5, __dt__11dEvDtBase_cFv@ha /* 0x80030190@ha */ -/* 800466A8 38 A5 01 90 */ addi r5, r5, __dt__11dEvDtBase_cFv@l /* 0x80030190@l */ -/* 800466AC 38 C0 00 24 */ li r6, 0x24 -/* 800466B0 38 E0 00 0B */ li r7, 0xb -/* 800466B4 48 31 B6 AD */ bl __construct_array -/* 800466B8 38 00 FF FF */ li r0, -1 -/* 800466BC 90 1F 01 90 */ stw r0, 0x190(r31) -/* 800466C0 38 00 00 00 */ li r0, 0 -/* 800466C4 98 1F 06 BC */ stb r0, 0x6bc(r31) -/* 800466C8 7F E3 FB 78 */ mr r3, r31 -/* 800466CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800466D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800466D4 7C 08 03 A6 */ mtlr r0 -/* 800466D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800466DC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/init__18dEvent_exception_cFv.s b/asm/d/event/d_event_manager/init__18dEvent_exception_cFv.s deleted file mode 100644 index 58bc718a52a..00000000000 --- a/asm/d/event/d_event_manager/init__18dEvent_exception_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800463DC: -/* 800463DC 38 00 FF FF */ li r0, -1 -/* 800463E0 90 03 00 00 */ stw r0, 0(r3) -/* 800463E4 38 00 00 00 */ li r0, 0 -/* 800463E8 90 03 00 08 */ stw r0, 8(r3) -/* 800463EC 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/remove__16dEvent_manager_cFv.s b/asm/d/event/d_event_manager/remove__16dEvent_manager_cFv.s deleted file mode 100644 index d32d66a7df1..00000000000 --- a/asm/d/event/d_event_manager/remove__16dEvent_manager_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80046C0C: -/* 80046C0C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046C10 7C 08 02 A6 */ mflr r0 -/* 80046C14 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046C18 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046C1C 48 31 B5 C1 */ bl _savegpr_29 -/* 80046C20 7C 7D 1B 78 */ mr r29, r3 -/* 80046C24 3B C0 00 00 */ li r30, 0 -/* 80046C28 3B E0 00 00 */ li r31, 0 -lbl_80046C2C: -/* 80046C2C 7C 7D FA 14 */ add r3, r29, r31 -/* 80046C30 4B FF F5 09 */ bl init__11dEvDtBase_cFv -/* 80046C34 3B DE 00 01 */ addi r30, r30, 1 -/* 80046C38 2C 1E 00 0B */ cmpwi r30, 0xb -/* 80046C3C 3B FF 00 24 */ addi r31, r31, 0x24 -/* 80046C40 41 80 FF EC */ blt lbl_80046C2C -/* 80046C44 38 00 00 00 */ li r0, 0 -/* 80046C48 90 1D 01 8C */ stw r0, 0x18c(r29) -/* 80046C4C 38 7D 01 90 */ addi r3, r29, 0x190 -/* 80046C50 4B FF F7 8D */ bl init__18dEvent_exception_cFv -/* 80046C54 38 7D 01 BC */ addi r3, r29, 0x1bc -/* 80046C58 4B FF D2 01 */ bl init__11dEvDtFlag_cFv -/* 80046C5C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046C60 48 31 B5 C9 */ bl _restgpr_29 -/* 80046C64 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046C68 7C 08 03 A6 */ mtlr r0 -/* 80046C6C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046C70 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/roomFinish__16dEvent_manager_cFi.s b/asm/d/event/d_event_manager/roomFinish__16dEvent_manager_cFi.s deleted file mode 100644 index d5a674b0c29..00000000000 --- a/asm/d/event/d_event_manager/roomFinish__16dEvent_manager_cFi.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800469EC: -/* 800469EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800469F0 7C 08 02 A6 */ mflr r0 -/* 800469F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800469F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800469FC 48 31 B7 DD */ bl _savegpr_28 -/* 80046A00 7C 7C 1B 78 */ mr r28, r3 -/* 80046A04 7C 9D 23 78 */ mr r29, r4 -/* 80046A08 3B C0 00 04 */ li r30, 4 -/* 80046A0C 3B E0 00 90 */ li r31, 0x90 -lbl_80046A10: -/* 80046A10 7C 7C FA 14 */ add r3, r28, r31 -/* 80046A14 80 03 00 00 */ lwz r0, 0(r3) -/* 80046A18 28 00 00 00 */ cmplwi r0, 0 -/* 80046A1C 41 82 00 14 */ beq lbl_80046A30 -/* 80046A20 80 03 00 20 */ lwz r0, 0x20(r3) -/* 80046A24 7C 1D 00 00 */ cmpw r29, r0 -/* 80046A28 40 82 00 08 */ bne lbl_80046A30 -/* 80046A2C 4B FF F7 0D */ bl init__11dEvDtBase_cFv -lbl_80046A30: -/* 80046A30 3B DE 00 01 */ addi r30, r30, 1 -/* 80046A34 2C 1E 00 09 */ cmpwi r30, 9 -/* 80046A38 3B FF 00 24 */ addi r31, r31, 0x24 -/* 80046A3C 40 81 FF D4 */ ble lbl_80046A10 -/* 80046A40 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046A44 48 31 B7 E1 */ bl _restgpr_28 -/* 80046A48 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046A4C 7C 08 03 A6 */ mtlr r0 -/* 80046A50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046A54 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_A_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_A_TRIGGER__Fv.s deleted file mode 100644 index 2ad89f0decb..00000000000 --- a/asm/d/menu/d_menu_window/dMw_A_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801FA03C: -/* 801FA03C 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FA040 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FA044 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801FA048 54 03 C7 FE */ rlwinm r3, r0, 0x18, 0x1f, 0x1f -/* 801FA04C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_B_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_B_TRIGGER__Fv.s deleted file mode 100644 index 7be8ec32931..00000000000 --- a/asm/d/menu/d_menu_window/dMw_B_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801FA050: -/* 801FA050 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FA054 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FA058 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801FA05C 54 03 BF FE */ rlwinm r3, r0, 0x17, 0x1f, 0x1f -/* 801FA060 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_DOWN_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_DOWN_TRIGGER__Fv.s deleted file mode 100644 index fa75b67ca8a..00000000000 --- a/asm/d/menu/d_menu_window/dMw_DOWN_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801F9F98: -/* 801F9F98 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801F9F9C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801F9FA0 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801F9FA4 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f -/* 801F9FA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_LEFT_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_LEFT_TRIGGER__Fv.s deleted file mode 100644 index 99e4902fd31..00000000000 --- a/asm/d/menu/d_menu_window/dMw_LEFT_TRIGGER__Fv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801F9FAC: -/* 801F9FAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F9FB0 7C 08 02 A6 */ mflr r0 -/* 801F9FB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F9FB8 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801F9FBC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801F9FC0 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801F9FC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 801F9FC8 41 82 00 18 */ beq lbl_801F9FE0 -/* 801F9FCC 4B FF FF B9 */ bl dMw_UP_TRIGGER__Fv -/* 801F9FD0 2C 03 00 00 */ cmpwi r3, 0 -/* 801F9FD4 40 82 00 0C */ bne lbl_801F9FE0 -/* 801F9FD8 38 60 00 01 */ li r3, 1 -/* 801F9FDC 48 00 00 08 */ b lbl_801F9FE4 -lbl_801F9FE0: -/* 801F9FE0 38 60 00 00 */ li r3, 0 -lbl_801F9FE4: -/* 801F9FE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F9FE8 7C 08 03 A6 */ mtlr r0 -/* 801F9FEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F9FF0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_RIGHT_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_RIGHT_TRIGGER__Fv.s deleted file mode 100644 index 98fd976ac9a..00000000000 --- a/asm/d/menu/d_menu_window/dMw_RIGHT_TRIGGER__Fv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801F9FF4: -/* 801F9FF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F9FF8 7C 08 02 A6 */ mflr r0 -/* 801F9FFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA000 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FA004 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FA008 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801FA00C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 801FA010 41 82 00 18 */ beq lbl_801FA028 -/* 801FA014 4B FF FF 71 */ bl dMw_UP_TRIGGER__Fv -/* 801FA018 2C 03 00 00 */ cmpwi r3, 0 -/* 801FA01C 40 82 00 0C */ bne lbl_801FA028 -/* 801FA020 38 60 00 01 */ li r3, 1 -/* 801FA024 48 00 00 08 */ b lbl_801FA02C -lbl_801FA028: -/* 801FA028 38 60 00 00 */ li r3, 0 -lbl_801FA02C: -/* 801FA02C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801FA030 7C 08 03 A6 */ mtlr r0 -/* 801FA034 38 21 00 10 */ addi r1, r1, 0x10 -/* 801FA038 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_START_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_START_TRIGGER__Fv.s deleted file mode 100644 index e44199ec365..00000000000 --- a/asm/d/menu/d_menu_window/dMw_START_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801FA078: -/* 801FA078 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FA07C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FA080 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801FA084 54 03 A7 FE */ rlwinm r3, r0, 0x14, 0x1f, 0x1f -/* 801FA088 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_UP_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_UP_TRIGGER__Fv.s deleted file mode 100644 index 3cedf371f2b..00000000000 --- a/asm/d/menu/d_menu_window/dMw_UP_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801F9F84: -/* 801F9F84 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801F9F88 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801F9F8C 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801F9F90 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f -/* 801F9F94 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_Z_TRIGGER__Fv.s b/asm/d/menu/d_menu_window/dMw_Z_TRIGGER__Fv.s deleted file mode 100644 index 0071955651e..00000000000 --- a/asm/d/menu/d_menu_window/dMw_Z_TRIGGER__Fv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801FA064: -/* 801FA064 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 801FA068 38 63 D2 E8 */ addi r3, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 801FA06C 80 03 00 34 */ lwz r0, 0x34(r3) -/* 801FA070 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 801FA074 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_isMenuRing__Fv.s b/asm/d/menu/d_menu_window/dMw_isMenuRing__Fv.s deleted file mode 100644 index 40b91c65c90..00000000000 --- a/asm/d/menu/d_menu_window/dMw_isMenuRing__Fv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801FA114: -/* 801FA114 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA118 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA11C 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801FA120 28 03 00 00 */ cmplwi r3, 0 -/* 801FA124 41 82 00 10 */ beq lbl_801FA134 -/* 801FA128 88 03 01 47 */ lbz r0, 0x147(r3) -/* 801FA12C 54 03 07 FE */ clrlwi r3, r0, 0x1f -/* 801FA130 4E 80 00 20 */ blr -lbl_801FA134: -/* 801FA134 38 60 00 00 */ li r3, 0 -/* 801FA138 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_offMenuRing__Fv.s b/asm/d/menu/d_menu_window/dMw_offMenuRing__Fv.s deleted file mode 100644 index e5ebfe94403..00000000000 --- a/asm/d/menu/d_menu_window/dMw_offMenuRing__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA0F0: -/* 801FA0F0 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA0F4 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA0F8 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801FA0FC 28 03 00 00 */ cmplwi r3, 0 -/* 801FA100 4D 82 00 20 */ beqlr -/* 801FA104 88 03 01 47 */ lbz r0, 0x147(r3) -/* 801FA108 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e -/* 801FA10C 98 03 01 47 */ stb r0, 0x147(r3) -/* 801FA110 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_offPauseWindow__Fv.s b/asm/d/menu/d_menu_window/dMw_offPauseWindow__Fv.s deleted file mode 100644 index 7ff878d066c..00000000000 --- a/asm/d/menu/d_menu_window/dMw_offPauseWindow__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA0AC: -/* 801FA0AC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA0B0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA0B4 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801FA0B8 28 03 00 00 */ cmplwi r3, 0 -/* 801FA0BC 4D 82 00 20 */ beqlr -/* 801FA0C0 38 00 00 00 */ li r0, 0 -/* 801FA0C4 98 03 01 54 */ stb r0, 0x154(r3) -/* 801FA0C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_onMenuRing__Fv.s b/asm/d/menu/d_menu_window/dMw_onMenuRing__Fv.s deleted file mode 100644 index 5b73dd5e8c5..00000000000 --- a/asm/d/menu/d_menu_window/dMw_onMenuRing__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801FA0CC: -/* 801FA0CC 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA0D0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA0D4 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801FA0D8 28 03 00 00 */ cmplwi r3, 0 -/* 801FA0DC 4D 82 00 20 */ beqlr -/* 801FA0E0 88 03 01 47 */ lbz r0, 0x147(r3) -/* 801FA0E4 60 00 00 01 */ ori r0, r0, 1 -/* 801FA0E8 98 03 01 47 */ stb r0, 0x147(r3) -/* 801FA0EC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/dMw_onPauseWindow__Fv.s b/asm/d/menu/d_menu_window/dMw_onPauseWindow__Fv.s deleted file mode 100644 index 3f172e6fa21..00000000000 --- a/asm/d/menu/d_menu_window/dMw_onPauseWindow__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801FA08C: -/* 801FA08C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA090 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA094 80 63 00 24 */ lwz r3, 0x24(r3) -/* 801FA098 28 03 00 00 */ cmplwi r3, 0 -/* 801FA09C 4D 82 00 20 */ beqlr -/* 801FA0A0 38 00 00 01 */ li r0, 1 -/* 801FA0A4 98 03 01 54 */ stb r0, 0x154(r3) -/* 801FA0A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/ring_open_init__5dMw_cFUc.s b/asm/d/menu/d_menu_window/ring_open_init__5dMw_cFUc.s deleted file mode 100644 index 1aada434a21..00000000000 --- a/asm/d/menu/d_menu_window/ring_open_init__5dMw_cFUc.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801FA220: -/* 801FA220 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801FA224 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801FA228 88 03 00 B9 */ lbz r0, 0xb9(r3) -/* 801FA22C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801FA230 38 00 00 02 */ li r0, 2 -/* 801FA234 98 03 00 B9 */ stb r0, 0xb9(r3) -/* 801FA238 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_Reset/destroyVideo__Fv.s b/asm/m_Do/m_Do_Reset/destroyVideo__Fv.s deleted file mode 100644 index 513745d4ad8..00000000000 --- a/asm/m_Do/m_Do_Reset/destroyVideo__Fv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800155DC: -/* 800155DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800155E0 7C 08 02 A6 */ mflr r0 -/* 800155E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800155E8 48 2C F6 C5 */ bl destroyManager__8JUTVideoFv -/* 800155EC 38 60 00 00 */ li r3, 0 -/* 800155F0 48 34 6F BD */ bl GXSetDrawDoneCallback -/* 800155F4 38 60 00 01 */ li r3, 1 -/* 800155F8 48 33 82 49 */ bl VISetBlack -/* 800155FC 48 33 80 99 */ bl VIFlush -/* 80015600 48 33 73 C5 */ bl VIWaitForRetrace -/* 80015604 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80015608 7C 08 03 A6 */ mtlr r0 -/* 8001560C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80015610 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_controller_pad/recalibrate__8mDoCPd_cFv.s b/asm/m_Do/m_Do_controller_pad/recalibrate__8mDoCPd_cFv.s deleted file mode 100644 index f04a4eecbd5..00000000000 --- a/asm/m_Do/m_Do_controller_pad/recalibrate__8mDoCPd_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_80007D74: -/* 80007D74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80007D78 7C 08 02 A6 */ mflr r0 -/* 80007D7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80007D80 48 2D 92 A5 */ bl clearForReset__10JUTGamePadFv -/* 80007D84 3C 60 F0 00 */ lis r3, 0xf000 -/* 80007D88 48 2D 9C 51 */ bl setEnabled__Q210JUTGamePad7CRumbleFUl -/* 80007D8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80007D90 7C 08 03 A6 */ mtlr r0 -/* 80007D94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80007D98 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/CheckHeap1__9HeapCheckFv.s b/asm/m_Do/m_Do_main/CheckHeap1__9HeapCheckFv.s deleted file mode 100644 index eecf6c67160..00000000000 --- a/asm/m_Do/m_Do_main/CheckHeap1__9HeapCheckFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_80005728: -/* 80005728 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000572C 7C 08 02 A6 */ mflr r0 -/* 80005730 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005734 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005738 93 C1 00 08 */ stw r30, 8(r1) -/* 8000573C 7C 7E 1B 78 */ mr r30, r3 -/* 80005740 80 63 00 08 */ lwz r3, 8(r3) -/* 80005744 48 2C A6 21 */ bl getTotalUsedSize__10JKRExpHeapCFv -/* 80005748 7C 7F 1B 78 */ mr r31, r3 -/* 8000574C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80005750 48 2C 8F DD */ bl getFreeSize__7JKRHeapFv -/* 80005754 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 80005758 7C 00 F8 00 */ cmpw r0, r31 -/* 8000575C 40 80 00 08 */ bge lbl_80005764 -/* 80005760 93 FE 00 0C */ stw r31, 0xc(r30) -lbl_80005764: -/* 80005764 80 1E 00 10 */ lwz r0, 0x10(r30) -/* 80005768 7C 00 18 00 */ cmpw r0, r3 -/* 8000576C 40 81 00 08 */ ble lbl_80005774 -/* 80005770 90 7E 00 10 */ stw r3, 0x10(r30) -lbl_80005774: -/* 80005774 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80005778 83 C1 00 08 */ lwz r30, 8(r1) -/* 8000577C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005780 7C 08 03 A6 */ mtlr r0 -/* 80005784 38 21 00 10 */ addi r1, r1, 0x10 -/* 80005788 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/countUsed__FP10JKRExpHeap.s b/asm/m_Do/m_Do_main/countUsed__FP10JKRExpHeap.s deleted file mode 100644 index 2fc57fdd096..00000000000 --- a/asm/m_Do/m_Do_main/countUsed__FP10JKRExpHeap.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_80005848: -/* 80005848 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8000584C 7C 08 02 A6 */ mflr r0 -/* 80005850 90 01 00 14 */ stw r0, 0x14(r1) -/* 80005854 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80005858 93 C1 00 08 */ stw r30, 8(r1) -/* 8000585C 7C 7E 1B 78 */ mr r30, r3 -/* 80005860 48 33 B4 65 */ bl OSDisableScheduler -/* 80005864 3B E0 00 00 */ li r31, 0 -/* 80005868 80 7E 00 80 */ lwz r3, 0x80(r30) -/* 8000586C 48 00 00 0C */ b lbl_80005878 -lbl_80005870: -/* 80005870 80 63 00 0C */ lwz r3, 0xc(r3) -/* 80005874 3B FF 00 01 */ addi r31, r31, 1 -lbl_80005878: -/* 80005878 28 03 00 00 */ cmplwi r3, 0 -/* 8000587C 40 82 FF F4 */ bne lbl_80005870 -/* 80005880 48 33 B4 85 */ bl OSEnableScheduler -/* 80005884 7F E3 FB 78 */ mr r3, r31 -/* 80005888 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8000588C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80005890 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80005894 7C 08 03 A6 */ mtlr r0 -/* 80005898 38 21 00 10 */ addi r1, r1, 0x10 -/* 8000589C 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/debug__Fv.s b/asm/m_Do/m_Do_main/debug__Fv.s deleted file mode 100644 index 1fd1d9e5740..00000000000 --- a/asm/m_Do/m_Do_main/debug__Fv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_800061C8: -/* 800061C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800061CC 7C 08 02 A6 */ mflr r0 -/* 800061D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800061D4 88 0D 80 00 */ lbz r0, data_80450580(r13) -/* 800061D8 7C 00 07 75 */ extsb. r0, r0 -/* 800061DC 41 82 00 A0 */ beq lbl_8000627C -/* 800061E0 88 0D 85 9A */ lbz r0, struct_80450B18+0x2(r13) -/* 800061E4 28 00 00 00 */ cmplwi r0, 0 -/* 800061E8 41 82 00 0C */ beq lbl_800061F4 -/* 800061EC 38 60 00 02 */ li r3, 2 -/* 800061F0 4B FF F5 9D */ bl CheckHeap__FUl -lbl_800061F4: -/* 800061F4 3C 60 80 3E */ lis r3, m_gamePad__8mDoCPd_c@ha /* 0x803DD2D8@ha */ -/* 800061F8 38 63 D2 D8 */ addi r3, r3, m_gamePad__8mDoCPd_c@l /* 0x803DD2D8@l */ -/* 800061FC 80 63 00 08 */ lwz r3, 8(r3) -/* 80006200 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80006204 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 80006208 28 00 00 20 */ cmplwi r0, 0x20 -/* 8000620C 40 82 00 1C */ bne lbl_80006228 -/* 80006210 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80006214 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 80006218 41 82 00 10 */ beq lbl_80006228 -/* 8000621C 88 0D 85 98 */ lbz r0, struct_80450B18+0x0(r13) -/* 80006220 68 00 00 01 */ xori r0, r0, 1 -/* 80006224 98 0D 85 98 */ stb r0, struct_80450B18+0x0(r13) -lbl_80006228: -/* 80006228 88 0D 85 98 */ lbz r0, struct_80450B18+0x0(r13) -/* 8000622C 28 00 00 00 */ cmplwi r0, 0 -/* 80006230 41 82 00 44 */ beq lbl_80006274 -/* 80006234 80 03 00 18 */ lwz r0, 0x18(r3) -/* 80006238 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 8000623C 28 00 00 40 */ cmplwi r0, 0x40 -/* 80006240 40 82 00 30 */ bne lbl_80006270 -/* 80006244 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80006248 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 8000624C 41 82 00 24 */ beq lbl_80006270 -/* 80006250 88 6D 80 08 */ lbz r3, data_80450588(r13) -/* 80006254 28 03 00 05 */ cmplwi r3, 5 -/* 80006258 40 80 00 10 */ bge lbl_80006268 -/* 8000625C 38 03 00 01 */ addi r0, r3, 1 -/* 80006260 98 0D 80 08 */ stb r0, data_80450588(r13) -/* 80006264 48 00 00 0C */ b lbl_80006270 -lbl_80006268: -/* 80006268 38 00 00 01 */ li r0, 1 -/* 8000626C 98 0D 80 08 */ stb r0, data_80450588(r13) -lbl_80006270: -/* 80006270 4B FF F8 69 */ bl debugDisplay__Fv -lbl_80006274: -/* 80006274 38 60 00 02 */ li r3, 2 -/* 80006278 4B FF FA D5 */ bl Debug_console__FUl -lbl_8000627C: -/* 8000627C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80006280 7C 08 03 A6 */ mtlr r0 -/* 80006284 38 21 00 10 */ addi r1, r1, 0x10 -/* 80006288 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/getUsedCount__9HeapCheckCFv.s b/asm/m_Do/m_Do_main/getUsedCount__9HeapCheckCFv.s deleted file mode 100644 index 003c9292c18..00000000000 --- a/asm/m_Do/m_Do_main/getUsedCount__9HeapCheckCFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800058A0: -/* 800058A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800058A4 7C 08 02 A6 */ mflr r0 -/* 800058A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800058AC 80 63 00 08 */ lwz r3, 8(r3) -/* 800058B0 4B FF FF 99 */ bl countUsed__FP10JKRExpHeap -/* 800058B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800058B8 7C 08 03 A6 */ mtlr r0 -/* 800058BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800058C0 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/heapDisplay__9HeapCheckCFv.s b/asm/m_Do/m_Do_main/heapDisplay__9HeapCheckCFv.s deleted file mode 100644 index 3df24c824c7..00000000000 --- a/asm/m_Do/m_Do_main/heapDisplay__9HeapCheckCFv.s +++ /dev/null @@ -1,134 +0,0 @@ -lbl_800058C4: -/* 800058C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800058C8 7C 08 02 A6 */ mflr r0 -/* 800058CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800058D0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800058D4 48 35 C8 FD */ bl _savegpr_26 -/* 800058D8 7C 7D 1B 78 */ mr r29, r3 -/* 800058DC 80 63 00 08 */ lwz r3, 8(r3) -/* 800058E0 80 83 00 38 */ lwz r4, 0x38(r3) -/* 800058E4 7C 9A 23 78 */ mr r26, r4 -/* 800058E8 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 800058EC 7F E0 20 50 */ subf r31, r0, r4 -/* 800058F0 48 2C A4 75 */ bl getTotalUsedSize__10JKRExpHeapCFv -/* 800058F4 7C 7E 1B 78 */ mr r30, r3 -/* 800058F8 80 7D 00 08 */ lwz r3, 8(r29) -/* 800058FC 48 2C 8E 89 */ bl getTotalFreeSize__7JKRHeapFv -/* 80005900 7C 7B 1B 78 */ mr r27, r3 -/* 80005904 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005908 48 2C 8E 25 */ bl getFreeSize__7JKRHeapFv -/* 8000590C 7C 7C 1B 78 */ mr r28, r3 -/* 80005910 38 60 00 64 */ li r3, 0x64 -/* 80005914 38 80 00 D4 */ li r4, 0xd4 -/* 80005918 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 8000591C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005920 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80005924 80 DD 00 00 */ lwz r6, 0(r29) -/* 80005928 4C C6 31 82 */ crclr 6 -/* 8000592C 48 2D AC 05 */ bl JUTReport__FiiPCce -/* 80005930 38 60 00 64 */ li r3, 0x64 -/* 80005934 38 80 00 E3 */ li r4, 0xe3 -/* 80005938 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 8000593C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005940 38 A5 00 45 */ addi r5, r5, 0x45 -/* 80005944 7F 46 D3 78 */ mr r6, r26 -/* 80005948 4C C6 31 82 */ crclr 6 -/* 8000594C 48 2D AB E5 */ bl JUTReport__FiiPCce -/* 80005950 38 60 00 64 */ li r3, 0x64 -/* 80005954 38 80 00 F0 */ li r4, 0xf0 -/* 80005958 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 8000595C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005960 38 A5 00 5B */ addi r5, r5, 0x5b -/* 80005964 80 DD 00 1C */ lwz r6, 0x1c(r29) -/* 80005968 4C C6 31 82 */ crclr 6 -/* 8000596C 48 2D AB C5 */ bl JUTReport__FiiPCce -/* 80005970 38 60 00 64 */ li r3, 0x64 -/* 80005974 38 80 00 FD */ li r4, 0xfd -/* 80005978 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 8000597C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005980 38 A5 00 71 */ addi r5, r5, 0x71 -/* 80005984 7C DF D8 50 */ subf r6, r31, r27 -/* 80005988 4C C6 31 82 */ crclr 6 -/* 8000598C 48 2D AB A5 */ bl JUTReport__FiiPCce -/* 80005990 38 60 00 64 */ li r3, 0x64 -/* 80005994 38 80 01 0A */ li r4, 0x10a -/* 80005998 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 8000599C 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 800059A0 38 A5 00 87 */ addi r5, r5, 0x87 -/* 800059A4 7C DF E0 50 */ subf r6, r31, r28 -/* 800059A8 4C C6 31 82 */ crclr 6 -/* 800059AC 48 2D AB 85 */ bl JUTReport__FiiPCce -/* 800059B0 38 60 00 64 */ li r3, 0x64 -/* 800059B4 38 80 01 17 */ li r4, 0x117 -/* 800059B8 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 800059BC 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 800059C0 38 A5 00 9D */ addi r5, r5, 0x9d -/* 800059C4 7F C6 F3 78 */ mr r6, r30 -/* 800059C8 4C C6 31 82 */ crclr 6 -/* 800059CC 48 2D AB 65 */ bl JUTReport__FiiPCce -/* 800059D0 38 60 00 64 */ li r3, 0x64 -/* 800059D4 38 80 01 24 */ li r4, 0x124 -/* 800059D8 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 800059DC 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 800059E0 38 A5 00 B3 */ addi r5, r5, 0xb3 -/* 800059E4 1C DE 00 64 */ mulli r6, r30, 0x64 -/* 800059E8 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 800059EC 7C C6 03 D6 */ divw r6, r6, r0 -/* 800059F0 4C C6 31 82 */ crclr 6 -/* 800059F4 48 2D AB 3D */ bl JUTReport__FiiPCce -/* 800059F8 38 60 00 64 */ li r3, 0x64 -/* 800059FC 38 80 01 31 */ li r4, 0x131 -/* 80005A00 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005A04 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005A08 38 A5 00 CF */ addi r5, r5, 0xcf -/* 80005A0C 80 DD 00 0C */ lwz r6, 0xc(r29) -/* 80005A10 4C C6 31 82 */ crclr 6 -/* 80005A14 48 2D AB 1D */ bl JUTReport__FiiPCce -/* 80005A18 38 60 00 64 */ li r3, 0x64 -/* 80005A1C 38 80 01 3E */ li r4, 0x13e -/* 80005A20 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005A24 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005A28 38 A5 00 E5 */ addi r5, r5, 0xe5 -/* 80005A2C 80 1D 00 0C */ lwz r0, 0xc(r29) -/* 80005A30 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 80005A34 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80005A38 7C C6 03 D6 */ divw r6, r6, r0 -/* 80005A3C 4C C6 31 82 */ crclr 6 -/* 80005A40 48 2D AA F1 */ bl JUTReport__FiiPCce -/* 80005A44 38 60 00 64 */ li r3, 0x64 -/* 80005A48 38 80 01 4B */ li r4, 0x14b -/* 80005A4C 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005A50 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005A54 38 A5 01 01 */ addi r5, r5, 0x101 -/* 80005A58 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 80005A5C 7C DF 00 50 */ subf r6, r31, r0 -/* 80005A60 4C C6 31 82 */ crclr 6 -/* 80005A64 48 2D AA CD */ bl JUTReport__FiiPCce -/* 80005A68 38 60 00 64 */ li r3, 0x64 -/* 80005A6C 38 80 01 58 */ li r4, 0x158 -/* 80005A70 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005A74 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005A78 38 A5 01 17 */ addi r5, r5, 0x117 -/* 80005A7C 80 1D 00 10 */ lwz r0, 0x10(r29) -/* 80005A80 7C 1F 00 50 */ subf r0, r31, r0 -/* 80005A84 1C C0 00 64 */ mulli r6, r0, 0x64 -/* 80005A88 80 1D 00 1C */ lwz r0, 0x1c(r29) -/* 80005A8C 7C C6 03 D6 */ divw r6, r6, r0 -/* 80005A90 4C C6 31 82 */ crclr 6 -/* 80005A94 48 2D AA 9D */ bl JUTReport__FiiPCce -/* 80005A98 80 7D 00 08 */ lwz r3, 8(r29) -/* 80005A9C 4B FF FD AD */ bl countUsed__FP10JKRExpHeap -/* 80005AA0 7C 66 1B 78 */ mr r6, r3 -/* 80005AA4 38 60 00 64 */ li r3, 0x64 -/* 80005AA8 38 80 01 65 */ li r4, 0x165 -/* 80005AAC 3C A0 80 37 */ lis r5, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005AB0 38 A5 39 A0 */ addi r5, r5, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005AB4 38 A5 01 33 */ addi r5, r5, 0x133 -/* 80005AB8 4C C6 31 82 */ crclr 6 -/* 80005ABC 48 2D AA 75 */ bl JUTReport__FiiPCce -/* 80005AC0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80005AC4 48 35 C7 59 */ bl _restgpr_26 -/* 80005AC8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80005ACC 7C 08 03 A6 */ mtlr r0 -/* 80005AD0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80005AD4 4E 80 00 20 */ blr diff --git a/asm/m_Do/m_Do_main/version_check__Fv.s b/asm/m_Do/m_Do_main/version_check__Fv.s deleted file mode 100644 index 90b359c9965..00000000000 --- a/asm/m_Do/m_Do_main/version_check__Fv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800056C0: -/* 800056C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800056C4 7C 08 02 A6 */ mflr r0 -/* 800056C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800056CC 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 800056D0 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 800056D4 7C 64 1B 78 */ mr r4, r3 -/* 800056D8 48 36 32 BD */ bl strcmp -/* 800056DC 2C 03 00 00 */ cmpwi r3, 0 -/* 800056E0 40 82 00 20 */ bne lbl_80005700 -/* 800056E4 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 800056E8 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 800056EC 38 63 00 0A */ addi r3, r3, 0xa -/* 800056F0 7C 64 1B 78 */ mr r4, r3 -/* 800056F4 48 36 32 A1 */ bl strcmp -/* 800056F8 2C 03 00 00 */ cmpwi r3, 0 -/* 800056FC 41 82 00 1C */ beq lbl_80005718 -lbl_80005700: -/* 80005700 3C 60 80 37 */ lis r3, m_Do_m_Do_main__stringBase0@ha /* 0x803739A0@ha */ -/* 80005704 38 63 39 A0 */ addi r3, r3, m_Do_m_Do_main__stringBase0@l /* 0x803739A0@l */ -/* 80005708 38 63 00 11 */ addi r3, r3, 0x11 -/* 8000570C 4C C6 31 82 */ crclr 6 -/* 80005710 48 00 14 FD */ bl OSReport_Error -lbl_80005714: -/* 80005714 48 00 00 00 */ b lbl_80005714 -lbl_80005718: -/* 80005718 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8000571C 7C 08 03 A6 */ mtlr r0 -/* 80005720 38 21 00 10 */ addi r1, r1, 0x10 -/* 80005724 4E 80 00 20 */ blr diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index c82d717ec62..45121ca98ab 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -1,6 +1,29 @@ #ifndef J3DSTRUCT_H #define J3DSTRUCT_H +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" +struct J3DLightInfo { + /* 803256C4 */ void operator=(J3DLightInfo const&); + + /* 0x00 */ cXyz mLightPosition; + /* 0x0C */ cXyz mLightDirection; + /* 0x18 */ _GXColor mColor; + /* 0x1C */ f32 mA0; + /* 0x20 */ f32 mA1; + /* 0x24 */ f32 mA2; + /* 0x28 */ f32 mK0; + /* 0x2C */ f32 mK1; + /* 0x30 */ f32 mK2; +}; // Size = 0x34 + +struct J3DLightObj { + /* 80018C0C */ J3DLightObj(); + + /* 0x00 */ J3DLightInfo mInfo; + /* 0x34 */ u8 field_0x34[64]; +}; // Size = 0x74 + #endif /* J3DSTRUCT_H */ diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 265bd2dfc82..14d6e86277b 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -8,8 +8,9 @@ class JAISoundID { public: operator u32() const { return this->mId; } + void operator=(JAISoundID const&); - JAISoundID(u32 pId) : mId(pId) {} + JAISoundID(u32 pId); JAISoundID(JAISoundID const& other); @@ -62,7 +63,7 @@ public: /* 802A26B8 */ void calc_JAISound_(); /* 802A29DC */ void initTrack_JAISound_(JASTrack*); - JAISoundID getID() const { return JAISoundID((u32)this->sound_id); } + JAISoundID getID() const; u32 getUserData() const { return user_data; } // TODO: do proper struct later @@ -167,4 +168,19 @@ private: JAISound* mSound; }; +class JAISoundHandles { +public: + JAISoundHandles(JAISoundHandle* pHandle, int param_1) { + mSoundHandle = pHandle; + field_0x04 = param_1; + }; + + void getHandleSoundID(JAISoundID); + void getFreeHandle(); + +private: + JAISoundHandle* mSoundHandle; + int field_0x04; +}; + #endif /* JAISOUND_H */ diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index e4848569cbd..d8ac89fa5fe 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -20,6 +20,98 @@ struct TVec3 { }; */ +template +struct TVec2 { + TVec2() {} + TVec2(T x, T y) { set(x, y); } + + void set(T x, T y) { + this->x = x; + this->y = y; + } + + void set(const TVec2& other) { + x = other.x; + y = other.y; + } + + void setMin(const TVec2& min) { + if (min.x <= x) + x = min.x; + if (min.y <= y) + y = min.y; + } + + void setMax(const TVec2& max) { + if (x <= max.x) + x = max.x; + if (y <= max.y) + y = max.y; + } + + void add(const TVec2& other) { + x += other.x; + y += other.y; + } + + bool isAbove(const TVec2& other) const { + return (other.x <= x) && (other.y <= y) ? true : false; + } + + T x; + T y; +}; + +template +struct TBox { + TBox() : i(), f() {} + TBox(const TBox& other) : i(other.f), f(other.y) {} + + T i, f; +}; + +// clang-format off +template<> struct TBox > { + f32 getWidth() const { return f.x - i.x; } + f32 getHeight() const { return f.y - i.y; } + + inline void operator= (const TBox >& rhs) { + // ??? + *(u32*)&i.x = *(u32*)&rhs.i.x; + *(u32*)&i.y = *(u32*)&rhs.i.y; + *(u32*)&f.x = *(u32*)&rhs.f.x; + *(u32*)&f.y = *(u32*)&rhs.f.y; + } + + bool isValid() const { return f.isAbove(i); } + + void addPos(const TVec2& pos) { + i.add(pos); + f.add(pos); + } + + bool intersect(const TBox >& other) { + i.setMax(other.i); + f.setMin(other.f); + return isValid(); + } + + TVec2 i, f; +}; + +template +struct TBox2 : TBox > { + TBox2() {} + TBox2(f32 x0, f32 y0, f32 x1, f32 y1) { set(x0, y0, x1, y1); } + + inline const TBox2& operator=(const TBox2& rhs) { *(TBox >*)this = rhs; } + void set(const TBox2& other) { set(other.i, other.f); } + void set(const TVec2& i, const TVec2 f) { this->i.set(i), this->f.set(f); } + void set(f32 x0, f32 y0, f32 x1, f32 y1) { i.set(x0, y0); f.set(x1, y1); } +}; + +// clang-format on + } // namespace JGeometry #endif \ No newline at end of file diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h index 1036ccab718..326d6948c9e 100644 --- a/include/SSystem/SComponent/c_API_controller_pad.h +++ b/include/SSystem/SComponent/c_API_controller_pad.h @@ -4,32 +4,32 @@ #include "dolphin/types.h" struct interface_of_controller_pad { - f32 mMainStickPosX; - f32 mMainStickPosY; - f32 mMainStickValue; - s16 mMainStickAngle; - u8 field_0xe; - u8 field_0xf; - f32 mCStickPosX; - f32 mCStickPosY; - f32 mCStickValue; - s16 mCStickAngle; - u8 field_0x1e; - u8 field_0x1f; - f32 mAnalogA; - f32 mAnalogB; - f32 mTriggerLeft; - f32 mTriggerRight; - u32 mButtonFlags; - u32 mPressedButtonFlags; - s8 mGamepadErrorFlags; - u8 field_0x39; - u8 field_0x3a; - u8 field_0x3b; - u8 field_0x3c; - u8 field_0x3d; - u8 field_0x3e; - u8 field_0x3f; + /* 0x00 */ f32 mMainStickPosX; + /* 0x04 */ f32 mMainStickPosY; + /* 0x08 */ f32 mMainStickValue; + /* 0x0C */ s16 mMainStickAngle; + /* 0x0E */ u8 field_0xe; + /* 0x0F */ u8 field_0xf; + /* 0x10 */ f32 mCStickPosX; + /* 0x14 */ f32 mCStickPosY; + /* 0x18 */ f32 mCStickValue; + /* 0x1C */ s16 mCStickAngle; + /* 0x1E */ u8 field_0x1e; + /* 0x1F */ u8 field_0x1f; + /* 0x20 */ f32 mAnalogA; + /* 0x24 */ f32 mAnalogB; + /* 0x28 */ f32 mTriggerLeft; + /* 0x2C */ f32 mTriggerRight; + /* 0x30 */ u32 mButtonFlags; + /* 0x34 */ u32 mPressedButtonFlags; + /* 0x38 */ s8 mGamepadErrorFlags; + /* 0x39 */ u8 mHoldLockL; + /* 0x3A */ u8 mTrigLockL; + /* 0x3B */ u8 mHoldLockR; + /* 0x3C */ u8 mTrigLockR; + /* 0x3D */ u8 field_0x3d; + /* 0x3E */ u8 field_0x3e; + /* 0x3F */ u8 field_0x3f; }; void cAPICPad_recalibrate(void); diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h index 55c2bde9e2b..212d5f94c4d 100644 --- a/include/Z2AudioLib/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr.h @@ -1,6 +1,43 @@ #ifndef Z2AUDIOMGR_H #define Z2AUDIOMGR_H +#include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JKernel/JKRArchive.h" +#include "JSystem/JKernel/JKRSolidHeap.h" +#include "Z2AudioLib/Z2SceneMgr.h" +#include "Z2AudioLib/Z2SeMgr.h" +#include "Z2AudioLib/Z2SeqMgr.h" +#include "Z2AudioLib/Z2SoundStarter.h" +#include "Z2AudioLib/Z2StatusMgr.h" #include "dolphin/types.h" +class Z2AudioMgr { +public: + Z2AudioMgr(); + void init(JKRSolidHeap*, u32, void*, JKRArchive*); + void setOutputMode(u32); + void zeldaGFrameWork(); + void gframeProcess(); + void resetProcess(u32, bool); + void resetRecover(); + void hasReset() const; + void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); + + static Z2AudioMgr* mAudioMgrPtr; + +private: + /* 0x0000 */ Z2SeMgr mSeMgr; + /* 0x03D0 */ Z2SeqMgr mSeqMgr; + /* 0x04A4 */ Z2SceneMgr mSceneMgr; + /* 0x04C4 */ Z2StatusMgr mStatusMgr; + /* 0x04F4 */ // Z2SoundObjMgr mSoundObjMgr; + /* 0x051C */ // JASAudioReseter mAudioReseter; + /* 0x052C */ Z2SoundStarter mSoundStarter; + /* 0x0530 */ // Z2SoundMgr mSoundMgr; + /* 0x0D40 */ // JAISoundInfo mSoundInfo; + /* 0x0D4C */ // Z2Audience mAudience; + /* 0x0F2C */ // Z2SpeechMgr2 mSpeechMgr; + /* 0x1370 */ // Z2FxLineMgr mFxLineMgr; +}; + #endif /* Z2AUDIOMGR_H */ diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h index 94f95f326bb..8bd14a7d876 100644 --- a/include/Z2AudioLib/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature.h @@ -53,12 +53,12 @@ public: void setLinkSwordType(s32, s32); void setLinkShieldType(s32, s32); void setLinkBootsType(s32); - void deleteObject(); + virtual void deleteObject(); void init(Vec*, Vec*, Vec*); void initKantera(Vec*); void deleteKantera(void); void setKanteraState(u8); - void framework(u32, s8); + virtual void framework(u32, s8); void setSinkDepth(s8); void setRiding(bool); void setMagnetized(bool); @@ -68,7 +68,7 @@ public: void startLinkVoice(JAISoundID, s8); void startLinkVoiceLevel(JAISoundID, s8); void startLinkSwordSound(JAISoundID, u32, s8); - void startCollisionSE(u32, u32); + virtual void startCollisionSE(u32, u32); int startHitItemSE(u32, u32, Z2SoundObjBase*, float); void setResumeAttack(bool); @@ -106,4 +106,23 @@ private: /* 0x99 */ u8 padding[3]; }; +class Z2CreatureEnemy : public Z2Creature { +public: + virtual void test(); // temp to build OK, remove later + /* 802C0F64 */ Z2CreatureEnemy(); + /* 802C0FC4 */ virtual void deleteObject(); + /* 802C1094 */ void init(Vec*, Vec*, u8, u8); + /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8); + /* 802C10D4 */ virtual void framework(u32, s8); + /* 802C110C */ virtual void startCreatureSound(JAISoundID, u32, s8); + /* 802C136C */ virtual void startCreatureSoundLevel(JAISoundID, u32, s8); + /* 802C168C */ virtual void startCreatureVoice(JAISoundID, s8); + /* 802C1948 */ virtual void startCreatureVoiceLevel(JAISoundID, s8); + /* 802C199C */ virtual void startCreatureExtraSound(JAISoundID, u32, s8); + /* 802C19D8 */ virtual void startCreatureExtraSoundLevel(JAISoundID, u32, s8); + /* 802C1A14 */ virtual void startCollisionSE(u32, u32); + /* 802C1B7C */ void setLinkSearch(bool); + /* 802C1B90 */ void setEnemyName(char const*); +}; + #endif /* Z2CREATURE_H */ diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h index 073fcb33e1e..ec67d7326a4 100644 --- a/include/Z2AudioLib/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr.h @@ -1,6 +1,56 @@ #ifndef Z2SCENEMGR_H #define Z2SCENEMGR_H +#include "JSystem/JAudio2/JAISound.h" #include "dolphin/types.h" +class Z2SceneMgr { +public: + Z2SceneMgr(); + void setInDarkness(bool); + void setSceneExist(bool); + void setFadeOutStart(u8); + void setFadeInStart(u8); + void setSceneName(char*, s32, s32); + void sceneChange(JAISoundID, u8, u8, u8, u8, u8, bool); + void framework(); + void load1stDynamicWave(); + void _load1stWaveInner_1(); + void _load1stWaveInner_2(); + void check1stDynamicWave(); + void load2ndDynamicWave(); + void sceneBgmStart(); + void loadStaticWaves(); + bool checkFirstWaves(); + void eraseSeWave(u32); + void eraseBgmWave(u32); + void getWaveLoadStatus(u32, u32); + void loadSeWave(u32); + void loadBgmWave(u32); + +private: + /* 0x00 */ long BGM_ID; + /* 0x04 */ int sceneNum; + /* 0x08 */ int timer; + /* 0x0C */ s8 roomNum; + /* 0x0D */ u8 SeWave_1; + /* 0x0E */ u8 SeWaveToErase_1; + /* 0x0F */ u8 SeWave_2; + /* 0x10 */ u8 SeWaveToErase_2; + /* 0x11 */ u8 BgmWave_1; + /* 0x12 */ u8 BgmWaveToErase_1; + /* 0x13 */ u8 BgmWave_2; + /* 0x14 */ u8 BgmWaveToErase_2; + /* 0x15 */ u8 SeWave_3; + /* 0x16 */ u8 SeWaveToErase_3; + /* 0x17 */ u8 field_0x17; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 field_0x19; + /* 0x1A */ u8 field_0x1a; + /* 0x1B */ u8 field_0x1b; + /* 0x1C */ bool inGame; + /* 0x1D */ bool sceneExist; + /* 0x1E */ bool inDarkness; +}; // Size = 0x20 + #endif /* Z2SCENEMGR_H */ diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h index 9e7d9dce23c..d6deefe87e6 100644 --- a/include/Z2AudioLib/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr.h @@ -1,6 +1,4185 @@ #ifndef Z2SEMGR_H #define Z2SEMGR_H +#include "JSystem/JAudio2/JAISound.h" +#include "dolphin/mtx/vec.h" #include "dolphin/types.h" +struct Z2MultiSeMgr { + Z2MultiSeMgr(); + ~Z2MultiSeMgr(); + void registMultiSePos(Vec*); + void resetMultiSePos(); + void getPanPower(); + void getDolbyPower(); + + /* 0x00 */ float mVolumeScale; + /* 0x04 */ float mMaxVolume; + /* 0x08 */ float mMaxPowL; + /* 0x0C */ float mMaxPowR; + /* 0x10 */ float mMaxPowB; + /* 0x14 */ float mMaxPowF; + /* 0x18 */ s8 mPosCount; +}; // Size = 0x1C + +struct Z2MultiSeObj : Z2MultiSeMgr { + Z2MultiSeObj(); + ~Z2MultiSeObj(); + + /* 0x1C */ u32 field_0x1c; + /* 0x20 */ u8 field_0x20; +}; // Size = 0x24 + +class Z2SeMgr { +public: + /* 802AB64C */ Z2SeMgr(); + /* 802AB750 */ void initSe(); + /* 802AB80C */ void resetModY(); + /* 802AB830 */ void modHeightAtCamera(Vec const**); + /* 802AB93C */ void incrCrowdSize(); + /* 802AB960 */ void decrCrowdSize(); + /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); + /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); + /* 802AD8B0 */ void seStop(JAISoundID, u32); + /* 802AD94C */ void seStopAll(u32); + /* 802AD9F4 */ void seMoveVolumeAll(f32, u32); + /* 802ADB14 */ void messageSePlay(u16, Vec*, s8); + /* 802ADB50 */ void talkInSe(); + /* 802ADC54 */ void talkOutSe(); + /* 802ADD58 */ void menuInSe(); + /* 802ADE5C */ void setLevObjSE(u32, Vec*, s8); + /* 802ADFF4 */ void setMultiTriggerSE(u32, Vec*, s8); + /* 802AE184 */ void processSeFramework(); + /* 802AE524 */ void isLevelSe(JAISoundID); + /* 802AE5B0 */ void isSoundCulling(JAISoundID); + +private: + /* 0x000 */ JAISoundHandle mSoundHandle[24]; + /* 0x060 */ JAISoundHandles field_0x60; + /* 0x068 */ Z2MultiSeObj mLevelObjSe[10]; + /* 0x1D0 */ u8 mLevelObjectSeCount; + /* 0x1D4 */ Z2MultiSeObj mMultiTriggerSe[10]; + /* 0x33C */ u8 mMultiTriggerSeCount; + /* 0x33D */ u8 field_0x33d[0x60]; + /* 0x3A0 */ u32 mModY[8]; + /* 0x3C0 */ u8 field_0x3c0; + /* 0x3C1 */ u8 field_0x3c1; + /* 0x3C2 */ u8 field_0x3c2; + /* 0x3C3 */ u8 field_0x3c3; + /* 0x3C4 */ u8 field_0x3c4; + /* 0x3C5 */ u8 field_0x3c5; + /* 0x3C6 */ u8 field_0x3c6; + /* 0x3C7 */ u8 field_0x3c7; + /* 0x3C8 */ u8 field_0x3c8; + /* 0x3C9 */ u8 field_0x3c9; + /* 0x3CA */ u8 field_0x3ca; + /* 0x3CB */ u8 field_0x3cb; + /* 0x3CC */ u8 mCrowdSize; +}; // Size = 0x3D0 + +// JAISoundID's for sound effects +enum Z2SoundID { + Z2SE_SY_DUMMY = 0x0, + Z2SE_ENTER_GAME = 0x1, + Z2SE_QUIT_GAME = 0x2, + Z2SE_TITLE_ENTER = 0x3, + Z2SE_FILE_SELECT_CURSOR = 0x4, + Z2SE_FILE_SELECT_SUB = 0x5, + Z2SE_POINT_ON_ICON = 0x6, + Z2SE_NAVI_POINTER_MOVE = 0x7, + Z2SE_NAVI_FLY = 0x8, + Z2SE_NAVI_RETURN = 0x9, + Z2SE_FILE_SELECT_LEVEL = 0xA, + Z2SE_NO_SOUND = 0xB, + Z2SE_READ_RIDDLE_A = 0xC, + Z2SE_READ_RIDDLE_B = 0xD, + Z2SE_NAVI_CALLVOICE = 0xE, + Z2SE_NAVI_BLINK = 0xF, + Z2SE_NAVI_TALK_START = 0x10, + Z2SE_NAVI_TALK_END = 0x11, + Z2SE_OPTION_MENU_CURSOR = 0x12, + Z2SE_DPD_SCREEN_IN = 0x13, + Z2SE_DPD_SCREEN_OUT = 0x14, + Z2SE_HEART_PIECE_GET = 0x17, + Z2SE_CONSUMP_ITEM_GET = 0x18, + Z2SE_CONSUM_INC_CNT_1 = 0x1B, + Z2SE_CONSUM_INC_CNT_2 = 0x1C, + JA_SE_SYS_EV_TIMER_20 = 0x1D, + JA_SE_SYS_EV_TIMER_10 = 0x1E, + JA_SE_SYS_EV_TIMER_5 = 0x1F, + JA_SE_SYS_EV_TIMER_0 = 0x20, + Z2SE_HP_GAUGE_INC = 0x21, + Z2SE_MAGIC_METER_RECOVER = 0x22, + Z2SE_MAGIC_METER_DEC = 0x23, + Z2SE_MAGIC_METER_FINISH = 0x24, + Z2SE_OIL_METER_RECOVER = 0x25, + Z2SE_OIL_METER_LESS = 0x26, + Z2SE_OIL_METER_FINISH = 0x27, + Z2SE_SWIM_TIMER_ON = 0x28, + Z2SE_SWIM_TIMER_DEC = 0x29, + Z2SE_SWIM_TIMER_BLINK_1 = 0x2A, + Z2SE_SWIM_TIMER_BLINK_2 = 0x2B, + Z2SE_SWIM_TIMER_RECOVER = 0x2C, + Z2SE_DPD_CALIB_MODE = 0x2D, + Z2SE_DPD_CALIB_SET_A = 0x2E, + Z2SE_DPD_CALIB_SET_B = 0x2F, + Z2SE_DPD_CALIB_SET_C = 0x30, + Z2SE_DPD_CALIB_SET_D = 0x31, + Z2SE_DPD_CALIB_SET_E = 0x32, + Z2SE_FORCE_BACK = 0x33, + Z2SE_ALMOST_DIE_ALERM_1 = 0x34, + Z2SE_ALMOST_DIE_ALERM_2 = 0x35, + Z2SE_ALMOST_DIE_ALERM_3 = 0x36, + Z2SE_SUBJ_VIEW_IN = 0x37, + Z2SE_SUBJ_VIEW_OUT = 0x38, + Z2SE_KARI_EN_WING_S = 0x39, + Z2SE_KARI_EN_WING_M = 0x3A, + Z2SE_SYS_RESULT_WRONG = 0x3B, + Z2SE_ITEM_RING_IN = 0x3C, + Z2SE_ITEM_RING_OUT = 0x3D, + Z2SE_ITEM_RING_ROLL = 0x3E, + Z2SE_WHIP_HORSE = 0x3F, + Z2SE_WHIP_RECOVER = 0x40, + Z2SE_WHIP_RECOVER_ALL = 0x41, + Z2SE_WARP_MAP_CURSOR = 0x46, + Z2SE_WARP_MAP_ON = 0x47, + Z2SE_WARP_MAP_DECIDE = 0x48, + Z2SE_WARP_MAP_OFF = 0x49, + Z2SE_SYS_ERROR = 0x4A, + Z2SE_SY_COW_GET_IN = 0x4B, + Z2SE_SY_CURSOR_OPTION = 0x4C, + Z2SE_SY_CURSOR_ITEM = 0x4D, + Z2SE_SY_CURSOR_FLOOR = 0x4E, + Z2SE_SY_ITEM_SET_X = 0x4F, + Z2SE_SY_ITEM_SET_Y = 0x50, + Z2SE_SY_EXP_WIN_OPEN = 0x51, + Z2SE_SY_EXP_WIN_CLOSE = 0x52, + Z2SE_SY_HINT_BUTTON = 0x56, + Z2SE_SY_L_FOCUS_SET = 0x57, + Z2SE_SY_L_FOCUS_RESET = 0x58, + Z2SE_SY_CAMERA_L_MOVE = 0x59, + Z2SE_SY_CAMERA_L_CANCEL = 0x5A, + Z2SE_SY_MENU_IN = 0x5B, + Z2SE_SY_MENU_OUT = 0x5C, + Z2SE_SY_MENU_PAGE_CHANGE = 0x5D, + Z2SE_SY_TALK_START = 0x5E, + Z2SE_SY_TALK_NEXT = 0x5F, + Z2SE_SY_TALK_END = 0x60, + Z2SE_SY_TALK_WIN_OPEN = 0x61, + Z2SE_SY_TALK_WIN_CLOSE = 0x62, + Z2SE_SY_TALK_CURSOR = 0x63, + Z2SE_SY_TALK_CURSOR_OK = 0x64, + Z2SE_SY_DEMO_MESSAGE_NEXT = 0x65, + Z2SE_SY_DEMO_MESSAGE_END = 0x66, + Z2SE_SY_L_FOCUS_SET_SOFT = 0x67, + Z2SE_SY_BOOM_LOCK_ON_1 = 0x68, + Z2SE_SY_BOOM_LOCK_ON_2 = 0x69, + Z2SE_SY_BOOM_LOCK_ON_3 = 0x6A, + Z2SE_SY_BOOM_LOCK_ON_4 = 0x6B, + Z2SE_SY_BOOM_LOCK_ON_5 = 0x6C, + Z2SE_SY_CURSOR_OK = 0x6D, + Z2SE_SY_CURSOR_CANCEL = 0x6E, + Z2SE_SY_ITEM_USE_CANCEL = 0x6F, + Z2SE_GREEN_LUPY_GET = 0x70, + Z2SE_BLUE_LUPY_GET = 0x71, + Z2SE_RED_LUPY_GET = 0x72, + Z2SE_LUPY_INC_CNT_1 = 0x73, + Z2SE_LUPY_INC_CNT_2 = 0x74, + Z2SE_LUPY_DEC_CNT_1 = 0x75, + Z2SE_LUPY_DEC_CNT_2 = 0x76, + Z2SE_SY_HINT_BUTTON_BLINK = 0x77, + Z2SE_SY_SUMO_READY = 0x78, + Z2SE_SY_SUMO_START = 0x79, + Z2SE_SY_TEXT_DISP_ALL = 0x7A, + Z2SE_SY_TEXT_OUT = 0x7B, + Z2SE_SY_TEXT_OUT_FEMALE = 0x7C, + Z2SE_SY_TEXT_OUT_CHILD = 0x7D, + Z2SE_SY_TEXT_OUT_GORON = 0x7E, + Z2SE_SY_TEXT_OUT_ZORA = 0x7F, + Z2SE_SY_TEXT_OUT_GREY = 0x80, + Z2SE_SY_TEXT_OUT_SPIRIT = 0x81, + Z2SE_SY_TEXT_OUT_BRAVE = 0x82, + Z2SE_SY_TEXT_OUT_GANON = 0x83, + Z2SE_SY_TEXT_OUT_ZANT = 0x84, + Z2SE_SY_TEXT_OUT_YAMI = 0x85, + Z2SE_SY_WARP_FADE = 0x86, + Z2SE_SY_WARP_FADE_GW = 0x87, + Z2SE_SY_MG_TIMER_20 = 0x88, + Z2SE_SY_MG_TIMER_10 = 0x89, + Z2SE_SY_MG_TIMER_5 = 0x8A, + Z2SE_SY_MG_TIMEUP = 0x8B, + Z2SE_SY_MG_CANOE_SCORE = 0x8C, + Z2SE_SY_MG_KARGO_COMBO_01 = 0x8D, + Z2SE_SY_MG_KARGO_COMBO_02 = 0x8E, + Z2SE_SY_MG_KARGO_COMBO_03 = 0x8F, + Z2SE_SY_MG_KARGO_COMBO_04 = 0x90, + Z2SE_SY_MG_KARGO_COMBO_05 = 0x91, + Z2SE_SY_MG_KARGO_COMBO_06 = 0x92, + Z2SE_SY_MG_KARGO_COMBO_07 = 0x93, + Z2SE_SY_MG_KARGO_COMBO_08 = 0x94, + Z2SE_SY_MG_KARGO_COMBO_09 = 0x95, + Z2SE_SY_MG_KARGO_COMBO_10 = 0x96, + Z2SE_SY_MG_SEKI_BLACK_OUT = 0x97, + Z2SE_SY_MG_SEKI_WHITE_OUT = 0x98, + Z2SE_SY_MG_SEKI_FAILURE = 0x99, + Z2SE_SY_MG_CANOE_SCORE_2 = 0x9A, + Z2SE_SY_WARP_FADE_FAIRY = 0x9B, + Z2SE_D25_WHITE_OUT = 0x9C, + Z2SE_D28_SPACE_OUT = 0x9D, + Z2SE_D24_FLASHBACK = 0x9E, + Z2SE_SY_CONTINUE_OK = 0x9F, + Z2SE_SY_MENU_CURSOR_COMMON = 0xA0, + Z2SE_SY_MENU_NEXT = 0xA1, + Z2SE_SY_MENU_BACK = 0xA2, + Z2SE_SY_MENU_CHANGE_WINDOW = 0xA3, + Z2SE_SY_MENU_SUB_IN = 0xA4, + Z2SE_SY_MENU_SUB_OUT = 0xA5, + Z2SE_SY_MENU_SUB_NEXT = 0xA6, + Z2SE_SY_NEW_FILE = 0xA7, + Z2SE_SY_FILE_MENU_SLIDE_IN = 0xA8, + Z2SE_SY_FILE_COPY_LEVEL = 0xA9, + Z2SE_SY_FILE_COPY_OK = 0xAA, + Z2SE_SY_FILE_DELETE_LEVEL = 0xAB, + Z2SE_SY_FILE_DELETE_OK = 0xAC, + Z2SE_SY_FILE_SAVE_LEVEL = 0xAD, + Z2SE_SY_FILE_SAVE_OK = 0xAE, + Z2SE_SY_FILE_ERROR = 0xAF, + Z2SE_SY_NAME_CURSOR = 0xB0, + Z2SE_SY_NAME_INPUT = 0xB1, + Z2SE_SY_NAME_DELETE = 0xB2, + Z2SE_SY_NAME_OK = 0xB3, + Z2SE_SY_ITEM_SET_B = 0xB4, + Z2SE_SY_ITEM_COMBINE_ON = 0xB5, + Z2SE_SY_ITEM_COMBINE_OFF = 0xB6, + Z2SE_SY_ITEM_COMBINE_ICON = 0xB7, + Z2SE_SY_MAP_OPEN_S = 0xB8, + Z2SE_SY_MAP_CLOSE_S = 0xB9, + Z2SE_SY_MAP_OPEN_L = 0xBA, + Z2SE_SY_MAP_CLOSE_L = 0xBB, + Z2SE_SY_MAP_ZOOMIN = 0xBC, + Z2SE_SY_MAP_ZOOMOUT = 0xBD, + Z2SE_SY_MAP_SCROLL = 0xBE, + Z2SE_SY_MAP_DPD_HOLD_ON = 0xBF, + Z2SE_SY_MAP_DPD_HOLD_OFF = 0xC0, + Z2SE_SY_MAP_AREA_SELECT = 0xC1, + Z2SE_SY_LETTER_OPEN = 0xC2, + Z2SE_SY_LETTER_CLOSE = 0xC3, + Z2SE_SY_LETTER_NEXT_PAGE = 0xC4, + Z2SE_SY_LIGHT_POT_EQUIP = 0xC5, + Z2SE_SY_LIGHT_DROP_GET = 0xC6, + Z2SE_SY_LIGHT_DROP_COMPLETE = 0xC7, + Z2SE_SY_OPTION_SWITCH = 0xC8, + Z2SE_SY_SOUND_MODE_MONO = 0xC9, + Z2SE_SY_SOUND_MODE_STEREO = 0xCA, + Z2SE_SY_SOUND_MODE_SURROUND = 0xCB, + Z2SE_SY_DPD_CALIB_SW = 0xCC, + Z2SE_SY_SENSOR_BAR_WIDTH = 0xCD, + Z2SE_SY_MG_CANOE_SCORE_DW = 0xCE, + Z2SE_SY_HAWK_GET_KAGO = 0xCF, + Z2SE_AL_V_ATTACK_S = 0x10000, + Z2SE_AL_V_ATTACK_L = 0x10001, + Z2SE_AL_V_DAMAGE_S = 0x10002, + Z2SE_AL_V_DAMAGE_L = 0x10003, + Z2SE_AL_V_ATTACK_M = 0x10004, + Z2SE_AL_V_JUMP_S = 0x10005, + Z2SE_AL_V_JUMP_L = 0x10006, + Z2SE_AL_V_BACKTEN = 0x10007, + Z2SE_AL_V_ZENTEN_FAIL = 0x10008, + Z2SE_AL_V_ZENTEN_FAIL_2 = 0x10009, + Z2SE_AL_V_GRAB = 0x1000A, + Z2SE_AL_V_FOOT_MISS = 0x1000B, + Z2SE_AL_V_FALL = 0x1000C, + Z2SE_AL_V_LANDING_FAIL = 0x1000D, + Z2SE_AL_V_LANDING_FAIL_2 = 0x1000E, + Z2SE_AL_V_LIFTUP_S = 0x1000F, + Z2SE_AL_V_LIFTUP_L = 0x10010, + Z2SE_AL_V_THROW_S = 0x10011, + Z2SE_AL_V_THROW_L = 0x10012, + Z2SE_AL_V_PUSH_ROCK = 0x10013, + Z2SE_AL_V_TIRED_S = 0x10014, + Z2SE_AL_V_TIRED_L = 0x10015, + Z2SE_AL_V_DIE = 0x10016, + Z2SE_AL_V_DIE_SHORT = 0x10017, + Z2SE_AL_V_CLIMB = 0x10018, + Z2SE_AL_V_DRINK = 0x10019, + Z2SE_AL_V_DRINK_2 = 0x1001A, + Z2SE_AL_V_RUSH_HORSE = 0x1001B, + Z2SE_AL_V_ATTACK_RUN = 0x1001C, + Z2SE_AL_V_SWING_BOTTLE = 0x1001D, + Z2SE_AL_V_BITTEN_LOOP = 0x1001E, + Z2SE_AL_V_D04_WAKE_UP = 0x1001F, + Z2SE_AL_V_D04_NOTICE = 0x10020, + Z2SE_AL_V_D04_SURPRISE_A = 0x10021, + Z2SE_AL_V_D04_SURPRISE_B = 0x10022, + Z2SE_AL_V_D04_KIDNAPPED = 0x10023, + Z2SE_AL_V_D04_SURPRISE_C = 0x10024, + Z2SE_AL_V_GORONJUMP = 0x10025, + Z2SE_AL_V_DRINK_DAMAGE = 0x10026, + Z2SE_AL_V_SWING_IB = 0x10027, + Z2SE_AL_V_THROW_IB = 0x10028, + Z2SE_AL_V_FALL_MAGMA = 0x10029, + Z2SE_AL_V_FALL_QUICKSAND = 0x1002A, + Z2SE_AL_V_ATTACK_S_FREE = 0x1002B, + Z2SE_AL_V_ATTACK_M_FREE = 0x1002C, + Z2SE_AL_V_ATTACK_L_FREE = 0x1002D, + Z2SE_WL_V_BREATH_WAIT = 0x1002E, + Z2SE_WL_V_BREATH_TIRED = 0x1002F, + Z2SE_WL_V_BREATH_SIT = 0x10030, + Z2SE_WL_V_BREATH_WALK = 0x10031, + Z2SE_WL_V_BREATH_RUN = 0x10032, + Z2SE_WL_V_BREATH_JUMP = 0x10033, + Z2SE_WL_V_DAMAGE = 0x10034, + Z2SE_WL_V_HOWL = 0x10035, + Z2SE_WL_V_YAWN = 0x10036, + Z2SE_WL_V_ROAR = 0x10037, + Z2SE_WL_V_ATTACK_S = 0x10038, + Z2SE_WL_V_ATTACK_L = 0x10039, + Z2SE_WL_V_ATTACK_SPIN = 0x1003A, + Z2SE_WL_V_ATTACK_THRUST = 0x1003B, + Z2SE_WL_V_THREAT = 0x1003C, + Z2SE_WL_V_DASH = 0x1003D, + Z2SE_WL_V_SNIFF = 0x1003E, + Z2SE_WL_V_NOSE = 0x1003F, + Z2SE_WL_V_LAND_DAMAGE = 0x10040, + Z2SE_WL_V_FALL_TO_RESTART = 0x10041, + Z2SE_WL_V_RESTART = 0x10042, + Z2SE_WL_V_DIE = 0x10043, + Z2SE_WL_V_BITE_ATTACK = 0x10044, + Z2SE_WL_V_BITE_THROAT = 0x10045, + Z2SE_WL_V_HOLD_MOUTH = 0x10046, + Z2SE_WL_V_LOCK_JUMP = 0x10047, + Z2SE_AL_V_SUMO_HARITE_ATK = 0x10048, + Z2SE_AL_V_SUMO_HARITE_DMG = 0x10049, + Z2SE_AL_V_SUMO_TUCKLE_ATK = 0x1004A, + Z2SE_AL_V_SUMO_HOLDED = 0x1004B, + Z2SE_AL_V_SUMO_HOLD_BACK = 0x1004C, + Z2SE_AL_V_SUMO_PUSH = 0x1004D, + Z2SE_AL_V_SUMO_PUSH_LAST = 0x1004E, + Z2SE_AL_V_SUMO_FALL_LOSE = 0x1004F, + Z2SE_AL_V_UNDER_WATER = 0x10050, + Z2SE_AL_V_KAITEN = 0x10051, + Z2SE_AL_V_KAITEN_FREE = 0x10052, + Z2SE_AL_V_DAMAGE_FREEZE = 0x10053, + Z2SE_AL_V_DAMAGE_ELEC = 0x10054, + Z2SE_AL_V_DAMAGE_COMIC = 0x10055, + Z2SE_AL_V_BACKTEN_FREE = 0x10056, + Z2SE_AL_V_JUMP_HANG = 0x10057, + Z2SE_AL_V_CLIMB_WALL = 0x10058, + Z2SE_AL_V_THROW_GORON = 0x10059, + Z2SE_AL_V_PULL_CHAIN_FM = 0x1005A, + Z2SE_AL_V_DIVING = 0x1005B, + Z2SE_AL_V_MAGNET_CAUGHT = 0x1005C, + Z2SE_AL_V_RELAX_A = 0x1005D, + Z2SE_AL_V_RELAX_B = 0x1005E, + Z2SE_AL_V_RELAX_C = 0x1005F, + Z2SE_AL_V_TAMING = 0x10060, + Z2SE_AL_V_SUMO_SHIKO = 0x10061, + Z2SE_AL_V_SUMO_PUSHED_BACK = 0x10062, + Z2SE_AL_V_ATTACK_RUN_FREE = 0x10063, + Z2SE_AL_V_D02_LOOKBACK = 0x10064, + Z2SE_AL_V_D02_WRY_FACE = 0x10065, + Z2SE_AL_V_D04_NOD_SMILE = 0x10066, + Z2SE_AL_V_D04_LOOKBACK = 0x10067, + Z2SE_AL_V_D04_SURPRISE_D = 0x10068, + Z2SE_AL_V_D04_ATTACKED = 0x10069, + Z2SE_AL_V_D04_SURPRISE_E = 0x1006A, + Z2SE_AL_V_D04_DASH = 0x1006B, + Z2SE_AL_V_D04_SUFFER_A = 0x1006C, + Z2SE_AL_V_D04_SUFFER_B = 0x1006D, + Z2SE_AL_V_D04_SUFFER_C = 0x1006E, + Z2SE_AL_V_D04_FALL_DOWN_A = 0x1006F, + Z2SE_AL_V_D04_FALL_DOWN_B = 0x10070, + Z2SE_AL_V_D04_TRANSFORM = 0x10071, + Z2SE_AL_V_D11_SURPRISE = 0x10072, + Z2SE_AL_V_D15_RUSH_HORSE = 0x10073, + Z2SE_AL_V_D15_SURPRISE = 0x10074, + Z2SE_AL_V_D15_ANGER = 0x10075, + Z2SE_AL_V_D36_SWAY_JUMP = 0x10076, + Z2SE_AL_V_D36_SWAY_LAND = 0x10077, + Z2SE_AL_V_D36_JUMP_TO_HORSE = 0x10078, + Z2SE_AL_V_D36_LOOSE_BALANCE = 0x10079, + Z2SE_AL_V_D36_HANG_HORSE = 0x1007A, + Z2SE_AL_V_D36_LOOK_BACK = 0x1007B, + Z2SE_AL_V_D16_SMILE = 0x1007C, + Z2SE_AL_V_D17_LOOK_BACK = 0x1007D, + Z2SE_AL_V_D17_NOD = 0x1007E, + Z2SE_AL_V_D18_SMILING = 0x1007F, + Z2SE_AL_V_D18_SHUDDER = 0x10080, + Z2SE_AL_V_D18_DARK_LAUGH = 0x10081, + Z2SE_AL_V_D18_SCREAM = 0x10082, + Z2SE_AL_V_D18_AWAKE = 0x10083, + Z2SE_AL_V_D19_HIT_SHOULDER = 0x10084, + Z2SE_AL_V_D19_WORRIED = 0x10085, + Z2SE_AL_V_D19_NOTICE = 0x10086, + Z2SE_AL_V_D19_CANT_SAY = 0x10087, + Z2SE_AL_V_D35_LOOK_BACK = 0x10088, + Z2SE_AL_V_D20_SURPRISE = 0x10089, + Z2SE_AL_V_D20_UPSET = 0x1008A, + Z2SE_AL_V_D20_DAMAGE = 0x1008B, + Z2SE_AL_V_D22_PULLOUT = 0x1008C, + Z2SE_AL_V_D22_TAKE_A_REST = 0x1008D, + Z2SE_AL_V_CANON_JUMP = 0x1008E, + Z2SE_AL_V_JUMP_DIVING = 0x1008F, + Z2SE_AL_V_INSECT_LOOP = 0x10090, + Z2SE_AL_V_GUARD_BROKEN = 0x10091, + Z2SE_AL_V_TAME = 0x10092, + Z2SE_AL_V_TATE_OSHI = 0x10093, + Z2SE_AL_V_TODOME_JUMP = 0x10094, + Z2SE_AL_V_TODOME_RETURN = 0x10095, + Z2SE_AL_V_SOTOMO_ROLL = 0x10096, + Z2SE_AL_V_SOTOMO_ATK = 0x10097, + Z2SE_AL_V_KABUTO_JUMP = 0x10098, + Z2SE_AL_V_KABUTO_ATK = 0x10099, + Z2SE_AL_V_IAIGIRI = 0x1009A, + Z2SE_AL_V_JUMP_ATTACK_L_1 = 0x1009B, + Z2SE_AL_V_JUMP_ATTACK_L_2 = 0x1009C, + Z2SE_AL_V_KAITENGIRI_L = 0x1009D, + Z2SE_AL_V_OUGI_KAMAE = 0x1009E, + Z2SE_AL_V_ENTRANCE = 0x1009F, + Z2SE_AL_V_APPEARANCE = 0x100A0, + Z2SE_AL_V_TW_PULL = 0x100A1, + Z2SE_AL_V_D_MHOP = 0x100A2, + Z2SE_AL_V_MSTR_SW_STICK = 0x100A3, + Z2SE_AL_V_MSTR_SW_PULLOUT = 0x100A4, + Z2SE_AL_V_GET_SWL = 0x100A5, + Z2SE_AL_V_D_ODOROKU = 0x100A6, + Z2SE_AL_V_D_ASHIMOTO = 0x100A7, + Z2SE_AL_V_D_UNAZUKU = 0x100A8, + Z2SE_AL_V_TERRORED = 0x100A9, + Z2SE_WL_V_TERRORED = 0x100AA, + Z2SE_AL_V_DAMAGE_ON_HORSE = 0x100AB, + Z2SE_AL_V_CLING_HORSE = 0x100AC, + Z2SE_AL_V_TRANSFORM = 0x100AD, + Z2SE_WL_V_CATCHED = 0x100AE, + Z2SE_WL_V_CATCHED_LOOP = 0x100AF, + Z2SE_WL_V_SLIP_ROLL = 0x100B0, + Z2SE_WL_V_SLIP_CLIMB = 0x100B1, + Z2SE_WL_V_DIE_WATER = 0x100B2, + Z2SE_WL_V_FALL_MAGMA = 0x100B3, + Z2SE_WL_V_FALL_QUICKSAND = 0x100B4, + Z2SE_WL_V_PUSH_ROCK = 0x100B5, + Z2SE_WL_V_TURN_BACK = 0x100B6, + Z2SE_WL_V_HOLD_THROW = 0x100B7, + Z2SE_WL_V_BITE_HANG = 0x100B8, + Z2SE_WL_V_FAILED = 0x100B9, + Z2SE_WL_V_FOOTMISS = 0x100BA, + Z2SE_WL_V_ENTRANCE = 0x100BB, + Z2SE_WL_V_MD_SHOCK = 0x100BC, + Z2SE_WL_V_TW_PULL = 0x100BD, + Z2SE_WL_V_ATTACK_POU_ST = 0x100BE, + Z2SE_WL_V_ATTACK_POU_BITE = 0x100BF, + Z2SE_WL_V_DAMAGE_ELEC = 0x100C0, + Z2SE_WL_V_DAMAGE_FREEZE = 0x100C1, + Z2SE_AL_V_VS_GND_TUBA_A = 0x100C2, + Z2SE_AL_V_VS_GND_TUBA_B = 0x100C3, + Z2SE_AL_V_VS_GND_TUBA_C = 0x100C4, + Z2SE_AL_V_VS_GND_TUBA_WIN = 0x100C5, + Z2SE_AL_V_VS_GND_TUBA_LOSE = 0x100C6, + Z2SE_WL_V_TITLE_HOWL = 0x100C7, + Z2SE_AL_SWORD_PULLOUT = 0x20000, + Z2SE_AL_SWORD_PUTIN = 0x20001, + Z2SE_AL_SWORD_SWING_S = 0x20002, + Z2SE_AL_SWORD_SWING_L = 0x20003, + Z2SE_AL_SWORD_THRUST = 0x20004, + Z2SE_AL_KAITENGIRI = 0x20005, + Z2SE_AL_FINISH_SWING1 = 0x20006, + Z2SE_AL_FINISH_SWING2 = 0x20007, + Z2SE_AL_FINISH_PUTIN = 0x20008, + Z2SE_WOLFATTACK_WIND_S = 0x20009, + Z2SE_WOLFATTACK_WIND_L = 0x2000A, + Z2SE_WOLF_DIG_HOLE = 0x2000B, + Z2SE_WOLF_WIPE_OFF_WATER = 0x2000C, + Z2SE_WOLFATTACK_WIND_TAIL = 0x2000D, + Z2SE_WOLFATTACK_WIND_SCREW = 0x2000E, + Z2SE_WOLF_SWALLOW = 0x2000F, + Z2SE_AL_KICK_HORSE = 0x20010, + Z2SE_BOOM_TORNADO = 0x20011, + Z2SE_AL_SET_CHAIN = 0x20012, + Z2SE_AL_GRAB_CHAIN = 0x20013, + Z2SE_AL_DAMAGE_NORMAL = 0x20014, + Z2SE_AL_DAMAGE_LARGE = 0x20015, + Z2SE_AL_BODYATTACK = 0x20016, + Z2SE_WOLFATTACK_WIND_RUSH = 0x20017, + Z2SE_WARP_DOME_OPEN = 0x20018, + Z2SE_WARP_DOME_SUSTAIN = 0x20019, + Z2SE_BOOM_POWER_RESUME = 0x2001A, + Z2SE_BOOM_POWER_FULL = 0x2001B, + Z2SE_MIDNA_BIND_AREA_OPEN = 0x2001C, + Z2SE_MIDNA_BIND_AREA_SUS = 0x2001D, + Z2SE_PLAY_REED_TOBIKUSA = 0x2001E, + Z2SE_TOBIKUSA_ECHO = 0x2001F, + Z2SE_AL_SWING_BOTTLE = 0x20020, + Z2SE_AL_PADDLING_FORWARD = 0x20021, + Z2SE_AL_PADDLING_BACKWARD = 0x20022, + Z2SE_PLAY_REED_UMAKUSA = 0x20023, + Z2SE_UMAKUSA_ECHO = 0x20024, + Z2SE_SWORD_POWER_COME = 0x20025, + Z2SE_AL_SWORD_SHIELD_ADD = 0x20026, + Z2SE_AL_HARNESS_ADD_HS = 0x20027, + Z2SE_AL_HARNESS_ADD_WB = 0x20028, + Z2SE_AL_KANTERA_SWING_ADD = 0x20029, + Z2SE_AL_MAGNETIZED = 0x2002A, + JA_SE_LK_CUT_GRASS = 0x2002B, + JA_SE_FT_ADD_GRASS = 0x2002C, + Z2SE_AL_ITEM_TAKEOUT = 0x2002D, + JA_SE_LK_BOOM_FLY = 0x2002E, + JA_SE_LK_BOOM_CATCH = 0x2002F, + JA_SE_LK_FALL_DAMAGE = 0x20030, + Z2SE_AL_IB_SWING = 0x20031, + Z2SE_AL_IB_THROW = 0x20032, + Z2SE_AL_IB_PULLBACK = 0x20033, + Z2SE_AL_IB_CATCH = 0x20034, + Z2SE_AL_IB_CHAIN_ADD = 0x20035, + Z2SE_AL_HS_HANGING_UP = 0x20036, + Z2SE_AL_HS_HANGING_DOWN = 0x20037, + JA_SE_LK_MOVE_ROCK = 0x20038, + JA_SE_LK_MOVE_ROCK_LIMIT = 0x20039, + JA_SE_LK_MOVE_WBLOCK = 0x2003A, + JA_SE_LK_MOVE_WBLOCK_LIMIT = 0x2003B, + Z2SE_AL_ARROW_EMPTY = 0x2003C, + JA_SE_LK_W_WEP_CRT_HIT = 0x2003D, + JA_SE_LK_MS_WEP_CRT_HIT = 0x2003E, + Z2SE_AL_WALK_IN_WATER = 0x2003F, + Z2SE_AL_WALK_OUT_WATER = 0x20040, + Z2SE_AL_BURNING = 0x20041, + Z2SE_AL_DRAW_BOW = 0x20042, + Z2SE_AL_HS_OPEN = 0x20043, + Z2SE_WOLF_POWER_COME = 0x20044, + Z2SE_LK_BOTTLE_CLOSE = 0x20045, + Z2SE_LK_BOTTLE_OPEN = 0x20046, + Z2SE_AL_BURN_START = 0x20047, + Z2SE_LK_HS_SHOOT = 0x20048, + Z2SE_LK_HS_CHAIN = 0x20049, + Z2SE_LK_HS_WIND_UP = 0x2004A, + Z2SE_LK_HS_WIND_UP_FIN = 0x2004B, + Z2SE_AL_FREEZE = 0x2004C, + Z2SE_LK_SCOOP_WATER = 0x2004D, + Z2SE_LK_SPRINKLE_WATER = 0x2004E, + Z2SE_AL_OPEN_LETTER = 0x2004F, + Z2SE_WOLF_SENSE_OPEN_START = 0x20050, + Z2SE_WOLF_SENSE_OPEN = 0x20051, + Z2SE_WOLF_DIG_HOLE_THROUGH = 0x20052, + Z2SE_WOLF_WIPE_OFF_DUST = 0x20053, + Z2SE_WOLF_BODYATTACK = 0x20054, + Z2SE_AL_FREEZE_RECOVER = 0x20055, + Z2SE_AL_PICKUP_GRASS = 0x20056, + Z2SE_AL_ITEM_TAKEOUT_FAST = 0x20057, + Z2SE_AL_KANTERA_BURNING = 0x20058, + Z2SE_AL_KANTERA_SWING = 0x20059, + Z2SE_AL_KANTERA_OFF = 0x2005A, + Z2SE_AL_GORON_JUMP_START = 0x2005B, + Z2SE_AL_GORON_JUMP_ROLLING = 0x2005C, + Z2SE_AL_KANTERA_OFF_SWING = 0x2005D, + Z2SE_AL_CHANGE_BOOTS = 0x2005E, + Z2SE_AL_STROKE_GOAT_A = 0x2005F, + Z2SE_AL_STROKE_GOAT_B = 0x20060, + Z2SE_AL_DAMAGE_SMALL = 0x20061, + Z2SE_AL_UNDERWATER_BUBBLE = 0x20062, + Z2SE_AL_WATER_STROKE_S = 0x20063, + Z2SE_AL_WATER_STROKE_L = 0x20064, + Z2SE_AL_WATER_STROKE_FAST = 0x20065, + Z2SE_AL_WATER_STROKE_CIRCLE = 0x20066, + Z2SE_AL_COPYROD_THROW = 0x20067, + Z2SE_AL_COPYROD_RETURN = 0x20068, + Z2SE_AL_COPYROD_CATCH = 0x20069, + Z2SE_AL_COPYROD_SWING = 0x2006A, + Z2SE_AL_COPYROD_READY = 0x2006B, + Z2SE_AL_SPINNER_RIDE = 0x2006C, + Z2SE_AL_SPINNER_EXTEND = 0x2006D, + Z2SE_AL_SPINNER_RAIL = 0x2006E, + Z2SE_AL_SINK_MAGMA = 0x2006F, + Z2SE_AL_SINK_SAND_LEVEL = 0x20070, + Z2SE_AL_SINK_SAND_OUT = 0x20071, + Z2SE_AL_SINK_SAND_PITFALL = 0x20072, + Z2SE_AL_SINK_SNOW_LEVEL = 0x20073, + Z2SE_AL_SINK_SNOW_OUT = 0x20074, + Z2SE_AL_SINK_SNOW_PITFALL = 0x20075, + Z2SE_AL_SPINNER_START = 0x20076, + Z2SE_AL_SPINNER_END = 0x20077, + Z2SE_AL_ROD_SWING_LURE = 0x20078, + Z2SE_AL_ROD_SWING_UKI = 0x20079, + Z2SE_AL_ROD_CASTING_LOOP = 0x2007A, + Z2SE_AL_ROD_ROLLBACK_SLOW = 0x2007B, + Z2SE_AL_ROD_ROLLBACK_FAST = 0x2007C, + Z2SE_AL_REEL_SLOW_LOOP = 0x2007D, + Z2SE_AL_REEL_FAST_LOOP = 0x2007E, + Z2SE_AL_ROD_BEND = 0x2007F, + Z2SE_AL_FISHING_HIT = 0x20080, + Z2SE_AL_LURE_IN_WATER = 0x20081, + Z2SE_AL_UKI_IN_WATER = 0x20082, + Z2SE_AL_FISH_JUMP_UP = 0x20083, + Z2SE_AL_FISH_JUMP_DOWN = 0x20084, + Z2SE_AL_FISH_CATCH = 0x20085, + Z2SE_AL_FISH_RELEASE = 0x20086, + Z2SE_AL_FISH_JUMP_UP_S = 0x20087, + Z2SE_AL_REEL_CRATCH_OFF = 0x20088, + Z2SE_AL_UKI_OUT_WATER = 0x20089, + Z2SE_AL_ROD_TAKEOUT = 0x2008A, + Z2SE_AL_LURE_BOUND = 0x2008B, + Z2SE_AL_FISHING_BOOTS_GET = 0x2008C, + Z2SE_AL_REEL_ROLL_THROW = 0x2008D, + Z2SE_AL_COPYROD_WAIT = 0x2008E, + Z2SE_AL_COPYROD_READY_OFF = 0x2008F, + Z2SE_AL_D04_HEARTBEAT = 0x20090, + Z2SE_AL_SNOBO_RIDE = 0x20091, + Z2SE_AL_SNOBO_BREAK = 0x20092, + Z2SE_AL_SNOBO_JUMP = 0x20093, + Z2SE_AL_SNOBO_LAND = 0x20094, + Z2SE_WOLF_SENSE_CLOSE = 0x20095, + Z2SE_AL_WARP_IN_TATE = 0x20096, + Z2SE_AL_WARP_IN_YOKO = 0x20097, + Z2SE_AL_WARP_OUT = 0x20098, + Z2SE_WOLF_WARP_IN_TATE = 0x20099, + Z2SE_WOLF_WARP_IN_YOKO = 0x2009A, + Z2SE_WOLF_WARP_OUT = 0x2009B, + Z2SE_AL_SHOE_PKPK = 0x2009C, + Z2SE_AL_TORIDASU = 0x2009D, + Z2SE_AL_CANOE_COL = 0x2009E, + Z2SE_AL_CANOE_FALL_DW = 0x2009F, + Z2SE_AL_CANOE_FALL_WET = 0x200A0, + Z2SE_AL_LV3_FALL_WET = 0x200A1, + Z2SE_AL_SWM_STICK = 0x200A2, + Z2SE_AL_SWM_PULL = 0x200A3, + Z2SE_AL_COPYROD_COMEBACK = 0x200A4, + Z2SE_AL_WAIT_SWORD_SWING = 0x200A5, + Z2SE_AL_PULL_CHAIN = 0x200A6, + Z2SE_AL_PULL_CHAIN_STOP = 0x200A7, + Z2SE_AL_TRANSFORM_A_TO_W = 0x200A8, + Z2SE_AL_TRANSFORM_W_TO_A = 0x200A9, + Z2SE_AL_SCOOP_OIL = 0x200AA, + Z2SE_AL_SCOOP_SOUP = 0x200AB, + Z2SE_AL_ELEC_DAMAGE = 0x200AC, + Z2SE_AL_WOOD_SHIELD_BURN = 0x200AD, + Z2SE_AL_IN_WATER_FALL = 0x200AE, + Z2SE_AL_PACHINKO_DRAW = 0x200AF, + Z2SE_AL_PACHINKO_SHOT = 0x200B0, + Z2SE_AL_JUMP_DIVE_WATER = 0x200B1, + Z2SE_AL_SWORD_COLLIDE = 0x200B2, + Z2SE_AL_JUMP_ATK_L_IMPACT = 0x200B3, + Z2SE_AL_KAITEN_L_SLASH = 0x200B4, + Z2SE_AL_HAWK_EYE_PUTON = 0x200B5, + Z2SE_AL_HAWK_EYE_PUTOFF = 0x200B6, + Z2SE_AL_HAWK_EYE_PAN = 0x200B7, + Z2SE_AL_HAWK_EYE_ZOOMIN = 0x200B8, + Z2SE_AL_HAWK_EYE_ZOOMOUT = 0x200B9, + Z2SE_AL_SNOBO_ICEBREAK = 0x200BA, + Z2SE_AL_ICE_SLIP = 0x200BB, + Z2SE_AL_LIGHTNING_SW_GET = 0x200BC, + Z2SE_AL_LIGHTNING_SW_GLOW = 0x200BD, + Z2SE_AL_M_ARMER_RECOVER = 0x200BE, + Z2SE_AL_LTN_SWORD_SWING_S = 0x200BF, + Z2SE_AL_LTN_SWORD_SWING_L = 0x200C0, + Z2SE_AL_LTN_SWORD_THRUST = 0x200C1, + Z2SE_AL_LTN_KAITENGIRI = 0x200C2, + Z2SE_AL_LTN_FINISH_SWING1 = 0x200C3, + Z2SE_AL_LTN_FINISH_SWING2 = 0x200C4, + Z2SE_AL_LTN_SW_WAIT_SWING = 0x200C5, + Z2SE_AL_UKI_KURUKURU_LOOP = 0x200C6, + Z2SE_AL_UKI_POKOPOKO = 0x200C7, + Z2SE_AL_DOJOU_EAT_IMPACT = 0x200C8, + Z2SE_D22_WLF_LIGHT = 0x200C9, + Z2SE_D22_WLF_BRK = 0x200CA, + Z2SE_D22_AL_PULL_OUT = 0x200CB, + Z2SE_D04_AL_TF_BRIGHT = 0x200CC, + Z2SE_D04_AL_TF_BRIGHT_2 = 0x200CE, + Z2SE_D04_WLF_TF_OFF = 0x200D0, + Z2SE_D04_WLF_CHAIN = 0x200D1, + Z2SE_D06_WLF_BITE_CHAIN = 0x200D2, + Z2SE_D06_WLF_CHAIN_LAND = 0x200D3, + Z2SE_D06_WLF_SWING_BD = 0x200D4, + Z2SE_BOOM_GET_DEMO_LOOP1 = 0x200D5, + Z2SE_BOOM_GET_DEMO_LOOP2 = 0x200D6, + Z2SE_AL_M_ARMER_TURNOFF = 0x200D7, + Z2SE_AL_LURE_BOUND_WOOD = 0x200D8, + Z2SE_AL_BACKTEN_WIND = 0x200D9, + Z2SE_FN_WALK_DUMMY = 0x30000, + Z2SE_FN_JUMP_DUMMY = 0x30001, + Z2SE_FN_BOUND_DUMMY = 0x30002, + Z2SE_FN_HAND_DUMMY = 0x30003, + Z2SE_FN_WALK_HEAVY = 0x30004, + Z2SE_FN_JUMP_HEAVY = 0x30005, + Z2SE_FN_LADDER_CLIMB = 0x30006, + Z2SE_FN_LADDER_DOWN = 0x30007, + Z2SE_WL_WALK_L_DUMMY = 0x30008, + Z2SE_WL_WALK_R_DUMMY = 0x30009, + Z2SE_WL_RUN_L_DUMMY = 0x3000A, + Z2SE_WL_RUN_R_DUMMY = 0x3000B, + Z2SE_FN_WALL_CLIMB = 0x3000C, + Z2SE_FN_LINK_CRAWL = 0x3000D, + Z2SE_FN_ROPE_CREAK = 0x3000E, + Z2SE_FN_CHAIN_CREAK = 0x3000F, + Z2SE_HS_WALK_L_DUMMY = 0x30010, + Z2SE_HS_WALK_R_DUMMY = 0x30011, + Z2SE_HS_TROT_L_DUMMY = 0x30012, + Z2SE_HS_TROT_R_DUMMY = 0x30013, + Z2SE_HS_GALLOP_L_DUMMY = 0x30014, + Z2SE_HS_GALLOP_R_DUMMY = 0x30015, + Z2SE_FT_HORSE_PEDAL = 0x30016, + Z2SE_FN_LINK_SLIP = 0x30017, + Z2SE_FN_WOLF_SLIP = 0x30018, + Z2SE_FN_HORSE_SLIP = 0x30019, + Z2SE_BODY_FALL_DOWN = 0x3001A, + Z2SE_AL_SWIM = 0x3001B, + Z2SE_AL_INTO_WATER = 0x3001C, + Z2SE_AL_OUTOF_WATER = 0x3001D, + Z2SE_AL_DIVE_INTO_WATER = 0x3001E, + Z2SE_AL_DIVE_SWIM = 0x3001F, + Z2SE_AL_SWIM_UNDERWATER = 0x30020, + Z2SE_WL_SWIM = 0x30021, + Z2SE_WL_INTO_WATER = 0x30022, + Z2SE_WL_OUTOF_WATER = 0x30023, + Z2SE_WL_DIG_GROUND = 0x30024, + Z2SE_WB_FRONT_L_DUMMY = 0x30025, + Z2SE_WB_FRONT_R_DUMMY = 0x30026, + Z2SE_WB_REAR_L_DUMMY = 0x30027, + Z2SE_WB_REAR_R_DUMMY = 0x30028, + Z2SE_EN_WB_L_SLIP = 0x30029, + Z2SE_EN_WB_KICK_GROUND = 0x3002A, + Z2SE_BB_FRONT_L = 0x3002B, + Z2SE_BB_FRONT_R = 0x3002C, + Z2SE_BB_REAR_L = 0x3002D, + Z2SE_BB_REAR_R = 0x3002E, + Z2SE_EN_BB_KICK_GROUND = 0x3002F, + Z2SE_EN_BB_FN_WALK_L = 0x30030, + Z2SE_EN_BB_FN_WALK_R = 0x30031, + Z2SE_RIDER_FOOTNOTE = 0x30032, + Z2SE_RIDER_FOOTNOTE_WATER = 0x30033, + Z2SE_GOAT_WALK_L_GROUND = 0x30034, + Z2SE_GOAT_WALK_R_GROUND = 0x30035, + Z2SE_GOAT_RUN_L_GROUND = 0x30036, + Z2SE_GOAT_RUN_R_GROUND = 0x30037, + Z2SE_GORON_FOOTNOTE = 0x30038, + Z2SE_STALFOS_FOOTNOTE = 0x30039, + Z2SE_STALHOUND_FOOTNOTE = 0x3003A, + Z2SE_BABYSTAL_FOOTNOTE = 0x3003B, + Z2SE_FN_GOB_WALK = 0x3003C, + Z2SE_FN_GOB_STEP = 0x3003D, + Z2SE_FN_GOB_JUMP = 0x3003E, + Z2SE_FN_ROPE_CREAK_ADD = 0x3003F, + Z2SE_FN_SANDAL_WALK_L = 0x30040, + Z2SE_FN_SANDAL_WALK_R = 0x30041, + Z2SE_FN_SANDAL_JUMP = 0x30042, + Z2SE_FN_SANDAL_WALK_ADULT_L = 0x30043, + Z2SE_FN_SANDAL_WALK_ADULT_R = 0x30044, + Z2SE_FN_KICK_STONE = 0x30045, + Z2SE_FN_NPC_CHILD_WALK_L = 0x30046, + Z2SE_FN_NPC_CHILD_WALK_R = 0x30047, + Z2SE_FN_NPC_CHILD_JUMP = 0x30048, + Z2SE_FN_NPC_ADULT_WALK_L = 0x30049, + Z2SE_FN_NPC_ADULT_WALK_R = 0x3004A, + Z2SE_FN_ARMER_LIGHT_ADD = 0x3004B, + Z2SE_FN_ARMER_HEAVY_ADD = 0x3004C, + Z2SE_FN_SEKIZOU_L = 0x3004D, + Z2SE_FN_SEKIZOU_R = 0x3004E, + Z2SE_FN_ZORA_L = 0x3004F, + Z2SE_FN_ZORA_R = 0x30050, + Z2SE_AL_SWIM_DASH = 0x30051, + Z2SE_WL_SWIM_DASH = 0x30052, + Z2SE_KN_FOOTNOTE_A = 0x30053, + Z2SE_KN_FOOTNOTE_B = 0x30054, + Z2SE_D15_ECHO_SANDAL_L = 0x30055, + Z2SE_D15_ECHO_SANDAL_R = 0x30056, + Z2SE_D15_WB_FOOT_FRONT_L = 0x30057, + Z2SE_D15_WB_FOOT_FRONT_R = 0x30058, + Z2SE_D15_WB_FOOT_REAR_L = 0x30059, + Z2SE_D15_WB_FOOT_REAR_R = 0x3005A, + Z2SE_HIT_SWORD = 0x40000, + Z2SE_HIT_SWORD_STAB = 0x40001, + Z2SE_HIT_SHIELD_ATTACK = 0x40002, + Z2SE_HIT_WOLFBITE = 0x40003, + Z2SE_HIT_WOLFKICK = 0x40004, + Z2SE_HIT_WOOD_WEAPON = 0x40005, + Z2SE_HIT_HAMMER = 0x40006, + Z2SE_HIT_ARROW_STICK = 0x40007, + Z2SE_HIT_ARROW_REBOUND = 0x40008, + Z2SE_HIT_HOOKSHOT_STICK = 0x40009, + Z2SE_HIT_HOOKSHOT_REBOUND = 0x4000A, + Z2SE_HIT_METAL_WEAPON = 0x4000B, + Z2SE_HIT_STONE_WEAPON = 0x4000C, + Z2SE_HIT_HARD_BODY = 0x4000D, + Z2SE_HIT_SOFT_BODY = 0x4000E, + Z2SE_HIT_DUMMY_CANCEL = 0x4000F, + Z2SE_HIT_SWORD_RUN = 0x40010, + Z2SE_HIT_EN_WOOD_WEAPON = 0x40011, + Z2SE_HIT_THOROW_OBJ = 0x40012, + Z2SE_HIT_SPINNER = 0x40013, + Z2SE_HIT_COPYROD = 0x40014, + Z2SE_HIT_STATUE_HAMMER = 0x40015, + Z2SE_HIT_AL_ARROW_STICK = 0x40016, + Z2SE_HIT_AL_ARROW_REBOUND = 0x40017, + Z2SE_HIT_PACHINKO = 0x40018, + Z2SE_SWORD_STICK_PULLOUT = 0x40019, + Z2SE_COL_FLIP_ARROW = 0x4001A, + Z2SE_COL_FLIP_BOOM = 0x4001B, + Z2SE_HIT_ROPE_CUT = 0x4001C, + Z2SE_HIT_ROPE_REBOUND = 0x4001D, + Z2SE_HIT_CHAIN_REBOUND = 0x4001E, + JA_SE_OBJ_BREAK_WOOD_S = 0x4001F, + JA_SE_OBJ_BREAK_WOOD_L = 0x40020, + JA_SE_OBJ_BREAK_CHINA_S = 0x40021, + JA_SE_OBJ_BREAK_CHINA_L = 0x40022, + JA_SE_OBJ_BREAK_WRAILING = 0x40023, + JA_SE_OBJ_HIT_SHOCK_SWITCH = 0x40024, + Z2SE_HS_V_CRY = 0x50000, + Z2SE_HS_V_BURURU = 0x50001, + Z2SE_CAT_CRY_FAMILIER = 0x50002, + Z2SE_CAT_CRY_ANNOY = 0x50003, + Z2SE_CAT_CRY_CARRY = 0x50004, + Z2SE_CAT_CRY_ATTACK = 0x50005, + Z2SE_CHICKEN_WALK = 0x50006, + Z2SE_CHICKEN_CRY = 0x50007, + Z2SE_CAT_CRY_ANNOY_D = 0x50008, + Z2SE_CAT_CRY_ATTACK_D = 0x50009, + Z2SE_HS_V_ANNOY = 0x5000B, + Z2SE_HS_V_RUSH = 0x5000C, + Z2SE_DOG_BARK = 0x5000D, + Z2SE_DOG_BREATH = 0x5000E, + Z2SE_DOG_CARRIED = 0x5000F, + Z2SE_M007_DOG_COME_RUNNING = 0x50013, + Z2SE_KOSARU_V_WAIT = 0x50014, + Z2SE_KOSARU_V_WALK = 0x50015, + Z2SE_KOSARU_V_JUMP = 0x50016, + Z2SE_KOSARU_V_CALL = 0x50017, + Z2SE_KOSARU_V_CATCH = 0x50018, + Z2SE_KOSARU_V_THROW = 0x50019, + Z2SE_KOSARU_V_PRISONED = 0x5001A, + Z2SE_KOSARU_V_POINT = 0x5001B, + Z2SE_KOSARU_V_CRUSHED = 0x5001C, + Z2SE_KOSARU_V_SCARED = 0x5001D, + Z2SE_KOSARU_V_SLAPPED_HIP = 0x5001E, + Z2SE_GOAT_V_CRY = 0x5001F, + Z2SE_GOAT_V_RUN = 0x50020, + Z2SE_GOAT_V_NOSE = 0x50021, + Z2SE_GOAT_V_EAT = 0x50022, + Z2SE_DOG_V_CALL_HELP = 0x50023, + Z2SE_DOG_V_JUMP = 0x50024, + Z2SE_HAWK_V_FIND_LINK = 0x50025, + Z2SE_HAWK_V_LANDING = 0x50026, + Z2SE_HAWK_V_TAKE_OFF = 0x50027, + Z2SE_MK_V_DEMO_HELP_APPEAR = 0x50028, + Z2SE_MK_V_ROPE_START = 0x50029, + Z2SE_MK_V_SWINGING = 0x5002A, + Z2SE_MK_V_D_DELIGHT = 0x5002B, + Z2SE_MK_V_D_BOMB_SHOW = 0x5002C, + Z2SE_MK_V_LOSE_BOMB = 0x5002D, + Z2SE_TKS_V_OUT_OF_POT = 0x5002E, + Z2SE_TKS_V_JUMP_UP = 0x5002F, + Z2SE_TKS_V_RUNNING_LOOP = 0x50030, + Z2SE_TKS_V_FALLING_LOOP = 0x50031, + Z2SE_TKS_V_ODOROKI_LOOP = 0x50032, + Z2SE_TKC_V_ODOROKI_LOOP = 0x50033, + Z2SE_TKJ_V_ODOROKI_LOOP = 0x50034, + Z2SE_HAWK_V_REGI_DEMO_1 = 0x50035, + Z2SE_HAWK_V_REGI_DEMO_2 = 0x50036, + Z2SE_TKJ_V_RUNNING_LOOP = 0x50037, + Z2SE_TKJ_V_CATCHED_CRY = 0x50038, + Z2SE_M019_YELIA_01 = 0x50039, + Z2SE_M020_YELIA_02 = 0x5003A, + Z2SE_TKJ_V_THROWN_CRY = 0x5003B, + Z2SE_TKS_V_TRANSLATE = 0x5003C, + Z2SE_M023_YELIA_05 = 0x5003D, + Z2SE_MOIR_V_WOLF_SURPRISE = 0x5003E, + Z2SE_MOIR_V_SHIT_H = 0x5003F, + Z2SE_MOIR_V_SHIT_L = 0x50040, + Z2SE_GRA_V_SPAWATER_SHOUT = 0x50041, + Z2SE_TKJ_V_SHOP_TALK = 0x50042, + Z2SE_KOSARU_V_SWING_KANTERA = 0x50043, + Z2SE_KOSARU_V_JUMP_SURPRISE = 0x50044, + Z2SE_KOSARU_V_RELEIEF = 0x50045, + Z2SE_KOSARU_V_KAGO_WAIT = 0x50046, + Z2SE_TAMABE_V_TUTO_BIKKURI = 0x50047, + Z2SE_SHA_V_URANAU = 0x50048, + Z2SE_M036_URI_01 = 0x5004A, + Z2SE_KN_V_BREATH = 0x5004B, + Z2SE_KN_V_GUARD = 0x5004C, + Z2SE_KN_V_DAMAGE_S = 0x5004D, + Z2SE_KN_V_DAMAGE_M = 0x5004E, + Z2SE_KN_V_DAMAGE_L = 0x5004F, + Z2SE_KN_V_ATTACK = 0x50050, + Z2SE_KN_V_BALL_READY = 0x50051, + Z2SE_KN_V_BALL_THROW = 0x50052, + Z2SE_KN_V_SOTOMOGIRI = 0x50053, + Z2SE_KN_V_KABUTOWARI = 0x50054, + Z2SE_KN_V_IAIGIRI = 0x50055, + Z2SE_KN_V_JUMP_ATTACK_L = 0x50056, + Z2SE_WLF_V_DEMO_BREATH_RUN = 0x50057, + Z2SE_WLF_V_DEMO_BREATH_WAI = 0x50058, + Z2SE_WLF_V_DEMO_UNARI = 0x50059, + Z2SE_D07V_WLF_UNARI_TRIG = 0x5005A, + Z2SE_M053_KOLIN_03 = 0x5005B, + Z2SE_TARO_V_CAGE_CRY_LOOP = 0x5005C, + Z2SE_M055_TARO_02 = 0x5005D, + Z2SE_M056_TARO_03 = 0x5005E, + Z2SE_TARO_V_CAGE_HAPPY = 0x5005F, + Z2SE_M058_TARO_05 = 0x50060, + Z2SE_WLF_V_DEMO_DAMAGE_S = 0x50061, + Z2SE_WLF_V_DEMO_DAMAGE_L = 0x50062, + Z2SE_D20V_WLF_WAIT_BREATH = 0x50063, + Z2SE_D20V_WLF_WAIT_DAMAGE = 0x50064, + Z2SE_POST_V_RUN_HIGH = 0x50065, + Z2SE_POST_V_RUN_LOW = 0x50066, + Z2SE_GORON_V_SMR_CAUTION = 0x5006A, + Z2SE_GORON_V_SMR_TO_STONE = 0x5006B, + Z2SE_GORON_V_SMR_REPLY = 0x5006C, + Z2SE_YAMI_MURMUR_S = 0x5006D, + Z2SE_YAMI_MURMUR_D = 0x5006E, + Z2SE_YAMI_MURMUR_T = 0x5006F, + Z2SE_SHAD_V_INCANTATION_L = 0x50070, + Z2SE_GRA_A_V_BRBR = 0x50071, + Z2SE_CHIN_V_KUSHAMI = 0x50072, + Z2SE_M077_HANJO_05 = 0x50073, + Z2SE_MDN_V_WARP_LIFTUP = 0x50074, + Z2SE_MSG_V_MDN_D21 = 0x50075, + Z2SE_GOAT_V_THROWN = 0x50077, + Z2SE_GOAT_V_ANGRY = 0x50078, + Z2SE_GOAT_V_BREATH = 0x50079, + Z2SE_GOAT_V_BREATH_SHAKE = 0x5007A, + Z2SE_KOSARU_V_DELIGHT = 0x5007B, + Z2SE_EN_WB_V_INANAKI = 0x5007C, + Z2SE_EN_WB_V_DAMAGE = 0x5007D, + Z2SE_EN_WB_V_INANAKI_DMG = 0x5007E, + Z2SE_EN_WB_V_BREATH = 0x5007F, + Z2SE_EN_WB_V_CRASH = 0x50080, + Z2SE_EN_WB_V_DOWN = 0x50081, + Z2SE_EN_WB_V_UP = 0x50082, + Z2SE_EN_WB_V_RIDE = 0x50083, + Z2SE_MK_V_COME_BACK = 0x50084, + Z2SE_MIDNA_V_LAUGH_LOOP = 0x50085, + Z2SE_GORON_V_FIGHTING_WAIT = 0x50086, + Z2SE_GORON_V_PUNCH = 0x50087, + Z2SE_GORON_V_GUARD = 0x50088, + Z2SE_GORON_V_TOTTER = 0x50089, + Z2SE_GORON_V_HEAD_BACK = 0x5008A, + Z2SE_GORON_V_HIT_TO_STONE = 0x5008B, + Z2SE_GORON_V_RECOVER = 0x5008C, + Z2SE_GORON_V_TO_STONE = 0x5008D, + Z2SE_GORON_V_THROWN = 0x5008E, + Z2SE_GORON_V_RELAX = 0x5008F, + Z2SE_GORON_V_THROWN_FIRST = 0x50090, + Z2SE_MYNA_V_LIGHT_ON = 0x50091, + Z2SE_MYNA_V_LIGHT_OFF = 0x50092, + Z2SE_BOU_V_SUMO_HARITE_ATK = 0x50093, + Z2SE_BOU_V_SUMO_HARITE_DMG = 0x50094, + Z2SE_BOU_V_SUMO_TUCKLE_ATK = 0x50095, + Z2SE_BOU_V_SUMO_HOLDED = 0x50096, + Z2SE_BOU_V_SUMO_HOLD_BACK = 0x50097, + Z2SE_BOU_V_SUMO_PUSH = 0x50098, + Z2SE_BOU_V_SUMO_PUSH_LAST = 0x50099, + Z2SE_BOU_V_SUMO_FALL_LOSE = 0x5009A, + Z2SE_HS_V_D15_CRY = 0x5009B, + Z2SE_HS_V_COACH_CRY = 0x5009E, + Z2SE_HS_V_CRY_UMAKUSA = 0x5009F, + Z2SE_MIDNA_V_APPEAR = 0x500A0, + Z2SE_HYL_MDN_RPLY = 0x500A1, + Z2SE_HYL_MDN_JOKE = 0x500A2, + Z2SE_HYL_MDN_SEXY = 0x500A3, + Z2SE_HYL_MDN_RDCL = 0x500A4, + Z2SE_HYL_MDN_BORE = 0x500A5, + Z2SE_HYL_MDN_IRRT = 0x500A6, + Z2SE_HYL_MDN_ORDR = 0x500A7, + Z2SE_HYL_MDN_RSNT = 0x500A8, + Z2SE_HYL_MDN_CHER = 0x500A9, + Z2SE_HYL_MDN_CONF = 0x500AA, + Z2SE_HYL_MDN_HSTL = 0x500AB, + Z2SE_HYL_MDN_TIRE = 0x500AC, + Z2SE_HYL_MDN_SRUS = 0x500AD, + Z2SE_HYL_MDN_RPLB = 0x500AE, + Z2SE_HYL_MDN_APLG = 0x500AF, + Z2SE_HYL_MDN_DSID = 0x500B0, + Z2SE_HYL_MDN_AFRD = 0x500B1, + Z2SE_MDN_D07_OTT = 0x500B2, + Z2SE_MDN_D10_HOO = 0x500B3, + Z2SE_MDN_D10_HMNG = 0x500B4, + Z2SE_MSG_V_MDN_LAUGH_30 = 0x500B5, + Z2SE_MSG_V_MDN_LAUGH_31 = 0x500B6, + Z2SE_MSG_V_MDN_LAUGH_32 = 0x500B7, + Z2SE_MSG_V_A_MDN_102 = 0x500B8, + Z2SE_MSG_V_A_MDN_103 = 0x500B9, + Z2SE_MSG_V_A_MDN_104 = 0x500BA, + Z2SE_YM_V_SNOBO_RIDING = 0x500BB, + Z2SE_YM_V_SNOBO_JUMP = 0x500BC, + Z2SE_YM_V_SNOBO_SPIN = 0x500BD, + Z2SE_YW_V_SNOBO_RIDING = 0x500BE, + Z2SE_YW_V_SNOBO_JUMP = 0x500BF, + Z2SE_YW_V_SNOBO_SPIN = 0x500C0, + Z2SE_BOU_V_SUMO_SHIKO = 0x500C1, + Z2SE_BOU_V_SUMO_PUSHED_BACK = 0x500C2, + Z2SE_GRN_V_SUMO_SHIKO = 0x500C3, + Z2SE_GRN_V_SUMO_HARITE_ATK = 0x500C4, + Z2SE_GRN_V_SUMO_HARITE_DMG = 0x500C5, + Z2SE_GRN_V_SUMO_TUCKLE_ATK = 0x500C6, + Z2SE_GRN_V_SUMO_HOLDED = 0x500C7, + Z2SE_GRN_V_SUMO_HOLD_BACK = 0x500C8, + Z2SE_GRN_V_SUMO_PUSH = 0x500C9, + Z2SE_GRN_V_SUMO_PUSHED_BACK = 0x500CA, + Z2SE_GRN_V_SUMO_PUSH_LAST = 0x500CB, + Z2SE_GRN_V_SUMO_FALL_LOSE = 0x500CC, + Z2SE_MESSAGE_SE_COMMON = 0x500CD, + Z2SE_YAMI_CUT_S = 0x500CE, + Z2SE_YAMI_CUT_D = 0x500CF, + Z2SE_YAMI_CUT_T = 0x500D0, + Z2SE_YAMI_CUT_L_SWD_S = 0x500D1, + Z2SE_YAMI_CUT_L_SWD_D = 0x500D2, + Z2SE_YAMI_CUT_L_SWD_T = 0x500D3, + Z2SE_YELIA_V_KYAAA_TRIG = 0x500D4, + Z2SE_YELIA_V_KYAAA_LOOP = 0x500D5, + Z2SE_TARO_V_SWING_L = 0x500D6, + Z2SE_TARO_V_SWING_S = 0x500D7, + Z2SE_TARO_V_ARROW_YEAH = 0x500D8, + Z2SE_BESU_MV_DOUYOU = 0x500D9, + Z2SE_MOI_MV_WOUND_UMEKI = 0x500DA, + Z2SE_MOI_V_WOUND_SWING = 0x500DB, + Z2SE_MOI_V_SWING_L = 0x500DC, + Z2SE_MOI_V_SWING_S = 0x500DD, + Z2SE_MOI_V_WOUND_BREATH = 0x500DE, + Z2SE_MOI_V_SLEEP_UNASARE = 0x500DF, + Z2SE_URI_V_SCREAM_L = 0x500E0, + Z2SE_URI_V_SCREAM_S = 0x500E1, + Z2SE_KYURY_MV_ZEKKU = 0x500E2, + Z2SE_KYURY_MV_WORRY = 0x500E3, + Z2SE_HANJO_MV_CRY = 0x500E4, + Z2SE_GRZ_V_BREAK = 0x500E5, + Z2SE_GRZ_V_BREAK_FINISH_M = 0x500E6, + Z2SE_GRZ_V_BREATH = 0x500E7, + Z2SE_GRZ_V_SNIFF = 0x500E8, + Z2SE_GRZ_V_BREAK_FINISH_L = 0x500E9, + Z2SE_GRO_MV_SINGING = 0x500EA, + Z2SE_GRR_MV_SINGING = 0x500EB, + Z2SE_ZRC_V_SLEEPING = 0x500EC, + Z2SE_ZRC_V_UNASARE = 0x500ED, + Z2SE_ZRA_MV_WOUND_BREATH = 0x500EE, + Z2SE_ZRA_MV_WOUND_COUGH = 0x500EF, + Z2SE_SHAD_V_INCANTATION = 0x500F0, + Z2SE_YKM_V_GETFOOD = 0x500F1, + Z2SE_FAIRY_V_SMILING_S = 0x500F2, + Z2SE_FAIRY_V_SIGH_S = 0x500F3, + Z2SE_FAIRY_V_SIGH_L = 0x500F4, + Z2SE_POST_V_THEME = 0x500F5, + Z2SE_POST_V_FANFARE = 0x500F6, + Z2SE_CLERK_MV_SONG_HO = 0x500F7, + Z2SE_WAD_A_MV_DANCE = 0x500F8, + Z2SE_MCN_A_V_DANCE = 0x500F9, + Z2SE_WCN_A_V_DANCE = 0x500FA, + Z2SE_BESU_V_SHIKARARE = 0x500FB, + Z2SE_KKRI_V_AISOWARAI = 0x500FC, + Z2SE_KKRI_V_GREETING = 0x500FD, + Z2SE_LUD_V_HOUSHIN = 0x500FE, + Z2SE_LUD_V_SHIKARARE = 0x500FF, + Z2SE_GRZ_V_NOD = 0x50100, + Z2SE_GRO_V_BREATH = 0x50101, + Z2SE_GRS_V_SURPRISED = 0x50102, + Z2SE_GRA_V_ROLLING = 0x50103, + Z2SE_TOBY_V_BOOT = 0x50104, + Z2SE_THE_V_BURNING = 0x50105, + Z2SE_ASH_V_SMILING = 0x50106, + Z2SE_YKM_V_DASH = 0x50107, + Z2SE_YKM_V_HUG = 0x50108, + Z2SE_YKW_V_HUG = 0x50109, + Z2SE_FAIRY_V_SMILING_L = 0x5010A, + Z2SE_POST_V_APPEAR = 0x5010B, + Z2SE_POST_V_SMILING = 0x5010C, + Z2SE_CHIN_V_YEAH = 0x5010D, + Z2SE_CHIN_V_SMILING = 0x5010E, + Z2SE_INS_V_UFUFU = 0x5010F, + Z2SE_YELIA_V_LOOK_KIBORI = 0x50110, + Z2SE_MAN_A1_V_AWAY = 0x50111, + Z2SE_MAN_A1_V_SURPRISE = 0x50112, + Z2SE_MAN_A1_V_FEAR = 0x50113, + Z2SE_MAN_A1_V_HEY = 0x50114, + Z2SE_MAN_A1_V_LAUGH = 0x50115, + Z2SE_MAN_A1_V_HMM = 0x50116, + Z2SE_MAD_A1_V_AWAY = 0x50117, + Z2SE_MAD_A1_V_SURPRISE = 0x50118, + Z2SE_MAD_A1_V_FEAR = 0x50119, + Z2SE_MAD_A1_V_HEY = 0x5011A, + Z2SE_MAD_A1_V_LAUGH = 0x5011B, + Z2SE_MAD_A1_V_HMM = 0x5011C, + Z2SE_MCN_A1_V_AWAY = 0x5011D, + Z2SE_MCN_A1_V_SURPRISE = 0x5011E, + Z2SE_MCN_A1_V_FEAR = 0x5011F, + Z2SE_MCN_A1_V_HEY = 0x50120, + Z2SE_MCN_A1_V_LAUGH = 0x50121, + Z2SE_MCN_A1_V_HMM = 0x50122, + Z2SE_MON_A1_V_AWAY = 0x50123, + Z2SE_MON_A1_V_SURPRISE = 0x50124, + Z2SE_MON_A1_V_FEAR = 0x50125, + Z2SE_MON_A1_V_HEY = 0x50126, + Z2SE_MON_A1_V_LAUGH = 0x50127, + Z2SE_MON_A1_V_HMM = 0x50128, + Z2SE_MAN_B1_V_AWAY = 0x50129, + Z2SE_MAN_B1_V_SURPRISE = 0x5012A, + Z2SE_MAN_B1_V_FEAR = 0x5012B, + Z2SE_MAN_B1_V_HEY = 0x5012C, + Z2SE_MAN_B1_V_LAUGH = 0x5012D, + Z2SE_MAN_B1_V_HMM = 0x5012E, + Z2SE_MAN_C1_V_AWAY = 0x5012F, + Z2SE_MAN_C1_V_SURPRISE = 0x50130, + Z2SE_MAN_C1_V_FEAR = 0x50131, + Z2SE_MAN_C1_V_HEY = 0x50132, + Z2SE_MAN_C1_V_LAUGH = 0x50133, + Z2SE_MAN_C1_V_HMM = 0x50134, + Z2SE_MAS_A1_V_AWAY = 0x50135, + Z2SE_MAS_A1_V_SURPRISE = 0x50136, + Z2SE_MAS_A1_V_FEAR = 0x50137, + Z2SE_MAS_A1_V_HEY = 0x50138, + Z2SE_MAS_A1_V_LAUGH = 0x50139, + Z2SE_MAS_A1_V_HMM = 0x5013A, + Z2SE_MBN_A1_V_AWAY = 0x5013B, + Z2SE_MBN_A1_V_SURPRISE = 0x5013C, + Z2SE_MBN_A1_V_FEAR = 0x5013D, + Z2SE_MBN_A1_V_HEY = 0x5013E, + Z2SE_MBN_A1_V_LAUGH = 0x5013F, + Z2SE_MBN_A1_V_HMM = 0x50140, + Z2SE_MAD_A2_V_AWAY = 0x50141, + Z2SE_MAD_A2_V_SURPRISE = 0x50142, + Z2SE_MAD_A2_V_FEAR = 0x50143, + Z2SE_MAD_A2_V_HEY = 0x50144, + Z2SE_MAD_A2_V_LAUGH = 0x50145, + Z2SE_MAD_A2_V_HMM = 0x50146, + Z2SE_MAN_A2_V_AWAY = 0x50147, + Z2SE_MAN_A2_V_SURPRISE = 0x50148, + Z2SE_MAN_A2_V_FEAR = 0x50149, + Z2SE_MAN_A2_V_HEY = 0x5014A, + Z2SE_MAN_A2_V_LAUGH = 0x5014B, + Z2SE_MAN_A2_V_HMM = 0x5014C, + Z2SE_MCN_A2_V_AWAY = 0x5014D, + Z2SE_MCN_A2_V_SURPRISE = 0x5014E, + Z2SE_MCN_A2_V_FEAR = 0x5014F, + Z2SE_MCN_A2_V_HEY = 0x50150, + Z2SE_MCN_A2_V_LAUGH = 0x50151, + Z2SE_MCN_A2_V_HMM = 0x50152, + Z2SE_MON_A2_V_AWAY = 0x50153, + Z2SE_MON_A2_V_SURPRISE = 0x50154, + Z2SE_MON_A2_V_FEAR = 0x50155, + Z2SE_MON_A2_V_HEY = 0x50156, + Z2SE_MON_A2_V_LAUGH = 0x50157, + Z2SE_MON_A2_V_HMM = 0x50158, + Z2SE_MAN_B2_V_AWAY = 0x50159, + Z2SE_MAN_B2_V_SURPRISE = 0x5015A, + Z2SE_MAN_B2_V_FEAR = 0x5015B, + Z2SE_MAN_B2_V_HEY = 0x5015C, + Z2SE_MAN_B2_V_LAUGH = 0x5015D, + Z2SE_MAN_B2_V_HMM = 0x5015E, + Z2SE_MAN_C2_V_AWAY = 0x5015F, + Z2SE_MAN_C2_V_SURPRISE = 0x50160, + Z2SE_MAN_C2_V_FEAR = 0x50161, + Z2SE_MAN_C2_V_HEY = 0x50162, + Z2SE_MAN_C2_V_LAUGH = 0x50163, + Z2SE_MAN_C2_V_HMM = 0x50164, + Z2SE_MAS_A2_V_AWAY = 0x50165, + Z2SE_MAS_A2_V_SURPRISE = 0x50166, + Z2SE_MAS_A2_V_FEAR = 0x50167, + Z2SE_MAS_A2_V_HEY = 0x50168, + Z2SE_MAS_A2_V_LAUGH = 0x50169, + Z2SE_MAS_A2_V_HMM = 0x5016A, + Z2SE_MBN_A2_V_AWAY = 0x5016B, + Z2SE_MBN_A2_V_SURPRISE = 0x5016C, + Z2SE_MBN_A2_V_FEAR = 0x5016D, + Z2SE_MBN_A2_V_HEY = 0x5016E, + Z2SE_MBN_A2_V_LAUGH = 0x5016F, + Z2SE_MBN_A2_V_HMM = 0x50170, + Z2SE_WAN_A1_V_AWAY = 0x50171, + Z2SE_WAN_A1_V_SURPRISE = 0x50172, + Z2SE_WAN_A1_V_FEAR = 0x50173, + Z2SE_WAN_A1_V_HEY = 0x50174, + Z2SE_WAN_A1_V_LAUGH = 0x50175, + Z2SE_WAN_A1_V_HMM = 0x50176, + Z2SE_WAD_A1_V_AWAY = 0x50177, + Z2SE_WAD_A1_V_SURPRISE = 0x50178, + Z2SE_WAD_A1_V_FEAR = 0x50179, + Z2SE_WAD_A1_V_HEY = 0x5017A, + Z2SE_WAD_A1_V_LAUGH = 0x5017B, + Z2SE_WAD_A1_V_HMM = 0x5017C, + Z2SE_MAT_A1_V_AWAY = 0x5017D, + Z2SE_MAT_A1_V_SURPRISE = 0x5017E, + Z2SE_MAT_A1_V_FEAR = 0x5017F, + Z2SE_MAT_A1_V_HEY = 0x50180, + Z2SE_MAT_A1_V_LAUGH = 0x50181, + Z2SE_MAT_A1_V_HMM = 0x50182, + Z2SE_WCN_A1_V_AWAY = 0x50183, + Z2SE_WCN_A1_V_SURPRISE = 0x50184, + Z2SE_WCN_A1_V_FEAR = 0x50185, + Z2SE_WCN_A1_V_HEY = 0x50186, + Z2SE_WCN_A1_V_LAUGH = 0x50187, + Z2SE_WCN_A1_V_HMM = 0x50188, + Z2SE_WON_A1_V_AWAY = 0x50189, + Z2SE_WON_A1_V_SURPRISE = 0x5018A, + Z2SE_WON_A1_V_FEAR = 0x5018B, + Z2SE_WON_A1_V_HEY = 0x5018C, + Z2SE_WON_A1_V_LAUGH = 0x5018D, + Z2SE_WON_A1_V_HMM = 0x5018E, + Z2SE_WGN_A1_V_AWAY = 0x5018F, + Z2SE_WGN_A1_V_SURPRISE = 0x50190, + Z2SE_WGN_A1_V_FEAR = 0x50191, + Z2SE_WGN_A1_V_HEY = 0x50192, + Z2SE_WGN_A1_V_LAUGH = 0x50193, + Z2SE_WGN_A1_V_HMM = 0x50194, + Z2SE_WAN_B1_V_AWAY = 0x50195, + Z2SE_WAN_B1_V_SURPRISE = 0x50196, + Z2SE_WAN_B1_V_FEAR = 0x50197, + Z2SE_WAN_B1_V_HEY = 0x50198, + Z2SE_WAN_B1_V_LAUGH = 0x50199, + Z2SE_WAN_B1_V_HMM = 0x5019A, + Z2SE_WAN_A2_V_AWAY = 0x5019B, + Z2SE_WAN_A2_V_SURPRISE = 0x5019C, + Z2SE_WAN_A2_V_FEAR = 0x5019D, + Z2SE_WAN_A2_V_HEY = 0x5019E, + Z2SE_WAN_A2_V_LAUGH = 0x5019F, + Z2SE_WAN_A2_V_HMM = 0x501A0, + Z2SE_WAD_A2_V_AWAY = 0x501A1, + Z2SE_WAD_A2_V_SURPRISE = 0x501A2, + Z2SE_WAD_A2_V_FEAR = 0x501A3, + Z2SE_WAD_A2_V_HEY = 0x501A4, + Z2SE_WAD_A2_V_LAUGH = 0x501A5, + Z2SE_WAD_A2_V_HMM = 0x501A6, + Z2SE_MAT_A2_V_AWAY = 0x501A7, + Z2SE_MAT_A2_V_SURPRISE = 0x501A8, + Z2SE_MAT_A2_V_FEAR = 0x501A9, + Z2SE_MAT_A2_V_HEY = 0x501AA, + Z2SE_MAT_A2_V_LAUGH = 0x501AB, + Z2SE_MAT_A2_V_HMM = 0x501AC, + Z2SE_WCN_A2_V_AWAY = 0x501AD, + Z2SE_WCN_A2_V_SURPRISE = 0x501AE, + Z2SE_WCN_A2_V_FEAR = 0x501AF, + Z2SE_WCN_A2_V_HEY = 0x501B0, + Z2SE_WCN_A2_V_LAUGH = 0x501B1, + Z2SE_WCN_A2_V_HMM = 0x501B2, + Z2SE_WON_A2_V_AWAY = 0x501B3, + Z2SE_WON_A2_V_SURPRISE = 0x501B4, + Z2SE_WON_A2_V_FEAR = 0x501B5, + Z2SE_WON_A2_V_HEY = 0x501B6, + Z2SE_WON_A2_V_LAUGH = 0x501B7, + Z2SE_WON_A2_V_HMM = 0x501B8, + Z2SE_WGN_A2_V_AWAY = 0x501B9, + Z2SE_WGN_A2_V_SURPRISE = 0x501BA, + Z2SE_WGN_A2_V_FEAR = 0x501BB, + Z2SE_WGN_A2_V_HEY = 0x501BC, + Z2SE_WGN_A2_V_LAUGH = 0x501BD, + Z2SE_WGN_A2_V_HMM = 0x501BE, + Z2SE_WAN_B2_V_AWAY = 0x501BF, + Z2SE_WAN_B2_V_SURPRISE = 0x501C0, + Z2SE_WAN_B2_V_FEAR = 0x501C1, + Z2SE_WAN_B2_V_HEY = 0x501C2, + Z2SE_WAN_B2_V_LAUGH = 0x501C3, + Z2SE_WAN_B2_V_HMM = 0x501C4, + Z2SE_MSG_V_A_MDN_1 = 0x501C8, + Z2SE_MSG_V_A_MDN_2 = 0x501C9, + Z2SE_MSG_V_KOKKO = 0x501CA, + Z2SE_MSG_V_SQUIRREL = 0x501CB, + Z2SE_MSG_V_CAT = 0x501CC, + Z2SE_MSG_V_PERU = 0x501CD, + Z2SE_MSG_V_FROG = 0x501CE, + Z2SE_MSG_V_DOG = 0x501CF, + Z2SE_MSG_V_MONKEY = 0x501D0, + Z2SE_MSG_V_MYNA = 0x501D1, + Z2SE_KIU_V_FEAR = 0x501D2, + Z2SE_HANA_V_FEAR = 0x501D3, + Z2SE_MICH_V_FEAR = 0x501D4, + Z2SE_MOI_V_KUTT = 0x501D5, + Z2SE_YKM_V_HUMMING = 0x501D6, + Z2SE_YKM_V_ATTACK_TREE = 0x501D7, + Z2SE_YKM_V_JUMP_TO_LEAF = 0x501D8, + Z2SE_GRA_V_YURAYURA = 0x501D9, + Z2SE_SEKI_V_KAKUSEI_1 = 0x501DA, + Z2SE_SEKI_V_KAKUSEI_2 = 0x501DB, + Z2SE_SEKI_V_JUMP_1 = 0x501DC, + Z2SE_SEKI_V_COL1 = 0x501DD, + Z2SE_SEKI_V_COL2 = 0x501DE, + Z2SE_SEKI_V_NO_JUMP_1 = 0x501DF, + Z2SE_SEKI_V_NO_JUMP_2 = 0x501E0, + Z2SE_GRA_V_ROLLING_RETURN = 0x501E1, + Z2SE_SEKI_V_JUMP_2 = 0x501E2, + Z2SE_SEKI_V_CLEAR_1 = 0x501E3, + Z2SE_SEKI_V_CLEAR_2 = 0x501E4, + Z2SE_MOI_V_GUARD_SWING = 0x501E5, + Z2SE_JAGA_V_SURPRISE = 0x501E6, + Z2SE_TOBY_V_SURPRISE = 0x501E7, + Z2SE_TOBY_V_BURUBURU = 0x501E8, + Z2SE_MDN_V_FLY_OUT = 0x501E9, + Z2SE_MDN_V_MGN_TAME = 0x501EA, + Z2SE_MDN_V_CLINGST = 0x501EB, + Z2SE_MDN_V_LV_PANIC = 0x501EC, + Z2SE_MDN_V_HIT = 0x501ED, + Z2SE_MDN_V_LOOKABOUT_1 = 0x501EE, + Z2SE_MDN_V_WLSWIMDIE = 0x501EF, + Z2SE_MDN_V_WAITD = 0x501F0, + Z2SE_MDN_V_SWAITA = 0x501F1, + Z2SE_MDN_V_SWAITB_1 = 0x501F2, + Z2SE_D26V_MDN_CRY_2 = 0x501F3, + Z2SE_MDN_V_SWAITB_3 = 0x501F4, + Z2SE_MDN_V_SWAITC = 0x501F5, + Z2SE_MDN_V_SWAITD = 0x501F6, + Z2SE_MDN_V_LEADSWAIT = 0x501F7, + Z2SE_MDN_V_HIP = 0x501F8, + Z2SE_MDN_V_WLDIEA = 0x501F9, + Z2SE_MDN_V_ENTRANCE = 0x501FA, + Z2SE_MDN_V_DOOROP = 0x501FB, + Z2SE_MDN_V_ROPEWAIT_1 = 0x501FC, + Z2SE_MDN_V_ROPEWAIT_2 = 0x501FD, + Z2SE_MDN_V_ROPEFALTER = 0x501FE, + Z2SE_MDN_V_WAITTP = 0x501FF, + Z2SE_MDN_V_MGN_CATCH = 0x50200, + Z2SE_MDN_V_MGN_THROW = 0x50201, + Z2SE_D01V_LINK_SMILE_KLN = 0x50202, + Z2SE_D01V_ARU_CALLING = 0x50203, + Z2SE_D01V_YELIA_NOTICE = 0x50204, + Z2SE_D01V_LINK_SMILE_YLA = 0x50205, + Z2SE_D02V_BOU_APPEAR = 0x50206, + Z2SE_D02V_YELIA_NOTICE = 0x50207, + Z2SE_D02V_BOU_LOOKBACK = 0x50208, + Z2SE_D02V_BOU_SHOGERU = 0x50209, + Z2SE_D02V_BOU_KOMATTA = 0x5020A, + Z2SE_D04V_YELIA_SURPRISE = 0x5020B, + Z2SE_D04V_YELIA_SCREAM = 0x5020C, + Z2SE_D13V_BANS_KEIKAI = 0x5020D, + Z2SE_D13V_TARO_ODOSARE = 0x5020E, + Z2SE_D13V_BANS_SOPPO = 0x5020F, + Z2SE_D13V_BESU_CRY_OUT = 0x50210, + Z2SE_D13V_LEN_KOMARU = 0x50211, + Z2SE_D13V_BANS_MASK = 0x50212, + Z2SE_D13V_LEN_NIRAMU = 0x50213, + Z2SE_D13V_BANS_YOTTEKURU = 0x50214, + Z2SE_D13V_BANS_LOOK_BASE = 0x50215, + Z2SE_D13V_BANS_TOBITSUKI = 0x50216, + Z2SE_D13V_BANS_ZUKKOKE = 0x50217, + Z2SE_D13V_BANS_ATOZUSARI = 0x50218, + Z2SE_D13V_BESU_CRYING = 0x50219, + Z2SE_D13V_KOLIN_HARAWARE = 0x5021A, + Z2SE_D13V_BANS_WHO = 0x5021B, + Z2SE_D13V_TARO_FUN = 0x5021C, + Z2SE_D16V_KOLIN_WAKEUP = 0x5021D, + Z2SE_D16V_KOLIN_RELIEF = 0x5021E, + Z2SE_D16V_KOLIN_KOBUSHI = 0x5021F, + Z2SE_D16V_LINK_NOD = 0x50220, + Z2SE_D16V_KOLIN_SLEEP = 0x50221, + Z2SE_D16V_TARO_SURPRISE = 0x50222, + Z2SE_D16V_BESU_SURPRISE = 0x50223, + Z2SE_D16V_TARO_CARRY = 0x50224, + Z2SE_D35V_KOLIN_SMILE = 0x50225, + Z2SE_D35V_LINK_MIHIRAKI = 0x50226, + Z2SE_D35V_KOLIN_RUN = 0x50227, + Z2SE_D35V_THE_RELIEF = 0x50228, + Z2SE_D35V_LINK_LOOK_THE = 0x50229, + Z2SE_D35V_THE_WINK = 0x5022A, + Z2SE_D35V_LINK_NOTICE_1 = 0x5022B, + Z2SE_D35V_LINK_NOTICE_2 = 0x5022C, + Z2SE_D37V_LINK_SMILE = 0x5022D, + Z2SE_D37V_TARO_HIPPARARE = 0x5022E, + Z2SE_D37V_YELIA_SMILE = 0x5022F, + Z2SE_D14V_KOLIN_KIDUKU = 0x50230, + Z2SE_D14V_KOLIN_KOKERU = 0x50231, + Z2SE_D14V_TARO_RUN = 0x50232, + Z2SE_D14V_BESU_RUN = 0x50233, + Z2SE_D14V_TARO_STOP = 0x50234, + Z2SE_D14V_BESU_STOP = 0x50235, + Z2SE_D14V_TARO_JIMAN = 0x50236, + Z2SE_D14V_KOLIN_STANDUP = 0x50237, + Z2SE_D14V_BANS_SHOKAI = 0x50238, + Z2SE_D14V_KOLIN_MITSUMERU = 0x50239, + Z2SE_D14V_TARO_MITSUMERU = 0x5023A, + Z2SE_D14V_BESU_MITSUMERU = 0x5023B, + Z2SE_D17V_KOLIN_SITDOWN = 0x5023C, + Z2SE_D17V_KOLIN_BREATH = 0x5023D, + Z2SE_D17V_LINK_SURPRISE = 0x5023E, + Z2SE_D17V_KOLIN_ALLRIGHT = 0x5023F, + Z2SE_D17V_LINK_RELIEF_KLN = 0x50240, + Z2SE_D19V_LINK_SHOULDER_HIT = 0x50241, + Z2SE_D19V_DOC_NIRAMU = 0x50242, + Z2SE_D19V_LINK_CANNOT_SAY = 0x50243, + Z2SE_D19V_DOC_SORASU = 0x50244, + Z2SE_D19V_YELIA_MATTE = 0x50245, + Z2SE_D19V_YELIA_SIGH = 0x50246, + Z2SE_D19V_LINK_KIDUKU = 0x50247, + Z2SE_D19V_YELIA_KIDUKAZU = 0x50248, + Z2SE_D19V_LINK_YLA_BACK = 0x50249, + Z2SE_D19V_THE_THINK = 0x5024A, + Z2SE_D19V_YELIA_SITDOWN = 0x5024B, + Z2SE_D19V_ZRC_BREATH_1 = 0x5024C, + Z2SE_D19V_THE_IDEA = 0x5024D, + Z2SE_D19V_YELIA_FACEUP = 0x5024E, + Z2SE_D19V_HAI_A_SEKI = 0x5024F, + Z2SE_D19V_HAI_B_SEKI = 0x50250, + Z2SE_D19V_HAI_C_SEKI = 0x50251, + Z2SE_D19V_HAI_D_SEKI = 0x50252, + Z2SE_D19V_HAI_E_SEKI = 0x50253, + Z2SE_D19V_THE_NOTICE_HAI = 0x50254, + Z2SE_D19V_HAI_A_MORIAGARI = 0x50255, + Z2SE_D19V_HAI_B_MORIAGARI = 0x50256, + Z2SE_D19V_HAI_C_MORIAGARI = 0x50257, + Z2SE_D19V_HAI_D_MORIAGARI = 0x50258, + Z2SE_D19V_HAI_E_MORIAGARI = 0x50259, + Z2SE_D19V_THE_YOKATTA = 0x5025A, + Z2SE_D19V_THE_REMEMBER = 0x5025B, + Z2SE_D19V_THE_FIND_ONE = 0x5025C, + Z2SE_D19V_HAI_E_ONLY_ME = 0x5025D, + Z2SE_D19V_HAI_E_ESCAPE = 0x5025E, + Z2SE_D19V_THE_UNARU = 0x5025F, + Z2SE_D19V_THE_NIDOTO = 0x50260, + Z2SE_D19V_THE_FIND_LINK = 0x50261, + Z2SE_D19V_LINK_M_LOST_YLA = 0x50262, + Z2SE_D19V_ZRC_BREATH_2 = 0x50263, + Z2SE_D19V_THE_THROW_KISS = 0x50264, + Z2SE_D19V_THE_LAUGH = 0x50265, + Z2SE_D17V_LINK_NOTICE = 0x50266, + Z2SE_D06V_MDN_KAWASU = 0x50267, + Z2SE_D06V_MDN_LAUGH_OVER = 0x50268, + Z2SE_D08V_MDN_SEEK = 0x50269, + Z2SE_D08V_KOLIN_CHANGE = 0x5026A, + Z2SE_D08V_YELIA_CHANGE = 0x5026B, + Z2SE_D18V_LINK_IN_THE_DARK = 0x5026C, + Z2SE_D18V_LINK_SMILING = 0x5026D, + Z2SE_D18V_YELIA_SMILING = 0x5026E, + Z2SE_D18V_YELIA_ATTACK = 0x5026F, + Z2SE_D18V_LINK_B_SMILE = 0x50270, + Z2SE_D18V_LINK_B_MAGIC = 0x50271, + Z2SE_D18V_LINK_REMOVE = 0x50272, + Z2SE_D18V_LINK_B_LAUGH = 0x50273, + Z2SE_D18V_LINK_B_SURPRISE = 0x50274, + Z2SE_D18V_LINK_B_WEAK = 0x50275, + Z2SE_D18V_LINK_B_LOOKBACK = 0x50276, + Z2SE_D18V_LINK_B_SHOUT = 0x50277, + Z2SE_D18V_YELIA_UFUFU_1 = 0x50278, + Z2SE_D18V_YELIA_UFUFU_2 = 0x50279, + Z2SE_D18V_YELIA_AHAHA_1 = 0x5027A, + Z2SE_D18V_YELIA_AHAHA_2 = 0x5027B, + Z2SE_D18V_YELIA_AHAHA_3 = 0x5027C, + Z2SE_D18V_LINK_WAKEUP = 0x5027D, + Z2SE_D18V_LINK_BREATH = 0x5027E, + Z2SE_D26V_MDN_CRY_1 = 0x5027F, + Z2SE_D26V_MJN_1ST = 0x50280, + Z2SE_D26V_MJN_JUMP = 0x50281, + Z2SE_D26V_MJN_HAND_UP = 0x50282, + Z2SE_D26V_MJN_SPEAR_ATK = 0x50283, + Z2SE_D26V_MDN_NOTICE = 0x50284, + Z2SE_MDN_V_STN_OUT = 0x50285, + Z2SE_D20V_MDN_HAA = 0x50286, + Z2SE_MSG_MDN_KKK = 0x50287, + Z2SE_D28V_MJN_TAME = 0x50288, + Z2SE_D28V_MJN_RUSH = 0x50289, + Z2SE_D28V_SEI_A = 0x5028A, + Z2SE_D28V_SEI_B = 0x5028B, + Z2SE_D28V_SEI_C = 0x5028C, + Z2SE_D28V_SEI_D = 0x5028D, + Z2SE_D20V_LINK_LOOKBACK = 0x5028E, + Z2SE_D20V_LINK_CANNOT_SAY = 0x5028F, + Z2SE_D20V_LINK_SHOUT = 0x50290, + Z2SE_D20V_MDN_APPEAR = 0x50291, + Z2SE_D20V_MDN_SHIBARARE = 0x50292, + Z2SE_D20V_MDN_UBAWARE = 0x50293, + Z2SE_D20V_ZANT_THROW_AWAY = 0x50294, + Z2SE_D20V_MDN_HIT_GROUND = 0x50295, + Z2SE_D20V_MDN_FATALLY = 0x50296, + Z2SE_D20V_MDN_SHIBARI_AGAIN = 0x50297, + Z2SE_D20V_MDN_BRAINWASH = 0x50298, + Z2SE_D20V_ZANT_WANT_YOU = 0x50299, + Z2SE_D20V_MDN_AWAY_ZANT = 0x5029A, + Z2SE_D20V_MDN_SHIBARI_THIRD = 0x5029B, + Z2SE_D20V_MDN_UMEKI = 0x5029C, + Z2SE_D20V_MDN_SHOUT = 0x5029D, + Z2SE_D21V_MDN_BREATH = 0x5029E, + Z2SE_D21V_MDN_FALLDOWN = 0x5029F, + Z2SE_D21V_MDN_HATTOSURU = 0x502A0, + Z2SE_D21V_ZELDA_HATTOSURU = 0x502A1, + Z2SE_D21V_MDN_LIGHT = 0x502A2, + Z2SE_D21V_MDN_LOOK_BARRIER = 0x502A3, + Z2SE_D21V_MDN_KUYASHI = 0x502A4, + Z2SE_D22V_MDN_TOBASARE = 0x502A5, + Z2SE_D22V_LINK_PULLING = 0x502A6, + Z2SE_D22V_LINK_PULLED = 0x502A7, + Z2SE_D23V_LINK_NOD = 0x502A8, + Z2SE_D24V_KNJ_OUR_MISS = 0x502A9, + Z2SE_D24V_MDN_CHANGED_DOWN = 0x502AA, + Z2SE_D24V_MDN_SLOW_WALK = 0x502AB, + Z2SE_D24V_MDN_KUYASHI = 0x502AC, + Z2SE_D24V_KNJ_SEE_OFF = 0x502AD, + Z2SE_D09V_SEI_APPEAR = 0x502AE, + Z2SE_D11V_SEI_APPEAR = 0x502AF, + Z2SE_D14V_SEI_APPEAR = 0x502B0, + Z2SE_D20V_SEI_APPEAR = 0x502B1, + Z2SE_D20V_SEI_DMG = 0x502B2, + Z2SE_D22V_LINK_SWING_1 = 0x502B3, + Z2SE_D22V_LINK_SWING_2 = 0x502B4, + Z2SE_D22V_LINK_SWING_3 = 0x502B5, + Z2SE_D25V_MDN_NOT_CHANGE = 0x502B6, + Z2SE_D25V_ZANT_FATALLY = 0x502B7, + Z2SE_D25V_ZANT_DREAMING = 0x502B8, + Z2SE_D25V_ZANT_DIE = 0x502B9, + Z2SE_D27V_MDN_LOOK_ZELDA = 0x502BA, + Z2SE_D27V_LINK_LOOK_ZELDA = 0x502BB, + Z2SE_D27V_LINK_STOP_BY_MDN = 0x502BC, + Z2SE_D27V_GANON_SITDOWN = 0x502BD, + Z2SE_D27V_GANON_STANDUP = 0x502BE, + Z2SE_D27V_GANON_STOOD_FACE = 0x502BF, + Z2SE_D27V_GANON_LEFT_HAND = 0x502C0, + Z2SE_D27V_GANON_TRIFORCE = 0x502C1, + Z2SE_D27V_GANON_LAUGH_DENY = 0x502C2, + Z2SE_D27V_LINK_AH_MDN_FLY = 0x502C3, + Z2SE_D27V_MDN_TUBUTUUKA = 0x502C4, + Z2SE_D27V_MDN_NO_DAMAGE = 0x502C5, + Z2SE_D27V_MDN_ATTACK_ZLD = 0x502C6, + Z2SE_D27V_MDN_STOP_ATTACK = 0x502C7, + Z2SE_D27V_MDN_BLEW_AWAY = 0x502C8, + Z2SE_D27V_MDN_HIT_GROUND = 0x502C9, + Z2SE_D27V_LINK_FOLLOW_MDN = 0x502CA, + Z2SE_D27V_LINK_LOOKBACK = 0x502CB, + Z2SE_D27V_ZELDA_G_WALK = 0x502CC, + Z2SE_D27V_ZELDA_G_FLOAT = 0x502CD, + Z2SE_D27V_ZELDA_G_HIRUMU = 0x502CE, + Z2SE_D27V_ZELDA_G_ATTACKED = 0x502CF, + Z2SE_D27V_GANON_SCREAM = 0x502D0, + Z2SE_D27V_GANON_TO_PORK_1 = 0x502D1, + Z2SE_D28V_LINK_LOOK_GNN = 0x502D2, + Z2SE_D28V_ZELDA_LOOK_GNN = 0x502D3, + Z2SE_D28V_LINK_BACK = 0x502D4, + Z2SE_D28V_LINK_NOTICE_MDN_1 = 0x502D5, + Z2SE_D28V_LINK_NOTICE_MDN_2 = 0x502D6, + Z2SE_D28V_LINK_REACH_HAND = 0x502D7, + Z2SE_D28V_LINK_BEFORE_WARP = 0x502D8, + Z2SE_D28V_LINK_LOOK_AROUND = 0x502D9, + Z2SE_D28V_LINK_RUMBLE = 0x502DA, + Z2SE_D28V_ZELDA_RUMBLE = 0x502DB, + Z2SE_D28V_ZELDA_LOOK_MASK = 0x502DC, + Z2SE_D28V_LINK_LOOK_MASK = 0x502DD, + Z2SE_D28V_LINK_COME_HORSE = 0x502DE, + Z2SE_D28V_ZELDA_MAGIC = 0x502DF, + Z2SE_D29V_GANON_STANDUP = 0x502E0, + Z2SE_D29V_GANON_BREATH = 0x502E1, + Z2SE_D29V_GANON_TRIFORCE = 0x502E2, + Z2SE_D29V_GANON_BEFORE_D = 0x502E3, + Z2SE_D29V_GANON_DIE = 0x502E4, + Z2SE_D30V_LINK_NOTICE_MDN = 0x502E5, + Z2SE_D30V_LINK_RUN_TO_MDN = 0x502E6, + Z2SE_D30V_LINK_LOOK_MDN = 0x502E7, + Z2SE_D30V_LINK_SMILING = 0x502E8, + Z2SE_D30V_LINK_SURPRISE = 0x502E9, + Z2SE_D30V_ZELDA_SURPRISE = 0x502EA, + Z2SE_D30V_LINK_LOOKBACK = 0x502EB, + Z2SE_D32V_MDN_LOOK_MIRROR = 0x502EC, + Z2SE_D32V_MDN_KUYASHII = 0x502ED, + Z2SE_D32V_GANON_UMEKI = 0x502EE, + Z2SE_D32V_GANON_PIERCED = 0x502EF, + Z2SE_D32V_GANON_FURISIBORU = 0x502F0, + Z2SE_D32V_GANON_RIGHT_FREE = 0x502F1, + Z2SE_D32V_KNJ_SURPRISE = 0x502F2, + Z2SE_D32V_GANON_LEFT_FREE = 0x502F3, + Z2SE_D32V_KNJ_ATTACKED = 0x502F4, + Z2SE_D32V_KNJ_OTHERS_SURP = 0x502F5, + Z2SE_D32V_GANON_USE_SWORD = 0x502F6, + Z2SE_D32V_GANON_IN_MIRROR = 0x502F7, + Z2SE_D32V_KNJ_NAGEKI = 0x502F8, + Z2SE_D32V_KNJ_SETSUMEIGO_1 = 0x502F9, + Z2SE_D32V_KNJ_SETSUMEIGO_2 = 0x502FA, + Z2SE_D33V_ZANT_STANDUP = 0x502FB, + Z2SE_D33V_ZANT_NEJIRU = 0x502FC, + Z2SE_D33V_ZANT_HANERU = 0x502FD, + Z2SE_D33V_ZANT_IKIGIRE = 0x502FE, + Z2SE_D33V_ZANT_JUMP_TO_LNK = 0x502FF, + Z2SE_D33V_ZANT_KAITEN = 0x50300, + Z2SE_D33V_ZANT_EBIZORI = 0x50301, + Z2SE_D33V_ZANT_HIZATSUKI = 0x50302, + Z2SE_D33V_ZANT_KUYASHII = 0x50303, + Z2SE_D33V_ZANT_ATOZUSARI = 0x50304, + Z2SE_D33V_GANON_UMEKI = 0x50305, + Z2SE_D33V_ZANT_BOUZEN = 0x50306, + Z2SE_D32V_GANON_LAUGH_1 = 0x50307, + Z2SE_D32V_GANON_LAUGH_2 = 0x50308, + Z2SE_D07V_MDN_LAUGH_WOLF = 0x50309, + Z2SE_D07V_ZELDA_SURPRISE = 0x5030A, + Z2SE_D07V_MDN_AH = 0x5030B, + Z2SE_D07V_HAI_C_WAIT = 0x5030C, + Z2SE_D07V_HAI_E_WAIT = 0x5030D, + Z2SE_D07V_HAI_F_WAIT = 0x5030E, + Z2SE_D07V_HAI_G_WAIT = 0x5030F, + Z2SE_D07V_HAI_A_SMOKE = 0x50310, + Z2SE_D07V_HAI_C_SMOKE = 0x50311, + Z2SE_D07V_HAI_G_SMOKE = 0x50312, + Z2SE_D07V_ZELDA_NN = 0x50313, + Z2SE_D07V_HAI_B_ATTACK = 0x50314, + Z2SE_D07V_HAI_C_ATTACK = 0x50315, + Z2SE_D07V_HAI_C_SWING = 0x50316, + Z2SE_D07V_HAI_C_COUNTER = 0x50317, + Z2SE_D07V_HAI_C_FUMARERU = 0x50318, + Z2SE_D07V_ZELDA_AH = 0x50319, + Z2SE_D07V_HAI_C_NECK_1 = 0x5031A, + Z2SE_D07V_HAI_D_NECK_1 = 0x5031B, + Z2SE_D07V_HAI_E_NECK_1 = 0x5031C, + Z2SE_D07V_HAI_A_NECK_2 = 0x5031D, + Z2SE_D07V_HAI_G_LOOKBACK = 0x5031E, + Z2SE_D07V_ZELDA_SUR_OR_DIE = 0x5031F, + Z2SE_D07V_MDN_OTTO = 0x50320, + Z2SE_D07V_MDN_RIDE_WOLF = 0x50321, + Z2SE_D15V_TARO_HEAR_STEP = 0x50322, + Z2SE_D15V_BESU_HEAR_STEP = 0x50323, + Z2SE_D15V_TARO_LOOK_ENEMY = 0x50324, + Z2SE_D15V_BESU_LOOK_ENEMY = 0x50325, + Z2SE_D15V_TARO_BREATH = 0x50326, + Z2SE_D15V_KOLIN_LOOK_ENEMY = 0x50327, + Z2SE_D15V_KOLIN_MAYOI = 0x50328, + Z2SE_D15V_KOLIN_KETSUI = 0x50329, + Z2SE_D15V_KOLIN_ATTACK = 0x5032A, + Z2SE_D15V_BESU_TAORERU = 0x5032B, + Z2SE_D15V_BANS_APPEAR = 0x5032C, + Z2SE_D15V_BANS_MENOMAE = 0x5032D, + Z2SE_D15V_BANS_DOWNMASK = 0x5032E, + Z2SE_D06V_MDN_AKUBI = 0x5032F, + Z2SE_D29V_GANON_BREATH_T1 = 0x50330, + Z2SE_D29V_GANON_BREATH_L1 = 0x50331, + Z2SE_D29V_GANON_BREATH_T2 = 0x50332, + Z2SE_D29V_GANON_BREATH_L2 = 0x50333, + Z2SE_D06V_MDN_KIAI = 0x50334, + Z2SE_D22V_WLF_LONG_BARK = 0x50335, + Z2SE_MIDNA_APPEAR = 0x60000, + Z2SE_MIDNA_DISAPPEAR = 0x60001, + Z2SE_CAT_SWIM = 0x60002, + Z2SE_BIRD_FLYING = 0x60003, + Z2SE_BIRD_STAY = 0x60004, + Z2SE_CHICKEN_WING = 0x60005, + Z2SE_GORON_PUNCHWIND = 0x60006, + Z2SE_GORON_TO_STONE = 0x60007, + Z2SE_GORON_TREMBLE = 0x60008, + Z2SE_GORON_RECOVER = 0x60009, + JA_SE_CM_MONS_EXPLODE = 0x6000A, + Z2SE_MIDNA_JUMP = 0x6000B, + Z2SE_CSL_TOWN_BAND_GT_1 = 0x6000C, + Z2SE_CSL_TOWN_BAND_GT_2 = 0x6000D, + Z2SE_CSL_TOWN_BAND_GT_3 = 0x6000E, + Z2SE_CSL_TOWN_BAND_FLUTE = 0x6000F, + JA_SE_CM_MAGBALL_BOUND = 0x60010, + Z2SE_CSL_TOWN_BAND_VOCAL = 0x60011, + JA_SE_CM_CUT_GRASS = 0x60012, + Z2SE_KN_BALL_LEVEL = 0x60013, + Z2SE_TKC_WARP_IN = 0x60014, + Z2SE_TKC_WARP_OUT = 0x60015, + Z2SE_TKS_SHOW_UP = 0x60016, + Z2SE_TKS_HIDE = 0x60017, + Z2SE_TKS_BOUND = 0x60018, + Z2SE_TKJ_FOOTNOTE = 0x60019, + Z2SE_ZELDA_ARROW_DRAW = 0x6001A, + Z2SE_ZELDA_ARROW_SHOT = 0x6001B, + Z2SE_ZELDA_ARROW_FLY = 0x6001C, + Z2SE_ZELDA_ARROW_HIT = 0x6001D, + Z2SE_MIDNA_JUMP_FINISH = 0x6001E, + Z2SE_KOSARU_FOOTNOTE = 0x6001F, + Z2SE_KOSARU_JUMP_START = 0x60020, + Z2SE_KOSARU_JUMP_END = 0x60021, + Z2SE_KOSARU_HAND_CLAP = 0x60022, + Z2SE_KOSARU_FALL_GROUND = 0x60023, + Z2SE_KOSARU_JUMP_WIND = 0x60024, + Z2SE_KOSARU_ATTACK_POLL = 0x60025, + Z2SE_KOSARU_ROLL = 0x60026, + Z2SE_KOSARU_CLIMB = 0x60027, + Z2SE_DARK_VANISH = 0x60028, + Z2SE_MIDNA_BIND_LOCK_ON = 0x60029, + Z2SE_MIDNA_BIND_LOCK_SUS = 0x6002A, + Z2SE_CM_BODYFALL_S = 0x6002B, + Z2SE_CM_BODYFALL_M = 0x6002C, + Z2SE_CM_BODYFALL_L = 0x6002D, + Z2SE_CM_BODYFALL_ASASE_S = 0x6002E, + Z2SE_CM_BODYFALL_ASASE_M = 0x6002F, + Z2SE_CM_BODYFALL_ASASE_L = 0x60030, + Z2SE_CM_BODYFALL_WATER_S = 0x60031, + Z2SE_CM_BODYFALL_WATER_M = 0x60032, + Z2SE_CM_BODYFALL_WATER_L = 0x60033, + Z2SE_CM_KAZAKIRI_S = 0x60034, + Z2SE_CM_KAZAKIRI_M = 0x60035, + Z2SE_CM_KAZAKIRI_L = 0x60036, + Z2SE_HORSE_BODYHIT = 0x60037, + Z2SE_HORSE_SUDDEN_STOP = 0x60038, + Z2SE_HAWK_WING = 0x60039, + Z2SE_HAWK_GLIDE = 0x6003A, + Z2SE_HAWK_HOVER = 0x6003B, + Z2SE_HAWK_LANDING = 0x6003C, + Z2SE_MK_ROPE_SWING = 0x6003D, + Z2SE_MK_DARK_BOOMERANG = 0x6003E, + Z2SE_MK_DARK_BOOM_RESUME = 0x6003F, + Z2SE_MK_DARK_INSECT_DEATH = 0x60040, + Z2SE_KOSARU_FT_BRIDGE = 0x60041, + Z2SE_KOSARU_SWIM = 0x60042, + Z2SE_TKJ_WING = 0x60043, + Z2SE_TKC_WING = 0x60044, + Z2SE_LINKBIRD_CRY = 0x60045, + Z2SE_LINKBIRD_WING = 0x60046, + Z2SE_MOI_STIFF_SHOULDER = 0x60047, + Z2SE_MOI_BELT_TIGHTEN_UP = 0x60048, + Z2SE_MOI_HOLD_SWORD = 0x60049, + Z2SE_GORON_ROLLING = 0x6004A, + Z2SE_GORON_ROLL_BOUND = 0x6004B, + Z2SE_SUMO_HARITE_HIT = 0x6004C, + Z2SE_SUMO_TUCKLE_HIT = 0x6004D, + Z2SE_COACH_WHEEL_ROLL_A = 0x6004E, + Z2SE_COACH_WHEEL_ROLL_B = 0x6004F, + Z2SE_COACH_SHAKE = 0x60050, + Z2SE_COACH_FIRE = 0x60051, + Z2SE_COACH_HIT_ARROW = 0x60052, + Z2SE_COACH_HIT_WIND = 0x60053, + Z2SE_BHANDS_HIT_TABLE = 0x60054, + Z2SE_LINK_COVER_WATER = 0x60055, + Z2SE_DUCK_INTO_WTR = 0x60056, + Z2SE_DUCK_SWIM = 0x60057, + Z2SE_DUCK_SING = 0x60058, + Z2SE_DUCK_SING_S = 0x60059, + Z2SE_DUCK_CRY = 0x6005A, + Z2SE_DUCK_CRY_S = 0x6005B, + Z2SE_HENA_CLAP = 0x6005C, + Z2SE_BANS_SHOVEL = 0x6005D, + Z2SE_BANS_SHOVEL2 = 0x6005E, + Z2SE_BANS_KICK = 0x6005F, + Z2SE_CSTATUE_HIT_BALL = 0x60060, + Z2SE_CSTATUE_ACTIVE_LOOP = 0x60061, + Z2SE_CSTATUE_S_START = 0x60062, + Z2SE_CSTATUE_S_STOP = 0x60063, + Z2SE_CSTATUE_S_WALK_A = 0x60064, + Z2SE_CSTATUE_S_BOUND = 0x60065, + Z2SE_CSTATUE_L_START = 0x60066, + Z2SE_CSTATUE_L_STOP = 0x60067, + Z2SE_CSTATUE_L_WALK_A = 0x60068, + Z2SE_CSTATUE_L_BOUND = 0x60069, + Z2SE_CSTATUE_L_WAKEUP = 0x6006A, + Z2SE_CSTATUE_L_WAKEUP_D = 0x6006B, + Z2SE_CSTATUE_L_SWING_UP = 0x6006C, + Z2SE_CSTATUE_L_SWING_DOWN = 0x6006D, + Z2SE_CSTATUE_L_RESET_ARM = 0x6006E, + Z2SE_CSTATUE_L_REBOUND = 0x6006F, + Z2SE_CSTATUE_S_WALK_B = 0x60070, + Z2SE_CSTATUE_L_WALK_B = 0x60071, + Z2SE_CSTATUE_F_WALK_A = 0x60072, + Z2SE_CSTATUE_F_WALK_B = 0x60073, + Z2SE_CSTATUE_F_BOUND = 0x60074, + Z2SE_KLN_HIHI_OP = 0x60075, + Z2SE_KLN_HIHI_CLAP = 0x60076, + Z2SE_KLN_HIHI_CLTH = 0x60077, + Z2SE_KLN_HIHI_HAND = 0x60078, + Z2SE_KYR_CLN_DISH = 0x60079, + Z2SE_MOI_SWD_FURI = 0x6007A, + Z2SE_POUYA_RECOVER_FADE = 0x6007B, + Z2SE_ZELDA_ARROW_READY = 0x6007C, + Z2SE_TRL_FLAP = 0x6007D, + Z2SE_TRL_SING_HPY = 0x60080, + Z2SE_TRL_SING_ANGRY = 0x60081, + Z2SE_TRL_LIGHT_ON = 0x60082, + Z2SE_TRL_SURIASHI = 0x60083, + Z2SE_G_WLF_ATK = 0x60084, + Z2SE_G_WLF_UNARU = 0x60085, + Z2SE_YM_SNOBO_RIDE = 0x60086, + Z2SE_YM_SNOBO_JUMP = 0x60087, + Z2SE_YM_SNOBO_LAND = 0x60088, + Z2SE_YM_SNOBO_SPIN = 0x60089, + Z2SE_YW_SNOBO_RIDE = 0x6008A, + Z2SE_YW_SNOBO_JUMP = 0x6008B, + Z2SE_YW_SNOBO_LAND = 0x6008C, + Z2SE_YW_SNOBO_SPIN = 0x6008D, + Z2SE_YM_ATTACK_TREE = 0x6008E, + Z2SE_YM_FISH = 0x6008F, + Z2SE_GORON_CHILD_SITDOWN = 0x60090, + Z2SE_YAMI_TRANSFORM_S = 0x60091, + Z2SE_YAMI_TRANSFORM_D = 0x60092, + Z2SE_YAMI_TRANSFORM_T = 0x60093, + Z2SE_GRA_SPA_RLX_A_1 = 0x60094, + Z2SE_GRA_SPA_RLX_A_2 = 0x60095, + Z2SE_GRA_SPA_RLX_B_1 = 0x60096, + Z2SE_GRA_SPA_RLX_B_2 = 0x60097, + Z2SE_ZRZ_MV = 0x60098, + Z2SE_NPC_SNOW_WALK = 0x60099, + Z2SE_YK_WALK = 0x6009A, + Z2SE_YK_LARGE_WALK = 0x6009B, + Z2SE_GRZ_ROCK_PUNCH = 0x6009C, + Z2SE_GRZ_ROCK_BREAK = 0x6009D, + Z2SE_RACA_CLAP = 0x6009E, + Z2SE_MDN_WARP_MAGIC = 0x6009F, + Z2SE_MDN_WARP_IN_TATE = 0x600A0, + Z2SE_MDN_WARP_IN_YOKO = 0x600A1, + Z2SE_A_MDN_WARP_IN_YOKO = 0x600A2, + Z2SE_INSCT_KIRA = 0x600A3, + Z2SE_INSCT_BTBT = 0x600A4, + Z2SE_INSCT_KSKS = 0x600A5, + Z2SE_TOBY_REPAIR_A = 0x600A6, + Z2SE_TOBY_REPAIR_B = 0x600A7, + Z2SE_TOBY_REPAIR_C = 0x600A8, + Z2SE_KOSARU_FT_TSUTA = 0x600A9, + Z2SE_KOSARU_KANTERA_SWING = 0x600AA, + Z2SE_KOSARU_KANTERA_ADD = 0x600AB, + Z2SE_KOSARU_KANTERA_FALL = 0x600AC, + Z2SE_POUYA_TORIDASU = 0x600AD, + Z2SE_POUYA_TORIDASU_2 = 0x600AE, + Z2SE_POSTMAN_PUT_LETTER = 0x600AF, + Z2SE_THEB_WIP = 0x600B0, + Z2SE_THEB_WIP_B = 0x600B1, + Z2SE_GRA_ATK_AT_THE = 0x600B2, + Z2SE_GZ_NE_JUMP = 0x600B3, + Z2SE_GZ_NE_KNKN = 0x600B4, + Z2SE_M_GENERAL_CLAP = 0x600B5, + Z2SE_SHOE_MUNE_TATAKU = 0x600B6, + Z2SE_GRA_A_DRINK = 0x600B7, + Z2SE_CLERKB_MOONWALK_TURN = 0x600B8, + Z2SE_ASHB_MASKOFF = 0x600B9, + Z2SE_ASHB_HAND = 0x600BA, + Z2SE_MOI_KABUTO_OFF = 0x600BB, + Z2SE_MOI_KABUTO_ON = 0x600BC, + Z2SE_MDN_ESCAPE_HOLE_OP = 0x600BD, + Z2SE_FAIRY_STAY = 0x600BE, + Z2SE_FAIRY_HANE_OP = 0x600BF, + Z2SE_FAIRY_HANE_STAY = 0x600C0, + Z2SE_FAIRY_STANDUP = 0x600C1, + Z2SE_FAIRY_WALK = 0x600C2, + Z2SE_INS_SEARCH = 0x600C3, + Z2SE_ZRA_DIVE_SPLASH = 0x600C4, + Z2SE_ZRA_SWIM = 0x600C5, + Z2SE_ZRA_SWIM_B = 0x600C6, + Z2SE_ZRA_SWIM_TURN = 0x600C7, + Z2SE_ZRA_FLOAT = 0x600C8, + Z2SE_ZRA_FLOAT_B = 0x600C9, + Z2SE_ZRA_WAIT_SWIM = 0x600CA, + Z2SE_ZRA_DIVE = 0x600CB, + Z2SE_ZRA_DIVE_B = 0x600CC, + Z2SE_ZRA_TOBIKOMI_S = 0x600CD, + Z2SE_SEKI_YARI = 0x600CE, + Z2SE_SEKI_ST_DEMO = 0x600CF, + Z2SE_SEKI_END_DEMO_1 = 0x600D0, + Z2SE_GIRLS_HEART = 0x600D2, + Z2SE_YM_SCRATCH = 0x600D3, + Z2SE_YM_RIDE_LEAF = 0x600D4, + Z2SE_ZRA_DIVE_SPLASH_OUT = 0x600D5, + Z2SE_FAIRY_S_LV = 0x600D6, + Z2SE_FAIRY_S_FLY = 0x600D7, + Z2SE_FAIRY_S_FLY_RTT = 0x600D8, + Z2SE_YM_HIT_STOMACH = 0x600D9, + Z2SE_YM_SNIFF = 0x600DA, + Z2SE_SEKI_JUMP_LAND = 0x600DB, + Z2SE_SEKI_JUMP_COL = 0x600DC, + Z2SE_SEKI_END_DEMO_2 = 0x600DD, + Z2SE_MDN_HIP = 0x600DE, + Z2SE_MDN_HIP_WTR = 0x600DF, + Z2SE_MDN_LAND = 0x600E0, + Z2SE_MDN_LAND_WTR = 0x600E1, + Z2SE_MDN_MV = 0x600E2, + Z2SE_MDN_HAIR_LEAD = 0x600E3, + Z2SE_MDN_TWPULL = 0x600E4, + Z2SE_MDN_HAIR_OP = 0x600E5, + Z2SE_MDN_HAIR_CL = 0x600E6, + Z2SE_MDN_TAKES = 0x600E7, + Z2SE_MDN_PACKAWAY = 0x600E8, + Z2SE_MDN_HAND = 0x600E9, + Z2SE_MDN_HAND_WTR = 0x600EA, + Z2SE_MDN_LEG = 0x600EB, + Z2SE_MDN_LEG_WTR = 0x600EC, + Z2SE_D13_BANS_MASK_UP = 0x600ED, + Z2SE_D13_BANS_MASK_DOWN = 0x600EE, + Z2SE_D13_BANS_MASK_FALL = 0x600EF, + Z2SE_G_WLF_BREATH = 0x600F0, + Z2SE_G_WLF_JUMP = 0x600F1, + Z2SE_G_WLF_TRANSFORM = 0x600F2, + Z2SE_D07_ZANT_FOOTSET = 0x600F3, + Z2SE_D30_SEIREI = 0x600F4, + Z2SE_D30_WIND = 0x600F5, + Z2SE_D30_NAMIDA = 0x600F6, + Z2SE_D32_KENJA_APPEAR = 0x600F7, + Z2SE_D32_HORSE = 0x600FD, + Z2SE_D32_KENJA_DIE = 0x600FE, + Z2SE_D32_KENJA_MIRROR = 0x600FF, + Z2SE_D25_MDN_HAIR_UP = 0x60101, + Z2SE_D25_MDN_HAIR_EXTEND = 0x60103, + Z2SE_D25_MDN_HAIR_SHORTEN = 0x60104, + Z2SE_D26_MDN_TRANSFORM = 0x60105, + Z2SE_D26_MDN_JINARI = 0x60106, + Z2SE_D26_MJN_FN = 0x60107, + Z2SE_D26_MJN_LAND = 0x60108, + Z2SE_D26_MJN_FN_SUBERI = 0x60109, + Z2SE_D27_MDN_TRANSFORM = 0x6010D, + Z2SE_D27_MJN_EXTEND = 0x6010E, + Z2SE_D28_MDN_LIGHT = 0x6010F, + Z2SE_D28_ZLD_LIGHT = 0x60110, + Z2SE_D28_LZ_WARP_IN = 0x60111, + Z2SE_D28_MDN_TRANSFORM = 0x60112, + Z2SE_D28_MJN_MV_UP = 0x60113, + Z2SE_D28_LZ_WARP_OUT = 0x60114, + Z2SE_D28_LZ_WARP_SEIREI = 0x60115, + Z2SE_SEI_GEM_A = 0x60116, + Z2SE_SEI_GEM_B = 0x60117, + Z2SE_SEI_GEM_C = 0x60118, + Z2SE_SEI_GEM_D = 0x60119, + Z2SE_SEKI_OFF = 0x6011A, + Z2SE_D21_ZLD_TF_1 = 0x6011B, + Z2SE_D21_ZLD_TF_2 = 0x6011C, + Z2SE_D21_ZLD_LIGHT = 0x6011D, + Z2SE_D21_MDN_LIGHT = 0x6011E, + Z2SE_D21_ZLD_TRANSPARENT = 0x6011F, + Z2SE_D24_KENJA_STAY = 0x60120, + Z2SE_D24_KENJA_OUT = 0x60121, + Z2SE_SEI_APPEAR_HEAD = 0x60122, + Z2SE_D09_SEI_APPEAR = 0x60123, + Z2SE_SEI_A_ENERGY = 0x60124, + Z2SE_D09_SEI_VANISH = 0x60125, + Z2SE_D09_SEI_AWAY = 0x60126, + Z2SE_D11_MDN_LAND_WTR = 0x60127, + Z2SE_D11_MDN_AWAY = 0x60128, + Z2SE_D11_SEI_APPEAR_HEAD = 0x60129, + Z2SE_SEI_B_ENERGY = 0x6012B, + Z2SE_SEI_C_ENERGY = 0x6012C, + Z2SE_D14_SEI_WING = 0x6012D, + Z2SE_D14_SEI_AWAY_HEAD = 0x6012E, + Z2SE_D18_MDN_LAND = 0x6012F, + Z2SE_D18_MDN_LAND_BK = 0x60130, + Z2SE_D18_MDN_AWAY = 0x60131, + Z2SE_D18_SEI_APPEAR = 0x60132, + Z2SE_D18_SEI_SWIM = 0x60133, + Z2SE_D18_SEI_APPEAR_2 = 0x60134, + Z2SE_SEI_D_ENERGY = 0x60135, + Z2SE_D18_YLA_APPEAR = 0x60136, + Z2SE_D18_D_AL_ENERGY_COME = 0x60139, + Z2SE_D18_AL_VANISH = 0x6013A, + Z2SE_D18_SEI_GEMS_APPEAR = 0x6013B, + Z2SE_D20_SEI_APPEAR_1 = 0x6013C, + Z2SE_D20_SEI_APPEAR_2 = 0x60143, + Z2SE_D20_MDN_WARP_EXIT = 0x60144, + Z2SE_D20_WLF_WARP_OUT = 0x60145, + Z2SE_D20_WLF_FALL = 0x60146, + Z2SE_D06_MDN_JUMP_1 = 0x60147, + Z2SE_D06_MDN_JUMP_2 = 0x60148, + Z2SE_D06_MDN_BUBBLE = 0x60149, + Z2SE_D24_MDN_FOOT = 0x6014A, + Z2SE_D08_MDN_OUT_WINDOW = 0x6014B, + Z2SE_D08_MDN_FR_IN = 0x6014C, + Z2SE_D08_MDN_WARP = 0x6014D, + Z2SE_D10_MDN_MAGIC = 0x6014E, + Z2SE_D07_MDN_TOUCH_WOLF = 0x6014F, + Z2SE_D07_PEOPLE_TW = 0x60150, + Z2SE_D07_Z_TAKE_HOOD = 0x60151, + Z2SE_D15_BANS_HELM_DW = 0x60152, + Z2SE_D06_MDN_MAGIC = 0x60153, + Z2SE_CSTATUE_GM_HIT_BALL = 0x60154, + Z2SE_CSTATUE_GM_START = 0x60155, + Z2SE_CSTATUE_GM_ACTIVE_LP = 0x60156, + Z2SE_CSTATUE_GM_STOP = 0x60157, + Z2SE_CSTATUE_GM_SWING_DOWN = 0x60158, + Z2SE_CSTATUE_GM_HIT_GROUND = 0x60159, + Z2SE_CSTATUE_GM_RESET_ARM = 0x6015A, + Z2SE_CSTATUE_GM_MOVE_STOP = 0x6015B, + Z2SE_CSTATUE_SEAL_VANISH = 0x6015C, + Z2SE_D04_CONNECTED_CHAIN = 0x6015D, + Z2SE_D06_WOLF_ONLY_CHAIN = 0x6015E, + Z2SE_SARU_CHAIN_DEMO = 0x6015F, + Z2SE_SARU_CHAIN_SWING = 0x60160, + Z2SE_EN_SINEWAVE = 0x70000, + Z2SE_EN_FM_FOOTNOTE = 0x70001, + Z2SE_EN_FM_BLAST = 0x70002, + Z2SE_EN_FM_BUN = 0x70003, + Z2SE_EN_FM_CHAIN_FOOTNOTE = 0x70004, + Z2SE_EN_FM_CHAIN_HIKIZURI = 0x70005, + Z2SE_EN_FM_V_BLAST_GAOO = 0x70006, + Z2SE_EN_FM_V_DAMAGE = 0x70007, + Z2SE_EN_FM_V_GAOO_LONG = 0x70008, + Z2SE_EN_FM_V_UDEHURI = 0x70009, + Z2SE_EN_FM_HOTAIR = 0x7000A, + Z2SE_EN_FM_BURNING = 0x7000B, + Z2SE_EN_FM_V_GAOO_SHORT = 0x7000C, + Z2SE_EN_NS_UDEHURI = 0x7000D, + Z2SE_EN_NS_FALLTREE = 0x7000E, + Z2SE_EN_NS_DOSA = 0x7000F, + Z2SE_EN_NS_V_DAMAGE = 0x70010, + Z2SE_EN_NS_V_DEATH = 0x70011, + Z2SE_EN_RD_SWING_CLUB = 0x70012, + Z2SE_EN_RD_V_DAMAGE = 0x70013, + Z2SE_EN_RD_V_DEATH = 0x70014, + Z2SE_EN_RD_V_SNIPED_DAMAGE = 0x70015, + Z2SE_EN_RD_V_SNIPED_FALLING = 0x70016, + Z2SE_EN_RD_V_SHOT_ARROW = 0x70017, + Z2SE_EN_RD_V_RIDING_YELL = 0x70018, + Z2SE_EN_RD_V_DODGE = 0x70019, + Z2SE_EN_RD_V_FIND_LINK_YELL = 0x7001A, + Z2SE_EN_RD_V_COMMANDER = 0x7001B, + Z2SE_EN_RD_V_NOTICE = 0x7001C, + Z2SE_EN_RD_V_LAKE_APPEAR = 0x7001D, + Z2SE_EN_SF_V_FIRST_DEMO = 0x7001F, + Z2SE_EN_DN_V_DAMAGE = 0x70021, + Z2SE_EN_DN_V_DEATH = 0x70022, + Z2SE_EN_HG_V_D28_STAND = 0x70024, + Z2SE_EN_HG_V_D28_STANDTURN = 0x70025, + Z2SE_EN_KR_WING = 0x70027, + Z2SE_EN_KR_V_DAMAGE = 0x70028, + Z2SE_EN_KR_V_DEATH = 0x70029, + Z2SE_EN_KR_V_ATTACK = 0x7002A, + Z2SE_EN_KR_V_NAKU = 0x7002B, + Z2SE_EN_KR_V_FURA = 0x7002C, + Z2SE_EN_KR_V_FIND = 0x7002D, + Z2SE_EN_KR_FALLDOWN = 0x7002E, + Z2SE_EN_KR_GLIDE = 0x7002F, + Z2SE_EN_KR_V_DAMAGE_S = 0x70030, + Z2SE_EN_KR_V_DOWN = 0x70031, + Z2SE_EN_KR_V_ATTACK2 = 0x70032, + Z2SE_EN_KR_V_AWAKE = 0x70033, + Z2SE_EN_RD_V_WAND_ATTACK = 0x70034, + Z2SE_EN_RD_V_READY_WEAPON = 0x70035, + Z2SE_EN_RD_V_RUNNING_BREATH = 0x70036, + Z2SE_EN_RD_V_CALLING = 0x70037, + Z2SE_EN_RD_V_JUMP_RIDING = 0x70038, + Z2SE_EN_DN_FN_L = 0x70039, + Z2SE_EN_DN_FN_R = 0x7003A, + Z2SE_EN_DN_FN_RUN_L = 0x7003B, + Z2SE_EN_DN_FN_RUN_R = 0x7003C, + Z2SE_EN_DN_TAIL = 0x7003D, + Z2SE_EN_DN_V_TAIL = 0x7003E, + Z2SE_EN_DN_V_FIND = 0x7003F, + Z2SE_EN_DN_KNIFE = 0x70040, + Z2SE_EN_DN_V_KNIFE = 0x70041, + Z2SE_EN_DN_KNIFE2_A = 0x70042, + Z2SE_EN_DN_KNIFE2_B = 0x70043, + Z2SE_EN_DN_V_KNIFE2_A = 0x70044, + Z2SE_EN_DN_V_BREATH = 0x70045, + Z2SE_EN_DN_V_GUARD = 0x70046, + Z2SE_EN_DN_V_JUMP = 0x70047, + Z2SE_EN_DN_V_SEARCH = 0x70048, + Z2SE_EN_DN_V_SEARCH2 = 0x70049, + Z2SE_EN_DN_V_DRAWBACK = 0x7004A, + Z2SE_EN_DN_V_UP = 0x7004B, + Z2SE_EN_DN_V_AWAKE = 0x7004C, + Z2SE_EN_DN_V_DAMAGE2 = 0x7004D, + Z2SE_EN_DN_V_SURPRIZE = 0x7004E, + Z2SE_EN_DN_V_FIND_BOMB = 0x7004F, + Z2SE_EN_DN_V_LOOK_BOMB = 0x70050, + Z2SE_EN_DN_V_KICK_BOMB = 0x70051, + Z2SE_EN_ZAN_DEMO_FOOT = 0x70052, + Z2SE_EN_PM_V_LAUGH = 0x70055, + Z2SE_EN_PM_V_DAMAGE = 0x70056, + Z2SE_EN_PM_V_DEATH = 0x70057, + Z2SE_EN_PM_FADEIN = 0x70058, + Z2SE_EN_PM_FADEOUT = 0x70059, + Z2SE_EN_PM_TRUMPET = 0x7005A, + Z2SE_EN_PM_MOVE = 0x7005B, + Z2SE_EN_PM_LAMP_FALL = 0x7005C, + Z2SE_EN_FM_YUGE = 0x7005D, + Z2SE_EN_FM_DOWNSPLASH = 0x7005E, + Z2SE_EN_FM_DOWNYUGE = 0x7005F, + Z2SE_EN_FM_CHAIN_HIT = 0x70060, + Z2SE_EN_FM_CHAIN_CUTOFF = 0x70061, + Z2SE_EN_AI_DOSU = 0x70062, + Z2SE_EN_AI_HAMMER = 0x70063, + Z2SE_EN_AI_GURAGURA = 0x70064, + Z2SE_EN_AI_V_AWAKE = 0x70065, + Z2SE_EN_AI_V_DAMAGE = 0x70066, + Z2SE_EN_AI_V_HAMMER = 0x70067, + Z2SE_EN_AI_V_MOGAKU = 0x70068, + Z2SE_EN_MK_V_BREATH = 0x70069, + Z2SE_EN_MK_V_THROW_BOOM = 0x7006A, + Z2SE_EN_MK_V_CATCH_BOOM = 0x7006B, + Z2SE_EN_MK_V_DAMAGE = 0x7006C, + Z2SE_EN_MK_V_DAMAGE_L = 0x7006D, + Z2SE_EN_MK_V_DEAD = 0x7006E, + Z2SE_EN_MK_V_PROVOKE_A = 0x7006F, + Z2SE_EN_MK_V_PROVOKE_B = 0x70070, + Z2SE_EN_MK_V_JUMP = 0x70071, + Z2SE_EN_MK_V_SNEER = 0x70072, + Z2SE_EN_MK_V_HIT_BOOM = 0x70073, + Z2SE_EN_MK_V_DOWN = 0x70074, + Z2SE_EN_MK_V_AWAKE = 0x70075, + Z2SE_EN_MK_V_LOOSE_BALANCE = 0x70076, + Z2SE_EN_MK_FOOTNOTE = 0x70077, + Z2SE_EN_MK_JUMP_START = 0x70078, + Z2SE_EN_MK_JUMP_END = 0x70079, + Z2SE_EN_MK_FALL_GROUND = 0x7007A, + Z2SE_EN_MK_BOOM_FLY = 0x7007B, + Z2SE_EN_MK_CATCH_BOOM = 0x7007C, + Z2SE_EN_MK_JUMP_WIND = 0x7007D, + Z2SE_EN_MK_CRAWL = 0x7007E, + Z2SE_EN_MK_SCRATCH_HIP = 0x7007F, + Z2SE_EN_DB_GRASS = 0x70080, + Z2SE_EN_DB_V_CREEP = 0x70081, + Z2SE_EN_DB_ATTACK = 0x70082, + Z2SE_EN_DB_V_ATTACK = 0x70083, + Z2SE_EN_DB_V_DAMAGE = 0x70084, + Z2SE_EN_DB_V_DAMAGE_S = 0x70085, + Z2SE_EN_DB_V_DEATH = 0x70086, + Z2SE_EN_DB_V_WAIT = 0x70087, + Z2SE_EN_DB_V_FAINT = 0x70088, + Z2SE_EN_DB_V_AWAKE = 0x70089, + Z2SE_EN_DB_V_CUT = 0x7008A, + Z2SE_EN_DB_BERON = 0x7008B, + Z2SE_EN_DB_APPEAR = 0x7008C, + Z2SE_EN_DB_HIKKOMU = 0x7008D, + Z2SE_EN_SF_V_ATTACK = 0x7008E, + Z2SE_EN_SF_V_NOTICE = 0x7008F, + Z2SE_EN_SF_V_GUARD = 0x70090, + Z2SE_EN_SF_V_DRAWBACK = 0x70091, + Z2SE_EN_SF_V_DAMAGE = 0x70092, + Z2SE_EN_SF_V_FALLDOWN = 0x70093, + Z2SE_EN_SF_V_RESURRECTION = 0x70094, + Z2SE_EN_SF_BUILD_UP = 0x70095, + Z2SE_EN_SF_BREAK_DOWN = 0x70096, + Z2SE_EN_SF_SHAKE_BONES = 0x70097, + Z2SE_EN_SF_SWING_SWORD_L = 0x70098, + Z2SE_EN_SF_SWING_SWORD_S = 0x70099, + Z2SE_EN_AI_AWAKE = 0x7009A, + Z2SE_EN_AI_BREAK_LAST = 0x7009B, + Z2SE_EN_AI_HAMMER_HIT = 0x7009C, + Z2SE_EN_AI_FLASH = 0x7009D, + Z2SE_EN_SH_V_APPEAR = 0x7009E, + Z2SE_EN_SH_V_BREATH = 0x7009F, + Z2SE_EN_SH_V_ATTACK = 0x700A0, + Z2SE_EN_SH_V_DAMAGE = 0x700A1, + Z2SE_EN_SH_V_DEAD = 0x700A2, + Z2SE_EN_SH_APPEAR = 0x700A3, + Z2SE_EN_SH_DISAPPEAR = 0x700A4, + Z2SE_EN_SH_DEAD = 0x700A5, + Z2SE_EN_ST_SILK = 0x700A6, + Z2SE_EN_BA_WING = 0x700A7, + Z2SE_EN_GO_FOOTNOTE = 0x700A8, + Z2SE_EN_ST_SILK_WRAP = 0x700A9, + Z2SE_EN_ST_SILK_CUT = 0x700AA, + Z2SE_EN_BS_V_ATTACK = 0x700AB, + Z2SE_EN_BS_V_NOTICE = 0x700AC, + Z2SE_EN_BS_V_DAMAGE = 0x700AD, + Z2SE_EN_BS_V_DEAD = 0x700AE, + Z2SE_EN_BS_APPEAR = 0x700AF, + Z2SE_EN_BS_DEAD = 0x700B0, + Z2SE_EN_BS_SHAKE_BONES = 0x700B1, + Z2SE_EN_BS_ATTACK_SPEAR = 0x700B2, + Z2SE_EN_BA_V_NAKU = 0x700B3, + Z2SE_EN_BA_V_ATTACK = 0x700B4, + Z2SE_EN_BA_V_DEATH = 0x700B5, + Z2SE_EN_ST_FOOTNOTE = 0x700B6, + Z2SE_EN_ST_ATTACK = 0x700B7, + Z2SE_EN_ST_V_WAIT = 0x700B8, + Z2SE_EN_ST_HUG_ATTACK = 0x700B9, + Z2SE_EN_ST_V_DEATH = 0x700BA, + Z2SE_EN_ST_JUMP = 0x700BB, + Z2SE_EN_ST_JUMPBACK = 0x700BC, + Z2SE_EN_KG_ATTACK = 0x700BD, + Z2SE_EN_KG_V_ATTACK = 0x700BE, + Z2SE_EN_KG_V_DEATH = 0x700BF, + Z2SE_EN_KG_V_FIND = 0x700C0, + Z2SE_EN_KG_FOOTNOTE = 0x700C1, + Z2SE_EN_KG_FALL = 0x700C2, + Z2SE_EN_KG_V_WAIT = 0x700C3, + Z2SE_EN_NZ_V_NAKU = 0x700C4, + Z2SE_EN_NZ_V_DEATH = 0x700C5, + Z2SE_EN_NZ_BITE = 0x700C6, + Z2SE_EN_NZ_FOOTNOTE = 0x700C7, + Z2SE_EN_NZ_FN_WATER = 0x700C8, + Z2SE_EN_PO_ATTACK = 0x700C9, + Z2SE_EN_PO_V_ATTACK = 0x700CA, + Z2SE_EN_PO_V_DEATH = 0x700CB, + Z2SE_EN_PO_V_FIND = 0x700CC, + Z2SE_EN_PO_V_BIKKURI = 0x700CD, + Z2SE_EN_PO_MOVE = 0x700CE, + Z2SE_EN_PO_V_DAMAGE = 0x700CF, + Z2SE_EN_PO_LAMP = 0x700D0, + Z2SE_EN_PO_VISIBLE = 0x700D1, + Z2SE_EN_PO_V_LAUGH = 0x700D2, + Z2SE_EN_NS_V_AWAKE = 0x700D3, + Z2SE_EN_NS_V_HIRUMU = 0x700D4, + Z2SE_EN_FS_ATTACK = 0x700D5, + Z2SE_EN_FS_DAMAGE = 0x700D6, + Z2SE_EN_FS_DEATH = 0x700D7, + Z2SE_EN_FS_APPEAR = 0x700D8, + Z2SE_EN_FS_POSE = 0x700D9, + Z2SE_EN_FS_KUBIKASIGE = 0x700DA, + Z2SE_EN_FS_LAND = 0x700DB, + Z2SE_EN_FS_LAND_WATER = 0x700DC, + Z2SE_EN_PM_FN_L = 0x700DD, + Z2SE_EN_PM_FN_R = 0x700DE, + Z2SE_EN_PM_FN_WATER_L = 0x700DF, + Z2SE_EN_PM_FN_WATER_R = 0x700E0, + Z2SE_EN_PM_LAND = 0x700E1, + Z2SE_EN_PM_LAND_WATER = 0x700E2, + Z2SE_EN_FS_BACKSWING = 0x700E3, + Z2SE_EN_FS_MOVE = 0x700E4, + Z2SE_EN_PM_V_FOGBLOW = 0x700E5, + Z2SE_EN_YM_FOOTNOTE = 0x700E6, + Z2SE_EN_YM_DEATH = 0x700E7, + Z2SE_EN_YM_MOGAKU = 0x700E8, + Z2SE_EN_YM_WAIT = 0x700EA, + Z2SE_EN_BI_FOOTNOTE = 0x700EB, + Z2SE_EN_BI_WAIT = 0x700EC, + Z2SE_EN_BI_APPEAR = 0x700ED, + Z2SE_EN_BI_STAND = 0x700EE, + Z2SE_EN_BI_CROUCH = 0x700EF, + Z2SE_EN_YM_JUMP = 0x700F0, + Z2SE_EN_RDB_V_DAMAGE = 0x700F6, + Z2SE_EN_RDB_V_DEATH = 0x700F7, + Z2SE_EN_RDB_V_HOICK = 0x700F8, + Z2SE_EN_RDB_HORN = 0x700F9, + Z2SE_EN_NS_FN_L = 0x700FA, + Z2SE_EN_NS_FN_R = 0x700FB, + Z2SE_EN_NS_HAND_L = 0x700FC, + Z2SE_EN_NS_HAND_R = 0x700FD, + Z2SE_EN_BH_V_APPEAR = 0x700FE, + Z2SE_EN_BH_V_ATTACK = 0x700FF, + Z2SE_EN_BH_ATTACK = 0x70100, + Z2SE_EN_BH_V_DAMAGE = 0x70101, + Z2SE_EN_BH_V_WAIT = 0x70102, + Z2SE_EN_BH_V_NODAMAGE = 0x70103, + Z2SE_EN_BH_V_EAT = 0x70104, + Z2SE_EN_BH_V_ROUT = 0x70105, + Z2SE_EN_BH_SPLASH_UP = 0x70106, + Z2SE_EN_BH_SPLASH_DOWN = 0x70107, + Z2SE_EN_BH_V_AWAKE = 0x70108, + Z2SE_EN_BH_BURST = 0x70109, + Z2SE_EN_BQ_V_APPEAR = 0x7010A, + Z2SE_EN_BQ_V_BARK = 0x7010B, + Z2SE_EN_BQ_APPEAR = 0x7010C, + Z2SE_EN_BQ_V_WAIT = 0x7010E, + Z2SE_EN_BQ_V_BOMBDAMAGE = 0x7010F, + Z2SE_EN_BQ_V_DAMAGEWAIT = 0x70110, + Z2SE_EN_BQ_V_COREDAMAGE = 0x70111, + Z2SE_EN_BQ_V_BACK = 0x70113, + Z2SE_EN_BQ_V_DAMAGEBACK = 0x70114, + Z2SE_EN_NS_V_ATTACK = 0x70115, + Z2SE_EN_NS_V_SEARCH = 0x70116, + Z2SE_EN_YM_FALL = 0x70117, + Z2SE_EN_NS_V_WAIT = 0x70118, + Z2SE_EN_NS_V_ATTACK2 = 0x70119, + Z2SE_EN_BQ_DOWN = 0x7011A, + Z2SE_EN_YM_ATTACK = 0x7011B, + Z2SE_EN_YM_DEFENCE = 0x7011C, + Z2SE_EN_YM_FIND = 0x7011D, + Z2SE_EN_YM_LAND = 0x7011E, + Z2SE_EN_YM_MOVE = 0x7011F, + Z2SE_EN_DB_DRY = 0x70120, + Z2SE_EN_BB_V_INANAKI = 0x70122, + Z2SE_EN_BB_V_START = 0x70123, + Z2SE_EN_BE_FLY_D = 0x70124, + Z2SE_EN_BE_FLY_GROUP_D = 0x70125, + Z2SE_EN_BE_STAY = 0x70126, + Z2SE_EN_BE_FLY = 0x70127, + Z2SE_EN_BE_DEATH = 0x70128, + Z2SE_EN_BE_STAY_GROUP = 0x70129, + Z2SE_EN_BE_FLY_GROUP = 0x7012A, + Z2SE_EN_BE_GO_HOME = 0x7012B, + Z2SE_EN_RDB_V_LAUGH = 0x7012C, + Z2SE_EN_RDB_V_FAINT = 0x7012D, + Z2SE_EN_RDB_V_AWAKE = 0x7012E, + Z2SE_EN_RDB_V_HOICK2 = 0x7012F, + Z2SE_EN_BB_V_BREATH = 0x70130, + Z2SE_EN_BB_V_BREATH2 = 0x70131, + Z2SE_EN_RDB_V_DAMAGE_L = 0x70136, + Z2SE_EN_RDB_BREAK_ARMOR = 0x70137, + Z2SE_EN_RDB_V_RUNDOWN = 0x70138, + Z2SE_EN_BB_RUNDOWN = 0x70139, + Z2SE_EN_DB_SHRINK = 0x7013A, + Z2SE_EN_BH_ABUKU = 0x7013B, + Z2SE_EN_BQ_ABUKU = 0x7013C, + Z2SE_EN_BQ_DOKUHAKI = 0x7013D, + Z2SE_EN_BQ_DOKUSMOKE = 0x7013E, + Z2SE_EN_BQ_V_DOKUHAKI = 0x7013F, + Z2SE_EN_BQ_JINARI = 0x70140, + Z2SE_EN_BH_JINARI = 0x70141, + Z2SE_EN_BQ_V_DEAD = 0x70142, + Z2SE_EN_BQ_V_NODAMAGE = 0x70143, + Z2SE_EN_BQ_EYE_LAND = 0x70145, + Z2SE_EN_BH_V_SP_ATTACK = 0x70146, + Z2SE_EN_WS_V_YOKOKU = 0x70147, + Z2SE_EN_WS_V_ATTACK = 0x70148, + Z2SE_EN_WS_V_DAMAGE = 0x70149, + Z2SE_EN_WS_V_DEATH = 0x7014A, + Z2SE_EN_WS_FOOTNOTE = 0x7014B, + Z2SE_EN_GB_SWINGHEAD = 0x7014C, + Z2SE_EN_GB_DROPKEY = 0x7014D, + Z2SE_EN_GB_V_ATTACK = 0x7014E, + Z2SE_EN_GB_V_ATTACK_DASH = 0x7014F, + Z2SE_EN_GB_V_DAMAGE = 0x70150, + Z2SE_EN_GB_V_NODAMAGE = 0x70151, + Z2SE_EN_GB_V_WAIT = 0x70152, + Z2SE_EN_GB_BOMBROOT = 0x70153, + Z2SE_EN_GB_V_DIE = 0x70154, + Z2SE_EN_GF_WAIT = 0x70155, + Z2SE_EN_GF_EAT = 0x70156, + Z2SE_EN_GF_BURST = 0x70157, + Z2SE_EN_GF_OPEN = 0x70158, + Z2SE_EN_GF_CLOSE = 0x70159, + Z2SE_EN_GF_BOUND = 0x7015A, + Z2SE_EN_GF_BOUND_CLOSE = 0x7015B, + Z2SE_EN_GF_DIE = 0x7015C, + Z2SE_EN_DB_V_BITE = 0x7015D, + Z2SE_EN_DB_V_BITING = 0x7015E, + Z2SE_EN_DB_V_RELEASE = 0x7015F, + Z2SE_EN_BQ_V_TODOME = 0x70160, + Z2SE_EN_ST_V_NODAMAGE = 0x70161, + Z2SE_EN_ST_V_ATTACKA = 0x70162, + Z2SE_EN_ST_V_ATTACKB = 0x70163, + Z2SE_EN_ST_V_ATTACKC = 0x70164, + Z2SE_EN_ST_V_DAWNA = 0x70165, + Z2SE_EN_ST_V_DAWNB = 0x70166, + Z2SE_EN_ST_V_DAWNC = 0x70167, + Z2SE_EN_ST_V_DEATH2 = 0x70168, + Z2SE_EN_ST_V_DEFENSE = 0x70169, + Z2SE_EN_ST_V_HIT = 0x7016A, + Z2SE_EN_ST_V_STAND = 0x7016B, + Z2SE_EN_ST_V_DEATHA = 0x7016C, + Z2SE_EN_ST_SILK_RELEASE = 0x7016D, + Z2SE_EN_ST_APPEAR = 0x7016E, + Z2SE_EN_BQ_EYE_EXPLODE = 0x7016F, + Z2SE_EN_WB_RUNDOWN = 0x70170, + Z2SE_EN_ST_SHELL_BREAK = 0x70171, + Z2SE_EN_RDB_V_DEMO04_UHM = 0x70172, + Z2SE_EN_NS_V_DEMO04_HIPPARU = 0x70173, + Z2SE_EN_RDB_V_DEMO04_HORN = 0x70174, + Z2SE_EN_RDB_V_DEMO04_LAUGH = 0x70175, + Z2SE_EN_RDB_V_DEMO04_WBFN1 = 0x70176, + Z2SE_EN_RDB_V_DEMO04_WBFN2 = 0x70177, + Z2SE_EN_OC_FOOTNOTE_L = 0x70178, + Z2SE_EN_OC_FOOTNOTE_R = 0x70179, + Z2SE_EN_OC_V_LEAP_A = 0x7017A, + Z2SE_EN_OC_LEAP_B = 0x7017B, + Z2SE_EN_OC_V_SEARCH = 0x7017C, + Z2SE_EN_OC_V_STAND = 0x7017D, + Z2SE_EN_OC_V_FIND = 0x7017E, + Z2SE_EN_OC_V_DASH = 0x7017F, + Z2SE_EN_OC_V_WAIT = 0x70180, + Z2SE_EN_OC_V_DAMAGE = 0x70181, + Z2SE_EN_OC_V_DAMAGE_LR = 0x70182, + Z2SE_EN_OC_V_CRY = 0x70183, + Z2SE_EN_OC_V_ATTACK_B = 0x70184, + Z2SE_EN_OC_V_ATTACK_C = 0x70185, + Z2SE_EN_OC_V_ATTACK_B2 = 0x70186, + Z2SE_EN_OC_V_ATTACK_C2 = 0x70187, + Z2SE_EN_OC_ATTACK_B = 0x70188, + Z2SE_EN_OC_ATTACK_C = 0x70189, + Z2SE_EN_OC_V_TALK = 0x7018A, + Z2SE_EN_OC_V_STAND_WAIT = 0x7018B, + Z2SE_EN_OC_V_FINISH = 0x7018C, + Z2SE_EN_OC_V_WAIT_ST = 0x7018D, + Z2SE_EN_OC_V_WALK_ST = 0x7018E, + Z2SE_EN_OC_V_TALK_B = 0x7018F, + Z2SE_EN_OC_V_LEAP_SPIN = 0x70190, + Z2SE_EN_OC_V_DEATH = 0x70191, + Z2SE_EN_OC_CLUB_HIT = 0x70192, + Z2SE_EN_OC_CLUB_DAGGLE = 0x70193, + Z2SE_EN_YM_NEAR = 0x70194, + Z2SE_EN_YM_ELECTRIC = 0x70195, + Z2SE_EN_YM_ELECTRIC_LOOP = 0x70196, + Z2SE_EN_YM_DIG = 0x70197, + Z2SE_EN_YM_FN_UNDER = 0x70198, + Z2SE_EN_YM_FLY = 0x70199, + Z2SE_EN_YM_FLY_ATTACK = 0x7019A, + Z2SE_EN_DF_BOUND = 0x7019B, + Z2SE_EN_DF_BURST = 0x7019C, + Z2SE_EN_DF_DIE = 0x7019D, + Z2SE_EN_DF_EAT = 0x7019E, + Z2SE_EN_DF_EAT_WAIT = 0x7019F, + Z2SE_EN_DF_SPITOUT = 0x701A0, + Z2SE_EN_DF_WAIT = 0x701A1, + Z2SE_EN_OC_V_GALE = 0x701A2, + Z2SE_EN_OC_V_ANGRY_A = 0x701A3, + Z2SE_EN_OC_V_ANGRY_B = 0x701A4, + Z2SE_EN_OC_V_FALL = 0x701A5, + Z2SE_EN_MS_V_NAKU = 0x701A6, + Z2SE_EN_MS_V_FIND = 0x701A7, + Z2SE_EN_MS_V_DEATH = 0x701A8, + Z2SE_EN_MS_BITE = 0x701A9, + Z2SE_EN_MS_FOOTNOTE = 0x701AA, + Z2SE_EN_MS_FN_WATER = 0x701AB, + Z2SE_EN_MS_SWIM = 0x701AC, + Z2SE_EN_MS_FALLWATER = 0x701AD, + Z2SE_EN_MS_V_DAMAGE = 0x701AE, + Z2SE_EN_OC_V_DROWNED = 0x701AF, + Z2SE_EN_OC_DROWNED = 0x701B0, + Z2SE_EN_OC_V_SAKEBU = 0x701B1, + Z2SE_EN_OC_V_JUMP = 0x701B2, + Z2SE_EN_NS_V_SHOUT = 0x701B3, + Z2SE_EN_YR_V_DEATH = 0x701B4, + Z2SE_EN_YR_V_DAMAGE = 0x701B5, + Z2SE_EN_YR_V_DAMAGE_S = 0x701B6, + Z2SE_EN_YR_V_ATTACK = 0x701B7, + Z2SE_EN_YR_V_ATTACK2 = 0x701B8, + Z2SE_EN_YR_V_FURA = 0x701B9, + Z2SE_EN_YR_WING = 0x701BA, + Z2SE_EN_YR_V_NAKU = 0x701BB, + Z2SE_EN_YR_V_FIND = 0x701BC, + Z2SE_EN_YR_GLIDE = 0x701BD, + Z2SE_EN_YR_V_AWAKE = 0x701BE, + Z2SE_EN_YR_V_DOWN = 0x701BF, + Z2SE_EN_YR_V_DEATH2 = 0x701C0, + Z2SE_EN_YR_V_HOVERING = 0x701C1, + Z2SE_EN_KR_V_DEATH2 = 0x701C2, + Z2SE_EN_BA_V_BITE = 0x701C3, + Z2SE_EN_BA_V_DEATH2 = 0x701C4, + Z2SE_EN_BA_V_FURA = 0x701C5, + Z2SE_EN_BA_FIRE = 0x701C6, + Z2SE_EN_YK_WING = 0x701C7, + Z2SE_EN_YK_V_NAKU = 0x701C8, + Z2SE_EN_YK_V_ATTACK = 0x701C9, + Z2SE_EN_YK_V_DEATH = 0x701CA, + Z2SE_EN_YK_V_BITE = 0x701CB, + Z2SE_EN_YK_V_DEATH2 = 0x701CC, + Z2SE_EN_YK_V_FURA = 0x701CD, + Z2SE_EN_BA_V_SPIN = 0x701CE, + Z2SE_EN_YK_V_SPIN = 0x701CF, + Z2SE_EN_YG_V_NAKU = 0x701D0, + Z2SE_EN_YG_V_FIND = 0x701D1, + Z2SE_EN_YG_V_DEATH = 0x701D2, + Z2SE_EN_YG_BITE = 0x701D3, + Z2SE_EN_YG_SWIM = 0x701D4, + Z2SE_EN_YG_FALLWATER = 0x701D5, + Z2SE_EN_YG_V_DAMAGE = 0x701D6, + Z2SE_EN_YG_DARK = 0x701D7, + Z2SE_EN_YG_FOOTNOTE = 0x701D8, + Z2SE_EN_YG_FN_WATER = 0x701D9, + Z2SE_EN_YG_JUMP = 0x701DA, + Z2SE_EN_BM_BOOT = 0x701DB, + Z2SE_EN_BM_UP = 0x701DC, + Z2SE_EN_BM_DOWN = 0x701DD, + Z2SE_EN_BM_TURN = 0x701DE, + Z2SE_EN_BM_BEAM = 0x701DF, + Z2SE_EN_BM_EYE_BREAK = 0x701E0, + Z2SE_EN_GOB_PROVOKE_KNUCKLES = 0x701E1, + Z2SE_EN_GOB_ARM_SWING_WAIT = 0x701E2, + Z2SE_EN_GOB_ARM_SWING_ATTACK = 0x701E3, + Z2SE_EN_GOB_ARM_DOWN_WIND = 0x701E4, + Z2SE_EN_GOB_ARM_DOWN_FLOOR = 0x701E5, + Z2SE_EN_GOB_STOMACH_BOUND = 0x701E6, + Z2SE_EN_GOB_HIP_DOWN = 0x701E7, + Z2SE_EN_GOB_ROLLING = 0x701E8, + Z2SE_EN_GOB_ROLLING_BOUND = 0x701E9, + Z2SE_EN_GOB_CATCHED_FRICTION = 0x701EA, + Z2SE_EN_GOB_KNUCKLE_GROUND = 0x701EB, + Z2SE_EN_GOB_MAGMA_JUMP = 0x701EC, + Z2SE_EN_GOB_V_JUMP = 0x701ED, + Z2SE_EN_GOB_V_ATK_A_READY = 0x701EE, + Z2SE_EN_GOB_V_ATK_A_WAIT = 0x701EF, + Z2SE_EN_GOB_V_ATK_A = 0x701F0, + Z2SE_EN_GOB_V_ATK_B_READY = 0x701F1, + Z2SE_EN_GOB_V_ATK_B_WAIT = 0x701F2, + Z2SE_EN_GOB_V_ATK_B = 0x701F3, + Z2SE_EN_GOB_V_PROVOKE_A = 0x701F4, + Z2SE_EN_GOB_V_PROVOKE_B = 0x701F5, + Z2SE_EN_GOB_V_DAMAGE = 0x701F6, + Z2SE_EN_GOB_V_STOMACH = 0x701F7, + Z2SE_EN_GOB_V_HIP_DOWN = 0x701F8, + Z2SE_EN_GOB_V_CATCHED_ANNOY = 0x701F9, + Z2SE_EN_GOB_V_THROWN = 0x701FA, + Z2SE_EN_GOB_V_MAGMA = 0x701FB, + Z2SE_EN_GOB_V_RECOVER = 0x701FC, + Z2SE_EN_GOB_V_CATCHED = 0x701FD, + Z2SE_EN_GOB_V_GUARD = 0x701FE, + Z2SE_EN_GOB_V_MAGMA_LAST = 0x701FF, + Z2SE_EN_GOB_V_FALL_LAST = 0x70200, + Z2SE_EN_GOB_V_GETUP_LAST = 0x70201, + Z2SE_EN_GOB_HELMET_OFF = 0x70202, + Z2SE_EN_GOB_HELMET_BOUND = 0x70203, + Z2SE_EN_GOB_HELMET_MELT = 0x70204, + Z2SE_EN_GOB_KNUCKLES_FRICTION = 0x70205, + Z2SE_EN_BA_V_FAINT = 0x70206, + Z2SE_EN_YK_V_FAINT = 0x70207, + Z2SE_EN_HZ_V_WALK = 0x70208, + Z2SE_EN_HZ_WALK = 0x70209, + Z2SE_EN_HZ_V_WIND_NAKU = 0x7020A, + Z2SE_EN_HZ_V_WIND = 0x7020B, + Z2SE_EN_HZ_V_JUMP = 0x7020C, + Z2SE_EN_HZ_JUMP = 0x7020D, + Z2SE_EN_HZ_V_LAUGH = 0x7020E, + Z2SE_EN_HZ_V_LANDING = 0x7020F, + Z2SE_EN_HZ_LANDING = 0x70210, + Z2SE_EN_HZ_V_DAMAGE = 0x70211, + Z2SE_EN_HZ_V_STAND = 0x70212, + Z2SE_EN_HZ_V_DEATH = 0x70213, + Z2SE_EN_HZ_V_WAIT = 0x70214, + Z2SE_EN_HZ_V_BACK = 0x70215, + Z2SE_EN_HZ_BACK = 0x70216, + Z2SE_EN_HZ_V_DEATH_STAND = 0x70217, + Z2SE_EN_HZ_V_FAINT = 0x70218, + Z2SE_EN_HZ_V_GALE = 0x70219, + Z2SE_EN_HZ_SLIDE = 0x7021A, + Z2SE_EN_HZ_V_DROWNED_A = 0x7021B, + Z2SE_EN_HZ_V_DROWNED_B = 0x7021C, + Z2SE_EN_HZ_WIND = 0x7021D, + Z2SE_EN_HZ_CLOSE = 0x7021E, + Z2SE_EN_HZ_SWING = 0x7021F, + Z2SE_EN_HZ_BACK_JUMP = 0x70220, + Z2SE_EN_HZ_DROWNSPLASH = 0x70221, + Z2SE_EN_NS_V_HANGED = 0x70222, + Z2SE_EN_NS_V_HANGEDAMAGE = 0x70223, + Z2SE_EN_NS_V_HANGEDBRUSH = 0x70224, + Z2SE_EN_NS_V_HANGEDBRUSH2 = 0x70225, + Z2SE_EN_BM_SPARK = 0x70226, + Z2SE_EN_BM_UNLOCK = 0x70227, + Z2SE_EN_BM_TURN_END = 0x70228, + Z2SE_EN_BM_BURN = 0x70229, + Z2SE_EN_BM_SLIDE = 0x7022A, + Z2SE_EN_ST_V_WATERDEAD = 0x7022B, + Z2SE_EN_ST_V_WINDDAMAGE = 0x7022C, + Z2SE_EN_BI_ATTACK = 0x7022D, + Z2SE_EN_PM_ZELDASONG = 0x7022E, + Z2SE_EN_GB_V_DOSUN = 0x7022F, + Z2SE_EN_GB_DOSUN_DASH = 0x70230, + Z2SE_EN_GB_DOSUN = 0x70231, + Z2SE_EN_DF_EAT_POT = 0x70232, + Z2SE_EN_DF_EAT_BOKKURI = 0x70233, + Z2SE_EN_YC_WING = 0x70234, + Z2SE_EN_YC_GLIDE = 0x70235, + Z2SE_EN_YC_CRASH = 0x70236, + Z2SE_EN_OT_SWIM = 0x70237, + Z2SE_EN_OT_V_DEATH = 0x70238, + Z2SE_EN_OT_BORN = 0x70239, + Z2SE_EN_DT_FALLING = 0x7023A, + Z2SE_EN_DT_SPLASH = 0x7023B, + Z2SE_EN_DT_V_DOWN_DAMAGE = 0x7023C, + Z2SE_EN_DT_V_DOWN_DAMAGE2 = 0x7023D, + Z2SE_EN_BM_FIND = 0x7023E, + Z2SE_EN_BM_HEAT = 0x7023F, + Z2SE_EN_HM_WAIT = 0x70240, + Z2SE_EN_HM_WALK = 0x70241, + Z2SE_EN_HM_V_GUARD = 0x70242, + Z2SE_EN_HM_V_SIPPU = 0x70243, + Z2SE_EN_HM_V_DIE = 0x70244, + Z2SE_EN_HM_FALL = 0x70245, + Z2SE_EN_HM_LAND = 0x70246, + Z2SE_EN_HM_V_ATTACK = 0x70247, + Z2SE_EN_HM_ATTACK = 0x70248, + Z2SE_EN_HM_FIRE = 0x70249, + Z2SE_EN_TT_V_DAMAGE_ARROW = 0x7024A, + Z2SE_EN_TT_V_DAMAGE = 0x7024B, + Z2SE_EN_TT_V_EYE_DEATH = 0x7024C, + Z2SE_EN_TT_LEG_DEATH = 0x7024D, + Z2SE_EN_TT_JUMP = 0x7024E, + Z2SE_EN_TT_V_JUMP = 0x7024F, + Z2SE_EN_TT_LAND = 0x70250, + Z2SE_EN_TT_LAND_WATER = 0x70251, + Z2SE_EN_TT_V_WIND = 0x70252, + Z2SE_EN_TT_WAIT = 0x70253, + Z2SE_EN_TT_V_PUSH = 0x70254, + Z2SE_EN_TT_V_WAIT = 0x70255, + Z2SE_EN_TK_SWIM = 0x70256, + Z2SE_EN_TK_APPEAR = 0x70257, + Z2SE_EN_TK_APPEAR2 = 0x70258, + Z2SE_EN_TK_HIDE = 0x70259, + Z2SE_EN_TK_V_ATTACK = 0x7025A, + Z2SE_EN_TK_ATTACK = 0x7025B, + Z2SE_EN_TK_V_DAMAGE = 0x7025C, + Z2SE_EN_TK_SHOT = 0x7025D, + Z2SE_EN_TK_HIT = 0x7025E, + Z2SE_EN_TK_V_WAIT = 0x7025F, + Z2SE_EN_TK_KYORO = 0x70260, + Z2SE_EN_TK2_SWIM = 0x70261, + Z2SE_EN_TK2_APPEAR = 0x70262, + Z2SE_EN_TK2_APPEAR2 = 0x70263, + Z2SE_EN_TK2_HIDE = 0x70264, + Z2SE_EN_TK2_V_ATTACK = 0x70265, + Z2SE_EN_TK2_ATTACK = 0x70266, + Z2SE_EN_TK2_V_DAMAGE = 0x70267, + Z2SE_EN_TK2_SHOT = 0x70268, + Z2SE_EN_TK2_HIT = 0x70269, + Z2SE_EN_TK2_V_WAIT = 0x7026A, + Z2SE_EN_TK2_KYORO = 0x7026B, + Z2SE_EN_DD_V_DAMAGE = 0x7026C, + Z2SE_EN_DD_V_DIE = 0x7026D, + Z2SE_EN_DD_V_DIE_ARROW = 0x7026E, + Z2SE_EN_DD_V_DIE_BOMB = 0x7026F, + Z2SE_EN_DD_DIE_BOMB = 0x70270, + Z2SE_EN_DD_V_GUARD = 0x70271, + Z2SE_EN_DD_V_WAIT = 0x70272, + Z2SE_EN_DD_WALK_L = 0x70273, + Z2SE_EN_DD_WALK_R = 0x70274, + Z2SE_EN_DD_RUN_L = 0x70275, + Z2SE_EN_DD_RUN_R = 0x70276, + Z2SE_EN_DD_V_FIRE_A = 0x70277, + Z2SE_EN_DD_V_FIRE_B = 0x70278, + Z2SE_EN_DD_V_FIRE_C = 0x70279, + Z2SE_EN_DD_FALL = 0x7027A, + Z2SE_EN_SM_HIT = 0x7027B, + Z2SE_EN_GI_SHOUT = 0x7027C, + Z2SE_EN_BOSS_EXPLODE = 0x7027D, + Z2SE_EN_BOSS_CONVERGE = 0x7027E, + Z2SE_EN_FM_V_CHAIN_BREAK = 0x7027F, + Z2SE_EN_FM_CHAIN_TENSION = 0x70280, + Z2SE_EN_FM_V_OPDEMO = 0x70281, + Z2SE_EN_FM_OPDEMO = 0x70282, + Z2SE_EN_FM_V_DEMOEND = 0x70283, + Z2SE_EN_FM_DEMOEND = 0x70284, + Z2SE_EN_FM_DEMOEND_CORE = 0x70285, + Z2SE_EN_FM_SAITENKA = 0x70286, + Z2SE_EN_FM_V_CHANCE = 0x70287, + Z2SE_EN_FM_V_CHANCEDAMAGE = 0x70288, + Z2SE_EN_FM_V_DAMAGEWALK = 0x70289, + Z2SE_EN_FM_DOWN = 0x7028A, + Z2SE_EN_FM_V_DOWN = 0x7028B, + Z2SE_EN_FM_V_DOWNWAIT = 0x7028C, + Z2SE_EN_FM_V_HANGWAIT = 0x7028D, + Z2SE_EN_FM_V_KYORO = 0x7028E, + Z2SE_EN_FM_V_UP = 0x7028F, + Z2SE_EN_FM_V_UP02 = 0x70290, + Z2SE_EN_FM_V_UP02_2 = 0x70291, + Z2SE_EN_FM_V_WAIT = 0x70292, + Z2SE_EN_FM_V_ATTACK_TAME = 0x70293, + Z2SE_EN_FM_ATTACK_TAME = 0x70294, + Z2SE_EN_FM_ATTACK02_CHAIN = 0x70295, + Z2SE_EN_FM_CORE_EYEOPEN = 0x70296, + Z2SE_EN_FM_CORE_GLOW = 0x70297, + Z2SE_EN_FM_COREHIT = 0x70298, + Z2SE_EN_FM_V_FIND = 0x70299, + Z2SE_EN_YB_V_CRY = 0x7029A, + Z2SE_EN_YB_FLY = 0x7029B, + Z2SE_EN_YB_ABUKU = 0x7029C, + Z2SE_EN_YB_SPLASH = 0x7029D, + Z2SE_EN_YB_ELECTRIC = 0x7029E, + Z2SE_EN_YB_ELECTRIC_LOOP = 0x7029F, + Z2SE_EN_YB_ELECTRIC_LOOP_WTR = 0x702A0, + Z2SE_EN_DK_WAIT = 0x702A1, + Z2SE_EN_DK_CHARGE = 0x702A2, + Z2SE_EN_DK_ATTACK = 0x702A3, + Z2SE_EN_DK_GUARD = 0x702A4, + Z2SE_EN_DK_PULLOUT = 0x702A5, + Z2SE_EN_DK_BUBBLE = 0x702A6, + Z2SE_EN_BG_SWIM = 0x702A7, + Z2SE_EN_BG_V_DAMAGE = 0x702A8, + Z2SE_EN_BG_SANDSMOKE = 0x702A9, + Z2SE_EN_FM_V_TODOME = 0x702AA, + Z2SE_EN_DD_V_FIND = 0x702AB, + Z2SE_EN_SB_WAIT = 0x702AC, + Z2SE_EN_SB_DEFENCE = 0x702AD, + Z2SE_EN_SB_ATTACK01 = 0x702AE, + Z2SE_EN_SB_ATTACK02 = 0x702AF, + Z2SE_EN_SB_DEATH = 0x702B0, + Z2SE_EN_SB_JUMP = 0x702B1, + Z2SE_EN_SB_LAND = 0x702B2, + Z2SE_EN_SB_SHIELD = 0x702B3, + Z2SE_EN_SB_BIND = 0x702B4, + Z2SE_EN_SB_BUBBLE = 0x702B5, + Z2SE_EN_YB_V_ATTACK = 0x702B6, + Z2SE_EN_YB_V_DAMAGE = 0x702B7, + Z2SE_EN_YB_SHIRU = 0x702B8, + Z2SE_EN_YB_V_DAMAGE_DOWN = 0x702B9, + Z2SE_EN_YB_V_DOWN_DAMAGE = 0x702BA, + Z2SE_EN_YB_V_DOWN_WAIT = 0x702BB, + Z2SE_EN_YB_V_DEATH = 0x702BC, + Z2SE_EN_YB_V_FLY_WAIT = 0x702BD, + Z2SE_EN_YB_V_GUARD = 0x702BE, + Z2SE_EN_YB_V_DOWN_IN = 0x702BF, + Z2SE_EN_YB_V_RISE = 0x702C0, + Z2SE_EN_YB_MOVE_ONWATER = 0x702C1, + Z2SE_EN_YB_MOVE_UNDERWATER = 0x702C2, + Z2SE_EN_YB_HIT_FLOATBOARD = 0x702C3, + Z2SE_EN_SG_BITE = 0x702C4, + Z2SE_EN_SG_SWIM = 0x702C5, + Z2SE_EN_SG_BOUND = 0x702C6, + Z2SE_EN_SG_V_DEATH = 0x702C7, + Z2SE_EN_SC_V_WAIT = 0x702C8, + Z2SE_EN_SC_V_FIND = 0x702C9, + Z2SE_EN_SC_V_DAMAGE = 0x702CA, + Z2SE_EN_SC_V_DEAD = 0x702CB, + Z2SE_EN_SC_V_PROVOKE = 0x702CC, + Z2SE_EN_SC_V_ESCAPE = 0x702CD, + Z2SE_EN_SC_JUMP = 0x702CE, + Z2SE_EN_SC_LAND = 0x702CF, + Z2SE_EN_SC_LAND_WATER = 0x702D0, + Z2SE_EN_SC_V_WHISTLE = 0x702D1, + Z2SE_EN_SC_V_F_SHOCK = 0x702D2, + Z2SE_EN_SC_V_LIBERATION = 0x702D3, + Z2SE_EN_SC_V_KYORO = 0x702D4, + Z2SE_EN_SC_SL_MOVE = 0x702D5, + Z2SE_EN_SC_SL_REBOUND = 0x702D6, + Z2SE_EN_SC_SL_ATTACK = 0x702D7, + Z2SE_EN_SC_SL_LAND = 0x702D8, + Z2SE_EN_SC_SL_JUMP_IN = 0x702D9, + Z2SE_EN_SC_SL_EXPLODE = 0x702DA, + Z2SE_EN_SC_V_ATTACK = 0x702DB, + Z2SE_EN_SC_V_WHISTLE2 = 0x702DC, + Z2SE_EN_OI_DEMO_APPEAR = 0x702DD, + Z2SE_EN_OI_DEMO_APPEAR2 = 0x702DE, + Z2SE_EN_MM_V_RUSH = 0x702DF, + Z2SE_EN_MM_V_KYORO = 0x702E0, + Z2SE_EN_MM_V_FIND = 0x702E1, + Z2SE_EN_MM_V_SURPRISE = 0x702E3, + Z2SE_EN_MM_V_DAMAGE = 0x702E4, + Z2SE_EN_MM_V_NO_DAMAGE = 0x702E5, + Z2SE_EN_MM_V_DEAD = 0x702E6, + Z2SE_EN_MM_R2W_MET = 0x702E7, + Z2SE_EN_MM_R2W_NOMET = 0x702E8, + Z2SE_EN_MM_BRAKE_LND = 0x702E9, + Z2SE_EN_MM_BRAKE_WTR = 0x702EA, + Z2SE_EN_MM_FALL_LND = 0x702EB, + Z2SE_EN_MM_FALL_WTR = 0x702EC, + Z2SE_EN_MM_WALK_LND = 0x702ED, + Z2SE_EN_MM_WALK_WTR = 0x702EE, + Z2SE_EN_MM_RUN_LND = 0x702EF, + Z2SE_EN_MM_RUN_WTR = 0x702F0, + Z2SE_EN_MM_MET_LIFT_WTR = 0x702F1, + Z2SE_EN_MM_MET_PUT_LND = 0x702F2, + Z2SE_EN_MM_MET_PUT_WTR = 0x702F3, + Z2SE_EN_MM_MET_BOUND_LND = 0x702F4, + Z2SE_EN_MM_MET_BOUND_WTR = 0x702F5, + Z2SE_EN_MM_MET_TAKEN = 0x702F6, + Z2SE_EN_YO_ICE_MOVE = 0x702F7, + Z2SE_EN_YO_ICE_ATTACK = 0x702F8, + Z2SE_EN_YO_ICE_LAND = 0x702F9, + Z2SE_EN_YO_ICE_VIBERATE = 0x702FA, + Z2SE_EN_YO_ICE_PULLOUT = 0x702FB, + Z2SE_EN_YO_ICE_BREAK = 0x702FC, + Z2SE_EN_YO_MOVE1 = 0x702FD, + Z2SE_EN_YO_MOVE2 = 0x702FE, + Z2SE_EN_YO_BOUND1 = 0x702FF, + Z2SE_EN_YO_BOUND2 = 0x70300, + Z2SE_EN_YO_BREAK1 = 0x70301, + Z2SE_EN_YO_BREAK2 = 0x70302, + Z2SE_EN_YO_ROLL1 = 0x70303, + Z2SE_EN_YO_ROLL2 = 0x70304, + Z2SE_EN_YO_MOVE_FLY = 0x70305, + Z2SE_EN_YO_FALL = 0x70306, + Z2SE_EN_YO_LAND = 0x70307, + Z2SE_EN_YO_VIBRATE = 0x70308, + Z2SE_EN_YO_PULLOUT = 0x70309, + Z2SE_EN_YO_BREAK3 = 0x7030A, + Z2SE_EN_YO_HIT_WALL = 0x7030B, + Z2SE_EN_YO_VIBE_ROOM = 0x7030C, + Z2SE_EN_YO_V_ICICLE = 0x7030D, + Z2SE_EN_DT_WALK = 0x7030E, + Z2SE_EN_DT_FOOTNOTE_L = 0x7030F, + Z2SE_EN_DT_FOOTNOTE_R = 0x70310, + Z2SE_EN_DT_JUMP = 0x70311, + Z2SE_EN_DT_V_JUMP = 0x70312, + Z2SE_EN_DT_V_DOWN_WAIT = 0x70313, + Z2SE_EN_DT_V_RETURN = 0x70314, + Z2SE_EN_DT_SWING = 0x70315, + Z2SE_EN_DT_V_CROAK = 0x70316, + Z2SE_EN_DT_SPAWN = 0x70317, + Z2SE_EN_DT_CROAK_DAMAGE = 0x70318, + Z2SE_EN_DT_CROAK_BOMB = 0x70319, + Z2SE_EN_DT_V_KYORO = 0x7031A, + Z2SE_EN_DT_V_DEAD = 0x7031B, + Z2SE_EN_DT_SMALL_DAMAGE = 0x7031C, + Z2SE_EN_DT_STEP = 0x7031D, + Z2SE_EN_DT_NODAMAGE_FOOT = 0x7031E, + Z2SE_EN_DT_V_OPDEMO = 0x7031F, + Z2SE_EN_FZ_BOUND = 0x70320, + Z2SE_EN_FZ_DAMAGE = 0x70321, + Z2SE_EN_FZ_DEATH = 0x70322, + Z2SE_EN_FZ_MOVE = 0x70323, + Z2SE_EN_FL_DAMAGE = 0x70324, + Z2SE_EN_FL_DEATH = 0x70325, + Z2SE_EN_FL_BREATH = 0x70326, + Z2SE_EN_DT_V_TODOME = 0x70327, + Z2SE_EN_VA_V_FOUND = 0x70328, + Z2SE_EN_VA_V_VISUAL = 0x70329, + Z2SE_EN_VA_V_ATK1 = 0x7032B, + Z2SE_EN_VA_V_ATK2 = 0x7032C, + Z2SE_EN_VA_V_ATK3 = 0x7032D, + Z2SE_EN_VA_V_BITED = 0x7032E, + Z2SE_EN_VA_V_NO_DMG = 0x7032F, + Z2SE_EN_VA_V_VANISH = 0x70330, + Z2SE_EN_VA_V_ROTATE = 0x70331, + Z2SE_EN_VA_V_DYING = 0x70332, + Z2SE_EN_VA_V_DEAD = 0x70333, + Z2SE_EN_VA_V_DMG = 0x70334, + Z2SE_EN_VA_V_DMG_L = 0x70335, + Z2SE_EN_VA_V_ATK_FLY = 0x70336, + Z2SE_EN_VA_V_ATK_FLY2 = 0x70337, + Z2SE_EN_VA_V_DOWN = 0x70338, + Z2SE_EN_VA_SWD_FLY = 0x70339, + Z2SE_EN_VA_SWD_IMPACT = 0x7033A, + Z2SE_EN_VA_SWD_ATK1 = 0x7033B, + Z2SE_EN_VA_SWD_ATK2 = 0x7033C, + Z2SE_EN_VA_SWD_ATK3 = 0x7033D, + Z2SE_EN_VA_VANISH = 0x7033E, + Z2SE_EN_VA_SWD_ATK_T = 0x7033F, + Z2SE_EN_VA_ATK_FLY = 0x70340, + Z2SE_EN_VA_ATK_FLY2 = 0x70341, + Z2SE_EN_VA_DOWN = 0x70342, + Z2SE_EN_VA_OPENING1 = 0x70343, + Z2SE_EN_VA_OPENING2 = 0x70344, + Z2SE_EN_VA_END = 0x70345, + Z2SE_EN_VA_ATK_BALL = 0x70346, + Z2SE_EN_OI_TENT_MOVE = 0x70347, + Z2SE_EN_OI_TENT_SWING = 0x70348, + Z2SE_EN_OI_V_TENT_DAMAGE = 0x70349, + Z2SE_EN_OI_CORE_MOVE = 0x7034A, + Z2SE_EN_OI_CORE_PULLOUT = 0x7034B, + Z2SE_EN_OI_V_CORE_DAMAGE = 0x7034C, + Z2SE_EN_OI_V_EAT = 0x7034D, + Z2SE_EN_OI_V_SWALLOW = 0x7034F, + Z2SE_EN_OI_V_DRAWIN = 0x70350, + Z2SE_EN_OI_V_EAT02 = 0x70351, + Z2SE_EN_OI_V_THROWUP = 0x70352, + Z2SE_EN_OI_MOVE = 0x70353, + Z2SE_EN_OI_HIT_COLUMN = 0x70354, + Z2SE_EN_OI_V_DAMAGE = 0x70355, + Z2SE_EN_OI_V_TODOME = 0x70356, + Z2SE_EN_OI_V_ENDDEMO = 0x70357, + Z2SE_EN_OI_ENDDEMO = 0x70358, + Z2SE_EN_SW_MOVE = 0x70359, + Z2SE_EN_SW_JUMP_OUT = 0x7035A, + Z2SE_EN_SW_JUMP_IN = 0x7035B, + Z2SE_EN_SW_BTBT = 0x7035C, + Z2SE_EN_SW_DIVE = 0x7035D, + Z2SE_EN_SW_V_DMG = 0x7035E, + Z2SE_EN_SW_V_DEAD = 0x7035F, + Z2SE_EN_SW_V_CATCH = 0x70360, + Z2SE_EN_BU_WING = 0x70361, + Z2SE_EN_BU_WING_L = 0x70362, + Z2SE_EN_BU_V_ATK = 0x70363, + Z2SE_EN_BU_V_DMG = 0x70364, + Z2SE_EN_BU_DMG_BOUND = 0x70365, + Z2SE_EN_BU_NODMG_BOUND = 0x70366, + Z2SE_EN_BU_MOVE_BOUND = 0x70367, + Z2SE_EN_BU_V_DEAD = 0x70368, + Z2SE_EN_BU_LV_FIRE = 0x70369, + Z2SE_EN_GI_WALK = 0x7036B, + Z2SE_EN_GI_ATK_STRK = 0x7036C, + Z2SE_EN_GI_ATK_IMPCT = 0x7036D, + Z2SE_EN_GI_V_ATK = 0x7036E, + Z2SE_EN_GI_V_DMG = 0x7036F, + Z2SE_EN_GI_V_DEAD = 0x70370, + Z2SE_EN_OI_HIT_TENTACLE = 0x70371, + Z2SE_EN_OI_HIT_WALL = 0x70372, + Z2SE_EN_OI_EXPLODE = 0x70373, + Z2SE_EN_OI_BG_APPEAR = 0x70374, + Z2SE_EN_BUG_WALK_GRD = 0x70375, + Z2SE_EN_BUG_WALK_GRD_GRP = 0x70376, + Z2SE_EN_BUG_WALK_BODY = 0x70377, + Z2SE_EN_BUG_WALK_BODY_GRP = 0x70378, + Z2SE_EN_BUG_JUMP = 0x70379, + Z2SE_EN_BUG_DIE = 0x7037A, + Z2SE_EN_KK_ATTACK01 = 0x7037B, + Z2SE_EN_KK_ATTACK03 = 0x7037C, + Z2SE_EN_KK_FOOTNOTE = 0x7037D, + Z2SE_EN_KK_CRASH = 0x7037E, + Z2SE_EN_KK_DAMAGE = 0x7037F, + Z2SE_EN_KK_NO_DAMAGE = 0x70380, + Z2SE_EN_KK_DEAD = 0x70381, + Z2SE_EN_KK_RESTORE = 0x70382, + Z2SE_EN_KK_APPEAR = 0x70383, + Z2SE_EN_KK_THROW = 0x70384, + Z2SE_EN_KK_SPEAR_STICK = 0x70385, + Z2SE_EN_FL_BLIZZARD = 0x70386, + Z2SE_EN_FL_ROTATE = 0x70387, + Z2SE_EN_WW_V_WAIT = 0x70388, + Z2SE_EN_WW_V_DAMAGE = 0x70389, + Z2SE_EN_WW_V_DEAD = 0x7038A, + Z2SE_EN_WW_JUMP = 0x7038B, + Z2SE_EN_WW_APPEAR = 0x7038C, + Z2SE_EN_WW_FOOTNOTE = 0x7038D, + Z2SE_EN_WW_HIDE = 0x7038E, + Z2SE_EN_WW_V_ATTACK = 0x7038F, + Z2SE_EN_TH_BRANDISH = 0x70390, + Z2SE_EN_TH_BRANDISH_START = 0x70391, + Z2SE_EN_TH_V_DAMAGE = 0x70392, + Z2SE_EN_TH_V_ENDDEMO = 0x70393, + Z2SE_EN_TH_V_LOOKAROUND = 0x70394, + Z2SE_EN_TH_V_PULLBACK = 0x70395, + Z2SE_EN_TH_V_THROW = 0x70396, + Z2SE_EN_TH_V_TRAP = 0x70397, + Z2SE_EN_FL_BLIZZARD_END = 0x70398, + Z2SE_EN_TN_V_KIAI_OP = 0x70399, + Z2SE_EN_TN_V_KIAI = 0x7039A, + Z2SE_EN_TN_V_KIAI_AGE = 0x7039B, + Z2SE_EN_TN_V_DMG = 0x7039C, + Z2SE_EN_TN_V_DMG_2 = 0x7039D, + Z2SE_EN_TN_V_THROW = 0x7039E, + Z2SE_EN_TN_V_PULL_OUT = 0x7039F, + Z2SE_EN_TN_V_KICK = 0x703A0, + Z2SE_EN_TN_V_JUMP = 0x703A1, + Z2SE_EN_TN_V_ZEIZEI = 0x703A2, + Z2SE_EN_TN_V_KURUSI = 0x703A3, + Z2SE_EN_TN_V_DEAD = 0x703A4, + Z2SE_EN_TN_V_DEAD2 = 0x703A5, + Z2SE_EN_TN_FOOT_M1 = 0x703A6, + Z2SE_EN_TN_FOOT_M2 = 0x703A7, + Z2SE_EN_TN_FOOT_L = 0x703A8, + Z2SE_EN_TN_SWD_L = 0x703A9, + Z2SE_EN_TN_SWD_IMPCT = 0x703AA, + Z2SE_EN_TN_ATK_NO_DMG = 0x703AB, + Z2SE_EN_TN_PULL_OUT = 0x703AC, + Z2SE_EN_TN_SWD_S_TRST = 0x703AD, + Z2SE_EN_TN_SWD_S = 0x703AE, + Z2SE_EN_TN_HIZA = 0x703AF, + Z2SE_EN_TN_BRK_ARMOR = 0x703B0, + Z2SE_EN_TN_ARMOR_BND = 0x703B1, + Z2SE_EN_TN_SHIELD_BND = 0x703B2, + Z2SE_EN_TN_WEAPON_FLY = 0x703B3, + Z2SE_EN_TN_WEAPON_STOP = 0x703B4, + Z2SE_EN_TN_SAYA_BND_1 = 0x703B5, + Z2SE_EN_TN_SAYA_BND_2 = 0x703B6, + Z2SE_EN_TN_SWD_DROP = 0x703B7, + Z2SE_EN_ZM_EMERGE = 0x703B8, + Z2SE_EN_ZM_DISAPPER = 0x703B9, + Z2SE_EN_ZM_PRE_ATK = 0x703BA, + Z2SE_EN_ZM_BALL_OUT = 0x703BB, + Z2SE_EN_ZM_BALL_FLY = 0x703BC, + Z2SE_EN_ZM_BALL_BURST = 0x703BD, + Z2SE_EN_ZM_V_DMG = 0x703BE, + Z2SE_EN_ZM_V_DEAD = 0x703BF, + Z2SE_EN_ZM_DROP = 0x703C0, + Z2SE_EN_SM_HIT2 = 0x703C1, + Z2SE_EN_SM_MOVE = 0x703C2, + Z2SE_EN_SM_MOVE2 = 0x703C3, + Z2SE_EN_SM_JUMP = 0x703C4, + Z2SE_EN_SM_JUMP2 = 0x703C5, + Z2SE_EN_SM_FUSION = 0x703C6, + Z2SE_EN_SM_FUSION2 = 0x703C7, + Z2SE_EN_SM_LAND = 0x703C8, + Z2SE_EN_SM_LAND2 = 0x703C9, + Z2SE_EN_MF_V_DEATH = 0x703CA, + Z2SE_EN_MF_V_DAMAGE = 0x703CB, + Z2SE_EN_MF_V_DAMAGE2 = 0x703CC, + Z2SE_EN_MF_TAIL = 0x703CD, + Z2SE_EN_MF_KNIFE = 0x703CE, + Z2SE_EN_MF_KNIFE2_A = 0x703CF, + Z2SE_EN_MF_KNIFE2_B = 0x703D0, + Z2SE_EN_MF_V_DRAWBACK = 0x703D1, + Z2SE_EN_MF_V_AWAKE = 0x703D2, + Z2SE_EN_MF_V_UP = 0x703D3, + Z2SE_EN_MF_FN_L = 0x703D4, + Z2SE_EN_MF_FN_R = 0x703D5, + Z2SE_EN_MF_FN_RUN_L = 0x703D6, + Z2SE_EN_MF_FN_RUN_R = 0x703D7, + Z2SE_EN_MF_V_TAIL = 0x703D8, + Z2SE_EN_MF_V_FIND = 0x703D9, + Z2SE_EN_MF_V_KNIFE = 0x703DA, + Z2SE_EN_MF_V_KNIFE2_A = 0x703DB, + Z2SE_EN_MF_V_BREATH = 0x703DC, + Z2SE_EN_MF_V_GUARD = 0x703DD, + Z2SE_EN_MF_V_JUMP = 0x703DE, + Z2SE_EN_MF_V_SEARCH = 0x703DF, + Z2SE_EN_MF_V_SEARCH2 = 0x703E0, + Z2SE_EN_MF_V_SURPRISE = 0x703E1, + Z2SE_EN_MF_V_FIND_BOMB = 0x703E2, + Z2SE_EN_MF_V_LOOK_BOMB = 0x703E3, + Z2SE_EN_MF_V_KICK_BOMB = 0x703E4, + Z2SE_EN_TN_V_ATK_SLD = 0x703E5, + Z2SE_EN_TN_V_2_SWD_1 = 0x703E6, + Z2SE_EN_TN_V_2_SWD_2 = 0x703E7, + Z2SE_EN_TN_V_THRUST = 0x703E8, + Z2SE_EN_BM_BEAM2 = 0x703E9, + Z2SE_EN_BM_BURN2 = 0x703EA, + Z2SE_EN_BM_BREAK = 0x703EB, + Z2SE_EN_PZ_V_ATK_RDY = 0x703EC, + Z2SE_EN_PZ_V_ATK_TRW = 0x703ED, + Z2SE_EN_PZ_V_DMG = 0x703EE, + Z2SE_EN_PZ_V_DEAD = 0x703EF, + Z2SE_EN_PZ_EMERGE = 0x703F0, + Z2SE_EN_PZ_DISAPPEAR = 0x703F1, + Z2SE_EN_PZ_BALL_EMERGE = 0x703F2, + Z2SE_EN_PZ_BALL = 0x703F3, + Z2SE_EN_PZ_BALL_BURST = 0x703F4, + Z2SE_EN_PZ_PT_EMERGE = 0x703F5, + Z2SE_EN_PZ_PT = 0x703F6, + Z2SE_EN_PZ_PT_DISAPPEAR = 0x703F7, + Z2SE_EN_PZ_DKBB_SEED = 0x703F8, + Z2SE_EN_PZ_DKBB_VANISH = 0x703F9, + Z2SE_EN_PZ_FIRE_OUT = 0x703FA, + Z2SE_EN_PZ_FIRE = 0x703FB, + Z2SE_EN_PZ_FIRE_BURST = 0x703FC, + Z2SE_EN_PZ_FOG = 0x703FD, + Z2SE_EN_YO_DEMO_OP1 = 0x703FE, + Z2SE_EN_YO_DEMO_OP2 = 0x703FF, + Z2SE_EN_YO_DEMO_MID = 0x70400, + Z2SE_EN_YO_DEMO_END = 0x70401, + Z2SE_EN_PZ_V_ATK_TRW_1ST = 0x70402, + Z2SE_EN_ZAN_WARP_OUT = 0x70403, + Z2SE_EN_ZAN_WARP_IN = 0x70404, + Z2SE_EN_ZAN_V_ATK_BALL = 0x70405, + Z2SE_EN_ZAN_V_ATK_BALL_MG = 0x70406, + Z2SE_EN_ZAN_V_ATK_BALL_OI = 0x70407, + Z2SE_EN_ZAN_V_ATK_BALL_MK = 0x70408, + Z2SE_EN_ZAN_FIRE_OUT = 0x70409, + Z2SE_EN_ZAN_FIRE = 0x7040A, + Z2SE_EN_ZAN_FIRE_BURST = 0x7040B, + Z2SE_EN_ZAN_V_DMG = 0x7040C, + Z2SE_EN_ZAN_V_DMG_MG = 0x7040D, + Z2SE_EN_ZAN_V_DMG_OI = 0x7040E, + Z2SE_EN_ZAN_V_DMG_MK = 0x7040F, + Z2SE_EN_ZAN_V_DMG_YO = 0x70410, + Z2SE_EN_ZAN_V_DMG_CTL = 0x70411, + Z2SE_EN_ZAN_V_NO_DMG = 0x70412, + Z2SE_EN_ZAN_MAHOJIN_BB = 0x70413, + Z2SE_EN_ZAN_MAHOJIN_MG = 0x70414, + Z2SE_EN_ZAN_MAHOJIN_OI = 0x70415, + Z2SE_EN_ZAN_MAHOJIN_MK = 0x70416, + Z2SE_EN_ZAN_MAHOJIN_YO = 0x70417, + Z2SE_EN_ZAN_MAHOJIN_CTL = 0x70418, + Z2SE_EN_ZAN_OP_V_WAKEUP = 0x70419, + Z2SE_EN_ZAN_OP_FLY = 0x7041A, + Z2SE_EN_ZAN_BB_V_ZEIZEI = 0x7041B, + Z2SE_EN_ZAN_BB_V_JUMP = 0x7041C, + Z2SE_EN_ZAN_BB_LAND = 0x7041D, + Z2SE_EN_ZAN_BB_FOOT = 0x7041E, + Z2SE_EN_ZAN_BB_V_FALL = 0x7041F, + Z2SE_EN_ZAN_BB_WTR = 0x70420, + Z2SE_EN_ZAN_MG_V_JUMP = 0x70421, + Z2SE_EN_ZAN_MG_LAND = 0x70422, + Z2SE_EN_ZAN_OI_V_CAUGHT = 0x70423, + Z2SE_EN_ZAN_OI_SWIM1 = 0x70424, + Z2SE_EN_ZAN_OI_SWIM2 = 0x70425, + Z2SE_EN_ZZ_MV = 0x70426, + Z2SE_EN_ZZ_HANAIKI = 0x70427, + Z2SE_EN_ZZ_OPEN = 0x70428, + Z2SE_EN_ZZ_CLOSE = 0x70429, + Z2SE_EN_ZAN_MK_V_OTT = 0x7042A, + Z2SE_EN_ZAN_MK_V_FALL = 0x7042B, + Z2SE_EN_ZAN_MK_UMARU = 0x7042C, + Z2SE_EN_ZAN_MK_V_MGGG = 0x7042D, + Z2SE_EN_ZAN_MK_V_JUMP = 0x7042E, + Z2SE_EN_ZAN_MK_LAND = 0x7042F, + Z2SE_EN_ZAN_YO_V_HUGE = 0x70430, + Z2SE_EN_ZAN_YO_LAND_HUGE = 0x70431, + Z2SE_EN_ZAN_YO_V_LAND = 0x70432, + Z2SE_EN_ZAN_YO_V_JUMP = 0x70433, + Z2SE_EN_ZAN_YO_FUMI = 0x70434, + Z2SE_EN_ZAN_YO_V_FUMI_1 = 0x70435, + Z2SE_EN_ZAN_YO_V_FUMI_2 = 0x70436, + Z2SE_EN_ZAN_YO_V_FUMI_3 = 0x70437, + Z2SE_EN_ZAN_YO_LAND = 0x70438, + Z2SE_EN_ZAN_YO_V_KENKEN = 0x70439, + Z2SE_EN_ZAN_CTL_OP = 0x7043A, + Z2SE_EN_ZAN_CTL_SWD_RUB = 0x7043B, + Z2SE_EN_ZAN_CTL_FOOT = 0x7043C, + Z2SE_EN_ZAN_CTL_SW_SWING_L = 0x7043D, + Z2SE_EN_ZAN_CTL_FOOT_L = 0x7043E, + Z2SE_EN_ZAN_CTL_V_SW_ATK_A1 = 0x7043F, + Z2SE_EN_ZAN_CTL_V_SW_ATK_A2 = 0x70440, + Z2SE_EN_ZAN_CTL_SW_SWING_S1 = 0x70441, + Z2SE_EN_ZAN_CTL_SW_SWING_S2 = 0x70442, + Z2SE_EN_ZAN_CTL_V_SW_ATK_B1 = 0x70443, + Z2SE_EN_ZAN_CTL_V_SW_ATK_B2 = 0x70444, + Z2SE_EN_ZAN_CTL_SPIN_ATK = 0x70445, + Z2SE_EN_ZAN_CTL_V_SPIN_ATK = 0x70446, + Z2SE_EN_ZAN_CTL_V_ZEIZEI = 0x70447, + Z2SE_EN_ZAN_V_DMG_SHINARU = 0x70448, + Z2SE_EN_ZAN_V_DMG_JITANDA = 0x70449, + Z2SE_EN_ZAN_END = 0x7044A, + Z2SE_EN_KG_V_DAMAGE = 0x7044B, + Z2SE_EN_GBA_V_DEATH = 0x7044C, + Z2SE_EN_GBA_FOOTNOTE = 0x7044D, + Z2SE_EN_GBA_LAYEGG = 0x7044E, + Z2SE_EN_GBA_FUKA = 0x7044F, + Z2SE_EN_GBA_LAND = 0x70450, + Z2SE_EN_ZAN_L4_1 = 0x70451, + Z2SE_EN_ZAN_L4_2 = 0x70452, + Z2SE_EN_ZAN_L4_WARP_IN = 0x70453, + Z2SE_EN_ZAN_L4_WARP_OUT = 0x70454, + Z2SE_EN_ZH_START = 0x70455, + Z2SE_EN_ZH_MV = 0x70456, + Z2SE_EN_ZH_ATK_PRE = 0x70457, + Z2SE_EN_ZH_ATK = 0x70458, + Z2SE_EN_ZH_FALL = 0x70459, + Z2SE_EN_ZH_DROP = 0x7045A, + Z2SE_EN_ZH_PIYO = 0x7045B, + Z2SE_EN_ZH_BLINK = 0x7045C, + Z2SE_EN_ZH_WAKEUP = 0x7045D, + Z2SE_EN_ZH_DMG = 0x7045E, + Z2SE_EN_ZH_MV_WALL = 0x7045F, + Z2SE_EN_ZAN_YO_FLOAT_WAIT = 0x70460, + Z2SE_EN_PH_HIT = 0x70461, + Z2SE_EN_PH_PROPELLER = 0x70462, + Z2SE_EN_RB_APPEAR = 0x70463, + Z2SE_EN_RB_MOVE = 0x70464, + Z2SE_EN_RB_V_DEATH = 0x70465, + Z2SE_EN_RB_BACKDOWN = 0x70466, + Z2SE_EN_GE_V_NAKU = 0x70467, + Z2SE_EN_GE_V_ATTACK = 0x70468, + Z2SE_EN_GE_V_DEATH = 0x70469, + Z2SE_EN_GE_WING = 0x7046A, + Z2SE_EN_GE_GLIDE = 0x7046B, + Z2SE_EN_GE_V_FURA = 0x7046C, + Z2SE_EN_GO_V_BEAMATTACK_A = 0x7046D, + Z2SE_EN_GO_V_BEAMATTACK_C = 0x7046E, + Z2SE_EN_GO_DASH = 0x7046F, + Z2SE_EN_GO_V_DEATH = 0x70470, + Z2SE_EN_GO_LANDING = 0x70471, + Z2SE_EN_GO_V_LANDING_DAMAGE = 0x70472, + Z2SE_EN_GO_LANDING_WAIT = 0x70473, + Z2SE_EN_GO_RETURN = 0x70474, + Z2SE_EN_GO_V_ROOF_DAMAGE = 0x70475, + Z2SE_EN_GO_SLOW_MOVE = 0x70476, + Z2SE_EN_GO_WAIT = 0x70477, + Z2SE_EN_GO_DEMO_OP = 0x70478, + Z2SE_EN_GO_BEAM = 0x70479, + Z2SE_EN_DR_WING = 0x7047A, + Z2SE_EN_DR_GLIDE = 0x7047B, + Z2SE_EN_DR_V_FIRE = 0x7047C, + Z2SE_EN_DR_BREAK_ARMOR = 0x7047D, + Z2SE_EN_DR_V_BURU = 0x7047E, + Z2SE_EN_DR_V_DAMAGE = 0x7047F, + Z2SE_EN_DR_V_DAMAGE_LAST = 0x70480, + Z2SE_EN_DR_V_DEATH = 0x70481, + Z2SE_EN_DR_FALL = 0x70482, + Z2SE_EN_DR_V_FIRE_A = 0x70483, + Z2SE_EN_DR_FLAP = 0x70484, + Z2SE_EN_DR_V_HOVERING = 0x70485, + Z2SE_EN_DR_V_WAKEUP = 0x70486, + Z2SE_EN_DR_V_SCREAM = 0x70487, + Z2SE_EN_DR_V_POLE_STAY = 0x70488, + Z2SE_EN_DR_DEMO_DESTROY = 0x70489, + Z2SE_EN_DR_V_NAKU = 0x7048A, + Z2SE_EN_DR_V_TUME = 0x7048B, + Z2SE_EN_DR_TUME = 0x7048C, + Z2SE_EN_DR_CORE_HIT = 0x7048D, + Z2SE_EN_DR_WIND_ATTACK = 0x7048E, + Z2SE_EN_YC_V_HANGED = 0x7048F, + Z2SE_EN_YC_V_BRUSH = 0x70490, + Z2SE_EN_YC_V_BRUSH2 = 0x70491, + Z2SE_EN_YC_DASH = 0x70492, + Z2SE_EN_YC_V_HOVERING = 0x70493, + Z2SE_EN_YC_V_ATTACK = 0x70494, + Z2SE_EN_YC_V_DAMAGE = 0x70495, + Z2SE_EN_YC_SPLASH = 0x70496, + Z2SE_EN_KC_WING = 0x70497, + Z2SE_EN_KC_GLIDE = 0x70498, + Z2SE_EN_KC_CRASH = 0x70499, + Z2SE_EN_KC_V_CRASH = 0x7049A, + Z2SE_EN_KC_DASH = 0x7049B, + Z2SE_EN_KC_SPLASH = 0x7049C, + Z2SE_EN_VA_FIRE_BURST = 0x7049D, + Z2SE_EN_GG_V_ATTACK = 0x7049E, + Z2SE_EN_GG_ATTACK = 0x7049F, + Z2SE_EN_GG_WING = 0x704A0, + Z2SE_EN_GG_V_SHOUT = 0x704A1, + Z2SE_EN_GG_V_ATTACK_A = 0x704A2, + Z2SE_EN_GG_ATTACK_A = 0x704A3, + Z2SE_EN_GG_V_ATTACK_B = 0x704A4, + Z2SE_EN_GG_ATTACK_B = 0x704A5, + Z2SE_EN_GG_V_ATTACK_C = 0x704A6, + Z2SE_EN_GG_ATTACK_C = 0x704A7, + Z2SE_EN_GG_V_DAMAGE = 0x704A8, + Z2SE_EN_GG_V_DIE_BOSS = 0x704A9, + Z2SE_EN_GG_V_DIE = 0x704AA, + Z2SE_EN_GG_V_FAINT = 0x704AB, + Z2SE_EN_GG_V_BREATH = 0x704AC, + Z2SE_EN_GG_FOOTNOTE = 0x704AD, + Z2SE_EN_MD_V_DAMAGE = 0x704AE, + Z2SE_EN_MD_V_DEATH = 0x704AF, + Z2SE_EN_MD_V_DEATH_PRESS = 0x704B0, + Z2SE_EN_ZAN_MG_V_ZEIZEI = 0x704B1, + Z2SE_EN_GG_V_DEMO_OP = 0x704B2, + Z2SE_EN_YC_HIT_SIDE = 0x704B3, + Z2SE_EN_PM_V_OP = 0x704B4, + Z2SE_EN_PM_V_END = 0x704B5, + Z2SE_EN_ZS_APPEAR = 0x704B6, + Z2SE_EN_ZS_DISAPPEAR = 0x704B7, + Z2SE_EN_ZS_V_DMG = 0x704B8, + Z2SE_EN_ZS_V_DEAD = 0x704B9, + Z2SE_EN_ZS_V_WAIT = 0x704BA, + Z2SE_EN_DS_OPDEMO = 0x704BB, + Z2SE_EN_DS_HANDS = 0x704BC, + Z2SE_EN_DS_V_ATK_FIRE = 0x704BD, + Z2SE_EN_DS_V_RTT = 0x704BE, + Z2SE_EN_DS_V_ATK_1 = 0x704BF, + Z2SE_EN_DS_V_ATK_2 = 0x704C0, + Z2SE_EN_DS_ATK = 0x704C1, + Z2SE_EN_DS_HAND_1 = 0x704C2, + Z2SE_EN_DS_HAND_2 = 0x704C3, + Z2SE_EN_DS_DMG_WAIT = 0x704C4, + Z2SE_EN_DS_BONE_BRK = 0x704C5, + Z2SE_EN_DS_V_DMG_A = 0x704C6, + Z2SE_EN_DS_V_DMG_B = 0x704C7, + Z2SE_EN_DS_V_DMG_L = 0x704C8, + Z2SE_EN_DS_DMG_A_FALL = 0x704C9, + Z2SE_EN_DS_DMG_B_FALL = 0x704CA, + Z2SE_EN_DS_DMG_L_FALL = 0x704CB, + Z2SE_EN_DS_DMG_HAND = 0x704CC, + Z2SE_EN_DS_DMG_BODY = 0x704CD, + Z2SE_EN_DS_V_NODMG = 0x704CE, + Z2SE_EN_DS_V_WAIT_A = 0x704CF, + Z2SE_EN_DS_V_WAIT_B = 0x704D0, + Z2SE_EN_DS_V_WAIT_C = 0x704D1, + Z2SE_EN_DS_MDEMO_FALL = 0x704D2, + Z2SE_EN_DS_MDEMO_REBOOT = 0x704D3, + Z2SE_EN_DS_H_FLOAT = 0x704D4, + Z2SE_EN_DS_H_COL = 0x704D5, + Z2SE_EN_DS_H_DOWN_UP = 0x704D6, + Z2SE_EN_DS_H_V_DMG_SPNR = 0x704D7, + Z2SE_EN_DS_H_V_DMG_SWD = 0x704D8, + Z2SE_EN_DS_H_V_ATK = 0x704D9, + Z2SE_EN_DS_END_V = 0x704DA, + Z2SE_EN_DS_END_COL = 0x704DB, + Z2SE_EN_DS_END_COL_LAST = 0x704DC, + Z2SE_EN_DR_V_BOOT_A = 0x704DD, + Z2SE_EN_DR_V_BOOT_B = 0x704DE, + Z2SE_EN_DR_LAND = 0x704DF, + Z2SE_EN_DR_CRASH = 0x704E0, + Z2SE_EN_DR_CORE_GLOW = 0x704E1, + Z2SE_EN_HZE_MOVE = 0x704E2, + Z2SE_EN_HZE_V_LAUGH = 0x704E3, + Z2SE_EN_HZE_V_ATK_YOKOKU = 0x704E4, + Z2SE_EN_HZE_V_ATK_A_START = 0x704E5, + Z2SE_EN_HZE_ATK_A_MOVE = 0x704E6, + Z2SE_EN_HZE_ATK_B_LIGHT = 0x704E7, + Z2SE_EN_HZE_ATK_B_LIGHTWALL = 0x704E8, + Z2SE_EN_HZE_V_ATK_B_LIGHTWALL = 0x704E9, + Z2SE_EN_HZE_ATK_C_BALL = 0x704EA, + Z2SE_EN_HZE_V_ATK_C_THROW = 0x704EB, + Z2SE_EN_HZE_ATK_C_BALL_HIT = 0x704EC, + Z2SE_EN_HZE_ATK_C_BALL_RETURN = 0x704ED, + Z2SE_EN_HZE_V_DAMAGE = 0x704EE, + Z2SE_EN_HZE_DAMAGE = 0x704EF, + Z2SE_EN_HZE_V_REBIRTH = 0x704F0, + Z2SE_EN_HZE_V_DAMAGE_LAST = 0x704F1, + Z2SE_EN_ZAN_L4_V = 0x704F2, + Z2SE_EN_DS_EYE_OFF = 0x704F3, + Z2SE_EN_MGN_DEMO_OP = 0x704F4, + Z2SE_EN_MGN_DEMO_END = 0x704F5, + Z2SE_EN_MGN_FOOTNOTE = 0x704F6, + Z2SE_EN_MGN_WARP = 0x704F7, + Z2SE_EN_MGN_SLIP = 0x704F8, + Z2SE_EN_MGN_APPR_EFF = 0x704F9, + Z2SE_EN_MGN_V_KOROBU = 0x704FA, + Z2SE_EN_MGN_V_DAMAGE = 0x704FB, + Z2SE_EN_MGN_V_RETURN = 0x704FC, + Z2SE_EN_MGN_V_GROWL = 0x704FD, + Z2SE_EN_MGN_MIDNA_CATCHED = 0x704FE, + Z2SE_EN_MGN_V_MIDNA_CATCHED = 0x704FF, + Z2SE_EN_MGN_V_MIDNA_THROW = 0x70500, + Z2SE_EN_MGN_V_MIDNA_RELEASE = 0x70501, + Z2SE_EN_ZM_BALL_REFLECT = 0x70502, + Z2SE_EN_ZM_PARA = 0x70503, + Z2SE_EN_GG_V_DEMO_MID = 0x70504, + Z2SE_EN_GG_V_TAKE_OFF = 0x70505, + Z2SE_EN_GG_V_PULL = 0x70506, + Z2SE_EN_GG_ATK_MOVE = 0x70507, + Z2SE_EN_GG_V_DEMO_OP_LV9 = 0x70508, + Z2SE_EN_HG_V_BREATH = 0x70509, + Z2SE_EN_HG_FOOTNOTE_L = 0x7050A, + Z2SE_EN_HG_FOOTNOTE_R = 0x7050B, + Z2SE_EN_HG_SLIP = 0x7050C, + Z2SE_EN_HG_LAND = 0x7050D, + Z2SE_EN_HG_V_STAND = 0x7050E, + Z2SE_EN_HG_V_STANDTURN = 0x7050F, + Z2SE_EN_GND_LIGHTBALL = 0x70510, + Z2SE_EN_GND_LIGHTBALL_SPLIT = 0x70511, + Z2SE_EN_GND_LIGHTBALL_SUB = 0x70512, + Z2SE_EN_GND_LIGHTBALL_SUB_HIT = 0x70513, + Z2SE_EN_GND_DENKIBIRI = 0x70514, + Z2SE_EN_GND_V_SPUR = 0x70515, + Z2SE_EN_GND_V_BRAKE = 0x70516, + Z2SE_EN_GND_V_ATTACK01A = 0x70517, + Z2SE_EN_GND_V_ATTACK01B = 0x70518, + Z2SE_EN_GND_V_ATTACK02A = 0x70519, + Z2SE_EN_GND_V_ATTACK02C = 0x7051A, + Z2SE_EN_GND_V_JUMP_START = 0x7051B, + Z2SE_EN_GND_V_DAMAGE01 = 0x7051C, + Z2SE_EN_GND_V_DAMAGE02 = 0x7051D, + Z2SE_EN_GND_V_RETURN = 0x7051E, + Z2SE_EN_GND_V_DOWN = 0x7051F, + Z2SE_EN_DS_H_COL_WALL = 0x70520, + Z2SE_EN_PO_V_AWAKE = 0x70521, + Z2SE_EN_PO_V_DOWN = 0x70522, + Z2SE_EN_PO_LAMP_LAND = 0x70523, + Z2SE_EN_PO_SOUL = 0x70524, + Z2SE_EN_DS_SMOKE_1 = 0x70525, + Z2SE_EN_DS_SMOKE_2 = 0x70526, + Z2SE_EN_FK_MOVE = 0x70527, + Z2SE_EN_FK_DEATH = 0x70528, + Z2SE_EN_HP_V_ATTACK = 0x70529, + Z2SE_EN_HP_SWING = 0x7052A, + Z2SE_EN_HP_V_DAMAGE = 0x7052B, + Z2SE_EN_HP_V_DOWN = 0x7052C, + Z2SE_EN_HP_V_DEAD = 0x7052D, + Z2SE_EN_HP_V_LAUGH = 0x7052E, + Z2SE_EN_HP_V_FOUND = 0x7052F, + Z2SE_EN_HP_V_RETURN = 0x70530, + Z2SE_EN_HP_MOVE = 0x70531, + Z2SE_EN_CR_FOOTNOTE = 0x70532, + Z2SE_EN_CR_LAYEGG = 0x70533, + Z2SE_EN_CR_EGG_BOMB = 0x70534, + Z2SE_EN_CR_V_DEATH = 0x70535, + Z2SE_EN_OC_NATA_HIT = 0x70536, + Z2SE_EN_OC_NATA_DAGGLE = 0x70537, + Z2SE_EN_CR_EGG_BOUND = 0x70538, + Z2SE_EN_PO_SOUL_PULLOUT = 0x70539, + Z2SE_EN_GND_MANTEAU = 0x7053A, + Z2SE_EN_GND_FOOTNOTE = 0x7053B, + Z2SE_EN_GND_V_CHOUHATU = 0x7053C, + Z2SE_EN_GND_V_ATTACKA = 0x7053D, + Z2SE_EN_GND_ATTACKA = 0x7053E, + Z2SE_EN_GND_V_ATTACKB = 0x7053F, + Z2SE_EN_GND_ATTACKB = 0x70540, + Z2SE_EN_GND_V_ATTACKC_A = 0x70541, + Z2SE_EN_GND_ATTACKC_A = 0x70542, + Z2SE_EN_GND_V_ATTACKC_C = 0x70543, + Z2SE_EN_GND_ATTACKC_C = 0x70544, + Z2SE_EN_GND_V_ATTACKD = 0x70545, + Z2SE_EN_GND_ATTACKD = 0x70546, + Z2SE_EN_GND_V_ATTACKE_A = 0x70547, + Z2SE_EN_GND_ATTACKE_A = 0x70548, + Z2SE_EN_GND_V_ATTACKE_B = 0x70549, + Z2SE_EN_GND_ATTACKE_B = 0x7054A, + Z2SE_EN_GND_V_ATTACKE_C2 = 0x7054B, + Z2SE_EN_GND_ATTACKE_C2 = 0x7054C, + Z2SE_EN_GND_V_ATTACK_F = 0x7054D, + Z2SE_EN_GND_ATTACK_F = 0x7054E, + Z2SE_EN_GND_FN_SLIDE = 0x7054F, + Z2SE_EN_GND_V_ATTACK_G1 = 0x70550, + Z2SE_EN_GND_ATTACK_G1 = 0x70551, + Z2SE_EN_GND_V_ATTACK_G2 = 0x70552, + Z2SE_EN_GND_ATTACK_G2 = 0x70553, + Z2SE_EN_GND_V_JUMP = 0x70554, + Z2SE_EN_GND_JUMP = 0x70555, + Z2SE_EN_GND_LAND = 0x70556, + Z2SE_EN_GND_TUBAZERI_EFF = 0x70557, + Z2SE_EN_GND_V_TUBAZERI_A = 0x70558, + Z2SE_EN_GND_V_TUBAZERI_B = 0x70559, + Z2SE_EN_GND_V_TUBAZERI_C = 0x7055A, + Z2SE_EN_GND_V_TUBAZERI_WIN = 0x7055B, + Z2SE_EN_GND_V_TUBAZERI_LOSE = 0x7055C, + Z2SE_EN_GND_TUBAZERI_PUSH = 0x7055D, + Z2SE_EN_GND_V_DEFENCE = 0x7055E, + Z2SE_EN_GND_V_KUZURE = 0x7055F, + Z2SE_EN_GND_V_DAMAGE = 0x70560, + Z2SE_EN_GND_DOWN = 0x70561, + Z2SE_EN_GND_V_DOWNWAIT = 0x70562, + Z2SE_EN_GND_V_DOWNUP = 0x70563, + Z2SE_EN_GND_V_DOWNB = 0x70564, + Z2SE_EN_GND_V_LAUGH = 0x70565, + Z2SE_EN_GND_V_END = 0x70566, + Z2SE_EN_GND_V_STANDUP = 0x70567, + Z2SE_EN_GND_V_LOOK = 0x70568, + Z2SE_EN_GND_V_SAYAOPEN = 0x70569, + Z2SE_EN_GND_SAYAOPEN = 0x7056A, + Z2SE_EN_RDB_LV9_OP = 0x7056B, + Z2SE_EN_RDB_V_LV9_OP = 0x7056C, + Z2SE_EN_RDB_V_LV9_END01 = 0x7056D, + Z2SE_EN_RDB_V_LV9_END02 = 0x7056E, + Z2SE_EN_RDB_V_LV9_END03 = 0x7056F, + Z2SE_EN_RDB_V_OP_DEMO_SWING = 0x70570, + Z2SE_EN_RDB_OP_DEMO_SWING = 0x70571, + Z2SE_EN_RDB_V_ED_DEMO_DOWN = 0x70572, + Z2SE_EN_RDB_V_ED_DEMO_DOWNUP = 0x70573, + Z2SE_EN_RDB_V_ED_DEMO_WALK = 0x70574, + Z2SE_EN_RDB_ED_FOOTNOTE = 0x70575, + Z2SE_EN_RDB_FOOTNOTE = 0x70576, + Z2SE_EN_RDB_V_ATTACK = 0x70577, + Z2SE_EN_RDB_ATTACK01 = 0x70578, + Z2SE_EN_RDB_ATTACK01_HIT = 0x70579, + Z2SE_EN_RDB_ATTACK02 = 0x7057A, + Z2SE_EN_RDB_ATTACK02B = 0x7057B, + Z2SE_EN_RDB_ATTACK03 = 0x7057C, + Z2SE_EN_RDB_V_PUSH = 0x7057D, + Z2SE_EN_RDB_DEMO_ONO_LAND = 0x7057E, + Z2SE_EN_RDB_V_DEMO_EXCITE = 0x7057F, + Z2SE_EN_PH_APPEAR = 0x70580, + Z2SE_D29_GND_TF_OFF = 0x70581, + Z2SE_D29_ZAN_NECK = 0x70582, + Z2SE_D29_GND_WIND = 0x70583, + Z2SE_D32_GND_TF1 = 0x70584, + Z2SE_D32_GND_HAND1 = 0x70585, + Z2SE_D32_GND_TF2 = 0x70586, + Z2SE_D32_GND_HAND2 = 0x70587, + Z2SE_D32_GND_ATK = 0x70588, + Z2SE_D32_GND_WARP = 0x70589, + Z2SE_D33_ZAN_MASK_OFF = 0x7058A, + Z2SE_D33_ZAN_BTBT_1 = 0x7058B, + Z2SE_D33_ZAN_BTBT_2 = 0x7058C, + Z2SE_D33_ZAN_ZOOM_UP = 0x7058D, + Z2SE_D33_GND_BALL1 = 0x7058E, + Z2SE_D33_GND_BALL2 = 0x7058F, + Z2SE_D33_ZAN_INTO_BALL = 0x70590, + Z2SE_D33_GND_FIRE = 0x70591, + Z2SE_D25_ZAN_STICK = 0x70592, + Z2SE_D25_ZAN_BALOON = 0x70593, + Z2SE_D27_GND_KIZU = 0x70594, + Z2SE_D27_GND_TF = 0x70595, + Z2SE_D27_GND_PTCL_1 = 0x70596, + Z2SE_D27_GND_PTCL_2 = 0x70597, + Z2SE_D27_GND_PTCL_3 = 0x70598, + Z2SE_D27_HZEL_EYE_OP = 0x70599, + Z2SE_D27_HZEL_FLOAT = 0x7059A, + Z2SE_D27_HZEL_LIGHT = 0x7059B, + Z2SE_D27_GND_GATHER = 0x7059C, + Z2SE_D28_MGN_FIRE = 0x7059D, + Z2SE_D28_MGN_CHANGE = 0x7059E, + Z2SE_D28_GND_SPIRIT = 0x7059F, + Z2SE_D28V_GND_CRY_1 = 0x705A0, + Z2SE_D28_WIND = 0x705A2, + Z2SE_D28_FK_THROUGH_1 = 0x705A3, + Z2SE_D28_FK_THROUGH_2 = 0x705A4, + Z2SE_D24_ZAN_PUNCH = 0x705A5, + Z2SE_EN_GND_V_DAMAGE_DOWN = 0x705A6, + Z2SE_D20_ZAN_APPEAR = 0x705A7, + Z2SE_D20_ZAN_MAGIC_ATK = 0x705A8, + Z2SE_D20_ZAN_MASK_OP = 0x705A9, + Z2SE_EN_HZE_V_ATK_C_RETURN = 0x705AA, + Z2SE_D07_NS_CATCH_FACE = 0x705AD, + Z2SE_D07_NS_JUMP_LAND = 0x705B0, + Z2SE_D15_RDB_HELM_UP = 0x705B1, + Z2SE_D36_RD_1_FALL = 0x705B2, + Z2SE_D36_RD_2_FALL = 0x705B3, + Z2SE_EN_MGN_V_TURN = 0x705B4, + Z2SE_EN_GG_MET_BREAK = 0x705B5, + Z2SE_EN_GG_MET_LAND = 0x705B6, + Z2SE_EN_DR_DEMO_FIRST = 0x705B7, + Z2SE_EN_YC_V_NAKU = 0x705B8, + Z2SE_EN_KC_V_NAKU = 0x705B9, + Z2SE_OBJ_ARROW_DRAW_NORMAL = 0x80000, + Z2SE_OBJ_DARK_GATE_RIPPLE_WLF = 0x80001, + Z2SE_OBJ_ARROW_SHOT_NORMAL = 0x80002, + Z2SE_OBJ_ARROW_SHOT_GAIN = 0x80003, + Z2SE_OBJ_ARROW_FLY_NORMAL = 0x80004, + Z2SE_OBJ_ARROW_FLY_GAIN = 0x80005, + Z2SE_OBJ_ARROW_FIRE_READY = 0x80006, + Z2SE_OBJ_ARROW_SHOT_FIRE = 0x80007, + Z2SE_OBJ_ARROW_FLY_FIRE = 0x80008, + Z2SE_OBJ_BOMB_WALL_BREAK = 0x80009, + Z2SE_OBJ_BOMB_IGNITION = 0x8000A, + Z2SE_OBJ_BOMB_EXPLODE = 0x8000B, + Z2SE_OBJ_ARROWBOMB_SHOT = 0x8000C, + Z2SE_OBJ_ARROWBOMB_SHOTGAIN = 0x8000D, + Z2SE_OBJ_ARROWBOMB_FLY = 0x8000E, + Z2SE_OBJ_ARROWBOMB_FLYGAIN = 0x8000F, + Z2SE_OBJ_DOOR_STEEL_BAR = 0x80010, + Z2SE_OBJ_STONE_DOOR_OPEN = 0x80011, + Z2SE_OBJ_STONE_DOOR_CLOSE = 0x80012, + Z2SE_OBJ_STONE_DOOR_OPEN_STOP = 0x80013, + Z2SE_OBJ_STONE_DOOR_CLOSE_STOP = 0x80014, + Z2SE_OBJ_MK_COLUMN_SHAKE = 0x80015, + Z2SE_OBJ_BOMB_ROCK_BREAK = 0x80016, + Z2SE_OBJ_FIRE_IGNITION = 0x80017, + Z2SE_OBJ_FIRE_BURNING = 0x80018, + Z2SE_OBJ_FIRE_OFF = 0x80019, + Z2SE_OBJ_WATERBOMB_EXPLODE = 0x8001A, + JA_SE_OBJ_STN_DOOR_MOVE_U = 0x8001B, + JA_SE_OBJ_STN_DOOR_MOVE_D = 0x8001C, + JA_SE_OBJ_STN_DOOR_STOP_U = 0x8001D, + JA_SE_OBJ_STN_DOOR_STOP_D = 0x8001E, + Z2SE_OBJ_TBOX_OPEN_A = 0x8001F, + Z2SE_OBJ_TBOX_OPEN_B = 0x80020, + Z2SE_OBJ_TBOX_OPEN_B_SLOW = 0x80021, + Z2SE_OBJ_TBOX_OPEN_C = 0x80022, + Z2SE_OBJ_KNOB_DOOR_LOCKED = 0x80023, + Z2SE_OBJ_KNOB_DOOR_OPEN = 0x80024, + Z2SE_OBJ_KNOB_DOOR_CLOSE = 0x80025, + Z2SE_OBJ_ROCK_FALL_DUMMY = 0x80026, + Z2SE_OBJ_ROCK_FALL_DIRECT = 0x80027, + Z2SE_OBJ_BOMB_EXP_WTRSURF = 0x80028, + Z2SE_OBJ_FALL_WATER_S = 0x80029, + Z2SE_OBJ_FALL_WATER_M = 0x8002A, + Z2SE_OBJ_FALL_WATER_L = 0x8002B, + JA_SE_OBJ_FALL_MAGMA_S = 0x8002C, + JA_SE_OBJ_FALL_MAGMA_M = 0x8002D, + JA_SE_OBJ_FALL_MAGMA_L = 0x8002E, + JA_SE_OBJ_BLOCK_FALL_NORMAL = 0x8002F, + JA_SE_OBJ_WBOX_FALL_NORMAL = 0x80030, + JA_SE_OBJ_BREAK_WATER_POT = 0x80031, + JA_SE_OBJ_BURN_WBOX_S = 0x80032, + JA_SE_OBJ_BURN_WBOX_L = 0x80033, + JA_SE_OBJ_BURN_WRAILING = 0x80034, + JA_SE_OBJ_PUT_POT_S = 0x80035, + JA_SE_OBJ_PUT_POT_L = 0x80036, + JA_SE_OBJ_PUT_POT_W = 0x80037, + JA_SE_OBJ_PUT_WBOX_S = 0x80038, + JA_SE_OBJ_PUT_STONE = 0x80039, + JA_SE_OBJ_PUT_ROCK = 0x8003A, + Z2SE_OBJ_BREAK_STONE = 0x8003B, + Z2SE_OBJ_BREAK_ROCK = 0x8003C, + Z2SE_OBJ_BREAK_STEPS = 0x8003D, + Z2SE_OBJ_BREAK_BAMBOOFENCE = 0x8003E, + JA_SE_OBJ_FOOT_SW_ON = 0x80040, + Z2SE_OBJ_D19_DOOR_CLOSE = 0x80041, + Z2SE_OBJ_D19_PUT_LANCE = 0x80042, + Z2SE_OBJ_D18_SWORD_STICK = 0x80043, + Z2SE_OBJ_HACHINOSU_HIT = 0x80044, + Z2SE_OBJ_HACHINOSU_BOUND = 0x80045, + Z2SE_OBJ_HACHINOSU_BREAK = 0x80046, + Z2SE_OBJ_SNOWTREE_HIT = 0x80050, + Z2SE_OBJ_BOSS_LOCK_OPEN = 0x80060, + Z2SE_OBJ_LUPY_OUT = 0x80078, + Z2SE_OBJ_LUPY_BOUND = 0x80083, + Z2SE_OBJ_MAGIC_POT_BOUND = 0x80084, + Z2SE_OBJ_ARROW_BOUND = 0x80085, + Z2SE_OBJ_GEYSER_LOW = 0x80088, + Z2SE_OBJ_GEYSER_HIGH = 0x80089, + Z2SE_OBJ_BOMB_BOUND = 0x80094, + Z2SE_OBJ_WOODSHIELD_BREAK = 0x80095, + Z2SE_OBJ_GNAW_CHAIN_SW = 0x80096, + Z2SE_OBJ_PULLDOWN_CHAIN_SW = 0x80097, + Z2SE_OBJ_STOP_CHAIN_SW = 0x80098, + Z2SE_OBJ_SWAY_CHAIN = 0x80099, + Z2SE_OBJ_OPEN_CHAIN_SW_DOOR = 0x8009A, + Z2SE_OBJ_MOVE_JAIL_DOOR = 0x8009B, + Z2SE_OBJ_OPEN_ZELDAROOM_DOOR = 0x8009C, + Z2SE_OBJ_BREAK_IRON_FENCE = 0x8009D, + Z2SE_OBJ_FIREWOOD_BURNING = 0x800A3, + Z2SE_OBJ_FIREWOOD_SHAKE = 0x800A4, + Z2SE_OBJ_FIREWOOD_BREAK = 0x800A5, + Z2SE_OBJ_FIREWOOD_SMOKE = 0x800A6, + Z2SE_OBJ_PUMPKIN_PULLOUT = 0x800A7, + Z2SE_OBJ_PUMPKIN_PUT = 0x800A8, + Z2SE_OBJ_PUMPKIN_CRASH = 0x800A9, + Z2SE_OBJ_WARP_RESPONSE = 0x800AA, + Z2SE_OBJ_WARP_HINT = 0x800AB, + Z2SE_OBJ_PEEL_OFF_TILE = 0x800AC, + Z2SE_OBJ_WARP_HOLE = 0x800AD, + Z2SE_OBJ_WARP_OUT = 0x800AE, + Z2SE_OBJ_MONKEYJAIL_BREAK = 0x800AF, + Z2SE_OBJ_MONKEYJAIL_CREAK = 0x800B0, + Z2SE_OBJ_MONKEYJAIL_SHAKE = 0x800B1, + Z2SE_OBJ_WOOD_DOOR_ROLLOPEN = 0x800B2, + Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE = 0x800B3, + Z2SE_OBJ_WOOD_DOOR_OPEN_STOP = 0x800B4, + Z2SE_OBJ_WOOD_DOOR_CLOSE_STOP = 0x800B5, + Z2SE_OBJ_DOOR_CHAIN_LOCK_OPEN = 0x800B6, + Z2SE_OBJ_BOKKURI_PULLOUT = 0x800B7, + Z2SE_OBJ_BOKKURI_PUT = 0x800B8, + Z2SE_OBJ_BOKKURI_BURST = 0x800B9, + Z2SE_OBJ_PEEL_OFF_LEAVES = 0x800BA, + Z2SE_OBJ_FOOT_SWITCH_ON = 0x800BB, + Z2SE_OBJ_FOOT_SWITCH_SLIDE = 0x800BC, + Z2SE_OBJ_KAKASHI_SHAKE = 0x800BD, + Z2SE_OBJ_FLAG_TRAILING = 0x800BE, + Z2SE_OBJ_BRIDGE_TRAILING = 0x800BF, + Z2SE_OBJ_BOKKURI_HIT_ROLL = 0x800C0, + Z2SE_OBJ_WATERMILL_ROUND = 0x800C1, + Z2SE_OBJ_DOOR_WOOD_BAR_CL = 0x800C2, + Z2SE_OBJ_DOOR_WOOD_BAR_OP = 0x800C3, + Z2SE_OBJ_KEY_BOUND = 0x800C4, + Z2SE_OBJ_KEY_TWINKLE = 0x800C5, + Z2SE_OBJ_CANOE_WAVE = 0x800C6, + Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2 = 0x800C7, + Z2SE_OBJ_CAT_DOOR = 0x800C8, + Z2SE_OBJ_RANCH_WOODPLATE = 0x800C9, + Z2SE_OBJ_CAT_VANE_ROLL = 0x800CA, + Z2SE_OBJ_CAT_VANE_BREAK = 0x800CB, + Z2SE_OBJ_STEP_MOVESTART = 0x800CC, + Z2SE_OBJ_STEP_MOVE = 0x800CD, + Z2SE_OBJ_STEP_MOVEEND = 0x800CE, + Z2SE_OBJ_BOOMSHTR_SWITCH = 0x800CF, + Z2SE_OBJ_BOOMSHTR_GATA = 0x800D0, + Z2SE_OBJ_BOOMSHTR_OPEN = 0x800D1, + Z2SE_OBJ_STRAWFENCE_IGNITION = 0x800D2, + Z2SE_OBJ_STRAWFENCE_BURNING = 0x800D3, + Z2SE_OBJ_BOKKURI_FALLWATER = 0x800D4, + Z2SE_OBJ_BONES_BREAK_L = 0x800D5, + Z2SE_OBJ_KEY_TWINKLE_HIDDEN = 0x800D6, + Z2SE_OBJ_RANCHHOUSE_DOOR_OPEN = 0x800D7, + Z2SE_OBJ_KEYLOCK_BOUND = 0x800D8, + Z2SE_OBJ_BOOMSHTR2_GATA1 = 0x800DC, + Z2SE_OBJ_BOOMSHTR2_GATA2 = 0x800DD, + Z2SE_OBJ_BOOMSHTR2_GATA3 = 0x800DE, + Z2SE_OBJ_BOOMSHTR2_DIRT = 0x800DF, + Z2SE_OBJ_BOOMSHTR2_DIRT_L = 0x800E0, + Z2SE_OBJ_BOOMSHTR2_OPEN = 0x800E1, + Z2SE_OBJ_BOOMSHTR2_PARA = 0x800E2, + Z2SE_OBJ_BOOMSHTR_HIT_SW = 0x800E3, + Z2SE_OBJ_BOARD_BREAK = 0x800E4, + Z2SE_OBJ_BOARD_BOUND = 0x800E5, + Z2SE_OBJ_BOARD_PUT = 0x800E6, + Z2SE_OBJ_DARK_GATE = 0x800E7, + Z2SE_OBJ_COLUMN_SHAKE_HARD = 0x800E8, + Z2SE_OBJ_COLUMN_SHAKE_FIRST = 0x800E9, + Z2SE_WARP_HOLE_OPEN = 0x800EA, + Z2SE_DEMO_NS_WARPHOLE = 0x800EB, + Z2SE_OBJ_WATERGATE_MOVE = 0x800EC, + Z2SE_OBJ_LIGHTDROP_APPEAR = 0x800ED, + Z2SE_OBJ_LIGHTDROP_FLOAT = 0x800EE, + Z2SE_OBJ_LIGHTDROP_DRAW_IN = 0x800EF, + Z2SE_OBJ_BARRIER_STN_APPEAR = 0x800F0, + Z2SE_OBJ_BARRIER_STN_STICK = 0x800F1, + Z2SE_OBJ_BARRIER_STN_DISAPPEAR = 0x800F2, + Z2SE_OBJ_BARRIER_STN_TURN_ON = 0x800F3, + Z2SE_OBJ_BARRIER_EMERGENCE = 0x800F4, + Z2SE_OBJ_BARRIER_COLLISION = 0x800F5, + Z2SE_OBJ_SKULL_BREAK = 0x800F6, + Z2SE_OBJ_SKULL_PUT = 0x800F7, + Z2SE_OBJ_PUT_WATER_S = 0x800F8, + Z2SE_OBJ_PUT_WATER_M = 0x800F9, + Z2SE_OBJ_PUT_WATER_L = 0x800FA, + Z2SE_OBJ_WOODBOX_BREAK = 0x800FB, + Z2SE_OBJ_ZELDAROOM_DOOR_MOVE = 0x800FC, + Z2SE_OBJ_SPIRALSTEP_DOOR_1 = 0x800FD, + Z2SE_OBJ_SPIRALSTEP_DOOR_2 = 0x800FE, + Z2SE_OBJ_SPIRALSTEP_DOOR_3 = 0x800FF, + Z2SE_OBJ_SPIRALSTEP_DOOR_4 = 0x80100, + Z2SE_OBJ_SPIRALSTEP_DOOR_5 = 0x80101, + Z2SE_OBJ_SPIRALSTEP_DOOR_6 = 0x80102, + Z2SE_OBJ_SPIRALSTEP_DOOR_7 = 0x80103, + Z2SE_OBJ_SPIRALSTEP_DOOR_8 = 0x80104, + Z2SE_OBJ_SPIRALSTEP_DOOR_BOUND = 0x80105, + Z2SE_OBJ_WOODSHIELD_SHAKE = 0x80106, + Z2SE_OBJ_WOODSHIELD_COME_OFF = 0x80107, + Z2SE_OBJ_WOODSHIELD_BOUND = 0x80108, + Z2SE_OBJ_GOBFLOOR_CHAIN_BREAK = 0x80109, + Z2SE_OBJ_GOBFLOOR_INTO_MAGMA = 0x8010A, + Z2SE_OBJ_WOODSTICK_BOUND = 0x8010B, + Z2SE_OBJ_WOODSTICK_PUT = 0x8010C, + Z2SE_OBJ_CHURCH_ALTER_MOVE = 0x8010D, + Z2SE_OBJ_CHURCH_ALTER_STOP = 0x8010E, + Z2SE_OBJ_WOODROOF_BREAK = 0x8010F, + Z2SE_OBJ_GLASSWINDOW_BREAK = 0x80110, + Z2SE_OBJ_CHEST_DOWN = 0x80111, + Z2SE_OBJ_WEB_BURN = 0x80112, + Z2SE_OBJ_WEB_BOUND_L = 0x80113, + Z2SE_OBJ_WEB_BOUND_S = 0x80114, + Z2SE_OBJ_ROLLBRG_MOVESTART = 0x80116, + Z2SE_OBJ_ROLLBRG_MOVE = 0x80117, + Z2SE_OBJ_ROLLBRG_MOVEEND = 0x80118, + Z2SE_OBJ_BOOMSHTR_ATTACK = 0x80119, + Z2SE_OBJ_BOOMSHTR_S_OPEN = 0x8011A, + Z2SE_OBJ_CBLOCK_SLIDEMOVE = 0x8011B, + Z2SE_OBJ_CBLOCK_STOP = 0x8011C, + Z2SE_OBJ_MYNA_LIGHT_BURNING = 0x8011D, + Z2SE_OBJ_MYNA_LIGHT_ON = 0x8011E, + Z2SE_OBJ_MYNA_LIGHT_OFF = 0x8011F, + Z2SE_OBJ_BROKENBRIDGE = 0x80120, + Z2SE_OBJ_BOOMSHTR2_CLOSE = 0x80121, + Z2SE_OBJ_MAGMAPOLE_YOBI = 0x80122, + Z2SE_OBJ_MAGMAPOLE_BLAST = 0x80123, + Z2SE_OBJ_PIPEFIRE_REST = 0x80124, + Z2SE_OBJ_PIPEFIRE_YOBI = 0x80125, + Z2SE_OBJ_PIPEFIRE_BLAST = 0x80126, + Z2SE_OBJ_HEAVYSW_MOVE = 0x80127, + Z2SE_OBJ_HEAVYSW_UP = 0x80128, + Z2SE_OBJ_HEAVYSW_DOWN = 0x80129, + Z2SE_OBJ_HEAVYSW_STOP = 0x8012A, + Z2SE_OBJ_GORONGATE_MOVE = 0x8012B, + Z2SE_OBJ_GORONGATE_STOP = 0x8012C, + Z2SE_OBJ_BREAK_WOODNAIL_FENCE = 0x8012D, + Z2SE_OBJ_BREAK_BARREL = 0x8012E, + Z2SE_OBJ_MAGNELIFT_TURN_S = 0x8012F, + Z2SE_OBJ_MAGNELIFT_STOP_S = 0x80130, + Z2SE_OBJ_MAGNELIFT_TURN_M = 0x80131, + Z2SE_OBJ_MAGNELIFT_STOP_M = 0x80132, + Z2SE_OBJ_MAGNELIFT_TURN_L = 0x80133, + Z2SE_OBJ_MAGNELIFT_STOP_L = 0x80134, + Z2SE_OBJ_CWALL_MOVE = 0x80135, + Z2SE_OBJ_CWALL_MOVE_STOP = 0x80136, + Z2SE_OBJ_CWALL_BACK = 0x80137, + Z2SE_OBJ_CWALL_BACK_STOP = 0x80138, + Z2SE_OBJ_BOMBBARREL_HIT = 0x80139, + Z2SE_OBJ_BOMBBARREL_IGNITION = 0x8013A, + Z2SE_OBJ_BOMBBARREL_BREAK = 0x8013B, + Z2SE_OBJ_MOVE_WBLOCK = 0x8013C, + Z2SE_OBJ_MOVE_WBLOCK_LIMIT = 0x8013D, + Z2SE_OBJ_ATK_FENCE_HIT = 0x8013E, + Z2SE_OBJ_ATK_FENCE_FALLDOWN = 0x8013F, + Z2SE_OBJ_HEAVY_FUMISW_RIDE = 0x80140, + Z2SE_OBJ_HEAVY_FUMISW_DROP = 0x80141, + Z2SE_OBJ_HEAVY_FUMISW_ON = 0x80142, + Z2SE_OBJ_ROPEBRDG_CUT = 0x80143, + Z2SE_OBJ_ROPEBRDG_MOVE_S = 0x80144, + Z2SE_OBJ_ROPEBRDG_FALLDOWN_S = 0x80145, + Z2SE_OBJ_ROPEBRDG_MOVE_L = 0x80146, + Z2SE_OBJ_ROPEBRDG_FALLDOWN_L = 0x80147, + Z2SE_OBJ_MAGNEARM_MOVESTART = 0x80148, + Z2SE_OBJ_MAGNEARM_MOVE = 0x80149, + Z2SE_OBJ_MAGNEARM_STOP = 0x8014A, + Z2SE_OBJ_MAGNEARM_UP = 0x8014B, + Z2SE_OBJ_MAGNEARM_DOWN = 0x8014C, + Z2SE_OBJ_MAGNEARM_SWING = 0x8014D, + Z2SE_OBJ_BREAK_WOOD_S = 0x8014E, + Z2SE_OBJ_BREAK_WOOD_L = 0x8014F, + Z2SE_OBJ_BLOCK_FALL_NORMAL = 0x80150, + Z2SE_OBJ_WBOX_FALL_NORMAL = 0x80151, + Z2SE_OBJ_PUT_WBOX_S = 0x80152, + Z2SE_OBJ_PUT_STONE = 0x80153, + Z2SE_OBJ_MOVE_ROCK = 0x80154, + Z2SE_OBJ_MOVE_ROCK_LIMIT = 0x80155, + Z2SE_OBJ_HEAVY_FUMISW_OFF = 0x80156, + Z2SE_OBJ_ELEVATOR_START = 0x80157, + Z2SE_OBJ_ELEVATOR_MOVE = 0x80158, + Z2SE_OBJ_ELEVATOR_STOP = 0x80159, + Z2SE_OBJ_CHAINSW_PULL = 0x8015A, + Z2SE_OBJ_CHAINSW_PULLHEAVY = 0x8015B, + Z2SE_OBJ_CHAINSW_BACK = 0x8015C, + Z2SE_OBJ_CHAINSW_BACKFAST = 0x8015D, + Z2SE_OBJ_CHAINSW_ON = 0x8015E, + Z2SE_OBJ_CHAND_TOP = 0x8015F, + Z2SE_OBJ_CHAND_FALLDOWN = 0x80160, + Z2SE_OBJ_CHAND_FALLDOWN_S = 0x80161, + Z2SE_OBJ_FM_BREAK_PILLAR = 0x80162, + Z2SE_OBJ_FM_DIRTFALL = 0x80163, + Z2SE_OBJ_STALAC_BREAK = 0x80164, + Z2SE_OBJ_STALAC_LAND = 0x80165, + Z2SE_OBJ_STALAC_LAND_WATER = 0x80166, + Z2SE_OBJ_ROLLSTAIR_ROLL = 0x80167, + Z2SE_OBJ_ROLLSTAIR_STOP = 0x80168, + Z2SE_OBJ_BURASW_ON = 0x80169, + Z2SE_OBJ_BURASW_OFF = 0x8016A, + Z2SE_OBJ_FLOATBOARD = 0x8016B, + Z2SE_OBJ_FLOATBOARD_SWING = 0x8016C, + Z2SE_OBJ_FLOATBOARD_SWING_L = 0x8016D, + Z2SE_OBJ_CWALL_BACK_SLOW = 0x8016E, + Z2SE_OBJ_CWALL_CHAIN_TENSION = 0x8016F, + Z2SE_OBJ_ROOF_ANA = 0x80170, + Z2SE_OBJ_MADO_YURE = 0x80171, + Z2SE_OBJ_MADO_NOT_BREAK = 0x80172, + Z2SE_OBJ_MADO_BREAK_PRPR = 0x80173, + Z2SE_OBJ_TANSU_YURE = 0x80174, + Z2SE_OBJ_BOMB_HOUSE_BURN = 0x80175, + Z2SE_OBJ_BOMB_HOUSE_BURN_S = 0x80176, + Z2SE_OBJ_BOMB_HOUSE_EXPLD = 0x80177, + Z2SE_OBJ_TABLE_BRAKE = 0x80178, + Z2SE_OBJ_ARW_TRGT_BRK = 0x80179, + Z2SE_OBJ_ARW_TRGT_BRK_LAST = 0x8017A, + Z2SE_OBJ_SHOCK_SW_ON = 0x8017B, + Z2SE_OBJ_GEAR_LV = 0x8017D, + Z2SE_OBJ_WTR_WHL_1 = 0x8017E, + Z2SE_OBJ_WTR_WHL_1_SPLSH = 0x8017F, + Z2SE_OBJ_WTR_WHL_2 = 0x80180, + Z2SE_OBJ_WTR_WHL_2_SPLSH = 0x80181, + Z2SE_OBJ_WTR_CLMN_WAIT = 0x80182, + Z2SE_OBJ_WTR_CLMN_READY = 0x80183, + Z2SE_OBJ_WTR_CLMN_UP = 0x80184, + Z2SE_OBJ_WTR_CLMN_DOWN = 0x80186, + Z2SE_OBJ_SW_W_DR_OP = 0x80187, + Z2SE_OBJ_SW_W_DR_OP_STOP = 0x80188, + Z2SE_OBJ_SW_W_DR_CL = 0x80189, + Z2SE_OBJ_SW_W_DR_CL_STOP = 0x8018A, + Z2SE_OBJ_LV3_KNOB_DR_OP = 0x8018B, + Z2SE_OBJ_LV3_KNOB_DR_CL = 0x8018C, + Z2SE_OBJ_NET_SHTR_OP = 0x8018D, + Z2SE_OBJ_NET_SHTR_CL = 0x8018E, + Z2SE_OBJ_NET_L_SHTR_CL = 0x8018F, + Z2SE_OBJ_SW_FENCE_DOWN = 0x80190, + Z2SE_OBJ_LV3_SHTR_OP = 0x80191, + Z2SE_OBJ_LV3_SHTR_CL = 0x80192, + Z2SE_OBJ_WALLSHUTTER_OPEN = 0x80193, + Z2SE_OBJ_LV3_SHTR_UP_STOP = 0x80194, + Z2SE_OBJ_LV3_SHTR_DW_STOP = 0x80195, + Z2SE_OBJ_LV3_SHTR_CL_WTR = 0x80196, + Z2SE_OBJ_LV3_SHTR_OP_MDN = 0x80197, + Z2SE_OBJ_SW_FENCE_DWN_WTR = 0x80198, + Z2SE_OBJ_MAGNE_EFFECT = 0x80199, + Z2SE_OBJ_LV3_SHTR_OP_FX = 0x8019A, + Z2SE_OBJ_WOOD_DR_OP_MDN = 0x8019B, + Z2SE_OBJ_WOOD_DR_OP_MDN_FX = 0x8019C, + Z2SE_OBJ_SPNR_SW_FIT = 0x8019D, + Z2SE_OBJ_SPNR_SW_CL = 0x8019E, + Z2SE_OBJ_SPNR_GEAR_S = 0x8019F, + Z2SE_OBJ_STN_WL_RL = 0x801A0, + Z2SE_OBJ_STN_WL_RL_OP = 0x801A1, + Z2SE_OBJ_STN_WL_RL_ST = 0x801A2, + Z2SE_OBJ_STN_SPRL_RAIL = 0x801A3, + Z2SE_OBJ_STN_SPRL_RAIL_DW = 0x801A4, + Z2SE_OBJ_STN_SPRL_RAIL_ST = 0x801A5, + Z2SE_OBJ_RL_SWD_LV = 0x801A6, + Z2SE_OBJ_RL_SWD_TRG = 0x801A7, + Z2SE_OBJ_SWD_FENCE_POP = 0x801A8, + Z2SE_OBJ_TOGE_SPIN = 0x801A9, + Z2SE_OBJ_RL_SW_WALL_ON = 0x801AA, + Z2SE_OBJ_RL_SW_WALL_OFF = 0x801AB, + Z2SE_OBJ_RL_SW_WALL_MV = 0x801AC, + Z2SE_OBJ_RL_SW_ELVTR_UP = 0x801AD, + Z2SE_OBJ_RL_SW_ELVTR_DW = 0x801AE, + Z2SE_OBJ_RL_SW_ELVTR_ON = 0x801AF, + Z2SE_OBJ_RL_SW_ELVTR_OFF = 0x801B0, + Z2SE_OBJ_HIDDEN_WALL_MV = 0x801B1, + Z2SE_OBJ_HIDDEN_WALL_ST = 0x801B2, + Z2SE_OBJ_POU_GATE_CL = 0x801B3, + Z2SE_OBJ_POU_GATE_OP = 0x801B4, + Z2SE_OBJ_FALL_STAIR = 0x801B5, + Z2SE_OBJ_STL_FENCE_UP = 0x801B6, + Z2SE_OBJ_STL_FENCE_DW = 0x801B7, + Z2SE_OBJ_LV4_CNDL_MISS = 0x801B8, + Z2SE_OBJ_CHANDELIER_SWING = 0x801B9, + Z2SE_OBJ_CHANDELIER_UP = 0x801BA, + Z2SE_OBJ_CHANDELIER_DW_TRG = 0x801BB, + Z2SE_OBJ_CHANDELIER_DW_LV = 0x801BC, + Z2SE_OBJ_SINK_FLOOR_DW = 0x801BD, + Z2SE_OBJ_SINK_FLOOR_UP = 0x801BE, + Z2SE_OBJ_SPNR_RAIL_ATRCT = 0x801BF, + Z2SE_OBJ_HEAVYSW_ON = 0x801C0, + Z2SE_OBJ_SPNR_GEAR_L = 0x801C1, + Z2SE_OBJ_POU_GATE_QUAKE = 0x801C2, + Z2SE_OBJ_RL_SW_ELVTR_OFF_TOP = 0x801C3, + Z2SE_OBJ_LV3_FLR_SW_ON = 0x801C4, + Z2SE_OBJ_LV3_FLR_SW_OFF = 0x801C5, + Z2SE_OBJ_BOSS_LOCK_OPEN_LV5 = 0x801C6, + Z2SE_OBJ_ICE_BREAK = 0x801C7, + Z2SE_OBJ_ICE_KEZURU = 0x801C8, + Z2SE_OBJ_CANNON_CHARGE = 0x801C9, + Z2SE_OBJ_CANNON_MOVE = 0x801CA, + Z2SE_OBJ_CANNON_STOP = 0x801CB, + Z2SE_OBJ_SPNR_SW_RL = 0x801CC, + Z2SE_OBJ_DOOR_STEEL_BAR_CL = 0x801CD, + Z2SE_OBJ_FIRE_TAKEN = 0x801CE, + Z2SE_OBJ_FIRE_EMERGE = 0x801CF, + Z2SE_OBJ_FIRE_FLY = 0x801D0, + Z2SE_OBJ_KNTR_BREAK = 0x801D1, + Z2SE_OBJ_IRONBLOCK_MOVE = 0x801D2, + Z2SE_OBJ_IRONBLOCK_STOP = 0x801D3, + Z2SE_OBJ_IRONBALL_HIT = 0x801D4, + Z2SE_OBJ_IRONBALL_HIT_SNOW = 0x801D5, + Z2SE_OBJ_IRONBALL_HIT_ICE = 0x801D6, + Z2SE_OBJ_ARMOR_SWING = 0x801D7, + Z2SE_OBJ_ARMOR_HIT = 0x801D8, + Z2SE_OBJ_ARMOR_BREAK = 0x801D9, + Z2SE_OBJ_CHANDLV5_HIT = 0x801DA, + Z2SE_OBJ_CHANDLV5_SWING = 0x801DB, + Z2SE_OBJ_BREAK_FLOOR = 0x801DC, + Z2SE_OBJ_IRONTRAY_SWITCH = 0x801DD, + Z2SE_OBJ_IRONTRAY_BALL = 0x801DE, + Z2SE_OBJ_IRONBLOCK_LAND = 0x801DF, + Z2SE_OBJ_DOOR_LOCK_OPEN = 0x801E0, + Z2SE_OBJ_TOGE_ROLL_MV = 0x801E1, + Z2SE_OBJ_L6_RL_SW_ON = 0x801E2, + Z2SE_OBJ_L6_RL_SW_OFF = 0x801E3, + Z2SE_OBJ_L6_RL_SW_MV = 0x801E4, + Z2SE_OBJ_L6_RL_FLR_MV = 0x801E5, + Z2SE_OBJ_L6_RL_FLR_ST = 0x801E6, + Z2SE_OBJ_L6_SW_GATE_OP_MV = 0x801E7, + Z2SE_OBJ_L6_SW_GATE_OP_ST = 0x801E8, + Z2SE_OBJ_L6_SW_GATE_CL_MV = 0x801E9, + Z2SE_OBJ_L6_SW_GATE_CL_ST = 0x801EA, + Z2SE_OBJ_L6_ELK_GATE_LV = 0x801EB, + Z2SE_OBJ_L6_ELK_GATE_TOUCH = 0x801EC, + Z2SE_OBJ_L6_MARIO_GATE_ON = 0x801ED, + Z2SE_OBJ_L6_MARIO_GATE_OFF = 0x801EE, + Z2SE_OBJ_L6_MARIO_GATE_MV = 0x801EF, + Z2SE_OBJ_L6_UD_BLOCK_UP = 0x801F0, + Z2SE_OBJ_L6_UD_BLOCK_UP_ST = 0x801F1, + Z2SE_OBJ_L6_UD_BLOCK_DW = 0x801F2, + Z2SE_OBJ_L6_UD_BLOCK_DW_ST = 0x801F3, + Z2SE_OBJ_L6_BALANCE_MV = 0x801F4, + Z2SE_OBJ_L6_BALANCE_ST = 0x801F5, + Z2SE_OBJ_L6_BLADE = 0x801F6, + Z2SE_OBJ_L6_WARP_DW_ST = 0x801F7, + Z2SE_OBJ_L6_WARP_UP_ST = 0x801F8, + Z2SE_OBJ_L6_WARP_LV = 0x801F9, + Z2SE_OBJ_L6_SW_GATE_ON = 0x801FA, + Z2SE_OBJ_L6_SW_GATE_OFF = 0x801FB, + Z2SE_OBJ_L6_SW_GATE_MV = 0x801FC, + Z2SE_OBJ_T_BOX_EMERGE = 0x801FD, + Z2SE_OBJ_BREAK_WOOD_FURNITURE = 0x801FE, + Z2SE_OBJ_KNOB_DOOR_LV5_OP = 0x801FF, + Z2SE_OBJ_KNOB_DOOR_LV5_CL = 0x80200, + Z2SE_OBJ_FLN_GATE_ATK = 0x80201, + Z2SE_OBJ_FLN_GATE_L_OP = 0x80202, + Z2SE_OBJ_FLN_GATE_CRK = 0x80203, + Z2SE_OBJ_NABE_BUBBLE = 0x80204, + Z2SE_OBJ_L8_L_BALL = 0x80205, + Z2SE_OBJ_L8_L_BALL_REVIVE = 0x80206, + Z2SE_OBJ_L8_L_BALL_BOUND = 0x80207, + Z2SE_OBJ_L8_STAIR_ON = 0x80208, + Z2SE_OBJ_L8_STAIR = 0x80209, + Z2SE_OBJ_L8_STAIR_OFF = 0x8020A, + Z2SE_OBJ_L8_STAIR_MV_UP = 0x8020B, + Z2SE_OBJ_L8_STAIR_MV_DW = 0x8020C, + Z2SE_OBJ_L8_STAIR_ST_UP = 0x8020D, + Z2SE_OBJ_L8_STAIR_ST_DW = 0x8020E, + Z2SE_OBJ_L8_L_BALL_SW_ON = 0x8020F, + Z2SE_OBJ_L8_L_BALL_SW = 0x80210, + Z2SE_OBJ_L8_L_BALL_SW_OFF = 0x80211, + Z2SE_OBJ_L8_L_TORCH_SW = 0x80212, + Z2SE_OBJ_L8_L_LIFT_ON = 0x80213, + Z2SE_OBJ_L8_L_LIFT_MV = 0x80214, + Z2SE_OBJ_L8_B_FOG_FLY = 0x80215, + Z2SE_OBJ_L8_B_FOG_STAY = 0x80216, + Z2SE_OBJ_L8_B_FALL_S = 0x80217, + Z2SE_OBJ_L8_B_FALL_L = 0x80218, + Z2SE_OBJ_L8_SHTR_OP = 0x80219, + Z2SE_OBJ_L8_SHTR_CL = 0x8021A, + Z2SE_OBJ_L8_SHTR_CREST_ON = 0x8021B, + Z2SE_OBJ_L8_SHTR_CREST_OFF = 0x8021C, + Z2SE_OBJ_L8_MBOSS_SHTR_OP = 0x8021D, + Z2SE_OBJ_L8_MBOSS_SHTR_CL = 0x8021E, + Z2SE_OBJ_TRAP_BREAK = 0x8021F, + Z2SE_OBJ_SPNR_SW_PUSH = 0x80220, + Z2SE_OBJ_L_SWD_DEMO = 0x80221, + Z2SE_GRZ_DOOR_CL = 0x80222, + Z2SE_OBJ_ZORA_STN_VANISH = 0x80223, + Z2SE_OBJ_CMN_ROCK_LIFT = 0x80224, + Z2SE_OBJ_CMN_ROCK_BREAK = 0x80225, + Z2SE_OBJ_CMN_ROCK_ROLL = 0x80226, + Z2SE_OBJ_CMN_ROCK_BOUND = 0x80227, + Z2SE_OBJ_CMN_ROCK_PUT = 0x80228, + Z2SE_OBJ_RIDER_GATE_ATK = 0x80229, + Z2SE_OBJ_RIDER_GATE_L_OP = 0x8022A, + Z2SE_OBJ_RIDER_GATE_CRK = 0x8022B, + Z2SE_OBJ_CMN_L_ROCK_LIFT = 0x8022C, + Z2SE_OBJ_CMN_L_ROCK_BREAK = 0x8022D, + Z2SE_OBJ_CMN_L_ROCK_ROLL = 0x8022E, + Z2SE_OBJ_CMN_L_ROCK_BOUND = 0x8022F, + Z2SE_OBJ_CMN_L_ROCK_PUT = 0x80230, + Z2SE_OBJ_ZORA_BOSEKI_MV = 0x80231, + Z2SE_OBJ_BK_DOOR_ATK_CL = 0x80232, + Z2SE_OBJ_BK_DOOR_ATK_OP = 0x80233, + Z2SE_OBJ_IGATE_ATK_CL = 0x80234, + Z2SE_OBJ_IGATE_ATK_OP = 0x80235, + Z2SE_OBJ_H_SAKU_ORERU = 0x80236, + Z2SE_OBJ_H_SAKU_BREAK = 0x80237, + Z2SE_OBJ_IMPAL_DOOR_OP = 0x80238, + Z2SE_OBJ_TCANNON_ACTION_LAKE = 0x80239, + Z2SE_OBJ_TCANNON_ACTION_L7 = 0x8023A, + Z2SE_OBJ_THOUSE_CLOSE = 0x8023B, + Z2SE_OBJ_THOUSE_CHANGE = 0x8023C, + Z2SE_OBJ_THOUSE_HLIGHT = 0x8023D, + Z2SE_OBJ_AMATA_ACTION = 0x8023E, + Z2SE_OBJ_AMATA_CRK = 0x8023F, + Z2SE_OBJ_KKRK_BRG_LIFT_UP = 0x80240, + Z2SE_OBJ_KKRK_BRG_WARP_IN = 0x80241, + Z2SE_OBJ_KKRK_BRG_WARP_OUT = 0x80242, + Z2SE_OBJ_KKRK_BRG_LIFT_DW = 0x80243, + Z2SE_OBJ_ORDN_BRG_LIFT_UP = 0x80244, + Z2SE_OBJ_ORDN_BRG_WARP_IN = 0x80245, + Z2SE_OBJ_ORDN_BRG_WARP_OUT = 0x80246, + Z2SE_OBJ_ORDN_BRG_LIFT_DW = 0x80247, + Z2SE_OBJ_TCANNON_LIFT_UP = 0x80248, + Z2SE_OBJ_TCANNON_WARP_IN = 0x80249, + Z2SE_OBJ_TCANNON_WARP_OUT = 0x8024A, + Z2SE_OBJ_VOLC_FALL = 0x8024B, + Z2SE_OBJ_VOLC_LIFT_UP = 0x8024C, + Z2SE_OBJ_VOLC_WARP_IN = 0x8024D, + Z2SE_OBJ_WOOD_STATUE_BOUND = 0x8024E, + Z2SE_OBJ_RG_ROCK_BREAK = 0x8024F, + Z2SE_OBJ_RG_ROCK_FALL = 0x80250, + Z2SE_OBJ_RG_ROCKPOLE_FALL = 0x80251, + Z2SE_OBJ_RG_ROCKPOLE_LAND = 0x80252, + Z2SE_OBJ_BLN_BREAK_S = 0x80253, + Z2SE_OBJ_BLN_BREAK_M = 0x80254, + Z2SE_OBJ_BLN_BREAK_L = 0x80255, + Z2SE_OBJ_TRAP_BREAK_STN = 0x80256, + Z2SE_OBJ_VOLC_WAIT = 0x80257, + Z2SE_OBJ_BURASWLV7_ON = 0x80258, + Z2SE_OBJ_BURASWLV7_OFF = 0x80259, + Z2SE_OBJ_FLR_FALL_START = 0x8025A, + Z2SE_OBJ_FLR_GURAGURA = 0x8025B, + Z2SE_OBJ_FLR_FALLING = 0x8025C, + Z2SE_OBJ_POLE_FALL_START = 0x8025D, + Z2SE_OBJ_POLE_FALLING = 0x8025E, + Z2SE_OBJ_BRDG_MOVE = 0x8025F, + Z2SE_OBJ_BRDG_STOP = 0x80260, + Z2SE_OBJ_FAN_ROLL_S = 0x80261, + Z2SE_OBJ_FAN_ROLL_M = 0x80262, + Z2SE_OBJ_FAN_ROLL_L = 0x80263, + Z2SE_OBJ_FAN_WIND_S = 0x80264, + Z2SE_OBJ_FAN_WIND_M = 0x80265, + Z2SE_OBJ_FAN_WIND_L = 0x80266, + Z2SE_OBJ_ONSEN_TARU_BRK = 0x80267, + Z2SE_OBJ_CRYSTAL_KRKR = 0x80268, + Z2SE_OBJ_THE_DOOR_CL = 0x80269, + Z2SE_OBJ_THE_DOOR_MV = 0x8026A, + Z2SE_OBJ_GZ_NE_DOOR_OP = 0x8026B, + Z2SE_OBJ_ONSEN_WARM_FIRE = 0x8026C, + Z2SE_OBJ_STAR_GAME_HIT_1 = 0x8026D, + Z2SE_OBJ_STAR_GAME_HIT_2 = 0x8026E, + Z2SE_OBJ_STAR_GAME_HIT_3 = 0x8026F, + Z2SE_OBJ_STAR_GAME_HIT_4 = 0x80270, + Z2SE_OBJ_STAR_GAME_HIT_5 = 0x80271, + Z2SE_OBJ_MR_SCRW_ON = 0x80272, + Z2SE_OBJ_MR_SCRW_MV = 0x80273, + Z2SE_OBJ_MR_SCRW_OFF = 0x80274, + Z2SE_OBJ_MR_CHIN = 0x80275, + Z2SE_OBJ_MR_TBLE = 0x80276, + Z2SE_OBJ_DARK_GATE_RIPPLE = 0x80277, + Z2SE_OBJ_DS_FIRE_CLMN = 0x80278, + Z2SE_OBJ_DS_CLMN_UP = 0x80279, + Z2SE_OBJ_DS_CLMN_UP_ST = 0x8027A, + Z2SE_OBJ_DS_H_FIRE = 0x8027B, + Z2SE_OBJ_DS_END_ZAN_SWD = 0x8027C, + Z2SE_OBJ_PO_TBOX = 0x8027D, + Z2SE_OBJ_AMI_ROLL = 0x8027E, + Z2SE_OBJ_MDN_ESCAPE_HOLE = 0x8027F, + Z2SE_OBJ_DS_END_BRG = 0x80280, + Z2SE_OBJ_VSHUTR = 0x80281, + Z2SE_OBJ_TOY_BONE_PUT = 0x80282, + Z2SE_OBJ_TOY_BONE_BOUND = 0x80283, + Z2SE_OBJ_KAGERI_MIRROR_GET = 0x80284, + Z2SE_OBJ_DS_END_BRG_ST = 0x80285, + Z2SE_OBJ_BOMB_ROCK_BRK_WTR_1 = 0x80286, + Z2SE_OBJ_BOMB_ROCK_BRK_WTR_2 = 0x80287, + Z2SE_OBJ_G_KABE_BRK = 0x80288, + Z2SE_OBJ_BH_HASHI_LV = 0x80289, + Z2SE_OBJ_BH_HASHI_TRG = 0x8028A, + Z2SE_OBJ_SEKI_TFORCE_ON = 0x8028D, + Z2SE_OBJ_SEKI_TILE_EMERGE = 0x8028E, + Z2SE_OBJ_SEKI_TILE_ON = 0x8028F, + Z2SE_OBJ_SEKI_TILE_ON_LAST = 0x80290, + Z2SE_OBJ_SEKI_DOOR_OP = 0x80291, + Z2SE_OBJ_KAKO_DOOR_OP_IN = 0x80292, + Z2SE_OBJ_KAKO_DOOR_OP_LIGHT = 0x80293, + Z2SE_OBJ_KAKO_DOOR_OP_OUT = 0x80294, + Z2SE_OBJ_LV6_GATE_STAIR = 0x80295, + Z2SE_OBJ_LV6_GATE_GLASS_ON = 0x80296, + Z2SE_OBJ_LV6_GATE_GLASS_OFF = 0x80297, + Z2SE_OBJ_MG_CANOE_TSUBO_BRK = 0x80298, + Z2SE_OBJ_WTR_STREAM = 0x80299, + Z2SE_OBJ_WTR_STREAM_S = 0x8029A, + Z2SE_OBJ_ZR_GRN_ROCK_GRGR = 0x8029B, + Z2SE_OBJ_ZR_GRN_ROCK_BRK = 0x8029C, + Z2SE_OBJ_CTL_ROCK_FALL = 0x8029D, + Z2SE_OBJ_PM_WALL_FADEAWAY = 0x8029E, + Z2SE_OBJ_KAKO_DOOR_LIGHT_RT = 0x8029F, + Z2SE_OBJ_MGN_BREAK_PILLAR = 0x802A0, + Z2SE_OBJ_LEAF_BEGIN_FALL = 0x802A1, + Z2SE_OBJ_LEAF_FALL_DOWN = 0x802A2, + Z2SE_OBJ_SNOW_SLIDE = 0x802A3, + Z2SE_OBJ_SEKI_DOOR_OP_ST = 0x802A6, + Z2SE_OBJ_SAMPLE_TSUBO_BRK = 0x802A7, + Z2SE_OBJ_SINK_FLOOR_DW_TRG = 0x802A8, + Z2SE_OBJ_GANON_BARRIER_APPR = 0x802A9, + Z2SE_OBJ_GANON_BARRIER = 0x802AA, + Z2SE_OBJ_ICICLE_FALL = 0x802AB, + Z2SE_OBJ_ICICLE_LAND = 0x802AC, + Z2SE_OBJ_ICICLE_BRK = 0x802AD, + Z2SE_OBJ_HASU_WTR = 0x802AE, + Z2SE_OBJ_NIOIMASU_BOUND = 0x802AF, + Z2SE_OBJ_YO_HEART_S = 0x802B0, + Z2SE_OBJ_YO_HEART_L = 0x802B1, + Z2SE_OBJ_GATE_LV9_OP = 0x802B2, + Z2SE_OBJ_GATE_LV9_STOP = 0x802B3, + Z2SE_OBJ_ROPE_PAINT_CUT = 0x802B4, + Z2SE_OBJ_ROPE_PAINT_LAND = 0x802B5, + Z2SE_OBJ_LV9_SHTR_OP = 0x802B6, + Z2SE_OBJ_LV9_SHTR_CL = 0x802B7, + Z2SE_OBJ_YAGURA_BREAK = 0x802B8, + Z2SE_OBJ_YAGURA_LAND = 0x802B9, + Z2SE_OBJ_SAKU_BREAK = 0x802BA, + Z2SE_OBJ_LV9_HOLE_LIGHTON = 0x802BB, + Z2SE_OBJ_CHANDLV9_SWING = 0x802BC, + Z2SE_OBJ_CHANDLV9_DOWN = 0x802BD, + Z2SE_OBJ_POU_SOUL_BREAK = 0x802BE, + Z2SE_OBJ_D13_FIRE_BURNING = 0x802BF, + Z2SE_OBJ_L6_WARP_COL = 0x802C0, + Z2SE_OBJ_CRVN_GATE_ATTACK = 0x802C1, + Z2SE_OBJ_CRVN_GATE_OPEN = 0x802C2, + Z2SE_OBJ_CRVN_GATE_CREAK = 0x802C3, + Z2SE_OBJ_CRVN_GATE_CLOSE = 0x802C4, + Z2SE_OBJ_CRVN_GATE_BREAK = 0x802C5, + Z2SE_OBJ_CRVN_URA_GATE = 0x802C6, + Z2SE_OBJ_CRVN_BURNING = 0x802C7, + Z2SE_OBJ_BURASWLV7_GRAB = 0x802C8, + Z2SE_OBJ_MONOLIS_HOLE = 0x802C9, + Z2SE_OBJ_MIRROR_STAIR_ON = 0x802CA, + Z2SE_OBJ_MIRROR_STAIR_OFF = 0x802CB, + Z2SE_OBJ_MIRROR_LIGHT = 0x802CC, + Z2SE_D30_MIRROR_HIBI = 0x802CD, + Z2SE_D30_MIRROR_HIKARI = 0x802CE, + Z2SE_D32_SWD_FLOAT = 0x802D0, + Z2SE_D32_SWD_FLY = 0x802D1, + Z2SE_D32_GND_CHAIN1 = 0x802D2, + Z2SE_D32_GND_CHAIN2 = 0x802D3, + Z2SE_D32_GND_SWD_OUT = 0x802D5, + Z2SE_D32_MIRROR_LIGHT_ON = 0x802D6, + Z2SE_D32_MONOLIS_ON = 0x802D7, + Z2SE_D32_MONOLIS_OFF = 0x802D8, + Z2SE_D34_VOLC_WARP_OUT = 0x802D9, + Z2SE_D34_VOLC_FALL = 0x802DA, + Z2SE_D34_VOLC_IMPACT = 0x802DB, + Z2SE_D34_JINARI = 0x802DC, + Z2SE_D34_WTR_FALL = 0x802DD, + Z2SE_D34_ICE_FALL = 0x802DE, + Z2SE_D25_MDN_STN_FLY = 0x802DF, + Z2SE_D26_CTL_BARRIER = 0x802E0, + Z2SE_D26_MDN_STN_OUT = 0x802E1, + Z2SE_D26_MDN_STN_UNITE = 0x802E2, + Z2SE_D26_MDN_STN_GGG = 0x802E3, + Z2SE_D26_SPEAR_EMERGE = 0x802E4, + Z2SE_D26_SPEAR_HOLE = 0x802E5, + Z2SE_D27_BLOCK_ON = 0x802E6, + Z2SE_D27_HZEL_TAKE_SWD = 0x802E7, + Z2SE_D27_BLOCK_OFF = 0x802E8, + Z2SE_D27_MDN_STN_OUT = 0x802E9, + Z2SE_D28_MDN_STN_OUT = 0x802EA, + Z2SE_D28_MDN_STN_UNITE = 0x802EC, + Z2SE_D28_MJN_TAKE_SPEAR = 0x802ED, + Z2SE_D28_JINARI = 0x802EE, + Z2SE_D28_HYL_CTL_BRK = 0x802EF, + Z2SE_D28_MDN_STN_BRK = 0x802F0, + Z2SE_D28_GEM_GATHER = 0x802F1, + Z2SE_OBJ_CMN_ROCK_ASASE = 0x802F2, + Z2SE_OBJ_CMN_ROCK_WTR = 0x802F3, + Z2SE_OBJ_CMN_ROCK_PUT_WTR = 0x802F4, + Z2SE_OBJ_MIRROR_LIGHT_S = 0x802F5, + Z2SE_D21_CTL_BARRIER = 0x802F6, + Z2SE_D22_SWD_LIGHT_1 = 0x802F7, + Z2SE_D22_SWD_LIGHT_2 = 0x802F8, + Z2SE_D22_STN_GATHER = 0x802F9, + Z2SE_D22_SWD_PULL_OUT_LIGHT = 0x802FA, + Z2SE_D22_FOG_OUT = 0x802FB, + Z2SE_D22_SWD_EDGE_LIGHT = 0x802FC, + Z2SE_D24_MIRROR_GATHER = 0x802FD, + Z2SE_D24_CHAIN_LIGHT = 0x802FE, + Z2SE_D24_MONOLIS_FALL = 0x802FF, + Z2SE_D24_MONOLIS_LIGHT = 0x80301, + Z2SE_D24_STN_OUT = 0x80302, + Z2SE_LIGHT_BOWL_AWAY = 0x80303, + Z2SE_D18_S1_FLY_1 = 0x80304, + Z2SE_D18_S2_FLY_1 = 0x80305, + Z2SE_D18_S3_FLY_1 = 0x80306, + Z2SE_D18_S1_FLY_2 = 0x80307, + Z2SE_D18_S2_FLY_2 = 0x80308, + Z2SE_D18_S3_FLY_2 = 0x80309, + Z2SE_D18_S1_FLY_3 = 0x8030A, + Z2SE_D18_S2_FLY_3 = 0x8030B, + Z2SE_D18_S3_FLY_3 = 0x8030C, + Z2SE_D18_S_COL = 0x8030D, + Z2SE_D18_KNIFE = 0x8030E, + Z2SE_D18_TF_BRIGHT = 0x80310, + Z2SE_D18_STN_APPEAR = 0x80311, + Z2SE_D18_STN_FALL = 0x80312, + Z2SE_D18_STN_DISAPPEAR = 0x80313, + Z2SE_D20_STN_TAKEN = 0x80314, + Z2SE_D20_GENKI_DAMA = 0x80316, + Z2SE_D20_I_STN_INTO = 0x80317, + Z2SE_D08_DOOR_OP = 0x80318, + Z2SE_D07_SMOKE_IN = 0x80319, + Z2SE_D07_Z_SWD_FALL = 0x8031A, + Z2SE_D07_CTL_SMOKE = 0x8031B, + Z2SE_D15_BANS_DOOR_OP = 0x8031C, + Z2SE_OBJ_HYRULE_BARRIER = 0x8031D, + Z2SE_D06_CHAIN_BRK = 0x8031E, + Z2SE_OBJ_HYRULE_DR_MOVE = 0x8031F, + Z2SE_OBJ_HYRULE_DR_STOP = 0x80320, + Z2SE_ENV_LAKEWATER = 0x90000, + Z2SE_ENV_FALL_LV1BOSS = 0x90001, + Z2SE_ENV_LAKE_OFFSHORE = 0x90002, + JA_SE_MAGMA_L = 0x90003, + JA_SE_MAGMA_R = 0x90004, + JA_SE_MAGMA_SR = 0x90005, + JA_SE_FIREBLAST_NOISE = 0x90006, + JA_SE_OBJ_WIND_TAG = 0x90007, + Z2SE_D27_STRONG_WIND = 0x90008, + Z2SE_ENV_FIELD_WIND_L = 0x90009, + Z2SE_ENV_VALLEY_WIND = 0x9000A, + JA_SE_ATM_WIND_1 = 0x9000B, + JA_SE_ATM_RAIN_START = 0x9000C, + JA_SE_ATM_RAIN_END = 0x9000D, + Z2SE_ENV_VOLCANO_SHAKE = 0x9000E, + Z2SE_ENV_FIELD_WIND_R = 0x9000F, + JA_SE_ATM_WIND_HOT = 0x90010, + Z2SE_ENV_QUICKSAND_LOOP = 0x90012, + Z2SE_ENV_SPIRIT_FALL = 0x90013, + Z2SE_ENV_ICED_VILLAGE_L = 0x90014, + Z2SE_ENV_ICED_VILLAGE_R = 0x90015, + Z2SE_ENV_WATERFALL_NORMAL = 0x90016, + Z2SE_ENV_WATERFALL_CALM = 0x90017, + Z2SE_ENV_RIVER_NORMAL = 0x90018, + Z2SE_ENV_RIVER_SMALL = 0x90019, + Z2SE_ENV_WINDTAG_STRONG = 0x9001A, + Z2SE_ENV_WINDTAG_SLOW = 0x9001B, + Z2SE_ENV_WINDTAG_CEASE = 0x9001C, + Z2SE_ENV_SEWER = 0x9001D, + Z2SE_ENV_SCENT_GRAVE = 0x9001E, + Z2SE_ENV_FOREST_DAY = 0x9001F, + Z2SE_ENV_FORESTWIND = 0x90020, + Z2SE_OBJ_L_BLOCK_LIGHT = 0x90021, + Z2SE_ENV_PUPPET_FOG_L = 0x90022, + Z2SE_ENV_PUPPET_FOG_R = 0x90023, + Z2SE_ENV_RAIN_NORMAL_L = 0x90024, + Z2SE_ENV_RAIN_NORMAL_R = 0x90025, + Z2SE_ENV_RAIN_ROOM = 0x90026, + Z2SE_ENV_SEWER_FILL = 0x90027, + Z2SE_ENV_SEWER_OUT = 0x90028, + Z2SE_ENV_THUNDER_FAR = 0x90029, + Z2SE_ENV_THUNDER_NEAR = 0x9002A, + Z2SE_ENV_THUND_FAR_WIN = 0x9002B, + Z2SE_ENV_THUND_NEAR_WIN = 0x9002C, + Z2SE_ENV_WIND_SARUDAN = 0x9002D, + Z2SE_ENV_SPIRIT_FOUNTAIN = 0x9002E, + Z2SE_ENV_RAIN_HARD_L = 0x9002F, + Z2SE_ENV_RAIN_HARD_R = 0x90030, + Z2SE_ENV_RAIN_HARD_ROOM = 0x90031, + Z2SE_ENV_SNOW_MT_WIND_L = 0x90032, + Z2SE_ENV_SNOW_MT_WIND_R = 0x90033, + Z2SE_ENV_SNOW_MT_WIND_ROOM = 0x90034, + Z2SE_ENV_FOG_WIPE = 0x90035, + Z2SE_ENV_WATER_WAY = 0x90036, + Z2SE_ENV_WATER_SURFACE = 0x90037, + Z2SE_ENV_DS_SAND = 0x90038, + Z2SE_ENV_SAND_FALL = 0x90039, + Z2SE_ENV_FILL_UP_LV3WTR1 = 0x9003A, + Z2SE_ENV_FILL_UP_LV3WTR2 = 0x9003B, + Z2SE_ENV_FILL_UP_LV3WTR3 = 0x9003C, + Z2SE_ENV_WATER_WAY_L = 0x9003D, + Z2SE_ENV_PEOPLE_CROWD = 0x9003E, + Z2SE_ENV_OUGI_FIELD_L = 0x9003F, + Z2SE_ENV_OUGI_FIELD_R = 0x90040, + Z2SE_D32_FIRE = 0x90041, + Z2SE_D32_WIND = 0x90042, + Z2SE_D28_SEIREI_SPACE = 0x90043, + Z2SE_D09_ENV_LIGHT_ON = 0x90044, + Z2SE_D11_ENV_LIGHT_ON = 0x90045, + Z2SE_D14_ENV_LIGHT_ON = 0x90046, + Z2SE_D18_ENV_LIGHT_ON = 0x90047, + Z2SE_D20_ENV_LIGHT_ON = 0x9004C, + Z2SE_D20_ENV_SHINE = 0x9004D, + Z2SE_D15_JINARI = 0x9004E +}; + #endif /* Z2SEMGR_H */ diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index 61032878081..d65c048ec00 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -1,6 +1,105 @@ #ifndef Z2SEQMGR_H #define Z2SEQMGR_H +#include "JSystem/JAudio2/JAISound.h" #include "dolphin/types.h" +// move TTransition / Z2SoundFader ? +struct TTransition { + /* 0x0 */ float field_0x0; + /* 0x4 */ float field_0x4; + /* 0x8 */ u32 mCount; +}; // Size = 0xC + +struct Z2SoundFader { + /* 0x0 */ float mIntensity; + /* 0x4 */ TTransition mTransition; +}; // Size = 0x10 + +class Z2SeqMgr { +public: + Z2SeqMgr(); + + void bgmStart(u32, u32, s32); + void bgmStop(u32, s32); + void subBgmStart(u32); + void subBgmStop(); + void subBgmStopInner(); + void bgmStreamPrepare(u32); + int bgmStreamCheckReady(); + void bgmStreamPlay(); + void bgmStreamStop(u32); + void changeBgmStatus(s32); + void changeSubBgmStatus(s32); + void onVariantBgmJumpEnd(bool); + void changeFishingBgm(s32); + void talkInBgm(); + void talkOutBgm(); + void menuInBgm(); + void menuOutBgm(); + void fanfareFramework(); + void stopWolfHowlSong(); + void setHeightVolMod(bool, u32); + void setTimeProcVolMod(bool, u32); + void processBgmFramework(); + void checkBgmIDPlaying(u32); + void getChildTrackVolume(JAISoundHandle*, int); + void setChildTrackVolume(JAISoundHandle*, int, float, u32, float, float); + void resetBattleBgmParams(); + void setBattleBgmOff(bool); + void setBattleSearched(bool); + void setBattleDistIgnore(bool); + void setBattleGhostMute(bool); + void setBattleDistState(u8); + void setBattleSeqState(u8); + void setBattleLastHit(u8); + void battleBgmFramework(); + void startBattleBgm(bool); + void stopBattleBgm(u8, u8); + void fieldBgmStart(); + void fieldRidingMute(); + void onFieldBgmJumpStart(); + void onFieldBgmJumpEnd(); + void fieldBgmFramework(); + void mbossBgmMuteProcess(); + void bgmSetSwordUsing(s32); + void bgmNowBattle(float); + void taktModeMute(); + void taktModeMuteOff(); + void setFieldBgmPlay(bool); + +private: + /* 0x00 */ JAISoundHandle mMainBgmHandle; + /* 0x04 */ JAISoundHandle mSubBgmHandle; + /* 0x08 */ JAISoundHandle field_0x08; + /* 0x0C */ JAISoundHandle field_0x0c; + /* 0x10 */ JAISoundID field_0x10; + /* 0x14 */ Z2SoundFader field_0x14; + /* 0x24 */ Z2SoundFader field_0x24; + /* 0x34 */ Z2SoundFader field_0x34; + /* 0x44 */ Z2SoundFader field_0x44; + /* 0x54 */ Z2SoundFader field_0x54; + /* 0x64 */ Z2SoundFader field_0x64; + /* 0x74 */ Z2SoundFader field_0x74; + /* 0x84 */ Z2SoundFader field_0x84; + /* 0x94 */ Z2SoundFader field_0x94; + /* 0xA4 */ Z2SoundFader field_0xa4; + /* 0xB4 */ float mTwilightGateVolume; + /* 0xB8 */ u16 field_0xb8; + /* 0xBA */ u8 field_0xba; + /* 0xBB */ u8 field_0xbb; + /* 0xBC */ u8 field_0xbc; + /* 0xBD */ u8 field_0xbd; + /* 0xBE */ u8 field_0xbe; + /* 0xBF */ u8 field_0xbf; + /* 0xC0 */ u8 field_0xc0; + /* 0xC1 */ u8 field_0xc1; + /* 0xC2 */ u8 field_0xc2; + /* 0xC3 */ u8 field_0xc3; + /* 0xC4 */ u8 field_0xc4; + /* 0xC8 */ float field_0xc8; + /* 0xCC */ float field_0xcc; + /* 0xD0 */ u8 mFlags; +}; // Size = 0xD4 + #endif /* Z2SEQMGR_H */ diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index 97d8ae98aa6..38bf2e91981 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -1,6 +1,39 @@ #ifndef Z2SOUNDOBJMGR_H #define Z2SOUNDOBJMGR_H +#include "JSystem/JSupport/JSUList.h" +#include "Z2AudioLib/Z2Creature.h" #include "dolphin/types.h" +class Z2SoundObjMgr : protected JSUList { +public: + Z2SoundObjMgr(); + void setForceBattleArea(bool, u16, u16, u16); + void searchEnemy(); + void setGhostEnemyState(u8); + void getEnemyID(char const*, JSULink*); + void setBattleInit(); + void checkBattleFinish(); + void deleteEnemyAll(); + void removeEnemy(JSULink*); + bool isTwilightBattle(); + + bool isForceBattle() { return mForceBattle; } + +private: + /* 0x0C */ u8 field_0xc[2]; + /* 0x0E */ u16 field_0xe; + /* 0x10 */ u16 field_0x10; + /* 0x12 */ u16 field_0x12; + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 mEnemyNumNear; + /* 0x16 */ u8 field_0x16; + /* 0x17 */ u8 mEnemyNumVeryFar; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 mGhostEnemyState; + /* 0x1A */ bool field_0x1a; + /* 0x1B */ bool mTwilightBattle; + /* 0x1C */ bool mForceBattle; +}; // Size = 0x20 + #endif /* Z2SOUNDOBJMGR_H */ diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 1e3a0abea18..f82b10cb6e7 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -23,23 +23,20 @@ struct Z2StatusMgr { //! @todo there are a number of inlines only called from rels: see CHN_debug - u8 mHour; - u8 mMinute; - u8 mWeekday; - u8 field_0x03; - s16 mTime; - u8 field_0x6[2]; - void* mEventBit; - bool mIsMenuIn; - u8 field_0xd[3]; - u32 mCameraMapInfo; - u32 field_0x14; - float mUnderwaterDepth; - float mCameraInWaterDepthRatio; - Vec mPolygonPosition; - u8 mDemoStatus; - u8 mHeartGaugeOn; - u8 padding[2]; -}; + /* 0x00 */ u8 mHour; + /* 0x01 */ u8 mMinute; + /* 0x02 */ u8 mWeekday; + /* 0x03 */ u8 field_0x03; + /* 0x04 */ s16 mTime; + /* 0x08 */ void* mEventBit; + /* 0x0C */ bool mIsMenuIn; + /* 0x10 */ u32 mCameraMapInfo; + /* 0x14 */ u32 field_0x14; + /* 0x18 */ float mUnderwaterDepth; + /* 0x1C */ float mCameraInWaterDepthRatio; + /* 0x20 */ Vec mPolygonPosition; + /* 0x2C */ u8 mDemoStatus; + /* 0x2D */ u8 mHeartGaugeOn; +}; // Size = 0x30 #endif /* Z2STATUSMGR_H */ diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 8aee3e817e9..45cbf2da370 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -2909,7 +2909,7 @@ public: private: /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0538 */ u8 field_0x538[0xD1C]; + /* 0x0570 */ u8 field_0x570[0xCE4]; /* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep; }; @@ -2932,7 +2932,7 @@ public: private: /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0538 */ u8 field_0x538[0x35C]; + /* 0x0570 */ u8 field_0x570[0x324]; /* 0x0894 */ u32 mStateFlg1; /* 0x0898 */ u32 mEndResetStateFlg0; }; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index deed7b2ec86..f48328e34c0 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -126,9 +126,6 @@ private: class daPy_py_c : public fopAc_ac_c { public: - /* 0x0538 */ u8 field_0x538[0x32]; - /* 0x056A */ u8 field_0x56a; - /* 0x056B */ u8 field_0x56b[5]; /* 0x0570 */ int mNoResetFlg0; /* 0x0574 */ int mNoResetFlg1; /* 0x0578 */ int mNoResetFlg2; @@ -390,7 +387,7 @@ public: inline bool getSumouCameraMode() const { bool sumouCameraMode = false; - if (field_0x56a != 0 && field_0x56a < 0x26) { + if (field_0x560[0xA] != 0 && field_0x560[0xA] < 0x26) { sumouCameraMode = true; } return sumouCameraMode; diff --git a/include/d/bg/d_bg_s_lin_chk.h b/include/d/bg/d_bg_s_lin_chk.h index 6edea1d3e6f..33029a5acbc 100644 --- a/include/d/bg/d_bg_s_lin_chk.h +++ b/include/d/bg/d_bg_s_lin_chk.h @@ -43,4 +43,9 @@ class dBgS_ObjLinChk : dBgS_LinChk { /* 80077FB8 */ ~dBgS_ObjLinChk(); }; +class dBgS_BombLinChk : dBgS_LinChk { + /* 80078104 */ dBgS_BombLinChk(); + /* 80078160 */ ~dBgS_BombLinChk(); +}; + #endif /* D_BG_D_BG_S_LIN_CHK_H */ diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index ea562093b8e..df531283ce2 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -137,9 +137,7 @@ public: /* 0x03F8C */ dStage_roomControl_c* mRoomControl; /* 0x03F90 */ dEvt_control_c mEvent; /* 0x040C0 */ dEvent_manager_c mEvtManager; - /* 0x0477C */ u8 field_0x477C[4]; /* 0x04780 */ dAttention_c mAttention; - /* 0x04C88 */ u8 field_0x4c88[0x14]; /* 0x04C9C */ dVibration_c mVibration; /* 0x04D2C */ u8 field_0x4d2c[4]; /* 0x04D30 */ JKRArchive* mFieldMapArchive2; @@ -258,18 +256,18 @@ public: /* 0x04F07 */ u8 mCStickStatusForce; /* 0x04F08 */ u8 mSButtonStatusForce; /* 0x04F09 */ u8 mZStatusForce; - /* 0x04F0A */ u8 mRSetFlag; // related to RStatus - /* 0x04F0B */ u8 mASetFlag; // related to AStatus + /* 0x04F0A */ u8 mRSetFlag; + /* 0x04F0B */ u8 mASetFlag; /* 0x04F0C */ u8 field_0x4f0c; - /* 0x04F0D */ u8 mNunSetFlag; // related to NunStatus - /* 0x04F0E */ u8 mBottleSetFlag; // related to BottleStatus - /* 0x04F0F */ u8 mRemoConSetFlag; // related to RemoConStatus + /* 0x04F0D */ u8 mNunSetFlag; + /* 0x04F0E */ u8 mBottleSetFlag; + /* 0x04F0F */ u8 mRemoConSetFlag; /* 0x04F10 */ u8 field_0x4f10[2]; - /* 0x04F12 */ u8 mDoSetFlag; // related to DoStatus - /* 0x04F13 */ u8 m3DSetFlag; // related to 3DStatus - /* 0x04F14 */ u8 mCStickSetFlag; // related to CStickStatus - /* 0x04F15 */ u8 mSButtonSetFlag; // related to SButtonStatus - /* 0x04F16 */ u8 mZSetFlag; // related to ZStatus + /* 0x04F12 */ u8 mDoSetFlag; + /* 0x04F13 */ u8 m3DSetFlag; + /* 0x04F14 */ u8 mCStickSetFlag; + /* 0x04F15 */ u8 mSButtonSetFlag; + /* 0x04F16 */ u8 mZSetFlag; /* 0x04F17 */ u8 mRSetFlagForce; /* 0x04F18 */ u8 mASetFlagForce; /* 0x04F19 */ u8 field_0x4f19; @@ -288,14 +286,14 @@ public: /* 0x04F27 */ u8 mXSetFlagForce; /* 0x04F28 */ u8 mYStatus; /* 0x04F29 */ u8 mYStatusForce; - /* 0x04F2A */ u8 mYSetFlag; // related to YStatus + /* 0x04F2A */ u8 mYSetFlag; /* 0x04F2B */ u8 mYSetFlagForce; /* 0x04F2C */ u8 mNunZStatus; - /* 0x04F2D */ u8 mNunZSetFlag; // related to NunZStatus + /* 0x04F2D */ u8 mNunZSetFlag; /* 0x04F2E */ u8 field_0x4fc6; // related to NunZStatusForce /* 0x04F2F */ u8 field_0x4fc7; // related to NunZStatusForce /* 0x04F30 */ u8 mNunCStatus; - /* 0x04F31 */ u8 mNunCSetFlag; // related to NunCStatus + /* 0x04F31 */ u8 mNunCSetFlag; /* 0x04F32 */ u8 field_0x4fca; // related to NunCStatusForce /* 0x04F33 */ u8 field_0x4fcb; // related to NunCStatusForce /* 0x04F34 */ u8 mSelectItem[8]; diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 2690ea3a7ef..3cc89e0a454 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -25,10 +25,10 @@ private: class dAttCatch_c { public: - /* 8007398C */ void convPId(unsigned int); - /* 800739BC */ void init(); - /* 800739DC */ void proc(); - /* 80073A08 */ void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); + void convPId(unsigned int); + void init(); + void proc(); + void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); private: void* field_0x0; @@ -38,8 +38,9 @@ private: u8 field_0xd; u8 field_0xe; u8 field_0xf; - void* field_0x10; -}; + u32 field_0x10; + u8 mChangeItem; +}; // Size = 0x14 class dAttParam_c { public: @@ -47,26 +48,29 @@ public: /* 80070110 */ ~dAttParam_c(); private: - u8 field_0x0; - u8 field_0x1; - u8 field_0x2; - u8 field_0x3; - u8 field_0x4; - u8 field_0x5; - u8 field_0x6; - u8 field_0x7; - u8 field_0x8; - u8 field_0x9; - u8 field_0xa; - u8 field_0xb; - u8 field_0xc; - u8 field_0xd; - u8 field_0xe; - u8 field_0xf; - u8 field_0x10; - u8 field_0x11; - u8 field_0x12; -}; + /* 0x00 */ void* vtable; + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u16 mFlag; + /* 0x08 */ float field_0x8; + /* 0x0C */ float field_0xc; + /* 0x10 */ float field_0x10; + /* 0x14 */ float field_0x14; + /* 0x18 */ float field_0x18; + /* 0x1C */ float field_0x1c; + /* 0x20 */ float field_0x20; + /* 0x24 */ float field_0x24; + /* 0x28 */ float field_0x28; + /* 0x2C */ float field_0x2c; + /* 0x30 */ float field_0x30; + /* 0x34 */ float field_0x34; + /* 0x38 */ u8 field_0x38; + /* 0x39 */ u8 field_0x39; + /* 0x3C */ float field_0x3c; + /* 0x40 */ float field_0x40; + /* 0x44 */ u32 field_0x44; + /* 0x48 */ u32 field_0x48; +}; // Size = 0x4C class dAttLook_c { public: @@ -79,7 +83,8 @@ private: u32 field_0x0; u32 field_0x4; float field_0x8; -}; + u32 field_0xc; +}; // Size = 0x10 #pragma pack(push, 1) class dAttList_c { @@ -96,7 +101,6 @@ private: }; #pragma pack(pop) -#pragma pack(push, 1) class dAttDraw_c { public: /* 8003054C */ ~dAttDraw_c(); @@ -123,7 +127,7 @@ public: /* 0x11C */ mDoExt_bpkAnm bpkAnm2; /* 0x134 */ mDoExt_brkAnm brkAnm3; /* 0x14C */ mDoExt_btkAnm btkAnm2; - /* 0x164 */ u8 field_0x164[0xC]; + /* 0x164 */ cXyz field_0x164; /* 0x170 */ u8 field_0x170; /* 0x171 */ u8 field_0x171; /* 0x172 */ u8 field_0x172; @@ -131,7 +135,6 @@ public: /* 0x174 */ u8 field_0x174; /* 0x175 */ u8 field_0x175; }; -#pragma pack(pop) class dAttDraw_CallBack_c { public: @@ -187,58 +190,53 @@ public: static u32 chk_type_tbl; static u32 chk_type_num; -private: - u8 field_0x0[4]; - u32 field_0x4; - dAttDraw_CallBack_c dattdraw_callback; - u32 field_0xc; - u32 field_0x10; - u8 field_0x14[8]; - cXyz field_0x1c; - /* 0x028 */ dAttDraw_c attention_draw[2]; - int field_0x318; - cXyz field_0x31c; - u8 field_0x328[12]; - u32 field_0x334; - /* 0x0338 */ dAttList_c attention_list1[8]; - int* field_0x3d8; - int* field_0x3dc; - /* 0x03E0 */ dAttList_c attention_list2[4]; - int* field_0x430; - int field_0x434; - /* 0x0438 */ dAttList_c attention_list3[4]; - int* field_0x488; - int field_0x48c; - dAttHint_c attention_hint; - dAttCatch_c attention_catch; - u8 field_0x4b0[4]; - dAttLook_c attention_look; - u8 field_0x4c0; - u8 field_0x4c1; - u8 field_0x4c2; - u8 field_0x4c3; - int* field_0x4c4; - u8 field_0x4c8; - u8 field_0x4c9; - u8 field_0x4ca; - u8 field_0x4cb; - u8 field_0x4cc; - u8 field_0x4cd; - u8 field_0x4ce; - u8 field_0x4cf; - /* 0x04D0 */ dAttParam_c attention_param; - u8 field_0x4e3; - u8 field_0x4e4; - u8 field_0x4e5; - int* field_0x4e6; - u8 field_0x4ea; - u8 field_0x4eb; - u8 field_0x4ec; - u8 field_0x4ed; - u8 field_0x4ee; - u8 field_0x4ef; - u8 field_0x4f0[0x18]; - /* 0x0508 */ void* vtable; -}; +public: + /* 0x000 */ fopAc_ac_c* field_0x0; + /* 0x004 */ u32 field_0x4; + /* 0x008 */ dAttDraw_CallBack_c dattdraw_callback; + /* 0x00C */ u32 field_0xc; + /* 0x010 */ u32 field_0x10; + /* 0x014 */ u8 field_0x14[4]; + /* 0x018 */ JKRSolidHeap* heap; + /* 0x01C */ cXyz field_0x1c; + /* 0x028 */ dAttDraw_c draw[2]; + /* 0x318 */ int field_0x318; + /* 0x31C */ cXyz field_0x31c; + /* 0x328 */ u8 field_0x328; + /* 0x329 */ u8 field_0x329; + /* 0x32A */ u8 field_0x32a; + /* 0x32B */ u8 field_0x32b; + /* 0x32C */ u8 field_0x32c; + /* 0x32D */ u8 field_0x32d; + /* 0x32E */ u8 field_0x32e; + /* 0x32F */ u8 field_0x32f; + /* 0x330 */ u8 field_0x330; + /* 0x331 */ u8 field_0x331; + /* 0x332 */ u8 field_0x332; + /* 0x333 */ u8 field_0x333; + /* 0x334 */ u32 mFlags; + /* 0x338 */ dAttList_c mLockOnList[8]; + /* 0x3D8 */ int mLockonCount; + /* 0x3DC */ int field_0x3dc; + /* 0x3E0 */ dAttList_c mActionList[4]; + /* 0x430 */ int mActionCount; + /* 0x434 */ int field_0x434; + /* 0x438 */ dAttList_c attention_list3[4]; + /* 0x488 */ int mCheckObjectCount; + /* 0x48C */ int field_0x48c; + /* 0x490 */ dAttHint_c mZHintTarget; + /* 0x49C */ dAttCatch_c mCatghTarget; + /* 0x4B4 */ dAttLook_c mLookTarget; + /* 0x4C4 */ int field_0x4c4; + /* 0x4C8 */ u8 field_0x4c8; + /* 0x4C9 */ u8 field_0x4c9; + /* 0x4CA */ u8 field_0x4ca; + /* 0x4CB */ u8 field_0x4cb; + /* 0x4CC */ u8 field_0x4cc; + /* 0x4CD */ u8 field_0x4cd; + /* 0x4CE */ u8 field_0x4ce; + /* 0x4CF */ u8 field_0x4cf; + /* 0x4D0 */ dAttParam_c attention_param; +}; // Size = 0x51C #endif /* D_D_ATTENTION_H */ diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 07668ee3b01..b021b0a4119 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -1,6 +1,46 @@ #ifndef D_D_BOMB_H #define D_D_BOMB_H -#include "dolphin/types.h" +#include "Z2AudioLib/Z2SoundObject.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" +#include "d/kankyo/d_kankyo.h" +#include "f_op/f_op_actor.h" + +class daNbomb_c { +public: + enum daNbomb_FLG0 { WATER_BOMB = 16 }; + + u32 checkStateFlg0(daNbomb_FLG0 flag) const { return mStateFlg0 & flag; } + u32 checkWaterBomb() const { return checkStateFlg0(WATER_BOMB); } + + /* 0x000 */ fopAc_ac_c mActor; + /* 0x570 */ u8 field_0x570[8]; + /* 0x578 */ dBgS_Acch mAcch; + /* 0x750 */ dBgS_AcchCir mAcchCir; + /* 0x790 */ dCcD_Stts mStts; + /* 0x7CC */ dCcD_Sph mSph1; + /* 0x904 */ dCcD_Sph mSph2; + /* 0xA3C */ u8 field_0xa3c[0x64]; + /* 0xAA0 */ dBgS_BombLinChk mLinChk; + /* 0xB10 */ cBgS_PolyInfo mPolyInfo; + /* 0xB20 */ Z2SoundObjSimple mSoundObj; + /* 0xB40 */ u8 field_0xb40[0xC]; + /* 0xB4C */ u32 mStateFlg0; + /* 0xB50 */ u8 field_0xb50; + /* 0xB51 */ u8 field_0xb51[0x3]; + /* 0xB54 */ u8 field_0xb54; + /* 0xB55 */ u8 field_0xb55[0xB]; + /* 0xB60 */ LIGHT_INFLUENCE field_0xb60; + /* 0xB80 */ WIND_INFLUENCE field_0xb80; +}; + +class dBomb_c : public daNbomb_c { +public: + bool checkStateCarry(); + bool checkFlowerBombWait(fopAc_ac_c*); + bool checkWaterBomb(fopAc_ac_c*); + bool checkInsectBombMove(fopAc_ac_c*); +}; #endif /* D_D_BOMB_H */ diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index a340444041c..2b88c55ed34 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -8,6 +8,8 @@ class dJntColData_c {}; +class fopAc_ac_c; + class dJntCol_c { public: /* 80035C8C */ dJntCol_c(); diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index e42af8ecebc..c02ed580c35 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -4,275 +4,94 @@ #include "d/a/d_a_itembase.h" #include "d/a/d_a_player.h" #include "d/d_stage.h" +#include "d/event/d_event_manager.h" #include "d/save/d_save.h" #include "dolphin/types.h" -#pragma pack(push, 1) class dEvt_order_c { public: - /* 80030154 */ ~dEvt_order_c(); - /* 800415D4 */ dEvt_order_c(); + ~dEvt_order_c(); + dEvt_order_c(); -private: - u8 field_0x0; - u8 field_0x1; - u8 field_0x2; - u8 field_0x3; - u8 field_0x4; - u8 field_0x5; - u8 field_0x6; - u8 field_0x7; - u8 field_0x8; - u8 field_0x9; - u8 field_0xa; - u8 field_0xb; - u8 field_0xc; - u8 field_0xd; - u8 field_0xe; - u8 field_0xf; - u8 field_0x10; - u8 field_0x11; - u8 field_0x12; - u8 field_0x13; - u8 field_0x14; - u8 field_0x15; - u8 field_0x16; - u8 field_0x17; - u8 field_0x18; - u8 field_0x19; - u8 field_0x1a; - u8 field_0x1b; - u8 field_0x1c; - u8 field_0x1d; - u8 field_0x1e; - u8 field_0x1f; - u8 field_0x20; - u8 field_0x21; - u8 field_0x22; - u8 field_0x23; - u8 field_0x24; - u8 field_0x25; - u8 field_0x26; - u8 field_0x27; - u8 field_0x28; - u8 field_0x29; - u8 field_0x2a; - u8 field_0x2b; - u8 field_0x2c; - u8 field_0x2d; - u8 field_0x2e; - u8 field_0x2f; - u8 field_0x30; - u8 field_0x31; - u8 field_0x32; - u8 field_0x33; - u8 field_0x34; - u8 field_0x35; - u8 field_0x36; - u8 field_0x37; - u8 field_0x38; - u8 field_0x39; - u8 field_0x3a; - u8 field_0x3b; - u8 field_0x3c; - u8 field_0x3d; - u8 field_0x3e; - u8 field_0x3f; - u8 field_0x40; - u8 field_0x41; - u8 field_0x42; - u8 field_0x43; - u8 field_0x44; - u8 field_0x45; - u8 field_0x46; - u8 field_0x47; - u8 field_0x48; - u8 field_0x49; - u8 field_0x4a; - u8 field_0x4b; - u8 field_0x4c; - u8 field_0x4d; - u8 field_0x4e; - u8 field_0x4f; - u8 field_0x50; - u8 field_0x51; - u8 field_0x52; - u8 field_0x53; - u8 field_0x54; - u8 field_0x55; - u8 field_0x56; - u8 field_0x57; - u8 field_0x58; - u8 field_0x59; - u8 field_0x5a; - u8 field_0x5b; - u8 field_0x5c; - u8 field_0x5d; - u8 field_0x5e; - u8 field_0x5f; - u8 field_0x60; - u8 field_0x61; - u8 field_0x62; - u8 field_0x63; - u8 field_0x64; - u8 field_0x65; - u8 field_0x66; - u8 field_0x67; - u8 field_0x68; - u8 field_0x69; - u8 field_0x6a; - u8 field_0x6b; - u8 field_0x6c; - u8 field_0x6d; - u8 field_0x6e; - u8 field_0x6f; - u8 field_0x70; - u8 field_0x71; - u8 field_0x72; - u8 field_0x73; - u8 field_0x74; - u8 field_0x75; - u8 field_0x76; - u8 field_0x77; - u8 field_0x78; - u8 field_0x79; - u8 field_0x7a; - u8 field_0x7b; - u8 field_0x7c; - u8 field_0x7d; - u8 field_0x7e; - u8 field_0x7f; - u8 field_0x80; - u8 field_0x81; - u8 field_0x82; - u8 field_0x83; - u8 field_0x84; - u8 field_0x85; - u8 field_0x86; - u8 field_0x87; - u8 field_0x88; - u8 field_0x89; - u8 field_0x8a; - u8 field_0x8b; - u8 field_0x8c; - u8 field_0x8d; - u8 field_0x8e; - u8 field_0x8f; - u8 field_0x90; - u8 field_0x91; - u8 field_0x92; - u8 field_0x93; - u8 field_0x94; - u8 field_0x95; - u8 field_0x96; - u8 field_0x97; - u8 field_0x98; - u8 field_0x99; - u8 field_0x9a; - u8 field_0x9b; - u8 field_0x9c; - u8 field_0x9d; - u8 field_0x9e; - u8 field_0x9f; - u8 field_0xa0; - u8 field_0xa1; - u8 field_0xa2; - u8 field_0xa3; - u8 field_0xa4; - u8 field_0xa5; - u8 field_0xa6; - u8 field_0xa7; - u8 field_0xa8; - u8 field_0xa9; - u8 field_0xaa; - u8 field_0xab; - u8 field_0xac; - u8 field_0xad; - u8 field_0xae; - u8 field_0xaf; - u8 field_0xb0; - u8 field_0xb1; - u8 field_0xb2; - u8 field_0xb3; - u8 field_0xb4; - u8 field_0xb5; - u8 field_0xb6; - u8 field_0xb7; - u8 field_0xb8; - u8 field_0xb9; - u8 field_0xba; - u8 field_0xbb; - u8 field_0xbc; - u8 field_0xbd; - u8 field_0xbe; -}; -#pragma pack(pop) + /* 0x00 */ u16 mEventType; + /* 0x02 */ u16 mFlag; + /* 0x04 */ s16 field_0x04; + /* 0x08 */ fopAc_ac_c* mActor1; + /* 0x0C */ fopAc_ac_c* mActor2; + /* 0x10 */ s16 mEventId; + /* 0x12 */ s16 mPriority; + /* 0x14 */ u8 mNextOrderIdx; + /* 0x15 */ u8 mEventInfoIdx; +}; // Size = 0x18 + +typedef int (*SkipFunc)(void*, int); -#pragma pack(push, 1) class dEvt_control_c { public: - /* 80041580 */ dEvt_control_c(); - /* 800415D8 */ void orderOld(u16, u16, u16, u16, void*, void*, void const*); - /* 80041668 */ void order(u16, u16, u16, u16, void*, void*, s16, u8); - /* 80041804 */ void setParam(dEvt_order_c*); - /* 80041934 */ void beforeFlagProc(dEvt_order_c*); - /* 80041964 */ void afterFlagProc(dEvt_order_c*); - /* 800419A8 */ void commonCheck(dEvt_order_c*, u16, u16); - /* 80041A20 */ void talkCheck(dEvt_order_c*); - /* 80041B58 */ void talkXyCheck(dEvt_order_c*); - /* 80041C90 */ void catchCheck(dEvt_order_c*); - /* 80041D34 */ void talkEnd(); - /* 80041DDC */ void demoCheck(dEvt_order_c*); - /* 80041F18 */ void demoEnd(); - /* 80041FA0 */ void potentialCheck(dEvt_order_c*); - /* 80042014 */ void doorCheck(dEvt_order_c*); - /* 8004212C */ void itemCheck(dEvt_order_c*); - /* 800421C0 */ void endProc(); - /* 80042254 */ void change(); - /* 800422C0 */ void entry(); - /* 80042518 */ void reset(void*); - /* 80042468 */ void reset(); - /* 800425B4 */ void clearSkipSystem(); - /* 8004290C */ void getSkipEventName(); - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 80042958 */ void setSkipZev(void*, char*); - /* 800429A8 */ void onSkipFade(); - /* 800429B4 */ void offSkipFade(); - /* 800429D4 */ void skipper(); - /* 80042BBC */ void Step(); - /* 80042FA8 */ void moveApproval(void*); - /* 8004316C */ void compulsory(void*, char const*, u16); - /* 800431E8 */ void remove(); - /* 80043278 */ void getStageEventDt(); - /* 80043280 */ void sceneChange(int); - /* 800432C8 */ void getPId(void*); - /* 800432EC */ void convPId(unsigned int); - /* 8004331C */ void getStbDemoData(char*); - /* 80043500 */ void searchMapEventData(u8, s32); - /* 800434D8 */ void searchMapEventData(u8); - /* 8004360C */ void runningEventID(s16); - /* 8004362C */ void setPt1(void*); - /* 8004365C */ void setPt2(void*); - /* 8004368C */ void setPtT(void*); - /* 800436BC */ void setPtI(void*); - /* 800436EC */ void setPtI_Id(unsigned int); - /* 800436F4 */ void setPtD(void*); - /* 80043724 */ void setGtItm(u8); + dEvt_control_c(); + void orderOld(u16, u16, u16, u16, void*, void*, void const*); + void order(u16, u16, u16, u16, void*, void*, s16, u8); + void setParam(dEvt_order_c*); + s32 beforeFlagProc(dEvt_order_c*); + void afterFlagProc(dEvt_order_c*); + void commonCheck(dEvt_order_c*, u16, u16); + void talkCheck(dEvt_order_c*); + void talkXyCheck(dEvt_order_c*); + void catchCheck(dEvt_order_c*); + void talkEnd(); + void demoCheck(dEvt_order_c*); + void demoEnd(); + s32 potentialCheck(dEvt_order_c*); + void doorCheck(dEvt_order_c*); + void itemCheck(dEvt_order_c*); + void endProc(); + void change(); + void entry(); + void reset(void*); + void reset(); + void clearSkipSystem(); + char* getSkipEventName(); + void setSkipProc(void*, SkipFunc, int); + void setSkipZev(void*, char*); + void onSkipFade(); + void offSkipFade(); + void skipper(); + void Step(); + void moveApproval(void*); + void compulsory(void*, char const*, u16); + void remove(); + void* getStageEventDt(); // ret type probably wrong, fix later + void sceneChange(int); + u32 getPId(void*); + void convPId(unsigned int); + void getStbDemoData(char*); + void searchMapEventData(u8, s32); + void searchMapEventData(u8); + s16 runningEventID(s16); + void setPt1(void*); + void setPt2(void*); + void setPtT(void*); + void setPtI(void*); + void setPtI_Id(unsigned int); + void setPtD(void*); + void setGtItm(u8); -private: + u16 chkFlag2(u16 flag) { return flag & mFlag2; } + +public: /* 0x000 */ u8 field_0x0[4]; - /* 0x004 */ dEvt_order_c event_order; - /* 0x0C4 */ int mPt1; - /* 0x0C8 */ int mPt2; - /* 0x0CC */ int mPtT; - /* 0x0D0 */ int mPtI; - /* 0x0D4 */ int mPtd; + /* 0x004 */ dEvt_order_c mOrder[8]; + /* 0x0C4 */ u32 mPt1; + /* 0x0C8 */ u32 mPt2; + /* 0x0CC */ u32 mPtT; + /* 0x0D0 */ u32 mPtI; + /* 0x0D4 */ u32 mPtd; /* 0x0D8 */ u16 mEventFlag; /* 0x0DA */ u16 mFlag2; /* 0x0DC */ u16 mHindFlag; - /* 0x0DE */ u16 field_0xde; - /* 0x0E0 */ u16 field_0xe0; - /* 0x0E2 */ u8 field_0xe2; + /* 0x0DE */ s16 mSpecifiedEvent; // name maybe wrong + /* 0x0E0 */ s16 field_0xe0; + /* 0x0E2 */ u8 mNum; /* 0x0E3 */ u8 field_0xe3; /* 0x0E4 */ u8 mMode; /* 0x0E5 */ u8 field_0xe5; @@ -287,15 +106,18 @@ private: /* 0x0EE */ u8 mPreItemNo; /* 0x0EF */ u8 mGtItm; /* 0x0F0 */ float mCullRate; - /* 0x0F4 */ int mStageEventDt; - /* 0x0F8 */ int mChangeOK; - /* 0x0FC */ u8 field_0xfc[20]; - /* 0x110 */ bool mSkipFade; - /* 0x114 */ char mSkipEventName[0x14]; + /* 0x0F4 */ void* mStageEventDt; + /* 0x0F8 */ void* mChangeOK; + /* 0x0FC */ u8 field_0xfc[4]; + /* 0x100 */ SkipFunc mSkipFunc; + /* 0x104 */ u32 field_0x104; + /* 0x108 */ u32 field_0x108; + /* 0x10C */ u32 field_0x10c; + /* 0x110 */ int mSkipFade; + /* 0x114 */ char mSkipEventName[20]; /* 0x128 */ u8 mCompulsory; - /* 0x129 */ u8 field_0x129; + /* 0x129 */ bool field_0x129; /* 0x12C */ int field_0x12c; -}; -#pragma pack(pop) +}; // Size = 0x130 #endif /* D_EVENT_D_EVENT_H */ diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index 8a6e6d4f58a..f09499c8260 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -5,59 +5,111 @@ #include "d/save/d_save.h" #include "dolphin/types.h" -struct dEvDtStaff_c { - /* 80043FD8 */ void specialProc_WaitStart(int); - /* 8004403C */ void specialProc_WaitProc(int); - /* 80044080 */ void specialProc(); - /* 80044134 */ void init(); - /* 80044170 */ void advanceCut(int); - /* 80044190 */ void specialProcLight(); - /* 80044324 */ void specialProcMessage(); - /* 80044A58 */ void specialProcSound(); - /* 80044CB8 */ void specialProcCreate(); - /* 80044EE4 */ void specialProcDirector(); - /* 80045878 */ void specialProcPackage(); - /* 80045AFC */ void specialProcTimekeeper(); - /* 80045C34 */ void specialProcEffect(); +struct event_binary_data_header {}; + +struct dEvDtData_c {}; + +class dEvDtCut_c { +public: + void startCheck(); + +private: + /* 0x00 */ u8 field_0x0[0x20]; + /* 0x20 */ u32 mTagID; + /* 0x28 */ int field_0x28[3]; + /* 0x34 */ u32 mFlagId; + /* 0x38 */ u32 mDataTop; + /* 0x3C */ u32 mNext; }; -struct dEvDtEvent_c { - /* 80043E78 */ void finishCheck(); - /* 80043EFC */ void forceFinish(); - /* 80043F70 */ void specialStaffProc(dEvDtStaff_c*); +class dEvDtStaff_c { +public: + void specialProc_WaitStart(int); + void specialProc_WaitProc(int); + void specialProc(); + void init(); + void advanceCut(int); + void specialProcLight(); + void specialProcMessage(); + void specialProcSound(); + void specialProcCreate(); + void specialProcDirector(); + void specialProcPackage(); + void specialProcTimekeeper(); + void specialProcEffect(); + +private: + /* 0x00 */ u8 field_0x00[4]; + /* 0x04 */ void* field_0x04; + /* 0x08 */ u32 field_0x08; + /* 0x0C */ int field_0x0c; + /* 0x10 */ u32 field_0x10; + /* 0x14 */ u8 field_0x14[0xC]; + /* 0x20 */ u32 mTagID; + /* 0x24 */ u32 field_0x24; + /* 0x28 */ u8 field_0x28[4]; + /* 0x2C */ int mType; + /* 0x30 */ u32 mStartCut; + /* 0x34 */ u8 field_0x34[2]; + /* 0x36 */ s16 field_0x36; + /* 0x38 */ int mCurrentCut; + /* 0x3C */ u32 field_0x3c; + /* 0x40 */ u8 field_0x40; + /* 0x41 */ u8 field_0x41; + /* 0x42 */ s16 field_0x42; + /* 0x44 */ s16 mSoundWait; + /* 0x46 */ u8 field_0x46[4]; + /* 0x4A */ int field_0x4a; +}; + +class dEvDtEvent_c { +public: + void finishCheck(); + void forceFinish(); + void specialStaffProc(dEvDtStaff_c*); + + /* 0x00 */ s32 mEventNum; }; class dEvDtFlag_c { public: - /* 80043D60 */ void flagCheck(int); - /* 80043DC8 */ void flagSet(int); - /* 80043E30 */ void flagMaxCheck(int); - /* 80043E58 */ void init(); + dEvDtFlag_c() {} + void flagCheck(int); + void flagSet(int); + bool flagMaxCheck(int); + void init(); + +#define FlagMax 0x2800 private: - u8 field_0x0[320]; -}; + u32 mFlags[320]; +}; // Size = 0x500 + #pragma pack(push, 1) class dEvDtBase_c { public: dEvDtBase_c(); ~dEvDtBase_c(); - /* 80046138 */ void init(); - /* 8004616C */ void init(char*, int); - /* 8004628C */ void advanceCut(dEvDtEvent_c*); - /* 800462FC */ void advanceCutLocal(dEvDtStaff_c*); + void init(); + void init(char*, int); + void advanceCut(dEvDtEvent_c*); + void advanceCutLocal(dEvDtStaff_c*); + + event_binary_data_header* getHeaderP() { return mHeaderP; } + s32 getEventNum() { return mEventP->mEventNum; } + s32 roomNo() { return mRoomNo; } private: - u32 field_0x0; - u32 field_0x4; - u32 field_0x8; - u32 field_0xc; - u32 field_0x10; - u32 field_0x14; - u32 field_0x18; - u32 field_0x1c; - u32 field_0x20; -}; + /* 0x00 */ event_binary_data_header* mHeaderP; + /* 0x04 */ dEvDtEvent_c* mEventP; + /* 0x08 */ dEvDtStaff_c* mStaffP; + /* 0x0C */ dEvDtCut_c* mCutP; + /* 0x10 */ dEvDtData_c* mDataP; + /* 0x14 */ float* mFDataP; + /* 0x18 */ s32* mIDataP; + /* 0x1C */ char* mSDataP; + /* 0x20 */ s32 mRoomNo; +}; // Size = 0x24 #pragma pack(pop) #endif /* D_EVENT_D_EVENT_DATA_H */ diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index e9d571a8190..c941d171831 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -4,87 +4,81 @@ #include "d/event/d_event_data.h" #include "dolphin/types.h" -struct dEvDtData_c {}; - -#pragma pack(push, 1) class dEvent_exception_c { public: - /* 800463DC */ void init(); - /* 800463F0 */ void setStartDemo(int); - /* 80046480 */ void getEventName(); + dEvent_exception_c() { mEventInfoIdx = -1; } + void init(); + void setStartDemo(int); + void getEventName(); private: - u32 field_0x0; + u32 mEventInfoIdx; u8 field_0x4; u8 field_0x5; u8 field_0x6; u8 field_0x7; - u32 field_0x8; + u32 mState; }; -#pragma pack(pop) -#pragma pack(push, 1) -struct dEvent_manager_c { - /* 800465E8 */ void getSubstance(dEvDtData_c*, int); - /* 80046688 */ dEvent_manager_c(); - /* 80046710 */ void create(); - /* 80046800 */ void setObjectArchive(char*); - /* 80046888 */ void demoInit(); - /* 80046904 */ void roomInit(int); - /* 800469EC */ void roomFinish(int); - /* 80046A58 */ void orderStartDemo(); - /* 80046C0C */ void remove(); - /* 80046CB8 */ void startProc(dEvDtEvent_c*); - /* 80046DA0 */ void closeProc(dEvDtEvent_c*); - /* 80046DAC */ void endProc(s16, int); - /* 80046E64 */ void Sequencer(); - /* 800473FC */ void Experts(); - /* 800474BC */ void getEventData(s16); - /* 80047454 */ void getEventData(s16, int); - /* 80047514 */ void getEventIdx(char const*, u8, s32); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047758 */ void getEventIdx(fopAc_ac_c*, char const*, u8); - /* 80047930 */ void isMapToolCamera(u8, s32); - /* 80047984 */ void order(s16); - /* 800479F8 */ void startCheck(s16); - /* 80047A38 */ void startCheckOld(char const*); - /* 80047A78 */ void endCheck(s16); - /* 80047ADC */ void endCheckOld(char const*); - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047E10 */ void getMyActIdx(int, char const* const*, int, int, int); - /* 80047F5C */ void getMyNowCutName(int); - /* 80047FC8 */ void getMyDataP(int, char const*, int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 80048144 */ void getMySubstanceNum(int, char const*); - /* 8004817C */ void cutEnd(int); - /* 800481F4 */ void getEventPrio(fopAc_ac_c*, s16); - /* 800482CC */ void issueStaff(char const*); - /* 80048348 */ void cancelStaff(char const*); - /* 800483C4 */ void setGoal(cXyz*); - /* 800483E0 */ void getGoal(); - /* 800483E8 */ void getRunEventName(); - /* 80048520 */ void specialCast_Shutter(s16, int); - /* 80048618 */ void specialCast(char const*, int); - /* 800487F0 */ void ChkPresentEnd(); - /* 8004882C */ void checkStartDemo(); +class dEvent_manager_c { +public: + void getSubstance(dEvDtData_c*, int); + dEvent_manager_c(); + void create(); + void setObjectArchive(char*); + void demoInit(); + void roomInit(int); + void roomFinish(int); + void orderStartDemo(); + void remove(); + void startProc(dEvDtEvent_c*); + void closeProc(dEvDtEvent_c*); + void endProc(s16, int); + void Sequencer(); + void Experts(); + void getEventData(s16); + dEvDtEvent_c* getEventData(s16, int); + void getEventIdx(char const*, u8, s32); + void getEventIdx(fopAc_ac_c*, u8); + void getEventIdx(fopAc_ac_c*, char const*, u8); + void isMapToolCamera(u8, s32); + void order(s16); + void startCheck(s16); + void startCheckOld(char const*); + void endCheck(s16); + void endCheckOld(char const*); + void getMyStaffId(char const*, fopAc_ac_c*, int); + void getIsAddvance(int); + void getMyActIdx(int, char const* const*, int, int, int); + void getMyNowCutName(int); + void getMyDataP(int, char const*, int); + void getMySubstanceP(int, char const*, int); + void getMySubstanceNum(int, char const*); + void cutEnd(int); + void getEventPrio(fopAc_ac_c*, s16); + void issueStaff(char const*); + void cancelStaff(char const*); + void setGoal(cXyz*); + void getGoal(); + void getRunEventName(); + void specialCast_Shutter(s16, int); + void specialCast(char const*, int); + void ChkPresentEnd(); + void checkStartDemo(); - /* 0x0000 */ dEvDtBase_c event_data_base[11]; - /* 0x018C */ u32 field_0x18c; - /* 0x0190 */ u32 field_0x190; - /* 0x0194 */ u8 field_0x194[0x8]; - /* 0x019C */ cXyz goal; - /* 0x01A8 */ u8 field_0x1A8[4]; +private: + /* 0x0000 */ dEvDtBase_c mEventList[11]; + /* 0x018C */ s32 mCameraPlay; + /* 0x0190 */ dEvent_exception_c mEventException; + /* 0x019C */ cXyz mGoal; + /* 0x01A8 */ u8 field_0x1a8[2]; /* 0x01AA */ u16 field_0x1aa; - /* 0x01AC */ u8 field_0x1ac[0x8]; - /* 0x01B4 */ dEvent_exception_c event_exception; - /* 0x01C0 */ cXyz position; - /* 0x01CC */ u8 field_0x1cc[0x14]; - /* 0x01E0 */ dEvDtFlag_c event_data_flag; - /* 0x0320 */ u8 field_0x320[0x35C]; - /* 0x067C */ void* vtable; - /* 0x0680 */ u8 field_0x680[0x3C]; + /* 0x01AC */ u8 field_0x1ac[4]; + /* 0x01B0 */ u32 field_0x1b0; + /* 0x01B4 */ u32 field_0x1b4; + /* 0x01B8 */ u32 field_0x1b8; + /* 0x01BC */ dEvDtFlag_c mFlags; + /* 0x06BC */ bool mDataLoaded; }; -#pragma pack(pop) #endif /* D_EVENT_D_EVENT_MANAGER_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index bb382bc4158..d92ecebccdf 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -1,6 +1,7 @@ #ifndef D_KANKYO_D_KANKYO_H #define D_KANKYO_D_KANKYO_H +#include "JSystem/J3DGraphBase/J3DStruct.h" #include "SSystem/SComponent/c_xyz.h" #include "dolphin/gx/GXTexture.h" #include "dolphin/types.h" @@ -16,4 +17,48 @@ struct LIGHT_INFLUENCE { /* 0x1C */ int field_0x1c; }; +struct WIND_INFLUENCE { + /* 0x00 */ cXyz field_0x00; + /* 0x0C */ cXyz field_0x0c; + /* 0x18 */ u8 field_0x18[0xC]; + /* 0x24 */ int field_0x24; + /* 0x28 */ u8 field_0x28; + /* 0x29 */ u8 field_0x29; +}; + +class dKy_tevstr_c { +public: +private: + /* 0x000 */ J3DLightObj field_0x000; + /* 0x074 */ J3DLightObj field_0x074[6]; + /* 0x32C */ cXyz field_0x32c; + /* 0x338 */ cXyz field_0x338; + /* 0x344 */ f32 field_0x344; + /* 0x348 */ int field_0x348; + /* 0x34C */ int field_0x34c; + /* 0x350 */ int field_0x350; + /* 0x354 */ int field_0x354; + /* 0x358 */ int field_0x358; + /* 0x35C */ int field_0x35c; + /* 0x360 */ int field_0x360; + /* 0x364 */ int field_0x364; + /* 0x368 */ f32 field_0x368; + /* 0x36C */ f32 field_0x36c; + /* 0x370 */ f32 field_0x370; + /* 0x374 */ f32 field_0x374; + /* 0x378 */ u16 field_0x378; + /* 0x37A */ u8 field_0x37a; + /* 0x37B */ u8 field_0x37b; + /* 0x37C */ u8 field_0x37c; + /* 0x37D */ u8 field_0x37d; + /* 0x37E */ u8 field_0x37e; + /* 0x37F */ u8 field_0x37f; + /* 0x380 */ u8 field_0x380; + /* 0x381 */ u8 field_0x381; + /* 0x382 */ u8 field_0x382; + /* 0x383 */ u8 field_0x383; + /* 0x384 */ u8 field_0x384; + /* 0x385 */ u8 field_0x385; +}; // Size = 0x388? + #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 18a7adb4026..781f1ed640c 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -1,6 +1,175 @@ #ifndef D_MENU_D_MENU_WINDOW_H #define D_MENU_D_MENU_WINDOW_H +#include "d/meter/d_meter2_info.h" #include "dolphin/types.h" +#include "m_Do/m_Do_controller_pad.h" + +struct STControl; +struct CSTControl; +class dDlst_base_c; +class dMenu_Ring_c; +class dMenu_Collect2D_c; +class dMenu_Dmap_c; +class dMenu_Fmap_c; +class dMenu_save_c; +class dMenu_Option_c; +class dMenu_Letter_c; +class dMenu_Fishing_c; +class dMenu_Skill_c; +class dMenu_Insect_c; + +class dMw_c { +public: + /* 801FA13C */ void key_wait_init(u8); + /* 801FA220 */ void ring_open_init(u8); + /* 801FA23C */ void ring_move_init(u8); + /* 801FA240 */ void ring_close_init(u8); + /* 801FA244 */ void collect_open_init(u8); + /* 801FA2D0 */ void collect_move_init(u8); + /* 801FA46C */ void collect_close_init(u8); + /* 801FA538 */ void fmap_open_init(u8); + /* 801FA55C */ void fmap_move_init(u8); + /* 801FA560 */ void fmap_close_init(u8); + /* 801FA564 */ void dmap_open_init(u8); + /* 801FA588 */ void dmap_move_init(u8); + /* 801FA58C */ void dmap_close_init(u8); + /* 801FA590 */ void collect_save_open_init(u8); + /* 801FA5E4 */ void collect_save_move_init(u8); + /* 801FA5E8 */ void collect_save_close_init(u8); + /* 801FA608 */ void collect_option_open_init(u8); + /* 801FA65C */ void collect_option_move_init(u8); + /* 801FA660 */ void collect_option_close_init(u8); + /* 801FA680 */ void collect_letter_open_init(u8); + /* 801FA6DC */ void collect_letter_move_init(u8); + /* 801FA6E0 */ void collect_letter_close_init(u8); + /* 801FA738 */ void collect_fishing_open_init(u8); + /* 801FA794 */ void collect_fishing_move_init(u8); + /* 801FA798 */ void collect_fishing_close_init(u8); + /* 801FA7F0 */ void collect_skill_open_init(u8); + /* 801FA84C */ void collect_skill_move_init(u8); + /* 801FA850 */ void collect_skill_close_init(u8); + /* 801FA8A8 */ void collect_insect_open_init(u8); + /* 801FA908 */ void collect_insect_move_init(u8); + /* 801FA90C */ void collect_insect_close_init(u8); + /* 801FA964 */ void insect_open_init(u8); + /* 801FA9E8 */ void insect_open2_init(u8); + /* 801FA9EC */ void insect_move_init(u8); + /* 801FA9F0 */ void insect_close_init(u8); + /* 801FAA48 */ void key_wait_proc(); + /* 801FAFDC */ void ring_open_proc(); + /* 801FB01C */ void ring_move_proc(); + /* 801FB064 */ void ring_close_proc(); + /* 801FB0B8 */ void collect_open_proc(); + /* 801FB110 */ void collect_move_proc(); + /* 801FB1A0 */ void collect_close_proc(); + /* 801FB240 */ void fmap_open_proc(); + /* 801FB298 */ void fmap_move_proc(); + /* 801FB36C */ void fmap_close_proc(); + /* 801FB3AC */ void dmap_open_proc(); + /* 801FB404 */ void dmap_move_proc(); + /* 801FB5DC */ void dmap_close_proc(); + /* 801FB61C */ void collect_save_open_proc(); + /* 801FB67C */ void collect_save_move_proc(); + /* 801FB6D8 */ void collect_save_close_proc(); + /* 801FB73C */ void collect_option_open_proc(); + /* 801FB7AC */ void collect_option_move_proc(); + /* 801FB800 */ void collect_option_close_proc(); + /* 801FB81C */ void collect_letter_open_proc(); + /* 801FB8AC */ void collect_letter_move_proc(); + /* 801FB900 */ void collect_letter_close_proc(); + /* 801FB91C */ void collect_fishing_open_proc(); + /* 801FB9AC */ void collect_fishing_move_proc(); + /* 801FBA00 */ void collect_fishing_close_proc(); + /* 801FBA1C */ void collect_skill_open_proc(); + /* 801FBAAC */ void collect_skill_move_proc(); + /* 801FBB00 */ void collect_skill_close_proc(); + /* 801FBB1C */ void collect_insect_open_proc(); + /* 801FBBAC */ void collect_insect_move_proc(); + /* 801FBC00 */ void collect_insect_close_proc(); + /* 801FBC1C */ void insect_open_proc(); + /* 801FBC78 */ void insect_open2_proc(); + /* 801FBD08 */ void insect_move_proc(); + /* 801FBD64 */ void insect_close_proc(); + /* 801FBD80 */ void dMw_capture_create(); + /* 801FBE14 */ void dMw_capture_delete(); + /* 801FBE94 */ void dMw_ring_create(u8); + /* 801FBF60 */ void dMw_ring_delete(); + /* 801FBFF8 */ void dMw_collect_create(); + /* 801FC090 */ void dMw_collect_delete(bool); + /* 801FC0FC */ void dMw_fmap_create(); + /* 801FC264 */ void dMw_fmap_delete(bool); + /* 801FC350 */ void dMw_dmap_create(); + /* 801FC46C */ void dMw_dmap_delete(bool); + /* 801FC520 */ void dMw_save_create(); + /* 801FC5D0 */ void dMw_save_delete(); + /* 801FC668 */ void dMw_option_create(); + /* 801FC70C */ void dMw_option_delete(); + /* 801FC7BC */ void dMw_letter_create(); + /* 801FC85C */ void dMw_letter_delete(); + /* 801FC904 */ void dMw_fishing_create(); + /* 801FC9A4 */ void dMw_fishing_delete(); + /* 801FCA4C */ void dMw_skill_create(); + /* 801FCAEC */ void dMw_skill_delete(); + /* 801FCB94 */ void dMw_insect_create(u8); + /* 801FCC44 */ void dMw_insect_delete(); + /* 801FCCEC */ void dMw_onButtonBit(u8); + /* 801FCCFC */ void dMw_offButtonBit(u8); + /* 801FCD0C */ void dMw_isButtonBit(u8); + /* 801FCD24 */ void dMw_isPush_S_Button(); + /* 801FCDD8 */ void isPauseReady(); + /* 801FCE08 */ void dMw_fade_out(); + /* 801FCE78 */ void dMw_fade_in(); + /* 801FCEE8 */ void checkCStickTrigger(); + /* 801FCF84 */ void isEventCheck(); + /* 801FD094 */ void markMemSize(); + /* 801FD0D4 */ void checkMemSize(); + /* 801FD140 */ void _create(); + /* 801FD2D8 */ void _execute(); + /* 801FD450 */ void _draw(); + /* 801FD67C */ void _delete(); + + void onPauseWindow() { mPauseWindow = true; } + void offPauseWindow() { mPauseWindow = false; } + void onShowFlag() { mShowFlag |= 1; } + void offShowFlag() { mShowFlag &= ~1; } + bool isShowFlag() { return mShowFlag & 1 != 0; } + +private: + u8 field_0x0[0x100]; + /* 0x100 */ void* field_0x100; + /* 0x104 */ STControl* mpStick; + /* 0x108 */ CSTControl* mpCStick; + /* 0x10C */ dDlst_base_c* field_0x10c; + /* 0x110 */ dMenu_Ring_c* mRing; + /* 0x114 */ dMenu_Collect2D_c* mCollect2D; + /* 0x118 */ dMenu_Dmap_c* mDmap; + /* 0x11C */ dMenu_Fmap_c* mFmap; + /* 0x120 */ dMenu_save_c* mSave; + /* 0x124 */ dMenu_Option_c* mOption; + /* 0x128 */ dMenu_Letter_c* mLetter; + /* 0x12C */ dMenu_Fishing_c* mFishing; + /* 0x130 */ dMenu_Skill_c* mSkill; + /* 0x134 */ dMenu_Insect_c* mInsect; + /* 0x138 */ int field_0x138; + /* 0x13C */ u8 field_0x13c[8]; + /* 0x144 */ u8 field_0x144; + /* 0x145 */ u8 mButtons; + /* 0x146 */ u8 field_0x146; + /* 0x147 */ u8 mShowFlag; + /* 0x148 */ u8 field_0x148; + /* 0x149 */ u8 field_0x149; + /* 0x14A */ u8 field_0x14A; + /* 0x14B */ u8 field_0x14B; + /* 0x14C */ u8 field_0x14C; + /* 0x14D */ u8 field_0x14D; + /* 0x14E */ u8 field_0x14E; + /* 0x14F */ u8 field_0x14F; + /* 0x150 */ u8 field_0x150; + /* 0x151 */ u8 field_0x151; + /* 0x152 */ u8 field_0x152; + /* 0x153 */ u8 field_0x153; + /* 0x154 */ bool mPauseWindow; +}; #endif /* D_MENU_D_MENU_WINDOW_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index a0f124a1b24..61ba0bd8a90 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -3,6 +3,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "d/d_resorce.h" +#include "d/menu/d_menu_window.h" #include "d/msg/d_msg_flow.h" #include "dolphin/types.h" #include "f_op/f_op_actor.h" @@ -14,11 +15,16 @@ struct dSv_event_flag_c { struct dMsgObject_c { /* 802384C4 */ void setLetterNameID(u16); + /* 802379AC */ void setKillMessageFlag(); + /* 8023822C */ void getStatus(); }; class dMeterMap_c { public: /* 8020D900 */ bool isMapOpenCheck(); + /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); + /* 8020D874 */ void setDispPosInsideFlg_SE_On(); + /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); }; struct J2DPicture {}; @@ -41,9 +47,12 @@ struct dItem_data { struct CPaneMgr {}; -class dMeter2_c {}; +class dMw_c; -class dMw_c {}; +class dMeter2_c { +public: + /* 8021F6EC */ void emphasisButtonDelete(); +}; class dMeter2Info_c { public: @@ -98,8 +107,13 @@ public: void setMiniGameCount(s8); void setSaveStageName(const char*); + void setWindowStatus(u8 status) { + unk186 = mWindowStatus; + mWindowStatus = status; + } u8& getDirectUseItem() { return mDirectUseItem; } dMeterMap_c* getMeterMapClass() { return mMeterMap; } + dMw_c* getMenuWindowClass() { return mMenuWindowClass; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } private: @@ -187,12 +201,20 @@ private: extern dMeter2Info_c g_meter2_info; -inline dMeterMap_c* dMeter2Info_getMeterMapClass() { - return g_meter2_info.getMeterMapClass(); -} - inline void dMeter2Info_Initialize() { g_meter2_info.init(); } +inline dMeterMap_c* dMeter2Info_getMeterMapClass() { + return g_meter2_info.getMeterMapClass(); +} + +inline dMw_c* dMeter2Info_getMenuWindowClass() { + return g_meter2_info.getMenuWindowClass(); +} + +inline void dMeter2Info_setWindowStatus(u8 status) { + g_meter2_info.setWindowStatus(status); +} + #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/particle/d_particle_copoly.h b/include/d/particle/d_particle_copoly.h index f4da7608d9e..561b75ea19d 100644 --- a/include/d/particle/d_particle_copoly.h +++ b/include/d/particle/d_particle_copoly.h @@ -4,7 +4,7 @@ #include "d/bg/d_bg_s_acch.h" #include "dolphin/types.h" -struct dKy_tevstr_c {}; +struct dKy_tevstr_c; class dPaPo_c { public: diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 3a517a5d9e2..903c6e03844 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -3,30 +3,85 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include "d/kankyo/d_kankyo.h" #include "dolphin/mtx/mtx.h" #include "f_pc/f_pc_leaf.h" struct JKRSolidHeap; +class dEvt_info_c { +public: + dEvt_info_c(); + virtual ~dEvt_info_c(); + void setEventName(char*); + void getEventName(); + void beforeProc(); + void onCondition(u16); + void offCondition(u16); + bool checkCommandCatch(); + bool checkCommandDoor(); + bool checkCommandDemoAccrpt(); + + void setCommand(u16 command) { mCommand = command; } + void setMapToolId(u8 id) { mMapToolId = id; } + void setEventId(s16 id) { mEventId = id; } + void setCondition(u16 condition) { mCondition = condition; } + void setArchiveName(char* name) { mArchiveName = name; } + u8 getMapToolId() { return mMapToolId; } + s16 getEventId() { return mEventId; } + u8 getIdx() { return mIndex; } + char* getArchiveName() { return mArchiveName; } + bool chkCondition(u16 condition) { return mCondition == condition; } + + bool checkCommandTalk() { return mCommand == 1; } + bool checkCommandItem() { return mCommand == 4; } + +private: + /* 0x04 */ u16 mCommand; + /* 0x06 */ u16 mCondition; + /* 0x08 */ s16 mEventId; + /* 0x0A */ u8 mMapToolId; + +public: + /* 0x0B */ u8 mIndex; + /* 0x0C */ char* mArchiveName; + /* 0x10 */ void* field_0x10; + /* 0x14 */ void* field_0x14; +}; // Size = 0x18 + struct actor_place { cXyz mPosition; csXyz mAngle; u8 mRoomNo; - u8 field_0x13; }; +struct actor_attention_types { + /* 0x00 */ u32 mDistance1; + /* 0x04 */ u32 mDistance2; + /* 0x08 */ u32 mDistance3; + /* 0x0C */ cXyz mPosition; + /* 0x18 */ u32 mFlags; +}; // Size = 0x1C + +class dJntCol_c; + class fopAc_ac_c : public leafdraw_class { public: /* 0x0C0 */ int mAcType; /* 0x0C4 */ create_tag_class mAcTg; /* 0x0D8 */ create_tag_class mDwTg; /* 0x0EC */ profile_method_class* mSubMtd; - /* 0x0F0 */ JKRSolidHeap* unk_0x0F0; - /* 0x0F4 */ u8 unk_0x0F4[0x496 - 0xF4]; - /* 0x496 */ u8 unk_0x496; - /* 0x497 */ u8 unk_0x497[0x499 - 0x497]; - /* 0x499 */ s8 unk_0x499; - /* 0x49A */ u8 unk_0x49A[0x4A8 - 0x49A]; + /* 0x0F0 */ JKRSolidHeap* mHeap; + /* 0x0F4 */ dEvt_info_c mEvtInfo; + /* 0x10C */ dKy_tevstr_c mTevStr; + /* 0x494 */ s16 mSetID; + /* 0x496 */ u8 mGroup; + /* 0x497 */ u8 mCullType; + /* 0x498 */ u8 mDemoActorId; + /* 0x499 */ s8 mSubtype; + /* 0x49C */ u32 mStatus; + /* 0x4A0 */ u32 mCondition; + /* 0x4A4 */ u32 mParentPcId; /* 0x4A8 */ actor_place mOrig; /* 0x4BC */ actor_place mNext; /* 0x4D0 */ actor_place mCurrent; @@ -44,18 +99,23 @@ public: /* 0x514 */ f32 mRadius; } mSphere; } mCull; - /* 0x520 */ u8 unk_0x520[0xC]; + /* 0x520 */ float mCullSizeFar; + /* 0x524 */ void* field_0x524; // possibly J3DModel* + /* 0x528 */ dJntCol_c* mJntCol; /* 0x52C */ f32 mSpeedF; /* 0x530 */ f32 mGravity; /* 0x534 */ f32 mMaxFallSpeed; + /* 0x538 */ cXyz mEyePos; + /* 0x544 */ actor_attention_types mAttentionInfo; + /* 0x560 */ u8 field_0x560[0x10]; // not 100% sure on this - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); + fopAc_ac_c(); + ~fopAc_ac_c(); - static u8 stopStatus[4]; + static u32 stopStatus; const cXyz& getPosition() const { return mCurrent.mPosition; } const csXyz& getAngle() const { return mCurrent.mAngle; } -}; // Size: unknown +}; // Size: 0x570? #endif diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index e6b196f8876..68dceee0c14 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -76,6 +76,22 @@ inline s16 fopAcM_GetName(fopAc_ac_c* pActor) { return fpcM_GetName(pActor); } +inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) { + return pActor->mStatus & status; +} + +inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) { + return pActor->mStatus & 0x2000; +} + +inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { + return fopAcM_checkStatus(pActor, 0x100000); +} + +inline u32 fopAcM_GetParam(const void* pActor) { + return fpcM_GetParam(pActor); +} + void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); void fopAcM_setStageLayer(void*); int fopAcM_setRoomLayer(void*, int); diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 7c62fe75ecc..1d13f495d3f 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -18,6 +18,9 @@ inline u32 fpcM_GetID(const void* pProc) { inline s16 fpcM_GetName(const void* pActor) { return ((base_process_class*)pActor)->mProcName; } +inline u32 fpcM_GetParam(const void* pActor) { + return ((base_process_class*)pActor)->mParameters; +} void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index b356b923021..499be53c96d 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -3,4 +3,46 @@ #include "dolphin/types.h" +struct mDoRstData { + /* 0x00 */ int mReset; + /* 0x04 */ int mResetPrepare; + /* 0x08 */ int m3ButtonReset; + /* 0x0C */ int m3ButtonResetPort; + /* 0x10 */ bool mShutdown; + /* 0x11 */ bool mReturnToMenu; + /* 0x12 */ u8 mLogoScnFlag; + /* 0x13 */ u8 mProgSeqFlag; + /* 0x14 */ u8 mProgChgFlag; + /* 0x15 */ u8 mWarningDispFlag; +}; // Size = 0x18 + +class mDoRst { +public: + static void offReturnToMenu() { mResetData->mReturnToMenu = false; } + static void offShutdown() { mResetData->mShutdown = false; } + static void setWarningDispFlag(u8 flag) { mResetData->mWarningDispFlag = flag; } + static void setProgChgFlag(u8 flag) { mResetData->mProgChgFlag = flag; } + static void setProgSeqFlag(u8 flag) { mResetData->mProgSeqFlag = flag; } + static void setLogoScnFlag(u8 flag) { mResetData->mLogoScnFlag = flag; } + static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; } + static void off3ButtonReset() { mResetData->m3ButtonReset = 0; } + static void offResetPrepare() { mResetData->mResetPrepare = 0; } + static void offReset() { mResetData->mReset = 0; } + static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; } + static bool isReturnToMenu() { return mResetData->mReturnToMenu; } + static bool isShutdown() { return mResetData->mShutdown; } + static int isReset() { return mResetData->mReset; } + static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; } + static int is3ButtonReset() { return mResetData->m3ButtonReset; } + static void onReset() { mResetData->mReset = 1; } + static void onReturnToMenu() { mResetData->mReturnToMenu = true; } + static void on3ButtonReset() { mResetData->m3ButtonReset = 1; } + static void onShutdown() { mResetData->mShutdown = true; } + + static mDoRstData* getResetData(); + static void setResetData(mDoRstData* rstData) { mResetData = rstData; } + + static mDoRstData* mResetData; +}; + #endif /* M_DO_M_DO_RESET_H */ diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 461bc3056ca..d796955ddee 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -3,4 +3,24 @@ #include "dolphin/types.h" +// move/fix later +template +class JASGlobalInstance { +public: + JASGlobalInstance(bool param_0) { + if (param_0) { + sInstance = this; + } + }; + ~JASGlobalInstance() { + if (sInstance == this) { + sInstance = NULL; + } + }; + + T* getInstance() { return sInstance; }; + + static T* sInstance; +}; + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index d3a33011cca..2cc21a68150 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -1,6 +1,60 @@ #ifndef M_DO_M_DO_CONTROLLER_PAD_H #define M_DO_M_DO_CONTROLLER_PAD_H +#include "JSystem/JUtility/JUTGamePad.h" +#include "SSystem/SComponent/c_API_controller_pad.h" #include "dolphin/types.h" +class mDoCPd_c { +public: + enum { PAD_0, PAD_1, PAD_2, PAD_3 }; + + void create(); + void read(); + void convert(interface_of_controller_pad*, JUTGamePad*); + void LRlockCheck(interface_of_controller_pad*); + void recalibrate(); + + static interface_of_controller_pad& getCpadInfo(u32 pad) { return m_cpadInfo[pad]; } + static JUTGamePad* getGamePad(u32 pad) { return m_gamePad[pad]; } + static u32 getTrig(u32 pad) { return getCpadInfo(pad).mPressedButtonFlags; } + static u32 getTrigLockL(u32 pad) { return getCpadInfo(pad).mTrigLockL; } + static u32 getTrigLockR(u32 pad) { return getCpadInfo(pad).mTrigLockR; } + static u32 getTrigUp(u32 pad) { return getTrig(pad) & CButton::DPAD_UP; } + static u32 getTrigDown(u32 pad) { return getTrig(pad) & CButton::DPAD_DOWN; } + static u32 getTrigLeft(u32 pad) { return getTrig(pad) & CButton::DPAD_LEFT; } + static u32 getTrigRight(u32 pad) { return getTrig(pad) & CButton::DPAD_RIGHT; } + static u32 getTrigL(u32 pad) { return getTrig(pad) & CButton::L; } + static u32 getTrigR(u32 pad) { return getTrig(pad) & CButton::R; } + static u32 getTrigA(u32 pad) { return getTrig(pad) & CButton::A; } + static u32 getTrigB(u32 pad) { return getTrig(pad) & CButton::B; } + static u32 getTrigZ(u32 pad) { return getTrig(pad) & CButton::Z; } + static u32 getTrigY(u32 pad) { return getTrig(pad) & CButton::Y; } + static u32 getTrigX(u32 pad) { return getTrig(pad) & CButton::X; } + static u32 getTrigStart(u32 pad) { return getTrig(pad) & CButton::START; } + static u32 getHold(u32 pad) { return getCpadInfo(pad).mButtonFlags; } + static u32 getHoldLockL(u32 pad) { return getCpadInfo(pad).mHoldLockL; } + static u32 getHoldLockR(u32 pad) { return getCpadInfo(pad).mHoldLockR; } + static u32 getHoldUp(u32 pad) { return getHold(pad) & CButton::DPAD_UP; } + static u32 getHoldDown(u32 pad) { return getHold(pad) & CButton::DPAD_DOWN; } + static u32 getHoldLeft(u32 pad) { return getHold(pad) & CButton::DPAD_LEFT; } + static u32 getHoldRight(u32 pad) { return getHold(pad) & CButton::DPAD_RIGHT; } + static u32 getHoldL(u32 pad) { return getHold(pad) & CButton::L; } + static u32 getHoldR(u32 pad) { return getHold(pad) & CButton::R; } + static u32 getHoldA(u32 pad) { return getHold(pad) & CButton::A; } + static u32 getHoldB(u32 pad) { return getHold(pad) & CButton::B; } + static u32 getHoldZ(u32 pad) { return getHold(pad) & CButton::Z; } + static u32 getHoldY(u32 pad) { return getHold(pad) & CButton::Y; } + static u32 getHoldX(u32 pad) { return getHold(pad) & CButton::X; } + static f32 getStickX(u32 pad) { return getCpadInfo(pad).mMainStickPosX; } + static f32 getStickY(u32 pad) { return getCpadInfo(pad).mMainStickPosY; } + static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; } + static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; } + static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; } + static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; } + + static JUTGamePad* m_gamePad[4]; + static interface_of_controller_pad m_cpadInfo[4]; +}; + #endif /* M_DO_M_DO_CONTROLLER_PAD_H */ diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index bc6c43f5668..76a3844a3d9 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -1,6 +1,39 @@ #ifndef M_DO_M_DO_MAIN_H #define M_DO_M_DO_MAIN_H +#include "JSystem/JKernel/JKRExpHeap.h" #include "dolphin/types.h" +class HeapCheck { +public: + void CheckHeap1(void); + s32 getUsedCount(void) const; + void heapDisplay(void) const; + u32& getUsedCountRef() { return mUsedCount; } + u32& getTotalUsedSizeRef() { return mTotalUsedSize; } + JKRExpHeap* getHeap() { return mHeap; } + void setHeap(JKRExpHeap* i_heap) { mHeap = i_heap; } + void setHeapSize(u32 i_size) { mTargetHeapSize = i_size; } + s32 getMaxTotalUsedSize() { return mMaxTotalUsedSize; } + s32 getMaxTotalFreeSize() { return mMaxTotalFreeSize; } + +private: + /* 0x00 */ char* mName; + /* 0x04 */ char* mJName; + /* 0x08 */ JKRExpHeap* mHeap; + /* 0x0C */ s32 mMaxTotalUsedSize; + /* 0x10 */ s32 mMaxTotalFreeSize; + /* 0x14 */ u8 unk20[8]; + /* 0x1C */ u32 mTargetHeapSize; + /* 0x20 */ u32 mUsedCount; + /* 0x24 */ u32 mTotalUsedSize; +}; + +struct mDoMain { + static u8 COPYDATE_STRING[18 + 2 /* padding */]; + static u32 memMargin; + static u8 sPowerOnTime[4]; // should be OSTime + static u8 sHungUpTime[4]; // should be OSTime +}; + #endif /* M_DO_M_DO_MAIN_H */ diff --git a/libs/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/J3DGraphBase/J3DStruct.cpp index 7c2eb26887d..cbeabedec65 100644 --- a/libs/JSystem/J3DGraphBase/J3DStruct.cpp +++ b/libs/JSystem/J3DGraphBase/J3DStruct.cpp @@ -20,10 +20,6 @@ struct J3DNBTScaleInfo { /* 8032587C */ void operator=(J3DNBTScaleInfo const&); }; -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - struct J3DIndTexMtxInfo { /* 803257DC */ void operator=(J3DIndTexMtxInfo const&); }; diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 783abd142c4..1e253033bd4 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -11,22 +11,11 @@ // Types: // -struct Z2StatusMgr { - /* 802B5F1C */ Z2StatusMgr(); - /* 802B5F7C */ void processHeartGaugeSound(); - /* 802B617C */ void menuOut(); - /* 802B671C */ void processTime(); -}; - struct Z2SpeechMgr2 { /* 802CBC60 */ Z2SpeechMgr2(); /* 802CC9D0 */ void framework(); }; -struct Z2SoundStarter { - /* 802AAB94 */ Z2SoundStarter(bool); -}; - struct Z2SoundObjMgr { /* 802BF920 */ Z2SoundObjMgr(); }; @@ -38,22 +27,6 @@ struct Z2SoundMgr { /* 802AA908 */ void initParams(); }; -struct Z2SeqMgr { - /* 802AEEA0 */ Z2SeqMgr(); - /* 802B33A8 */ void processBgmFramework(); -}; - -struct Z2SeMgr { - /* 802AB64C */ Z2SeMgr(); - /* 802AB750 */ void initSe(); - /* 802AE184 */ void processSeFramework(); -}; - -struct Z2SceneMgr { - /* 802B6840 */ Z2SceneMgr(); - /* 802B9C50 */ void framework(); -}; - struct Z2Param { static f32 VOL_BGM_DEFAULT; static f32 VOL_SE_SYSTEM_DEFAULT; @@ -70,35 +43,6 @@ struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); }; -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct JKRSolidHeap {}; - -struct JAISoundID {}; - -struct JKRArchive {}; - -struct JAISoundHandle {}; - -struct Z2AudioMgr { - /* 802CD248 */ Z2AudioMgr(); - /* 802CD34C */ void init(JKRSolidHeap*, u32, void*, JKRArchive*); - /* 802CD888 */ void setOutputMode(u32); - /* 802CD8B4 */ void zeldaGFrameWork(); - /* 802CD904 */ void gframeProcess(); - /* 802CD974 */ void resetProcess(u32, bool); - /* 802CD9CC */ void resetRecover(); - /* 802CDA6C */ void hasReset() const; - /* 802CDB1C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); - - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - struct JAUSection { /* 802A50F8 */ void finishBuild(); }; @@ -111,8 +55,6 @@ struct Z2Audience { /* 802BD130 */ Z2Audience(); }; -struct JKRHeap {}; - struct JAU_JASInitializer { /* 802A4AD0 */ JAU_JASInitializer(); /* 802A4B28 */ void initJASystem(JKRSolidHeap*); @@ -152,8 +94,6 @@ struct JAUAudioArcInterpreter { /* 802A4260 */ ~JAUAudioArcInterpreter(); }; -struct JASTrack {}; - struct JASSeqParser { static u8 sCallBackFunc[4]; }; @@ -361,7 +301,7 @@ SECTION_DATA extern void* __vt__10Z2AudioMgr[3] = { /* 80451368-80451370 000868 0004+04 1/1 251/251 900/900 .sbss mAudioMgrPtr__10Z2AudioMgr */ -u8 Z2AudioMgr::mAudioMgrPtr[4 + 4 /* padding */]; +Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr; /* 802CD248-802CD34C 2C7B88 0104+00 0/0 1/1 0/0 .text __ct__10Z2AudioMgrFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 5bb7bffa019..5e7523ee06d 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -15,23 +15,6 @@ struct Z2SpeechMgr2 { /* 802CCF88 */ void isMidnaSpeak(); }; -struct Z2CreatureEnemy { - /* 802C0F64 */ Z2CreatureEnemy(); - /* 802C0FC4 */ void deleteObject(); - /* 802C1094 */ void init(Vec*, Vec*, u8, u8); - /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8); - /* 802C10D4 */ void framework(u32, s8); - /* 802C110C */ void startCreatureSound(JAISoundID, u32, s8); - /* 802C136C */ void startCreatureSoundLevel(JAISoundID, u32, s8); - /* 802C168C */ void startCreatureVoice(JAISoundID, s8); - /* 802C1948 */ void startCreatureVoiceLevel(JAISoundID, s8); - /* 802C199C */ void startCreatureExtraSound(JAISoundID, u32, s8); - /* 802C19D8 */ void startCreatureExtraSoundLevel(JAISoundID, u32, s8); - /* 802C1A14 */ void startCollisionSE(u32, u32); - /* 802C1B7C */ void setLinkSearch(bool); - /* 802C1B90 */ void setEnemyName(char const*); -}; - struct Z2SoundObjMgr { /* 802C0074 */ void getEnemyID(char const*, JSULink*); /* 802C0190 */ void removeEnemy(JSULink*); diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 465129fecee..319fe226917 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -69,36 +69,6 @@ struct Z2SeMgr { /* 802B9AC4 */ void resetCrowdSize(); }; -struct JAISoundID { - /* 802B9B60 */ JAISoundID(u32); - /* 802B995C */ JAISoundID(JAISoundID const&); - /* 802B9A88 */ void operator=(JAISoundID const&); -}; - -struct Z2SceneMgr { - /* 802B6840 */ Z2SceneMgr(); - /* 802B68B0 */ void setInDarkness(bool); - /* 802B68E0 */ void setSceneExist(bool); - /* 802B697C */ void setFadeOutStart(u8); - /* 802B6A18 */ void setFadeInStart(u8); - /* 802B6AF8 */ void setSceneName(char*, s32, s32); - /* 802B9B68 */ void sceneChange(JAISoundID, u8, u8, u8, u8, u8, bool); - /* 802B9C50 */ void framework(); - /* 802B9D40 */ void load1stDynamicWave(); - /* 802B9D98 */ void _load1stWaveInner_1(); - /* 802B9FC8 */ void _load1stWaveInner_2(); - /* 802BA09C */ void check1stDynamicWave(); - /* 802BA120 */ void load2ndDynamicWave(); - /* 802BA294 */ void sceneBgmStart(); - /* 802BA56C */ void loadStaticWaves(); - /* 802BA5C0 */ bool checkFirstWaves(); - /* 802BA5C8 */ void eraseSeWave(u32); - /* 802BA630 */ void eraseBgmWave(u32); - /* 802BA698 */ void getWaveLoadStatus(u32, u32); - /* 802BA704 */ void loadSeWave(u32); - /* 802BA770 */ void loadBgmWave(u32); -}; - struct Z2FxLineMgr { /* 802BAEB8 */ void setSceneFx(s32); }; @@ -135,11 +105,6 @@ struct JAISoundParamsMove { /* 802A2DB4 */ void moveVolume(f32, u32); }; -struct JAISound { - /* 802A24DC */ void stop(u32); - /* 802B9988 */ void getID() const; -}; - // // Forward References: // @@ -244,6 +209,35 @@ extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; // /* 802B6840-802B68B0 2B1180 0070+00 0/0 1/1 0/0 .text __ct__10Z2SceneMgrFv */ +// Missing 2 instructions (beginning and end) +#ifdef NONMATCHING +Z2SceneMgr::Z2SceneMgr(void) { + lbl_80450B80 = this; + sceneNum = -1; + timer = -1; + BGM_ID = -1; + roomNum = -1; + SeWave_1 = 0; + SeWaveToErase_1 = 0; + SeWave_2 = 0; + SeWaveToErase_2 = 0; + BgmWave_1 = 0; + BgmWaveToErase_1 = 0; + BgmWave_2 = 0; + BgmWaveToErase_2 = 0; + SeWave_3 = 0; + SeWaveToErase_3 = 0; + field_0x18 = 0; + field_0x19 = 0; + field_0x1a = 0; + field_0x1b = 0; + sceneExist = 0; + inGame = 0; + inDarkness = false; + field_0x17 = 0; + return; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -252,6 +246,7 @@ asm Z2SceneMgr::Z2SceneMgr() { #include "asm/Z2AudioLib/Z2SceneMgr/__ct__10Z2SceneMgrFv.s" } #pragma pop +#endif /* 802B68B0-802B68E0 2B11F0 0030+00 0/0 1/1 0/0 .text setInDarkness__10Z2SceneMgrFb */ #pragma push @@ -276,6 +271,29 @@ SECTION_SDATA2 static u8 lit_3511[4] = { SECTION_SDATA2 static f32 lit_3512 = 1.0f; /* 802B68E0-802B697C 2B1220 009C+00 3/3 2/2 2/2 .text setSceneExist__10Z2SceneMgrFb */ +#ifdef NONMATCHING +void Z2SceneMgr::setSceneExist(bool param_1) { + Z2SoundMgr* Z2soundMgrPtr; + sceneExist = param_1; + timer = 0; + Z2soundMgrPtr = lbl_80450B60; + if (param_1 == false) { + Z2soundMgrPtr->JAISoundParamsMove->moveVolume(FLOAT_LABEL(lit_3511), 0xb4); + } else { + inGame = 1; + if (SeWave_3 == 0x85) { + Z2soundMgrPtr->JAISoundParamsMove->moveVolume(FLOAT_LABEL(lit_3511), 0); + } else { + if (SeWave_3 == 0x7f) { + lbl_80450B88->seMoveVolumeAll(FLOAT_LABEL(lit_3511), 0); + } else { + Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lit_3512, 0x21); + } + } + } + return; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -284,6 +302,7 @@ asm void Z2SceneMgr::setSceneExist(bool param_0) { #include "asm/Z2AudioLib/Z2SceneMgr/setSceneExist__10Z2SceneMgrFb.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80455A40-80455A48 004040 0004+04 1/1 0/0 0/0 .sdata2 @3529 */ @@ -725,18 +744,18 @@ asm void Z2SceneMgr::setSceneName(char* param_0, s32 param_1, s32 param_2) { } #pragma pop -/* 802B995C-802B9968 2B429C 000C+00 1/1 0/0 0/0 .text __ct__10JAISoundIDFRC10JAISoundID - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundID::JAISoundID(JAISoundID const& param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SceneMgr/__ct__10JAISoundIDFRC10JAISoundID.s" +//! @meme this looks to be non-inlined here because @ref setSceneName is too large +JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) { + mId = soundIdToSet.mId; } -#pragma pop /* 802B9968-802B9978 2B42A8 0010+00 1/1 0/0 0/0 .text setFieldBgmPlay__8Z2SeqMgrFb */ +// 1 Instruction off +#ifdef NONMATCHING +void Z2SeqMgr::setFieldBgmPlay(bool param_1) { + unk_1 = (param_1 & 1U) << 2 | unk_1 & 0xfb; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -745,6 +764,7 @@ asm void Z2SeqMgr::setFieldBgmPlay(bool param_0) { #include "asm/Z2AudioLib/Z2SceneMgr/setFieldBgmPlay__8Z2SeqMgrFb.s" } #pragma pop +#endif /* 802B9978-802B9988 2B42B8 0010+00 1/1 0/0 0/0 .text isActive__12JAIStreamMgrCFv */ #pragma push @@ -760,7 +780,7 @@ asm void JAIStreamMgr::isActive() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JAISound::getID() const { +asm JAISoundID JAISound::getID() const { nofralloc #include "asm/Z2AudioLib/Z2SceneMgr/getID__8JAISoundCFv.s" } @@ -859,8 +879,8 @@ asm void Z2SeqMgr::setWindStoneVol(f32 param_0, u32 param_1) { #pragma pop /* 802B9B60-802B9B68 -00001 0008+00 0/0 0/0 0/0 .text __ct__10JAISoundIDFUl */ -JAISoundID::JAISoundID(u32 param_0) { - *(u32*)this = (u32)(param_0); +JAISoundID::JAISoundID(u32 id) { + mId = id; } /* 802B9B68-802B9C50 2B44A8 00E8+00 1/1 0/0 0/0 .text diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index 97f7cd87a93..1e3631b6378 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -17,24 +17,10 @@ struct Z2StatusMgr { /* 802B61BC */ void isMovieDemo(); }; -struct Vec {}; - struct Z2SpeechMgr2 { /* 802CCA18 */ void playOneShotVoice(u8, u16, Vec*, s8); }; -struct JAISoundHandle { - /* 80007838 */ ~JAISoundHandle(); - /* 802A2184 */ void releaseSound(); - /* 802A4AC4 */ JAISoundHandle(); -}; - -struct Z2SoundStarter { - /* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8); -}; - -struct JAISoundID {}; - struct Z2SoundMgr { /* 802AA7DC */ void stopSoundID(JAISoundID); /* 802AA9E8 */ void multiVolumeSoundID(JAISoundID, f32); @@ -44,29 +30,6 @@ struct Z2SeqMgr { /* 802AF010 */ void bgmStart(u32, u32, s32); }; -struct Z2SeMgr { - /* 802AB64C */ Z2SeMgr(); - /* 802AB750 */ void initSe(); - /* 802AB80C */ void resetModY(); - /* 802AB830 */ void modHeightAtCamera(Vec const**); - /* 802AB93C */ void incrCrowdSize(); - /* 802AB960 */ void decrCrowdSize(); - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AD8B0 */ void seStop(JAISoundID, u32); - /* 802AD94C */ void seStopAll(u32); - /* 802AD9F4 */ void seMoveVolumeAll(f32, u32); - /* 802ADB14 */ void messageSePlay(u16, Vec*, s8); - /* 802ADB50 */ void talkInSe(); - /* 802ADC54 */ void talkOutSe(); - /* 802ADD58 */ void menuInSe(); - /* 802ADE5C */ void setLevObjSE(u32, Vec*, s8); - /* 802ADFF4 */ void setMultiTriggerSE(u32, Vec*, s8); - /* 802AE184 */ void processSeFramework(); - /* 802AE524 */ void isLevelSe(JAISoundID); - /* 802AE5B0 */ void isSoundCulling(JAISoundID); -}; - struct Z2Param { static f32 VOL_SE_SYSTEM_DEFAULT; static f32 VOL_SE_LINK_VOICE_DEFAULT; @@ -94,20 +57,6 @@ struct Z2Param { static f32 VOL_SE_ATMOSPHERE_PAUSING; }; -struct Z2MultiSeObj { - /* 80007888 */ ~Z2MultiSeObj(); - /* 802AB710 */ Z2MultiSeObj(); -}; - -struct Z2MultiSeMgr { - /* 802AEB04 */ Z2MultiSeMgr(); - /* 802AEB34 */ ~Z2MultiSeMgr(); - /* 802AEB70 */ void registMultiSePos(Vec*); - /* 802AECBC */ void resetMultiSePos(); - /* 802AECE0 */ void getPanPower(); - /* 802AEDC0 */ void getDolbyPower(); -}; - struct Z2CreatureLink { static u8 mLinkPtr[4 + 4 /* padding */]; }; @@ -135,15 +84,6 @@ struct JAISoundParamsMove { /* 802A2F14 */ void moveDolby(f32, u32); }; -struct JAISoundHandles { - /* 802A2C98 */ void getHandleSoundID(JAISoundID); - /* 802A2CF4 */ void getFreeHandle(); -}; - -struct JAISound { - /* 802A24DC */ void stop(u32); -}; - struct JAISeCategoryMgr { /* 8029FDE0 */ void stop(u32); }; @@ -213,7 +153,6 @@ extern "C" void calcRelPosPan__10Z2AudienceFRC3Veci(); extern "C" void calcRelPosDolby__10Z2AudienceFRC3Veci(); extern "C" void playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc(); extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_26(); @@ -254,7 +193,7 @@ extern "C" extern u8 data_80450B74[4]; extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; +extern "C" extern Z2SeMgr* data_80450B88; // JASGlobalInstance::sInstance extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // @@ -262,6 +201,23 @@ extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // /* 802AB64C-802AB710 2A5F8C 00C4+00 0/0 1/1 0/0 .text __ct__7Z2SeMgrFv */ +// almost matches, JASGlobalInstance stuff needs to be setup properly +#ifdef NONMATCHING +Z2SeMgr::Z2SeMgr() : field_0x60(&mSoundHandle[0], 0x18) { + // data_80450B88 = this; + field_0x3c0 = 0; + field_0x3c1 = 0; + field_0x3c2 = 0; + field_0x3c3 = 0; + field_0x3c4 = 0; + field_0x3c5 = 0; + + field_0x3c9 = 0; + field_0x3ca = 0; + field_0x3cb = 0; + mCrowdSize = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -270,18 +226,32 @@ asm Z2SeMgr::Z2SeMgr() { #include "asm/Z2AudioLib/Z2SeMgr/__ct__7Z2SeMgrFv.s" } #pragma pop +#endif -/* 802AB710-802AB750 2A6050 0040+00 1/1 0/0 0/0 .text __ct__12Z2MultiSeObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2MultiSeObj::Z2MultiSeObj() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeObjFv.s" +Z2MultiSeObj::Z2MultiSeObj() { + field_0x1c = 0xffffffff; + field_0x20 = 0; } -#pragma pop /* 802AB750-802AB80C 2A6090 00BC+00 0/0 1/1 0/0 .text initSe__7Z2SeMgrFv */ +#ifdef NONMATCHING +void Z2SeMgr::initSe() { + for (int i = 0; i < 10; i++) { + mLevelObjSe[i].resetMultiSePos(); + mLevelObjSe[i].field_0x1c = 0xffffffff; + mLevelObjSe[i].field_0x20 = 0; + } + mLevelObjectSeCount = 0; + + for (int i = 0; i < 10; i++) { + mMultiTriggerSe[i].resetMultiSePos(); + mMultiTriggerSe[i].field_0x1c = 0xffffffff; + mMultiTriggerSe[i].field_0x20 = 0; + } + mMultiTriggerSeCount = 0; + resetModY(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -290,16 +260,13 @@ asm void Z2SeMgr::initSe() { #include "asm/Z2AudioLib/Z2SeMgr/initSe__7Z2SeMgrFv.s" } #pragma pop +#endif -/* 802AB80C-802AB830 2A614C 0024+00 1/1 1/1 0/0 .text resetModY__7Z2SeMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SeMgr::resetModY() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/resetModY__7Z2SeMgrFv.s" +void Z2SeMgr::resetModY() { + for (int i = 0; i < 8; i++) { + mModY[i] = 0; + } } -#pragma pop /* 802AB830-802AB93C 2A6170 010C+00 1/1 0/0 0/0 .text modHeightAtCamera__7Z2SeMgrFPPC3Vec */ @@ -312,25 +279,21 @@ asm void Z2SeMgr::modHeightAtCamera(Vec const** param_0) { } #pragma pop -/* 802AB93C-802AB960 2A627C 0024+00 0/0 1/1 0/0 .text incrCrowdSize__7Z2SeMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SeMgr::incrCrowdSize() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/incrCrowdSize__7Z2SeMgrFv.s" -} -#pragma pop +void Z2SeMgr::incrCrowdSize() { + mCrowdSize++; -/* 802AB960-802AB984 2A62A0 0024+00 0/0 3/3 0/0 .text decrCrowdSize__7Z2SeMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SeMgr::decrCrowdSize() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/decrCrowdSize__7Z2SeMgrFv.s" + if (mCrowdSize > 100) + mCrowdSize = 100; +} + +void Z2SeMgr::decrCrowdSize() { + mCrowdSize--; + + //! @bug probably copypasta from incrCrowdSize(), but semantically it's still correct: + //! mCrowdSize is a u8, so an underflow would result in mCrowdSize > 100, triggering the clamp. + if (mCrowdSize > 100) + mCrowdSize = 0; } -#pragma pop /* ############################################################################################## */ /* 80455870-80455874 003E70 0004+00 1/1 0/0 0/0 .sdata2 @4038 */ @@ -716,25 +679,11 @@ asm void Z2SeMgr::isSoundCulling(JAISoundID param_0) { } #pragma pop -/* 802AEB04-802AEB34 2A9444 0030+00 1/1 1/1 0/0 .text __ct__12Z2MultiSeMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2MultiSeMgr::Z2MultiSeMgr() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/__ct__12Z2MultiSeMgrFv.s" +Z2MultiSeMgr::Z2MultiSeMgr() { + resetMultiSePos(); } -#pragma pop -/* 802AEB34-802AEB70 2A9474 003C+00 0/0 2/2 0/0 .text __dt__12Z2MultiSeMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2MultiSeMgr::~Z2MultiSeMgr() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/__dt__12Z2MultiSeMgrFv.s" -} -#pragma pop +Z2MultiSeMgr::~Z2MultiSeMgr() {} /* 802AEB70-802AECBC 2A94B0 014C+00 2/2 6/6 0/0 .text registMultiSePos__12Z2MultiSeMgrFP3Vec */ #pragma push @@ -746,16 +695,15 @@ asm void Z2MultiSeMgr::registMultiSePos(Vec* param_0) { } #pragma pop -/* 802AECBC-802AECE0 2A95FC 0024+00 3/3 6/6 0/0 .text resetMultiSePos__12Z2MultiSeMgrFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2MultiSeMgr::resetMultiSePos() { - nofralloc -#include "asm/Z2AudioLib/Z2SeMgr/resetMultiSePos__12Z2MultiSeMgrFv.s" +void Z2MultiSeMgr::resetMultiSePos(void) { + mPosCount = -1; + f32 _0 = FLOAT_LABEL(lit_4040); + mMaxPowL = _0; + mMaxPowR = _0; + mMaxPowB = _0; + mMaxPowF = _0; + mMaxVolume = _0; } -#pragma pop /* 802AECE0-802AEDC0 2A9620 00E0+00 1/1 8/8 0/0 .text getPanPower__12Z2MultiSeMgrFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index f4617a0ecaa..ae3b3717487 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -16,10 +16,6 @@ struct Z2StatusMgr { /* 802B6734 */ void checkDayTime(); }; -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - struct Z2SoundStarter { /* 802AAEDC */ void setPortData(JAISoundHandle*, u32, u16, s8); /* 802AAF74 */ void getPortData(JAISoundHandle*, u32, s8); @@ -33,56 +29,6 @@ struct Z2SoundObjMgr { /* 802C01E4 */ void isTwilightBattle(); }; -struct Z2SeqMgr { - /* 802AEEA0 */ Z2SeqMgr(); - /* 802AF010 */ void bgmStart(u32, u32, s32); - /* 802AF408 */ void bgmStop(u32, s32); - /* 802AF49C */ void subBgmStart(u32); - /* 802AF884 */ void subBgmStop(); - /* 802AF9D0 */ void subBgmStopInner(); - /* 802AFB94 */ void bgmStreamPrepare(u32); - /* 802AFDEC */ void bgmStreamCheckReady(); - /* 802AFE18 */ void bgmStreamPlay(); - /* 802AFEDC */ void bgmStreamStop(u32); - /* 802AFF8C */ void changeBgmStatus(s32); - /* 802B1DF4 */ void changeSubBgmStatus(s32); - /* 802B299C */ void onVariantBgmJumpEnd(bool); - /* 802B2A88 */ void changeFishingBgm(s32); - /* 802B2CA4 */ void talkInBgm(); - /* 802B2D64 */ void talkOutBgm(); - /* 802B2DAC */ void menuInBgm(); - /* 802B2DF4 */ void menuOutBgm(); - /* 802B2E3C */ void fanfareFramework(); - /* 802B327C */ void stopWolfHowlSong(); - /* 802B3318 */ void setHeightVolMod(bool, u32); - /* 802B3398 */ void setTimeProcVolMod(bool, u32); - /* 802B33A8 */ void processBgmFramework(); - /* 802B3EAC */ void checkBgmIDPlaying(u32); - /* 802B3F40 */ void getChildTrackVolume(JAISoundHandle*, int); - /* 802B3FEC */ void setChildTrackVolume(JAISoundHandle*, int, f32, u32, f32, f32); - /* 802B4128 */ void resetBattleBgmParams(); - /* 802B4164 */ void setBattleBgmOff(bool); - /* 802B421C */ void setBattleSearched(bool); - /* 802B43D0 */ void setBattleDistIgnore(bool); - /* 802B43E0 */ void setBattleGhostMute(bool); - /* 802B4498 */ void setBattleDistState(u8); - /* 802B4844 */ void setBattleSeqState(u8); - /* 802B4AFC */ void setBattleLastHit(u8); - /* 802B4BD0 */ void battleBgmFramework(); - /* 802B4EB0 */ void startBattleBgm(bool); - /* 802B5204 */ void stopBattleBgm(u8, u8); - /* 802B545C */ void fieldBgmStart(); - /* 802B556C */ void fieldRidingMute(); - /* 802B5750 */ void onFieldBgmJumpStart(); - /* 802B579C */ void onFieldBgmJumpEnd(); - /* 802B594C */ void fieldBgmFramework(); - /* 802B5E80 */ void mbossBgmMuteProcess(); - /* 802B5E84 */ void bgmSetSwordUsing(s32); - /* 802B5E88 */ void bgmNowBattle(f32); - /* 802B5E8C */ void taktModeMute(); - /* 802B5ED4 */ void taktModeMuteOff(); -}; - struct Z2SceneMgr { /* 802B68E0 */ void setSceneExist(bool); }; @@ -120,12 +66,6 @@ struct JAISoundParamsMove { /* 802A2F14 */ void moveDolby(f32, u32); }; -struct JAISound { - /* 802A21A0 */ void releaseHandle(); - /* 802A24DC */ void stop(u32); - /* 802A2598 */ void stop(); -}; - struct JAISeqMgr { /* 802A1C90 */ void calc(); /* 802A1E3C */ void stop(u32); @@ -764,7 +704,7 @@ asm void Z2SeqMgr::bgmStreamPrepare(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void Z2SeqMgr::bgmStreamCheckReady() { +asm int Z2SeqMgr::bgmStreamCheckReady() { nofralloc #include "asm/Z2AudioLib/Z2SeqMgr/bgmStreamCheckReady__8Z2SeqMgrFv.s" } diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index 10341fc35cb..8097a9d7148 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -71,29 +71,22 @@ extern "C" extern u8 data_80451348[8]; // Declarations: // -/* 802AB07C-802AB0B4 2A59BC 0038+00 0/0 1/1 0/0 .text __ct__14Z2SoundHandlesFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SoundHandles::Z2SoundHandles() { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/__ct__14Z2SoundHandlesFv.s" -} -#pragma pop +inline JAISoundID::JAISoundID(u32 pId) : mId(pId) {} -/* 802AB0B4-802AB118 2A59F4 0064+00 0/0 1/1 0/0 .text __dt__14Z2SoundHandlesFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SoundHandles::~Z2SoundHandles() { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/__dt__14Z2SoundHandlesFv.s" +inline JAISoundID JAISound::getID() const { + return JAISoundID((u32)sound_id); } -#pragma pop -/* 802AB118-802AB120 -00001 0008+00 0/0 0/0 0/0 .text initHandlesPool__14Z2SoundHandlesFUc */ -void Z2SoundHandles::initHandlesPool(u8 param_0) { - *(u8*)(((u8*)this) + 12) /* this->field_0xc */ = (u8)(param_0); +Z2SoundHandles::Z2SoundHandles() { + mNumHandles = 0; +} + +Z2SoundHandles::~Z2SoundHandles() { + deleteHandlesPool(); +} + +void Z2SoundHandles::initHandlesPool(u8 pNumHandles) { + mNumHandles = pNumHandles; } /* ############################################################################################## */ @@ -125,26 +118,33 @@ extern "C" asm void func_802AB200(void* _this) { } #pragma pop -/* 802AB254-802AB2A0 2A5B94 004C+00 0/0 6/6 0/0 .text - * getHandleSoundID__14Z2SoundHandlesF10JAISoundID */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/getHandleSoundID__14Z2SoundHandlesF10JAISoundID.s" -} -#pragma pop +JAISoundHandle* Z2SoundHandles::getHandleSoundID(JAISoundID pSoundId) { + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + if (handle->isSoundAttached()) { + if ((*handle)->getID() == pSoundId) { + return handle; + } + } + } -/* 802AB2A0-802AB2D8 2A5BE0 0038+00 0/0 1/1 0/0 .text getHandleUserData__14Z2SoundHandlesFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/getHandleUserData__14Z2SoundHandlesFUl.s" + return NULL; +} + +JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) { + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + if (handle->isSoundAttached()) { + if ((*handle)->getUserData() == pUserData) { + return handle; + } + } + } + + return NULL; } -#pragma pop /* 802AB2D8-802AB3D0 2A5C18 00F8+00 0/0 3/3 0/0 .text getFreeHandle__14Z2SoundHandlesFv */ @@ -168,26 +168,29 @@ asm void Z2SoundHandles::getLowPrioSound(JAISoundID param_0) { } #pragma pop -/* 802AB4A0-802AB504 2A5DE0 0064+00 0/0 1/1 0/0 .text stopAllSounds__14Z2SoundHandlesFUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundHandles::stopAllSounds(u32 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/stopAllSounds__14Z2SoundHandlesFUl.s" +void Z2SoundHandles::stopAllSounds(u32 fadeout) { + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { + JAISoundHandle* handle = link->getObject(); + //! @meme: explicit operator bool call required to match and be similar + //! to CHN_debug; could more concisely write handle->isSoundAttached + //! (for some reason cast-to-bool doesn't work?) + if (handle && handle->operator bool()) { + (*handle)->stop(fadeout); + } + } } -#pragma pop -/* 802AB504-802AB538 2A5E44 0034+00 0/0 1/1 0/0 .text isActive__14Z2SoundHandlesCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool Z2SoundHandles::isActive() const { - nofralloc -#include "asm/Z2AudioLib/Z2SoundHandles/isActive__14Z2SoundHandlesCFv.s" +bool Z2SoundHandles::isActive() const { + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { + if (link->getObject()->isSoundAttached()) { + return true; + } + } + + return false; } -#pragma pop /* 802AB538-802AB64C 2A5E78 0114+00 0/0 1/1 0/0 .text * setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3 */ diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 65f0bf27f20..6c7a7191eff 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -4,6 +4,7 @@ // #include "Z2AudioLib/Z2SoundObjMgr.h" +#include "Z2AudioLib/Z2SeqMgr.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,53 +12,12 @@ // Types: // -template -struct JSULink {}; -/* JSULink */ -struct JSULink__template2 {}; - -struct Z2CreatureEnemy {}; - -struct Z2SoundObjMgr { - /* 802BF920 */ Z2SoundObjMgr(); - /* 802BF980 */ void setForceBattleArea(bool, u16, u16, u16); - /* 802BF994 */ void searchEnemy(); - /* 802BFFEC */ void setGhostEnemyState(u8); - /* 802C0074 */ void getEnemyID(char const*, JSULink*); - /* 802C0100 */ void setBattleInit(); - /* 802C0120 */ void checkBattleFinish(); - /* 802C013C */ void deleteEnemyAll(); - /* 802C0190 */ void removeEnemy(JSULink*); - /* 802C01E4 */ void isTwilightBattle(); -}; - -struct Z2SeqMgr { - /* 802AFF8C */ void changeBgmStatus(s32); - /* 802B1DF4 */ void changeSubBgmStatus(s32); - /* 802B421C */ void setBattleSearched(bool); - /* 802B43E0 */ void setBattleGhostMute(bool); - /* 802B4498 */ void setBattleDistState(u8); - /* 802B5204 */ void stopBattleBgm(u8, u8); -}; - -struct Z2CreatureLink { - static u8 mLinkPtr[4 + 4 /* padding */]; -}; - struct Z2Calc { struct CurveSign {}; /* 802A96F4 */ void getParamByExp(f32, f32, f32, f32, f32, f32, Z2Calc::CurveSign); }; -struct JSUPtrLink {}; - -struct JSUPtrList { - /* 802DBF14 */ void initiate(); - /* 802DBF4C */ void append(JSUPtrLink*); - /* 802DC15C */ void remove(JSUPtrLink*); -}; - // // Forward References: // @@ -88,8 +48,6 @@ extern "C" void stopBattleBgm__8Z2SeqMgrFUcUc(); extern "C" void initiate__10JSUPtrListFv(); extern "C" void append__10JSUPtrListFP10JSUPtrLink(); extern "C" void remove__10JSUPtrListFP10JSUPtrLink(); -extern "C" void PSVECSubtract(); -extern "C" void PSVECMag(); extern "C" void _savegpr_23(); extern "C" void _savegpr_27(); extern "C" void _restgpr_23(); @@ -97,7 +55,7 @@ extern "C" void _restgpr_27(); extern "C" void strcmp(); extern "C" extern u8 data_80450B48[4]; extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; +extern "C" extern Z2SeqMgr* data_80450B84; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // @@ -105,6 +63,16 @@ extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // /* 802BF920-802BF980 2BA260 0060+00 0/0 1/1 0/0 .text __ct__13Z2SoundObjMgrFv */ +#ifdef NONMATCHING +// order wrong because this needs to inherit from JASGlobalInstance +Z2SoundObjMgr::Z2SoundObjMgr() { + data_80450B84 = this; + mGhostEnemyState = 0; + mIsTwilightBattle = false; + setBattleInit(); + setForceBattleArea(false, 700, 1100, 1500); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -113,6 +81,7 @@ asm Z2SoundObjMgr::Z2SoundObjMgr() { #include "asm/Z2AudioLib/Z2SoundObjMgr/__ct__13Z2SoundObjMgrFv.s" } #pragma pop +#endif /* 802BF980-802BF994 2BA2C0 0014+00 1/1 3/3 3/3 .text setForceBattleArea__13Z2SoundObjMgrFbUsUsUs */ @@ -346,15 +315,20 @@ asm void Z2SoundObjMgr::searchEnemy() { } #pragma pop -/* 802BFFEC-802C0074 2BA92C 0088+00 1/1 2/2 0/0 .text setGhostEnemyState__13Z2SoundObjMgrFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjMgr::setGhostEnemyState(u8 param_0) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObjMgr/setGhostEnemyState__13Z2SoundObjMgrFUc.s" +void Z2SoundObjMgr::setGhostEnemyState(u8 p1) { + if (p1 == 0x20) { + if (field_0x1a >= field_0x16) { + data_80450B84->setBattleGhostMute(true); + } + } else { + if (field_0x1a == false) { + mGhostEnemyState = 0; + return; + } + } + + mGhostEnemyState = p1 + (mGhostEnemyState & 1); } -#pragma pop /* 802C0074-802C0100 2BA9B4 008C+00 0/0 1/1 0/0 .text * getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */ @@ -389,14 +363,22 @@ asm void Z2SoundObjMgr::checkBattleFinish() { /* 802C013C-802C0190 2BAA7C 0054+00 0/0 1/1 0/0 .text deleteEnemyAll__13Z2SoundObjMgrFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjMgr::deleteEnemyAll() { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObjMgr/deleteEnemyAll__13Z2SoundObjMgrFv.s" +void Z2SoundObjMgr::deleteEnemyAll() { + JSULink* link; + + // not moving the link pointer forward looks like a bug, but deleteObject() actually unlinks the + // enemy from its owning list + while (link = this->getFirst(), link != NULL) { + Z2CreatureEnemy* enemy = link->getObject(); + if (enemy == NULL) { + // setWarningMessage_f((JUTAssertion *)0x1,(ulong)"Z2SoundObjMgr.cpp",(char + // *)0x16f,(int)&*fill*, + // "[Z2SoundObjMgr::searchEnemy] remain remove enemy\n",in_r8); + } else { + enemy->deleteObject(); + } + } } -#pragma pop /* 802C0190-802C01E4 2BAAD0 0054+00 0/0 2/2 0/0 .text * removeEnemy__13Z2SoundObjMgrFP26JSULink<15Z2CreatureEnemy> */ @@ -414,7 +396,7 @@ asm void Z2SoundObjMgr::removeEnemy(JSULink* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void Z2SoundObjMgr::isTwilightBattle() { +asm bool Z2SoundObjMgr::isTwilightBattle() { nofralloc #include "asm/Z2AudioLib/Z2SoundObjMgr/isTwilightBattle__13Z2SoundObjMgrFv.s" } diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 8e97138e3fb..c7046fb0505 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -116,7 +116,7 @@ extern "C" void _restgpr_29(); extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B4C[4]; extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; +extern "C" extern Z2SoundStarter* data_80450B74; extern "C" extern u8 data_80450B88[4]; // @@ -184,38 +184,35 @@ SECTION_DATA extern void* __vt__14Z2SoundObjBase[8] = { (void*)startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc, }; -/* 802BDEF0-802BDF48 2B8830 0058+00 3/3 2/2 0/0 .text __ct__14Z2SoundObjBaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SoundObjBase::Z2SoundObjBase() { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObject/__ct__14Z2SoundObjBaseFv.s" +Z2SoundObjBase::Z2SoundObjBase() { + //! @note initializer list doesn't work since fields were initialized out of + //! structure layout order, indicating original code didn't use initializer list. + mSoundPos = NULL; + mIsInitialized = false; + mSoundStarter = data_80450B74; // sInstance + field_0x1c = 0; + field_0x1e = 0; } -#pragma pop -/* 802BDF48-802BDFB0 2B8888 0068+00 1/1 3/3 15/15 .text __dt__14Z2SoundObjBaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Z2SoundObjBase::~Z2SoundObjBase() { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObject/__dt__14Z2SoundObjBaseFv.s" +Z2SoundObjBase::~Z2SoundObjBase() { + deleteObject(); } -#pragma pop -/* 802BDFB0-802BDFF8 2B88F0 0048+00 5/4 2/2 0/0 .text init__14Z2SoundObjBaseFP3VecUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjBase::init(Vec* param_0, u8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObject/init__14Z2SoundObjBaseFP3VecUc.s" +void Z2SoundObjBase::init(Vec* pSoundPos, u8 pNumHandles) { + initHandlesPool(pNumHandles); + mSoundPos = pSoundPos; + mIsInitialized = true; } -#pragma pop /* 802BDFF8-802BE038 2B8938 0040+00 1/1 8/8 61/61 .text deleteObject__14Z2SoundObjBaseFv */ +// issue from using temp virtuals i think +#ifdef NONMATCHING +void Z2SoundObjBase::deleteObject() { + dispose(); + deleteHandlesPool(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -224,18 +221,37 @@ asm void Z2SoundObjBase::deleteObject() { #include "asm/Z2AudioLib/Z2SoundObject/deleteObject__14Z2SoundObjBaseFv.s" } #pragma pop +#endif -/* 802BE038-802BE070 2B8978 0038+00 4/1 3/0 0/0 .text framework__14Z2SoundObjBaseFUlSc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjBase::framework(u32 param_0, s8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObject/framework__14Z2SoundObjBaseFUlSc.s" +void Z2SoundObjBase::framework(u32 p1, s8 p2) { + if (mIsInitialized) { + field_0x1c = p1; + field_0x1e = p2; + setPos(*(JGeometry::TVec3*)mSoundPos); + } } -#pragma pop /* 802BE070-802BE104 2B89B0 0094+00 5/0 3/0 0/0 .text dispose__14Z2SoundObjBaseFv */ +// sInstance stuff +#ifdef NONMATCHING +void Z2SoundObjBase::dispose() { + JAISoundHandle* handle; + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { + handle = link->getObject(); + if (handle != NULL && (bool)*handle) { + u32 swBit = lbl_80450B4C->getSwBit((*handle)->getID()); + if ((swBit & 0x8000) != 0) { + handle->releaseSound(); + } else { + (*handle)->stop(); + } + } + } + + mIsInitialized = false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -244,9 +260,17 @@ asm void Z2SoundObjBase::dispose() { #include "asm/Z2AudioLib/Z2SoundObject/dispose__14Z2SoundObjBaseFv.s" } #pragma pop +#endif /* 802BE104-802BE144 2B8A44 0040+00 5/0 3/0 0/0 .text * stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool */ + +// sInstance stuff +#ifdef NONMATCHING +bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) { + return !(lbl_80450B4C->getSwBit(pSoundHandlePool->getID()) & 0x8000); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -255,6 +279,7 @@ asm bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& param_0) { #include "asm/Z2AudioLib/Z2SoundObject/stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80455B38-80455B3C 004138 0004+00 5/5 0/0 0/0 .sdata2 @3559 */ @@ -401,15 +426,9 @@ asm Z2SoundObjSimple::Z2SoundObjSimple() { } #pragma pop -/* 802BE880-802BE8A0 2B91C0 0020+00 1/0 0/0 0/0 .text init__16Z2SoundObjSimpleFP3VecUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void Z2SoundObjSimple::init(Vec* param_0, u8 param_1) { - nofralloc -#include "asm/Z2AudioLib/Z2SoundObject/init__16Z2SoundObjSimpleFP3VecUc.s" +void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) { + Z2SoundObjBase::init(pSoundPos, pNumHandles); } -#pragma pop /* ############################################################################################## */ /* 80455B50-80455B54 004150 0004+00 4/4 0/0 0/0 .sdata2 @3821 */ diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index ef1ee16fbdc..74b3d248269 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -39,10 +39,6 @@ struct mDoExt_MtxCalcAnmBlendTbl { /* 800D00BC */ void getAnm(int); }; -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - struct fopEn_enemy_c {}; struct e_wb_class { @@ -635,13 +631,6 @@ struct dInsect_c { /* 80110648 */ void Insect_Release(); }; -struct dEvt_info_c { - /* 801411E0 */ void onCondition(u16); - /* 80141200 */ void offCondition(u16); - /* 80141388 */ void checkCommandCatch(); - /* 80141450 */ void checkCommandDoor(); -}; - struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); @@ -24106,10 +24095,10 @@ asm void daAlink_c::checkPullBehindWall() { /* 800E8298-800E82B0 0E2BD8 0018+00 3/3 0/0 0/0 .text offGoatStopGame__9daAlink_cFv */ void daAlink_c::offGoatStopGame() { - if (field_0x56a != 0x2a) { + if (field_0x560[0xA] != 0x2a) { return; } else { - field_0x56a = 0; + field_0x560[0xA] = 0; } } @@ -24349,7 +24338,7 @@ asm void daAlink_c::checkSumouVsActor() { /* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text cancelSumouMode__9daAlink_cFv */ void daAlink_c::cancelSumouMode() { field_0x2854.clearData(); - field_0x56a = 0; + field_0x560[0xA] = 0; } /* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text sumouPunchTrigger__9daAlink_cFv */ @@ -35167,7 +35156,7 @@ void daPy_demo_c::setSpecialDemoType() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_info_c::checkCommandCatch() { +asm bool dEvt_info_c::checkCommandCatch() { nofralloc #include "asm/d/a/d_a_alink/checkCommandCatch__11dEvt_info_cFv.s" } @@ -35245,7 +35234,7 @@ static asm void dComIfGp_event_chkEventFlag(u16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_info_c::checkCommandDoor() { +asm bool dEvt_info_c::checkCommandDoor() { nofralloc #include "asm/d/a/d_a_alink/checkCommandDoor__11dEvt_info_cFv.s" } diff --git a/src/d/bg/d_bg_s_lin_chk.cpp b/src/d/bg/d_bg_s_lin_chk.cpp index c5a23ae34f8..a36d4f35c8e 100644 --- a/src/d/bg/d_bg_s_lin_chk.cpp +++ b/src/d/bg/d_bg_s_lin_chk.cpp @@ -26,11 +26,6 @@ struct dBgS_CamLinChk { /* 80077E00 */ ~dBgS_CamLinChk(); }; -struct dBgS_BombLinChk { - /* 80078104 */ dBgS_BombLinChk(); - /* 80078160 */ ~dBgS_BombLinChk(); -}; - // // Forward References: // diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index faeae6a980b..2e835f4056c 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -27,10 +27,6 @@ struct mDoGph_gInf_c { static u8 mFader[4]; }; -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - struct dSmplMdl_draw_c { /* 80048CB4 */ dSmplMdl_draw_c(); /* 80048E0C */ void draw(); diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 58eb3b4e3fc..f025c002057 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -6,75 +6,21 @@ #include "d/d_bomb.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" -// -// Types: -// - -struct fopAc_ac_c {}; - -struct dBomb_c { - /* 80031F94 */ void checkStateCarry(); - /* 80031FCC */ void checkFlowerBombWait(fopAc_ac_c*); - /* 80031FF4 */ void checkWaterBomb(fopAc_ac_c*); - /* 8003201C */ void checkInsectBombMove(fopAc_ac_c*); -}; - -// -// Forward References: -// - -extern "C" void checkStateCarry__7dBomb_cFv(); -extern "C" void checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c(); -extern "C" void checkWaterBomb__7dBomb_cFP10fopAc_ac_c(); -extern "C" void checkInsectBombMove__7dBomb_cFP10fopAc_ac_c(); - -// -// External References: -// - -// -// Declarations: -// - -/* 80031F94-80031FCC 02C8D4 0038+00 0/0 0/0 5/5 .text checkStateCarry__7dBomb_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBomb_c::checkStateCarry() { - nofralloc -#include "asm/d/d_bomb/checkStateCarry__7dBomb_cFv.s" +bool dBomb_c::checkStateCarry() { + return (fopAcM_checkCarryNow(&mActor) || fopAcM_checkHookCarryNow(&mActor) || + fopAcM_GetParam(&mActor) == 2 || fopAcM_GetParam(&mActor) == 1); } -#pragma pop -/* 80031FCC-80031FF4 02C90C 0028+00 0/0 0/0 1/1 .text checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/d_bomb/checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c.s" +bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) { + return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 4); } -#pragma pop -/* 80031FF4-8003201C 02C934 0028+00 0/0 0/0 1/1 .text checkWaterBomb__7dBomb_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBomb_c::checkWaterBomb(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/d_bomb/checkWaterBomb__7dBomb_cFP10fopAc_ac_c.s" +bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1) { + return (fopAcM_GetName(&mActor) == 0x221 && daNbomb_c::checkWaterBomb()); } -#pragma pop -/* 8003201C-80032044 02C95C 0028+00 0/0 0/0 1/1 .text checkInsectBombMove__7dBomb_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBomb_c::checkInsectBombMove(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/d_bomb/checkInsectBombMove__7dBomb_cFP10fopAc_ac_c.s" -} -#pragma pop +bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1) { + return (fopAcM_GetName(&mActor) == 0x221 && fopAcM_GetParam(&mActor) == 7); +} \ No newline at end of file diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index d21b0b4a9f6..2ad40eeff3b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -90,14 +90,6 @@ struct JKRExpHeap { struct JKRAramArchive {}; -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - struct FuncTable {}; // diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 53a38161567..244c1910116 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -6,6 +6,8 @@ #include "d/event/d_event.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_iter.h" +#include "f_op/f_op_actor_mng.h" // // Types: @@ -37,34 +39,6 @@ struct dMsgObject_c { /* 80238098 */ void endFlowGroup(); }; -struct dEvt_info_c { - /* 800433F0 */ dEvt_info_c(); - /* 80043428 */ void setEventName(char*); - /* 80043480 */ void getEventName(); - /* 800434CC */ void beforeProc(); -}; - -struct dEvent_manager_c { - /* 80046800 */ void setObjectArchive(char*); - /* 80046DAC */ void endProc(s16, int); - /* 80046E64 */ void Sequencer(); - /* 800473FC */ void Experts(); - /* 800474BC */ void getEventData(s16); - /* 80047514 */ void getEventIdx(char const*, u8, s32); - /* 80047698 */ void getEventIdx(fopAc_ac_c*, u8); - /* 80047984 */ void order(s16); - /* 800482CC */ void issueStaff(char const*); - /* 80048348 */ void cancelStaff(char const*); -}; - -struct dEvent_exception_c { - /* 800463F0 */ void setStartDemo(int); -}; - -struct dEvDtEvent_c { - /* 80043EFC */ void forceFinish(); -}; - struct dDemo_c { /* 80039CF8 */ void end(); @@ -157,7 +131,7 @@ extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); extern "C" void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(); extern "C" void fpcSch_JudgeByID__FPvPv(); extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); -extern "C" void dStage_changeScene4Event__FiScibfUlsi(); +extern "C" void dStage_changeScene4Event__FiScibfUlsi(int, s8, int, bool, float, u32, s16, int); extern "C" void dComIfGp_getSelectItem__Fi(); extern "C" void dComIfG_getStageRes__FPCc(); extern "C" void dComIfG_getRoomArcName__Fi(); @@ -232,17 +206,10 @@ static asm void func_80041488() { } #pragma pop -/* 80041580-800415D4 03BEC0 0054+00 0/0 1/1 0/0 .text __ct__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvt_control_c::dEvt_control_c() { - nofralloc -#include "asm/d/event/d_event/__ct__14dEvt_control_cFv.s" +dEvt_control_c::dEvt_control_c() { + remove(); } -#pragma pop -/* 800415D4-800415D8 03BF14 0004+00 1/1 0/0 0/0 .text __ct__12dEvt_order_cFv */ dEvt_order_c::dEvt_order_c() { /* empty function */ } @@ -290,7 +257,7 @@ asm void dEvt_control_c::setParam(dEvt_order_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvt_control_c::beforeFlagProc(dEvt_order_c* param_0) { +asm s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* param_0) { nofralloc #include "asm/d/event/d_event/beforeFlagProc__14dEvt_control_cFP12dEvt_order_c.s" } @@ -405,16 +372,22 @@ asm void dEvt_control_c::demoEnd() { } #pragma pop -/* 80041FA0-80042014 03C8E0 0074+00 1/1 0/0 0/0 .text - * potentialCheck__14dEvt_control_cFP12dEvt_order_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::potentialCheck(dEvt_order_c* param_0) { - nofralloc -#include "asm/d/event/d_event/potentialCheck__14dEvt_control_cFP12dEvt_order_c.s" +s32 dEvt_control_c::potentialCheck(dEvt_order_c* param_0) { + fopAc_ac_c* actor = param_0->mActor1; + s32 ret; + s32 tmp = beforeFlagProc(param_0); + + if (!tmp) { + ret = 0; + } else { + actor->mEvtInfo.setCommand(2); + mMode = 2; + setParam(param_0); + afterFlagProc(param_0); + ret = 1; + } + return ret; } -#pragma pop /* 80042014-8004212C 03C954 0118+00 1/1 0/0 0/0 .text doorCheck__14dEvt_control_cFP12dEvt_order_c */ @@ -514,22 +487,23 @@ asm void dEvt_control_c::reset(void* param_0) { } #pragma pop -/* 800425B4-800425E8 03CEF4 0034+00 2/2 0/0 0/0 .text clearSkipSystem__14dEvt_control_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::clearSkipSystem() { - nofralloc -#include "asm/d/event/d_event/clearSkipSystem__14dEvt_control_cFv.s" +void dEvt_control_c::clearSkipSystem() { + mSkipFunc = NULL; + field_0x104 = -1; + field_0x10c = 0; + field_0x108 = 0; + + if (!chkFlag2(3)) { + mSkipFade = 0; + } + mSkipEventName[0] = 0; } -#pragma pop /* 800425E8-8004261C 03CF28 0034+00 0/0 2/2 5/5 .text dEv_defaultSkipProc__FPvi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEv_defaultSkipProc(void* param_0, int param_1) { +asm int dEv_defaultSkipProc(void* param_0, int param_1) { nofralloc #include "asm/d/event/d_event/dEv_defaultSkipProc__FPvi.s" } @@ -546,7 +520,7 @@ SECTION_DEAD static char const* const stringBase_80379DC3 = "$0"; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEv_defaultSkipZev(void* param_0, int param_1) { +asm int dEv_defaultSkipZev(void* param_0, int param_1) { nofralloc #include "asm/d/event/d_event/dEv_defaultSkipZev__FPvi.s" } @@ -556,7 +530,7 @@ asm void dEv_defaultSkipZev(void* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEv_defaultSkipStb(void* param_0, int param_1) { +asm int dEv_defaultSkipStb(void* param_0, int param_1) { nofralloc #include "asm/d/event/d_event/dEv_defaultSkipStb__FPvi.s" } @@ -566,63 +540,37 @@ asm void dEv_defaultSkipStb(void* param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEv_noFinishSkipProc(void* param_0, int param_1) { +asm int dEv_noFinishSkipProc(void* param_0, int param_1) { nofralloc #include "asm/d/event/d_event/dEv_noFinishSkipProc__FPvi.s" } #pragma pop -/* 8004290C-80042914 03D24C 0008+00 2/2 0/0 0/0 .text getSkipEventName__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::getSkipEventName() { - nofralloc -#include "asm/d/event/d_event/getSkipEventName__14dEvt_control_cFv.s" +char* dEvt_control_c::getSkipEventName() { + return mSkipEventName; } -#pragma pop -/* 80042914-80042958 03D254 0044+00 1/1 3/3 64/64 .text setSkipProc__14dEvt_control_cFPvPFPvi_ii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setSkipProc(void* param_0, int (*param_1)(void*, int), int param_2) { - nofralloc -#include "asm/d/event/d_event/setSkipProc__14dEvt_control_cFPvPFPvi_ii.s" +void dEvt_control_c::setSkipProc(void* param_0, SkipFunc skipFunc, int param_2) { + mSkipFunc = skipFunc; + field_0x104 = getPId(param_0); + field_0x10c = param_2; } -#pragma pop -/* 80042958-800429A8 03D298 0050+00 0/0 1/1 14/14 .text setSkipZev__14dEvt_control_cFPvPc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setSkipZev(void* param_0, char* param_1) { - nofralloc -#include "asm/d/event/d_event/setSkipZev__14dEvt_control_cFPvPc.s" +void dEvt_control_c::setSkipZev(void* param_0, char* pName) { + setSkipProc(param_0, dEv_defaultSkipZev, 1); + strcpy(mSkipEventName, pName); } -#pragma pop -/* 800429A8-800429B4 03D2E8 000C+00 0/0 1/1 30/30 .text onSkipFade__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::onSkipFade() { - nofralloc -#include "asm/d/event/d_event/onSkipFade__14dEvt_control_cFv.s" +void dEvt_control_c::onSkipFade() { + mSkipFade = 1; } -#pragma pop -/* 800429B4-800429D4 03D2F4 0020+00 1/1 0/0 0/0 .text offSkipFade__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::offSkipFade() { - nofralloc -#include "asm/d/event/d_event/offSkipFade__14dEvt_control_cFv.s" +void dEvt_control_c::offSkipFade() { + if (mSkipFade != 0) { + mSkipFade = 0; + } + mSkipFade = 0; } -#pragma pop /* ############################################################################################## */ /* 80451EC4-80451EC8 0004C4 0004+00 1/1 0/0 0/0 .sdata2 @4904 */ @@ -673,57 +621,55 @@ asm void dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 para } #pragma pop -/* ############################################################################################## */ -/* 80451ECC-80451ED0 0004CC 0004+00 2/2 0/0 0/0 .sdata2 @5095 */ -SECTION_SDATA2 static u8 lit_5095[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 800431E8-80043278 03DB28 0090+00 1/1 1/1 0/0 .text remove__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::remove() { - nofralloc -#include "asm/d/event/d_event/remove__14dEvt_control_cFv.s" +void dEvt_control_c::remove() { + mMode = 0; + field_0xe5 = 0; + mNum = 0; + mDebugStb = 0; + field_0xe6 = 0; + field_0xe7 = 0; + mCullRate = 0.0f; + field_0xea = -1; + mMapToolId = -1; + field_0xec = -1; + mStageEventDt = NULL; + field_0xe0 = 255; + field_0xed = 0; + mPreItemNo = -1; + mEventFlag = 0; + mFlag2 = 0; + mChangeOK = NULL; + clearSkipSystem(); + mCompulsory = 0; + field_0x129 = 0; + field_0x12c = -1; } -#pragma pop /* 80043278-80043280 03DBB8 0008+00 2/2 2/2 0/0 .text getStageEventDt__14dEvt_control_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::getStageEventDt() { - nofralloc -#include "asm/d/event/d_event/getStageEventDt__14dEvt_control_cFv.s" +// ret type probably wrong, fix later +void* dEvt_control_c::getStageEventDt() { + return mStageEventDt; } -#pragma pop -/* 80043280-800432C8 03DBC0 0048+00 0/0 1/1 0/0 .text sceneChange__14dEvt_control_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::sceneChange(int param_0) { - nofralloc -#include "asm/d/event/d_event/sceneChange__14dEvt_control_cFi.s" +void dEvt_control_c::sceneChange(int param_0) { + dStage_changeScene4Event__FiScibfUlsi(param_0, field_0x12c, -1, field_0x129, 0.0f, 0, 0, -1); } -#pragma pop -/* 800432C8-800432EC 03DC08 0024+00 6/6 0/0 0/0 .text getPId__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::getPId(void* param_0) { - nofralloc -#include "asm/d/event/d_event/getPId__14dEvt_control_cFPv.s" +u32 dEvt_control_c::getPId(void* param_0) { + if (param_0 == NULL) { + return 0xffffffff; + } else { + return fopAcM_GetID(param_0); + } } -#pragma pop /* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */ +#ifdef NONMATCHING +void dEvt_control_c::convPId(unsigned int param_0) { + fopAcIt_Judge(fpcSch_JudgeByID, (void*)param_0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -732,6 +678,7 @@ asm void dEvt_control_c::convPId(unsigned int param_0) { #include "asm/d/event/d_event/convPId__14dEvt_control_cFUi.s" } #pragma pop +#endif /* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc */ @@ -744,15 +691,14 @@ asm void dEvt_control_c::getStbDemoData(char* param_0) { } #pragma pop -/* 800433F0-80043428 03DD30 0038+00 0/0 1/1 0/0 .text __ct__11dEvt_info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvt_info_c::dEvt_info_c() { - nofralloc -#include "asm/d/event/d_event/__ct__11dEvt_info_cFv.s" +dEvt_info_c::dEvt_info_c() { + setCommand(0); + setCondition(2); + setEventId(-1); + setMapToolId(-1); + mArchiveName = NULL; + mIndex = 0; } -#pragma pop /* 80043428-80043480 03DD68 0058+00 0/0 0/0 4/4 .text setEventName__11dEvt_info_cFPc */ #pragma push @@ -774,15 +720,9 @@ asm void dEvt_info_c::getEventName() { } #pragma pop -/* 800434CC-800434D8 03DE0C 000C+00 0/0 1/1 0/0 .text beforeProc__11dEvt_info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_info_c::beforeProc() { - nofralloc -#include "asm/d/event/d_event/beforeProc__11dEvt_info_cFv.s" +void dEvt_info_c::beforeProc() { + setCondition(2); } -#pragma pop /* 800434D8-80043500 03DE18 0028+00 0/0 4/4 1/1 .text searchMapEventData__14dEvt_control_cFUc */ #pragma push @@ -804,75 +744,36 @@ asm void dEvt_control_c::searchMapEventData(u8 param_0, s32 param_1) { } #pragma pop -/* 8004360C-8004362C 03DF4C 0020+00 0/0 1/1 0/0 .text runningEventID__14dEvt_control_cFs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::runningEventID(s16 param_0) { - nofralloc -#include "asm/d/event/d_event/runningEventID__14dEvt_control_cFs.s" +s16 dEvt_control_c::runningEventID(s16 param_0) { + return param_0 == field_0xe0 ? mSpecifiedEvent : param_0; } -#pragma pop -/* 8004362C-8004365C 03DF6C 0030+00 1/1 0/0 0/0 .text setPt1__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPt1(void* param_0) { - nofralloc -#include "asm/d/event/d_event/setPt1__14dEvt_control_cFPv.s" +void dEvt_control_c::setPt1(void* param_0) { + mPt1 = getPId(param_0); } -#pragma pop -/* 8004365C-8004368C 03DF9C 0030+00 1/1 2/2 28/28 .text setPt2__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPt2(void* param_0) { - nofralloc -#include "asm/d/event/d_event/setPt2__14dEvt_control_cFPv.s" +void dEvt_control_c::setPt2(void* param_0) { + mPt2 = getPId(param_0); } -#pragma pop -/* 8004368C-800436BC 03DFCC 0030+00 1/1 4/4 21/21 .text setPtT__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPtT(void* param_0) { - nofralloc -#include "asm/d/event/d_event/setPtT__14dEvt_control_cFPv.s" +void dEvt_control_c::setPtT(void* param_0) { + mPtT = getPId(param_0); } -#pragma pop -/* 800436BC-800436EC 03DFFC 0030+00 1/1 2/2 3/3 .text setPtI__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPtI(void* param_0) { - nofralloc -#include "asm/d/event/d_event/setPtI__14dEvt_control_cFPv.s" +void dEvt_control_c::setPtI(void* param_0) { + mPtI = getPId(param_0); } -#pragma pop -/* 800436EC-800436F4 -00001 0008+00 0/0 0/0 0/0 .text setPtI_Id__14dEvt_control_cFUi */ void dEvt_control_c::setPtI_Id(unsigned int param_0) { - *(u32*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u32)(param_0); + mPtI = param_0; } -/* 800436F4-80043724 03E034 0030+00 0/0 4/4 0/0 .text setPtD__14dEvt_control_cFPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvt_control_c::setPtD(void* param_0) { - nofralloc -#include "asm/d/event/d_event/setPtD__14dEvt_control_cFPv.s" +void dEvt_control_c::setPtD(void* param_0) { + mPtd = getPId(param_0); } -#pragma pop -/* 80043724-8004372C -00001 0008+00 0/0 0/0 0/0 .text setGtItm__14dEvt_control_cFUc */ void dEvt_control_c::setGtItm(u8 param_0) { - *(u8*)(((u8*)this) + 239) /* this->field_0xef */ = (u8)(param_0); + mGtItm = param_0; } /* ############################################################################################## */ diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 01bb85de381..44992dab528 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -11,8 +11,6 @@ // Types: // -struct _GXColor {}; - struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); /* 800080D0 */ void fadeOut(f32); @@ -61,10 +59,6 @@ struct dEvent_manager_c { /* 8004817C */ void cutEnd(int); }; -struct dEvDtCut_c { - /* 800460A8 */ void startCheck(); -}; - struct dDlst_list_c { /* 800568D8 */ void wipeIn(f32); @@ -360,25 +354,19 @@ asm void dEvDtFlag_c::flagSet(int param_0) { } #pragma pop -/* 80043E30-80043E58 03E770 0028+00 2/2 0/0 0/0 .text flagMaxCheck__11dEvDtFlag_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtFlag_c::flagMaxCheck(int param_0) { - nofralloc -#include "asm/d/event/d_event_data/flagMaxCheck__11dEvDtFlag_cFi.s" -} -#pragma pop +bool dEvDtFlag_c::flagMaxCheck(int flag_id) { + if (flag_id == -1) { + return true; + } -/* 80043E58-80043E78 03E798 0020+00 0/0 3/3 0/0 .text init__11dEvDtFlag_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtFlag_c::init() { - nofralloc -#include "asm/d/event/d_event_data/init__11dEvDtFlag_cFv.s" + return FlagMax <= flag_id; +} + +void dEvDtFlag_c::init() { + for (int i = 0; i < 320; i++) { + mFlags[i] = 0; + } } -#pragma pop /* 80043E78-80043EFC 03E7B8 0084+00 0/0 1/1 0/0 .text finishCheck__12dEvDtEvent_cFv */ #pragma push diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 98e50c39e8c..13a19a384f0 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -183,15 +183,10 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -/* 800463DC-800463F0 040D1C 0014+00 2/2 0/0 0/0 .text init__18dEvent_exception_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_exception_c::init() { - nofralloc -#include "asm/d/event/d_event_manager/init__18dEvent_exception_cFv.s" +void dEvent_exception_c::init() { + mEventInfoIdx = -1; + mState = 0; } -#pragma pop /* 800463F0-80046480 040D30 0090+00 0/0 2/2 0/0 .text setStartDemo__18dEvent_exception_cFi */ #pragma push @@ -267,25 +262,13 @@ asm void dEvent_manager_c::getSubstance(dEvDtData_c* param_0, int param_1) { } #pragma pop -/* 80046688-800466E0 040FC8 0058+00 0/0 1/1 0/0 .text __ct__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvent_manager_c::dEvent_manager_c() { - nofralloc -#include "asm/d/event/d_event_manager/__ct__16dEvent_manager_cFv.s" +dEvent_manager_c::dEvent_manager_c() { + mDataLoaded = false; } -#pragma pop -/* 800466E0-80046710 041020 0030+00 1/1 0/0 0/0 .text __ct__11dEvDtBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dEvDtBase_c::dEvDtBase_c() { - nofralloc -#include "asm/d/event/d_event_manager/__ct__11dEvDtBase_cFv.s" +dEvDtBase_c::dEvDtBase_c() { + init(); } -#pragma pop /* ############################################################################################## */ /* 80379F50-80379F60 0065B0 000F+01 6/6 0/0 0/0 .rodata @@ -357,15 +340,13 @@ asm void dEvent_manager_c::roomInit(int param_0) { } #pragma pop -/* 800469EC-80046A58 04132C 006C+00 0/0 1/1 0/0 .text roomFinish__16dEvent_manager_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::roomFinish(int param_0) { - nofralloc -#include "asm/d/event/d_event_manager/roomFinish__16dEvent_manager_cFi.s" +void dEvent_manager_c::roomFinish(int param_0) { + for (int i = 4; i <= 9; i++) { + if (mEventList[i].getHeaderP() != NULL && param_0 == mEventList[i].roomNo()) { + mEventList[i].init(); + } + } } -#pragma pop /* ############################################################################################## */ /* 80379F60-80379F60 0065C0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -385,15 +366,14 @@ asm void dEvent_manager_c::orderStartDemo() { } #pragma pop -/* 80046C0C-80046C74 04154C 0068+00 0/0 1/1 0/0 .text remove__16dEvent_manager_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::remove() { - nofralloc -#include "asm/d/event/d_event_manager/remove__16dEvent_manager_cFv.s" +void dEvent_manager_c::remove() { + for (int i = 0; i < 11; i++) { + mEventList[i].init(); + } + mCameraPlay = 0; + mEventException.init(); + mFlags.init(); } -#pragma pop /* 80046C74-80046C88 0415B4 0014+00 1/1 0/0 0/0 .text extraOnObjectCallBack__FP10fopAc_ac_cPv */ #pragma push @@ -514,14 +494,35 @@ asm void dEvent_manager_c::Experts() { /* 80047454-800474BC 041D94 0068+00 1/1 0/0 0/0 .text getEventData__16dEvent_manager_cFsi */ +#ifdef NONMATCHING +dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int param_1) { + dEvDtBase_c* baseptr; + dEvDtEvent_c* eventptr; + + if (param_1 < 1 || param_1 > 12) { + eventptr = NULL; + } else { + baseptr = &mEventList[param_1]; + if (baseptr == NULL || baseptr->getHeaderP() == NULL) { + eventptr = NULL; + } else if (param_0 < 0 || baseptr->getEventNum() <= param_0) { + eventptr = NULL; + } else { + eventptr = baseptr->getEventP(param_1); + } + } + return eventptr; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvent_manager_c::getEventData(s16 param_0, int param_1) { +asm dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int param_1) { nofralloc #include "asm/d/event/d_event_manager/getEventData__16dEvent_manager_cFsi.s" } #pragma pop +#endif /* 800474BC-80047514 041DFC 0058+00 9/9 3/3 4/4 .text getEventData__16dEvent_manager_cFs */ diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 1fb2129d8b6..2e6a8c58267 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -73,8 +73,6 @@ struct dStage_roomControl_c { static u8 mStatus[65792]; }; -struct dKy_tevstr_c {}; - struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; @@ -203,12 +201,6 @@ struct J3DModel {}; struct J3DMaterial {}; -struct J3DLightObj {}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - struct J3DGXColor {}; struct J3DFrameCtrl { diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index c1d3aa1004e..052f0636e2f 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -19,139 +19,6 @@ struct mDoGph_gInf_c { static u8 mFrameBufferTex[4]; }; -struct mDoCPd_c { - static u8 m_cpadInfo[256]; -}; - -struct dMw_c { - /* 801FA13C */ void key_wait_init(u8); - /* 801FA220 */ void ring_open_init(u8); - /* 801FA23C */ void ring_move_init(u8); - /* 801FA240 */ void ring_close_init(u8); - /* 801FA244 */ void collect_open_init(u8); - /* 801FA2D0 */ void collect_move_init(u8); - /* 801FA46C */ void collect_close_init(u8); - /* 801FA538 */ void fmap_open_init(u8); - /* 801FA55C */ void fmap_move_init(u8); - /* 801FA560 */ void fmap_close_init(u8); - /* 801FA564 */ void dmap_open_init(u8); - /* 801FA588 */ void dmap_move_init(u8); - /* 801FA58C */ void dmap_close_init(u8); - /* 801FA590 */ void collect_save_open_init(u8); - /* 801FA5E4 */ void collect_save_move_init(u8); - /* 801FA5E8 */ void collect_save_close_init(u8); - /* 801FA608 */ void collect_option_open_init(u8); - /* 801FA65C */ void collect_option_move_init(u8); - /* 801FA660 */ void collect_option_close_init(u8); - /* 801FA680 */ void collect_letter_open_init(u8); - /* 801FA6DC */ void collect_letter_move_init(u8); - /* 801FA6E0 */ void collect_letter_close_init(u8); - /* 801FA738 */ void collect_fishing_open_init(u8); - /* 801FA794 */ void collect_fishing_move_init(u8); - /* 801FA798 */ void collect_fishing_close_init(u8); - /* 801FA7F0 */ void collect_skill_open_init(u8); - /* 801FA84C */ void collect_skill_move_init(u8); - /* 801FA850 */ void collect_skill_close_init(u8); - /* 801FA8A8 */ void collect_insect_open_init(u8); - /* 801FA908 */ void collect_insect_move_init(u8); - /* 801FA90C */ void collect_insect_close_init(u8); - /* 801FA964 */ void insect_open_init(u8); - /* 801FA9E8 */ void insect_open2_init(u8); - /* 801FA9EC */ void insect_move_init(u8); - /* 801FA9F0 */ void insect_close_init(u8); - /* 801FAA48 */ void key_wait_proc(); - /* 801FAFDC */ void ring_open_proc(); - /* 801FB01C */ void ring_move_proc(); - /* 801FB064 */ void ring_close_proc(); - /* 801FB0B8 */ void collect_open_proc(); - /* 801FB110 */ void collect_move_proc(); - /* 801FB1A0 */ void collect_close_proc(); - /* 801FB240 */ void fmap_open_proc(); - /* 801FB298 */ void fmap_move_proc(); - /* 801FB36C */ void fmap_close_proc(); - /* 801FB3AC */ void dmap_open_proc(); - /* 801FB404 */ void dmap_move_proc(); - /* 801FB5DC */ void dmap_close_proc(); - /* 801FB61C */ void collect_save_open_proc(); - /* 801FB67C */ void collect_save_move_proc(); - /* 801FB6D8 */ void collect_save_close_proc(); - /* 801FB73C */ void collect_option_open_proc(); - /* 801FB7AC */ void collect_option_move_proc(); - /* 801FB800 */ void collect_option_close_proc(); - /* 801FB81C */ void collect_letter_open_proc(); - /* 801FB8AC */ void collect_letter_move_proc(); - /* 801FB900 */ void collect_letter_close_proc(); - /* 801FB91C */ void collect_fishing_open_proc(); - /* 801FB9AC */ void collect_fishing_move_proc(); - /* 801FBA00 */ void collect_fishing_close_proc(); - /* 801FBA1C */ void collect_skill_open_proc(); - /* 801FBAAC */ void collect_skill_move_proc(); - /* 801FBB00 */ void collect_skill_close_proc(); - /* 801FBB1C */ void collect_insect_open_proc(); - /* 801FBBAC */ void collect_insect_move_proc(); - /* 801FBC00 */ void collect_insect_close_proc(); - /* 801FBC1C */ void insect_open_proc(); - /* 801FBC78 */ void insect_open2_proc(); - /* 801FBD08 */ void insect_move_proc(); - /* 801FBD64 */ void insect_close_proc(); - /* 801FBD80 */ void dMw_capture_create(); - /* 801FBE14 */ void dMw_capture_delete(); - /* 801FBE94 */ void dMw_ring_create(u8); - /* 801FBF60 */ void dMw_ring_delete(); - /* 801FBFF8 */ void dMw_collect_create(); - /* 801FC090 */ void dMw_collect_delete(bool); - /* 801FC0FC */ void dMw_fmap_create(); - /* 801FC264 */ void dMw_fmap_delete(bool); - /* 801FC350 */ void dMw_dmap_create(); - /* 801FC46C */ void dMw_dmap_delete(bool); - /* 801FC520 */ void dMw_save_create(); - /* 801FC5D0 */ void dMw_save_delete(); - /* 801FC668 */ void dMw_option_create(); - /* 801FC70C */ void dMw_option_delete(); - /* 801FC7BC */ void dMw_letter_create(); - /* 801FC85C */ void dMw_letter_delete(); - /* 801FC904 */ void dMw_fishing_create(); - /* 801FC9A4 */ void dMw_fishing_delete(); - /* 801FCA4C */ void dMw_skill_create(); - /* 801FCAEC */ void dMw_skill_delete(); - /* 801FCB94 */ void dMw_insect_create(u8); - /* 801FCC44 */ void dMw_insect_delete(); - /* 801FCCEC */ void dMw_onButtonBit(u8); - /* 801FCCFC */ void dMw_offButtonBit(u8); - /* 801FCD0C */ void dMw_isButtonBit(u8); - /* 801FCD24 */ void dMw_isPush_S_Button(); - /* 801FCDD8 */ void isPauseReady(); - /* 801FCE08 */ void dMw_fade_out(); - /* 801FCE78 */ void dMw_fade_in(); - /* 801FCEE8 */ void checkCStickTrigger(); - /* 801FCF84 */ void isEventCheck(); - /* 801FD094 */ void markMemSize(); - /* 801FD0D4 */ void checkMemSize(); - /* 801FD140 */ void _create(); - /* 801FD2D8 */ void _execute(); - /* 801FD450 */ void _draw(); - /* 801FD67C */ void _delete(); -}; - -struct dMsgObject_c { - /* 802379AC */ void setKillMessageFlag(); - /* 8023822C */ void getStatus(); -}; - -struct dMeterMap_c { - /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); - /* 8020D874 */ void setDispPosInsideFlg_SE_On(); - /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); -}; - -struct dMeter2_c { - /* 8021F6EC */ void emphasisButtonDelete(); -}; - -struct dMeter2Info_c { - /* 8021C9DC */ void resetWarpStatus(); -}; - struct dMenu_save_c { /* 801EF6A0 */ dMenu_save_c(); /* 801EF7AC */ void _create(); @@ -170,8 +37,6 @@ struct STControl { struct CSTControl {}; -struct JKRExpHeap {}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); @@ -189,8 +54,6 @@ struct dMenu_Ring_c { /* 801EB3CC */ void isClose(); }; -struct JKRArchive {}; - struct dMenu_Option_c { /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*); /* 801E2C1C */ void _delete(); @@ -272,8 +135,6 @@ struct dDlst_MENU_CAPTURE_c { struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -282,11 +143,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRHeap { - /* 802CE5CC */ void freeAll(); - /* 802CE784 */ void getTotalFreeSize(); -}; - struct JFWDisplay { static u8 sManager[4]; }; @@ -307,7 +163,7 @@ extern "C" void dMw_onPauseWindow__Fv(); extern "C" void dMw_offPauseWindow__Fv(); extern "C" void dMw_onMenuRing__Fv(); extern "C" void dMw_offMenuRing__Fv(); -extern "C" static void dMw_isMenuRing__Fv(); +extern "C" static bool dMw_isMenuRing__Fv(); extern "C" void key_wait_init__5dMw_cFUc(); extern "C" void ring_open_init__5dMw_cFUc(); extern "C" void ring_move_init__5dMw_cFUc(); @@ -429,7 +285,6 @@ extern "C" extern char const* const d_menu_d_menu_window__stringBase0; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getCurrentHeap__Fv(); extern "C" void mDoExt_removeMesgFont__Fv(); @@ -565,7 +420,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_mwHIO[304]; extern "C" extern u8 g_mwDHIO[520]; extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 g_clearColor[4]; extern "C" extern u32 g_blackColor; extern "C" u8 mFader__13mDoGph_gInf_c[4]; @@ -579,135 +433,86 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // -/* 801F9F84-801F9F98 1F48C4 0014+00 3/3 2/2 0/0 .text dMw_UP_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_UP_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_UP_TRIGGER__Fv.s" +BOOL dMw_UP_TRIGGER() { + return (bool)mDoCPd_c::getTrigUp(mDoCPd_c::PAD_0); } -#pragma pop -/* 801F9F98-801F9FAC 1F48D8 0014+00 1/1 2/2 0/0 .text dMw_DOWN_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_DOWN_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_DOWN_TRIGGER__Fv.s" +bool dMw_DOWN_TRIGGER() { + return mDoCPd_c::getTrigDown(mDoCPd_c::PAD_0); } -#pragma pop -/* 801F9FAC-801F9FF4 1F48EC 0048+00 1/1 6/6 0/0 .text dMw_LEFT_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_LEFT_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_LEFT_TRIGGER__Fv.s" +bool dMw_LEFT_TRIGGER() { + if (mDoCPd_c::getTrigLeft(mDoCPd_c::PAD_0) && !dMw_UP_TRIGGER()) { + return true; + } else { + return false; + } } -#pragma pop -/* 801F9FF4-801FA03C 1F4934 0048+00 1/1 6/6 0/0 .text dMw_RIGHT_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_RIGHT_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_RIGHT_TRIGGER__Fv.s" +bool dMw_RIGHT_TRIGGER() { + if (mDoCPd_c::getTrigRight(mDoCPd_c::PAD_0) && !dMw_UP_TRIGGER()) { + return true; + } else { + return false; + } } -#pragma pop -/* 801FA03C-801FA050 1F497C 0014+00 1/1 7/7 0/0 .text dMw_A_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_A_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_A_TRIGGER__Fv.s" +bool dMw_A_TRIGGER() { + return mDoCPd_c::getTrigA(mDoCPd_c::PAD_0); } -#pragma pop -/* 801FA050-801FA064 1F4990 0014+00 1/1 8/8 0/0 .text dMw_B_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_B_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_B_TRIGGER__Fv.s" +bool dMw_B_TRIGGER() { + return mDoCPd_c::getTrigB(mDoCPd_c::PAD_0); } -#pragma pop -/* 801FA064-801FA078 1F49A4 0014+00 0/0 5/5 0/0 .text dMw_Z_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_Z_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_Z_TRIGGER__Fv.s" +bool dMw_Z_TRIGGER() { + return mDoCPd_c::getTrigZ(mDoCPd_c::PAD_0); } -#pragma pop -/* 801FA078-801FA08C 1F49B8 0014+00 2/2 1/1 0/0 .text dMw_START_TRIGGER__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_START_TRIGGER() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_START_TRIGGER__Fv.s" +bool dMw_START_TRIGGER() { + return mDoCPd_c::getTrigStart(mDoCPd_c::PAD_0); } -#pragma pop -/* 801FA08C-801FA0AC 1F49CC 0020+00 0/0 0/0 1/1 .text dMw_onPauseWindow__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_onPauseWindow() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_onPauseWindow__Fv.s" -} -#pragma pop +void dMw_onPauseWindow() { + dMw_c* menu_window = dMeter2Info_getMenuWindowClass(); -/* 801FA0AC-801FA0CC 1F49EC 0020+00 0/0 0/0 1/1 .text dMw_offPauseWindow__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_offPauseWindow() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_offPauseWindow__Fv.s" + if (menu_window) { + menu_window->onPauseWindow(); + } } -#pragma pop -/* 801FA0CC-801FA0F0 1F4A0C 0024+00 0/0 0/0 4/4 .text dMw_onMenuRing__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_onMenuRing() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_onMenuRing__Fv.s" -} -#pragma pop +void dMw_offPauseWindow() { + dMw_c* menu_window = dMeter2Info_getMenuWindowClass(); -/* 801FA0F0-801FA114 1F4A30 0024+00 0/0 0/0 2/2 .text dMw_offMenuRing__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_offMenuRing() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_offMenuRing__Fv.s" + if (menu_window) { + menu_window->offPauseWindow(); + } } -#pragma pop -/* 801FA114-801FA13C 1F4A54 0028+00 1/1 0/0 0/0 .text dMw_isMenuRing__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dMw_isMenuRing() { - nofralloc -#include "asm/d/menu/d_menu_window/dMw_isMenuRing__Fv.s" +void dMw_onMenuRing() { + dMw_c* menu_window = dMeter2Info_getMenuWindowClass(); + + if (menu_window) { + menu_window->onShowFlag(); + } +} + +void dMw_offMenuRing() { + dMw_c* menu_window = dMeter2Info_getMenuWindowClass(); + + if (menu_window) { + menu_window->offShowFlag(); + } +} + +static bool dMw_isMenuRing() { + dMw_c* menu_window = dMeter2Info_getMenuWindowClass(); + + if (menu_window) { + return menu_window->isShowFlag(); + } + return false; } -#pragma pop /* ############################################################################################## */ /* 803BE8F8-803BE904 01BA18 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ @@ -1523,22 +1328,14 @@ asm void dMw_c::key_wait_init(u8 param_0) { } #pragma pop -/* 801FA220-801FA23C 1F4B60 001C+00 1/0 0/0 0/0 .text ring_open_init__5dMw_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMw_c::ring_open_init(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_window/ring_open_init__5dMw_cFUc.s" +void dMw_c::ring_open_init(u8 param_0) { + dMeter2Info_setWindowStatus(2); } -#pragma pop -/* 801FA23C-801FA240 1F4B7C 0004+00 1/0 0/0 0/0 .text ring_move_init__5dMw_cFUc */ void dMw_c::ring_move_init(u8 param_0) { /* empty function */ } -/* 801FA240-801FA244 1F4B80 0004+00 1/0 0/0 0/0 .text ring_close_init__5dMw_cFUc */ void dMw_c::ring_close_init(u8 param_0) { /* empty function */ } diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 1495d0aa91f..2d9dc7c934e 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -11,8 +11,6 @@ // Types: // -struct _GXColor {}; - struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index b6fdcb30ab6..f3db6a97261 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -81,10 +81,6 @@ struct JPAEmitterManager { /* 8027E354 */ void clearResourceManager(u8); }; -struct dKy_tevstr_c {}; - -struct _GXColor {}; - struct dPa_simpleEcallBack { /* 8004ADF4 */ dPa_simpleEcallBack(); /* 8004AE1C */ void executeAfter(JPABaseEmitter*); @@ -354,14 +350,6 @@ struct J3DMaterialTable { /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); }; -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - // // Forward References: // diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 3f2426f572c..5e6b86549e1 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -12,8 +12,6 @@ // Types: // -struct dKy_tevstr_c {}; - struct fopEn_enemy_c { /* 80019404 */ void initBallModel(); /* 800194FC */ void checkBallModelDraw(); @@ -51,20 +49,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); }; -struct dEvt_info_c { - /* 80018C44 */ ~dEvt_info_c(); - /* 800433F0 */ dEvt_info_c(); - /* 800434CC */ void beforeProc(); -}; - struct dEvt_control_c { /* 80042FA8 */ void moveApproval(void*); }; @@ -96,14 +86,6 @@ struct J3DMaterialTable { /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); }; -struct J3DLightObj { - /* 80018C0C */ J3DLightObj(); -}; - -struct J3DLightInfo { - /* 803256C4 */ void operator=(J3DLightInfo const&); -}; - // // Forward References: // @@ -277,7 +259,7 @@ asm void fopAc_IsActor(void* param_0) { /* ############################################################################################## */ /* 80450CBC-80450CC0 0001BC 0004+00 2/2 1/1 0/0 .sbss stopStatus__10fopAc_ac_c */ -u8 fopAc_ac_c::stopStatus[4]; +u32 fopAc_ac_c::stopStatus; /* 80018D0C-80018DD8 01364C 00CC+00 1/0 0/0 0/0 .text fopAc_Draw__FPv */ #pragma push diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index f55418ed53c..ad6ffcff9ba 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -51,12 +51,8 @@ struct daPy_py_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct cBgS_PolyInfo {}; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -526,6 +522,7 @@ void fopAcM_Log(fopAc_ac_c const* param_0, char const* param_1) { /* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text fopAcM_delete__FP10fopAc_ac_c */ void fopAcM_delete(fopAc_ac_c* pActor) { + // "Deleting Actor" fopAcM_Log(pActor, "アクターの削除"); fpcM_Delete(pActor); } @@ -538,6 +535,7 @@ s32 fopAcM_delete(unsigned int pID) { // original moves r3 -> r0, then r0 -> r31 for 0 check // this generates r3 -> r31 with 0 check directly if (searchResult != NULL) { + // "Deleting Actor" fopAcM_Log(actor, "アクターの削除"); return fpcM_Delete(searchResult); } else { @@ -673,10 +671,11 @@ SECTION_DEAD static char const* const stringBase_8037890A = "アクターのヒ /* 8001A138-8001A188 014A78 0050+00 0/0 1/1 1/1 .text fopAcM_DeleteHeap__FP10fopAc_ac_c */ void fopAcM_DeleteHeap(fopAc_ac_c* pActor) { + // "Destroying actor's heap" fopAcM_Log(pActor, "アクターのヒープの破壊"); - if (pActor->unk_0x0F0 != NULL) { - mDoExt_destroySolidHeap(pActor->unk_0x0F0); - pActor->unk_0x0F0 = NULL; + if (pActor->mHeap != NULL) { + mDoExt_destroySolidHeap(pActor->mHeap); + pActor->mHeap = NULL; } } @@ -709,12 +708,14 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, if (heap00 != NULL) { bool status = fopAcM_callCallback(pActor, pHeapCallback, heap00) != 0; if (!status) { + // "Entry for estimated heap size(%08x) failed. %08x[%s]\n" OSReport_Error("見積もりヒープサイズ(%08x)で登録失敗しました。%08x[%s]\n", pSize, heap00->getFreeSize(), procNameString); mDoExt_destroySolidHeap(heap00); heap00 = NULL; } } else { + // "Could not allocate estimated heap. %08x [%s]\n" OSReport_Error("見積もりヒープが確保できませんでした。 %08x [%s]\n", pSize, procNameString); } @@ -722,11 +723,13 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, if (heap00 == NULL) { heap00 = mDoExt_createSolidHeapFromGame(0xFFFFFFFF, 0x20); if (heap00 == NULL) { + // "Failed to allocate maximum heap size. [%s]\n" OSReport_Error("最大空きヒープサイズで確保失敗。[%s]\n", procNameString); return false; } bool status = fopAcM_callCallback(pActor, pHeapCallback, heap00) != 0; if (!status) { + // "Entry failed for maximum heap size. %08x[%s]\n" OSReport_Error("最大空きヒープサイズで登録失敗。%08x[%s]\n", heap00->getFreeSize(), procNameString); mDoExt_destroySolidHeap(heap00); @@ -738,7 +741,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, } if (lbl_80450CC8 == 0) { mDoExt_adjustSolidHeap(heap00); - pActor->unk_0x0F0 = heap00; + pActor->mHeap = heap00; return true; } else { JKRSolidHeap* heap = NULL; @@ -753,6 +756,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, heap00 = NULL; bool status = fopAcM_callCallback(pActor, pHeapCallback, heap) != 0; if (!status) { + // "Entry fails at exact size? (Bug)\n" OSReport_Error("ぴったりサイズで、登録失敗？(バグ)\n"); mDoExt_destroySolidHeap(heap); heap = NULL; @@ -764,19 +768,20 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, } if (heap != NULL) { mDoExt_adjustSolidHeap(heap); - pActor->unk_0x0F0 = heap; + pActor->mHeap = heap; return true; } if (heap00 != NULL) { mDoExt_adjustSolidHeap(heap00); - pActor->unk_0x0F0 = heap00; + pActor->mHeap = heap00; return true; } - OSReport_Error("ばぐばぐです\n"); - OSReport_Error("緊急回避措置\n"); + OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" + OSReport_Error("緊急回避措置\n"); // "Emergency action\n" lbl_80450CC8 = 0; } } + // "fopAcM_entrySolidHeap didn't work [%s]\n" OSReport_Error("fopAcM_entrySolidHeap だめでした [%s]\n", procNameString); return false; } @@ -1664,8 +1669,7 @@ s32 fopAc_IsActor(void*); /* 8001C9CC-8001CA1C 01730C 0050+00 1/1 0/0 0/0 .text enemySearchJugge__FPvPv */ void* enemySearchJugge(void* pActor, void* pData) { - if (pActor != NULL && fopAc_IsActor(pActor) && - static_cast(pActor)->unk_0x496 == 2) { + if (pActor != NULL && fopAc_IsActor(pActor) && static_cast(pActor)->mGroup == 2) { return pActor; } else { return NULL; @@ -1913,7 +1917,7 @@ asm void fopAcM_setEffectMtx(fopAc_ac_c const* param_0, J3DModelData const* para /* 8001D5A4-8001D5EC 017EE4 0048+00 1/1 0/0 0/0 .text fopAcM_getProcNameString__FPC10fopAc_ac_c */ static const char* fopAcM_getProcNameString(const fopAc_ac_c* pActor) { - const char* name = dStage_getName2(pActor->mBase.mBsTypeId, pActor->unk_0x499); + const char* name = dStage_getName2(pActor->mBase.mBsTypeId, pActor->mSubtype); return name != NULL ? name : "UNKOWN"; } diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index b773c544751..e13249b3ee3 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -5,18 +5,13 @@ #include "m_Do/m_Do_Reset.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" #include "dolphin/types.h" // // Types: // -struct mDoRst { - /* 800157F4 */ u32 getResetData(); - - static u8 mResetData[4 + 4 /* padding */]; -}; - struct Z2AudioMgr { /* 802CDA6C */ void hasReset() const; @@ -55,7 +50,7 @@ extern "C" void mDoRst_resetCallBack__FiPv(); extern "C" u32 getResetData__6mDoRstFv(); extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80[8]; +extern "C" extern u64 struct_80450C80; extern "C" extern u8 data_80450C88[8]; // @@ -83,13 +78,10 @@ extern "C" void DVDGetDriveStatus(); extern "C" void DVDCheckDisk(); extern "C" void VIWaitForRetrace(); extern "C" void VIFlush(); -extern "C" void VISetBlack(); -extern "C" void GXSetCurrentGXThread(); -extern "C" void GXGetCurrentGXThread(); +extern "C" void VISetBlack(s32); extern "C" void GXFlush(); extern "C" void GXAbortFrame(); extern "C" void GXDrawDone(); -extern "C" void GXSetDrawDoneCallback(); extern "C" void _savegpr_27(); extern "C" extern u8 g_mDoMemCd_control[8192]; extern "C" extern u8 struct_80450BB8[4]; @@ -103,20 +95,18 @@ extern "C" u8 sManager__6JUTXfb[4 + 4 /* padding */]; // Declarations: // -/* 800155D8-800155DC 00FF18 0004+00 1/1 0/0 0/0 .text my_OSCancelAlarmAll__Fv */ static void my_OSCancelAlarmAll() { /* empty function */ } -/* 800155DC-80015614 00FF1C 0038+00 1/1 0/0 0/0 .text destroyVideo__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void destroyVideo() { - nofralloc -#include "asm/m_Do/m_Do_Reset/destroyVideo__Fv.s" +static void destroyVideo() { + destroyManager__8JUTVideoFv(); + GXSetDrawDoneCallback(NULL); + VISetBlack(1); + VIFlush(); + VIWaitForRetrace(); + return; } -#pragma pop /* ############################################################################################## */ /* 80374198-80374198 0007F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -126,9 +116,70 @@ SECTION_DEAD static char const* const stringBase_80374198 = "DVD_STATE_BUSY\n"; #pragma pop /* 80450C78-80450C80 000178 0004+04 3/2 42/42 2/2 .sbss mResetData__6mDoRst */ -u8 mDoRst::mResetData[4 + 4 /* padding */]; +mDoRstData* mDoRst::mResetData; /* 80015614-8001574C 00FF54 0138+00 0/0 3/3 0/0 .text mDoRst_reset__FiUli */ +#ifdef NONMATCHING +void mDoRst_reset(int p1, u32 p2, int p3) { + mDoCPd_c* pmVar1; + u32 uVar2; + DVDState DVar3; + OSThread* thread; + s32 enable; + /* sManager */ lbl_80451550->clearIndex(); + mDoDvdErr_ThdCleanup__Fv(); + cAPICPad_recalibrate__Fv(); + if (lbl_80450BB8 != false) { + do { + uVar2 = lbl_80451368->hasReset(); + } while ((uVar2 & 0xff) == 0); + } + + if ((s32)DVDGetDriveStatus() == (s32)DVD_STATE_BUSY) { + OSAttention(lbl_80374198); + } + JASTaskThread* task_thread = getThreadPointer__6JASDvdFv(); + if (task_thread != NULL) { + pause__13JASTaskThreadFb(task_thread, true); + thread = task_thread->thread; + if (thread != NULL) { + OSSuspendThread(thread); + OSDetachThread(thread); + OSCancelThread(thread); + } + } + + VIWaitForRetrace(); + VIWaitForRetrace(); + + thread = GXGetCurrentGXThread(); + enable = OSDisableInterrupts(); + OSThread* ourThread = OSGetCurrentThread(); + if (thread != ourThread) { + OSCancelThread(thread); + GXSetCurrentGXThread(); + } + GXFlush(); + GXAbortFrame(); + GXDrawDone(); + + OSRestoreInterrupts(enable); + destroyVideo(); + + while (mDoMemCd_isCardCommNone() != 0) { + VIWaitForRetrace(); + } + + my_OSCancelAlarmAll(); + LCDisable(); + // probably false match; check out 80015728 or thereabouts in Ghidra + OSSetSaveRegion(mDoRst::mResetData, (u8*)(&mDoRst::getResetData()) + 0x18); + OSResetSystem(p1, p2, p3); + do { + VIWaitForRetrace(); + } while (true); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -137,8 +188,34 @@ asm void mDoRst_reset(int param_0, u32 param_1, int param_2) { #include "asm/m_Do/m_Do_Reset/mDoRst_reset__FiUli.s" } #pragma pop +#endif /* 8001574C-800157F4 01008C 00A8+00 0/0 3/3 0/0 .text mDoRst_resetCallBack__FiPv */ +// fix JUTGamePad data +#ifdef NONMATCHING +void mDoRst_resetCallBack(int port, void* p2) { + if (!mDoRst::isReset()) { + if (port == -1) { + cAPICPad_recalibrate__Fv(); + } else { + if (mDoRst::is3ButtonReset() != 0) { + lbl_80451501 = false; + /* sCallback */ lbl_804514EC = &mDoRst_resetCallBack; + /* sCallbackArg */ lbl_804514F0 = 0; + return; + } + mDoRst::on3ButtonReset(); + mDoRst::set3ButtonResetPort(port); + cAPICPad_recalibrate__Fv(); + } + + if ((DVDCheckDisk() == 0) && (DVDGetDriveStatus() != DVD_STATE_FATAL_ERROR)) { + mDoRst::onReturnToMenu(); + } + mDoRst::onReset(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -147,18 +224,20 @@ asm void mDoRst_resetCallBack(int param_0, void* param_1) { #include "asm/m_Do/m_Do_Reset/mDoRst_resetCallBack__FiPv.s" } #pragma pop +#endif /* 800157F4-800157FC -00001 0008+00 0/0 0/0 0/0 .text getResetData__6mDoRstFv */ -u32 mDoRst::getResetData() { - return *(u32*)(&mDoRst::mResetData); +mDoRstData* mDoRst::getResetData() { + return mResetData; } /* ############################################################################################## */ /* 80450C80-80450C88 -00001 0008+00 0/0 6/6 0/0 .sbss None */ /* 80450C80 0001+00 data_80450C80 None */ /* 80450C81 0007+00 data_80450C81 None */ -extern u8 struct_80450C80[8]; -u8 struct_80450C80[8]; +// type might be fake, used for now to align to 8 +extern u64 struct_80450C80; +u64 struct_80450C80; /* 80450C88-80450C90 000188 0008+00 0/0 2/2 0/0 .sbss None */ extern u8 data_80450C88[8]; diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index bcb3df73816..2ef82bfaa54 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -15,39 +15,6 @@ struct mDoRst { static u8 mResetData[4 + 4 /* padding */]; }; -struct interface_of_controller_pad {}; - -struct JUTGamePad { - struct EPadPort {}; - - struct CRumble { - /* 802E19D8 */ void setEnabled(u32); - }; - - struct C3ButtonReset { - static u8 sCallback[4]; - static u8 sCallbackArg[4 + 4 /* padding */]; - }; - - /* 802E06DC */ JUTGamePad(JUTGamePad::EPadPort); - /* 802E08E4 */ void read(); - /* 802E1024 */ void clearForReset(); - /* 802E199C */ void getGamePad(int); - - static u8 sAnalogMode[4]; -}; - -struct mDoCPd_c { - /* 80007954 */ void create(); - /* 80007A94 */ void read(); - /* 80007B7C */ void convert(interface_of_controller_pad*, JUTGamePad*); - /* 80007CD0 */ void LRlockCheck(interface_of_controller_pad*); - /* 80007D74 */ void recalibrate(); - - static u8 m_gamePad[16]; - static u8 m_cpadInfo[256]; -}; - // // Forward References: // @@ -72,7 +39,6 @@ extern "C" void read__10JUTGamePadFv(); extern "C" void clearForReset__10JUTGamePadFv(); extern "C" void getGamePad__10JUTGamePadFi(); extern "C" void setEnabled__Q210JUTGamePad7CRumbleFUl(); -extern "C" void PADSetAnalogMode(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" extern u8 g_HIO[64 + 4 /* padding */]; @@ -89,12 +55,47 @@ extern "C" extern u8 struct_80451500[4]; /* ############################################################################################## */ /* 803DD2D8-803DD2E8 009FF8 0010+00 2/2 6/6 0/0 .bss m_gamePad__8mDoCPd_c */ -u8 mDoCPd_c::m_gamePad[16]; +JUTGamePad* mDoCPd_c::m_gamePad[4]; /* 803DD2E8-803DD3E8 00A008 0100+00 2/2 84/84 37/37 .bss m_cpadInfo__8mDoCPd_c */ -u8 mDoCPd_c::m_cpadInfo[256]; +interface_of_controller_pad mDoCPd_c::m_cpadInfo[4]; /* 80007954-80007A94 002294 0140+00 0/0 1/1 0/0 .text create__8mDoCPd_cFv */ +#ifdef NONMATCHING +void mDoCPd_c::create() { + JUTGamePad* JUTGamePad_ptr; + cpadInfo* m_cpadInfo_addr; + + JUTGamePad_ptr = new JUTGamePad(JUTGamePad::Port_1); + m_gamePad[0] = JUTGamePad_ptr; + if (lbl_80450580 == 0) { + m_gamePad[1] = NULL; + m_gamePad[2] = NULL; + m_gamePad[3] = NULL; + JUTGamePad_ptr = m_gamePad[3]; + } else { + m_gamePad[1] = new JUTGamePad(JUTGamePad::Port_2); + m_gamePad[2] = new JUTGamePad(JUTGamePad::Port_3); + JUTGamePad_ptr = new JUTGamePad(JUTGamePad::Port_4); + } + m_gamePad[3] = JUTGamePad_ptr; + if (m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x0 == 0) { + lbl_80451501 = false; + lbl_804514EC = resetCallBack__6mDoRstFiPv; + lbl_804514F0 = 0; + } + sAnalogMode = 3; + PADSetAnalogMode(3); + m_cpadInfo_addr = &m_cpadInfo; + for (int i = 4; i != 0; i--) { + m_cpadInfo_addr->interface.field_0x3a = false; + m_cpadInfo_addr->interface.field_0x39 = false; + m_cpadInfo_addr->interface.field_0x3c = false; + m_cpadInfo_addr->interface.field_0x3b = false; + m_cpadInfo_addr = m_cpadInfo_addr->unk1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -103,8 +104,40 @@ asm void mDoCPd_c::create() { #include "asm/m_Do/m_Do_controller_pad/create__8mDoCPd_cFv.s" } #pragma pop +#endif /* 80007A94-80007B7C 0023D4 00E8+00 0/0 1/1 0/0 .text read__8mDoCPd_cFv */ +#ifdef NONMATCHING +void mDoCPd_c::read() { + //_savegpr_29(); + gamePad->read(); + if (m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x0 == 0 && + m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x8 != 0) { + JUTGamePad* JUTGamePad_ptr = + JUTGamePad::getGamePad(m_Do_Reset_NS_mDoRst_NS_mResetData->pad_index); + bool error = false; + if (JUTGamePad_ptr->pad_port != 0xffff && + JUTGamePad_ptr->rumble.field_0x10 != 0) { // Make the rumble thing right + error = true; + } + if (error = false) { + m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x8 = 0; + } + } + JUTGamePad** m_gamePad_ptr = m_gamePad; + cpadInfo* cpad_ptr = &m_cpadInfo; + for (int i = 0; i < 4; i++) { + if (*m_gamePad_ptr == 0) { + cLib_memSet(cpad_ptr, 0, 0x40); + } else { + convert(&cpad_ptr->interface, *m_gamePad_ptr); + LRlockCheck(&cpad_ptr->interface); + } + m_gamePad_ptr = m_gamePad_ptr + 1; // Shouldn't it be 4 if it's incrementing a pointer??? + cpad_ptr = cpad_ptr->unk1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -113,6 +146,7 @@ asm void mDoCPd_c::read() { #include "asm/m_Do/m_Do_controller_pad/read__8mDoCPd_cFv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80451A20-80451A24 000020 0004+00 1/1 0/0 0/0 .sdata2 @3709 */ @@ -133,6 +167,44 @@ SECTION_SDATA2 static f64 lit_3713 = 4503599627370496.0 /* cast u32 to float */; /* 80007B7C-80007CD0 0024BC 0154+00 1/1 0/0 0/0 .text * convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad */ +#ifdef NONMATCHING +// off on load order, regalloc, const placement (int-to-float conversion magic). +void mDoCPd_c::convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad) { + pInterface->mButtonFlags = pPad->buttons.mButtonFlags; + pInterface->mPressedButtonFlags = pPad->buttons.mPressedButtonFlags; + pInterface->mMainStickPosX = pPad->control_stick.mPosX; + pInterface->mMainStickPosY = pPad->control_stick.mPosY; + pInterface->mMainStickValue = pPad->control_stick.mValue; + pInterface->mMainStickAngle = pPad->control_stick.mAngle; + pInterface->mCStickPosX = pPad->c_stick.mPosX; + pInterface->mCStickPosY = pPad->c_stick.mPosY; + pInterface->mCStickValue = pPad->c_stick.mValue; + pInterface->mCStickAngle = pPad->c_stick.mAngle; + + pInterface->mAnalogA = lbl_80451A20 * pPad->buttons.mAnalogARaw; + if (pInterface->mAnalogA > lbl_80451A24 /* 1.0 */) { + pInterface->mAnalogA = lbl_80451A24; + } + + pInterface->mAnalogB = lbl_80451A20 * pPad->buttons.mAnalogBRaw; + if (pInterface->mAnalogB > lbl_80451A24 /* 1.0 */) { + pInterface->mAnalogB = lbl_80451A24; + } + + // pInterface->mTriggerLeft = pPad->buttons.mTriggerLeftRaw * (1/140.0f); + pInterface->mTriggerLeft = lbl_80451A28 * pPad->buttons.mTriggerLeftRaw; + if (pInterface->mTriggerLeft > lbl_80451A24 /* 1.0 */) { + pInterface->mTriggerLeft = lbl_80451A24; + } + + pInterface->mTriggerRight = lbl_80451A28 * pPad->buttons.mTriggerRightRaw; + if (pInterface->mTriggerRight > lbl_80451A24 /* 1.0 */) { + pInterface->mTriggerRight = lbl_80451A24; + } + + pInterface->mGamepadErrorFlags = pPad->error_value; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -141,9 +213,39 @@ asm void mDoCPd_c::convert(interface_of_controller_pad* param_0, JUTGamePad* par #include "asm/m_Do/m_Do_controller_pad/convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad.s" } #pragma pop +#endif /* 80007CD0-80007D74 002610 00A4+00 1/1 0/0 0/0 .text * LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad */ +#ifdef NONMATCHING +void mDoCPd_c::LRlockCheck(interface_of_controller_pad* controllerInterface) { + float temp_1 = controllerInterface->trigger_left; // not sure if temp is left or right + controllerInterface->field_0x3a = false; + controllerInterface->field_0x3c = false; + if (temp_1 <= g_HIO.float_global_1) { // controllerInterface->trigger_left) { + if (temp_1 < g_HIO.float_global_2) { + controllerInterface->field_0x39 = false; + } + } else { + if (controllerInterface->field_0x39 == false) { + controllerInterface->field_0x3a = true; + } + controllerInterface->field_0x39 = true; + } + if (controllerInterface->trigger_right > g_HIO.float_global_1) { + if (controllerInterface->field_0x3b == false) { + controllerInterface->field_0x3c = true; + } + controllerInterface->field_0x3b = true; + return; + } + if (controllerInterface->trigger_right >= g_HIO.float_global_2) { + return; + } + controllerInterface->field_0x3b = false; + return; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -152,13 +254,10 @@ asm void mDoCPd_c::LRlockCheck(interface_of_controller_pad* param_0) { #include "asm/m_Do/m_Do_controller_pad/LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad.s" } #pragma pop +#endif -/* 80007D74-80007D9C 0026B4 0028+00 0/0 1/1 0/0 .text recalibrate__8mDoCPd_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoCPd_c::recalibrate() { - nofralloc -#include "asm/m_Do/m_Do_controller_pad/recalibrate__8mDoCPd_cFv.s" +void mDoCPd_c::recalibrate(void) { + JUTGamePad::clearForReset(); + JUTGamePad::CRumble::setEnabled( + PADMask(PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT)); } -#pragma pop diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index daa7763aae6..5a2b3df8884 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -4,8 +4,11 @@ // #include "m_Do/m_Do_main.h" +#include "JSystem/JUtility/JUTReport.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "m_Do/m_Do_controller_pad.h" +#include "msl_c/string.h" // // Types: @@ -19,25 +22,10 @@ struct mDoMemCd_Ctrl_c { /* 80016894 */ void update(); }; -struct mDoMain { - static u8 COPYDATE_STRING[18 + 2 /* padding */]; - static u32 memMargin; - static u8 sPowerOnTime[4]; - static u8 sHungUpTime[4]; -}; - struct mDoDvdThd_callback_c { /* 80015C74 */ void create(void* (*)(void*), void*); }; -struct mDoCPd_c { - /* 80007954 */ void create(); - /* 80007A94 */ void read(); - - static u8 m_gamePad[16]; - static u8 m_cpadInfo[256]; -}; - struct dRes_control_c { /* 8003C638 */ void dump(); }; @@ -57,24 +45,10 @@ struct JUTAssertion { /* 802E4C3C */ void setMessageCount(int); }; -struct JKRHeap { - /* 800065D8 */ bool dump_sort(); - /* 802CE72C */ void getFreeSize(); - /* 802CE784 */ void getTotalFreeSize(); - - static u8 sSystemHeap[4]; - static u8 sCurrentHeap[4]; - static u8 sRootHeap[4]; -}; - struct JKRSolidHeap { /* 802D0A24 */ void create(u32, JKRHeap*, bool); }; -struct JKRExpHeap { - /* 802CFD64 */ void getTotalUsedSize() const; -}; - struct JKRAramHeap { /* 802D3134 */ void getFreeSize(); /* 802D31AC */ void getTotalFreeSize(); @@ -89,12 +63,6 @@ struct JFWSystem { static u8 systemConsole[4]; }; -struct HeapCheck { - /* 80005728 */ void CheckHeap1(); - /* 800058A0 */ void getUsedCount() const; - /* 800058C4 */ void heapDisplay() const; -}; - struct DynamicModuleControlBase { /* 80262470 */ void dump(); }; @@ -152,9 +120,7 @@ extern "C" extern u8 data_80450B9C[4]; // External References: // -SECTION_INIT void memcpy(); extern "C" void OSReportInit__Fv(); -extern "C" void OSReport_Error(); extern "C" void mDoAud_Execute__Fv(); extern "C" void create__8mDoCPd_cFv(); extern "C" void read__8mDoCPd_cFv(); @@ -190,23 +156,6 @@ extern "C" void clear__10JUTConsoleFv(); extern "C" void dumpToTerminal__10JUTConsoleFUi(); extern "C" void scroll__10JUTConsoleFi(); extern "C" void getLineOffset__10JUTConsoleCFv(); -extern "C" void OSGetConsoleType(); -extern "C" void OSAllocFromArenaLo(); -extern "C" void OSGetResetCode(); -extern "C" void OSGetCurrentThread(); -extern "C" void OSDisableScheduler(); -extern "C" void OSEnableScheduler(); -extern "C" void OSCreateThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSuspendThread(); -extern "C" void OSSetThreadPriority(); -extern "C" void OSGetThreadPriority(); -extern "C" void OSCheckActiveThreads(); -extern "C" void OSGetTime(); -extern "C" void DVDOpen(); -extern "C" void DVDClose(); -extern "C" void DVDReadPrio(); -extern "C" void DVDGetCurrentDiskID(); extern "C" void _savegpr_23(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); @@ -215,7 +164,6 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); -extern "C" void strcmp(); extern "C" u8 m_gamePad__8mDoCPd_c[16]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern u8 g_mDoMemCd_control[8192]; @@ -237,62 +185,57 @@ extern "C" u8 sAramObject__7JKRAram[4]; // Declarations: // -/* ############################################################################################## */ -/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803739A0 = "20Apr2004"; -SECTION_DEAD static char const* const stringBase_803739AA = "Patch2"; -SECTION_DEAD static char const* const stringBase_803739B1 = - "SDKのバージョンが一致しません。停止します\n"; -#pragma pop +static void version_check() { + if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) { + return; + } -/* 800056C0-80005728 000000 0068+00 1/1 0/0 0/0 .text version_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void version_check() { - nofralloc -#include "asm/m_Do/m_Do_main/version_check__Fv.s" + // "SDK version doesn't match. Stopping\n" + OSReport_Error("SDKのバージョンが一致しません。停止します\n"); + do { + } while (true); } -#pragma pop -/* 80005728-8000578C 000068 0064+00 1/1 0/0 0/0 .text CheckHeap1__9HeapCheckFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void HeapCheck::CheckHeap1() { - nofralloc -#include "asm/m_Do/m_Do_main/CheckHeap1__9HeapCheckFv.s" +void HeapCheck::CheckHeap1() { + s32 totalUsedSize = mHeap->getTotalUsedSize(); + s32 freeSize = mHeap->getFreeSize(); + + if (mMaxTotalUsedSize < totalUsedSize) { + mMaxTotalUsedSize = totalUsedSize; + } + + if (mMaxTotalFreeSize > freeSize) { + mMaxTotalFreeSize = freeSize; + } } -#pragma pop /* ############################################################################################## */ /* 803D32E0-803D3308 000000 0028+00 3/2 0/0 0/0 .bss RootHeapCheck */ -extern "C" u8 RootHeapCheck[40]; +extern "C" HeapCheck RootHeapCheck; /* 803D3308-803D3330 000028 0028+00 1/2 0/0 0/0 .bss SystemHeapCheck */ -extern "C" u8 SystemHeapCheck[40]; +extern "C" HeapCheck SystemHeapCheck; /* 803D3330-803D3358 000050 0028+00 1/2 0/0 0/0 .bss ZeldaHeapCheck */ -extern "C" u8 ZeldaHeapCheck[40]; +extern "C" HeapCheck ZeldaHeapCheck; /* 803D3358-803D3380 000078 0028+00 1/2 0/0 0/0 .bss GameHeapCheck */ -extern "C" u8 GameHeapCheck[40]; +extern "C" HeapCheck GameHeapCheck; /* 803D3380-803D33A8 0000A0 0028+00 1/2 0/0 0/0 .bss ArchiveHeapCheck */ -extern "C" u8 ArchiveHeapCheck[40]; +extern "C" HeapCheck ArchiveHeapCheck; /* 803D33A8-803D33D0 0000C8 0028+00 1/2 0/0 0/0 .bss J2dHeapCheck */ -extern "C" u8 J2dHeapCheck[40]; +extern "C" HeapCheck J2dHeapCheck; /* 803D33D0-803D33F8 0000F0 0028+00 1/2 0/0 0/0 .bss HostioHeapCheck */ -extern "C" u8 HostioHeapCheck[40]; +extern "C" HeapCheck HostioHeapCheck; /* 803D33F8-803D3420 000118 0028+00 1/2 0/0 0/0 .bss CommandHeapCheck */ -extern "C" u8 CommandHeapCheck[40]; +extern "C" HeapCheck CommandHeapCheck; /* 803A2EE0-803A2EF4 000000 0012+02 2/2 1/1 0/0 .data COPYDATE_STRING__7mDoMain */ +// "??/??/?? ??:??:?" SECTION_DATA u8 mDoMain::COPYDATE_STRING[18 + 2 /* padding */] = { 0x3F, 0x3F, @@ -318,37 +261,62 @@ SECTION_DATA u8 mDoMain::COPYDATE_STRING[18 + 2 /* padding */] = { }; /* 803A2EF4-803A2F14 -00001 0020+00 1/2 0/0 0/0 .data HeapCheckTable */ -SECTION_DATA static void* HeapCheckTable[8] = { - (void*)&RootHeapCheck, (void*)&SystemHeapCheck, (void*)&ZeldaHeapCheck, - (void*)&GameHeapCheck, (void*)&ArchiveHeapCheck, (void*)&J2dHeapCheck, - (void*)&HostioHeapCheck, (void*)&CommandHeapCheck, +SECTION_DATA static HeapCheck* HeapCheckTable[8] = { + &RootHeapCheck, &SystemHeapCheck, &ZeldaHeapCheck, &GameHeapCheck, + &ArchiveHeapCheck, &J2dHeapCheck, &HostioHeapCheck, &CommandHeapCheck, }; /* 803D32E0-803D3308 000000 0028+00 3/2 0/0 0/0 .bss RootHeapCheck */ -static u8 RootHeapCheck[40]; +static HeapCheck RootHeapCheck; /* 803D3308-803D3330 000028 0028+00 1/2 0/0 0/0 .bss SystemHeapCheck */ -static u8 SystemHeapCheck[40]; +static HeapCheck SystemHeapCheck; /* 803D3330-803D3358 000050 0028+00 1/2 0/0 0/0 .bss ZeldaHeapCheck */ -static u8 ZeldaHeapCheck[40]; +static HeapCheck ZeldaHeapCheck; /* 803D3358-803D3380 000078 0028+00 1/2 0/0 0/0 .bss GameHeapCheck */ -static u8 GameHeapCheck[40]; +static HeapCheck GameHeapCheck; /* 803D3380-803D33A8 0000A0 0028+00 1/2 0/0 0/0 .bss ArchiveHeapCheck */ -static u8 ArchiveHeapCheck[40]; +static HeapCheck ArchiveHeapCheck; /* 803D33A8-803D33D0 0000C8 0028+00 1/2 0/0 0/0 .bss J2dHeapCheck */ -static u8 J2dHeapCheck[40]; +static HeapCheck J2dHeapCheck; /* 803D33D0-803D33F8 0000F0 0028+00 1/2 0/0 0/0 .bss HostioHeapCheck */ -static u8 HostioHeapCheck[40]; +static HeapCheck HostioHeapCheck; /* 803D33F8-803D3420 000118 0028+00 1/2 0/0 0/0 .bss CommandHeapCheck */ -static u8 CommandHeapCheck[40]; +static HeapCheck CommandHeapCheck; /* 8000578C-80005848 0000CC 00BC+00 1/1 0/0 0/0 .text CheckHeap__FUl */ +#ifdef NONMATCHING +void CheckHeap(u32 controller_pad_no) { + mDoMch_HeapCheckAll__Fv(); + OSCheckActiveThreads(); + + bool unk = false; + + // if L + R + Z is pressed... + if (((m_cpadInfo[controller_pad_no].mButtonFlags & ~0x10) == 0x60) && + m_cpadInfo[controller_pad_no].mPressedButtonFlags & 0x10) { + unk = true; + } + + for (int i = 0; i < 8; i++) { + HeapCheckTable[i]->CheckHeap1(); + if (unk) { + HeapCheck* currentHeap = HeapCheckTable[i]; + s32 used_count = currentHeap->getUsedCount(); + + currentHeap->getUsedCountRef() = used_count; + used_count = currentHeap->getHeap()->getTotalUsedSize(); + currentHeap->getTotalUsedSizeRef() = used_count; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -357,54 +325,51 @@ static asm void CheckHeap(u32 param_0) { #include "asm/m_Do/m_Do_main/CheckHeap__FUl.s" } #pragma pop +#endif -/* 80005848-800058A0 000188 0058+00 2/2 0/0 0/0 .text countUsed__FP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void countUsed(JKRExpHeap* param_0) { - nofralloc -#include "asm/m_Do/m_Do_main/countUsed__FP10JKRExpHeap.s" +static int countUsed(JKRExpHeap* heap) { + OSDisableScheduler(); + int counter = 0; + JKRExpHeap::CMemBlock* used_blocks_head = heap->getHeadUsedList(); + + while (used_blocks_head) { + used_blocks_head = used_blocks_head->getNextBlock(); + counter++; + }; + + OSEnableScheduler(); + return counter; } -#pragma pop -/* 800058A0-800058C4 0001E0 0024+00 2/2 0/0 0/0 .text getUsedCount__9HeapCheckCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void HeapCheck::getUsedCount() const { - nofralloc -#include "asm/m_Do/m_Do_main/getUsedCount__9HeapCheckCFv.s" +s32 HeapCheck::getUsedCount() const { + return countUsed(mHeap); } -#pragma pop -/* ############################################################################################## */ -/* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803739DC = "[%sName]"; -SECTION_DEAD static char const* const stringBase_803739E5 = "HeapSize %8ld"; -SECTION_DEAD static char const* const stringBase_803739FB = "TargetHeapSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A11 = "TotalFree %8ld"; -SECTION_DEAD static char const* const stringBase_80373A27 = "FreeSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A3D = "TotalUsedSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A53 = "TotalUsedRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373A6F = "MaxTotalUsedSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373A85 = "MaxTotalUsedRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373AA1 = "MinFreeSize %8ld"; -SECTION_DEAD static char const* const stringBase_80373AB7 = "MinFreeRate %3ld%%"; -SECTION_DEAD static char const* const stringBase_80373AD3 = "UsedCount %3ld%"; -#pragma pop +void HeapCheck::heapDisplay() const { + s32 heap_size = mHeap->getSize(); + s32 used_count = heap_size - mTargetHeapSize; -/* 800058C4-80005AD8 000204 0214+00 1/1 0/0 0/0 .text heapDisplay__9HeapCheckCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void HeapCheck::heapDisplay() const { - nofralloc -#include "asm/m_Do/m_Do_main/heapDisplay__9HeapCheckCFv.s" + s32 total_used_size = mHeap->getTotalUsedSize(); + s32 total_free_size = mHeap->getTotalFreeSize(); + s32 heap_free_size = mHeap->getFreeSize(); + + JUTReport(0x64, 0xd4, "[%sName]", mName); + JUTReport(0x64, 0xe3, "HeapSize %8ld", heap_size); + JUTReport(0x64, 0xf0, "TargetHeapSize %8ld", mTargetHeapSize); + JUTReport(0x64, 0xfd, "TotalFree %8ld", total_free_size - used_count); + JUTReport(0x64, 0x10a, "FreeSize %8ld", heap_free_size - used_count); + JUTReport(0x64, 0x117, "TotalUsedSize %8ld", total_used_size); + JUTReport(0x64, 0x124, "TotalUsedRate %3ld%%", + (int)(total_used_size * 0x64) / (int)mTargetHeapSize); + JUTReport(0x64, 0x131, "MaxTotalUsedSize %8ld", mMaxTotalUsedSize); + JUTReport(0x64, 0x13e, "MaxTotalUsedRate %3ld%%", + (mMaxTotalUsedSize * 0x64) / (int)mTargetHeapSize); + JUTReport(0x64, 0x14b, "MinFreeSize %8ld", mMaxTotalFreeSize - used_count); + JUTReport(0x64, 0x158, "MinFreeRate %3ld%%", + ((mMaxTotalFreeSize - used_count) * 0x64) / (int)mTargetHeapSize); + used_count = countUsed(mHeap); + JUTReport(0x64, 0x165, "UsedCount %3ld%", used_count); } -#pragma pop /* ############################################################################################## */ /* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -452,7 +417,7 @@ SECTION_DATA static void* desc2[5 + 1 /* padding */] = { #pragma pop /* 80450580-80450584 000000 0004+00 3/3 6/6 0/0 .sdata None */ -SECTION_SDATA extern u32 data_80450580 = 0xFF000000; +SECTION_SDATA extern s8 data_80450580 = 0xFF; /* 80450584-80450588 000004 0004+00 0/0 1/1 0/0 .sdata memMargin__7mDoMain */ SECTION_SDATA u32 mDoMain::memMargin = 0xFFFFFFFF; @@ -466,16 +431,14 @@ SECTION_SDATA static u8 data_80450588[8] = { static u8 data_80450B00[8]; /* 80450B08-80450B0C 000008 0004+00 1/1 1/1 0/0 .sbss sPowerOnTime__7mDoMain */ +// should be OSTime u8 mDoMain::sPowerOnTime[4]; - -/* 80450B0C-80450B10 00000C 0004+00 1/1 1/1 0/0 .sbss None */ extern u8 data_80450B0C[4]; u8 data_80450B0C[4]; /* 80450B10-80450B14 000010 0004+00 0/0 2/2 0/0 .sbss sHungUpTime__7mDoMain */ +// should be OSTime u8 mDoMain::sHungUpTime[4]; - -/* 80450B14-80450B18 000014 0004+00 0/0 2/2 0/0 .sbss None */ extern u8 data_80450B14[4]; u8 data_80450B14[4]; @@ -483,9 +446,74 @@ u8 data_80450B14[4]; /* 80450B18 0001+00 data_80450B18 None */ /* 80450B19 0001+00 data_80450B19 None */ /* 80450B1A 0002+00 data_80450B1A None */ -static u8 struct_80450B18[4]; +static u8 struct_80450B18[2]; + +static u8 data_80450B1A; +static u8 data_80450B1B; /* 80005AD8-80005D4C 000418 0274+00 1/1 0/0 0/0 .text debugDisplay__Fv */ +#ifdef NONMATCHING +void debugDisplay(void) { + int tmp1; + int tmp2; + HeapCheck** hct = (HeapCheck**)lbl_803A2EE0; + + if (lbl_80450B19 >= 1 && lbl_80450B19 <= 6) { + hct[lbl_80450B19 - 1]->heapDisplay(); + } + + if (lbl_80450588 == 5) { + JKRAramHeap* heap = sAramObject__7JKRAram->getAramHeap(); + if (heap) { + JUTReport(0x1db, 100, lbl_803739A0 + 0x196); + JUTReport(0x1db, 0x72, lbl_803739A0 + 0x1A0, heap->getFreeSize()); + JUTReport(0x1db, 0x80, lbl_803739A0 + 0x150); + JUTReport(0x1db, 0x8e, lbl_803739A0 + 0x1A0, heap->getTotalFreeSize()); + } + + } else { + if (lbl_80450588) { + JUTReport(0x1db, 100, lbl_803739A0 + 0x1A3, lbl_803A2F14[lbl_80450588]); + JUTReport(0x1db, 0x72, lbl_803739A0 + 0x1A3, lbl_803A2F28[lbl_80450588]); + + int k = 0; + for (int i = 0; i < 8; i++, k += 0x2c) { + // heap check table stuff + HeapCheck* heap_check; + heap_check = HeapCheckTable[i]; + + switch (lbl_80450588) { + case 3: { + tmp1 = heap_check->getUsedCount(); + tmp2 = heap_check->getHeap()->getTotalUsedSize(); + break; + } + case 1: { + tmp1 = heap_check->getHeap()->getTotalFreeSize(); + tmp2 = heap_check->getHeap()->getFreeSize(); + break; + } + case 2: { + tmp1 = heap_check->getMaxTotalUsedSize(); + tmp2 = heap_check->getHeap()->getSize(); + break; + } + case 4: { + tmp1 = heap_check->getUsedCount() - heap_check->getUsedCountRef(); + tmp2 = heap_check->getHeap()->getTotalUsedSize() - + heap_check->getTotalUsedSizeRef(); + break; + } + + JUTReport(0x1db, k + 0x96, lbl_80373B46, heap_check->getNames()[0]); + JUTReport(0x1db, k + 0xA4, lbl_80373B4C, tmp1); + JUTReport(0x1db, k + 0xB2, lbl_80373B4C, tmp2); + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -494,6 +522,7 @@ static asm void debugDisplay() { #include "asm/m_Do/m_Do_main/debugDisplay__Fv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -555,6 +584,121 @@ SECTION_SDATA2 static f32 lit_3888[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_3890 = 4503601774854144.0 /* cast s32 to float */; /* 80005D4C-8000614C 00068C 0400+00 1/1 0/0 0/0 .text Debug_console__FUl */ +#ifdef NONMATCHING +void Debug_console(u32 controller_pad_no) { + float tmp2; + float tmp3; + int tmp6; + + // systemConsole + if (lbl_804511B8) { + if (!lbl_80450B20) { + lbl_80450B1C = lbl_80451A00; + lbl_80450B20 = 1; + } + + if (!lbl_80450B28) { + lbl_80450B24 = lbl_80451A04; + lbl_80450B28 = 1; + } + if (!lbl_80450B30) { + lbl_80450B2C = lbl_80451A08; + lbl_80450B30 = 1; + } + + u32 tmp5 = m_cpadInfo[controller_pad_no].mPressedButtonFlags; + + if ((m_cpadInfo[controller_pad_no].mPressedButtonFlags & 0x10) && + !(m_cpadInfo[controller_pad_no].mButtonFlags & ~0x10)) { + lbl_804511B8->field_0x68 = !lbl_804511B8->field_0x68; + JUTAssertion::setMessageCount(0); + } + + if (lbl_804511B8->field_0x68) { + u32 tmp = m_cpadInfo[controller_pad_no].mButtonFlags; + + // if R and L are pressed + if ((tmp & CButton::R && tmp & CButton::L) || + ((lbl_80451A08 > m_cpadInfo[controller_pad_no].mTriggerLeft) && + (lbl_80451A08 > m_cpadInfo[controller_pad_no].mTriggerRight))) { + tmp2 = m_cpadInfo[controller_pad_no].mMainStickPosX; + tmp3 = m_cpadInfo[controller_pad_no].mMainStickPosY; + + // if x buttons are pressed, clear the console + if (tmp & (CButton::Y | CButton::START) && tmp5 & CButton::START) { + lbl_804511B8->clear(); + } + + u32 tmp = m_cpadInfo[controller_pad_no].mButtonFlags; + + if (!(tmp & (CButton::Y | CButton::START))) { + // subtract console scroll value from stick Y + float tmp4 = lbl_80450B2C; + lbl_80450B2C = tmp4 - tmp3; + if (lbl_80450B2C <= lbl_80451A0C) { + lbl_80451A10 <= lbl_80450B2C ? tmp = 0 : tmp = lbl_80451A0C; + } else { + tmp = (tmp4 - tmp3); + } + + if (tmp) { + lbl_80450B2C -= (tmp ^ 0x80000000) - 4503601774854144.00000000; + lbl_804511B8->scroll(tmp); + } + } else { + if (tmp & CButton::X) { + lbl_80450B2C += tmp2; + } + + if (tmp & CButton::Y) { + lbl_80450B2C -= tmp3; + } + } + + if (tmp5 & CButton::A) { + lbl_804511B8->dumpToTerminal(0xFFFFFFFF); + lbl_804511B8->field_0x58 = 3; + } + + JUTReport(0x1E, 0x186, 1, lbl_80373B51); + JUTReport(0x1E, 400, 1, lbl_80373B73); + JUTReport(0x1E, 0x19A, 1, lbl_80373B8D); + tmp6 = lbl_804511B8->getLineOffset(); + JUTReport(0x1E, 0x1A4, 1, lbl_80373BB6, tmp6, lbl_804511B8->field_0x40, + lbl_804511B8->field_0x44, lbl_804511B8->field_0x58); + } + } else { + if (tmp5 & 4) { + g_HIO.field_0x15 ^= 1; + } + + if (tmp5 & 1) { + if (sAramObject__7JKRAram->getAramHeap()) { + sAramObject__7JKRAram->getAramHeap()->dump(); + } + + dump__24DynamicModuleControlBaseFv(); + dump__14dRes_control_cFv(); + } + + if (tmp5 & 2) { + sSystemHeap__7JKRHeap->dump_sort(); + } + + if (tmp5 & 8) { + lbl_80450C2C->dump_sort(); + lbl_80450C28->dump_sort(); + lbl_80450C34->dump_sort(); + } + JUTReport(0x1E, 0x1B8, 1, lbl_80373BD5); + JUTReport(0x1E, 0x1C2, 1, lbl_80373BFB); + } + lbl_804511B8->field_0x40 = lbl_80450B1C; + lbl_804511B8->field_0x44 = lbl_80450B24; + tmp6 = 1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -563,6 +707,7 @@ static asm void Debug_console(u32 param_0) { #include "asm/m_Do/m_Do_main/Debug_console__FUl.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803739A0-803739A0 000000 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -572,6 +717,23 @@ SECTION_DEAD static char const* const stringBase_80373C23 = "/str/Final/Release/ #pragma pop /* 8000614C-800061C8 000A8C 007C+00 1/1 0/0 0/0 .text LOAD_COPYDATE__FPv */ +#ifdef NONMATCHING +s32 LOAD_COPYDATE(void*) { + s32 status; + u8 buffer[32]; + u8 fileInfo[80]; + // DVDFileInfo fileInfo; + + status = DVDOpen("/str/Final/Release/COPYDATE", (DVDFileInfo*)&fileInfo); + + if (status) { + DVDReadPrio((DVDFileInfo*)fileInfo, &buffer, 32, 0, 2); + memcpy(lbl_803A2EE0, buffer, 17); + status = DVDClose((DVDFileInfo*)fileInfo); + } + return status; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -580,22 +742,138 @@ static asm void LOAD_COPYDATE(void* param_0) { #include "asm/m_Do/m_Do_main/LOAD_COPYDATE__FPv.s" } #pragma pop +#endif -/* 800061C8-8000628C 000B08 00C4+00 1/1 0/0 0/0 .text debug__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void debug() { - nofralloc -#include "asm/m_Do/m_Do_main/debug__Fv.s" +static void debug() { + if (data_80450580) { + if (data_80450B1A) { + CheckHeap(2); + } + + if (((mDoCPd_c::m_gamePad[2]->buttons.mButtonFlags & ~0x10) == 0x20) && + (mDoCPd_c::m_gamePad[2]->buttons.mPressedButtonFlags & 0x10)) { + struct_80450B18[0] ^= 0x1; + } + + if (struct_80450B18[0]) { + if (((mDoCPd_c::m_gamePad[2]->buttons.mButtonFlags & ~0x10) == 0x40) && + (mDoCPd_c::m_gamePad[2]->buttons.mPressedButtonFlags & 0x10)) { + data_80450588[0] < 0x5 ? data_80450588[0]++ : data_80450588[0] = 0x1; + } + + debugDisplay(); + } + + Debug_console(2); + } } -#pragma pop /* ############################################################################################## */ /* 80450B34-80450B38 000034 0004+00 1/1 0/0 0/0 .sbss frame$3939 */ static u8 frame[4]; /* 8000628C-80006454 000BCC 01C8+00 1/1 0/0 0/0 .text main01__Fv */ +#ifdef NONMATCHING +void main01(void) { + HeapCheck* heaps = lbl_803D32E0; + + mDoMch_Create__Fv(); + mDoGph_Create(); + create__8mDoCPd_cFv(); + + // mDoDVDThd_callback_c thread_callback; + // JKRSolidHeap audio_heap; + + // Root Heap + heaps[0].setHeap((JKRExpHeap*)JKRHeap::getRootHeap()); + if (JKRHeap::getRootHeap()) { + heaps[0].setHeapSize(JKRHeap::getRootHeap()->getSize()); + } + + // System Heap + heaps[1].setHeap((JKRExpHeap*)JKRHeap::getSystemHeap()); + if (JKRHeap::getSystemHeap()) { + heaps[1].setHeapSize(JKRHeap::getSystemHeap()->getSize()); + } + + // Zelda Heap + heaps[2].setHeap(mDoExt_getZeldaHeap()); + if (heaps[2].getHeap()) { + heaps[2].setHeapSize(heaps[2].getHeap()->getSize()); + } + + // Game Heap + heaps[3].setHeap(mDoExt_getGameHeap()); + if (heaps[3].getHeap()) { + heaps[3].setHeapSize(heaps[3].getHeap()->getSize()); + } + + // Archive Heap + heaps[4].setHeap(mDoExt_getArchiveHeap()); + if (heaps[4].getHeap()) { + heaps[4].setHeapSize(heaps[4].getHeap()->getSize()); + } + + // J2D Heap + heaps[5].setHeap(mDoExt_getJ2dHeap()); + if (heaps[5].getHeap()) { + heaps[5].setHeapSize(heaps[5].getHeap()->getSize()); + } + + // HostIO Heap + heaps[6].setHeap(mDoExt_getHostIOHeap()); + if (heaps[6].getHeap()) { + heaps[6].setHeapSize(heaps[6].getHeap()->getSize()); + } + + // Command Heap + heaps[7].setHeap(mDoExt_getCommandHeap()); + + JUTConsole* systemConsole = lbl_804511B8; + + if (heaps[7].getHeap()) { + heaps[7].setHeapSize(heaps[7].getHeap()->getSize()); + } + + u32 unk = 0; + if (lbl_80450580) { + unk = 3; + } + + systemConsole->field_0x58 = unk; + systemConsole->field_0x40 = 0x20; + systemConsole->field_0x44 = 0x2A; + + // lol + mDoDVDThd_callback_c::create(LOAD_COPYDATE, 0); + fapGm_Create(); + fopAcM_initManager(); + lbl_80450B18 = 0; + cDyl_InitAsync__Fv(); + + // g_mDoAud_audioHeap + + lbl_80450BBC = JKRSolidHeap::create(0x14d800, JKRHeap::getCurrentHeap(), false); + + // main loop + do { + // global frame counter? + lbl_80450B34++; + + if (lbl_80450B00 && (lbl_80450B34 == ((lbl_80450B34 / lbl_80450B00) * lbl_80450B00))) { + mDoMch_HeapCheckAll__Fv(); + } + + if (lbl_80450C80) { + update__15mDoMemCd_Ctrl_cFv(); + } + mDoCPd_c_NS_read(); + fapGm_Execute(); + mDoAud_Execute(); + debug(); + } while (true); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -604,6 +882,7 @@ static asm void main01() { #include "asm/m_Do/m_Do_main/main01__Fv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803D3420-803DB420 000140 8000+00 1/1 0/0 0/0 .bss mainThreadStack */ @@ -613,6 +892,59 @@ static u8 mainThreadStack[32768]; static u8 mainThread[792 + 8 /* padding */]; /* 80006454-800065D8 000D94 0184+00 0/0 1/1 0/0 .text main */ +#ifdef NONMATCHING +void main() { + u32 resetCode; + OSThread* current_thread = OSGetCurrentThread(); + OSPriority* priority; + mDoMain::sPowerOnTime = OSGetTime(); + OSReportInit(); + version_check(); + mDoRstData* reset_data = (mDoRstData*)OSAllocFromArenaLo(0x18, 4); + mDoRst::setResetData(reset_data); + + if (!mDoRst::getResetData()) { + do { + } while (true); + } + + if (!(OSGetResetCode() & 0x80000000)) { + mDoRst::offReset(); + mDoRst::offResetPrepare(); + mDoRst::off3ButtonReset(); + mDoRst::off3ButtonResetPort(-1); + mDoRst::setLogoScnFlag(0); + mDoRst::setProgSeqFlag(0); + mDoRst::setProgChgFlag(0); + mDoRst::setWarningDispFlag(0); + mDoRst::offShutdown(); + mDoRst::offReturnToMenu(); + } + + dComIfG_ct(); + + if (data_80450580 < 0) { + DVDDiskID* disk_id = DVDGetCurrentDiskID(); + + if (disk_id->game_version <= 0x90) { + if (disk_id->game_version <= 0x80) { + data_80450580 = 0; + } else { + resetCode = OSGetConsoleType(); + data_80450580 = (-(resetCode & 0x10000000) >> 0x1f); + } + } else { + data_80450580 = 1; + } + } + + priority = OSGetThreadPriority(current_thread); + OSCreateThread(&mainThread, main01, 0, &mainThread, 0x8000, priority, 0); + OSResumeThread(&mainThread); + OSSetThreadPriority(current_thread, 0x1F); + OSSuspendThread(current_thread); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -621,6 +953,7 @@ asm void main() { #include "asm/m_Do/m_Do_main/main.s" } #pragma pop +#endif /* 800065D8-800065E0 000F18 0008+00 0/0 2/0 0/0 .text dump_sort__7JKRHeapFv */ bool JKRHeap::dump_sort() {