diff --git a/asm/d/a/d_a_alink/animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c.s b/asm/d/a/d_a_alink/animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c.s deleted file mode 100644 index d9a8d85e49..0000000000 --- a/asm/d/a/d_a_alink/animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800AD128: -/* 800AD128 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD12C 7C 08 02 A6 */ mflr r0 -/* 800AD130 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD134 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AD138 93 C1 00 08 */ stw r30, 8(r1) -/* 800AD13C 7C 9E 23 79 */ or. r30, r4, r4 -/* 800AD140 7C BF 2B 78 */ mr r31, r5 -/* 800AD144 41 82 00 14 */ beq lbl_800AD158 -/* 800AD148 7F E3 FB 78 */ mr r3, r31 -/* 800AD14C 48 0B 13 C5 */ bl updateFrame__16daPy_frameCtrl_cFv -/* 800AD150 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 800AD154 D0 1E 00 08 */ stfs f0, 8(r30) -lbl_800AD158: -/* 800AD158 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AD15C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800AD160 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD164 7C 08 03 A6 */ mtlr r0 -/* 800AD168 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD16C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/backJumpSpeedDec__9daAlink_cFv.s b/asm/d/a/d_a_alink/backJumpSpeedDec__9daAlink_cFv.s deleted file mode 100644 index eebccf2956..0000000000 --- a/asm/d/a/d_a_alink/backJumpSpeedDec__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800C5700: -/* 800C5700 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5704 7C 08 02 A6 */ mflr r0 -/* 800C5708 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C570C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C5710 7C 7F 1B 78 */ mr r31, r3 -/* 800C5714 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800C5718 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C571C 41 82 00 74 */ beq lbl_800C5790 -/* 800C5720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C5724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C5728 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800C572C 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C5730 4B FA EF 31 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 800C5734 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5738 41 82 00 58 */ beq lbl_800C5790 -/* 800C573C 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800C5740 4B FB 05 CD */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo -/* 800C5744 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C5748 41 82 00 0C */ beq lbl_800C5754 -/* 800C574C C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800C5750 48 00 00 30 */ b lbl_800C5780 -lbl_800C5754: -/* 800C5754 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800C5758 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800C575C A8 9F 2F F0 */ lha r4, 0x2ff0(r31) -/* 800C5760 54 80 04 38 */ rlwinm r0, r4, 0, 0x10, 0x1c -/* 800C5764 7C 63 02 14 */ add r3, r3, r0 -/* 800C5768 C0 23 00 04 */ lfs f1, 4(r3) -/* 800C576C C0 1F 34 78 */ lfs f0, 0x3478(r31) -/* 800C5770 EC 40 00 72 */ fmuls f2, f0, f1 -/* 800C5774 7C 80 07 35 */ extsh. r0, r4 -/* 800C5778 40 81 00 08 */ ble lbl_800C5780 -/* 800C577C EC 42 00 72 */ fmuls f2, f2, f1 -lbl_800C5780: -/* 800C5780 C0 1F 33 98 */ lfs f0, 0x3398(r31) -/* 800C5784 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 800C5788 40 81 00 08 */ ble lbl_800C5790 -/* 800C578C D0 5F 33 98 */ stfs f2, 0x3398(r31) -lbl_800C5790: -/* 800C5790 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C5794 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C5798 7C 08 03 A6 */ mtlr r0 -/* 800C579C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C57A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelDragonHangBackJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelDragonHangBackJump__9daAlink_cFv.s deleted file mode 100644 index 6325f5f0df..0000000000 --- a/asm/d/a/d_a_alink/cancelDragonHangBackJump__9daAlink_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D0B08: -/* 800D0B08 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0B0C 28 00 00 DC */ cmplwi r0, 0xdc -/* 800D0B10 4C 82 00 20 */ bnelr -/* 800D0B14 38 00 FF FF */ li r0, -1 -/* 800D0B18 B0 03 30 0E */ sth r0, 0x300e(r3) -/* 800D0B1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelDungeonWarpReadyNeck__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelDungeonWarpReadyNeck__9daAlink_cFv.s deleted file mode 100644 index 6a075c7362..0000000000 --- a/asm/d/a/d_a_alink/cancelDungeonWarpReadyNeck__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800D07FC: -/* 800D07FC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0800 28 00 00 EA */ cmplwi r0, 0xea -/* 800D0804 4C 82 00 20 */ bnelr -/* 800D0808 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800D080C 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 -/* 800D0810 90 03 31 A0 */ stw r0, 0x31a0(r3) -/* 800D0814 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelLockAt__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelLockAt__9daAlink_cFv.s deleted file mode 100644 index c7da1cb39f..0000000000 --- a/asm/d/a/d_a_alink/cancelLockAt__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800ABB28: -/* 800ABB28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ABB2C 7C 08 02 A6 */ mflr r0 -/* 800ABB30 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ABB34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ABB38 7C 7F 1B 78 */ mr r31, r3 -/* 800ABB3C 80 03 12 2C */ lwz r0, 0x122c(r3) -/* 800ABB40 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 -/* 800ABB44 90 03 12 2C */ stw r0, 0x122c(r3) -/* 800ABB48 80 03 12 84 */ lwz r0, 0x1284(r3) -/* 800ABB4C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 800ABB50 90 03 12 84 */ stw r0, 0x1284(r3) -/* 800ABB54 80 03 12 84 */ lwz r0, 0x1284(r3) -/* 800ABB58 60 00 00 01 */ ori r0, r0, 1 -/* 800ABB5C 90 03 12 84 */ stw r0, 0x1284(r3) -/* 800ABB60 38 7F 12 2C */ addi r3, r31, 0x122c -/* 800ABB64 4B FD 87 B5 */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800ABB68 38 00 FF FF */ li r0, -1 -/* 800ABB6C 90 1F 08 3C */ stw r0, 0x83c(r31) -/* 800ABB70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ABB74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ABB78 7C 08 03 A6 */ mtlr r0 -/* 800ABB7C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ABB80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelOctaIealHang__9daAlink_cFv.s b/asm/d/a/d_a_alink/cancelOctaIealHang__9daAlink_cFv.s deleted file mode 100644 index 9d02ab2dff..0000000000 --- a/asm/d/a/d_a_alink/cancelOctaIealHang__9daAlink_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D0AF0: -/* 800D0AF0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0AF4 28 00 00 DC */ cmplwi r0, 0xdc -/* 800D0AF8 4C 82 00 20 */ bnelr -/* 800D0AFC 38 00 00 01 */ li r0, 1 -/* 800D0B00 B0 03 30 0E */ sth r0, 0x300e(r3) -/* 800D0B04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/cancelWolfLock__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/cancelWolfLock__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index ed9f1daccb..0000000000 --- a/asm/d/a/d_a_alink/cancelWolfLock__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8013916C: -/* 8013916C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80139170 7C 08 02 A6 */ mflr r0 -/* 80139174 90 01 00 14 */ stw r0, 0x14(r1) -/* 80139178 28 04 00 00 */ cmplwi r4, 0 -/* 8013917C 41 82 00 0C */ beq lbl_80139188 -/* 80139180 80 A4 00 04 */ lwz r5, 4(r4) -/* 80139184 48 00 00 08 */ b lbl_8013918C -lbl_80139188: -/* 80139188 38 A0 FF FF */ li r5, -1 -lbl_8013918C: -/* 8013918C 38 80 00 00 */ li r4, 0 -/* 80139190 88 03 2F B1 */ lbz r0, 0x2fb1(r3) -/* 80139194 7C 09 03 A6 */ mtctr r0 -/* 80139198 2C 00 00 00 */ cmpwi r0, 0 -/* 8013919C 40 81 00 2C */ ble lbl_801391C8 -lbl_801391A0: -/* 801391A0 7C C3 22 14 */ add r6, r3, r4 -/* 801391A4 80 06 07 C4 */ lwz r0, 0x7c4(r6) -/* 801391A8 7C 05 00 40 */ cmplw r5, r0 -/* 801391AC 40 82 00 14 */ bne lbl_801391C0 -/* 801391B0 38 66 07 C4 */ addi r3, r6, 0x7c4 -/* 801391B4 48 02 5B 49 */ bl clearData__16daPy_actorKeep_cFv -/* 801391B8 38 60 00 01 */ li r3, 1 -/* 801391BC 48 00 00 10 */ b lbl_801391CC -lbl_801391C0: -/* 801391C0 38 84 00 08 */ addi r4, r4, 8 -/* 801391C4 42 00 FF DC */ bdnz lbl_801391A0 -lbl_801391C8: -/* 801391C8 38 60 00 00 */ li r3, 0 -lbl_801391CC: -/* 801391CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801391D0 7C 08 03 A6 */ mtlr r0 -/* 801391D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801391D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/changeCutFast__9daAlink_cFv.s b/asm/d/a/d_a_alink/changeCutFast__9daAlink_cFv.s deleted file mode 100644 index a855f53ecc..0000000000 --- a/asm/d/a/d_a_alink/changeCutFast__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800D1088: -/* 800D1088 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D108C 7C 08 02 A6 */ mflr r0 -/* 800D1090 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D1094 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1098 7C 7F 1B 78 */ mr r31, r3 -/* 800D109C 38 80 00 00 */ li r4, 0 -/* 800D10A0 38 A0 00 00 */ li r5, 0 -/* 800D10A4 4B FF 02 39 */ bl deleteEquipItem__9daAlink_cFii -/* 800D10A8 7F E3 FB 78 */ mr r3, r31 -/* 800D10AC 48 00 01 BD */ bl setSwordModel__9daAlink_cFv -/* 800D10B0 38 00 00 03 */ li r0, 3 -/* 800D10B4 98 1F 05 69 */ stb r0, 0x569(r31) -/* 800D10B8 7F E3 FB 78 */ mr r3, r31 -/* 800D10BC 48 00 13 05 */ bl checkCutAction__9daAlink_cFv -/* 800D10C0 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800D10C4 64 00 00 08 */ oris r0, r0, 8 -/* 800D10C8 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800D10CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D10D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D10D4 7C 08 03 A6 */ mtlr r0 -/* 800D10D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D10DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf.s b/asm/d/a/d_a_alink/checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf.s deleted file mode 100644 index 317764673f..0000000000 --- a/asm/d/a/d_a_alink/checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800D1920: -/* 800D1920 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D1924 7C 08 02 A6 */ mflr r0 -/* 800D1928 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D192C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1930 93 C1 00 08 */ stw r30, 8(r1) -/* 800D1934 7C 9E 23 78 */ mr r30, r4 -/* 800D1938 3B E0 00 00 */ li r31, 0 -/* 800D193C 7F C3 F3 78 */ mr r3, r30 -/* 800D1940 4B FB 29 81 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D1944 28 03 00 00 */ cmplwi r3, 0 -/* 800D1948 41 82 00 14 */ beq lbl_800D195C -/* 800D194C 80 1E 00 5C */ lwz r0, 0x5c(r30) -/* 800D1950 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 800D1954 41 82 00 08 */ beq lbl_800D195C -/* 800D1958 3B E0 00 01 */ li r31, 1 -lbl_800D195C: -/* 800D195C 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D1960 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D1964 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D1968 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D196C 7C 08 03 A6 */ mtlr r0 -/* 800D1970 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D1974 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkAutoJump__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkAutoJump__9daAlink_cCFv.s deleted file mode 100644 index f703271399..0000000000 --- a/asm/d/a/d_a_alink/checkAutoJump__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D03F0: -/* 800D03F0 38 00 00 00 */ li r0, 0 -/* 800D03F4 A0 63 2F E8 */ lhz r3, 0x2fe8(r3) -/* 800D03F8 28 03 00 15 */ cmplwi r3, 0x15 -/* 800D03FC 41 82 00 0C */ beq lbl_800D0408 -/* 800D0400 28 03 00 FC */ cmplwi r3, 0xfc -/* 800D0404 40 82 00 08 */ bne lbl_800D040C -lbl_800D0408: -/* 800D0408 38 00 00 01 */ li r0, 1 -lbl_800D040C: -/* 800D040C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800D0410 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBeeChildDrink__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBeeChildDrink__9daAlink_cCFv.s deleted file mode 100644 index 1979c17a11..0000000000 --- a/asm/d/a/d_a_alink/checkBeeChildDrink__9daAlink_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D0A94: -/* 800D0A94 88 63 2F D3 */ lbz r3, 0x2fd3(r3) -/* 800D0A98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoarRun__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBoarRun__9daAlink_cCFv.s deleted file mode 100644 index d92b308126..0000000000 --- a/asm/d/a/d_a_alink/checkBoarRun__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0718: -/* 800D0718 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D071C 20 00 00 53 */ subfic r0, r0, 0x53 -/* 800D0720 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0724 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0728 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoarStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBoarStart__9daAlink_cFv.s deleted file mode 100644 index 13572c653e..0000000000 --- a/asm/d/a/d_a_alink/checkBoarStart__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800A4BC8: -/* 800A4BC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A4BCC 7C 08 02 A6 */ mflr r0 -/* 800A4BD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A4BD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A4BD8 93 C1 00 08 */ stw r30, 8(r1) -/* 800A4BDC 7C 7E 1B 78 */ mr r30, r3 -/* 800A4BE0 3B E0 00 00 */ li r31, 0 -/* 800A4BE4 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800A4BE8 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800A4BEC 38 63 04 45 */ addi r3, r3, 0x445 -/* 800A4BF0 4B FF 8E 71 */ bl checkStageName__9daAlink_cFPCc -/* 800A4BF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800A4BF8 41 82 00 2C */ beq lbl_800A4C24 -/* 800A4BFC 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 800A4C00 54 00 06 BE */ clrlwi r0, r0, 0x1a -/* 800A4C04 2C 00 00 03 */ cmpwi r0, 3 -/* 800A4C08 40 82 00 1C */ bne lbl_800A4C24 -/* 800A4C0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A4C10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A4C14 A8 03 0D B8 */ lha r0, 0xdb8(r3) -/* 800A4C18 7C 00 07 35 */ extsh. r0, r0 -/* 800A4C1C 40 82 00 08 */ bne lbl_800A4C24 -/* 800A4C20 3B E0 00 01 */ li r31, 1 -lbl_800A4C24: -/* 800A4C24 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800A4C28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A4C2C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800A4C30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A4C34 7C 08 03 A6 */ mtlr r0 -/* 800A4C38 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A4C3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoomerangAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBoomerangAnime__9daAlink_cCFv.s deleted file mode 100644 index 2ae1527f90..0000000000 --- a/asm/d/a/d_a_alink/checkBoomerangAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800E0440: -/* 800E0440 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0444 7C 08 02 A6 */ mflr r0 -/* 800E0448 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E044C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0450 3B E0 00 00 */ li r31, 0 -/* 800E0454 7F E4 FB 78 */ mr r4, r31 -/* 800E0458 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E045C 28 00 00 40 */ cmplwi r0, 0x40 -/* 800E0460 41 82 00 0C */ beq lbl_800E046C -/* 800E0464 28 00 01 02 */ cmplwi r0, 0x102 -/* 800E0468 40 82 00 14 */ bne lbl_800E047C -lbl_800E046C: -/* 800E046C A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E0470 28 00 00 54 */ cmplwi r0, 0x54 -/* 800E0474 40 82 00 08 */ bne lbl_800E047C -/* 800E0478 38 80 00 01 */ li r4, 1 -lbl_800E047C: -/* 800E047C 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800E0480 40 82 00 10 */ bne lbl_800E0490 -/* 800E0484 48 00 00 29 */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800E0488 2C 03 00 00 */ cmpwi r3, 0 -/* 800E048C 41 82 00 08 */ beq lbl_800E0494 -lbl_800E0490: -/* 800E0490 3B E0 00 01 */ li r31, 1 -lbl_800E0494: -/* 800E0494 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E0498 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E049C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E04A0 7C 08 03 A6 */ mtlr r0 -/* 800E04A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E04A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBoomerangLockAccept__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBoomerangLockAccept__9daAlink_cFv.s deleted file mode 100644 index bdd4491530..0000000000 --- a/asm/d/a/d_a_alink/checkBoomerangLockAccept__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800DFFE0: -/* 800DFFE0 38 80 00 00 */ li r4, 0 -/* 800DFFE4 88 03 20 68 */ lbz r0, 0x2068(r3) -/* 800DFFE8 28 00 00 00 */ cmplwi r0, 0 -/* 800DFFEC 41 82 00 1C */ beq lbl_800E0008 -/* 800DFFF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800DFFF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800DFFF8 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800DFFFC 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc -/* 800E0000 41 82 00 08 */ beq lbl_800E0008 -/* 800E0004 38 80 00 01 */ li r4, 1 -lbl_800E0008: -/* 800E0008 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800E000C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBossBabaRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkBossBabaRoom__9daAlink_cFv.s deleted file mode 100644 index 461722f18c..0000000000 --- a/asm/d/a/d_a_alink/checkBossBabaRoom__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E01A0: -/* 800E01A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E01A4 7C 08 02 A6 */ mflr r0 -/* 800E01A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E01AC 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800E01B0 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800E01B4 38 63 00 50 */ addi r3, r3, 0x50 -/* 800E01B8 4B FB D8 A9 */ bl checkStageName__9daAlink_cFPCc -/* 800E01BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E01C0 7C 08 03 A6 */ mtlr r0 -/* 800E01C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E01C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBottleDrinkEnd__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBottleDrinkEnd__9daAlink_cCFv.s deleted file mode 100644 index be06e40691..0000000000 --- a/asm/d/a/d_a_alink/checkBottleDrinkEnd__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0638: -/* 800D0638 38 80 00 00 */ li r4, 0 -/* 800D063C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0640 28 00 00 B3 */ cmplwi r0, 0xb3 -/* 800D0644 40 82 00 14 */ bne lbl_800D0658 -/* 800D0648 A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D064C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0650 41 82 00 08 */ beq lbl_800D0658 -/* 800D0654 38 80 00 01 */ li r4, 1 -lbl_800D0658: -/* 800D0658 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D065C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkBottleSwingMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkBottleSwingMode__9daAlink_cCFv.s deleted file mode 100644 index bea2fbb5b9..0000000000 --- a/asm/d/a/d_a_alink/checkBottleSwingMode__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D04F4: -/* 800D04F4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D04F8 20 00 00 B5 */ subfic r0, r0, 0xb5 -/* 800D04FC 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0500 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0504 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeFishingGetLeft__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCanoeFishingGetLeft__9daAlink_cCFv.s deleted file mode 100644 index ea6a1d1cba..0000000000 --- a/asm/d/a/d_a_alink/checkCanoeFishingGetLeft__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0A44: -/* 800D0A44 38 80 00 00 */ li r4, 0 -/* 800D0A48 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0A4C 28 00 00 97 */ cmplwi r0, 0x97 -/* 800D0A50 40 82 00 14 */ bne lbl_800D0A64 -/* 800D0A54 A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D0A58 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0A5C 40 82 00 08 */ bne lbl_800D0A64 -/* 800D0A60 38 80 00 01 */ li r4, 1 -lbl_800D0A64: -/* 800D0A64 7C 83 23 78 */ mr r3, r4 -/* 800D0A68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeFishingGetRight__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCanoeFishingGetRight__9daAlink_cCFv.s deleted file mode 100644 index 45f8d8d064..0000000000 --- a/asm/d/a/d_a_alink/checkCanoeFishingGetRight__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0A6C: -/* 800D0A6C 38 80 00 00 */ li r4, 0 -/* 800D0A70 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0A74 28 00 00 97 */ cmplwi r0, 0x97 -/* 800D0A78 40 82 00 14 */ bne lbl_800D0A8C -/* 800D0A7C A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D0A80 2C 00 00 01 */ cmpwi r0, 1 -/* 800D0A84 40 82 00 08 */ bne lbl_800D0A8C -/* 800D0A88 38 80 00 01 */ li r4, 1 -lbl_800D0A8C: -/* 800D0A8C 7C 83 23 78 */ mr r3, r4 -/* 800D0A90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCanoeStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCanoeStart__9daAlink_cFv.s deleted file mode 100644 index 6aaac145ca..0000000000 --- a/asm/d/a/d_a_alink/checkCanoeStart__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800A4C40: -/* 800A4C40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A4C44 7C 08 02 A6 */ mflr r0 -/* 800A4C48 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A4C4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A4C50 93 C1 00 08 */ stw r30, 8(r1) -/* 800A4C54 7C 7E 1B 78 */ mr r30, r3 -/* 800A4C58 3B E0 00 00 */ li r31, 0 -/* 800A4C5C 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800A4C60 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800A4C64 38 63 01 06 */ addi r3, r3, 0x106 -/* 800A4C68 4B FF 8D F9 */ bl checkStageName__9daAlink_cFPCc -/* 800A4C6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800A4C70 41 82 00 28 */ beq lbl_800A4C98 -/* 800A4C74 80 1E 00 B0 */ lwz r0, 0xb0(r30) -/* 800A4C78 54 00 06 BF */ clrlwi. r0, r0, 0x1a -/* 800A4C7C 40 82 00 1C */ bne lbl_800A4C98 -/* 800A4C80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800A4C84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800A4C88 A8 03 0D B8 */ lha r0, 0xdb8(r3) -/* 800A4C8C 2C 00 00 02 */ cmpwi r0, 2 -/* 800A4C90 40 82 00 08 */ bne lbl_800A4C98 -/* 800A4C94 3B E0 00 01 */ li r31, 1 -lbl_800A4C98: -/* 800A4C98 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800A4C9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A4CA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 800A4CA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A4CA8 7C 08 03 A6 */ mtlr r0 -/* 800A4CAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A4CB0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCastleTownUseItem__9daAlink_cFUs.s b/asm/d/a/d_a_alink/checkCastleTownUseItem__9daAlink_cFUs.s deleted file mode 100644 index df94ba0c13..0000000000 --- a/asm/d/a/d_a_alink/checkCastleTownUseItem__9daAlink_cFUs.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_800C0678: -/* 800C0678 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C067C 7C 08 02 A6 */ mflr r0 -/* 800C0680 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C0684 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C0688 93 C1 00 08 */ stw r30, 8(r1) -/* 800C068C 7C 7E 1B 78 */ mr r30, r3 -/* 800C0690 4B FF FF 05 */ bl checkNotBattleStage__9daAlink_cFv -/* 800C0694 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0698 41 82 00 C8 */ beq lbl_800C0760 -/* 800C069C 57 DF 04 3E */ clrlwi r31, r30, 0x10 -/* 800C06A0 28 1F 00 48 */ cmplwi r31, 0x48 -/* 800C06A4 41 82 00 AC */ beq lbl_800C0750 -/* 800C06A8 7F E3 FB 78 */ mr r3, r31 -/* 800C06AC 48 09 E5 2D */ bl checkTradeItem__9daPy_py_cFi -/* 800C06B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C06B4 40 82 00 9C */ bne lbl_800C0750 -/* 800C06B8 7F E0 FB 78 */ mr r0, r31 -/* 800C06BC 28 00 00 27 */ cmplwi r0, 0x27 -/* 800C06C0 40 82 00 10 */ bne lbl_800C06D0 -/* 800C06C4 48 05 E7 7D */ bl checkLv7DungeonShop__9daAlink_cFv -/* 800C06C8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C06CC 40 82 00 84 */ bne lbl_800C0750 -lbl_800C06D0: -/* 800C06D0 4B FF FD E5 */ bl checkRoomSpecial__9daAlink_cFv -/* 800C06D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C06D8 41 82 00 20 */ beq lbl_800C06F8 -/* 800C06DC 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 800C06E0 28 00 00 60 */ cmplwi r0, 0x60 -/* 800C06E4 41 82 00 6C */ beq lbl_800C0750 -/* 800C06E8 7F E3 FB 78 */ mr r3, r31 -/* 800C06EC 48 09 E5 3D */ bl checkDungeonWarpItem__9daPy_py_cFi -/* 800C06F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C06F4 40 82 00 5C */ bne lbl_800C0750 -lbl_800C06F8: -/* 800C06F8 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800C06FC 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800C0700 38 63 05 35 */ addi r3, r3, 0x535 -/* 800C0704 4B FD D3 5D */ bl checkStageName__9daAlink_cFPCc -/* 800C0708 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C070C 41 82 00 10 */ beq lbl_800C071C -/* 800C0710 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 800C0714 28 00 00 46 */ cmplwi r0, 0x46 -/* 800C0718 41 82 00 38 */ beq lbl_800C0750 -lbl_800C071C: -/* 800C071C 4B FF FD 31 */ bl checkLv2DungeonRoomSpecial__9daAlink_cFv -/* 800C0720 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0724 41 82 00 10 */ beq lbl_800C0734 -/* 800C0728 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 800C072C 28 00 00 45 */ cmplwi r0, 0x45 -/* 800C0730 41 82 00 20 */ beq lbl_800C0750 -lbl_800C0734: -/* 800C0734 7F E3 FB 78 */ mr r3, r31 -/* 800C0738 48 09 E3 51 */ bl checkBottleItem__9daPy_py_cFi -/* 800C073C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C0740 41 82 00 18 */ beq lbl_800C0758 -/* 800C0744 57 C0 04 3E */ clrlwi r0, r30, 0x10 -/* 800C0748 28 00 00 60 */ cmplwi r0, 0x60 -/* 800C074C 41 82 00 0C */ beq lbl_800C0758 -lbl_800C0750: -/* 800C0750 38 60 00 01 */ li r3, 1 -/* 800C0754 48 00 00 10 */ b lbl_800C0764 -lbl_800C0758: -/* 800C0758 38 60 00 00 */ li r3, 0 -/* 800C075C 48 00 00 08 */ b lbl_800C0764 -lbl_800C0760: -/* 800C0760 38 60 00 01 */ li r3, 1 -lbl_800C0764: -/* 800C0764 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0768 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C076C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C0770 7C 08 03 A6 */ mtlr r0 -/* 800C0774 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C0778 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkChainBlockPushPull__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkChainBlockPushPull__9daAlink_cFv.s deleted file mode 100644 index 0cdec8aa21..0000000000 --- a/asm/d/a/d_a_alink/checkChainBlockPushPull__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800E7BD0: -/* 800E7BD0 38 80 00 00 */ li r4, 0 -/* 800E7BD4 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800E7BD8 28 00 00 62 */ cmplwi r0, 0x62 -/* 800E7BDC 41 82 00 10 */ beq lbl_800E7BEC -/* 800E7BE0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E7BE4 28 00 02 A0 */ cmplwi r0, 0x2a0 -/* 800E7BE8 40 82 00 08 */ bne lbl_800E7BF0 -lbl_800E7BEC: -/* 800E7BEC 38 80 00 01 */ li r4, 1 -lbl_800E7BF0: -/* 800E7BF0 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 800E7BF4 41 82 00 34 */ beq lbl_800E7C28 -/* 800E7BF8 80 63 28 48 */ lwz r3, 0x2848(r3) -/* 800E7BFC 28 03 00 00 */ cmplwi r3, 0 -/* 800E7C00 41 82 00 28 */ beq lbl_800E7C28 -/* 800E7C04 A8 03 00 08 */ lha r0, 8(r3) -/* 800E7C08 2C 00 00 7E */ cmpwi r0, 0x7e -/* 800E7C0C 41 82 00 14 */ beq lbl_800E7C20 -/* 800E7C10 2C 00 01 6F */ cmpwi r0, 0x16f -/* 800E7C14 41 82 00 0C */ beq lbl_800E7C20 -/* 800E7C18 2C 00 00 7F */ cmpwi r0, 0x7f -/* 800E7C1C 40 82 00 0C */ bne lbl_800E7C28 -lbl_800E7C20: -/* 800E7C20 38 60 00 01 */ li r3, 1 -/* 800E7C24 4E 80 00 20 */ blr -lbl_800E7C28: -/* 800E7C28 38 60 00 00 */ li r3, 0 -/* 800E7C2C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkClimbMove__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkClimbMove__9daAlink_cCFv.s deleted file mode 100644 index 204d472b5d..0000000000 --- a/asm/d/a/d_a_alink/checkClimbMove__9daAlink_cCFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800D06D8: -/* 800D06D8 38 00 00 00 */ li r0, 0 -/* 800D06DC A0 63 2F E8 */ lhz r3, 0x2fe8(r3) -/* 800D06E0 28 03 00 82 */ cmplwi r3, 0x82 -/* 800D06E4 41 82 00 14 */ beq lbl_800D06F8 -/* 800D06E8 28 03 00 6B */ cmplwi r3, 0x6b -/* 800D06EC 41 82 00 0C */ beq lbl_800D06F8 -/* 800D06F0 28 03 00 83 */ cmplwi r3, 0x83 -/* 800D06F4 40 82 00 08 */ bne lbl_800D06FC -lbl_800D06F8: -/* 800D06F8 38 00 00 01 */ li r0, 1 -lbl_800D06FC: -/* 800D06FC 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800D0700 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkComboCutTurn__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkComboCutTurn__9daAlink_cCFv.s deleted file mode 100644 index 45884f3555..0000000000 --- a/asm/d/a/d_a_alink/checkComboCutTurn__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D06B0: -/* 800D06B0 38 80 00 00 */ li r4, 0 -/* 800D06B4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D06B8 28 00 00 28 */ cmplwi r0, 0x28 -/* 800D06BC 40 82 00 14 */ bne lbl_800D06D0 -/* 800D06C0 88 03 05 69 */ lbz r0, 0x569(r3) -/* 800D06C4 28 00 00 00 */ cmplwi r0, 0 -/* 800D06C8 41 82 00 08 */ beq lbl_800D06D0 -/* 800D06CC 38 80 00 01 */ li r4, 1 -lbl_800D06D0: -/* 800D06D0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D06D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkComboReserb__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkComboReserb__9daAlink_cFv.s deleted file mode 100644 index 138b1f6260..0000000000 --- a/asm/d/a/d_a_alink/checkComboReserb__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800D2188: -/* 800D2188 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D218C 7C 08 02 A6 */ mflr r0 -/* 800D2190 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2194 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2198 3B E0 00 00 */ li r31, 0 -/* 800D219C 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800D21A0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800D21A4 41 82 00 14 */ beq lbl_800D21B8 -/* 800D21A8 48 04 3A 79 */ bl checkEventRun__9daAlink_cCFv -/* 800D21AC 2C 03 00 00 */ cmpwi r3, 0 -/* 800D21B0 40 82 00 08 */ bne lbl_800D21B8 -/* 800D21B4 3B E0 00 01 */ li r31, 1 -lbl_800D21B8: -/* 800D21B8 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D21BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D21C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D21C4 7C 08 03 A6 */ mtlr r0 -/* 800D21C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D21CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCommandDoor__11dEvt_info_cFv.s b/asm/d/a/d_a_alink/checkCommandDoor__11dEvt_info_cFv.s deleted file mode 100644 index 81c33f6994..0000000000 --- a/asm/d/a/d_a_alink/checkCommandDoor__11dEvt_info_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80141450: -/* 80141450 A0 03 00 04 */ lhz r0, 4(r3) -/* 80141454 20 00 00 03 */ subfic r0, r0, 3 -/* 80141458 7C 00 00 34 */ cntlzw r0, r0 -/* 8014145C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80141460 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCopyRodEquip__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCopyRodEquip__9daAlink_cCFv.s deleted file mode 100644 index beb48a21a1..0000000000 --- a/asm/d/a/d_a_alink/checkCopyRodEquip__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0A30: -/* 800D0A30 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D0A34 20 00 00 46 */ subfic r0, r0, 0x46 -/* 800D0A38 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0A3C 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D0A40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutCharge__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutCharge__9daAlink_cCFv.s deleted file mode 100644 index f32a65c5aa..0000000000 --- a/asm/d/a/d_a_alink/checkCutCharge__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0674: -/* 800D0674 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0678 20 00 00 2A */ subfic r0, r0, 0x2a -/* 800D067C 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0680 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0684 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutDashAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutDashAnime__9daAlink_cCFv.s deleted file mode 100644 index aea44510a0..0000000000 --- a/asm/d/a/d_a_alink/checkCutDashAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800D0ECC: -/* 800D0ECC 38 80 00 00 */ li r4, 0 -/* 800D0ED0 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800D0ED4 28 00 00 80 */ cmplwi r0, 0x80 -/* 800D0ED8 41 82 00 18 */ beq lbl_800D0EF0 -/* 800D0EDC 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800D0EE0 28 00 00 82 */ cmplwi r0, 0x82 -/* 800D0EE4 41 82 00 0C */ beq lbl_800D0EF0 -/* 800D0EE8 28 00 00 81 */ cmplwi r0, 0x81 -/* 800D0EEC 40 82 00 08 */ bne lbl_800D0EF4 -lbl_800D0EF0: -/* 800D0EF0 38 80 00 01 */ li r4, 1 -lbl_800D0EF4: -/* 800D0EF4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D0EF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf.s b/asm/d/a/d_a_alink/checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf.s deleted file mode 100644 index 34bb431a1c..0000000000 --- a/asm/d/a/d_a_alink/checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800D0EFC: -/* 800D0EFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0F00 7C 08 02 A6 */ mflr r0 -/* 800D0F04 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0F08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D0F0C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D0F10 7C 9E 23 78 */ mr r30, r4 -/* 800D0F14 3B E0 00 00 */ li r31, 0 -/* 800D0F18 7F C3 F3 78 */ mr r3, r30 -/* 800D0F1C 4B FB 33 A5 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D0F20 28 03 00 00 */ cmplwi r3, 0 -/* 800D0F24 41 82 00 1C */ beq lbl_800D0F40 -/* 800D0F28 38 7E 00 58 */ addi r3, r30, 0x58 -/* 800D0F2C 4B FB 27 5D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D0F30 48 00 B6 19 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c -/* 800D0F34 2C 03 00 00 */ cmpwi r3, 0 -/* 800D0F38 41 82 00 08 */ beq lbl_800D0F40 -/* 800D0F3C 3B E0 00 01 */ li r31, 1 -lbl_800D0F40: -/* 800D0F40 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D0F44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D0F48 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D0F4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0F50 7C 08 03 A6 */ mtlr r0 -/* 800D0F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0F58 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutJumpCancelTurn__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutJumpCancelTurn__9daAlink_cCFv.s deleted file mode 100644 index 83aaeb43b5..0000000000 --- a/asm/d/a/d_a_alink/checkCutJumpCancelTurn__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800D07A4: -/* 800D07A4 38 80 00 00 */ li r4, 0 -/* 800D07A8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D07AC 28 00 00 26 */ cmplwi r0, 0x26 -/* 800D07B0 41 82 00 0C */ beq lbl_800D07BC -/* 800D07B4 28 00 00 27 */ cmplwi r0, 0x27 -/* 800D07B8 40 82 00 14 */ bne lbl_800D07CC -lbl_800D07BC: -/* 800D07BC 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 800D07C0 2C 00 00 02 */ cmpwi r0, 2 -/* 800D07C4 41 82 00 08 */ beq lbl_800D07CC -/* 800D07C8 38 80 00 01 */ li r4, 1 -lbl_800D07CC: -/* 800D07CC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D07D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutJumpInFly__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutJumpInFly__9daAlink_cFv.s deleted file mode 100644 index cd3ce65918..0000000000 --- a/asm/d/a/d_a_alink/checkCutJumpInFly__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800B69CC: -/* 800B69CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B69D0 7C 08 02 A6 */ mflr r0 -/* 800B69D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B69D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B69DC 7C 7F 1B 78 */ mr r31, r3 -/* 800B69E0 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800B69E4 28 00 01 03 */ cmplwi r0, 0x103 -/* 800B69E8 40 82 00 10 */ bne lbl_800B69F8 -/* 800B69EC 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800B69F0 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800B69F4 40 82 00 14 */ bne lbl_800B6A08 -lbl_800B69F8: -/* 800B69F8 7F E3 FB 78 */ mr r3, r31 -/* 800B69FC 48 01 B6 B9 */ bl checkForceSwordSwing__9daAlink_cFv -/* 800B6A00 2C 03 00 00 */ cmpwi r3, 0 -/* 800B6A04 41 82 00 14 */ beq lbl_800B6A18 -lbl_800B6A08: -/* 800B6A08 7F E3 FB 78 */ mr r3, r31 -/* 800B6A0C 38 80 00 01 */ li r4, 1 -/* 800B6A10 48 01 D8 ED */ bl procCutJumpInit__9daAlink_cFi -/* 800B6A14 48 00 00 08 */ b lbl_800B6A1C -lbl_800B6A18: -/* 800B6A18 38 60 00 00 */ li r3, 0 -lbl_800B6A1C: -/* 800B6A1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B6A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B6A24 7C 08 03 A6 */ mtlr r0 -/* 800B6A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B6A2C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutJumpMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutJumpMode__9daAlink_cCFv.s deleted file mode 100644 index 4879646efd..0000000000 --- a/asm/d/a/d_a_alink/checkCutJumpMode__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D09C8: -/* 800D09C8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D09CC 20 00 00 26 */ subfic r0, r0, 0x26 -/* 800D09D0 7C 00 00 34 */ cntlzw r0, r0 -/* 800D09D4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D09D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutLargeJumpCharge__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutLargeJumpCharge__9daAlink_cCFv.s deleted file mode 100644 index e4548e0974..0000000000 --- a/asm/d/a/d_a_alink/checkCutLargeJumpCharge__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0688: -/* 800D0688 38 80 00 00 */ li r4, 0 -/* 800D068C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0690 28 00 00 2A */ cmplwi r0, 0x2a -/* 800D0694 40 82 00 14 */ bne lbl_800D06A8 -/* 800D0698 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800D069C 2C 00 00 00 */ cmpwi r0, 0 -/* 800D06A0 41 82 00 08 */ beq lbl_800D06A8 -/* 800D06A4 38 80 00 01 */ li r4, 1 -lbl_800D06A8: -/* 800D06A8 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D06AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf.s deleted file mode 100644 index c7c9a30b19..0000000000 --- a/asm/d/a/d_a_alink/checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800D1978: -/* 800D1978 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D197C 7C 08 02 A6 */ mflr r0 -/* 800D1980 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D1984 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1988 93 C1 00 08 */ stw r30, 8(r1) -/* 800D198C 7C 7E 1B 78 */ mr r30, r3 -/* 800D1990 7C 9F 23 78 */ mr r31, r4 -/* 800D1994 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D1998 4B FB 1C F1 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D199C 7F C3 F3 78 */ mr r3, r30 -/* 800D19A0 7F E4 FB 78 */ mr r4, r31 -/* 800D19A4 4B FF FF 7D */ bl checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf -/* 800D19A8 30 03 FF FF */ addic r0, r3, -1 -/* 800D19AC 7C 60 19 10 */ subfe r3, r0, r3 -/* 800D19B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D19B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D19B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D19BC 7C 08 03 A6 */ mtlr r0 -/* 800D19C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D19C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutTurnCharge__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutTurnCharge__9daAlink_cFv.s deleted file mode 100644 index 3084722baf..0000000000 --- a/asm/d/a/d_a_alink/checkCutTurnCharge__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800D2684: -/* 800D2684 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2688 7C 08 02 A6 */ mflr r0 -/* 800D268C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2690 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2694 7C 7F 1B 78 */ mr r31, r3 -/* 800D2698 38 80 00 08 */ li r4, 8 -/* 800D269C 4B FD FF 4D */ bl itemButtonCheck__9daAlink_cFUc -/* 800D26A0 2C 03 00 00 */ cmpwi r3, 0 -/* 800D26A4 41 82 00 2C */ beq lbl_800D26D0 -/* 800D26A8 A8 7F 30 12 */ lha r3, 0x3012(r31) -/* 800D26AC 2C 03 00 03 */ cmpwi r3, 3 -/* 800D26B0 40 80 00 10 */ bge lbl_800D26C0 -/* 800D26B4 38 03 00 01 */ addi r0, r3, 1 -/* 800D26B8 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 800D26BC 48 00 00 1C */ b lbl_800D26D8 -lbl_800D26C0: -/* 800D26C0 80 1F 05 80 */ lwz r0, 0x580(r31) -/* 800D26C4 60 00 00 40 */ ori r0, r0, 0x40 -/* 800D26C8 90 1F 05 80 */ stw r0, 0x580(r31) -/* 800D26CC 48 00 00 0C */ b lbl_800D26D8 -lbl_800D26D0: -/* 800D26D0 38 00 00 00 */ li r0, 0 -/* 800D26D4 B0 1F 30 12 */ sth r0, 0x3012(r31) -lbl_800D26D8: -/* 800D26D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D26DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D26E0 7C 08 03 A6 */ mtlr r0 -/* 800D26E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D26E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutTurnInputTrigger__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkCutTurnInputTrigger__9daAlink_cFv.s deleted file mode 100644 index 41ed4e80c9..0000000000 --- a/asm/d/a/d_a_alink/checkCutTurnInputTrigger__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800D2368: -/* 800D2368 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D236C 7C 08 02 A6 */ mflr r0 -/* 800D2370 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2374 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D2378 93 C1 00 08 */ stw r30, 8(r1) -/* 800D237C 7C 7E 1B 78 */ mr r30, r3 -/* 800D2380 3B E0 00 00 */ li r31, 0 -/* 800D2384 4B FE 03 35 */ bl swordSwingTrigger__9daAlink_cFv -/* 800D2388 2C 03 00 00 */ cmpwi r3, 0 -/* 800D238C 41 82 00 18 */ beq lbl_800D23A4 -/* 800D2390 7F C3 F3 78 */ mr r3, r30 -/* 800D2394 4B FF F0 51 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800D2398 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D239C 41 82 00 08 */ beq lbl_800D23A4 -/* 800D23A0 3B E0 00 01 */ li r31, 1 -lbl_800D23A4: -/* 800D23A4 7F E3 FB 78 */ mr r3, r31 -/* 800D23A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D23AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D23B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D23B4 7C 08 03 A6 */ mtlr r0 -/* 800D23B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D23BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkCutTypeNoBlur__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkCutTypeNoBlur__9daAlink_cCFv.s deleted file mode 100644 index af00b7344d..0000000000 --- a/asm/d/a/d_a_alink/checkCutTypeNoBlur__9daAlink_cCFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800D13AC: -/* 800D13AC 38 80 00 00 */ li r4, 0 -/* 800D13B0 88 03 05 68 */ lbz r0, 0x568(r3) -/* 800D13B4 28 00 00 02 */ cmplwi r0, 2 -/* 800D13B8 41 82 00 20 */ beq lbl_800D13D8 -/* 800D13BC 28 00 00 21 */ cmplwi r0, 0x21 -/* 800D13C0 41 82 00 18 */ beq lbl_800D13D8 -/* 800D13C4 28 00 00 20 */ cmplwi r0, 0x20 -/* 800D13C8 41 82 00 10 */ beq lbl_800D13D8 -/* 800D13CC 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D13D0 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D13D4 41 82 00 08 */ beq lbl_800D13DC -lbl_800D13D8: -/* 800D13D8 38 80 00 01 */ li r4, 1 -lbl_800D13DC: -/* 800D13DC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D13E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkDragonHangRide__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkDragonHangRide__9daAlink_cCFv.s deleted file mode 100644 index 1951261dcd..0000000000 --- a/asm/d/a/d_a_alink/checkDragonHangRide__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0B38: -/* 800D0B38 38 80 00 00 */ li r4, 0 -/* 800D0B3C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0B40 28 00 00 DC */ cmplwi r0, 0xdc -/* 800D0B44 40 82 00 14 */ bne lbl_800D0B58 -/* 800D0B48 80 03 32 CC */ lwz r0, 0x32cc(r3) -/* 800D0B4C 28 00 00 00 */ cmplwi r0, 0 -/* 800D0B50 41 82 00 08 */ beq lbl_800D0B58 -/* 800D0B54 38 80 00 01 */ li r4, 1 -lbl_800D0B58: -/* 800D0B58 7C 83 23 78 */ mr r3, r4 -/* 800D0B5C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkElecDamage__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkElecDamage__9daAlink_cCFv.s deleted file mode 100644 index fdba720242..0000000000 --- a/asm/d/a/d_a_alink/checkElecDamage__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D04B8: -/* 800D04B8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D04BC 20 00 01 42 */ subfic r0, r0, 0x142 -/* 800D04C0 7C 00 00 34 */ cntlzw r0, r0 -/* 800D04C4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D04C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkEmptyBottleSwing__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkEmptyBottleSwing__9daAlink_cCFv.s deleted file mode 100644 index da1bb2f209..0000000000 --- a/asm/d/a/d_a_alink/checkEmptyBottleSwing__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D04CC: -/* 800D04CC 38 80 00 00 */ li r4, 0 -/* 800D04D0 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D04D4 28 00 00 60 */ cmplwi r0, 0x60 -/* 800D04D8 40 82 00 14 */ bne lbl_800D04EC -/* 800D04DC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D04E0 28 00 00 B5 */ cmplwi r0, 0xb5 -/* 800D04E4 40 82 00 08 */ bne lbl_800D04EC -/* 800D04E8 38 80 00 01 */ li r4, 1 -lbl_800D04EC: -/* 800D04EC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D04F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkFastShotTime__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkFastShotTime__9daAlink_cFv.s deleted file mode 100644 index 18e07d6c7b..0000000000 --- a/asm/d/a/d_a_alink/checkFastShotTime__9daAlink_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D079C: -/* 800D079C A8 63 30 8E */ lha r3, 0x308e(r3) -/* 800D07A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkForceSwordSwing__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkForceSwordSwing__9daAlink_cFv.s deleted file mode 100644 index 12dc79ce37..0000000000 --- a/asm/d/a/d_a_alink/checkForceSwordSwing__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800D20B4: -/* 800D20B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D20B8 7C 08 02 A6 */ mflr r0 -/* 800D20BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D20C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D20C4 3B E0 00 00 */ li r31, 0 -/* 800D20C8 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D20CC 28 00 01 03 */ cmplwi r0, 0x103 -/* 800D20D0 40 82 00 14 */ bne lbl_800D20E4 -/* 800D20D4 4B FE 05 E5 */ bl swordSwingTrigger__9daAlink_cFv -/* 800D20D8 2C 03 00 00 */ cmpwi r3, 0 -/* 800D20DC 41 82 00 08 */ beq lbl_800D20E4 -/* 800D20E0 3B E0 00 01 */ li r31, 1 -lbl_800D20E4: -/* 800D20E4 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D20E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D20EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D20F0 7C 08 03 A6 */ mtlr r0 -/* 800D20F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D20F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkForestOldCentury__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkForestOldCentury__9daAlink_cFv.s deleted file mode 100644 index 4f202fcd43..0000000000 --- a/asm/d/a/d_a_alink/checkForestOldCentury__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800E1408: -/* 800E1408 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E140C 7C 08 02 A6 */ mflr r0 -/* 800E1410 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1414 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1418 3B E0 00 00 */ li r31, 0 -/* 800E141C 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800E1420 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800E1424 38 63 00 60 */ addi r3, r3, 0x60 -/* 800E1428 4B FB C6 39 */ bl checkStageName__9daAlink_cFPCc -/* 800E142C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E1430 41 82 00 14 */ beq lbl_800E1444 -/* 800E1434 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 800E1438 2C 00 00 02 */ cmpwi r0, 2 -/* 800E143C 40 82 00 08 */ bne lbl_800E1444 -/* 800E1440 3B E0 00 01 */ li r31, 1 -lbl_800E1444: -/* 800E1444 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800E1448 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E144C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1450 7C 08 03 A6 */ mtlr r0 -/* 800E1454 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1458 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGoatThrowAfter__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGoatThrowAfter__9daAlink_cCFv.s deleted file mode 100644 index 4e45935a8b..0000000000 --- a/asm/d/a/d_a_alink/checkGoatThrowAfter__9daAlink_cCFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800D0544: -/* 800D0544 38 80 00 00 */ li r4, 0 -/* 800D0548 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D054C 28 00 00 C0 */ cmplwi r0, 0xc0 -/* 800D0550 40 82 00 18 */ bne lbl_800D0568 -/* 800D0554 C0 23 34 78 */ lfs f1, 0x3478(r3) -/* 800D0558 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800D055C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D0560 40 81 00 08 */ ble lbl_800D0568 -/* 800D0564 38 80 00 01 */ li r4, 1 -lbl_800D0568: -/* 800D0568 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D056C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGoatThrow__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGoatThrow__9daAlink_cCFv.s deleted file mode 100644 index 1aff9b5cf0..0000000000 --- a/asm/d/a/d_a_alink/checkGoatThrow__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D051C: -/* 800D051C 38 80 00 00 */ li r4, 0 -/* 800D0520 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0524 28 00 00 C0 */ cmplwi r0, 0xc0 -/* 800D0528 40 82 00 14 */ bne lbl_800D053C -/* 800D052C A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800D0530 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0534 41 82 00 08 */ beq lbl_800D053C -/* 800D0538 38 80 00 01 */ li r4, 1 -lbl_800D053C: -/* 800D053C 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D0540 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGoronRideWait__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGoronRideWait__9daAlink_cCFv.s deleted file mode 100644 index b6ebb83cda..0000000000 --- a/asm/d/a/d_a_alink/checkGoronRideWait__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D05D4: -/* 800D05D4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D05D8 20 00 00 BE */ subfic r0, r0, 0xbe -/* 800D05DC 7C 00 00 34 */ cntlzw r0, r0 -/* 800D05E0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D05E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGrassWhistle__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGrassWhistle__9daAlink_cCFv.s deleted file mode 100644 index 3ea63da68a..0000000000 --- a/asm/d/a/d_a_alink/checkGrassWhistle__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0704: -/* 800D0704 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0708 20 00 00 BA */ subfic r0, r0, 0xba -/* 800D070C 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0710 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0714 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkGuardBreakMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkGuardBreakMode__9daAlink_cCFv.s deleted file mode 100644 index 70c443bfe6..0000000000 --- a/asm/d/a/d_a_alink/checkGuardBreakMode__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0468: -/* 800D0468 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D046C 20 00 00 1F */ subfic r0, r0, 0x1f -/* 800D0470 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0474 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0478 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHawkWait__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHawkWait__9daAlink_cCFv.s deleted file mode 100644 index baf90ac886..0000000000 --- a/asm/d/a/d_a_alink/checkHawkWait__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0508: -/* 800D0508 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D050C 20 00 00 BC */ subfic r0, r0, 0xbc -/* 800D0510 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0514 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0518 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHeavyStateOn__9daAlink_cFii.s b/asm/d/a/d_a_alink/checkHeavyStateOn__9daAlink_cFii.s deleted file mode 100644 index ff1f665345..0000000000 --- a/asm/d/a/d_a_alink/checkHeavyStateOn__9daAlink_cFii.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_800BB4B8: -/* 800BB4B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800BB4BC 7C 08 02 A6 */ mflr r0 -/* 800BB4C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 800BB4C4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB4C8 48 2A 6D 15 */ bl _savegpr_29 -/* 800BB4CC 7C 7D 1B 78 */ mr r29, r3 -/* 800BB4D0 7C 9E 23 78 */ mr r30, r4 -/* 800BB4D4 7C BF 2B 78 */ mr r31, r5 -/* 800BB4D8 48 05 A7 49 */ bl checkEventRun__9daAlink_cCFv -/* 800BB4DC 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB4E0 40 82 00 64 */ bne lbl_800BB544 -/* 800BB4E4 2C 1F 00 00 */ cmpwi r31, 0 -/* 800BB4E8 41 82 00 14 */ beq lbl_800BB4FC -/* 800BB4EC C0 3D 2B A8 */ lfs f1, 0x2ba8(r29) -/* 800BB4F0 C0 02 94 0C */ lfs f0, lit_14614(r2) -/* 800BB4F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800BB4F8 41 80 00 44 */ blt lbl_800BB53C -lbl_800BB4FC: -/* 800BB4FC 2C 1E 00 00 */ cmpwi r30, 0 -/* 800BB500 41 82 00 10 */ beq lbl_800BB510 -/* 800BB504 A0 1D 1F BC */ lhz r0, 0x1fbc(r29) -/* 800BB508 28 00 01 9C */ cmplwi r0, 0x19c -/* 800BB50C 41 82 00 30 */ beq lbl_800BB53C -lbl_800BB510: -/* 800BB510 7F A3 EB 78 */ mr r3, r29 -/* 800BB514 48 05 9B D1 */ bl checkIronBallAnime__9daAlink_cCFv -/* 800BB518 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB51C 40 82 00 20 */ bne lbl_800BB53C -/* 800BB520 7F A3 EB 78 */ mr r3, r29 -/* 800BB524 4B FF FE E5 */ bl checkMagicArmorHeavy__9daAlink_cCFv -/* 800BB528 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB52C 40 82 00 10 */ bne lbl_800BB53C -/* 800BB530 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 800BB534 74 00 42 02 */ andis. r0, r0, 0x4202 -/* 800BB538 41 82 00 0C */ beq lbl_800BB544 -lbl_800BB53C: -/* 800BB53C 38 60 00 01 */ li r3, 1 -/* 800BB540 48 00 00 08 */ b lbl_800BB548 -lbl_800BB544: -/* 800BB544 38 60 00 00 */ li r3, 0 -lbl_800BB548: -/* 800BB548 39 61 00 20 */ addi r11, r1, 0x20 -/* 800BB54C 48 2A 6C DD */ bl _restgpr_29 -/* 800BB550 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800BB554 7C 08 03 A6 */ mtlr r0 -/* 800BB558 38 21 00 20 */ addi r1, r1, 0x20 -/* 800BB55C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseRideNotReady__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkHorseRideNotReady__9daAlink_cCFv.s deleted file mode 100644 index 77b2b08b81..0000000000 --- a/asm/d/a/d_a_alink/checkHorseRideNotReady__9daAlink_cCFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800D072C: -/* 800D072C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0730 7C 08 02 A6 */ mflr r0 -/* 800D0734 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0738 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D073C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D0740 7C 7E 1B 78 */ mr r30, r3 -/* 800D0744 3B E0 00 00 */ li r31, 0 -/* 800D0748 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800D074C 81 8C 01 88 */ lwz r12, 0x188(r12) -/* 800D0750 7D 89 03 A6 */ mtctr r12 -/* 800D0754 4E 80 04 21 */ bctrl -/* 800D0758 28 03 00 00 */ cmplwi r3, 0 -/* 800D075C 41 82 00 1C */ beq lbl_800D0778 -/* 800D0760 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800D0764 28 00 00 3A */ cmplwi r0, 0x3a -/* 800D0768 41 82 00 10 */ beq lbl_800D0778 -/* 800D076C 28 00 00 3B */ cmplwi r0, 0x3b -/* 800D0770 41 82 00 08 */ beq lbl_800D0778 -/* 800D0774 3B E0 00 01 */ li r31, 1 -lbl_800D0778: -/* 800D0778 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800D077C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D0780 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D0784 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0788 7C 08 03 A6 */ mtlr r0 -/* 800D078C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0790 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFv.s deleted file mode 100644 index a2dd36c5a3..0000000000 --- a/asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800D01A8: -/* 800D01A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D01AC 7C 08 02 A6 */ mflr r0 -/* 800D01B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D01B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D01B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D01BC 80 04 0D D0 */ lwz r0, 0xdd0(r4) -/* 800D01C0 54 04 07 3E */ clrlwi r4, r0, 0x1c -/* 800D01C4 80 03 00 B0 */ lwz r0, 0xb0(r3) -/* 800D01C8 54 05 A6 FE */ rlwinm r5, r0, 0x14, 0x1b, 0x1f -/* 800D01CC 4B FD 53 29 */ bl checkHorseStart__9daAlink_cFUli -/* 800D01D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D01D4 7C 08 03 A6 */ mtlr r0 -/* 800D01D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D01DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkItemDraw__9daAlink_cFv.s deleted file mode 100644 index bbe1db52a2..0000000000 --- a/asm/d/a/d_a_alink/checkItemDraw__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_800CB5F8: -/* 800CB5F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CB5FC 7C 08 02 A6 */ mflr r0 -/* 800CB600 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CB604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CB608 7C 7F 1B 78 */ mr r31, r3 -/* 800CB60C 80 03 07 08 */ lwz r0, 0x708(r3) -/* 800CB610 28 00 00 00 */ cmplwi r0, 0 -/* 800CB614 41 82 00 68 */ beq lbl_800CB67C -/* 800CB618 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800CB61C 28 00 00 42 */ cmplwi r0, 0x42 -/* 800CB620 40 82 00 10 */ bne lbl_800CB630 -/* 800CB624 48 00 58 75 */ bl checkSwordEquipAnime__9daAlink_cCFv -/* 800CB628 2C 03 00 00 */ cmpwi r3, 0 -/* 800CB62C 40 82 00 50 */ bne lbl_800CB67C -lbl_800CB630: -/* 800CB630 7F E3 FB 78 */ mr r3, r31 -/* 800CB634 A0 9F 2F DC */ lhz r4, 0x2fdc(r31) -/* 800CB638 48 01 31 49 */ bl checkBowAndSlingItem__9daAlink_cFi -/* 800CB63C 2C 03 00 00 */ cmpwi r3, 0 -/* 800CB640 41 82 00 34 */ beq lbl_800CB674 -/* 800CB644 7F E3 FB 78 */ mr r3, r31 -/* 800CB648 48 01 45 81 */ bl checkBowGrabLeftHand__9daAlink_cCFv -/* 800CB64C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800CB650 40 82 00 24 */ bne lbl_800CB674 -/* 800CB654 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CB658 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CB65C 88 03 00 15 */ lbz r0, 0x15(r3) -/* 800CB660 28 00 00 FF */ cmplwi r0, 0xff -/* 800CB664 41 82 00 10 */ beq lbl_800CB674 -/* 800CB668 80 1F 2E 50 */ lwz r0, 0x2e50(r31) -/* 800CB66C 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 -/* 800CB670 41 82 00 0C */ beq lbl_800CB67C -lbl_800CB674: -/* 800CB674 38 60 00 01 */ li r3, 1 -/* 800CB678 48 00 00 08 */ b lbl_800CB680 -lbl_800CB67C: -/* 800CB67C 38 60 00 00 */ li r3, 0 -lbl_800CB680: -/* 800CB680 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CB684 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CB688 7C 08 03 A6 */ mtlr r0 -/* 800CB68C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CB690 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkItemSwordEquip__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkItemSwordEquip__9daAlink_cCFv.s deleted file mode 100644 index 483acb17cd..0000000000 --- a/asm/d/a/d_a_alink/checkItemSwordEquip__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0998: -/* 800D0998 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D099C 20 00 01 03 */ subfic r0, r0, 0x103 -/* 800D09A0 7C 00 00 34 */ cntlzw r0, r0 -/* 800D09A4 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D09A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLv2DungeonRoomSpecial__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkLv2DungeonRoomSpecial__9daAlink_cFv.s deleted file mode 100644 index 7cd5f17204..0000000000 --- a/asm/d/a/d_a_alink/checkLv2DungeonRoomSpecial__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800C044C: -/* 800C044C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C0450 7C 08 02 A6 */ mflr r0 -/* 800C0454 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C0458 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C045C 3B E0 00 00 */ li r31, 0 -/* 800C0460 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800C0464 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800C0468 38 63 05 2E */ addi r3, r3, 0x52e -/* 800C046C 4B FD D5 F5 */ bl checkStageName__9daAlink_cFPCc -/* 800C0470 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0474 41 82 00 28 */ beq lbl_800C049C -/* 800C0478 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) -/* 800C047C 7C 00 07 74 */ extsb r0, r0 -/* 800C0480 2C 00 00 0E */ cmpwi r0, 0xe -/* 800C0484 41 82 00 14 */ beq lbl_800C0498 -/* 800C0488 2C 00 00 10 */ cmpwi r0, 0x10 -/* 800C048C 41 82 00 0C */ beq lbl_800C0498 -/* 800C0490 2C 00 00 11 */ cmpwi r0, 0x11 -/* 800C0494 40 82 00 08 */ bne lbl_800C049C -lbl_800C0498: -/* 800C0498 3B E0 00 01 */ li r31, 1 -lbl_800C049C: -/* 800C049C 7F E3 FB 78 */ mr r3, r31 -/* 800C04A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C04A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C04A8 7C 08 03 A6 */ mtlr r0 -/* 800C04AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C04B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLv2MiddleBossBgRide__9daAlink_cFs.s b/asm/d/a/d_a_alink/checkLv2MiddleBossBgRide__9daAlink_cFs.s deleted file mode 100644 index 31ce39b270..0000000000 --- a/asm/d/a/d_a_alink/checkLv2MiddleBossBgRide__9daAlink_cFs.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800B1FB8: -/* 800B1FB8 38 60 00 00 */ li r3, 0 -/* 800B1FBC 7C 80 07 34 */ extsh r0, r4 -/* 800B1FC0 2C 00 00 7B */ cmpwi r0, 0x7b -/* 800B1FC4 41 82 00 0C */ beq lbl_800B1FD0 -/* 800B1FC8 2C 00 00 7D */ cmpwi r0, 0x7d -/* 800B1FCC 4C 82 00 20 */ bnelr -lbl_800B1FD0: -/* 800B1FD0 38 60 00 01 */ li r3, 1 -/* 800B1FD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLv3Slide__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkLv3Slide__9daAlink_cCFv.s deleted file mode 100644 index a4b2298933..0000000000 --- a/asm/d/a/d_a_alink/checkLv3Slide__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D047C: -/* 800D047C 38 80 00 00 */ li r4, 0 -/* 800D0480 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0484 28 00 00 0C */ cmplwi r0, 0xc -/* 800D0488 40 82 00 14 */ bne lbl_800D049C -/* 800D048C A8 03 30 0E */ lha r0, 0x300e(r3) -/* 800D0490 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0494 41 82 00 08 */ beq lbl_800D049C -/* 800D0498 38 80 00 01 */ li r4, 1 -lbl_800D049C: -/* 800D049C 7C 83 23 78 */ mr r3, r4 -/* 800D04A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLv6BossRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkLv6BossRoom__9daAlink_cFv.s deleted file mode 100644 index 4d37148eae..0000000000 --- a/asm/d/a/d_a_alink/checkLv6BossRoom__9daAlink_cFv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800E12E0: -/* 800E12E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E12E4 7C 08 02 A6 */ mflr r0 -/* 800E12E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E12EC 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800E12F0 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800E12F4 38 63 00 58 */ addi r3, r3, 0x58 -/* 800E12F8 4B FB C7 69 */ bl checkStageName__9daAlink_cFPCc -/* 800E12FC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800E1300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1304 7C 08 03 A6 */ mtlr r0 -/* 800E1308 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E130C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMetamorphose__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkMetamorphose__9daAlink_cCFv.s deleted file mode 100644 index 0054999c9b..0000000000 --- a/asm/d/a/d_a_alink/checkMetamorphose__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D09EC: -/* 800D09EC 38 80 00 00 */ li r4, 0 -/* 800D09F0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D09F4 28 00 01 4D */ cmplwi r0, 0x14d -/* 800D09F8 40 82 00 14 */ bne lbl_800D0A0C -/* 800D09FC A8 03 30 0A */ lha r0, 0x300a(r3) -/* 800D0A00 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0A04 40 82 00 08 */ bne lbl_800D0A0C -/* 800D0A08 38 80 00 01 */ li r4, 1 -lbl_800D0A0C: -/* 800D0A0C 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D0A10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkMidnaUseAbility__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkMidnaUseAbility__9daAlink_cCFv.s deleted file mode 100644 index 4d8bb2cbec..0000000000 --- a/asm/d/a/d_a_alink/checkMidnaUseAbility__9daAlink_cCFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80129958: -/* 80129958 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012995C 7C 08 02 A6 */ mflr r0 -/* 80129960 90 01 00 14 */ stw r0, 0x14(r1) -/* 80129964 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80129968 3B E0 00 00 */ li r31, 0 -/* 8012996C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80129970 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80129974 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 80129978 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 8012997C 40 82 00 10 */ bne lbl_8012998C -/* 80129980 48 08 29 61 */ bl dKy_withwarp_capture_check__Fv -/* 80129984 2C 03 00 00 */ cmpwi r3, 0 -/* 80129988 41 82 00 08 */ beq lbl_80129990 -lbl_8012998C: -/* 8012998C 3B E0 00 01 */ li r31, 1 -lbl_80129990: -/* 80129990 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 80129994 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80129998 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012999C 7C 08 03 A6 */ mtlr r0 -/* 801299A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801299A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNoEquipItem__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkNoEquipItem__9daAlink_cCFv.s deleted file mode 100644 index 835f9a2a61..0000000000 --- a/asm/d/a/d_a_alink/checkNoEquipItem__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D084C: -/* 800D084C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800D0850 20 00 00 FF */ subfic r0, r0, 0xff -/* 800D0854 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0858 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D085C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotAutoJumpStage__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNotAutoJumpStage__9daAlink_cFv.s deleted file mode 100644 index 0d2301e705..0000000000 --- a/asm/d/a/d_a_alink/checkNotAutoJumpStage__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800C0630: -/* 800C0630 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C0634 7C 08 02 A6 */ mflr r0 -/* 800C0638 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C063C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C0640 3B E0 00 00 */ li r31, 0 -/* 800C0644 4B FF FD A5 */ bl checkRoomOnly__9daAlink_cFv -/* 800C0648 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C064C 40 82 00 10 */ bne lbl_800C065C -/* 800C0650 4B FF FD 09 */ bl checkCastleTown__9daAlink_cFv -/* 800C0654 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0658 41 82 00 08 */ beq lbl_800C0660 -lbl_800C065C: -/* 800C065C 3B E0 00 01 */ li r31, 1 -lbl_800C0660: -/* 800C0660 7F E3 FB 78 */ mr r3, r31 -/* 800C0664 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0668 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C066C 7C 08 03 A6 */ mtlr r0 -/* 800C0670 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C0674 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotBattleStage__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNotBattleStage__9daAlink_cFv.s deleted file mode 100644 index 7f0a1728e0..0000000000 --- a/asm/d/a/d_a_alink/checkNotBattleStage__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_800C0594: -/* 800C0594 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C0598 7C 08 02 A6 */ mflr r0 -/* 800C059C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C05A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C05A4 3B E0 00 00 */ li r31, 0 -/* 800C05A8 4B FF FF 79 */ bl checkRoom__9daAlink_cFv -/* 800C05AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C05B0 40 82 00 10 */ bne lbl_800C05C0 -/* 800C05B4 4B FF FD A5 */ bl checkCastleTown__9daAlink_cFv -/* 800C05B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C05BC 41 82 00 08 */ beq lbl_800C05C4 -lbl_800C05C0: -/* 800C05C0 3B E0 00 01 */ li r31, 1 -lbl_800C05C4: -/* 800C05C4 7F E3 FB 78 */ mr r3, r31 -/* 800C05C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C05CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C05D0 7C 08 03 A6 */ mtlr r0 -/* 800C05D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C05D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotHeavyBootsStage__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNotHeavyBootsStage__9daAlink_cFv.s deleted file mode 100644 index f011217814..0000000000 --- a/asm/d/a/d_a_alink/checkNotHeavyBootsStage__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800C05DC: -/* 800C05DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C05E0 7C 08 02 A6 */ mflr r0 -/* 800C05E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C05E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C05EC 3B E0 00 00 */ li r31, 0 -/* 800C05F0 4B FF FF A5 */ bl checkNotBattleStage__9daAlink_cFv -/* 800C05F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C05F8 40 82 00 10 */ bne lbl_800C0608 -/* 800C05FC 4B FF FD A5 */ bl checkCloudSea__9daAlink_cFv -/* 800C0600 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0604 41 82 00 14 */ beq lbl_800C0618 -lbl_800C0608: -/* 800C0608 4B FF FE 45 */ bl checkLv2DungeonRoomSpecial__9daAlink_cFv -/* 800C060C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0610 40 82 00 08 */ bne lbl_800C0618 -/* 800C0614 3B E0 00 01 */ li r31, 1 -lbl_800C0618: -/* 800C0618 7F E3 FB 78 */ mr r3, r31 -/* 800C061C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C0624 7C 08 03 A6 */ mtlr r0 -/* 800C0628 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C062C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotItemSinkLimit__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNotItemSinkLimit__9daAlink_cFv.s deleted file mode 100644 index 9ed867e92d..0000000000 --- a/asm/d/a/d_a_alink/checkNotItemSinkLimit__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800B1B68: -/* 800B1B68 38 00 00 00 */ li r0, 0 -/* 800B1B6C C0 23 2B A8 */ lfs f1, 0x2ba8(r3) -/* 800B1B70 C0 02 95 E8 */ lfs f0, lit_28045(r2) -/* 800B1B74 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B1B78 40 80 00 2C */ bge lbl_800B1BA4 -/* 800B1B7C 88 63 2F BD */ lbz r3, 0x2fbd(r3) -/* 800B1B80 28 03 00 01 */ cmplwi r3, 1 -/* 800B1B84 41 82 00 1C */ beq lbl_800B1BA0 -/* 800B1B88 28 03 00 02 */ cmplwi r3, 2 -/* 800B1B8C 41 82 00 14 */ beq lbl_800B1BA0 -/* 800B1B90 28 03 00 03 */ cmplwi r3, 3 -/* 800B1B94 41 82 00 0C */ beq lbl_800B1BA0 -/* 800B1B98 28 03 00 04 */ cmplwi r3, 4 -/* 800B1B9C 40 82 00 08 */ bne lbl_800B1BA4 -lbl_800B1BA0: -/* 800B1BA0 38 00 00 01 */ li r0, 1 -lbl_800B1BA4: -/* 800B1BA4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800B1BA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotJumpSinkLimit__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkNotJumpSinkLimit__9daAlink_cFv.s deleted file mode 100644 index 8c04ba9389..0000000000 --- a/asm/d/a/d_a_alink/checkNotJumpSinkLimit__9daAlink_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800B1B28: -/* 800B1B28 38 80 00 00 */ li r4, 0 -/* 800B1B2C C0 23 2B A8 */ lfs f1, 0x2ba8(r3) -/* 800B1B30 C0 02 94 0C */ lfs f0, lit_14614(r2) -/* 800B1B34 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B1B38 41 80 00 24 */ blt lbl_800B1B5C -/* 800B1B3C 88 03 2F BD */ lbz r0, 0x2fbd(r3) -/* 800B1B40 28 00 00 03 */ cmplwi r0, 3 -/* 800B1B44 41 82 00 18 */ beq lbl_800B1B5C -/* 800B1B48 28 00 00 04 */ cmplwi r0, 4 -/* 800B1B4C 40 82 00 14 */ bne lbl_800B1B60 -/* 800B1B50 C0 02 94 34 */ lfs f0, lit_14624(r2) -/* 800B1B54 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B1B58 40 80 00 08 */ bge lbl_800B1B60 -lbl_800B1B5C: -/* 800B1B5C 38 80 00 01 */ li r4, 1 -lbl_800B1B60: -/* 800B1B60 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800B1B64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkOctaIealHang__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkOctaIealHang__9daAlink_cCFv.s deleted file mode 100644 index e84e320c8d..0000000000 --- a/asm/d/a/d_a_alink/checkOctaIealHang__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0AC8: -/* 800D0AC8 38 80 00 00 */ li r4, 0 -/* 800D0ACC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0AD0 28 00 00 DC */ cmplwi r0, 0xdc -/* 800D0AD4 40 82 00 14 */ bne lbl_800D0AE8 -/* 800D0AD8 80 03 32 CC */ lwz r0, 0x32cc(r3) -/* 800D0ADC 28 00 00 00 */ cmplwi r0, 0 -/* 800D0AE0 40 82 00 08 */ bne lbl_800D0AE8 -/* 800D0AE4 38 80 00 01 */ li r4, 1 -lbl_800D0AE8: -/* 800D0AE8 7C 83 23 78 */ mr r3, r4 -/* 800D0AEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkPlayerNoDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkPlayerNoDraw__9daAlink_cFv.s deleted file mode 100644 index c41d9ef06b..0000000000 --- a/asm/d/a/d_a_alink/checkPlayerNoDraw__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800CF344: -/* 800CF344 38 A0 00 01 */ li r5, 1 -/* 800CF348 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CF34C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CF350 80 03 31 7C */ lwz r0, 0x317c(r3) -/* 800CF354 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 800CF358 7C 84 02 14 */ add r4, r4, r0 -/* 800CF35C 80 04 5D 7C */ lwz r0, 0x5d7c(r4) -/* 800CF360 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800CF364 40 82 00 14 */ bne lbl_800CF378 -/* 800CF368 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800CF36C 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 -/* 800CF370 40 82 00 08 */ bne lbl_800CF378 -/* 800CF374 38 A0 00 00 */ li r5, 0 -lbl_800CF378: -/* 800CF378 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800CF37C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c.s deleted file mode 100644 index 617e553191..0000000000 --- a/asm/d/a/d_a_alink/checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0948: -/* 800D0948 80 03 27 F4 */ lwz r0, 0x27f4(r3) -/* 800D094C 7C 00 20 50 */ subf r0, r0, r4 -/* 800D0950 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0954 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D0958 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkReadyItem__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkReadyItem__9daAlink_cFv.s deleted file mode 100644 index c882979420..0000000000 --- a/asm/d/a/d_a_alink/checkReadyItem__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800B8930: -/* 800B8930 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B8934 7C 08 02 A6 */ mflr r0 -/* 800B8938 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B893C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B8940 7C 7F 1B 78 */ mr r31, r3 -/* 800B8944 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800B8948 28 00 00 FF */ cmplwi r0, 0xff -/* 800B894C 40 82 00 0C */ bne lbl_800B8958 -/* 800B8950 38 60 00 00 */ li r3, 0 -/* 800B8954 48 00 00 20 */ b lbl_800B8974 -lbl_800B8958: -/* 800B8958 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800B895C 4B F7 55 C1 */ bl dComIfGp_getSelectItem__Fi -/* 800B8960 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800B8964 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800B8968 7C 00 18 50 */ subf r0, r0, r3 -/* 800B896C 7C 00 00 34 */ cntlzw r0, r0 -/* 800B8970 54 03 D9 7E */ srwi r3, r0, 5 -lbl_800B8974: -/* 800B8974 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B8978 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B897C 7C 08 03 A6 */ mtlr r0 -/* 800B8980 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B8984 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkReinRide__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkReinRide__9daAlink_cCFv.s deleted file mode 100644 index 2fe1e69b46..0000000000 --- a/asm/d/a/d_a_alink/checkReinRide__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D00EC: -/* 800D00EC 38 00 00 00 */ li r0, 0 -/* 800D00F0 88 63 2F AA */ lbz r3, 0x2faa(r3) -/* 800D00F4 28 03 00 01 */ cmplwi r3, 1 -/* 800D00F8 41 82 00 0C */ beq lbl_800D0104 -/* 800D00FC 28 03 00 02 */ cmplwi r3, 2 -/* 800D0100 40 82 00 08 */ bne lbl_800D0108 -lbl_800D0104: -/* 800D0104 38 00 00 01 */ li r0, 1 -lbl_800D0108: -/* 800D0108 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800D010C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkRollJump__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkRollJump__9daAlink_cCFv.s deleted file mode 100644 index 264ef98888..0000000000 --- a/asm/d/a/d_a_alink/checkRollJump__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D05C0: -/* 800D05C0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D05C4 20 00 00 17 */ subfic r0, r0, 0x17 -/* 800D05C8 7C 00 00 34 */ cntlzw r0, r0 -/* 800D05CC 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D05D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkRoom__9daAlink_cFv.s deleted file mode 100644 index 8eb7605ed0..0000000000 --- a/asm/d/a/d_a_alink/checkRoom__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800C0520: -/* 800C0520 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C0524 7C 08 02 A6 */ mflr r0 -/* 800C0528 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C052C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C0530 3B E0 00 00 */ li r31, 0 -/* 800C0534 4B FF FE B5 */ bl checkRoomOnly__9daAlink_cFv -/* 800C0538 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C053C 40 82 00 3C */ bne lbl_800C0578 -/* 800C0540 4B FF FF 75 */ bl checkRoomSpecial__9daAlink_cFv -/* 800C0544 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0548 40 82 00 30 */ bne lbl_800C0578 -/* 800C054C 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 800C0550 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 800C0554 38 63 01 3C */ addi r3, r3, 0x13c -/* 800C0558 4B FD D5 09 */ bl checkStageName__9daAlink_cFPCc -/* 800C055C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C0560 41 82 00 1C */ beq lbl_800C057C -/* 800C0564 38 60 00 0E */ li r3, 0xe -/* 800C0568 38 80 FF FF */ li r4, -1 -/* 800C056C 4B F6 D5 F9 */ bl dComIfGs_isOneZoneSwitch__Fii -/* 800C0570 2C 03 00 00 */ cmpwi r3, 0 -/* 800C0574 40 82 00 08 */ bne lbl_800C057C -lbl_800C0578: -/* 800C0578 3B E0 00 01 */ li r31, 1 -lbl_800C057C: -/* 800C057C 7F E3 FB 78 */ mr r3, r31 -/* 800C0580 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C0584 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C0588 7C 08 03 A6 */ mtlr r0 -/* 800C058C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C0590 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkShieldDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkShieldDraw__9daAlink_cFv.s deleted file mode 100644 index b375ef981d..0000000000 --- a/asm/d/a/d_a_alink/checkShieldDraw__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_800CB53C: -/* 800CB53C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CB540 7C 08 02 A6 */ mflr r0 -/* 800CB544 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CB548 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CB54C 93 C1 00 08 */ stw r30, 8(r1) -/* 800CB550 3B E0 00 00 */ li r31, 0 -/* 800CB554 7F E5 FB 78 */ mr r5, r31 -/* 800CB558 7F E6 FB 78 */ mr r6, r31 -/* 800CB55C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CB560 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CB564 88 04 00 15 */ lbz r0, 0x15(r4) -/* 800CB568 28 00 00 FF */ cmplwi r0, 0xff -/* 800CB56C 41 82 00 14 */ beq lbl_800CB580 -/* 800CB570 88 03 2F D1 */ lbz r0, 0x2fd1(r3) -/* 800CB574 28 00 00 00 */ cmplwi r0, 0 -/* 800CB578 40 82 00 08 */ bne lbl_800CB580 -/* 800CB57C 38 C0 00 01 */ li r6, 1 -lbl_800CB580: -/* 800CB580 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800CB584 41 82 00 14 */ beq lbl_800CB598 -/* 800CB588 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800CB58C 74 00 04 08 */ andis. r0, r0, 0x408 -/* 800CB590 40 82 00 08 */ bne lbl_800CB598 -/* 800CB594 38 A0 00 01 */ li r5, 1 -lbl_800CB598: -/* 800CB598 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800CB59C 41 82 00 40 */ beq lbl_800CB5DC -/* 800CB5A0 3B C0 00 01 */ li r30, 1 -/* 800CB5A4 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800CB5A8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CB5AC 41 82 00 24 */ beq lbl_800CB5D0 -/* 800CB5B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CB5B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CB5B8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800CB5BC 38 80 0C 08 */ li r4, 0xc08 -/* 800CB5C0 4B F6 93 FD */ bl isEventBit__11dSv_event_cCFUs -/* 800CB5C4 2C 03 00 00 */ cmpwi r3, 0 -/* 800CB5C8 41 82 00 08 */ beq lbl_800CB5D0 -/* 800CB5CC 3B C0 00 00 */ li r30, 0 -lbl_800CB5D0: -/* 800CB5D0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800CB5D4 41 82 00 08 */ beq lbl_800CB5DC -/* 800CB5D8 3B E0 00 01 */ li r31, 1 -lbl_800CB5DC: -/* 800CB5DC 7F E3 FB 78 */ mr r3, r31 -/* 800CB5E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CB5E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800CB5E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CB5EC 7C 08 03 A6 */ mtlr r0 -/* 800CB5F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CB5F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkShieldGet__9daPy_py_cFv.s b/asm/d/a/d_a_alink/checkShieldGet__9daPy_py_cFv.s deleted file mode 100644 index c02c1fa904..0000000000 --- a/asm/d/a/d_a_alink/checkShieldGet__9daPy_py_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80141210: -/* 80141210 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80141214 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80141218 88 03 00 15 */ lbz r0, 0x15(r3) -/* 8014121C 20 60 00 FF */ subfic r3, r0, 0xff -/* 80141220 30 03 FF FF */ addic r0, r3, -1 -/* 80141224 7C 00 19 10 */ subfe r0, r0, r3 -/* 80141228 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8014122C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSideStep__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSideStep__9daAlink_cCFv.s deleted file mode 100644 index f879cd2343..0000000000 --- a/asm/d/a/d_a_alink/checkSideStep__9daAlink_cCFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800D0414: -/* 800D0414 38 80 00 00 */ li r4, 0 -/* 800D0418 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D041C 28 00 00 0A */ cmplwi r0, 0xa -/* 800D0420 41 82 00 0C */ beq lbl_800D042C -/* 800D0424 28 00 00 F7 */ cmplwi r0, 0xf7 -/* 800D0428 40 82 00 14 */ bne lbl_800D043C -lbl_800D042C: -/* 800D042C A8 03 30 0A */ lha r0, 0x300a(r3) -/* 800D0430 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0434 41 82 00 08 */ beq lbl_800D043C -/* 800D0438 38 80 00 01 */ li r4, 1 -lbl_800D043C: -/* 800D043C 7C 83 23 78 */ mr r3, r4 -/* 800D0440 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSingleBoarBattleSecondBowReady__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSingleBoarBattleSecondBowReady__9daAlink_cCFv.s deleted file mode 100644 index e98889ea86..0000000000 --- a/asm/d/a/d_a_alink/checkSingleBoarBattleSecondBowReady__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D07D4: -/* 800D07D4 38 80 00 00 */ li r4, 0 -/* 800D07D8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D07DC 28 00 00 45 */ cmplwi r0, 0x45 -/* 800D07E0 40 82 00 14 */ bne lbl_800D07F4 -/* 800D07E4 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800D07E8 2C 00 00 00 */ cmpwi r0, 0 -/* 800D07EC 41 82 00 08 */ beq lbl_800D07F4 -/* 800D07F0 38 80 00 01 */ li r4, 1 -lbl_800D07F4: -/* 800D07F4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D07F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSinkDead__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSinkDead__9daAlink_cCFv.s deleted file mode 100644 index fca86d1215..0000000000 --- a/asm/d/a/d_a_alink/checkSinkDead__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D09B4: -/* 800D09B4 88 03 2F BD */ lbz r0, 0x2fbd(r3) -/* 800D09B8 20 00 00 FF */ subfic r0, r0, 0xff -/* 800D09BC 7C 00 00 34 */ cntlzw r0, r0 -/* 800D09C0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D09C4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSlope__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSlope__9daAlink_cCFv.s deleted file mode 100644 index d09ebfd80f..0000000000 --- a/asm/d/a/d_a_alink/checkSlope__9daAlink_cCFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800B21EC: -/* 800B21EC 38 A0 00 00 */ li r5, 0 -/* 800B21F0 80 03 31 74 */ lwz r0, 0x3174(r3) -/* 800B21F4 2C 00 00 08 */ cmpwi r0, 8 -/* 800B21F8 41 82 00 1C */ beq lbl_800B2214 -/* 800B21FC A8 83 2F F0 */ lha r4, 0x2ff0(r3) -/* 800B2200 A8 03 31 22 */ lha r0, 0x3122(r3) -/* 800B2204 7C 00 00 D0 */ neg r0, r0 -/* 800B2208 7C 04 00 00 */ cmpw r4, r0 -/* 800B220C 40 80 00 08 */ bge lbl_800B2214 -/* 800B2210 38 A0 00 01 */ li r5, 1 -lbl_800B2214: -/* 800B2214 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 800B2218 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwordDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSwordDraw__9daAlink_cFv.s deleted file mode 100644 index 51d750b656..0000000000 --- a/asm/d/a/d_a_alink/checkSwordDraw__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_800CB480: -/* 800CB480 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CB484 7C 08 02 A6 */ mflr r0 -/* 800CB488 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CB48C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800CB490 93 C1 00 08 */ stw r30, 8(r1) -/* 800CB494 3B E0 00 00 */ li r31, 0 -/* 800CB498 7F E5 FB 78 */ mr r5, r31 -/* 800CB49C 7F E6 FB 78 */ mr r6, r31 -/* 800CB4A0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CB4A4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CB4A8 88 04 00 14 */ lbz r0, 0x14(r4) -/* 800CB4AC 28 00 00 FF */ cmplwi r0, 0xff -/* 800CB4B0 41 82 00 14 */ beq lbl_800CB4C4 -/* 800CB4B4 88 03 2F D6 */ lbz r0, 0x2fd6(r3) -/* 800CB4B8 28 00 00 00 */ cmplwi r0, 0 -/* 800CB4BC 40 82 00 08 */ bne lbl_800CB4C4 -/* 800CB4C0 38 C0 00 01 */ li r6, 1 -lbl_800CB4C4: -/* 800CB4C4 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 800CB4C8 41 82 00 14 */ beq lbl_800CB4DC -/* 800CB4CC 80 03 05 78 */ lwz r0, 0x578(r3) -/* 800CB4D0 74 00 02 08 */ andis. r0, r0, 0x208 -/* 800CB4D4 40 82 00 08 */ bne lbl_800CB4DC -/* 800CB4D8 38 A0 00 01 */ li r5, 1 -lbl_800CB4DC: -/* 800CB4DC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 -/* 800CB4E0 41 82 00 40 */ beq lbl_800CB520 -/* 800CB4E4 3B C0 00 01 */ li r30, 1 -/* 800CB4E8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800CB4EC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800CB4F0 41 82 00 24 */ beq lbl_800CB514 -/* 800CB4F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800CB4F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800CB4FC 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800CB500 38 80 0C 08 */ li r4, 0xc08 -/* 800CB504 4B F6 94 B9 */ bl isEventBit__11dSv_event_cCFUs -/* 800CB508 2C 03 00 00 */ cmpwi r3, 0 -/* 800CB50C 41 82 00 08 */ beq lbl_800CB514 -/* 800CB510 3B C0 00 00 */ li r30, 0 -lbl_800CB514: -/* 800CB514 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 800CB518 41 82 00 08 */ beq lbl_800CB520 -/* 800CB51C 3B E0 00 01 */ li r31, 1 -lbl_800CB520: -/* 800CB520 7F E3 FB 78 */ mr r3, r31 -/* 800CB524 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800CB528 83 C1 00 08 */ lwz r30, 8(r1) -/* 800CB52C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CB530 7C 08 03 A6 */ mtlr r0 -/* 800CB534 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CB538 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwordEquipAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkSwordEquipAnime__9daAlink_cCFv.s deleted file mode 100644 index 7a627b5b8a..0000000000 --- a/asm/d/a/d_a_alink/checkSwordEquipAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800D0E98: -/* 800D0E98 38 80 00 00 */ li r4, 0 -/* 800D0E9C 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D0EA0 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 -/* 800D0EA4 40 82 00 20 */ bne lbl_800D0EC4 -/* 800D0EA8 A0 03 1F BC */ lhz r0, 0x1fbc(r3) -/* 800D0EAC 28 00 02 55 */ cmplwi r0, 0x255 -/* 800D0EB0 41 82 00 10 */ beq lbl_800D0EC0 -/* 800D0EB4 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800D0EB8 28 00 02 61 */ cmplwi r0, 0x261 -/* 800D0EBC 40 82 00 08 */ bne lbl_800D0EC4 -lbl_800D0EC0: -/* 800D0EC0 38 80 00 01 */ li r4, 1 -lbl_800D0EC4: -/* 800D0EC4 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D0EC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSwordGet__9daPy_py_cFv.s b/asm/d/a/d_a_alink/checkSwordGet__9daPy_py_cFv.s deleted file mode 100644 index 0145cb093f..0000000000 --- a/asm/d/a/d_a_alink/checkSwordGet__9daPy_py_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801413D8: -/* 801413D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801413DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801413E0 88 03 00 14 */ lbz r0, 0x14(r3) -/* 801413E4 20 60 00 FF */ subfic r3, r0, 0xff -/* 801413E8 30 03 FF FF */ addic r0, r3, -1 -/* 801413EC 7C 00 19 10 */ subfe r0, r0, r3 -/* 801413F0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801413F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM.s b/asm/d/a/d_a_alink/checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM.s deleted file mode 100644 index 1d7897756f..0000000000 --- a/asm/d/a/d_a_alink/checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8012880C: -/* 8012880C 38 A0 00 00 */ li r5, 0 -/* 80128810 A0 03 1F 5C */ lhz r0, 0x1f5c(r3) -/* 80128814 28 00 FF FF */ cmplwi r0, 0xffff -/* 80128818 40 82 00 24 */ bne lbl_8012883C -/* 8012881C 54 80 18 38 */ slwi r0, r4, 3 -/* 80128820 3C 80 80 39 */ lis r4, m_wlAnmDataTable__9daAlink_c@ha /* 0x80391010@ha */ -/* 80128824 38 84 10 10 */ addi r4, r4, m_wlAnmDataTable__9daAlink_c@l /* 0x80391010@l */ -/* 80128828 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8012882C A0 03 1F 58 */ lhz r0, 0x1f58(r3) -/* 80128830 7C 04 00 40 */ cmplw r4, r0 -/* 80128834 40 82 00 08 */ bne lbl_8012883C -/* 80128838 38 A0 00 01 */ li r5, 1 -lbl_8012883C: -/* 8012883C 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 80128840 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkUpperItemActionFly__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkUpperItemActionFly__9daAlink_cFv.s deleted file mode 100644 index e8b57529cd..0000000000 --- a/asm/d/a/d_a_alink/checkUpperItemActionFly__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800B74B4: -/* 800B74B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B74B8 7C 08 02 A6 */ mflr r0 -/* 800B74BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B74C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B74C4 7C 7F 1B 78 */ mr r31, r3 -/* 800B74C8 A0 83 2F DC */ lhz r4, 0x2fdc(r3) -/* 800B74CC 48 02 72 B5 */ bl checkBowAndSlingItem__9daAlink_cFi -/* 800B74D0 2C 03 00 00 */ cmpwi r3, 0 -/* 800B74D4 41 82 00 10 */ beq lbl_800B74E4 -/* 800B74D8 7F E3 FB 78 */ mr r3, r31 -/* 800B74DC 48 02 82 BD */ bl checkUpperItemActionBowFly__9daAlink_cFv -/* 800B74E0 48 00 00 2C */ b lbl_800B750C -lbl_800B74E4: -/* 800B74E4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800B74E8 28 00 00 40 */ cmplwi r0, 0x40 -/* 800B74EC 40 82 00 10 */ bne lbl_800B74FC -/* 800B74F0 7F E3 FB 78 */ mr r3, r31 -/* 800B74F4 48 02 96 65 */ bl checkUpperItemActionBoomerangFly__9daAlink_cFv -/* 800B74F8 48 00 00 14 */ b lbl_800B750C -lbl_800B74FC: -/* 800B74FC 28 00 00 46 */ cmplwi r0, 0x46 -/* 800B7500 40 82 00 0C */ bne lbl_800B750C -/* 800B7504 7F E3 FB 78 */ mr r3, r31 -/* 800B7508 48 02 A6 AD */ bl checkUpperItemActionCopyRodFly__9daAlink_cFv -lbl_800B750C: -/* 800B750C 7F E3 FB 78 */ mr r3, r31 -/* 800B7510 48 03 CA F9 */ bl checkCanoeJumpRide__9daAlink_cFv -/* 800B7514 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B7518 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B751C 7C 08 03 A6 */ mtlr r0 -/* 800B7520 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7524 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWarpStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWarpStart__9daAlink_cFv.s deleted file mode 100644 index 3537fd3ff4..0000000000 --- a/asm/d/a/d_a_alink/checkWarpStart__9daAlink_cFv.s +++ /dev/null @@ -1,129 +0,0 @@ -lbl_8011F9EC: -/* 8011F9EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8011F9F0 7C 08 02 A6 */ mflr r0 -/* 8011F9F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8011F9F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011F9FC 48 24 27 E1 */ bl _savegpr_29 -/* 8011FA00 7C 7E 1B 78 */ mr r30, r3 -/* 8011FA04 3C 60 80 3B */ lis r3, cNullVec__6Z2Calc@ha /* 0x803AF990@ha */ -/* 8011FA08 3B E3 F9 90 */ addi r31, r3, cNullVec__6Z2Calc@l /* 0x803AF990@l */ -/* 8011FA0C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8011FA10 3B A3 01 88 */ addi r29, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8011FA14 88 1D 00 C0 */ lbz r0, 0xc0(r29) -/* 8011FA18 28 00 00 00 */ cmplwi r0, 0 -/* 8011FA1C 41 82 01 8C */ beq lbl_8011FBA8 -/* 8011FA20 28 00 00 03 */ cmplwi r0, 3 -/* 8011FA24 41 82 00 2C */ beq lbl_8011FA50 -/* 8011FA28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011FA2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011FA30 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8011FA34 7F C4 F3 78 */ mr r4, r30 -/* 8011FA38 38 A0 00 00 */ li r5, 0 -/* 8011FA3C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8011FA40 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011FA44 4B F2 37 29 */ bl compulsory__14dEvt_control_cFPvPCcUs -/* 8011FA48 2C 03 00 00 */ cmpwi r3, 0 -/* 8011FA4C 41 82 01 50 */ beq lbl_8011FB9C -lbl_8011FA50: -/* 8011FA50 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8011FA54 60 00 40 00 */ ori r0, r0, 0x4000 -/* 8011FA58 90 1E 05 70 */ stw r0, 0x570(r30) -/* 8011FA5C 88 1D 00 C0 */ lbz r0, 0xc0(r29) -/* 8011FA60 28 00 00 03 */ cmplwi r0, 3 -/* 8011FA64 40 82 00 E0 */ bne lbl_8011FB44 -/* 8011FA68 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 8011FA6C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 8011FA70 40 82 00 AC */ bne lbl_8011FB1C -/* 8011FA74 4B F1 00 4D */ bl dComIfGp_TargetWarpPt_get__Fv -/* 8011FA78 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011FA7C 28 00 00 03 */ cmplwi r0, 3 -/* 8011FA80 40 82 00 1C */ bne lbl_8011FA9C -/* 8011FA84 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8011FA88 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8011FA8C 38 03 01 44 */ addi r0, r3, 0x144 -/* 8011FA90 90 1E 01 00 */ stw r0, 0x100(r30) -/* 8011FA94 38 9F 32 C0 */ addi r4, r31, 0x32c0 -/* 8011FA98 48 00 00 90 */ b lbl_8011FB28 -lbl_8011FA9C: -/* 8011FA9C 4B F1 00 25 */ bl dComIfGp_TargetWarpPt_get__Fv -/* 8011FAA0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011FAA4 28 00 00 06 */ cmplwi r0, 6 -/* 8011FAA8 40 82 00 1C */ bne lbl_8011FAC4 -/* 8011FAAC 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8011FAB0 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8011FAB4 38 03 01 4D */ addi r0, r3, 0x14d -/* 8011FAB8 90 1E 01 00 */ stw r0, 0x100(r30) -/* 8011FABC 38 9F 32 D4 */ addi r4, r31, 0x32d4 -/* 8011FAC0 48 00 00 68 */ b lbl_8011FB28 -lbl_8011FAC4: -/* 8011FAC4 4B F0 FF FD */ bl dComIfGp_TargetWarpPt_get__Fv -/* 8011FAC8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011FACC 28 00 00 09 */ cmplwi r0, 9 -/* 8011FAD0 40 82 00 1C */ bne lbl_8011FAEC -/* 8011FAD4 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8011FAD8 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8011FADC 38 03 01 56 */ addi r0, r3, 0x156 -/* 8011FAE0 90 1E 01 00 */ stw r0, 0x100(r30) -/* 8011FAE4 38 9F 32 E8 */ addi r4, r31, 0x32e8 -/* 8011FAE8 48 00 00 40 */ b lbl_8011FB28 -lbl_8011FAEC: -/* 8011FAEC 4B F0 FF D5 */ bl dComIfGp_TargetWarpPt_get__Fv -/* 8011FAF0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011FAF4 28 00 00 08 */ cmplwi r0, 8 -/* 8011FAF8 40 82 00 1C */ bne lbl_8011FB14 -/* 8011FAFC 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8011FB00 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8011FB04 38 03 01 60 */ addi r0, r3, 0x160 -/* 8011FB08 90 1E 01 00 */ stw r0, 0x100(r30) -/* 8011FB0C 38 9F 32 FC */ addi r4, r31, 0x32fc -/* 8011FB10 48 00 00 18 */ b lbl_8011FB28 -lbl_8011FB14: -/* 8011FB14 38 9F 32 B0 */ addi r4, r31, 0x32b0 -/* 8011FB18 48 00 00 10 */ b lbl_8011FB28 -lbl_8011FB1C: -/* 8011FB1C 38 60 00 FF */ li r3, 0xff -/* 8011FB20 4B F0 FF 79 */ bl dComIfGp_TargetWarpPt_set__FUc -/* 8011FB24 38 9F 32 B0 */ addi r4, r31, 0x32b0 -lbl_8011FB28: -/* 8011FB28 7F C3 F3 78 */ mr r3, r30 -/* 8011FB2C 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 8011FB30 38 A5 FF FF */ addi r5, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 8011FB34 38 C0 00 01 */ li r6, 1 -/* 8011FB38 38 E0 00 01 */ li r7, 1 -/* 8011FB3C 4B EF B8 91 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs -/* 8011FB40 48 00 00 5C */ b lbl_8011FB9C -lbl_8011FB44: -/* 8011FB44 38 00 00 05 */ li r0, 5 -/* 8011FB48 B0 1E 06 04 */ sth r0, 0x604(r30) -/* 8011FB4C 88 1D 00 C0 */ lbz r0, 0xc0(r29) -/* 8011FB50 28 00 00 01 */ cmplwi r0, 1 -/* 8011FB54 40 82 00 40 */ bne lbl_8011FB94 -/* 8011FB58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011FB5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011FB60 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 8011FB64 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 8011FB68 7D 89 03 A6 */ mtctr r12 -/* 8011FB6C 4E 80 04 21 */ bctrl -/* 8011FB70 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8011FB74 54 03 46 3E */ srwi r3, r0, 0x18 -/* 8011FB78 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011FB7C 38 80 00 00 */ li r4, 0 -/* 8011FB80 38 A0 FF FF */ li r5, -1 -/* 8011FB84 A8 DE 04 E6 */ lha r6, 0x4e6(r30) -/* 8011FB88 38 E0 FF FF */ li r7, -1 -/* 8011FB8C 4B F0 75 E5 */ bl dStage_changeScene__FifUlScsi -/* 8011FB90 48 00 00 0C */ b lbl_8011FB9C -lbl_8011FB94: -/* 8011FB94 7F C3 F3 78 */ mr r3, r30 -/* 8011FB98 4B FF FC 41 */ bl dungeonReturnWarp__9daAlink_cFv -lbl_8011FB9C: -/* 8011FB9C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8011FBA0 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8011FBA4 48 0F CE 39 */ bl resetWarpStatus__13dMeter2Info_cFv -lbl_8011FBA8: -/* 8011FBA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8011FBAC 48 24 26 7D */ bl _restgpr_29 -/* 8011FBB0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8011FBB4 7C 08 03 A6 */ mtlr r0 -/* 8011FBB8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011FBBC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWaterPolygonUnder__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWaterPolygonUnder__9daAlink_cFv.s deleted file mode 100644 index bfbd195dfe..0000000000 --- a/asm/d/a/d_a_alink/checkWaterPolygonUnder__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800B1488: -/* 800B1488 38 80 00 00 */ li r4, 0 -/* 800B148C 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800B1490 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 800B1494 40 82 00 14 */ bne lbl_800B14A8 -/* 800B1498 C0 23 04 D4 */ lfs f1, 0x4d4(r3) -/* 800B149C C0 03 33 B4 */ lfs f0, 0x33b4(r3) -/* 800B14A0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B14A4 40 80 00 08 */ bge lbl_800B14AC -lbl_800B14A8: -/* 800B14A8 38 80 00 01 */ li r4, 1 -lbl_800B14AC: -/* 800B14AC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800B14B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfChain__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfChain__9daAlink_cCFv.s deleted file mode 100644 index af94389407..0000000000 --- a/asm/d/a/d_a_alink/checkWolfChain__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D05E8: -/* 800D05E8 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D05EC 20 00 01 31 */ subfic r0, r0, 0x131 -/* 800D05F0 7C 00 00 34 */ cntlzw r0, r0 -/* 800D05F4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D05F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfDash__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfDash__9daAlink_cCFv.s deleted file mode 100644 index 6f83a53db7..0000000000 --- a/asm/d/a/d_a_alink/checkWolfDash__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D03DC: -/* 800D03DC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D03E0 20 00 00 F3 */ subfic r0, r0, 0xf3 -/* 800D03E4 7C 00 00 34 */ cntlzw r0, r0 -/* 800D03E8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D03EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfDig__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfDig__9daAlink_cCFv.s deleted file mode 100644 index 5917559809..0000000000 --- a/asm/d/a/d_a_alink/checkWolfDig__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0660: -/* 800D0660 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0664 20 00 01 32 */ subfic r0, r0, 0x132 -/* 800D0668 7C 00 00 34 */ cntlzw r0, r0 -/* 800D066C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0670 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfDownAttackPullOut__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfDownAttackPullOut__9daAlink_cCFv.s deleted file mode 100644 index 46b76855f5..0000000000 --- a/asm/d/a/d_a_alink/checkWolfDownAttackPullOut__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0A14: -/* 800D0A14 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0A18 20 00 01 23 */ subfic r0, r0, 0x123 -/* 800D0A1C 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0A20 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0A24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c.s deleted file mode 100644 index 949c78cf65..0000000000 --- a/asm/d/a/d_a_alink/checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D095C: -/* 800D095C 80 03 28 20 */ lwz r0, 0x2820(r3) -/* 800D0960 7C 00 20 50 */ subf r0, r0, r4 -/* 800D0964 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0968 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D096C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfGroundSpecialMode__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfGroundSpecialMode__9daAlink_cFv.s deleted file mode 100644 index 1273cb5cc6..0000000000 --- a/asm/d/a/d_a_alink/checkWolfGroundSpecialMode__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80129A80: -/* 80129A80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80129A84 7C 08 02 A6 */ mflr r0 -/* 80129A88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80129A8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80129A90 7C 7F 1B 78 */ mr r31, r3 -/* 80129A94 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 80129A98 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 80129A9C 41 82 00 2C */ beq lbl_80129AC8 -/* 80129AA0 80 BF 31 A0 */ lwz r5, 0x31a0(r31) -/* 80129AA4 3C 80 00 07 */ lis r4, 0x0007 /* 0x00070C52@ha */ -/* 80129AA8 38 04 0C 52 */ addi r0, r4, 0x0C52 /* 0x00070C52@l */ -/* 80129AAC 7C A0 00 39 */ and. r0, r5, r0 -/* 80129AB0 40 82 00 18 */ bne lbl_80129AC8 -/* 80129AB4 80 1F 05 88 */ lwz r0, 0x588(r31) -/* 80129AB8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80129ABC 41 82 00 0C */ beq lbl_80129AC8 -/* 80129AC0 4B F9 DD 35 */ bl procCoMetamorphoseInit__9daAlink_cFv -/* 80129AC4 48 00 00 6C */ b lbl_80129B30 -lbl_80129AC8: -/* 80129AC8 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 80129ACC 28 00 00 27 */ cmplwi r0, 0x27 -/* 80129AD0 41 82 00 0C */ beq lbl_80129ADC -/* 80129AD4 28 00 00 28 */ cmplwi r0, 0x28 -/* 80129AD8 40 82 00 10 */ bne lbl_80129AE8 -lbl_80129ADC: -/* 80129ADC 7F E3 FB 78 */ mr r3, r31 -/* 80129AE0 48 00 B6 81 */ bl procWolfGiantPuzzleInit__9daAlink_cFv -/* 80129AE4 48 00 00 4C */ b lbl_80129B30 -lbl_80129AE8: -/* 80129AE8 28 00 00 2C */ cmplwi r0, 0x2c -/* 80129AEC 40 82 00 10 */ bne lbl_80129AFC -/* 80129AF0 7F E3 FB 78 */ mr r3, r31 -/* 80129AF4 48 01 40 79 */ bl procWolfCargoCarryInit__9daAlink_cFv -/* 80129AF8 48 00 00 38 */ b lbl_80129B30 -lbl_80129AFC: -/* 80129AFC 7F E3 FB 78 */ mr r3, r31 -/* 80129B00 4B F8 C4 6D */ bl checkSlideAction__9daAlink_cFv -/* 80129B04 2C 03 00 00 */ cmpwi r3, 0 -/* 80129B08 41 82 00 0C */ beq lbl_80129B14 -/* 80129B0C 38 60 00 01 */ li r3, 1 -/* 80129B10 48 00 00 20 */ b lbl_80129B30 -lbl_80129B14: -/* 80129B14 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 80129B18 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80129B1C 41 82 00 10 */ beq lbl_80129B2C -/* 80129B20 7F E3 FB 78 */ mr r3, r31 -/* 80129B24 48 00 D4 31 */ bl procWolfScreamWaitInit__9daAlink_cFv -/* 80129B28 48 00 00 08 */ b lbl_80129B30 -lbl_80129B2C: -/* 80129B2C 38 60 00 00 */ li r3, 0 -lbl_80129B30: -/* 80129B30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80129B34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80129B38 7C 08 03 A6 */ mtlr r0 -/* 80129B3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129B40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfHowlDemoMode__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfHowlDemoMode__9daAlink_cCFv.s deleted file mode 100644 index cb808dcfe5..0000000000 --- a/asm/d/a/d_a_alink/checkWolfHowlDemoMode__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D04A4: -/* 800D04A4 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D04A8 20 00 00 ED */ subfic r0, r0, 0xed -/* 800D04AC 7C 00 00 34 */ cntlzw r0, r0 -/* 800D04B0 54 03 D9 7E */ srwi r3, r0, 5 -/* 800D04B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfHowlSuccessAnime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfHowlSuccessAnime__9daAlink_cCFv.s deleted file mode 100644 index a7e1c22393..0000000000 --- a/asm/d/a/d_a_alink/checkWolfHowlSuccessAnime__9daAlink_cCFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800D0AA4: -/* 800D0AA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0AA8 7C 08 02 A6 */ mflr r0 -/* 800D0AAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0AB0 38 80 00 5E */ li r4, 0x5e -/* 800D0AB4 48 05 7D 59 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -/* 800D0AB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0ABC 7C 08 03 A6 */ mtlr r0 -/* 800D0AC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0AC4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfJumpAttack__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfJumpAttack__9daAlink_cCFv.s deleted file mode 100644 index 2636fcc46f..0000000000 --- a/asm/d/a/d_a_alink/checkWolfJumpAttack__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0610: -/* 800D0610 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0614 20 00 01 1C */ subfic r0, r0, 0x11c -/* 800D0618 7C 00 00 34 */ cntlzw r0, r0 -/* 800D061C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0620 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfLock__9daAlink_cCFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkWolfLock__9daAlink_cCFP10fopAc_ac_c.s deleted file mode 100644 index 6cb916feff..0000000000 --- a/asm/d/a/d_a_alink/checkWolfLock__9daAlink_cCFP10fopAc_ac_c.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8013911C: -/* 8013911C 28 04 00 00 */ cmplwi r4, 0 -/* 80139120 41 82 00 0C */ beq lbl_8013912C -/* 80139124 80 A4 00 04 */ lwz r5, 4(r4) -/* 80139128 48 00 00 08 */ b lbl_80139130 -lbl_8013912C: -/* 8013912C 38 A0 FF FF */ li r5, -1 -lbl_80139130: -/* 80139130 38 80 00 00 */ li r4, 0 -/* 80139134 88 03 2F B1 */ lbz r0, 0x2fb1(r3) -/* 80139138 7C 09 03 A6 */ mtctr r0 -/* 8013913C 2C 00 00 00 */ cmpwi r0, 0 -/* 80139140 40 81 00 24 */ ble lbl_80139164 -lbl_80139144: -/* 80139144 38 04 07 C4 */ addi r0, r4, 0x7c4 -/* 80139148 7C 03 00 2E */ lwzx r0, r3, r0 -/* 8013914C 7C 05 00 40 */ cmplw r5, r0 -/* 80139150 40 82 00 0C */ bne lbl_8013915C -/* 80139154 38 60 00 01 */ li r3, 1 -/* 80139158 4E 80 00 20 */ blr -lbl_8013915C: -/* 8013915C 38 84 00 08 */ addi r4, r4, 8 -/* 80139160 42 00 FF E4 */ bdnz lbl_80139144 -lbl_80139164: -/* 80139164 38 60 00 00 */ li r3, 0 -/* 80139168 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfRSit__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfRSit__9daAlink_cCFv.s deleted file mode 100644 index d2c2ce3be0..0000000000 --- a/asm/d/a/d_a_alink/checkWolfRSit__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0624: -/* 800D0624 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0628 20 00 00 FF */ subfic r0, r0, 0xff -/* 800D062C 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0630 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D0634 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfRopeHang__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfRopeHang__9daAlink_cCFv.s deleted file mode 100644 index 0845a8a282..0000000000 --- a/asm/d/a/d_a_alink/checkWolfRopeHang__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D05AC: -/* 800D05AC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D05B0 20 00 01 14 */ subfic r0, r0, 0x114 -/* 800D05B4 7C 00 00 34 */ cntlzw r0, r0 -/* 800D05B8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D05BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfSideStep__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfSideStep__9daAlink_cCFv.s deleted file mode 100644 index 64cc60dc40..0000000000 --- a/asm/d/a/d_a_alink/checkWolfSideStep__9daAlink_cCFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_80127DC4: -/* 80127DC4 38 80 00 00 */ li r4, 0 -/* 80127DC8 88 03 2F 98 */ lbz r0, 0x2f98(r3) -/* 80127DCC 28 00 00 00 */ cmplwi r0, 0 -/* 80127DD0 41 82 00 30 */ beq lbl_80127E00 -/* 80127DD4 A0 A3 2F E8 */ lhz r5, 0x2fe8(r3) -/* 80127DD8 28 05 00 F6 */ cmplwi r5, 0xf6 -/* 80127DDC 40 82 00 10 */ bne lbl_80127DEC -/* 80127DE0 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 80127DE4 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80127DE8 41 82 00 14 */ beq lbl_80127DFC -lbl_80127DEC: -/* 80127DEC 28 05 00 F8 */ cmplwi r5, 0xf8 -/* 80127DF0 41 82 00 0C */ beq lbl_80127DFC -/* 80127DF4 28 05 00 FA */ cmplwi r5, 0xfa -/* 80127DF8 40 82 00 08 */ bne lbl_80127E00 -lbl_80127DFC: -/* 80127DFC 38 80 00 01 */ li r4, 1 -lbl_80127E00: -/* 80127E00 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80127E04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfSlowDash__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfSlowDash__9daAlink_cFv.s deleted file mode 100644 index 714bb35a65..0000000000 --- a/asm/d/a/d_a_alink/checkWolfSlowDash__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_80127F20: -/* 80127F20 38 80 00 00 */ li r4, 0 -/* 80127F24 88 03 2F C7 */ lbz r0, 0x2fc7(r3) -/* 80127F28 28 00 00 01 */ cmplwi r0, 1 -/* 80127F2C 41 82 00 18 */ beq lbl_80127F44 -/* 80127F30 28 00 00 03 */ cmplwi r0, 3 -/* 80127F34 41 82 00 10 */ beq lbl_80127F44 -/* 80127F38 80 03 31 74 */ lwz r0, 0x3174(r3) -/* 80127F3C 2C 00 00 0B */ cmpwi r0, 0xb -/* 80127F40 40 82 00 08 */ bne lbl_80127F48 -lbl_80127F44: -/* 80127F44 38 80 00 01 */ li r4, 1 -lbl_80127F48: -/* 80127F48 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80127F4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfTagLockJumpLand__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfTagLockJumpLand__9daAlink_cCFv.s deleted file mode 100644 index 2ddc262829..0000000000 --- a/asm/d/a/d_a_alink/checkWolfTagLockJumpLand__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0598: -/* 800D0598 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D059C 20 00 01 19 */ subfic r0, r0, 0x119 -/* 800D05A0 7C 00 00 34 */ cntlzw r0, r0 -/* 800D05A4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D05A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfTagLockJump__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfTagLockJump__9daAlink_cCFv.s deleted file mode 100644 index 80df479f86..0000000000 --- a/asm/d/a/d_a_alink/checkWolfTagLockJump__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0570: -/* 800D0570 38 80 00 00 */ li r4, 0 -/* 800D0574 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0578 28 00 01 18 */ cmplwi r0, 0x118 -/* 800D057C 40 82 00 14 */ bne lbl_800D0590 -/* 800D0580 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 800D0584 2C 00 00 00 */ cmpwi r0, 0 -/* 800D0588 40 82 00 08 */ bne lbl_800D0590 -/* 800D058C 38 80 00 01 */ li r4, 1 -lbl_800D0590: -/* 800D0590 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800D0594 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfTriggerJump__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfTriggerJump__9daAlink_cCFv.s deleted file mode 100644 index 215c2b8e81..0000000000 --- a/asm/d/a/d_a_alink/checkWolfTriggerJump__9daAlink_cCFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0444: -/* 800D0444 38 00 00 00 */ li r0, 0 -/* 800D0448 A0 63 2F E8 */ lhz r3, 0x2fe8(r3) -/* 800D044C 28 03 00 F7 */ cmplwi r3, 0xf7 -/* 800D0450 41 82 00 0C */ beq lbl_800D045C -/* 800D0454 28 03 01 1C */ cmplwi r3, 0x11c -/* 800D0458 40 82 00 08 */ bne lbl_800D0460 -lbl_800D045C: -/* 800D045C 38 00 00 01 */ li r0, 1 -lbl_800D0460: -/* 800D0460 7C 03 03 78 */ mr r3, r0 -/* 800D0464 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfUseAbility__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkWolfUseAbility__9daAlink_cFv.s deleted file mode 100644 index 33d8413dfc..0000000000 --- a/asm/d/a/d_a_alink/checkWolfUseAbility__9daAlink_cFv.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_801299A8: -/* 801299A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801299AC 7C 08 02 A6 */ mflr r0 -/* 801299B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801299B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801299B8 7C 7F 1B 78 */ mr r31, r3 -/* 801299BC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 801299C0 28 00 01 37 */ cmplwi r0, 0x137 -/* 801299C4 41 82 00 A8 */ beq lbl_80129A6C -/* 801299C8 48 00 A5 29 */ bl checkMidnaLockJumpPoint__9daAlink_cCFv -/* 801299CC 28 03 00 00 */ cmplwi r3, 0 -/* 801299D0 41 82 00 1C */ beq lbl_801299EC -/* 801299D4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 801299D8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 801299DC 40 82 00 10 */ bne lbl_801299EC -/* 801299E0 7F E3 FB 78 */ mr r3, r31 -/* 801299E4 4B FF E2 C9 */ bl offWolfEyeUp__9daAlink_cFv -/* 801299E8 48 00 00 84 */ b lbl_80129A6C -lbl_801299EC: -/* 801299EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801299F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801299F4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801299F8 38 80 43 08 */ li r4, 0x4308 -/* 801299FC 4B F0 AF C1 */ bl isEventBit__11dSv_event_cCFUs -/* 80129A00 2C 03 00 00 */ cmpwi r3, 0 -/* 80129A04 41 82 00 68 */ beq lbl_80129A6C -/* 80129A08 88 1F 2F D2 */ lbz r0, 0x2fd2(r31) -/* 80129A0C 28 00 00 00 */ cmplwi r0, 0 -/* 80129A10 40 82 00 5C */ bne lbl_80129A6C -/* 80129A14 7F E3 FB 78 */ mr r3, r31 -/* 80129A18 4B FE C2 09 */ bl checkEventRun__9daAlink_cCFv -/* 80129A1C 2C 03 00 00 */ cmpwi r3, 0 -/* 80129A20 40 82 00 4C */ bne lbl_80129A6C -/* 80129A24 A8 9F 30 AC */ lha r4, 0x30ac(r31) -/* 80129A28 3C 60 80 39 */ lis r3, m__18daAlinkHIO_wolf_c0@ha /* 0x8038F9F8@ha */ -/* 80129A2C 38 63 F9 F8 */ addi r3, r3, m__18daAlinkHIO_wolf_c0@l /* 0x8038F9F8@l */ -/* 80129A30 A8 03 00 0C */ lha r0, 0xc(r3) -/* 80129A34 7C 04 00 00 */ cmpw r4, r0 -/* 80129A38 40 80 00 34 */ bge lbl_80129A6C -/* 80129A3C 7F E3 FB 78 */ mr r3, r31 -/* 80129A40 4B FF E2 B1 */ bl wolfSenseTrigger__9daAlink_cFv -/* 80129A44 2C 03 00 00 */ cmpwi r3, 0 -/* 80129A48 41 82 00 24 */ beq lbl_80129A6C -/* 80129A4C A8 1F 30 AC */ lha r0, 0x30ac(r31) -/* 80129A50 2C 00 00 00 */ cmpwi r0, 0 -/* 80129A54 40 82 00 10 */ bne lbl_80129A64 -/* 80129A58 7F E3 FB 78 */ mr r3, r31 -/* 80129A5C 4B FF E1 F9 */ bl onWolfEyeUp__9daAlink_cFv -/* 80129A60 48 00 00 0C */ b lbl_80129A6C -lbl_80129A64: -/* 80129A64 7F E3 FB 78 */ mr r3, r31 -/* 80129A68 4B FF E2 45 */ bl offWolfEyeUp__9daAlink_cFv -lbl_80129A6C: -/* 80129A6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80129A70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80129A74 7C 08 03 A6 */ mtlr r0 -/* 80129A78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80129A7C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWolfWait__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkWolfWait__9daAlink_cCFv.s deleted file mode 100644 index 54684daed0..0000000000 --- a/asm/d/a/d_a_alink/checkWolfWait__9daAlink_cCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D05FC: -/* 800D05FC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0600 20 00 00 F1 */ subfic r0, r0, 0xf1 -/* 800D0604 7C 00 00 34 */ cntlzw r0, r0 -/* 800D0608 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 800D060C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkZeroSpeedF__9daAlink_cCFv.s b/asm/d/a/d_a_alink/checkZeroSpeedF__9daAlink_cCFv.s deleted file mode 100644 index 425f627c2a..0000000000 --- a/asm/d/a/d_a_alink/checkZeroSpeedF__9daAlink_cCFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800B3904: -/* 800B3904 C0 03 33 98 */ lfs f0, 0x3398(r3) -/* 800B3908 FC 00 02 10 */ fabs f0, f0 -/* 800B390C FC 20 00 18 */ frsp f1, f0 -/* 800B3910 C0 02 93 E4 */ lfs f0, lit_12328(r2) -/* 800B3914 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B3918 7C 00 00 26 */ mfcr r0 -/* 800B391C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800B3920 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/clearFirePointDamageEffect__9daAlink_cFi.s b/asm/d/a/d_a_alink/clearFirePointDamageEffect__9daAlink_cFi.s deleted file mode 100644 index 08404842e7..0000000000 --- a/asm/d/a/d_a_alink/clearFirePointDamageEffect__9daAlink_cFi.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80124E28: -/* 80124E28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80124E2C 7C 08 02 A6 */ mflr r0 -/* 80124E30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80124E34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80124E38 93 C1 00 08 */ stw r30, 8(r1) -/* 80124E3C 7C 7E 1B 78 */ mr r30, r3 -/* 80124E40 1C 84 00 30 */ mulli r4, r4, 0x30 -/* 80124E44 3B E4 32 D8 */ addi r31, r4, 0x32d8 -/* 80124E48 7F FE FA 14 */ add r31, r30, r31 -/* 80124E4C 88 1F 00 00 */ lbz r0, 0(r31) -/* 80124E50 28 00 00 00 */ cmplwi r0, 0 -/* 80124E54 41 82 00 18 */ beq lbl_80124E6C -/* 80124E58 80 9F 00 04 */ lwz r4, 4(r31) -/* 80124E5C 4B FF B9 1D */ bl stopDrawParticle__9daAlink_cFUl -/* 80124E60 7F C3 F3 78 */ mr r3, r30 -/* 80124E64 80 9F 00 08 */ lwz r4, 8(r31) -/* 80124E68 4B FF B9 11 */ bl stopDrawParticle__9daAlink_cFUl -lbl_80124E6C: -/* 80124E6C 38 00 00 00 */ li r0, 0 -/* 80124E70 98 1F 00 00 */ stb r0, 0(r31) -/* 80124E74 3C 60 80 43 */ lis r3, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80124E78 C4 03 0C F4 */ lfsu f0, Zero__4cXyz@l(r3) /* 0x80430CF4@l */ -/* 80124E7C D0 1F 00 24 */ stfs f0, 0x24(r31) -/* 80124E80 C0 03 00 04 */ lfs f0, 4(r3) -/* 80124E84 D0 1F 00 28 */ stfs f0, 0x28(r31) -/* 80124E88 C0 03 00 08 */ lfs f0, 8(r3) -/* 80124E8C D0 1F 00 2C */ stfs f0, 0x2c(r31) -/* 80124E90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80124E94 83 C1 00 08 */ lwz r30, 8(r1) -/* 80124E98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80124E9C 7C 08 03 A6 */ mtlr r0 -/* 80124EA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80124EA4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/commonCutAction__9daAlink_cFv.s b/asm/d/a/d_a_alink/commonCutAction__9daAlink_cFv.s deleted file mode 100644 index 90f348659a..0000000000 --- a/asm/d/a/d_a_alink/commonCutAction__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800D21D0: -/* 800D21D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D21D4 7C 08 02 A6 */ mflr r0 -/* 800D21D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D21DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D21E0 7C 7F 1B 78 */ mr r31, r3 -/* 800D21E4 88 03 05 69 */ lbz r0, 0x569(r3) -/* 800D21E8 28 00 00 04 */ cmplwi r0, 4 -/* 800D21EC 40 82 00 0C */ bne lbl_800D21F8 -/* 800D21F0 38 80 00 01 */ li r4, 1 -/* 800D21F4 4B FF F2 3D */ bl resetCombo__9daAlink_cFi -lbl_800D21F8: -/* 800D21F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D21FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D2200 88 03 5E 24 */ lbz r0, 0x5e24(r3) -/* 800D2204 28 00 00 04 */ cmplwi r0, 4 -/* 800D2208 40 82 00 10 */ bne lbl_800D2218 -/* 800D220C 7F E3 FB 78 */ mr r3, r31 -/* 800D2210 38 80 00 00 */ li r4, 0 -/* 800D2214 4B FE 10 3D */ bl setDoStatus__9daAlink_cFUc -lbl_800D2218: -/* 800D2218 88 7F 05 69 */ lbz r3, 0x569(r31) -/* 800D221C 38 03 00 01 */ addi r0, r3, 1 -/* 800D2220 98 1F 05 69 */ stb r0, 0x569(r31) -/* 800D2224 38 00 00 00 */ li r0, 0 -/* 800D2228 88 7F 2F AA */ lbz r3, 0x2faa(r31) -/* 800D222C 28 03 00 01 */ cmplwi r3, 1 -/* 800D2230 41 82 00 0C */ beq lbl_800D223C -/* 800D2234 28 03 00 02 */ cmplwi r3, 2 -/* 800D2238 40 82 00 08 */ bne lbl_800D2240 -lbl_800D223C: -/* 800D223C 38 00 00 01 */ li r0, 1 -lbl_800D2240: -/* 800D2240 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 800D2244 41 82 00 28 */ beq lbl_800D226C -/* 800D2248 7F E3 FB 78 */ mr r3, r31 -/* 800D224C 48 01 F1 8D */ bl procHorseCutInit__9daAlink_cFv -/* 800D2250 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 800D2254 28 00 00 01 */ cmplwi r0, 1 -/* 800D2258 40 81 00 0C */ ble lbl_800D2264 -/* 800D225C 38 00 00 01 */ li r0, 1 -/* 800D2260 98 1F 05 69 */ stb r0, 0x569(r31) -lbl_800D2264: -/* 800D2264 38 60 00 01 */ li r3, 1 -/* 800D2268 48 00 00 08 */ b lbl_800D2270 -lbl_800D226C: -/* 800D226C 38 60 00 00 */ li r3, 0 -lbl_800D2270: -/* 800D2270 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2274 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D2278 7C 08 03 A6 */ mtlr r0 -/* 800D227C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2280 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/create__15daAlink_sight_cFv.s b/asm/d/a/d_a_alink/create__15daAlink_sight_cFv.s deleted file mode 100644 index 3bd015aaf7..0000000000 --- a/asm/d/a/d_a_alink/create__15daAlink_sight_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80126650: -/* 80126650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80126654 7C 08 02 A6 */ mflr r0 -/* 80126658 90 01 00 14 */ stw r0, 0x14(r1) -/* 8012665C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80126660 7C 7F 1B 78 */ mr r31, r3 -/* 80126664 38 7F 00 50 */ addi r3, r31, 0x50 -/* 80126668 4B FF F8 AD */ bl create__20daAlink_lockCursor_cFv -/* 8012666C 2C 03 00 00 */ cmpwi r3, 0 -/* 80126670 40 82 00 0C */ bne lbl_8012667C -/* 80126674 38 60 00 00 */ li r3, 0 -/* 80126678 48 00 00 34 */ b lbl_801266AC -lbl_8012667C: -/* 8012667C 38 62 92 90 */ la r3, l_arcName(r2) /* 80452C90-_SDA2_BASE_ */ -/* 80126680 38 80 00 5B */ li r4, 0x5b -/* 80126684 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80126688 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8012668C 3C A5 00 02 */ addis r5, r5, 2 -/* 80126690 38 C0 00 80 */ li r6, 0x80 -/* 80126694 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80126698 4B F1 5C 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8012669C 7C 64 1B 78 */ mr r4, r3 -/* 801266A0 7F E3 FB 78 */ mr r3, r31 -/* 801266A4 48 03 8C E1 */ bl setSightImage__18daPy_sightPacket_cFP7ResTIMG -/* 801266A8 38 60 00 01 */ li r3, 1 -lbl_801266AC: -/* 801266AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801266B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801266B4 7C 08 03 A6 */ mtlr r0 -/* 801266B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801266BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/create__20daAlink_lockCursor_cFv.s b/asm/d/a/d_a_alink/create__20daAlink_lockCursor_cFv.s deleted file mode 100644 index 224f72046b..0000000000 --- a/asm/d/a/d_a_alink/create__20daAlink_lockCursor_cFv.s +++ /dev/null @@ -1,279 +0,0 @@ -lbl_80125F14: -/* 80125F14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80125F18 7C 08 02 A6 */ mflr r0 -/* 80125F1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80125F20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80125F24 93 C1 00 08 */ stw r30, 8(r1) -/* 80125F28 7C 7E 1B 78 */ mr r30, r3 -/* 80125F2C 38 62 92 90 */ la r3, l_arcName(r2) /* 80452C90-_SDA2_BASE_ */ -/* 80125F30 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80125F34 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80125F38 3C 84 00 02 */ addis r4, r4, 2 -/* 80125F3C 38 A0 00 80 */ li r5, 0x80 -/* 80125F40 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80125F44 4B F1 62 A1 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci -/* 80125F48 83 E3 00 14 */ lwz r31, 0x14(r3) -/* 80125F4C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80125F50 D0 1E 00 2C */ stfs f0, 0x2c(r30) -/* 80125F54 38 00 00 00 */ li r0, 0 -/* 80125F58 98 1E 00 04 */ stb r0, 4(r30) -/* 80125F5C D0 1E 00 30 */ stfs f0, 0x30(r30) -/* 80125F60 38 60 01 18 */ li r3, 0x118 -/* 80125F64 48 1A 8C E9 */ bl __nw__FUl -/* 80125F68 7C 60 1B 79 */ or. r0, r3, r3 -/* 80125F6C 41 82 00 0C */ beq lbl_80125F78 -/* 80125F70 48 1D 25 29 */ bl __ct__9J2DScreenFv -/* 80125F74 7C 60 1B 78 */ mr r0, r3 -lbl_80125F78: -/* 80125F78 90 1E 00 08 */ stw r0, 8(r30) -/* 80125F7C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80125F80 28 03 00 00 */ cmplwi r3, 0 -/* 80125F84 40 82 00 0C */ bne lbl_80125F90 -/* 80125F88 38 60 00 00 */ li r3, 0 -/* 80125F8C 48 00 03 AC */ b lbl_80126338 -lbl_80125F90: -/* 80125F90 3C 80 80 39 */ lis r4, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80125F94 38 84 20 94 */ addi r4, r4, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80125F98 38 84 01 7F */ addi r4, r4, 0x17f -/* 80125F9C 3C A0 00 10 */ lis r5, 0x10 -/* 80125FA0 7F E6 FB 78 */ mr r6, r31 -/* 80125FA4 48 1D 26 A5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive -/* 80125FA8 80 7E 00 08 */ lwz r3, 8(r30) -/* 80125FAC 48 12 F1 3D */ bl dPaneClass_showNullPane__FP9J2DScreen -/* 80125FB0 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80125FB4 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80125FB8 38 63 01 9D */ addi r3, r3, 0x19d -/* 80125FBC 7F E4 FB 78 */ mr r4, r31 -/* 80125FC0 48 1A E2 B1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80125FC4 48 1E 2A A9 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80125FC8 90 7E 00 24 */ stw r3, 0x24(r30) -/* 80125FCC 80 1E 00 24 */ lwz r0, 0x24(r30) -/* 80125FD0 28 00 00 00 */ cmplwi r0, 0 -/* 80125FD4 40 82 00 0C */ bne lbl_80125FE0 -/* 80125FD8 38 60 00 00 */ li r3, 0 -/* 80125FDC 48 00 03 5C */ b lbl_80126338 -lbl_80125FE0: -/* 80125FE0 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80125FE4 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80125FE8 38 63 01 BB */ addi r3, r3, 0x1bb -/* 80125FEC 7F E4 FB 78 */ mr r4, r31 -/* 80125FF0 48 1A E2 81 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80125FF4 48 1E 2A 79 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80125FF8 90 7E 00 28 */ stw r3, 0x28(r30) -/* 80125FFC 80 1E 00 28 */ lwz r0, 0x28(r30) -/* 80126000 28 00 00 00 */ cmplwi r0, 0 -/* 80126004 40 82 00 0C */ bne lbl_80126010 -/* 80126008 38 60 00 00 */ li r3, 0 -/* 8012600C 48 00 03 2C */ b lbl_80126338 -lbl_80126010: -/* 80126010 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80126014 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80126018 38 63 01 D9 */ addi r3, r3, 0x1d9 -/* 8012601C 7F E4 FB 78 */ mr r4, r31 -/* 80126020 48 1A E2 51 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80126024 48 1E 2A 49 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80126028 90 7E 00 1C */ stw r3, 0x1c(r30) -/* 8012602C 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 80126030 28 00 00 00 */ cmplwi r0, 0 -/* 80126034 40 82 00 0C */ bne lbl_80126040 -/* 80126038 38 60 00 00 */ li r3, 0 -/* 8012603C 48 00 02 FC */ b lbl_80126338 -lbl_80126040: -/* 80126040 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 80126044 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 80126048 38 63 01 FA */ addi r3, r3, 0x1fa -/* 8012604C 7F E4 FB 78 */ mr r4, r31 -/* 80126050 48 1A E2 21 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80126054 48 1E 2A 19 */ bl load__20J2DAnmLoaderDataBaseFPCv -/* 80126058 90 7E 00 20 */ stw r3, 0x20(r30) -/* 8012605C 80 1E 00 20 */ lwz r0, 0x20(r30) -/* 80126060 28 00 00 00 */ cmplwi r0, 0 -/* 80126064 40 82 00 0C */ bne lbl_80126070 -/* 80126068 38 60 00 00 */ li r3, 0 -/* 8012606C 48 00 02 CC */ b lbl_80126338 -lbl_80126070: -/* 80126070 80 7E 00 08 */ lwz r3, 8(r30) -/* 80126074 3C 80 5F 61 */ lis r4, 0x5F61 /* 0x5F616C6C@ha */ -/* 80126078 38 C4 6C 6C */ addi r6, r4, 0x6C6C /* 0x5F616C6C@l */ -/* 8012607C 38 A0 00 6E */ li r5, 0x6e -/* 80126080 81 83 00 00 */ lwz r12, 0(r3) -/* 80126084 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80126088 7D 89 03 A6 */ mtctr r12 -/* 8012608C 4E 80 04 21 */ bctrl -/* 80126090 90 7E 00 0C */ stw r3, 0xc(r30) -/* 80126094 80 7E 00 08 */ lwz r3, 8(r30) -/* 80126098 3C 80 73 6F */ lis r4, 0x736F /* 0x736F7230@ha */ -/* 8012609C 38 C4 72 30 */ addi r6, r4, 0x7230 /* 0x736F7230@l */ -/* 801260A0 3C 80 00 63 */ lis r4, 0x0063 /* 0x00637572@ha */ -/* 801260A4 38 A4 75 72 */ addi r5, r4, 0x7572 /* 0x00637572@l */ -/* 801260A8 81 83 00 00 */ lwz r12, 0(r3) -/* 801260AC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801260B0 7D 89 03 A6 */ mtctr r12 -/* 801260B4 4E 80 04 21 */ bctrl -/* 801260B8 90 7E 00 10 */ stw r3, 0x10(r30) -/* 801260BC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801260C0 3C 80 73 6F */ lis r4, 0x736F /* 0x736F7231@ha */ -/* 801260C4 38 C4 72 31 */ addi r6, r4, 0x7231 /* 0x736F7231@l */ -/* 801260C8 3C 80 00 63 */ lis r4, 0x0063 /* 0x00637572@ha */ -/* 801260CC 38 A4 75 72 */ addi r5, r4, 0x7572 /* 0x00637572@l */ -/* 801260D0 81 83 00 00 */ lwz r12, 0(r3) -/* 801260D4 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 801260D8 7D 89 03 A6 */ mtctr r12 -/* 801260DC 4E 80 04 21 */ bctrl -/* 801260E0 90 7E 00 14 */ stw r3, 0x14(r30) -/* 801260E4 80 7E 00 08 */ lwz r3, 8(r30) -/* 801260E8 3C 80 73 6F */ lis r4, 0x736F /* 0x736F7232@ha */ -/* 801260EC 38 C4 72 32 */ addi r6, r4, 0x7232 /* 0x736F7232@l */ -/* 801260F0 3C 80 00 63 */ lis r4, 0x0063 /* 0x00637572@ha */ -/* 801260F4 38 A4 75 72 */ addi r5, r4, 0x7572 /* 0x00637572@l */ -/* 801260F8 81 83 00 00 */ lwz r12, 0(r3) -/* 801260FC 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80126100 7D 89 03 A6 */ mtctr r12 -/* 80126104 4E 80 04 21 */ bctrl -/* 80126108 90 7E 00 18 */ stw r3, 0x18(r30) -/* 8012610C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80126110 80 9E 00 08 */ lwz r4, 8(r30) -/* 80126114 81 83 00 00 */ lwz r12, 0(r3) -/* 80126118 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8012611C 7D 89 03 A6 */ mtctr r12 -/* 80126120 4E 80 04 21 */ bctrl -/* 80126124 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80126128 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 8012612C 81 83 00 00 */ lwz r12, 0(r3) -/* 80126130 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80126134 7D 89 03 A6 */ mtctr r12 -/* 80126138 4E 80 04 21 */ bctrl -/* 8012613C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80126140 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 80126144 81 83 00 00 */ lwz r12, 0(r3) -/* 80126148 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8012614C 7D 89 03 A6 */ mtctr r12 -/* 80126150 4E 80 04 21 */ bctrl -/* 80126154 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 80126158 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 8012615C 81 83 00 00 */ lwz r12, 0(r3) -/* 80126160 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80126164 7D 89 03 A6 */ mtctr r12 -/* 80126168 4E 80 04 21 */ bctrl -/* 8012616C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 80126170 80 9E 00 28 */ lwz r4, 0x28(r30) -/* 80126174 81 83 00 00 */ lwz r12, 0(r3) -/* 80126178 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 8012617C 7D 89 03 A6 */ mtctr r12 -/* 80126180 4E 80 04 21 */ bctrl -/* 80126184 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80126188 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 8012618C D0 03 00 08 */ stfs f0, 8(r3) -/* 80126190 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 80126194 80 9E 00 08 */ lwz r4, 8(r30) -/* 80126198 81 83 00 00 */ lwz r12, 0(r3) -/* 8012619C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801261A0 7D 89 03 A6 */ mtctr r12 -/* 801261A4 4E 80 04 21 */ bctrl -/* 801261A8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 801261AC 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 801261B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801261B4 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 801261B8 7D 89 03 A6 */ mtctr r12 -/* 801261BC 4E 80 04 21 */ bctrl -/* 801261C0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801261C4 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 801261C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801261CC 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 801261D0 7D 89 03 A6 */ mtctr r12 -/* 801261D4 4E 80 04 21 */ bctrl -/* 801261D8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801261DC 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 801261E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801261E4 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 801261E8 7D 89 03 A6 */ mtctr r12 -/* 801261EC 4E 80 04 21 */ bctrl -/* 801261F0 80 7E 00 08 */ lwz r3, 8(r30) -/* 801261F4 3C 80 6C 61 */ lis r4, 0x6C61 /* 0x6C617368@ha */ -/* 801261F8 38 C4 73 68 */ addi r6, r4, 0x7368 /* 0x6C617368@l */ -/* 801261FC 38 A0 00 66 */ li r5, 0x66 -/* 80126200 81 83 00 00 */ lwz r12, 0(r3) -/* 80126204 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80126208 7D 89 03 A6 */ mtctr r12 -/* 8012620C 4E 80 04 21 */ bctrl -/* 80126210 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 80126214 81 83 00 00 */ lwz r12, 0(r3) -/* 80126218 81 8C 00 64 */ lwz r12, 0x64(r12) -/* 8012621C 7D 89 03 A6 */ mtctr r12 -/* 80126220 4E 80 04 21 */ bctrl -/* 80126224 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80126228 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 8012622C D0 03 00 08 */ stfs f0, 8(r3) -/* 80126230 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 80126234 80 9E 00 08 */ lwz r4, 8(r30) -/* 80126238 81 83 00 00 */ lwz r12, 0(r3) -/* 8012623C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80126240 7D 89 03 A6 */ mtctr r12 -/* 80126244 4E 80 04 21 */ bctrl -/* 80126248 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 8012624C 80 9E 00 08 */ lwz r4, 8(r30) -/* 80126250 81 83 00 00 */ lwz r12, 0(r3) -/* 80126254 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80126258 7D 89 03 A6 */ mtctr r12 -/* 8012625C 4E 80 04 21 */ bctrl -/* 80126260 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80126264 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 80126268 81 83 00 00 */ lwz r12, 0(r3) -/* 8012626C 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80126270 7D 89 03 A6 */ mtctr r12 -/* 80126274 4E 80 04 21 */ bctrl -/* 80126278 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 8012627C 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 80126280 81 83 00 00 */ lwz r12, 0(r3) -/* 80126284 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 80126288 7D 89 03 A6 */ mtctr r12 -/* 8012628C 4E 80 04 21 */ bctrl -/* 80126290 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 80126294 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 80126298 81 83 00 00 */ lwz r12, 0(r3) -/* 8012629C 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 801262A0 7D 89 03 A6 */ mtctr r12 -/* 801262A4 4E 80 04 21 */ bctrl -/* 801262A8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 801262AC 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 801262B0 81 83 00 00 */ lwz r12, 0(r3) -/* 801262B4 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 801262B8 7D 89 03 A6 */ mtctr r12 -/* 801262BC 4E 80 04 21 */ bctrl -/* 801262C0 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801262C4 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 801262C8 81 83 00 00 */ lwz r12, 0(r3) -/* 801262CC 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 801262D0 7D 89 03 A6 */ mtctr r12 -/* 801262D4 4E 80 04 21 */ bctrl -/* 801262D8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801262DC 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 801262E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801262E4 81 8C 00 70 */ lwz r12, 0x70(r12) -/* 801262E8 7D 89 03 A6 */ mtctr r12 -/* 801262EC 4E 80 04 21 */ bctrl -/* 801262F0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 801262F4 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801262F8 D0 03 00 08 */ stfs f0, 8(r3) -/* 801262FC 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80126300 D0 03 00 08 */ stfs f0, 8(r3) -/* 80126304 80 7E 00 08 */ lwz r3, 8(r30) -/* 80126308 48 1D 33 89 */ bl animation__9J2DScreenFv -/* 8012630C 3C 60 6E 5F */ lis r3, 0x6E5F /* 0x6E5F3433@ha */ -/* 80126310 38 03 34 33 */ addi r0, r3, 0x3433 /* 0x6E5F3433@l */ -/* 80126314 38 80 00 00 */ li r4, 0 -/* 80126318 80 7E 00 08 */ lwz r3, 8(r30) -/* 8012631C 90 03 00 1C */ stw r0, 0x1c(r3) -/* 80126320 90 83 00 18 */ stw r4, 0x18(r3) -/* 80126324 38 00 00 20 */ li r0, 0x20 -/* 80126328 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8012632C 90 03 00 1C */ stw r0, 0x1c(r3) -/* 80126330 90 83 00 18 */ stw r4, 0x18(r3) -/* 80126334 38 60 00 01 */ li r3, 1 -lbl_80126338: -/* 80126338 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8012633C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80126340 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80126344 7C 08 03 A6 */ mtlr r0 -/* 80126348 38 21 00 10 */ addi r1, r1, 0x10 -/* 8012634C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_event_chkEventFlag__FUs.s b/asm/d/a/d_a_alink/dComIfGp_event_chkEventFlag__FUs.s deleted file mode 100644 index 5b64e19127..0000000000 --- a/asm/d/a/d_a_alink/dComIfGp_event_chkEventFlag__FUs.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80141438: -/* 80141438 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8014143C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80141440 A0 04 4F A0 */ lhz r0, 0x4fa0(r4) -/* 80141444 7C 60 00 38 */ and r0, r3, r0 -/* 80141448 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8014144C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_event_runCheck__Fv.s b/asm/d/a/d_a_alink/dComIfGp_event_runCheck__Fv.s deleted file mode 100644 index acc79c4cc2..0000000000 --- a/asm/d/a/d_a_alink/dComIfGp_event_runCheck__Fv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_801414A4: -/* 801414A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801414A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801414AC 88 63 4F AD */ lbz r3, 0x4fad(r3) -/* 801414B0 30 03 FF FF */ addic r0, r3, -1 -/* 801414B4 7C 00 19 10 */ subfe r0, r0, r3 -/* 801414B8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801414BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci.s b/asm/d/a/d_a_alink/dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci.s deleted file mode 100644 index 80e8ede52b..0000000000 --- a/asm/d/a/d_a_alink/dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80141464: -/* 80141464 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80141468 7C 08 02 A6 */ mflr r0 -/* 8014146C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80141470 7C 67 1B 78 */ mr r7, r3 -/* 80141474 7C 80 23 78 */ mr r0, r4 -/* 80141478 7C A6 2B 78 */ mr r6, r5 -/* 8014147C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80141480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80141484 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80141488 7C E4 3B 78 */ mr r4, r7 -/* 8014148C 7C 05 03 78 */ mr r5, r0 -/* 80141490 4B F0 66 8D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci -/* 80141494 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80141498 7C 08 03 A6 */ mtlr r0 -/* 8014149C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801414A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGp_getHorseActor__Fv.s b/asm/d/a/d_a_alink/dComIfGp_getHorseActor__Fv.s deleted file mode 100644 index 50a5e7a883..0000000000 --- a/asm/d/a/d_a_alink/dComIfGp_getHorseActor__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801414D8: -/* 801414D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801414DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801414E0 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 801414E4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dComIfGs_isEventBit__FUs.s b/asm/d/a/d_a_alink/dComIfGs_isEventBit__FUs.s deleted file mode 100644 index fc41983adb..0000000000 --- a/asm/d/a/d_a_alink/dComIfGs_isEventBit__FUs.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8014139C: -/* 8014139C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801413A0 7C 08 02 A6 */ mflr r0 -/* 801413A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801413A8 7C 64 1B 78 */ mr r4, r3 -/* 801413AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801413B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801413B4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801413B8 4B EF 36 05 */ bl isEventBit__11dSv_event_cCFUs -/* 801413BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801413C0 7C 08 03 A6 */ mtlr r0 -/* 801413C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801413C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_checkLightBallA__FP10fopAc_ac_c.s b/asm/d/a/d_a_alink/daAlink_checkLightBallA__FP10fopAc_ac_c.s deleted file mode 100644 index 60daa6067a..0000000000 --- a/asm/d/a/d_a_alink/daAlink_checkLightBallA__FP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E3830: -/* 800E3830 A8 03 00 08 */ lha r0, 8(r3) -/* 800E3834 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 800E3838 40 82 00 18 */ bne lbl_800E3850 -/* 800E383C 88 03 0C F0 */ lbz r0, 0xcf0(r3) -/* 800E3840 2C 00 00 08 */ cmpwi r0, 8 -/* 800E3844 40 82 00 0C */ bne lbl_800E3850 -/* 800E3848 38 60 00 01 */ li r3, 1 -/* 800E384C 4E 80 00 20 */ blr -lbl_800E3850: -/* 800E3850 38 60 00 00 */ li r3, 0 -/* 800E3854 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_checkLightBallB__FP10fopAc_ac_c.s b/asm/d/a/d_a_alink/daAlink_checkLightBallB__FP10fopAc_ac_c.s deleted file mode 100644 index 356f673e17..0000000000 --- a/asm/d/a/d_a_alink/daAlink_checkLightBallB__FP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800E3858: -/* 800E3858 A8 03 00 08 */ lha r0, 8(r3) -/* 800E385C 2C 00 02 FC */ cmpwi r0, 0x2fc -/* 800E3860 40 82 00 18 */ bne lbl_800E3878 -/* 800E3864 88 03 0C F0 */ lbz r0, 0xcf0(r3) -/* 800E3868 2C 00 00 09 */ cmpwi r0, 9 -/* 800E386C 40 82 00 0C */ bne lbl_800E3878 -/* 800E3870 38 60 00 01 */ li r3, 1 -/* 800E3874 4E 80 00 20 */ blr -lbl_800E3878: -/* 800E3878 38 60 00 00 */ li r3, 0 -/* 800E387C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_createHeap__FP10fopAc_ac_c.s b/asm/d/a/d_a_alink/daAlink_createHeap__FP10fopAc_ac_c.s deleted file mode 100644 index 3012b76942..0000000000 --- a/asm/d/a/d_a_alink/daAlink_createHeap__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800A48F0: -/* 800A48F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A48F4 7C 08 02 A6 */ mflr r0 -/* 800A48F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A48FC 4B FF F7 6D */ bl createHeap__9daAlink_cFv -/* 800A4900 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A4904 7C 08 03 A6 */ mtlr r0 -/* 800A4908 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A490C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_searchLightBall__FP10fopAc_ac_cPv.s b/asm/d/a/d_a_alink/daAlink_searchLightBall__FP10fopAc_ac_cPv.s deleted file mode 100644 index 2c9c5ad79a..0000000000 --- a/asm/d/a/d_a_alink/daAlink_searchLightBall__FP10fopAc_ac_cPv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800E3880: -/* 800E3880 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E3884 7C 08 02 A6 */ mflr r0 -/* 800E3888 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E388C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E3890 7C 7F 1B 78 */ mr r31, r3 -/* 800E3894 48 07 BE 05 */ bl checkCarryStartLightBallA__9daPy_py_cFv -/* 800E3898 28 03 00 00 */ cmplwi r3, 0 -/* 800E389C 41 82 00 14 */ beq lbl_800E38B0 -/* 800E38A0 7F E3 FB 78 */ mr r3, r31 -/* 800E38A4 4B FF FF 8D */ bl daAlink_checkLightBallA__FP10fopAc_ac_c -/* 800E38A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E38AC 40 82 00 20 */ bne lbl_800E38CC -lbl_800E38B0: -/* 800E38B0 48 07 BE 81 */ bl checkCarryStartLightBallB__9daPy_py_cFv -/* 800E38B4 28 03 00 00 */ cmplwi r3, 0 -/* 800E38B8 41 82 00 1C */ beq lbl_800E38D4 -/* 800E38BC 7F E3 FB 78 */ mr r3, r31 -/* 800E38C0 4B FF FF 99 */ bl daAlink_checkLightBallB__FP10fopAc_ac_c -/* 800E38C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E38C8 41 82 00 0C */ beq lbl_800E38D4 -lbl_800E38CC: -/* 800E38CC 7F E3 FB 78 */ mr r3, r31 -/* 800E38D0 48 00 00 08 */ b lbl_800E38D8 -lbl_800E38D4: -/* 800E38D4 38 60 00 00 */ li r3, 0 -lbl_800E38D8: -/* 800E38D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E38DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E38E0 7C 08 03 A6 */ mtlr r0 -/* 800E38E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E38E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/dungeonReturnWarp__9daAlink_cFv.s b/asm/d/a/d_a_alink/dungeonReturnWarp__9daAlink_cFv.s deleted file mode 100644 index 343b39e8f9..0000000000 --- a/asm/d/a/d_a_alink/dungeonReturnWarp__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8011F7D8: -/* 8011F7D8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8011F7DC 7C 08 02 A6 */ mflr r0 -/* 8011F7E0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8011F7E4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011F7E8 48 24 29 F5 */ bl _savegpr_29 -/* 8011F7EC 4B F0 FA D1 */ bl dComIfGs_getWarpPlayerPos__Fv -/* 8011F7F0 C0 03 00 00 */ lfs f0, 0(r3) -/* 8011F7F4 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8011F7F8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8011F7FC D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 8011F800 C0 03 00 08 */ lfs f0, 8(r3) -/* 8011F804 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8011F808 4B F0 FA C5 */ bl dComIfGs_getWarpPlayerAngleY__Fv -/* 8011F80C 7C 7E 1B 78 */ mr r30, r3 -/* 8011F810 4B F0 FA CD */ bl dComIfGs_getWarpRoomNo__Fv -/* 8011F814 7C 7D 1B 78 */ mr r29, r3 -/* 8011F818 4B F0 FA 95 */ bl dComIfGs_getWarpStageName__Fv -/* 8011F81C 7C 64 1B 78 */ mr r4, r3 -/* 8011F820 38 61 00 10 */ addi r3, r1, 0x10 -/* 8011F824 48 24 93 09 */ bl strcpy -/* 8011F828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011F82C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011F830 3B E3 0D B4 */ addi r31, r3, 0xdb4 -/* 8011F834 7F E3 FB 78 */ mr r3, r31 -/* 8011F838 38 81 00 18 */ addi r4, r1, 0x18 -/* 8011F83C 7F C5 F3 78 */ mr r5, r30 -/* 8011F840 7F A6 EB 78 */ mr r6, r29 -/* 8011F844 4B F1 57 3D */ bl setRoom__13dSv_restart_cFRC4cXyzsSc -/* 8011F848 38 00 00 01 */ li r0, 1 -/* 8011F84C 90 01 00 08 */ stw r0, 8(r1) -/* 8011F850 38 00 00 00 */ li r0, 0 -/* 8011F854 90 01 00 0C */ stw r0, 0xc(r1) -/* 8011F858 38 61 00 10 */ addi r3, r1, 0x10 -/* 8011F85C 38 80 FF FF */ li r4, -1 -/* 8011F860 88 1F 00 00 */ lbz r0, 0(r31) -/* 8011F864 7C 05 07 74 */ extsb r5, r0 -/* 8011F868 38 C0 FF FF */ li r6, -1 -/* 8011F86C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011F870 38 E0 00 0C */ li r7, 0xc -/* 8011F874 39 00 00 00 */ li r8, 0 -/* 8011F878 39 20 00 00 */ li r9, 0 -/* 8011F87C 39 40 00 00 */ li r10, 0 -/* 8011F880 4B F0 DA 7D */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii -/* 8011F884 88 1F 00 00 */ lbz r0, 0(r31) -/* 8011F888 7C 03 07 74 */ extsb r3, r0 -/* 8011F88C 38 80 00 00 */ li r4, 0 -/* 8011F890 38 A0 00 CA */ li r5, 0xca -/* 8011F894 38 C0 00 00 */ li r6, 0 -/* 8011F898 48 03 F1 75 */ bl setParamData__9daPy_py_cFiiii -/* 8011F89C 90 7F 00 14 */ stw r3, 0x14(r31) -/* 8011F8A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8011F8A4 48 24 29 85 */ bl _restgpr_29 -/* 8011F8A8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8011F8AC 7C 08 03 A6 */ mtlr r0 -/* 8011F8B0 38 21 00 40 */ addi r1, r1, 0x40 -/* 8011F8B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/exchangeGrabActor__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/exchangeGrabActor__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index fed8de4fc9..0000000000 --- a/asm/d/a/d_a_alink/exchangeGrabActor__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800E3A14: -/* 800E3A14 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E3A18 7C 08 02 A6 */ mflr r0 -/* 800E3A1C 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E3A20 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3A24 48 27 E7 B9 */ bl _savegpr_29 -/* 800E3A28 7C 7D 1B 78 */ mr r29, r3 -/* 800E3A2C 7C 9E 23 78 */ mr r30, r4 -/* 800E3A30 83 E3 28 30 */ lwz r31, 0x2830(r3) -/* 800E3A34 28 1F 00 00 */ cmplwi r31, 0 -/* 800E3A38 40 82 00 0C */ bne lbl_800E3A44 -/* 800E3A3C 38 60 00 00 */ li r3, 0 -/* 800E3A40 48 00 00 44 */ b lbl_800E3A84 -lbl_800E3A44: -/* 800E3A44 7F E3 FB 78 */ mr r3, r31 -/* 800E3A48 4B F3 91 59 */ bl fopAcM_cancelCarryNow__FP10fopAc_ac_c -/* 800E3A4C 38 00 00 00 */ li r0, 0 -/* 800E3A50 B0 1F 04 E8 */ sth r0, 0x4e8(r31) -/* 800E3A54 B0 1F 04 E4 */ sth r0, 0x4e4(r31) -/* 800E3A58 7F A3 EB 78 */ mr r3, r29 -/* 800E3A5C 48 00 02 99 */ bl checkGrabCarryActor__9daAlink_cFv -/* 800E3A60 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3A64 41 82 00 10 */ beq lbl_800E3A74 -/* 800E3A68 38 00 00 00 */ li r0, 0 -/* 800E3A6C B0 1F 04 E0 */ sth r0, 0x4e0(r31) -/* 800E3A70 B0 1F 04 DC */ sth r0, 0x4dc(r31) -lbl_800E3A74: -/* 800E3A74 7F A3 EB 78 */ mr r3, r29 -/* 800E3A78 7F C4 F3 78 */ mr r4, r30 -/* 800E3A7C 48 00 21 39 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c -/* 800E3A80 38 60 00 01 */ li r3, 1 -lbl_800E3A84: -/* 800E3A84 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3A88 48 27 E7 A1 */ bl _restgpr_29 -/* 800E3A8C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E3A90 7C 08 03 A6 */ mtlr r0 -/* 800E3A94 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E3A98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getAnmMtx__8J3DModelFi.s b/asm/d/a/d_a_alink/getAnmMtx__8J3DModelFi.s deleted file mode 100644 index 492d69f494..0000000000 --- a/asm/d/a/d_a_alink/getAnmMtx__8J3DModelFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800CFFE0: -/* 800CFFE0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800CFFE4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800CFFE8 1C 04 00 30 */ mulli r0, r4, 0x30 -/* 800CFFEC 7C 63 02 14 */ add r3, r3, r0 -/* 800CFFF0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBaseAnimeFrame__9daPy_py_cCFv.s b/asm/d/a/d_a_alink/getBaseAnimeFrame__9daPy_py_cCFv.s deleted file mode 100644 index cf493c721d..0000000000 --- a/asm/d/a/d_a_alink/getBaseAnimeFrame__9daPy_py_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80141694: -/* 80141694 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80141698 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoardCutTurnOffsetAngleY__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBoardCutTurnOffsetAngleY__9daAlink_cCFv.s deleted file mode 100644 index a2d224aa39..0000000000 --- a/asm/d/a/d_a_alink/getBoardCutTurnOffsetAngleY__9daAlink_cCFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800D0860: -/* 800D0860 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0864 28 00 00 AD */ cmplwi r0, 0xad -/* 800D0868 40 82 00 0C */ bne lbl_800D0874 -/* 800D086C A8 63 30 12 */ lha r3, 0x3012(r3) -/* 800D0870 4E 80 00 20 */ blr -lbl_800D0874: -/* 800D0874 38 60 00 00 */ li r3, 0 -/* 800D0878 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombAtR__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombAtR__9daAlink_cCFv.s deleted file mode 100644 index 9572af1e26..0000000000 --- a/asm/d/a/d_a_alink/getBombAtR__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37D0: -/* 800E37D0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37D4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37D8 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 800E37DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombBoundRate__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombBoundRate__9daAlink_cCFv.s deleted file mode 100644 index 7a313f42d6..0000000000 --- a/asm/d/a/d_a_alink/getBombBoundRate__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3790: -/* 800E3790 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3794 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3798 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 800E379C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombEffScale__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombEffScale__9daAlink_cCFv.s deleted file mode 100644 index 2b867ba353..0000000000 --- a/asm/d/a/d_a_alink/getBombEffScale__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37C0: -/* 800E37C0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37C4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37C8 C0 23 00 1C */ lfs f1, 0x1c(r3) -/* 800E37CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombExplodeTime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombExplodeTime__9daAlink_cCFv.s deleted file mode 100644 index 343fc8e130..0000000000 --- a/asm/d/a/d_a_alink/getBombExplodeTime__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3760: -/* 800E3760 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3764 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3768 A8 63 00 00 */ lha r3, 0(r3) -/* 800E376C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombExplodeWaterEffectLimit__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombExplodeWaterEffectLimit__9daAlink_cCFv.s deleted file mode 100644 index a260b65ffa..0000000000 --- a/asm/d/a/d_a_alink/getBombExplodeWaterEffectLimit__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3810: -/* 800E3810 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3814 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3818 C0 23 00 48 */ lfs f1, 0x48(r3) -/* 800E381C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombGravity__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombGravity__9daAlink_cCFv.s deleted file mode 100644 index 4dcf64dd96..0000000000 --- a/asm/d/a/d_a_alink/getBombGravity__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3770: -/* 800E3770 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3774 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3778 C0 23 00 08 */ lfs f1, 8(r3) -/* 800E377C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombInsectLimitAngle__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombInsectLimitAngle__9daAlink_cCFv.s deleted file mode 100644 index 52027fc831..0000000000 --- a/asm/d/a/d_a_alink/getBombInsectLimitAngle__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3820: -/* 800E3820 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3824 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3828 A8 63 00 04 */ lha r3, 4(r3) -/* 800E382C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombMaxFallSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombMaxFallSpeed__9daAlink_cCFv.s deleted file mode 100644 index fddc564e36..0000000000 --- a/asm/d/a/d_a_alink/getBombMaxFallSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3780: -/* 800E3780 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3784 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3788 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 800E378C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombMaxSpeedY__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombMaxSpeedY__9daAlink_cCFv.s deleted file mode 100644 index d87966a59d..0000000000 --- a/asm/d/a/d_a_alink/getBombMaxSpeedY__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37B0: -/* 800E37B0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37B4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37B8 C0 23 00 18 */ lfs f1, 0x18(r3) -/* 800E37BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombStopSpeedY__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombStopSpeedY__9daAlink_cCFv.s deleted file mode 100644 index 389a04b0a7..0000000000 --- a/asm/d/a/d_a_alink/getBombStopSpeedY__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37A0: -/* 800E37A0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37A4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37A8 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 800E37AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombWaterGravity__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombWaterGravity__9daAlink_cCFv.s deleted file mode 100644 index 64a2be611c..0000000000 --- a/asm/d/a/d_a_alink/getBombWaterGravity__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37F0: -/* 800E37F0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37F4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37F8 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 800E37FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBombWaterMaxFallSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBombWaterMaxFallSpeed__9daAlink_cCFv.s deleted file mode 100644 index 043a794162..0000000000 --- a/asm/d/a/d_a_alink/getBombWaterMaxFallSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E3800: -/* 800E3800 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E3804 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E3808 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 800E380C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomBgThroughTime__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBoomBgThroughTime__9daAlink_cCFv.s deleted file mode 100644 index 9b80215ee8..0000000000 --- a/asm/d/a/d_a_alink/getBoomBgThroughTime__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E0190: -/* 800E0190 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0194 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0198 A8 63 00 2A */ lha r3, 0x2a(r3) -/* 800E019C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomCatchSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBoomCatchSpeed__9daAlink_cCFv.s deleted file mode 100644 index 61aa30c38c..0000000000 --- a/asm/d/a/d_a_alink/getBoomCatchSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E00B0: -/* 800E00B0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E00B4 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E00B8 C0 23 00 48 */ lfs f1, 0x48(r3) -/* 800E00BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomFlyMax__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getBoomFlyMax__9daAlink_cCFv.s deleted file mode 100644 index e6c2433797..0000000000 --- a/asm/d/a/d_a_alink/getBoomFlyMax__9daAlink_cCFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800E00C0: -/* 800E00C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E00C4 7C 08 02 A6 */ mflr r0 -/* 800E00C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E00CC 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800E00D0 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 800E00D4 41 82 00 2C */ beq lbl_800E0100 -/* 800E00D8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800E00DC 81 8C 01 90 */ lwz r12, 0x190(r12) -/* 800E00E0 7D 89 03 A6 */ mtctr r12 -/* 800E00E4 4E 80 04 21 */ bctrl -/* 800E00E8 28 03 00 00 */ cmplwi r3, 0 -/* 800E00EC 40 82 00 14 */ bne lbl_800E0100 -/* 800E00F0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E00F4 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E00F8 C0 23 00 40 */ lfs f1, 0x40(r3) -/* 800E00FC 48 00 00 10 */ b lbl_800E010C -lbl_800E0100: -/* 800E0100 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0104 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0108 C0 23 00 3C */ lfs f1, 0x3c(r3) -lbl_800E010C: -/* 800E010C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0110 7C 08 03 A6 */ mtlr r0 -/* 800E0114 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E0118 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomLockMax__9daAlink_cFv.s b/asm/d/a/d_a_alink/getBoomLockMax__9daAlink_cFv.s deleted file mode 100644 index 646b7b6a81..0000000000 --- a/asm/d/a/d_a_alink/getBoomLockMax__9daAlink_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_800E011C: -/* 800E011C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E0120 7C 08 02 A6 */ mflr r0 -/* 800E0124 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E0128 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800E012C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800E0130 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0134 7C 7F 1B 78 */ mr r31, r3 -/* 800E0138 4B FF FF 89 */ bl getBoomFlyMax__9daAlink_cCFv -/* 800E013C FF E0 08 90 */ fmr f31, f1 -/* 800E0140 7F E3 FB 78 */ mr r3, r31 -/* 800E0144 48 00 00 5D */ bl checkBossBabaRoom__9daAlink_cFv -/* 800E0148 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E014C 41 82 00 0C */ beq lbl_800E0158 -/* 800E0150 C0 22 93 E8 */ lfs f1, lit_12475(r2) -/* 800E0154 48 00 00 20 */ b lbl_800E0174 -lbl_800E0158: -/* 800E0158 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E015C 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0160 C0 23 00 44 */ lfs f1, 0x44(r3) -/* 800E0164 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 800E0168 40 81 00 08 */ ble lbl_800E0170 -/* 800E016C 48 00 00 08 */ b lbl_800E0174 -lbl_800E0170: -/* 800E0170 FC 20 F8 90 */ fmr f1, f31 -lbl_800E0174: -/* 800E0174 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800E0178 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800E017C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0180 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E0184 7C 08 03 A6 */ mtlr r0 -/* 800E0188 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E018C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBoomerangActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/getBoomerangActor__9daAlink_cFv.s deleted file mode 100644 index 5613f7d0ea..0000000000 --- a/asm/d/a/d_a_alink/getBoomerangActor__9daAlink_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800E0210: -/* 800E0210 80 83 28 34 */ lwz r4, 0x2834(r3) -/* 800E0214 3C 04 00 01 */ addis r0, r4, 1 -/* 800E0218 28 00 FF FF */ cmplwi r0, 0xffff -/* 800E021C 41 82 00 0C */ beq lbl_800E0228 -/* 800E0220 80 63 28 38 */ lwz r3, 0x2838(r3) -/* 800E0224 4E 80 00 20 */ blr -lbl_800E0228: -/* 800E0228 A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 800E022C 28 00 00 40 */ cmplwi r0, 0x40 -/* 800E0230 40 82 00 0C */ bne lbl_800E023C -/* 800E0234 80 63 28 28 */ lwz r3, 0x2828(r3) -/* 800E0238 4E 80 00 20 */ blr -lbl_800E023C: -/* 800E023C 38 60 00 00 */ li r3, 0 -/* 800E0240 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getBottleMtx__9daAlink_cFv.s b/asm/d/a/d_a_alink/getBottleMtx__9daAlink_cFv.s deleted file mode 100644 index f48c51c7e5..0000000000 --- a/asm/d/a/d_a_alink/getBottleMtx__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_800D02E0: -/* 800D02E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D02E4 7C 08 02 A6 */ mflr r0 -/* 800D02E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D02EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D02F0 7C 7F 1B 78 */ mr r31, r3 -/* 800D02F4 80 03 07 08 */ lwz r0, 0x708(r3) -/* 800D02F8 28 00 00 00 */ cmplwi r0, 0 -/* 800D02FC 41 82 00 20 */ beq lbl_800D031C -/* 800D0300 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800D0304 48 08 E7 85 */ bl checkBottleItem__9daPy_py_cFi -/* 800D0308 2C 03 00 00 */ cmpwi r3, 0 -/* 800D030C 41 82 00 10 */ beq lbl_800D031C -/* 800D0310 80 7F 07 08 */ lwz r3, 0x708(r31) -/* 800D0314 38 63 00 24 */ addi r3, r3, 0x24 -/* 800D0318 48 00 00 08 */ b lbl_800D0320 -lbl_800D031C: -/* 800D031C 38 60 00 00 */ li r3, 0 -lbl_800D0320: -/* 800D0320 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D0324 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0328 7C 08 03 A6 */ mtlr r0 -/* 800D032C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0330 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCopyRodBallDisMax__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCopyRodBallDisMax__9daAlink_cCFv.s deleted file mode 100644 index 5d7317b540..0000000000 --- a/asm/d/a/d_a_alink/getCopyRodBallDisMax__9daAlink_cCFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800E1330: -/* 800E1330 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1334 7C 08 02 A6 */ mflr r0 -/* 800E1338 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E133C 4B FF FF A5 */ bl checkLv6BossRoom__9daAlink_cFv -/* 800E1340 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1344 41 82 00 14 */ beq lbl_800E1358 -/* 800E1348 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E134C 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E1350 C0 23 00 34 */ lfs f1, 0x34(r3) -/* 800E1354 48 00 00 10 */ b lbl_800E1364 -lbl_800E1358: -/* 800E1358 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E135C 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E1360 C0 23 00 2C */ lfs f1, 0x2c(r3) -lbl_800E1364: -/* 800E1364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1368 7C 08 03 A6 */ mtlr r0 -/* 800E136C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1370 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCopyRodBallReturnSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCopyRodBallReturnSpeed__9daAlink_cCFv.s deleted file mode 100644 index 803e372800..0000000000 --- a/asm/d/a/d_a_alink/getCopyRodBallReturnSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E1320: -/* 800E1320 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E1324 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E1328 C0 23 00 30 */ lfs f1, 0x30(r3) -/* 800E132C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCopyRodBallSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCopyRodBallSpeed__9daAlink_cCFv.s deleted file mode 100644 index ff681a5b5c..0000000000 --- a/asm/d/a/d_a_alink/getCopyRodBallSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E1310: -/* 800E1310 3C 60 80 39 */ lis r3, m__21daAlinkHIO_copyRod_c0@ha /* 0x8038EAFC@ha */ -/* 800E1314 38 63 EA FC */ addi r3, r3, m__21daAlinkHIO_copyRod_c0@l /* 0x8038EAFC@l */ -/* 800E1318 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 800E131C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCopyRodCameraActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCopyRodCameraActor__9daAlink_cFv.s deleted file mode 100644 index ad433ca809..0000000000 --- a/asm/d/a/d_a_alink/getCopyRodCameraActor__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800E1390: -/* 800E1390 80 63 28 40 */ lwz r3, 0x2840(r3) -/* 800E1394 28 03 00 00 */ cmplwi r3, 0 -/* 800E1398 41 82 00 0C */ beq lbl_800E13A4 -/* 800E139C 80 63 07 4C */ lwz r3, 0x74c(r3) -/* 800E13A0 4E 80 00 20 */ blr -lbl_800E13A4: -/* 800E13A4 38 60 00 00 */ li r3, 0 -/* 800E13A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCopyRodControllActor__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCopyRodControllActor__9daAlink_cFv.s deleted file mode 100644 index 43b4e84d9e..0000000000 --- a/asm/d/a/d_a_alink/getCopyRodControllActor__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800E1374: -/* 800E1374 80 63 28 40 */ lwz r3, 0x2840(r3) -/* 800E1378 28 03 00 00 */ cmplwi r3, 0 -/* 800E137C 41 82 00 0C */ beq lbl_800E1388 -/* 800E1380 80 63 07 44 */ lwz r3, 0x744(r3) -/* 800E1384 4E 80 00 20 */ blr -lbl_800E1388: -/* 800E1388 38 60 00 00 */ li r3, 0 -/* 800E138C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCutTurnDirection__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getCutTurnDirection__9daAlink_cCFv.s deleted file mode 100644 index 51394c58bd..0000000000 --- a/asm/d/a/d_a_alink/getCutTurnDirection__9daAlink_cCFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800D1424: -/* 800D1424 80 03 31 80 */ lwz r0, 0x3180(r3) -/* 800D1428 54 03 0F FE */ srwi r3, r0, 0x1f -/* 800D142C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getEnemyBombColorR__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getEnemyBombColorR__9daAlink_cCFv.s deleted file mode 100644 index 19bde3aaf3..0000000000 --- a/asm/d/a/d_a_alink/getEnemyBombColorR__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_800E37E0: -/* 800E37E0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_bomb_c0@ha /* 0x8038E714@ha */ -/* 800E37E4 38 63 E7 14 */ addi r3, r3, m__18daAlinkHIO_bomb_c0@l /* 0x8038E714@l */ -/* 800E37E8 A8 63 00 02 */ lha r3, 2(r3) -/* 800E37EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getFrontRollRate__9daAlink_cFv.s b/asm/d/a/d_a_alink/getFrontRollRate__9daAlink_cFv.s deleted file mode 100644 index 8d645b4b7f..0000000000 --- a/asm/d/a/d_a_alink/getFrontRollRate__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800B4B2C: -/* 800B4B2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B4B30 7C 08 02 A6 */ mflr r0 -/* 800B4B34 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B4B38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B4B3C 7C 7F 1B 78 */ mr r31, r3 -/* 800B4B40 38 80 00 01 */ li r4, 1 -/* 800B4B44 38 A0 00 01 */ li r5, 1 -/* 800B4B48 48 00 69 71 */ bl checkHeavyStateOn__9daAlink_cFii -/* 800B4B4C 2C 03 00 00 */ cmpwi r3, 0 -/* 800B4B50 41 82 00 14 */ beq lbl_800B4B64 -/* 800B4B54 C0 22 94 AC */ lfs f1, lit_16641(r2) -/* 800B4B58 C0 1F 34 34 */ lfs f0, 0x3434(r31) -/* 800B4B5C EC 21 00 32 */ fmuls f1, f1, f0 -/* 800B4B60 48 00 00 08 */ b lbl_800B4B68 -lbl_800B4B64: -/* 800B4B64 C0 22 94 AC */ lfs f1, lit_16641(r2) -lbl_800B4B68: -/* 800B4B68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B4B6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B4B70 7C 08 03 A6 */ mtlr r0 -/* 800B4B74 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B4B78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daAlink_cCFv.s deleted file mode 100644 index 7f9779247a..0000000000 --- a/asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daAlink_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D09DC: -/* 800D09DC A8 63 30 0C */ lha r3, 0x300c(r3) -/* 800D09E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getHeadMtx__9daAlink_cFv.s b/asm/d/a/d_a_alink/getHeadMtx__9daAlink_cFv.s deleted file mode 100644 index 9405d77317..0000000000 --- a/asm/d/a/d_a_alink/getHeadMtx__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800D0334: -/* 800D0334 80 83 06 50 */ lwz r4, 0x650(r3) -/* 800D0338 80 84 00 84 */ lwz r4, 0x84(r4) -/* 800D033C 80 84 00 0C */ lwz r4, 0xc(r4) -/* 800D0340 A0 03 30 B4 */ lhz r0, 0x30b4(r3) -/* 800D0344 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800D0348 7C 64 02 14 */ add r3, r4, r0 -/* 800D034C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getInvMtx__9daAlink_cFv.s b/asm/d/a/d_a_alink/getInvMtx__9daAlink_cFv.s deleted file mode 100644 index 48baa82c3c..0000000000 --- a/asm/d/a/d_a_alink/getInvMtx__9daAlink_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D029C: -/* 800D029C 38 63 2B B8 */ addi r3, r3, 0x2bb8 -/* 800D02A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLeftHandMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getLeftHandMatrix__9daAlink_cFv.s deleted file mode 100644 index 4557eeec39..0000000000 --- a/asm/d/a/d_a_alink/getLeftHandMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800CF2DC: -/* 800CF2DC 80 83 06 50 */ lwz r4, 0x650(r3) -/* 800CF2E0 80 84 00 84 */ lwz r4, 0x84(r4) -/* 800CF2E4 80 84 00 0C */ lwz r4, 0xc(r4) -/* 800CF2E8 A0 03 30 B8 */ lhz r0, 0x30b8(r3) -/* 800CF2EC 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800CF2F0 7C 64 02 14 */ add r3, r4, r0 -/* 800CF2F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLeftItemMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getLeftItemMatrix__9daAlink_cFv.s deleted file mode 100644 index 0edf8eb77b..0000000000 --- a/asm/d/a/d_a_alink/getLeftItemMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800CF298: -/* 800CF298 80 83 06 50 */ lwz r4, 0x650(r3) -/* 800CF29C 80 84 00 84 */ lwz r4, 0x84(r4) -/* 800CF2A0 80 84 00 0C */ lwz r4, 0xc(r4) -/* 800CF2A4 A0 03 30 C0 */ lhz r0, 0x30c0(r3) -/* 800CF2A8 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800CF2AC 7C 64 02 14 */ add r3, r4, r0 -/* 800CF2B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daAlink_cFv.s deleted file mode 100644 index 8d96a26290..0000000000 --- a/asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daAlink_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D02A4: -/* 800D02A4 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800D02A8 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800D02AC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800D02B0 38 63 00 30 */ addi r3, r3, 0x30 -/* 800D02B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getMagneBootsTopVec__9daAlink_cFv.s b/asm/d/a/d_a_alink/getMagneBootsTopVec__9daAlink_cFv.s deleted file mode 100644 index 5236bb28e3..0000000000 --- a/asm/d/a/d_a_alink/getMagneBootsTopVec__9daAlink_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D087C: -/* 800D087C 38 63 36 A8 */ addi r3, r3, 0x36a8 -/* 800D0880 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getModelMtx__9daAlink_cFv.s b/asm/d/a/d_a_alink/getModelMtx__9daAlink_cFv.s deleted file mode 100644 index 5a68e4f11c..0000000000 --- a/asm/d/a/d_a_alink/getModelMtx__9daAlink_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800D0290: -/* 800D0290 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800D0294 38 63 00 24 */ addi r3, r3, 0x24 -/* 800D0298 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getRightHandMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getRightHandMatrix__9daAlink_cFv.s deleted file mode 100644 index f4c285c3dc..0000000000 --- a/asm/d/a/d_a_alink/getRightHandMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800CF2F8: -/* 800CF2F8 80 83 06 50 */ lwz r4, 0x650(r3) -/* 800CF2FC 80 84 00 84 */ lwz r4, 0x84(r4) -/* 800CF300 80 84 00 0C */ lwz r4, 0xc(r4) -/* 800CF304 A0 03 30 BA */ lhz r0, 0x30ba(r3) -/* 800CF308 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800CF30C 7C 64 02 14 */ add r3, r4, r0 -/* 800CF310 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getRightItemMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getRightItemMatrix__9daAlink_cFv.s deleted file mode 100644 index ba68b58dd6..0000000000 --- a/asm/d/a/d_a_alink/getRightItemMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800CF328: -/* 800CF328 80 83 06 50 */ lwz r4, 0x650(r3) -/* 800CF32C 80 84 00 84 */ lwz r4, 0x84(r4) -/* 800CF330 80 84 00 0C */ lwz r4, 0xc(r4) -/* 800CF334 A0 03 30 C2 */ lhz r0, 0x30c2(r3) -/* 800CF338 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800CF33C 7C 64 02 14 */ add r3, r4, r0 -/* 800CF340 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSearchBallScale__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSearchBallScale__9daAlink_cCFv.s deleted file mode 100644 index a77ab2490d..0000000000 --- a/asm/d/a/d_a_alink/getSearchBallScale__9daAlink_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D0794: -/* 800D0794 C0 23 34 90 */ lfs f1, 0x3490(r3) -/* 800D0798 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSearchBallScale__9daPy_py_cCFv.s b/asm/d/a/d_a_alink/getSearchBallScale__9daPy_py_cCFv.s deleted file mode 100644 index cd29c2951f..0000000000 --- a/asm/d/a/d_a_alink/getSearchBallScale__9daPy_py_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80141788: -/* 80141788 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8014178C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSinkShapeOffset__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSinkShapeOffset__9daAlink_cCFv.s deleted file mode 100644 index 9d90bfeda4..0000000000 --- a/asm/d/a/d_a_alink/getSinkShapeOffset__9daAlink_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D09AC: -/* 800D09AC C0 23 2B A8 */ lfs f1, 0x2ba8(r3) -/* 800D09B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSinkShapeOffset__9daPy_py_cCFv.s b/asm/d/a/d_a_alink/getSinkShapeOffset__9daPy_py_cCFv.s deleted file mode 100644 index c9045eda45..0000000000 --- a/asm/d/a/d_a_alink/getSinkShapeOffset__9daPy_py_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80141904: -/* 80141904 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80141908 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSwordAtType__9daAlink_cFv.s b/asm/d/a/d_a_alink/getSwordAtType__9daAlink_cFv.s deleted file mode 100644 index d4fb5e5ec7..0000000000 --- a/asm/d/a/d_a_alink/getSwordAtType__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800D0F5C: -/* 800D0F5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0F60 7C 08 02 A6 */ mflr r0 -/* 800D0F64 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0F68 48 08 E4 31 */ bl checkMasterSwordEquip__9daPy_py_cFv -/* 800D0F6C 2C 03 00 00 */ cmpwi r3, 0 -/* 800D0F70 38 60 00 02 */ li r3, 2 -/* 800D0F74 41 82 00 0C */ beq lbl_800D0F80 -/* 800D0F78 3C 60 04 00 */ lis r3, 0x0400 /* 0x04000002@ha */ -/* 800D0F7C 38 63 00 02 */ addi r3, r3, 0x0002 /* 0x04000002@l */ -lbl_800D0F80: -/* 800D0F80 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0F84 7C 08 03 A6 */ mtlr r0 -/* 800D0F88 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0F8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSwordChangeWaitTimer__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSwordChangeWaitTimer__9daAlink_cCFv.s deleted file mode 100644 index 1dbc1411ba..0000000000 --- a/asm/d/a/d_a_alink/getSwordChangeWaitTimer__9daAlink_cCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D09E4: -/* 800D09E4 88 63 2F D6 */ lbz r3, 0x2fd6(r3) -/* 800D09E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daAlink_cFv.s deleted file mode 100644 index 98af8ce7fe..0000000000 --- a/asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daAlink_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D02CC: -/* 800D02CC 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800D02D0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800D02D4 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800D02D8 38 63 00 60 */ addi r3, r3, 0x60 -/* 800D02DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfHowlMgrP__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWolfHowlMgrP__9daAlink_cFv.s deleted file mode 100644 index 8ddd810335..0000000000 --- a/asm/d/a/d_a_alink/getWolfHowlMgrP__9daAlink_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_800D0A9C: -/* 800D0A9C 38 63 2D 84 */ addi r3, r3, 0x2d84 -/* 800D0AA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfLockActorEnd__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWolfLockActorEnd__9daAlink_cFv.s deleted file mode 100644 index 58272c7e5f..0000000000 --- a/asm/d/a/d_a_alink/getWolfLockActorEnd__9daAlink_cFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_801391DC: -/* 801391DC 80 63 07 C8 */ lwz r3, 0x7c8(r3) -/* 801391E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getWolfMouthMatrix__9daAlink_cFv.s b/asm/d/a/d_a_alink/getWolfMouthMatrix__9daAlink_cFv.s deleted file mode 100644 index 82dcfbbe15..0000000000 --- a/asm/d/a/d_a_alink/getWolfMouthMatrix__9daAlink_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D02B8: -/* 800D02B8 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800D02BC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800D02C0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800D02C4 38 63 02 70 */ addi r3, r3, 0x270 -/* 800D02C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz.s b/asm/d/a/d_a_alink/initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz.s deleted file mode 100644 index df50f00c9d..0000000000 --- a/asm/d/a/d_a_alink/initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801256EC: -/* 801256EC D0 23 00 24 */ stfs f1, 0x24(r3) -/* 801256F0 90 83 00 1C */ stw r4, 0x1c(r3) -/* 801256F4 C0 07 00 00 */ lfs f0, 0(r7) -/* 801256F8 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 801256FC C0 07 00 04 */ lfs f0, 4(r7) -/* 80125700 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 80125704 C0 07 00 08 */ lfs f0, 8(r7) -/* 80125708 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 8012570C C0 05 00 00 */ lfs f0, 0(r5) -/* 80125710 D0 03 00 38 */ stfs f0, 0x38(r3) -/* 80125714 C0 05 00 04 */ lfs f0, 4(r5) -/* 80125718 D0 03 00 3C */ stfs f0, 0x3c(r3) -/* 8012571C C0 05 00 08 */ lfs f0, 8(r5) -/* 80125720 D0 03 00 40 */ stfs f0, 0x40(r3) -/* 80125724 C0 06 00 00 */ lfs f0, 0(r6) -/* 80125728 D0 03 03 08 */ stfs f0, 0x308(r3) -/* 8012572C C0 06 00 04 */ lfs f0, 4(r6) -/* 80125730 D0 03 03 0C */ stfs f0, 0x30c(r3) -/* 80125734 C0 06 00 08 */ lfs f0, 8(r6) -/* 80125738 D0 03 03 10 */ stfs f0, 0x310(r3) -/* 8012573C C0 03 00 38 */ lfs f0, 0x38(r3) -/* 80125740 D0 03 00 44 */ stfs f0, 0x44(r3) -/* 80125744 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 80125748 D0 03 00 48 */ stfs f0, 0x48(r3) -/* 8012574C C0 03 00 40 */ lfs f0, 0x40(r3) -/* 80125750 D0 03 00 4C */ stfs f0, 0x4c(r3) -/* 80125754 C0 03 03 08 */ lfs f0, 0x308(r3) -/* 80125758 D0 03 03 14 */ stfs f0, 0x314(r3) -/* 8012575C C0 03 03 0C */ lfs f0, 0x30c(r3) -/* 80125760 D0 03 03 18 */ stfs f0, 0x318(r3) -/* 80125764 C0 03 03 10 */ lfs f0, 0x310(r3) -/* 80125768 D0 03 03 1C */ stfs f0, 0x31c(r3) -/* 8012576C 38 00 00 00 */ li r0, 0 -/* 80125770 90 03 00 14 */ stw r0, 0x14(r3) -/* 80125774 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initBoomerangUpperAnimeSpeed__9daAlink_cFi.s b/asm/d/a/d_a_alink/initBoomerangUpperAnimeSpeed__9daAlink_cFi.s deleted file mode 100644 index 8c9bac1091..0000000000 --- a/asm/d/a/d_a_alink/initBoomerangUpperAnimeSpeed__9daAlink_cFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800E03D0: -/* 800E03D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E03D4 7C 08 02 A6 */ mflr r0 -/* 800E03D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E03DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E03E0 93 C1 00 08 */ stw r30, 8(r1) -/* 800E03E4 7C 7E 1B 78 */ mr r30, r3 -/* 800E03E8 7C 9F 23 78 */ mr r31, r4 -/* 800E03EC 48 00 00 C1 */ bl checkBoomerangThrowAnime__9daAlink_cCFv -/* 800E03F0 2C 03 00 00 */ cmpwi r3, 0 -/* 800E03F4 40 82 00 34 */ bne lbl_800E0428 -/* 800E03F8 2C 1F 00 00 */ cmpwi r31, 0 -/* 800E03FC 41 82 00 1C */ beq lbl_800E0418 -/* 800E0400 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E0404 D0 1E 20 54 */ stfs f0, 0x2054(r30) -/* 800E0408 D0 1E 20 58 */ stfs f0, 0x2058(r30) -/* 800E040C 80 7E 1F 54 */ lwz r3, 0x1f54(r30) -/* 800E0410 D0 03 00 08 */ stfs f0, 8(r3) -/* 800E0414 48 00 00 14 */ b lbl_800E0428 -lbl_800E0418: -/* 800E0418 3C 60 80 39 */ lis r3, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E041C 38 63 E6 C8 */ addi r3, r3, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0420 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800E0424 D0 1E 20 54 */ stfs f0, 0x2054(r30) -lbl_800E0428: -/* 800E0428 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E042C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E0430 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0434 7C 08 03 A6 */ mtlr r0 -/* 800E0438 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E043C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initCutTurnAt__9daAlink_cFfi.s b/asm/d/a/d_a_alink/initCutTurnAt__9daAlink_cFfi.s deleted file mode 100644 index b6564bc2dd..0000000000 --- a/asm/d/a/d_a_alink/initCutTurnAt__9daAlink_cFfi.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_800D0F90: -/* 800D0F90 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D0F94 7C 08 02 A6 */ mflr r0 -/* 800D0F98 90 01 00 24 */ stw r0, 0x24(r1) -/* 800D0F9C DB E1 00 18 */ stfd f31, 0x18(r1) -/* 800D0FA0 93 E1 00 14 */ stw r31, 0x14(r1) -/* 800D0FA4 93 C1 00 10 */ stw r30, 0x10(r1) -/* 800D0FA8 7C 7E 1B 78 */ mr r30, r3 -/* 800D0FAC FF E0 08 90 */ fmr f31, f1 -/* 800D0FB0 7C 9F 23 78 */ mr r31, r4 -/* 800D0FB4 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800D0FB8 4B FB 33 61 */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800D0FBC 80 1E 0F B8 */ lwz r0, 0xfb8(r30) -/* 800D0FC0 60 00 00 01 */ ori r0, r0, 1 -/* 800D0FC4 90 1E 0F B8 */ stw r0, 0xfb8(r30) -/* 800D0FC8 4B FF FF 95 */ bl getSwordAtType__9daAlink_cFv -/* 800D0FCC 90 7E 0F C8 */ stw r3, 0xfc8(r30) -/* 800D0FD0 38 00 00 03 */ li r0, 3 -/* 800D0FD4 98 1E 10 2E */ stb r0, 0x102e(r30) -/* 800D0FD8 38 00 00 01 */ li r0, 1 -/* 800D0FDC 98 1E 10 2C */ stb r0, 0x102c(r30) -/* 800D0FE0 9B FE 0F CC */ stb r31, 0xfcc(r30) -/* 800D0FE4 80 1E 05 7C */ lwz r0, 0x57c(r30) -/* 800D0FE8 54 00 67 FE */ rlwinm r0, r0, 0xc, 0x1f, 0x1f -/* 800D0FEC 7C 60 00 D0 */ neg r3, r0 -/* 800D0FF0 38 00 00 04 */ li r0, 4 -/* 800D0FF4 7C 00 18 38 */ and r0, r0, r3 -/* 800D0FF8 98 1E 10 2D */ stb r0, 0x102d(r30) -/* 800D0FFC 38 7E 10 DC */ addi r3, r30, 0x10dc -/* 800D1000 FC 20 F8 90 */ fmr f1, f31 -/* 800D1004 48 19 E7 05 */ bl SetR__8cM3dGSphFf -/* 800D1008 38 00 00 01 */ li r0, 1 -/* 800D100C 98 1E 2F D0 */ stb r0, 0x2fd0(r30) -/* 800D1010 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 800D1014 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 800D1018 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 800D101C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800D1020 7C 08 03 A6 */ mtlr r0 -/* 800D1024 38 21 00 20 */ addi r1, r1, 0x20 -/* 800D1028 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initLockAt__9daAlink_cFv.s b/asm/d/a/d_a_alink/initLockAt__9daAlink_cFv.s deleted file mode 100644 index 6f2718479e..0000000000 --- a/asm/d/a/d_a_alink/initLockAt__9daAlink_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800ABAE0: -/* 800ABAE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ABAE4 7C 08 02 A6 */ mflr r0 -/* 800ABAE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ABAEC 80 03 12 2C */ lwz r0, 0x122c(r3) -/* 800ABAF0 60 00 00 20 */ ori r0, r0, 0x20 -/* 800ABAF4 90 03 12 2C */ stw r0, 0x122c(r3) -/* 800ABAF8 80 03 12 84 */ lwz r0, 0x1284(r3) -/* 800ABAFC 60 00 00 02 */ ori r0, r0, 2 -/* 800ABB00 90 03 12 84 */ stw r0, 0x1284(r3) -/* 800ABB04 80 03 12 84 */ lwz r0, 0x1284(r3) -/* 800ABB08 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800ABB0C 90 03 12 84 */ stw r0, 0x1284(r3) -/* 800ABB10 38 63 12 2C */ addi r3, r3, 0x122c -/* 800ABB14 4B FD 88 05 */ bl ResetAtHit__12dCcD_GObjInfFv -/* 800ABB18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ABB1C 7C 08 03 A6 */ mtlr r0 -/* 800ABB20 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ABB24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/initTevCustomColor__9daAlink_cFv.s b/asm/d/a/d_a_alink/initTevCustomColor__9daAlink_cFv.s deleted file mode 100644 index 0b45f0cee5..0000000000 --- a/asm/d/a/d_a_alink/initTevCustomColor__9daAlink_cFv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_800CC7DC: -/* 800CC7DC 38 00 00 00 */ li r0, 0 -/* 800CC7E0 98 03 04 73 */ stb r0, 0x473(r3) -/* 800CC7E4 B0 03 04 64 */ sth r0, 0x464(r3) -/* 800CC7E8 B0 03 04 66 */ sth r0, 0x466(r3) -/* 800CC7EC B0 03 04 68 */ sth r0, 0x468(r3) -/* 800CC7F0 98 03 04 6C */ stb r0, 0x46c(r3) -/* 800CC7F4 98 03 04 6E */ stb r0, 0x46e(r3) -/* 800CC7F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/init__16daAlink_matAnm_cFv.s b/asm/d/a/d_a_alink/init__16daAlink_matAnm_cFv.s deleted file mode 100644 index d3631644e8..0000000000 --- a/asm/d/a/d_a_alink/init__16daAlink_matAnm_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_8009D8E4: -/* 8009D8E4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8009D8E8 D0 03 00 F4 */ stfs f0, 0xf4(r3) -/* 8009D8EC D0 03 00 F8 */ stfs f0, 0xf8(r3) -/* 8009D8F0 D0 03 00 FC */ stfs f0, 0xfc(r3) -/* 8009D8F4 D0 03 01 00 */ stfs f0, 0x100(r3) -/* 8009D8F8 38 00 00 00 */ li r0, 0 -/* 8009D8FC 98 0D 8A 48 */ stb r0, struct_80450FC8+0x0(r13) -/* 8009D900 98 0D 8A 49 */ stb r0, struct_80450FC8+0x1(r13) -/* 8009D904 90 03 01 04 */ stw r0, 0x104(r3) -/* 8009D908 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/itemEquip__9daAlink_cFUs.s b/asm/d/a/d_a_alink/itemEquip__9daAlink_cFUs.s deleted file mode 100644 index e9b8f32894..0000000000 --- a/asm/d/a/d_a_alink/itemEquip__9daAlink_cFUs.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800B9640: -/* 800B9640 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B9644 7C 08 02 A6 */ mflr r0 -/* 800B9648 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B964C 80 03 28 38 */ lwz r0, 0x2838(r3) -/* 800B9650 28 00 00 00 */ cmplwi r0, 0 -/* 800B9654 41 82 00 10 */ beq lbl_800B9664 -/* 800B9658 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 800B965C 28 00 00 40 */ cmplwi r0, 0x40 -/* 800B9660 41 82 00 34 */ beq lbl_800B9694 -lbl_800B9664: -/* 800B9664 B0 83 2F DE */ sth r4, 0x2fde(r3) -/* 800B9668 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B966C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B9670 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800B9674 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 -/* 800B9678 90 04 5F 18 */ stw r0, 0x5f18(r4) -/* 800B967C 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800B9680 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc -/* 800B9684 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800B9688 A0 83 2F DE */ lhz r4, 0x2fde(r3) -/* 800B968C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800B9690 48 00 00 15 */ bl itemUnequip__9daAlink_cFUsf -lbl_800B9694: -/* 800B9694 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B9698 7C 08 03 A6 */ mtlr r0 -/* 800B969C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B96A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/makeItemType__9daAlink_cFv.s b/asm/d/a/d_a_alink/makeItemType__9daAlink_cFv.s deleted file mode 100644 index a05e1225a9..0000000000 --- a/asm/d/a/d_a_alink/makeItemType__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800BFD74: -/* 800BFD74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BFD78 7C 08 02 A6 */ mflr r0 -/* 800BFD7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BFD80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BFD84 7C 7F 1B 78 */ mr r31, r3 -/* 800BFD88 4B FF FB 49 */ bl setItemModel__9daAlink_cFv -/* 800BFD8C 2C 03 00 00 */ cmpwi r3, 0 -/* 800BFD90 40 82 00 0C */ bne lbl_800BFD9C -/* 800BFD94 7F E3 FB 78 */ mr r3, r31 -/* 800BFD98 4B FF FC 59 */ bl setItemActor__9daAlink_cFv -lbl_800BFD9C: -/* 800BFD9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BFDA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BFDA4 7C 08 03 A6 */ mtlr r0 -/* 800BFDA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BFDAC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/modelCalc__9daAlink_cFP8J3DModel.s b/asm/d/a/d_a_alink/modelCalc__9daAlink_cFP8J3DModel.s deleted file mode 100644 index 244186f95e..0000000000 --- a/asm/d/a/d_a_alink/modelCalc__9daAlink_cFP8J3DModel.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800CC25C: -/* 800CC25C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CC260 7C 08 02 A6 */ mflr r0 -/* 800CC264 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CC268 88 03 2F BF */ lbz r0, 0x2fbf(r3) -/* 800CC26C 28 00 00 00 */ cmplwi r0, 0 -/* 800CC270 40 82 00 18 */ bne lbl_800CC288 -/* 800CC274 7C 83 23 78 */ mr r3, r4 -/* 800CC278 81 84 00 00 */ lwz r12, 0(r4) -/* 800CC27C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800CC280 7D 89 03 A6 */ mtctr r12 -/* 800CC284 4E 80 04 21 */ bctrl -lbl_800CC288: -/* 800CC288 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800CC28C 7C 08 03 A6 */ mtlr r0 -/* 800CC290 38 21 00 10 */ addi r1, r1, 0x10 -/* 800CC294 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 8b47e7a702..0000000000 --- a/asm/d/a/d_a_alink/notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800D1788: -/* 800D1788 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D178C 7C 08 02 A6 */ mflr r0 -/* 800D1790 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D1794 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1798 28 03 00 00 */ cmplwi r3, 0 -/* 800D179C 41 82 00 38 */ beq lbl_800D17D4 -/* 800D17A0 88 03 04 96 */ lbz r0, 0x496(r3) -/* 800D17A4 28 00 00 04 */ cmplwi r0, 4 -/* 800D17A8 40 82 00 2C */ bne lbl_800D17D4 -/* 800D17AC AB E3 00 08 */ lha r31, 8(r3) -/* 800D17B0 48 00 AD F5 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c -/* 800D17B4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D17B8 40 82 00 1C */ bne lbl_800D17D4 -/* 800D17BC 2C 1F 01 08 */ cmpwi r31, 0x108 -/* 800D17C0 41 82 00 14 */ beq lbl_800D17D4 -/* 800D17C4 2C 1F 02 40 */ cmpwi r31, 0x240 -/* 800D17C8 41 82 00 0C */ beq lbl_800D17D4 -/* 800D17CC 38 60 00 01 */ li r3, 1 -/* 800D17D0 48 00 00 08 */ b lbl_800D17D8 -lbl_800D17D4: -/* 800D17D4 38 60 00 00 */ li r3, 0 -lbl_800D17D8: -/* 800D17D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D17DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D17E0 7C 08 03 A6 */ mtlr r0 -/* 800D17E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D17E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/notTalk__9daAlink_cFv.s b/asm/d/a/d_a_alink/notTalk__9daAlink_cFv.s deleted file mode 100644 index 87129485fe..0000000000 --- a/asm/d/a/d_a_alink/notTalk__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_800B4950: -/* 800B4950 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B4954 7C 08 02 A6 */ mflr r0 -/* 800B4958 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B495C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B4960 93 C1 00 08 */ stw r30, 8(r1) -/* 800B4964 7C 7E 1B 78 */ mr r30, r3 -/* 800B4968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B496C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B4970 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800B4974 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800B4978 4B FB FC E9 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo -/* 800B497C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B4980 41 82 00 1C */ beq lbl_800B499C -/* 800B4984 38 7E 1A 60 */ addi r3, r30, 0x1a60 -/* 800B4988 4B FC 13 F5 */ bl dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo -/* 800B498C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B4990 41 82 00 0C */ beq lbl_800B499C -/* 800B4994 3B E0 00 01 */ li r31, 1 -/* 800B4998 48 00 00 08 */ b lbl_800B49A0 -lbl_800B499C: -/* 800B499C 3B E0 00 00 */ li r31, 0 -lbl_800B49A0: -/* 800B49A0 88 1E 2F B2 */ lbz r0, 0x2fb2(r30) -/* 800B49A4 28 00 00 00 */ cmplwi r0, 0 -/* 800B49A8 40 82 00 3C */ bne lbl_800B49E4 -/* 800B49AC 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800B49B0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800B49B4 41 82 00 14 */ beq lbl_800B49C8 -/* 800B49B8 C0 3E 36 AC */ lfs f1, 0x36ac(r30) -/* 800B49BC 48 1B 38 29 */ bl cBgW_CheckBGround__Ff -/* 800B49C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B49C4 41 82 00 20 */ beq lbl_800B49E4 -lbl_800B49C8: -/* 800B49C8 80 9E 31 A0 */ lwz r4, 0x31a0(r30) -/* 800B49CC 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070C52@ha */ -/* 800B49D0 38 03 0C 52 */ addi r0, r3, 0x0C52 /* 0x00070C52@l */ -/* 800B49D4 7C 80 00 39 */ and. r0, r4, r0 -/* 800B49D8 40 82 00 14 */ bne lbl_800B49EC -/* 800B49DC 2C 1F 00 00 */ cmpwi r31, 0 -/* 800B49E0 40 82 00 0C */ bne lbl_800B49EC -lbl_800B49E4: -/* 800B49E4 38 60 00 01 */ li r3, 1 -/* 800B49E8 48 00 00 08 */ b lbl_800B49F0 -lbl_800B49EC: -/* 800B49EC 38 60 00 00 */ li r3, 0 -lbl_800B49F0: -/* 800B49F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B49F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800B49F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B49FC 7C 08 03 A6 */ mtlr r0 -/* 800B4A00 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B4A04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/offSetFlg__16daAlink_matAnm_cFv.s b/asm/d/a/d_a_alink/offSetFlg__16daAlink_matAnm_cFv.s deleted file mode 100644 index e4df565cf4..0000000000 --- a/asm/d/a/d_a_alink/offSetFlg__16daAlink_matAnm_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_800D0180: -/* 800D0180 38 00 00 00 */ li r0, 0 -/* 800D0184 90 03 01 04 */ stw r0, 0x104(r3) -/* 800D0188 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/offSwordModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/offSwordModel__9daAlink_cFv.s deleted file mode 100644 index dcc8cc2981..0000000000 --- a/asm/d/a/d_a_alink/offSwordModel__9daAlink_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_800D1310: -/* 800D1310 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D1314 7C 08 02 A6 */ mflr r0 -/* 800D1318 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D131C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1320 7C 7F 1B 78 */ mr r31, r3 -/* 800D1324 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 800D1328 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 800D132C 38 80 00 00 */ li r4, 0 -/* 800D1330 48 1E 4B 55 */ bl bgmSetSwordUsing__8Z2SeqMgrFl -/* 800D1334 80 7F 06 B8 */ lwz r3, 0x6b8(r31) -/* 800D1338 80 1F 06 68 */ lwz r0, 0x668(r31) -/* 800D133C 7C 03 00 40 */ cmplw r3, r0 -/* 800D1340 41 82 00 10 */ beq lbl_800D1350 -/* 800D1344 80 1F 06 60 */ lwz r0, 0x660(r31) -/* 800D1348 7C 03 00 40 */ cmplw r3, r0 -/* 800D134C 40 82 00 24 */ bne lbl_800D1370 -lbl_800D1350: -/* 800D1350 80 63 00 04 */ lwz r3, 4(r3) -/* 800D1354 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800D1358 80 63 00 00 */ lwz r3, 0(r3) -/* 800D135C 80 63 00 08 */ lwz r3, 8(r3) -/* 800D1360 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800D1364 60 00 00 01 */ ori r0, r0, 1 -/* 800D1368 90 03 00 0C */ stw r0, 0xc(r3) -/* 800D136C 48 00 00 2C */ b lbl_800D1398 -lbl_800D1370: -/* 800D1370 80 9F 06 70 */ lwz r4, 0x670(r31) -/* 800D1374 7C 03 20 40 */ cmplw r3, r4 -/* 800D1378 40 82 00 20 */ bne lbl_800D1398 -/* 800D137C 80 64 00 04 */ lwz r3, 4(r4) -/* 800D1380 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800D1384 80 63 00 04 */ lwz r3, 4(r3) -/* 800D1388 80 63 00 08 */ lwz r3, 8(r3) -/* 800D138C 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800D1390 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800D1394 90 03 00 0C */ stw r0, 0xc(r3) -lbl_800D1398: -/* 800D1398 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D139C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D13A0 7C 08 03 A6 */ mtlr r0 -/* 800D13A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D13A8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/offWolfEyeUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/offWolfEyeUp__9daAlink_cFv.s deleted file mode 100644 index dc53e8aada..0000000000 --- a/asm/d/a/d_a_alink/offWolfEyeUp__9daAlink_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80127CAC: -/* 80127CAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80127CB0 7C 08 02 A6 */ mflr r0 -/* 80127CB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80127CB8 A8 03 30 AC */ lha r0, 0x30ac(r3) -/* 80127CBC 2C 00 00 00 */ cmpwi r0, 0 -/* 80127CC0 41 82 00 20 */ beq lbl_80127CE0 -/* 80127CC4 38 00 00 00 */ li r0, 0 -/* 80127CC8 B0 03 30 AC */ sth r0, 0x30ac(r3) -/* 80127CCC 38 00 00 14 */ li r0, 0x14 -/* 80127CD0 98 03 2F D2 */ stb r0, 0x2fd2(r3) -/* 80127CD4 38 63 2C A8 */ addi r3, r3, 0x2ca8 -/* 80127CD8 38 80 00 00 */ li r4, 0 -/* 80127CDC 48 19 BE 21 */ bl setWolfEyeOpen__14Z2CreatureLinkFb -lbl_80127CE0: -/* 80127CE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80127CE4 7C 08 03 A6 */ mtlr r0 -/* 80127CE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80127CEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c.s b/asm/d/a/d_a_alink/onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c.s deleted file mode 100644 index c52fced4af..0000000000 --- a/asm/d/a/d_a_alink/onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D0818: -/* 800D0818 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800D081C 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D0820 B0 03 31 12 */ sth r0, 0x3112(r3) -/* 800D0824 98 A3 2F AC */ stb r5, 0x2fac(r3) -/* 800D0828 90 C3 28 08 */ stw r6, 0x2808(r3) -/* 800D082C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c.s b/asm/d/a/d_a_alink/onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c.s deleted file mode 100644 index e2177e863c..0000000000 --- a/asm/d/a/d_a_alink/onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800CF314: -/* 800CF314 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800CF318 B0 03 31 12 */ sth r0, 0x3112(r3) -/* 800CF31C 98 A3 2F AC */ stb r5, 0x2fac(r3) -/* 800CF320 90 C3 28 08 */ stw r6, 0x2808(r3) -/* 800CF324 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onSceneChangeDead__9daAlink_cFUci.s b/asm/d/a/d_a_alink/onSceneChangeDead__9daAlink_cFUci.s deleted file mode 100644 index 07e2fe8b53..0000000000 --- a/asm/d/a/d_a_alink/onSceneChangeDead__9daAlink_cFUci.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800D0830: -/* 800D0830 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0834 28 00 01 50 */ cmplwi r0, 0x150 -/* 800D0838 4C 82 00 20 */ bnelr -/* 800D083C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800D0840 B0 03 30 12 */ sth r0, 0x3012(r3) -/* 800D0844 90 A3 31 98 */ stw r5, 0x3198(r3) -/* 800D0848 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onWolfEyeUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/onWolfEyeUp__9daAlink_cFv.s deleted file mode 100644 index 9de8fc53bf..0000000000 --- a/asm/d/a/d_a_alink/onWolfEyeUp__9daAlink_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80127C54: -/* 80127C54 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80127C58 7C 08 02 A6 */ mflr r0 -/* 80127C5C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80127C60 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80127C64 7C 7F 1B 78 */ mr r31, r3 -/* 80127C68 A8 03 30 AC */ lha r0, 0x30ac(r3) -/* 80127C6C 2C 00 00 00 */ cmpwi r0, 0 -/* 80127C70 40 82 00 28 */ bne lbl_80127C98 -/* 80127C74 38 7F 2C A8 */ addi r3, r31, 0x2ca8 -/* 80127C78 38 80 00 01 */ li r4, 1 -/* 80127C7C 48 19 BE 81 */ bl setWolfEyeOpen__14Z2CreatureLinkFb -/* 80127C80 3C 60 80 39 */ lis r3, m__18daAlinkHIO_wolf_c0@ha /* 0x8038F9F8@ha */ -/* 80127C84 38 63 F9 F8 */ addi r3, r3, m__18daAlinkHIO_wolf_c0@l /* 0x8038F9F8@l */ -/* 80127C88 A8 03 00 0C */ lha r0, 0xc(r3) -/* 80127C8C B0 1F 30 AC */ sth r0, 0x30ac(r31) -/* 80127C90 38 00 00 14 */ li r0, 0x14 -/* 80127C94 98 1F 2F D2 */ stb r0, 0x2fd2(r31) -lbl_80127C98: -/* 80127C98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80127C9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80127CA0 7C 08 03 A6 */ mtlr r0 -/* 80127CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80127CA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/orderPeep__9daAlink_cFv.s b/asm/d/a/d_a_alink/orderPeep__9daAlink_cFv.s deleted file mode 100644 index 30692f6dea..0000000000 --- a/asm/d/a/d_a_alink/orderPeep__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800B7B7C: -/* 800B7B7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B7B80 7C 08 02 A6 */ mflr r0 -/* 800B7B84 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B7B88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B7B8C 7C 7F 1B 78 */ mr r31, r3 -/* 800B7B90 80 83 27 F4 */ lwz r4, 0x27f4(r3) -/* 800B7B94 88 04 05 6D */ lbz r0, 0x56d(r4) -/* 800B7B98 98 03 2F AD */ stb r0, 0x2fad(r3) -/* 800B7B9C 38 00 00 14 */ li r0, 0x14 -/* 800B7BA0 B0 03 2F F2 */ sth r0, 0x2ff2(r3) -/* 800B7BA4 80 83 27 F4 */ lwz r4, 0x27f4(r3) -/* 800B7BA8 3C A0 80 3B */ lis r5, l_peepEventName@ha /* 0x803AF99C@ha */ -/* 800B7BAC 38 A5 F9 9C */ addi r5, r5, l_peepEventName@l /* 0x803AF99C@l */ -/* 800B7BB0 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800B7BB4 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800B7BB8 38 E0 00 01 */ li r7, 1 -/* 800B7BBC 39 00 00 00 */ li r8, 0 -/* 800B7BC0 4B F6 39 21 */ bl fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs -/* 800B7BC4 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800B7BC8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800B7BCC 41 82 00 10 */ beq lbl_800B7BDC -/* 800B7BD0 7F E3 FB 78 */ mr r3, r31 -/* 800B7BD4 48 07 55 D5 */ bl procWolfWaitInit__9daAlink_cFv -/* 800B7BD8 48 00 00 0C */ b lbl_800B7BE4 -lbl_800B7BDC: -/* 800B7BDC 7F E3 FB 78 */ mr r3, r31 -/* 800B7BE0 48 00 B7 D9 */ bl procWaitInit__9daAlink_cFv -lbl_800B7BE4: -/* 800B7BE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B7BE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B7BEC 7C 08 03 A6 */ mtlr r0 -/* 800B7BF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B7BF4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/playerStartCollisionSE__9daAlink_cFUlUl.s b/asm/d/a/d_a_alink/playerStartCollisionSE__9daAlink_cFUlUl.s deleted file mode 100644 index 5861f736c1..0000000000 --- a/asm/d/a/d_a_alink/playerStartCollisionSE__9daAlink_cFUlUl.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0B60: -/* 800D0B60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0B64 7C 08 02 A6 */ mflr r0 -/* 800D0B68 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0B6C 85 83 2C A8 */ lwzu r12, 0x2ca8(r3) -/* 800D0B70 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 800D0B74 7D 89 03 A6 */ mtctr r12 -/* 800D0B78 4E 80 04 21 */ bctrl -/* 800D0B7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0B80 7C 08 03 A6 */ mtlr r0 -/* 800D0B84 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0B88 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procAtnActorMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procAtnActorMoveInit__9daAlink_cFv.s deleted file mode 100644 index 860f72f540..0000000000 --- a/asm/d/a/d_a_alink/procAtnActorMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800C39EC: -/* 800C39EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C39F0 7C 08 02 A6 */ mflr r0 -/* 800C39F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C39F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C39FC 7C 7F 1B 78 */ mr r31, r3 -/* 800C3A00 38 80 00 07 */ li r4, 7 -/* 800C3A04 4B FF F3 A1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C3A08 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3A0C 40 82 00 0C */ bne lbl_800C3A18 -/* 800C3A10 38 60 00 00 */ li r3, 0 -/* 800C3A14 48 00 00 1C */ b lbl_800C3A30 -lbl_800C3A18: -/* 800C3A18 7F E3 FB 78 */ mr r3, r31 -/* 800C3A1C 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3A20 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3A24 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3A28 4B FE B0 49 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800C3A2C 38 60 00 01 */ li r3, 1 -lbl_800C3A30: -/* 800C3A30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3A34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3A38 7C 08 03 A6 */ mtlr r0 -/* 800C3A3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3A40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procAtnActorMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procAtnActorMove__9daAlink_cFv.s deleted file mode 100644 index de66d150e7..0000000000 --- a/asm/d/a/d_a_alink/procAtnActorMove__9daAlink_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_800C3A44: -/* 800C3A44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3A48 7C 08 02 A6 */ mflr r0 -/* 800C3A4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3A50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3A54 7C 7F 1B 78 */ mr r31, r3 -/* 800C3A58 38 80 00 00 */ li r4, 0 -/* 800C3A5C 4B FF 66 75 */ bl checkNextAction__9daAlink_cFi -/* 800C3A60 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3A64 40 82 00 18 */ bne lbl_800C3A7C -/* 800C3A68 7F E3 FB 78 */ mr r3, r31 -/* 800C3A6C C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C3A70 4B FE B0 01 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800C3A74 7F E3 FB 78 */ mr r3, r31 -/* 800C3A78 4B FF 39 19 */ bl checkSwordTwirlAction__9daAlink_cFv -lbl_800C3A7C: -/* 800C3A7C 38 60 00 01 */ li r3, 1 -/* 800C3A80 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3A84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3A88 7C 08 03 A6 */ mtlr r0 -/* 800C3A8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3A90 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procAtnActorWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procAtnActorWaitInit__9daAlink_cFv.s deleted file mode 100644 index 267cb40270..0000000000 --- a/asm/d/a/d_a_alink/procAtnActorWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800C38CC: -/* 800C38CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C38D0 7C 08 02 A6 */ mflr r0 -/* 800C38D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C38D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C38DC 7C 7F 1B 78 */ mr r31, r3 -/* 800C38E0 38 80 00 06 */ li r4, 6 -/* 800C38E4 4B FF F4 C1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C38E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C38EC 40 82 00 0C */ bne lbl_800C38F8 -/* 800C38F0 38 60 00 00 */ li r3, 0 -/* 800C38F4 48 00 00 74 */ b lbl_800C3968 -lbl_800C38F8: -/* 800C38F8 80 9F 27 EC */ lwz r4, 0x27ec(r31) -/* 800C38FC 28 04 00 00 */ cmplwi r4, 0 -/* 800C3900 41 82 00 0C */ beq lbl_800C390C -/* 800C3904 7F E3 FB 78 */ mr r3, r31 -/* 800C3908 4B F5 6E 09 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -lbl_800C390C: -/* 800C390C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C3910 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C3914 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800C3918 28 00 00 02 */ cmplwi r0, 2 -/* 800C391C 41 82 00 0C */ beq lbl_800C3928 -/* 800C3920 38 00 00 03 */ li r0, 3 -/* 800C3924 98 1F 2F 98 */ stb r0, 0x2f98(r31) -lbl_800C3928: -/* 800C3928 7F E3 FB 78 */ mr r3, r31 -/* 800C392C 4B FE F9 85 */ bl checkAtnWaitAnime__9daAlink_cFv -/* 800C3930 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3934 41 82 00 1C */ beq lbl_800C3950 -/* 800C3938 7F E3 FB 78 */ mr r3, r31 -/* 800C393C 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3940 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3944 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3948 4B FE B1 29 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800C394C 48 00 00 18 */ b lbl_800C3964 -lbl_800C3950: -/* 800C3950 7F E3 FB 78 */ mr r3, r31 -/* 800C3954 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3958 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C395C C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3960 4B FE A4 B5 */ bl setBlendMoveAnime__9daAlink_cFf -lbl_800C3964: -/* 800C3964 38 60 00 01 */ li r3, 1 -lbl_800C3968: -/* 800C3968 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C396C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3970 7C 08 03 A6 */ mtlr r0 -/* 800C3974 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3978 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procAtnActorWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procAtnActorWait__9daAlink_cFv.s deleted file mode 100644 index 5b1bbb8f1d..0000000000 --- a/asm/d/a/d_a_alink/procAtnActorWait__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800C397C: -/* 800C397C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3980 7C 08 02 A6 */ mflr r0 -/* 800C3984 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3988 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C398C 7C 7F 1B 78 */ mr r31, r3 -/* 800C3990 38 80 00 00 */ li r4, 0 -/* 800C3994 4B FF 67 3D */ bl checkNextAction__9daAlink_cFi -/* 800C3998 2C 03 00 00 */ cmpwi r3, 0 -/* 800C399C 40 82 00 38 */ bne lbl_800C39D4 -/* 800C39A0 7F E3 FB 78 */ mr r3, r31 -/* 800C39A4 4B FE F9 0D */ bl checkAtnWaitAnime__9daAlink_cFv -/* 800C39A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C39AC 41 82 00 14 */ beq lbl_800C39C0 -/* 800C39B0 7F E3 FB 78 */ mr r3, r31 -/* 800C39B4 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C39B8 4B FE B0 B9 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800C39BC 48 00 00 10 */ b lbl_800C39CC -lbl_800C39C0: -/* 800C39C0 7F E3 FB 78 */ mr r3, r31 -/* 800C39C4 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C39C8 4B FE A4 4D */ bl setBlendMoveAnime__9daAlink_cFf -lbl_800C39CC: -/* 800C39CC 7F E3 FB 78 */ mr r3, r31 -/* 800C39D0 4B FF 39 C1 */ bl checkSwordTwirlAction__9daAlink_cFv -lbl_800C39D4: -/* 800C39D4 38 60 00 01 */ li r3, 1 -/* 800C39D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C39DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C39E0 7C 08 03 A6 */ mtlr r0 -/* 800C39E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C39E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procAtnMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procAtnMoveInit__9daAlink_cFv.s deleted file mode 100644 index 6b503c4ad6..0000000000 --- a/asm/d/a/d_a_alink/procAtnMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800C3810: -/* 800C3810 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3814 7C 08 02 A6 */ mflr r0 -/* 800C3818 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C381C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3820 7C 7F 1B 78 */ mr r31, r3 -/* 800C3824 38 80 00 05 */ li r4, 5 -/* 800C3828 4B FF F5 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C382C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3830 40 82 00 0C */ bne lbl_800C383C -/* 800C3834 38 60 00 00 */ li r3, 0 -/* 800C3838 48 00 00 1C */ b lbl_800C3854 -lbl_800C383C: -/* 800C383C 7F E3 FB 78 */ mr r3, r31 -/* 800C3840 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3844 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3848 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C384C 4B FE B2 25 */ bl setBlendAtnMoveAnime__9daAlink_cFf -/* 800C3850 38 60 00 01 */ li r3, 1 -lbl_800C3854: -/* 800C3854 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3858 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C385C 7C 08 03 A6 */ mtlr r0 -/* 800C3860 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3864 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutJumpInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procCutJumpInit__9daAlink_cFi.s deleted file mode 100644 index 9b3d2300cc..0000000000 --- a/asm/d/a/d_a_alink/procCutJumpInit__9daAlink_cFi.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_800D42FC: -/* 800D42FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D4300 7C 08 02 A6 */ mflr r0 -/* 800D4304 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D4308 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D430C 93 C1 00 08 */ stw r30, 8(r1) -/* 800D4310 7C 7E 1B 78 */ mr r30, r3 -/* 800D4314 7C 9F 23 78 */ mr r31, r4 -/* 800D4318 38 80 00 26 */ li r4, 0x26 -/* 800D431C 4B FE DC 51 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800D4320 7F C3 F3 78 */ mr r3, r30 -/* 800D4324 38 80 00 71 */ li r4, 0x71 -/* 800D4328 3C A0 80 39 */ lis r5, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D432C 38 A5 DB 40 */ addi r5, r5, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4330 4B FD 8D C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D4334 2C 1F 00 00 */ cmpwi r31, 0 -/* 800D4338 41 82 00 20 */ beq lbl_800D4358 -/* 800D433C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D4340 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4344 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 800D4348 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D434C C0 03 00 34 */ lfs f0, 0x34(r3) -/* 800D4350 D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800D4354 48 00 00 1C */ b lbl_800D4370 -lbl_800D4358: -/* 800D4358 3C 60 80 39 */ lis r3, m__21daAlinkHIO_cutJump_c0@ha /* 0x8038DB40@ha */ -/* 800D435C 38 63 DB 40 */ addi r3, r3, m__21daAlinkHIO_cutJump_c0@l /* 0x8038DB40@l */ -/* 800D4360 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 800D4364 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D4368 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800D436C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -lbl_800D4370: -/* 800D4370 7F C3 F3 78 */ mr r3, r30 -/* 800D4374 7F E4 FB 78 */ mr r4, r31 -/* 800D4378 4B FF E9 01 */ bl setCutJumpSpeed__9daAlink_cFi -/* 800D437C A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800D4380 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800D4384 7F C3 F3 78 */ mr r3, r30 -/* 800D4388 38 80 00 01 */ li r4, 1 -/* 800D438C 38 A0 00 03 */ li r5, 3 -/* 800D4390 38 C0 00 01 */ li r6, 1 -/* 800D4394 38 E0 00 03 */ li r7, 3 -/* 800D4398 3D 00 80 39 */ lis r8, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D439C 39 08 DE 8C */ addi r8, r8, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D43A0 C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D43A4 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D43A8 4B FF D2 E1 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D43AC 7F C3 F3 78 */ mr r3, r30 -/* 800D43B0 38 80 00 0A */ li r4, 0xa -/* 800D43B4 4B FF D1 79 */ bl setCutType__9daAlink_cFUc -/* 800D43B8 7F C3 F3 78 */ mr r3, r30 -/* 800D43BC 4B FF DF 49 */ bl setSwordComboVoice__9daAlink_cFv -/* 800D43C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D43C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D43C8 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800D43CC 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800D43D0 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800D43D4 38 00 00 02 */ li r0, 2 -/* 800D43D8 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 800D43DC 38 60 00 01 */ li r3, 1 -/* 800D43E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D43E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D43E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D43EC 7C 08 03 A6 */ mtlr r0 -/* 800D43F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D43F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutLargeJump__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutLargeJump__9daAlink_cFv.s deleted file mode 100644 index 65b27b65bc..0000000000 --- a/asm/d/a/d_a_alink/procCutLargeJump__9daAlink_cFv.s +++ /dev/null @@ -1,155 +0,0 @@ -lbl_800D6484: -/* 800D6484 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D6488 7C 08 02 A6 */ mflr r0 -/* 800D648C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D6490 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D6494 93 C1 00 08 */ stw r30, 8(r1) -/* 800D6498 7C 7E 1B 78 */ mr r30, r3 -/* 800D649C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800D64A0 A8 03 30 10 */ lha r0, 0x3010(r3) -/* 800D64A4 2C 00 00 00 */ cmpwi r0, 0 -/* 800D64A8 41 82 00 0C */ beq lbl_800D64B4 -/* 800D64AC 38 00 00 04 */ li r0, 4 -/* 800D64B0 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_800D64B4: -/* 800D64B4 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800D64B8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800D64BC 41 82 00 20 */ beq lbl_800D64DC -/* 800D64C0 7F C3 F3 78 */ mr r3, r30 -/* 800D64C4 4B FF AF 21 */ bl checkCutTurnInput__9daAlink_cCFv -/* 800D64C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D64CC 41 82 00 10 */ beq lbl_800D64DC -/* 800D64D0 7F C3 F3 78 */ mr r3, r30 -/* 800D64D4 4B FF AF 51 */ bl getCutTurnDirection__9daAlink_cCFv -/* 800D64D8 90 7E 31 98 */ stw r3, 0x3198(r30) -lbl_800D64DC: -/* 800D64DC A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 800D64E0 2C 00 00 00 */ cmpwi r0, 0 -/* 800D64E4 40 82 01 0C */ bne lbl_800D65F0 -/* 800D64E8 7F E3 FB 78 */ mr r3, r31 -/* 800D64EC 48 08 7F E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800D64F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800D64F4 41 82 00 40 */ beq lbl_800D6534 -/* 800D64F8 38 00 00 0C */ li r0, 0xc -/* 800D64FC 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800D6500 7F C3 F3 78 */ mr r3, r30 -/* 800D6504 38 80 01 8D */ li r4, 0x18d -/* 800D6508 3C A0 80 39 */ lis r5, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D650C 38 A5 DE 18 */ addi r5, r5, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D6510 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D6514 4B FD 6B E1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800D6518 38 00 00 01 */ li r0, 1 -/* 800D651C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 800D6520 7F C3 F3 78 */ mr r3, r30 -/* 800D6524 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001009C@ha */ -/* 800D6528 38 84 00 9C */ addi r4, r4, 0x009C /* 0x0001009C@l */ -/* 800D652C 4B FF BD 59 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D6530 48 00 01 74 */ b lbl_800D66A4 -lbl_800D6534: -/* 800D6534 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6538 C0 02 93 14 */ lfs f0, lit_7307(r2) -/* 800D653C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6540 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6544 40 82 00 0C */ bne lbl_800D6550 -/* 800D6548 38 00 00 01 */ li r0, 1 -/* 800D654C B0 1E 30 10 */ sth r0, 0x3010(r30) -lbl_800D6550: -/* 800D6550 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 800D6554 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 800D6558 40 82 00 44 */ bne lbl_800D659C -/* 800D655C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6560 C0 02 93 3C */ lfs f0, lit_7808(r2) -/* 800D6564 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6568 4C 41 13 82 */ cror 2, 1, 2 -/* 800D656C 40 82 00 30 */ bne lbl_800D659C -/* 800D6570 7F C3 F3 78 */ mr r3, r30 -/* 800D6574 4B FD E3 5D */ bl setJumpMode__9daAlink_cFv -/* 800D6578 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D657C 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D6580 C0 03 00 50 */ lfs f0, 0x50(r3) -/* 800D6584 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800D6588 C0 03 00 54 */ lfs f0, 0x54(r3) -/* 800D658C D0 1E 04 FC */ stfs f0, 0x4fc(r30) -/* 800D6590 7F C3 F3 78 */ mr r3, r30 -/* 800D6594 38 80 00 00 */ li r4, 0 -/* 800D6598 4B FF C6 E1 */ bl setCutJumpSpeed__9daAlink_cFi -lbl_800D659C: -/* 800D659C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D65A0 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D65A4 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D65A8 C0 03 00 58 */ lfs f0, 0x58(r3) -/* 800D65AC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D65B0 4C 41 13 82 */ cror 2, 1, 2 -/* 800D65B4 40 82 00 F0 */ bne lbl_800D66A4 -/* 800D65B8 C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 800D65BC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D65C0 40 80 00 E4 */ bge lbl_800D66A4 -/* 800D65C4 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D65C8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D65CC 40 82 00 14 */ bne lbl_800D65E0 -/* 800D65D0 7F C3 F3 78 */ mr r3, r30 -/* 800D65D4 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020002@ha */ -/* 800D65D8 38 84 00 02 */ addi r4, r4, 0x0002 /* 0x00020002@l */ -/* 800D65DC 4B FE 8B 11 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D65E0: -/* 800D65E0 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D65E4 60 00 00 02 */ ori r0, r0, 2 -/* 800D65E8 90 1E 05 80 */ stw r0, 0x580(r30) -/* 800D65EC 48 00 00 B8 */ b lbl_800D66A4 -lbl_800D65F0: -/* 800D65F0 A8 7E 30 0E */ lha r3, 0x300e(r30) -/* 800D65F4 2C 03 00 00 */ cmpwi r3, 0 -/* 800D65F8 41 82 00 4C */ beq lbl_800D6644 -/* 800D65FC 38 03 FF FF */ addi r0, r3, -1 -/* 800D6600 B0 1E 30 0E */ sth r0, 0x300e(r30) -/* 800D6604 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 800D6608 2C 00 00 00 */ cmpwi r0, 0 -/* 800D660C 40 82 00 38 */ bne lbl_800D6644 -/* 800D6610 7F C3 F3 78 */ mr r3, r30 -/* 800D6614 38 80 00 01 */ li r4, 1 -/* 800D6618 38 A0 00 03 */ li r5, 3 -/* 800D661C 38 C0 00 01 */ li r6, 1 -/* 800D6620 38 E0 00 04 */ li r7, 4 -/* 800D6624 3D 00 80 39 */ lis r8, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D6628 39 08 DE 8C */ addi r8, r8, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D662C C0 28 00 74 */ lfs f1, 0x74(r8) -/* 800D6630 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D6634 4B FF B0 55 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff -/* 800D6638 7F C3 F3 78 */ mr r3, r30 -/* 800D663C 38 80 00 13 */ li r4, 0x13 -/* 800D6640 4B FF AE ED */ bl setCutType__9daAlink_cFUc -lbl_800D6644: -/* 800D6644 80 1E 19 9C */ lwz r0, 0x199c(r30) -/* 800D6648 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800D664C 41 82 00 14 */ beq lbl_800D6660 -/* 800D6650 7F C3 F3 78 */ mr r3, r30 -/* 800D6654 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800D6658 48 00 00 69 */ bl procCutLargeJumpLandInit__9daAlink_cFi -/* 800D665C 48 00 00 48 */ b lbl_800D66A4 -lbl_800D6660: -/* 800D6660 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800D6664 3C 60 80 39 */ lis r3, m__26daAlinkHIO_cutLargeJump_c0@ha /* 0x8038DE18@ha */ -/* 800D6668 38 63 DE 18 */ addi r3, r3, m__26daAlinkHIO_cutLargeJump_c0@l /* 0x8038DE18@l */ -/* 800D666C C0 03 00 60 */ lfs f0, 0x60(r3) -/* 800D6670 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800D6674 4C 41 13 82 */ cror 2, 1, 2 -/* 800D6678 40 82 00 2C */ bne lbl_800D66A4 -/* 800D667C 80 1E 05 70 */ lwz r0, 0x570(r30) -/* 800D6680 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 -/* 800D6684 40 82 00 14 */ bne lbl_800D6698 -/* 800D6688 7F C3 F3 78 */ mr r3, r30 -/* 800D668C 3C 80 00 02 */ lis r4, 0x0002 /* 0x00020002@ha */ -/* 800D6690 38 84 00 02 */ addi r4, r4, 0x0002 /* 0x00020002@l */ -/* 800D6694 4B FE 8A 59 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800D6698: -/* 800D6698 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800D669C 60 00 00 02 */ ori r0, r0, 2 -/* 800D66A0 90 1E 05 80 */ stw r0, 0x580(r30) -lbl_800D66A4: -/* 800D66A4 38 60 00 01 */ li r3, 1 -/* 800D66A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D66AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D66B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D66B4 7C 08 03 A6 */ mtlr r0 -/* 800D66B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D66BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMoveInit__9daAlink_cFv.s deleted file mode 100644 index 359f418a4a..0000000000 --- a/asm/d/a/d_a_alink/procMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800C36CC: -/* 800C36CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C36D0 7C 08 02 A6 */ mflr r0 -/* 800C36D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C36D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C36DC 7C 7F 1B 78 */ mr r31, r3 -/* 800C36E0 38 80 00 04 */ li r4, 4 -/* 800C36E4 4B FF F6 C1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C36E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C36EC 40 82 00 0C */ bne lbl_800C36F8 -/* 800C36F0 38 60 00 00 */ li r3, 0 -/* 800C36F4 48 00 00 28 */ b lbl_800C371C -lbl_800C36F8: -/* 800C36F8 7F E3 FB 78 */ mr r3, r31 -/* 800C36FC 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3700 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3704 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3708 4B FE A7 0D */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C370C 7F E3 FB 78 */ mr r3, r31 -/* 800C3710 38 80 00 03 */ li r4, 3 -/* 800C3714 48 05 DA AD */ bl setFootEffectProcType__9daAlink_cFi -/* 800C3718 38 60 00 01 */ li r3, 1 -lbl_800C371C: -/* 800C371C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3724 7C 08 03 A6 */ mtlr r0 -/* 800C3728 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C372C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMoveTurnInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procMoveTurnInit__9daAlink_cFi.s deleted file mode 100644 index e5b58481c4..0000000000 --- a/asm/d/a/d_a_alink/procMoveTurnInit__9daAlink_cFi.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_800C3C3C: -/* 800C3C3C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3C40 7C 08 02 A6 */ mflr r0 -/* 800C3C44 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3C48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3C4C 93 C1 00 08 */ stw r30, 8(r1) -/* 800C3C50 7C 7F 1B 78 */ mr r31, r3 -/* 800C3C54 7C 9E 23 78 */ mr r30, r4 -/* 800C3C58 38 80 00 09 */ li r4, 9 -/* 800C3C5C 4B FF F1 49 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C3C60 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3C64 40 82 00 0C */ bne lbl_800C3C70 -/* 800C3C68 38 60 00 00 */ li r3, 0 -/* 800C3C6C 48 00 00 B4 */ b lbl_800C3D20 -lbl_800C3C70: -/* 800C3C70 7F E3 FB 78 */ mr r3, r31 -/* 800C3C74 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3C78 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3C7C C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3C80 4B FE A1 95 */ bl setBlendMoveAnime__9daAlink_cFf -/* 800C3C84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C3C88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C3C8C 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800C3C90 60 00 08 00 */ ori r0, r0, 0x800 -/* 800C3C94 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800C3C98 2C 1E 00 00 */ cmpwi r30, 0 -/* 800C3C9C 41 82 00 48 */ beq lbl_800C3CE4 -/* 800C3CA0 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C3CA4 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C3CA8 A8 83 00 14 */ lha r4, 0x14(r3) -/* 800C3CAC 54 83 10 3A */ slwi r3, r4, 2 -/* 800C3CB0 38 03 4A 56 */ addi r0, r3, 0x4a56 -/* 800C3CB4 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C3CB8 54 80 08 3C */ slwi r0, r4, 1 -/* 800C3CBC B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800C3CC0 38 00 00 02 */ li r0, 2 -/* 800C3CC4 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 800C3CC8 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800C3CCC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C3CD0 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 800C3CD4 C0 02 92 98 */ lfs f0, lit_5943(r2) -/* 800C3CD8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C3CDC D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C3CE0 48 00 00 24 */ b lbl_800C3D04 -lbl_800C3CE4: -/* 800C3CE4 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C3CE8 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C3CEC A8 63 00 14 */ lha r3, 0x14(r3) -/* 800C3CF0 54 60 08 3C */ slwi r0, r3, 1 -/* 800C3CF4 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C3CF8 B0 7F 30 10 */ sth r3, 0x3010(r31) -/* 800C3CFC 38 00 00 03 */ li r0, 3 -/* 800C3D00 B0 1F 30 0A */ sth r0, 0x300a(r31) -lbl_800C3D04: -/* 800C3D04 3C 60 80 39 */ lis r3, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C3D08 38 63 D6 BC */ addi r3, r3, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C3D0C A8 63 00 14 */ lha r3, 0x14(r3) -/* 800C3D10 54 60 08 3C */ slwi r0, r3, 1 -/* 800C3D14 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C3D18 B0 7F 30 10 */ sth r3, 0x3010(r31) -/* 800C3D1C 38 60 00 01 */ li r3, 1 -lbl_800C3D20: -/* 800C3D20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3D24 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C3D28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3D2C 7C 08 03 A6 */ mtlr r0 -/* 800C3D30 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3D34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMoveTurn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMoveTurn__9daAlink_cFv.s deleted file mode 100644 index 9a880f9344..0000000000 --- a/asm/d/a/d_a_alink/procMoveTurn__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800C3D38: -/* 800C3D38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3D3C 7C 08 02 A6 */ mflr r0 -/* 800C3D40 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3D44 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3D48 7C 7F 1B 78 */ mr r31, r3 -/* 800C3D4C 4B FF 02 89 */ bl setSpeedAndAngleNormal__9daAlink_cFv -/* 800C3D50 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 800C3D54 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800C3D58 A8 BF 30 0A */ lha r5, 0x300a(r31) -/* 800C3D5C A8 DF 30 0E */ lha r6, 0x300e(r31) -/* 800C3D60 A8 FF 30 10 */ lha r7, 0x3010(r31) -/* 800C3D64 48 1A C7 DD */ bl cLib_addCalcAngleS__FPsssss -/* 800C3D68 7F E3 FB 78 */ mr r3, r31 -/* 800C3D6C 38 80 00 00 */ li r4, 0 -/* 800C3D70 4B FF 63 61 */ bl checkNextAction__9daAlink_cFi -/* 800C3D74 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3D78 40 82 00 10 */ bne lbl_800C3D88 -/* 800C3D7C 7F E3 FB 78 */ mr r3, r31 -/* 800C3D80 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C3D84 4B FE A0 91 */ bl setBlendMoveAnime__9daAlink_cFf -lbl_800C3D88: -/* 800C3D88 38 60 00 01 */ li r3, 1 -/* 800C3D8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3D90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3D94 7C 08 03 A6 */ mtlr r0 -/* 800C3D98 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3D9C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procServiceWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procServiceWaitInit__9daAlink_cFv.s deleted file mode 100644 index de0134c113..0000000000 --- a/asm/d/a/d_a_alink/procServiceWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_800C3098: -/* 800C3098 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C309C 7C 08 02 A6 */ mflr r0 -/* 800C30A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C30A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C30A8 7C 7F 1B 78 */ mr r31, r3 -/* 800C30AC 38 80 00 01 */ li r4, 1 -/* 800C30B0 4B FF EE BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C30B4 7F E3 FB 78 */ mr r3, r31 -/* 800C30B8 38 80 00 90 */ li r4, 0x90 -/* 800C30BC 4B FE 9E C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800C30C0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C30C4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C30C8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C30CC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C30D0 38 00 00 04 */ li r0, 4 -/* 800C30D4 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800C30D8 38 60 00 01 */ li r3, 1 -/* 800C30DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C30E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C30E4 7C 08 03 A6 */ mtlr r0 -/* 800C30E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C30EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procServiceWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procServiceWait__9daAlink_cFv.s deleted file mode 100644 index d9aa6a3c33..0000000000 --- a/asm/d/a/d_a_alink/procServiceWait__9daAlink_cFv.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_800C30F0: -/* 800C30F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C30F4 7C 08 02 A6 */ mflr r0 -/* 800C30F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C30FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3100 93 C1 00 08 */ stw r30, 8(r1) -/* 800C3104 7C 7E 1B 78 */ mr r30, r3 -/* 800C3108 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C310C 38 80 00 00 */ li r4, 0 -/* 800C3110 4B FF 6F C1 */ bl checkNextAction__9daAlink_cFi -/* 800C3114 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3118 40 82 00 58 */ bne lbl_800C3170 -/* 800C311C 7F C3 F3 78 */ mr r3, r30 -/* 800C3120 4B FF 39 11 */ bl checkFrontWallTypeAction__9daAlink_cFv -/* 800C3124 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3128 40 82 00 48 */ bne lbl_800C3170 -/* 800C312C 7F C3 F3 78 */ mr r3, r30 -/* 800C3130 48 05 2A F1 */ bl checkEventRun__9daAlink_cCFv -/* 800C3134 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3138 40 82 00 24 */ bne lbl_800C315C -/* 800C313C 7F C3 F3 78 */ mr r3, r30 -/* 800C3140 48 01 95 39 */ bl checkGuardActionChange__9daAlink_cFv -/* 800C3144 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3148 40 82 00 14 */ bne lbl_800C315C -/* 800C314C A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800C3150 A8 1E 2F E6 */ lha r0, 0x2fe6(r30) -/* 800C3154 7C 03 00 00 */ cmpw r3, r0 -/* 800C3158 41 82 00 18 */ beq lbl_800C3170 -lbl_800C315C: -/* 800C315C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C3160 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 800C3164 7F C3 F3 78 */ mr r3, r30 -/* 800C3168 48 00 02 51 */ bl procWaitInit__9daAlink_cFv -/* 800C316C 48 00 00 9C */ b lbl_800C3208 -lbl_800C3170: -/* 800C3170 7F E3 FB 78 */ mr r3, r31 -/* 800C3174 C0 22 93 B4 */ lfs f1, lit_10040(r2) -/* 800C3178 48 26 52 B5 */ bl checkPass__12J3DFrameCtrlFf -/* 800C317C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3180 41 82 00 24 */ beq lbl_800C31A4 -/* 800C3184 7F C3 F3 78 */ mr r3, r30 -/* 800C3188 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001005D@ha */ -/* 800C318C 38 84 00 5D */ addi r4, r4, 0x005D /* 0x0001005D@l */ -/* 800C3190 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C3194 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C3198 7D 89 03 A6 */ mtctr r12 -/* 800C319C 4E 80 04 21 */ bctrl -/* 800C31A0 48 00 00 68 */ b lbl_800C3208 -lbl_800C31A4: -/* 800C31A4 7F E3 FB 78 */ mr r3, r31 -/* 800C31A8 C0 22 93 E0 */ lfs f1, lit_11673(r2) -/* 800C31AC 48 26 52 81 */ bl checkPass__12J3DFrameCtrlFf -/* 800C31B0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C31B4 41 82 00 24 */ beq lbl_800C31D8 -/* 800C31B8 7F C3 F3 78 */ mr r3, r30 -/* 800C31BC 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001005E@ha */ -/* 800C31C0 38 84 00 5E */ addi r4, r4, 0x005E /* 0x0001005E@l */ -/* 800C31C4 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C31C8 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C31CC 7D 89 03 A6 */ mtctr r12 -/* 800C31D0 4E 80 04 21 */ bctrl -/* 800C31D4 48 00 00 34 */ b lbl_800C3208 -lbl_800C31D8: -/* 800C31D8 7F E3 FB 78 */ mr r3, r31 -/* 800C31DC C0 22 95 98 */ lfs f1, lit_25684(r2) -/* 800C31E0 48 26 52 4D */ bl checkPass__12J3DFrameCtrlFf -/* 800C31E4 2C 03 00 00 */ cmpwi r3, 0 -/* 800C31E8 41 82 00 20 */ beq lbl_800C3208 -/* 800C31EC 7F C3 F3 78 */ mr r3, r30 -/* 800C31F0 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001005F@ha */ -/* 800C31F4 38 84 00 5F */ addi r4, r4, 0x005F /* 0x0001005F@l */ -/* 800C31F8 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 800C31FC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C3200 7D 89 03 A6 */ mtctr r12 -/* 800C3204 4E 80 04 21 */ bctrl -lbl_800C3208: -/* 800C3208 38 60 00 01 */ li r3, 1 -/* 800C320C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3210 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C3214 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3218 7C 08 03 A6 */ mtlr r0 -/* 800C321C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3220 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSideStepInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procSideStepInit__9daAlink_cFi.s deleted file mode 100644 index 60906a4ca4..0000000000 --- a/asm/d/a/d_a_alink/procSideStepInit__9daAlink_cFi.s +++ /dev/null @@ -1,121 +0,0 @@ -lbl_800C3DA0: -/* 800C3DA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3DA4 7C 08 02 A6 */ mflr r0 -/* 800C3DA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3DAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3DB0 93 C1 00 08 */ stw r30, 8(r1) -/* 800C3DB4 7C 7F 1B 78 */ mr r31, r3 -/* 800C3DB8 7C 9E 23 78 */ mr r30, r4 -/* 800C3DBC 2C 1E 00 01 */ cmpwi r30, 1 -/* 800C3DC0 40 82 00 64 */ bne lbl_800C3E24 -/* 800C3DC4 38 80 00 01 */ li r4, 1 -/* 800C3DC8 38 A0 00 01 */ li r5, 1 -/* 800C3DCC 4B FF 76 ED */ bl checkHeavyStateOn__9daAlink_cFii -/* 800C3DD0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3DD4 40 82 00 50 */ bne lbl_800C3E24 -/* 800C3DD8 7F E3 FB 78 */ mr r3, r31 -/* 800C3DDC 4B FF 54 79 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800C3DE0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3DE4 40 82 00 30 */ bne lbl_800C3E14 -/* 800C3DE8 7F E3 FB 78 */ mr r3, r31 -/* 800C3DEC 4B FF 55 55 */ bl checkEquipAnime__9daAlink_cCFv -/* 800C3DF0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3DF4 40 82 00 20 */ bne lbl_800C3E14 -/* 800C3DF8 88 1F 2F CC */ lbz r0, 0x2fcc(r31) -/* 800C3DFC 28 00 00 00 */ cmplwi r0, 0 -/* 800C3E00 41 82 00 24 */ beq lbl_800C3E24 -/* 800C3E04 7F E3 FB 78 */ mr r3, r31 -/* 800C3E08 48 01 8F E9 */ bl checkUpperGuardAnime__9daAlink_cCFv -/* 800C3E0C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3E10 41 82 00 14 */ beq lbl_800C3E24 -lbl_800C3E14: -/* 800C3E14 7F E3 FB 78 */ mr r3, r31 -/* 800C3E18 38 80 00 00 */ li r4, 0 -/* 800C3E1C 48 00 19 89 */ bl procBackJumpInit__9daAlink_cFi -/* 800C3E20 48 00 01 28 */ b lbl_800C3F48 -lbl_800C3E24: -/* 800C3E24 7F E3 FB 78 */ mr r3, r31 -/* 800C3E28 38 80 00 0A */ li r4, 0xa -/* 800C3E2C 4B FF E1 41 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C3E30 9B DF 2F 98 */ stb r30, 0x2f98(r31) -/* 800C3E34 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800C3E38 28 00 00 01 */ cmplwi r0, 1 -/* 800C3E3C 40 82 00 50 */ bne lbl_800C3E8C -/* 800C3E40 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C3E44 3C 63 00 01 */ addis r3, r3, 1 -/* 800C3E48 38 03 80 00 */ addi r0, r3, -32768 -/* 800C3E4C B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C3E50 7F E3 FB 78 */ mr r3, r31 -/* 800C3E54 38 80 00 21 */ li r4, 0x21 -/* 800C3E58 3C A0 80 39 */ lis r5, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C3E5C 38 A5 D8 64 */ addi r5, r5, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C3E60 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C3E64 4B FE 92 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C3E68 3C 60 80 39 */ lis r3, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C3E6C 38 63 D8 64 */ addi r3, r3, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C3E70 C0 03 00 58 */ lfs f0, 0x58(r3) -/* 800C3E74 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C3E78 C0 03 00 5C */ lfs f0, 0x5c(r3) -/* 800C3E7C D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800C3E80 38 00 00 00 */ li r0, 0 -/* 800C3E84 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 800C3E88 48 00 00 60 */ b lbl_800C3EE8 -lbl_800C3E8C: -/* 800C3E8C 28 00 00 02 */ cmplwi r0, 2 -/* 800C3E90 40 82 00 18 */ bne lbl_800C3EA8 -/* 800C3E94 38 80 00 1D */ li r4, 0x1d -/* 800C3E98 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C3E9C 38 03 40 00 */ addi r0, r3, 0x4000 -/* 800C3EA0 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C3EA4 48 00 00 14 */ b lbl_800C3EB8 -lbl_800C3EA8: -/* 800C3EA8 38 80 00 1E */ li r4, 0x1e -/* 800C3EAC A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C3EB0 38 03 C0 00 */ addi r0, r3, -16384 -/* 800C3EB4 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_800C3EB8: -/* 800C3EB8 7F E3 FB 78 */ mr r3, r31 -/* 800C3EBC 3C A0 80 39 */ lis r5, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C3EC0 38 A5 D8 64 */ addi r5, r5, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C3EC4 4B FE 92 31 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C3EC8 3C 60 80 39 */ lis r3, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C3ECC 38 63 D8 64 */ addi r3, r3, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C3ED0 C0 03 00 50 */ lfs f0, 0x50(r3) -/* 800C3ED4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C3ED8 C0 03 00 54 */ lfs f0, 0x54(r3) -/* 800C3EDC D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 800C3EE0 38 00 00 01 */ li r0, 1 -/* 800C3EE4 B0 1F 30 0A */ sth r0, 0x300a(r31) -lbl_800C3EE8: -/* 800C3EE8 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800C3EEC 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800C3EF0 41 82 00 2C */ beq lbl_800C3F1C -/* 800C3EF4 C0 3F 33 98 */ lfs f1, 0x3398(r31) -/* 800C3EF8 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800C3EFC 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800C3F00 C0 03 00 3C */ lfs f0, 0x3c(r3) -/* 800C3F04 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C3F08 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C3F0C C0 3F 04 FC */ lfs f1, 0x4fc(r31) -/* 800C3F10 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800C3F14 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C3F18 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -lbl_800C3F1C: -/* 800C3F1C 7F E3 FB 78 */ mr r3, r31 -/* 800C3F20 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010005@ha */ -/* 800C3F24 38 84 00 05 */ addi r4, r4, 0x0005 /* 0x00010005@l */ -/* 800C3F28 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800C3F2C 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800C3F30 7D 89 03 A6 */ mtctr r12 -/* 800C3F34 4E 80 04 21 */ bctrl -/* 800C3F38 38 00 00 00 */ li r0, 0 -/* 800C3F3C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C3F40 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C3F44 38 60 00 01 */ li r3, 1 -lbl_800C3F48: -/* 800C3F48 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3F4C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C3F50 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3F54 7C 08 03 A6 */ mtlr r0 -/* 800C3F58 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3F5C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSideStepLandInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSideStepLandInit__9daAlink_cFv.s deleted file mode 100644 index dd03d04e78..0000000000 --- a/asm/d/a/d_a_alink/procSideStepLandInit__9daAlink_cFv.s +++ /dev/null @@ -1,103 +0,0 @@ -lbl_800C40F0: -/* 800C40F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C40F4 7C 08 02 A6 */ mflr r0 -/* 800C40F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C40FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C4100 93 C1 00 08 */ stw r30, 8(r1) -/* 800C4104 7C 7F 1B 78 */ mr r31, r3 -/* 800C4108 38 80 00 0B */ li r4, 0xb -/* 800C410C 4B FF DE 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C4110 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800C4114 28 00 00 01 */ cmplwi r0, 1 -/* 800C4118 40 82 00 54 */ bne lbl_800C416C -/* 800C411C 38 00 00 04 */ li r0, 4 -/* 800C4120 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C4124 7F E3 FB 78 */ mr r3, r31 -/* 800C4128 38 80 00 22 */ li r4, 0x22 -/* 800C412C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C4130 38 A5 D8 64 */ addi r5, r5, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C4134 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C4138 4B FE 8F BD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C413C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C4140 38 63 D8 64 */ addi r3, r3, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C4144 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 800C4148 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800C414C 38 00 00 02 */ li r0, 2 -/* 800C4150 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800C4154 38 00 00 00 */ li r0, 0 -/* 800C4158 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 800C415C 98 1F 2F B0 */ stb r0, 0x2fb0(r31) -/* 800C4160 38 00 00 0A */ li r0, 0xa -/* 800C4164 98 1F 2F CC */ stb r0, 0x2fcc(r31) -/* 800C4168 48 00 00 B4 */ b lbl_800C421C -lbl_800C416C: -/* 800C416C 28 00 00 02 */ cmplwi r0, 2 -/* 800C4170 40 82 00 10 */ bne lbl_800C4180 -/* 800C4174 38 80 00 1F */ li r4, 0x1f -/* 800C4178 3B C0 00 3F */ li r30, 0x3f -/* 800C417C 48 00 00 0C */ b lbl_800C4188 -lbl_800C4180: -/* 800C4180 38 80 00 20 */ li r4, 0x20 -/* 800C4184 3B C0 00 40 */ li r30, 0x40 -lbl_800C4188: -/* 800C4188 7F E3 FB 78 */ mr r3, r31 -/* 800C418C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C4190 38 A5 D8 64 */ addi r5, r5, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C4194 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C4198 4B FE 8F 5D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C419C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C41A0 38 63 D8 64 */ addi r3, r3, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C41A4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800C41A8 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800C41AC 38 00 00 01 */ li r0, 1 -/* 800C41B0 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 800C41B4 38 00 00 08 */ li r0, 8 -/* 800C41B8 98 1F 2F B0 */ stb r0, 0x2fb0(r31) -/* 800C41BC 38 00 00 00 */ li r0, 0 -/* 800C41C0 98 1F 2F CC */ stb r0, 0x2fcc(r31) -/* 800C41C4 80 7F 27 EC */ lwz r3, 0x27ec(r31) -/* 800C41C8 48 01 83 81 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c -/* 800C41CC 2C 03 00 00 */ cmpwi r3, 0 -/* 800C41D0 41 82 00 4C */ beq lbl_800C421C -/* 800C41D4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800C41D8 28 00 01 03 */ cmplwi r0, 0x103 -/* 800C41DC 40 82 00 40 */ bne lbl_800C421C -/* 800C41E0 7F E3 FB 78 */ mr r3, r31 -/* 800C41E4 4B FF 50 71 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800C41E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C41EC 41 82 00 30 */ beq lbl_800C421C -/* 800C41F0 7F E3 FB 78 */ mr r3, r31 -/* 800C41F4 7F C4 F3 78 */ mr r4, r30 -/* 800C41F8 3C A0 80 39 */ lis r5, m__21daAlinkHIO_atnMove_c0@ha /* 0x8038D714@ha */ -/* 800C41FC 38 A5 D7 14 */ addi r5, r5, m__21daAlinkHIO_atnMove_c0@l /* 0x8038D714@l */ -/* 800C4200 C0 25 00 08 */ lfs f1, 8(r5) -/* 800C4204 C0 42 92 BC */ lfs f2, lit_6041(r2) -/* 800C4208 4B FE 91 A1 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800C420C 7F E3 FB 78 */ mr r3, r31 -/* 800C4210 3C 80 00 02 */ lis r4, 0x0002 /* 0x000200A5@ha */ -/* 800C4214 38 84 00 A5 */ addi r4, r4, 0x00A5 /* 0x000200A5@l */ -/* 800C4218 4B FF AE D5 */ bl seStartSwordCut__9daAlink_cFUl -lbl_800C421C: -/* 800C421C 38 00 00 04 */ li r0, 4 -/* 800C4220 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C4224 7F E3 FB 78 */ mr r3, r31 -/* 800C4228 38 80 00 02 */ li r4, 2 -/* 800C422C 48 05 CF 95 */ bl setFootEffectProcType__9daAlink_cFi -/* 800C4230 80 1F 05 84 */ lwz r0, 0x584(r31) -/* 800C4234 60 00 00 30 */ ori r0, r0, 0x30 -/* 800C4238 90 1F 05 84 */ stw r0, 0x584(r31) -/* 800C423C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C4240 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C4244 38 00 00 00 */ li r0, 0 -/* 800C4248 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C424C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C4250 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C4254 7F E3 FB 78 */ mr r3, r31 -/* 800C4258 4B FF 1A 0D */ bl setStepLandVibration__9daAlink_cFv -/* 800C425C 38 60 00 01 */ li r3, 1 -/* 800C4260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4264 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C4268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C426C 7C 08 03 A6 */ mtlr r0 -/* 800C4270 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4274 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSideStepLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSideStepLand__9daAlink_cFv.s deleted file mode 100644 index a613fd1eb6..0000000000 --- a/asm/d/a/d_a_alink/procSideStepLand__9daAlink_cFv.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_800C4278: -/* 800C4278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C427C 7C 08 02 A6 */ mflr r0 -/* 800C4280 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C4284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C4288 93 C1 00 08 */ stw r30, 8(r1) -/* 800C428C 7C 7E 1B 78 */ mr r30, r3 -/* 800C4290 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C4294 80 03 05 88 */ lwz r0, 0x588(r3) -/* 800C4298 64 00 08 00 */ oris r0, r0, 0x800 -/* 800C429C 90 03 05 88 */ stw r0, 0x588(r3) -/* 800C42A0 88 03 2F CC */ lbz r0, 0x2fcc(r3) -/* 800C42A4 28 00 00 00 */ cmplwi r0, 0 -/* 800C42A8 41 82 00 0C */ beq lbl_800C42B4 -/* 800C42AC 38 00 00 0A */ li r0, 0xa -/* 800C42B0 98 1E 2F CC */ stb r0, 0x2fcc(r30) -lbl_800C42B4: -/* 800C42B4 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) -/* 800C42B8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800C42BC 41 82 00 18 */ beq lbl_800C42D4 -/* 800C42C0 A8 1E 30 0A */ lha r0, 0x300a(r30) -/* 800C42C4 2C 00 00 00 */ cmpwi r0, 0 -/* 800C42C8 41 82 00 0C */ beq lbl_800C42D4 -/* 800C42CC 38 00 00 01 */ li r0, 1 -/* 800C42D0 B0 1E 30 0C */ sth r0, 0x300c(r30) -lbl_800C42D4: -/* 800C42D4 7F E3 FB 78 */ mr r3, r31 -/* 800C42D8 48 09 A1 F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C42DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C42E0 41 82 00 38 */ beq lbl_800C4318 -/* 800C42E4 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800C42E8 28 00 00 10 */ cmplwi r0, 0x10 -/* 800C42EC 40 82 00 1C */ bne lbl_800C4308 -/* 800C42F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C42F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C42F8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800C42FC 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800C4300 4B F8 3E 7D */ bl cutEnd__16dEvent_manager_cFi -/* 800C4304 48 00 00 58 */ b lbl_800C435C -lbl_800C4308: -/* 800C4308 7F C3 F3 78 */ mr r3, r30 -/* 800C430C 38 80 00 00 */ li r4, 0 -/* 800C4310 4B FF 5D C1 */ bl checkNextAction__9daAlink_cFi -/* 800C4314 48 00 00 48 */ b lbl_800C435C -lbl_800C4318: -/* 800C4318 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800C431C C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 800C4320 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C4324 40 81 00 38 */ ble lbl_800C435C -/* 800C4328 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 800C432C 2C 00 00 00 */ cmpwi r0, 0 -/* 800C4330 41 82 00 20 */ beq lbl_800C4350 -/* 800C4334 7F C3 F3 78 */ mr r3, r30 -/* 800C4338 88 9E 2F 98 */ lbz r4, 0x2f98(r30) -/* 800C433C 4B FF 4E 0D */ bl checkSideRollAction__9daAlink_cFi -/* 800C4340 2C 03 00 00 */ cmpwi r3, 0 -/* 800C4344 41 82 00 0C */ beq lbl_800C4350 -/* 800C4348 38 60 00 01 */ li r3, 1 -/* 800C434C 48 00 00 14 */ b lbl_800C4360 -lbl_800C4350: -/* 800C4350 7F C3 F3 78 */ mr r3, r30 -/* 800C4354 38 80 00 01 */ li r4, 1 -/* 800C4358 4B FF 5D 79 */ bl checkNextAction__9daAlink_cFi -lbl_800C435C: -/* 800C435C 38 60 00 01 */ li r3, 1 -lbl_800C4360: -/* 800C4360 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4364 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C4368 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C436C 7C 08 03 A6 */ mtlr r0 -/* 800C4370 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4374 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSideStep__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSideStep__9daAlink_cFv.s deleted file mode 100644 index 9b7eac5929..0000000000 --- a/asm/d/a/d_a_alink/procSideStep__9daAlink_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_800C3F60: -/* 800C3F60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3F64 7C 08 02 A6 */ mflr r0 -/* 800C3F68 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3F6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3F70 7C 7F 1B 78 */ mr r31, r3 -/* 800C3F74 80 83 27 EC */ lwz r4, 0x27ec(r3) -/* 800C3F78 28 04 00 00 */ cmplwi r4, 0 -/* 800C3F7C 41 82 00 54 */ beq lbl_800C3FD0 -/* 800C3F80 A8 1F 30 0A */ lha r0, 0x300a(r31) -/* 800C3F84 2C 00 00 00 */ cmpwi r0, 0 -/* 800C3F88 41 82 00 48 */ beq lbl_800C3FD0 -/* 800C3F8C 4B F5 67 85 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c -/* 800C3F90 7C 64 1B 78 */ mr r4, r3 -/* 800C3F94 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 800C3F98 38 A0 00 05 */ li r5, 5 -/* 800C3F9C 38 C0 05 E8 */ li r6, 0x5e8 -/* 800C3FA0 38 E0 01 3C */ li r7, 0x13c -/* 800C3FA4 48 1A C5 9D */ bl cLib_addCalcAngleS__FPsssss -/* 800C3FA8 88 1F 2F 98 */ lbz r0, 0x2f98(r31) -/* 800C3FAC 28 00 00 02 */ cmplwi r0, 2 -/* 800C3FB0 40 82 00 14 */ bne lbl_800C3FC4 -/* 800C3FB4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C3FB8 38 03 40 00 */ addi r0, r3, 0x4000 -/* 800C3FBC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C3FC0 48 00 00 10 */ b lbl_800C3FD0 -lbl_800C3FC4: -/* 800C3FC4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800C3FC8 38 03 C0 00 */ addi r0, r3, -16384 -/* 800C3FCC B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_800C3FD0: -/* 800C3FD0 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) -/* 800C3FD4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800C3FD8 41 82 00 18 */ beq lbl_800C3FF0 -/* 800C3FDC A8 1F 30 0A */ lha r0, 0x300a(r31) -/* 800C3FE0 2C 00 00 00 */ cmpwi r0, 0 -/* 800C3FE4 41 82 00 0C */ beq lbl_800C3FF0 -/* 800C3FE8 38 00 00 01 */ li r0, 1 -/* 800C3FEC B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_800C3FF0: -/* 800C3FF0 7F E3 FB 78 */ mr r3, r31 -/* 800C3FF4 4B FF 34 C1 */ bl checkUpperItemActionFly__9daAlink_cFv -/* 800C3FF8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3FFC 41 82 00 0C */ beq lbl_800C4008 -/* 800C4000 38 60 00 01 */ li r3, 1 -/* 800C4004 48 00 00 D8 */ b lbl_800C40DC -lbl_800C4008: -/* 800C4008 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800C400C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800C4010 41 82 00 44 */ beq lbl_800C4054 -/* 800C4014 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800C4018 2C 00 00 00 */ cmpwi r0, 0 -/* 800C401C 41 82 00 38 */ beq lbl_800C4054 -/* 800C4020 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 800C4024 2C 00 00 00 */ cmpwi r0, 0 -/* 800C4028 41 82 00 20 */ beq lbl_800C4048 -/* 800C402C 7F E3 FB 78 */ mr r3, r31 -/* 800C4030 88 9F 2F 98 */ lbz r4, 0x2f98(r31) -/* 800C4034 4B FF 51 15 */ bl checkSideRollAction__9daAlink_cFi -/* 800C4038 2C 03 00 00 */ cmpwi r3, 0 -/* 800C403C 41 82 00 0C */ beq lbl_800C4048 -/* 800C4040 38 60 00 01 */ li r3, 1 -/* 800C4044 48 00 00 98 */ b lbl_800C40DC -lbl_800C4048: -/* 800C4048 7F E3 FB 78 */ mr r3, r31 -/* 800C404C 48 00 00 A5 */ bl procSideStepLandInit__9daAlink_cFv -/* 800C4050 48 00 00 8C */ b lbl_800C40DC -lbl_800C4054: -/* 800C4054 7F E3 FB 78 */ mr r3, r31 -/* 800C4058 4B FF 51 FD */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800C405C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C4060 41 82 00 28 */ beq lbl_800C4088 -/* 800C4064 7F E3 FB 78 */ mr r3, r31 -/* 800C4068 48 00 E0 4D */ bl checkForceSwordSwing__9daAlink_cFv -/* 800C406C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C4070 41 82 00 18 */ beq lbl_800C4088 -/* 800C4074 7F E3 FB 78 */ mr r3, r31 -/* 800C4078 38 80 00 01 */ li r4, 1 -/* 800C407C 38 A0 00 00 */ li r5, 0 -/* 800C4080 48 00 DD 9D */ bl setCutDash__9daAlink_cFii -/* 800C4084 48 00 00 44 */ b lbl_800C40C8 -lbl_800C4088: -/* 800C4088 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800C408C 28 00 00 10 */ cmplwi r0, 0x10 -/* 800C4090 41 82 00 38 */ beq lbl_800C40C8 -/* 800C4094 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) -/* 800C4098 C0 3F 34 FC */ lfs f1, 0x34fc(r31) -/* 800C409C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_sideStep_c0@ha /* 0x8038D864@ha */ -/* 800C40A0 38 A3 D8 64 */ addi r5, r3, m__22daAlinkHIO_sideStep_c0@l /* 0x8038D864@l */ -/* 800C40A4 C0 05 00 60 */ lfs f0, 0x60(r5) -/* 800C40A8 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800C40AC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800C40B0 40 80 00 18 */ bge lbl_800C40C8 -/* 800C40B4 7F E3 FB 78 */ mr r3, r31 -/* 800C40B8 38 80 00 02 */ li r4, 2 -/* 800C40BC C0 25 00 64 */ lfs f1, 0x64(r5) -/* 800C40C0 48 00 29 89 */ bl procFallInit__9daAlink_cFif -/* 800C40C4 48 00 00 18 */ b lbl_800C40DC -lbl_800C40C8: -/* 800C40C8 38 00 00 01 */ li r0, 1 -/* 800C40CC B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C40D0 7F E3 FB 78 */ mr r3, r31 -/* 800C40D4 4B FF 58 79 */ bl checkItemChangeFromButton__9daAlink_cFv -/* 800C40D8 38 60 00 01 */ li r3, 1 -lbl_800C40DC: -/* 800C40DC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C40E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C40E4 7C 08 03 A6 */ mtlr r0 -/* 800C40E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C40EC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSlideInit__9daAlink_cFs.s b/asm/d/a/d_a_alink/procSlideInit__9daAlink_cFs.s deleted file mode 100644 index d650d33d2b..0000000000 --- a/asm/d/a/d_a_alink/procSlideInit__9daAlink_cFs.s +++ /dev/null @@ -1,109 +0,0 @@ -lbl_800C4378: -/* 800C4378 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C437C 7C 08 02 A6 */ mflr r0 -/* 800C4380 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C4384 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C4388 93 C1 00 08 */ stw r30, 8(r1) -/* 800C438C 7C 7F 1B 78 */ mr r31, r3 -/* 800C4390 7C 9E 23 78 */ mr r30, r4 -/* 800C4394 38 80 00 0C */ li r4, 0xc -/* 800C4398 4B FF DB D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C439C 38 00 00 FF */ li r0, 0xff -/* 800C43A0 98 1F 08 28 */ stb r0, 0x828(r31) -/* 800C43A4 38 00 00 08 */ li r0, 8 -/* 800C43A8 B0 1F 30 90 */ sth r0, 0x3090(r31) -/* 800C43AC B3 DF 04 DE */ sth r30, 0x4de(r31) -/* 800C43B0 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800C43B4 38 80 00 00 */ li r4, 0 -/* 800C43B8 4B FD DE 29 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi -/* 800C43BC 7C 60 07 34 */ extsh r0, r3 -/* 800C43C0 2C 00 00 D4 */ cmpwi r0, 0xd4 -/* 800C43C4 40 82 00 10 */ bne lbl_800C43D4 -/* 800C43C8 38 00 00 01 */ li r0, 1 -/* 800C43CC B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C43D0 48 00 00 0C */ b lbl_800C43DC -lbl_800C43D4: -/* 800C43D4 38 00 00 00 */ li r0, 0 -/* 800C43D8 B0 1F 30 0E */ sth r0, 0x300e(r31) -lbl_800C43DC: -/* 800C43DC 7F C3 F3 78 */ mr r3, r30 -/* 800C43E0 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800C43E4 48 1A CA 41 */ bl cLib_distanceAngleS__Fss -/* 800C43E8 2C 03 38 00 */ cmpwi r3, 0x3800 -/* 800C43EC 41 80 00 10 */ blt lbl_800C43FC -/* 800C43F0 A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 800C43F4 2C 00 00 00 */ cmpwi r0, 0 -/* 800C43F8 41 82 00 94 */ beq lbl_800C448C -lbl_800C43FC: -/* 800C43FC 38 00 00 01 */ li r0, 1 -/* 800C4400 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 800C4404 7F E3 FB 78 */ mr r3, r31 -/* 800C4408 38 80 00 BD */ li r4, 0xbd -/* 800C440C 3C A0 80 39 */ lis r5, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C4410 38 A5 D8 CC */ addi r5, r5, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C4414 4B FE 8C E1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C4418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C441C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C4420 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 800C4424 60 00 01 00 */ ori r0, r0, 0x100 -/* 800C4428 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 800C442C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C4430 60 00 80 00 */ ori r0, r0, 0x8000 -/* 800C4434 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800C4438 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C443C 64 00 02 00 */ oris r0, r0, 0x200 -/* 800C4440 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800C4444 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800C4448 64 00 20 00 */ oris r0, r0, 0x2000 -/* 800C444C 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 800C4450 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C4454 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800C4458 38 00 00 04 */ li r0, 4 -/* 800C445C 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C4460 7F E3 FB 78 */ mr r3, r31 -/* 800C4464 38 80 00 CE */ li r4, 0xce -/* 800C4468 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 800C446C 4B FE 8F 09 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf -/* 800C4470 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 800C4474 64 00 10 00 */ oris r0, r0, 0x1000 -/* 800C4478 90 1F 05 74 */ stw r0, 0x574(r31) -/* 800C447C 7F E3 FB 78 */ mr r3, r31 -/* 800C4480 38 80 00 00 */ li r4, 0 -/* 800C4484 48 05 CD 3D */ bl setFootEffectProcType__9daAlink_cFi -/* 800C4488 48 00 00 4C */ b lbl_800C44D4 -lbl_800C448C: -/* 800C448C 38 00 00 00 */ li r0, 0 -/* 800C4490 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 800C4494 7F E3 FB 78 */ mr r3, r31 -/* 800C4498 38 80 00 BE */ li r4, 0xbe -/* 800C449C 3C A0 80 39 */ lis r5, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C44A0 38 A5 D8 CC */ addi r5, r5, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C44A4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C44A8 4B FE 8C 4D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C44AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C44B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C44B4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) -/* 800C44B8 60 00 02 00 */ ori r0, r0, 0x200 -/* 800C44BC 90 03 5F 1C */ stw r0, 0x5f1c(r3) -/* 800C44C0 38 00 00 60 */ li r0, 0x60 -/* 800C44C4 98 1F 2F 9D */ stb r0, 0x2f9d(r31) -/* 800C44C8 7F E3 FB 78 */ mr r3, r31 -/* 800C44CC 38 80 00 01 */ li r4, 1 -/* 800C44D0 48 05 CC F1 */ bl setFootEffectProcType__9daAlink_cFi -lbl_800C44D4: -/* 800C44D4 3C 60 80 39 */ lis r3, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C44D8 38 63 D8 CC */ addi r3, r3, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C44DC C0 03 00 50 */ lfs f0, 0x50(r3) -/* 800C44E0 D0 1F 05 94 */ stfs f0, 0x594(r31) -/* 800C44E4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C44E8 D0 1F 33 CC */ stfs f0, 0x33cc(r31) -/* 800C44EC 38 00 00 00 */ li r0, 0 -/* 800C44F0 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800C44F4 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 800C44F8 38 60 00 01 */ li r3, 1 -/* 800C44FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4500 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C4504 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C4508 7C 08 03 A6 */ mtlr r0 -/* 800C450C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4510 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSlideLandInit__9daAlink_cFi.s b/asm/d/a/d_a_alink/procSlideLandInit__9daAlink_cFi.s deleted file mode 100644 index 29b29d7e67..0000000000 --- a/asm/d/a/d_a_alink/procSlideLandInit__9daAlink_cFi.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_800C47AC: -/* 800C47AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C47B0 7C 08 02 A6 */ mflr r0 -/* 800C47B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C47B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C47BC 93 C1 00 08 */ stw r30, 8(r1) -/* 800C47C0 7C 7E 1B 78 */ mr r30, r3 -/* 800C47C4 7C 9F 23 78 */ mr r31, r4 -/* 800C47C8 38 80 00 0D */ li r4, 0xd -/* 800C47CC 4B FF D7 A1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C47D0 2C 1F 00 00 */ cmpwi r31, 0 -/* 800C47D4 41 82 00 5C */ beq lbl_800C4830 -/* 800C47D8 7F C3 F3 78 */ mr r3, r30 -/* 800C47DC 38 80 00 BF */ li r4, 0xbf -/* 800C47E0 3C A0 80 39 */ lis r5, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C47E4 38 A5 D8 CC */ addi r5, r5, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C47E8 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C47EC 4B FE 89 09 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C47F0 3C 60 80 39 */ lis r3, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C47F4 38 63 D8 CC */ addi r3, r3, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C47F8 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 800C47FC D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800C4800 38 00 00 01 */ li r0, 1 -/* 800C4804 90 1E 31 98 */ stw r0, 0x3198(r30) -/* 800C4808 38 00 00 04 */ li r0, 4 -/* 800C480C 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800C4810 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 800C4814 C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 800C4818 D0 1E 35 88 */ stfs f0, 0x3588(r30) -/* 800C481C C0 03 00 04 */ lfs f0, 4(r3) -/* 800C4820 D0 1E 35 8C */ stfs f0, 0x358c(r30) -/* 800C4824 C0 03 00 08 */ lfs f0, 8(r3) -/* 800C4828 D0 1E 35 90 */ stfs f0, 0x3590(r30) -/* 800C482C 48 00 00 34 */ b lbl_800C4860 -lbl_800C4830: -/* 800C4830 7F C3 F3 78 */ mr r3, r30 -/* 800C4834 38 80 00 C0 */ li r4, 0xc0 -/* 800C4838 3C A0 80 39 */ lis r5, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C483C 38 A5 D8 CC */ addi r5, r5, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C4840 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C4844 4B FE 88 B1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 800C4848 3C 60 80 39 */ lis r3, m__19daAlinkHIO_slide_c0@ha /* 0x8038D8CC@ha */ -/* 800C484C 38 63 D8 CC */ addi r3, r3, m__19daAlinkHIO_slide_c0@l /* 0x8038D8CC@l */ -/* 800C4850 C0 03 00 4C */ lfs f0, 0x4c(r3) -/* 800C4854 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 800C4858 38 00 00 00 */ li r0, 0 -/* 800C485C 90 1E 31 98 */ stw r0, 0x3198(r30) -lbl_800C4860: -/* 800C4860 38 00 00 FF */ li r0, 0xff -/* 800C4864 98 1E 08 28 */ stb r0, 0x828(r30) -/* 800C4868 C0 3E 33 98 */ lfs f1, 0x3398(r30) -/* 800C486C C0 02 92 98 */ lfs f0, lit_5943(r2) -/* 800C4870 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800C4874 D0 1E 33 98 */ stfs f0, 0x3398(r30) -/* 800C4878 38 60 00 01 */ li r3, 1 -/* 800C487C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4880 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C4884 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C4888 7C 08 03 A6 */ mtlr r0 -/* 800C488C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4890 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSlideLand__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSlideLand__9daAlink_cFv.s deleted file mode 100644 index 28873e4569..0000000000 --- a/asm/d/a/d_a_alink/procSlideLand__9daAlink_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_800C4894: -/* 800C4894 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C4898 7C 08 02 A6 */ mflr r0 -/* 800C489C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C48A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C48A4 93 C1 00 08 */ stw r30, 8(r1) -/* 800C48A8 7C 7E 1B 78 */ mr r30, r3 -/* 800C48AC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C48B0 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800C48B4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C48B8 C0 42 93 24 */ lfs f2, lit_7450(r2) -/* 800C48BC 48 1A BE 85 */ bl cLib_chaseF__FPfff -/* 800C48C0 80 1E 31 98 */ lwz r0, 0x3198(r30) -/* 800C48C4 2C 00 00 00 */ cmpwi r0, 0 -/* 800C48C8 41 82 00 0C */ beq lbl_800C48D4 -/* 800C48CC 38 00 00 04 */ li r0, 4 -/* 800C48D0 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_800C48D4: -/* 800C48D4 7F E3 FB 78 */ mr r3, r31 -/* 800C48D8 48 09 9B F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C48DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C48E0 41 82 00 1C */ beq lbl_800C48FC -/* 800C48E4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C48E8 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C48EC 7F C3 F3 78 */ mr r3, r30 -/* 800C48F0 38 80 00 00 */ li r4, 0 -/* 800C48F4 4B FF 57 DD */ bl checkNextAction__9daAlink_cFi -/* 800C48F8 48 00 00 38 */ b lbl_800C4930 -lbl_800C48FC: -/* 800C48FC C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800C4900 C0 1E 34 78 */ lfs f0, 0x3478(r30) -/* 800C4904 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800C4908 40 81 00 28 */ ble lbl_800C4930 -/* 800C490C AB FE 04 DE */ lha r31, 0x4de(r30) -/* 800C4910 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C4914 B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C4918 7F C3 F3 78 */ mr r3, r30 -/* 800C491C 38 80 00 01 */ li r4, 1 -/* 800C4920 4B FF 57 B1 */ bl checkNextAction__9daAlink_cFi -/* 800C4924 2C 03 00 00 */ cmpwi r3, 0 -/* 800C4928 40 82 00 08 */ bne lbl_800C4930 -/* 800C492C B3 FE 04 DE */ sth r31, 0x4de(r30) -lbl_800C4930: -/* 800C4930 38 60 00 01 */ li r3, 1 -/* 800C4934 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C4938 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C493C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C4940 7C 08 03 A6 */ mtlr r0 -/* 800C4944 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C4948 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procTiredWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procTiredWait__9daAlink_cFv.s deleted file mode 100644 index 450de6f7b1..0000000000 --- a/asm/d/a/d_a_alink/procTiredWait__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800C3338: -/* 800C3338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C333C 7C 08 02 A6 */ mflr r0 -/* 800C3340 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3348 93 C1 00 08 */ stw r30, 8(r1) -/* 800C334C 7C 7E 1B 78 */ mr r30, r3 -/* 800C3350 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800C3354 38 80 00 00 */ li r4, 0 -/* 800C3358 4B FF 6D 79 */ bl checkNextAction__9daAlink_cFi -/* 800C335C 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3360 40 82 00 3C */ bne lbl_800C339C -/* 800C3364 7F E3 FB 78 */ mr r3, r31 -/* 800C3368 48 09 B1 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800C336C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800C3370 41 82 00 14 */ beq lbl_800C3384 -/* 800C3374 7F C3 F3 78 */ mr r3, r30 -/* 800C3378 38 80 00 B6 */ li r4, 0xb6 -/* 800C337C 4B FE 9C 05 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800C3380 48 00 00 1C */ b lbl_800C339C -lbl_800C3384: -/* 800C3384 88 1F 00 04 */ lbz r0, 4(r31) -/* 800C3388 28 00 00 02 */ cmplwi r0, 2 -/* 800C338C 40 82 00 10 */ bne lbl_800C339C -/* 800C3390 7F C3 F3 78 */ mr r3, r30 -/* 800C3394 7F E4 FB 78 */ mr r4, r31 -/* 800C3398 4B FE FF C1 */ bl setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c -lbl_800C339C: -/* 800C339C 38 60 00 01 */ li r3, 1 -/* 800C33A0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C33A4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C33A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C33AC 7C 08 03 A6 */ mtlr r0 -/* 800C33B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C33B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWaitTurnInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWaitTurnInit__9daAlink_cFv.s deleted file mode 100644 index ef1ae5c83a..0000000000 --- a/asm/d/a/d_a_alink/procWaitTurnInit__9daAlink_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800C3A94: -/* 800C3A94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3A98 7C 08 02 A6 */ mflr r0 -/* 800C3A9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3AA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3AA4 7C 7F 1B 78 */ mr r31, r3 -/* 800C3AA8 38 80 00 08 */ li r4, 8 -/* 800C3AAC 4B FF F2 F9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800C3AB0 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3AB4 40 82 00 0C */ bne lbl_800C3AC0 -/* 800C3AB8 38 60 00 00 */ li r3, 0 -/* 800C3ABC 48 00 00 4C */ b lbl_800C3B08 -lbl_800C3AC0: -/* 800C3AC0 7F E3 FB 78 */ mr r3, r31 -/* 800C3AC4 38 80 00 15 */ li r4, 0x15 -/* 800C3AC8 3C A0 80 39 */ lis r5, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800C3ACC 38 A5 D6 64 */ addi r5, r5, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800C3AD0 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800C3AD4 C0 45 00 18 */ lfs f2, 0x18(r5) -/* 800C3AD8 4B FE 95 09 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 800C3ADC 7F E3 FB 78 */ mr r3, r31 -/* 800C3AE0 48 05 21 41 */ bl checkEventRun__9daAlink_cCFv -/* 800C3AE4 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3AE8 41 82 00 0C */ beq lbl_800C3AF4 -/* 800C3AEC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800C3AF0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -lbl_800C3AF4: -/* 800C3AF4 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800C3AF8 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800C3AFC A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800C3B00 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800C3B04 38 60 00 01 */ li r3, 1 -lbl_800C3B08: -/* 800C3B08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3B0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3B10 7C 08 03 A6 */ mtlr r0 -/* 800C3B14 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3B18 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWaitTurn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWaitTurn__9daAlink_cFv.s deleted file mode 100644 index d9365a22f6..0000000000 --- a/asm/d/a/d_a_alink/procWaitTurn__9daAlink_cFv.s +++ /dev/null @@ -1,80 +0,0 @@ -lbl_800C3B1C: -/* 800C3B1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C3B20 7C 08 02 A6 */ mflr r0 -/* 800C3B24 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C3B28 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C3B2C 93 C1 00 08 */ stw r30, 8(r1) -/* 800C3B30 7C 7E 1B 78 */ mr r30, r3 -/* 800C3B34 38 7E 33 98 */ addi r3, r30, 0x3398 -/* 800C3B38 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C3B3C 3C 80 80 39 */ lis r4, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 800C3B40 38 84 D6 BC */ addi r4, r4, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 800C3B44 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800C3B48 48 1A CB F9 */ bl cLib_chaseF__FPfff -/* 800C3B4C 7F C3 F3 78 */ mr r3, r30 -/* 800C3B50 4B FF 64 01 */ bl checkGroundSpecialMode__9daAlink_cFv -/* 800C3B54 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3B58 41 82 00 0C */ beq lbl_800C3B64 -/* 800C3B5C 38 60 00 01 */ li r3, 1 -/* 800C3B60 48 00 00 C4 */ b lbl_800C3C24 -lbl_800C3B64: -/* 800C3B64 80 1E 05 88 */ lwz r0, 0x588(r30) -/* 800C3B68 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 800C3B6C 41 82 00 10 */ beq lbl_800C3B7C -/* 800C3B70 7F C3 F3 78 */ mr r3, r30 -/* 800C3B74 48 00 48 ED */ bl procFloorDownReboundInit__9daAlink_cFv -/* 800C3B78 48 00 00 AC */ b lbl_800C3C24 -lbl_800C3B7C: -/* 800C3B7C 38 7E 04 E6 */ addi r3, r30, 0x4e6 -/* 800C3B80 A8 9E 30 0E */ lha r4, 0x300e(r30) -/* 800C3B84 38 A0 00 1E */ li r5, 0x1e -/* 800C3B88 38 C0 3C DF */ li r6, 0x3cdf -/* 800C3B8C 38 E0 1F 40 */ li r7, 0x1f40 -/* 800C3B90 48 1A C9 B1 */ bl cLib_addCalcAngleS__FPsssss -/* 800C3B94 7C 7F 1B 78 */ mr r31, r3 -/* 800C3B98 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 800C3B9C B0 1E 04 DE */ sth r0, 0x4de(r30) -/* 800C3BA0 7F C3 F3 78 */ mr r3, r30 -/* 800C3BA4 4B FF 61 89 */ bl checkNextActionFromButton__9daAlink_cFv -/* 800C3BA8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3BAC 41 82 00 0C */ beq lbl_800C3BB8 -/* 800C3BB0 38 60 00 01 */ li r3, 1 -/* 800C3BB4 48 00 00 70 */ b lbl_800C3C24 -lbl_800C3BB8: -/* 800C3BB8 7F E0 07 35 */ extsh. r0, r31 -/* 800C3BBC 40 82 00 64 */ bne lbl_800C3C20 -/* 800C3BC0 7F C3 F3 78 */ mr r3, r30 -/* 800C3BC4 48 05 20 5D */ bl checkEventRun__9daAlink_cCFv -/* 800C3BC8 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3BCC 41 82 00 48 */ beq lbl_800C3C14 -/* 800C3BD0 80 1E 06 14 */ lwz r0, 0x614(r30) -/* 800C3BD4 28 00 00 05 */ cmplwi r0, 5 -/* 800C3BD8 40 82 00 1C */ bne lbl_800C3BF4 -/* 800C3BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C3BE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C3BE4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800C3BE8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800C3BEC 4B F8 45 91 */ bl cutEnd__16dEvent_manager_cFi -/* 800C3BF0 48 00 00 30 */ b lbl_800C3C20 -lbl_800C3BF4: -/* 800C3BF4 7F C3 F3 78 */ mr r3, r30 -/* 800C3BF8 38 80 00 00 */ li r4, 0 -/* 800C3BFC 4B FF 64 D5 */ bl checkNextAction__9daAlink_cFi -/* 800C3C00 2C 03 00 00 */ cmpwi r3, 0 -/* 800C3C04 40 82 00 1C */ bne lbl_800C3C20 -/* 800C3C08 7F C3 F3 78 */ mr r3, r30 -/* 800C3C0C 4B FF 1C E1 */ bl checkWaitAction__9daAlink_cFv -/* 800C3C10 48 00 00 10 */ b lbl_800C3C20 -lbl_800C3C14: -/* 800C3C14 7F C3 F3 78 */ mr r3, r30 -/* 800C3C18 38 80 00 00 */ li r4, 0 -/* 800C3C1C 4B FF 64 B5 */ bl checkNextAction__9daAlink_cFi -lbl_800C3C20: -/* 800C3C20 38 60 00 01 */ li r3, 1 -lbl_800C3C24: -/* 800C3C24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C3C28 83 C1 00 08 */ lwz r30, 8(r1) -/* 800C3C2C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C3C30 7C 08 03 A6 */ mtlr r0 -/* 800C3C34 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C3C38 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetCombo__9daAlink_cFi.s b/asm/d/a/d_a_alink/resetCombo__9daAlink_cFi.s deleted file mode 100644 index e4355a9e8f..0000000000 --- a/asm/d/a/d_a_alink/resetCombo__9daAlink_cFi.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800D1430: -/* 800D1430 38 A0 00 00 */ li r5, 0 -/* 800D1434 98 A3 05 69 */ stb r5, 0x569(r3) -/* 800D1438 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D143C 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf -/* 800D1440 90 03 05 70 */ stw r0, 0x570(r3) -/* 800D1444 2C 04 00 00 */ cmpwi r4, 0 -/* 800D1448 4D 82 00 20 */ beqlr -/* 800D144C 98 A3 2F A1 */ stb r5, 0x2fa1(r3) -/* 800D1450 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFairyEffect__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFairyEffect__9daAlink_cFv.s deleted file mode 100644 index b7773627a7..0000000000 --- a/asm/d/a/d_a_alink/resetFairyEffect__9daAlink_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80124B68: -/* 80124B68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80124B6C 7C 08 02 A6 */ mflr r0 -/* 80124B70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80124B74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80124B78 7C 7F 1B 78 */ mr r31, r3 -/* 80124B7C 80 83 32 58 */ lwz r4, 0x3258(r3) -/* 80124B80 4B FF BB F9 */ bl stopDrawParticle__9daAlink_cFUl -/* 80124B84 7F E3 FB 78 */ mr r3, r31 -/* 80124B88 80 9F 32 5C */ lwz r4, 0x325c(r31) -/* 80124B8C 4B FF BB ED */ bl stopDrawParticle__9daAlink_cFUl -/* 80124B90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80124B94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80124B98 7C 08 03 A6 */ mtlr r0 -/* 80124B9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80124BA0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetRootMtx__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetRootMtx__9daAlink_cFv.s deleted file mode 100644 index 612c24c3c1..0000000000 --- a/asm/d/a/d_a_alink/resetRootMtx__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_8009EB18: -/* 8009EB18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009EB1C 7C 08 02 A6 */ mflr r0 -/* 8009EB20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009EB24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009EB28 7C 7F 1B 78 */ mr r31, r3 -/* 8009EB2C 38 7F 2C 18 */ addi r3, r31, 0x2c18 -/* 8009EB30 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8009EB34 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8009EB38 48 2A 79 79 */ bl PSMTXCopy -/* 8009EB3C 38 00 00 00 */ li r0, 0 -/* 8009EB40 98 1F 2F 90 */ stb r0, 0x2f90(r31) -/* 8009EB44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009EB48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009EB4C 7C 08 03 A6 */ mtlr r0 -/* 8009EB50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009EB54 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/set3DStatus__9daAlink_cFUcUc.s b/asm/d/a/d_a_alink/set3DStatus__9daAlink_cFUcUc.s deleted file mode 100644 index 022a5716c0..0000000000 --- a/asm/d/a/d_a_alink/set3DStatus__9daAlink_cFUcUc.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800D0164: -/* 800D0164 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D0168 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D016C 98 83 5E 26 */ stb r4, 0x5e26(r3) -/* 800D0170 98 A3 5E 2D */ stb r5, 0x5e2d(r3) -/* 800D0174 38 00 00 00 */ li r0, 0 -/* 800D0178 98 03 5E 4B */ stb r0, 0x5e4b(r3) -/* 800D017C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setAnimeFrame__9daAlink_cFf.s b/asm/d/a/d_a_alink/setAnimeFrame__9daAlink_cFf.s deleted file mode 100644 index be2d7a0511..0000000000 --- a/asm/d/a/d_a_alink/setAnimeFrame__9daAlink_cFf.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800AC378: -/* 800AC378 D0 23 1F E0 */ stfs f1, 0x1fe0(r3) -/* 800AC37C D0 23 1F F8 */ stfs f1, 0x1ff8(r3) -/* 800AC380 D0 23 20 10 */ stfs f1, 0x2010(r3) -/* 800AC384 D0 23 20 28 */ stfs f1, 0x2028(r3) -/* 800AC388 D0 23 20 40 */ stfs f1, 0x2040(r3) -/* 800AC38C D0 23 20 58 */ stfs f1, 0x2058(r3) -/* 800AC390 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBaseTRMtx__8J3DModelFPA4_f.s b/asm/d/a/d_a_alink/setBaseTRMtx__8J3DModelFPA4_f.s deleted file mode 100644 index 94ad0388ec..0000000000 --- a/asm/d/a/d_a_alink/setBaseTRMtx__8J3DModelFPA4_f.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800CFFF4: -/* 800CFFF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800CFFF8 7C 08 02 A6 */ mflr r0 -/* 800CFFFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0000 7C 65 1B 78 */ mr r5, r3 -/* 800D0004 7C 83 23 78 */ mr r3, r4 -/* 800D0008 38 85 00 24 */ addi r4, r5, 0x24 -/* 800D000C 48 27 64 A5 */ bl PSMTXCopy -/* 800D0010 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0014 7C 08 03 A6 */ mtlr r0 -/* 800D0018 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D001C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setBoomerangCatchAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setBoomerangCatchAnime__9daAlink_cFv.s deleted file mode 100644 index 3ee5a10ebd..0000000000 --- a/asm/d/a/d_a_alink/setBoomerangCatchAnime__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800E0630: -/* 800E0630 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E0634 7C 08 02 A6 */ mflr r0 -/* 800E0638 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E063C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E0640 7C 7F 1B 78 */ mr r31, r3 -/* 800E0644 38 80 00 52 */ li r4, 0x52 -/* 800E0648 38 A0 00 02 */ li r5, 2 -/* 800E064C 3C C0 80 39 */ lis r6, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0650 38 C6 E6 C8 */ addi r6, r6, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E0654 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800E0658 4B FC D0 99 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800E065C 7F E3 FB 78 */ mr r3, r31 -/* 800E0660 38 80 00 E8 */ li r4, 0xe8 -/* 800E0664 38 A0 00 01 */ li r5, 1 -/* 800E0668 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800E066C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800E0670 4B FC EE 41 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800E0674 38 00 00 FE */ li r0, 0xfe -/* 800E0678 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800E067C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 800E0680 28 00 00 46 */ cmplwi r0, 0x46 -/* 800E0684 41 82 00 20 */ beq lbl_800E06A4 -/* 800E0688 7F E3 FB 78 */ mr r3, r31 -/* 800E068C 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002002F@ha */ -/* 800E0690 38 84 00 2F */ addi r4, r4, 0x002F /* 0x0002002F@l */ -/* 800E0694 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E0698 81 8C 01 18 */ lwz r12, 0x118(r12) -/* 800E069C 7D 89 03 A6 */ mtctr r12 -/* 800E06A0 4E 80 04 21 */ bctrl -lbl_800E06A4: -/* 800E06A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E06A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E06AC 7C 08 03 A6 */ mtlr r0 -/* 800E06B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E06B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCargoCarry__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setCargoCarry__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 3a18d75da3..0000000000 --- a/asm/d/a/d_a_alink/setCargoCarry__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D0884: -/* 800D0884 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D0888 7C 08 02 A6 */ mflr r0 -/* 800D088C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0890 38 00 00 2C */ li r0, 0x2c -/* 800D0894 98 03 05 6A */ stb r0, 0x56a(r3) -/* 800D0898 38 63 28 54 */ addi r3, r3, 0x2854 -/* 800D089C 48 08 E4 1D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800D08A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D08A4 7C 08 03 A6 */ mtlr r0 -/* 800D08A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D08AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setComboReserb__9daAlink_cFv.s b/asm/d/a/d_a_alink/setComboReserb__9daAlink_cFv.s deleted file mode 100644 index 5c64a0c9b4..0000000000 --- a/asm/d/a/d_a_alink/setComboReserb__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_800D20FC: -/* 800D20FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2100 7C 08 02 A6 */ mflr r0 -/* 800D2104 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2108 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D210C 7C 7F 1B 78 */ mr r31, r3 -/* 800D2110 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800D2114 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800D2118 41 82 00 18 */ beq lbl_800D2130 -/* 800D211C 3C 60 80 39 */ lis r3, m__22daAlinkHIO_wlAttack_c0@ha /* 0x8038F7A4@ha */ -/* 800D2120 38 63 F7 A4 */ addi r3, r3, m__22daAlinkHIO_wlAttack_c0@l /* 0x8038F7A4@l */ -/* 800D2124 A8 03 00 16 */ lha r0, 0x16(r3) -/* 800D2128 B0 1F 30 7E */ sth r0, 0x307e(r31) -/* 800D212C 48 00 00 14 */ b lbl_800D2140 -lbl_800D2130: -/* 800D2130 3C 60 80 39 */ lis r3, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 800D2134 38 63 DE 8C */ addi r3, r3, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 800D2138 A8 03 00 52 */ lha r0, 0x52(r3) -/* 800D213C B0 1F 30 7E */ sth r0, 0x307e(r31) -lbl_800D2140: -/* 800D2140 88 1F 05 69 */ lbz r0, 0x569(r31) -/* 800D2144 28 00 00 04 */ cmplwi r0, 4 -/* 800D2148 41 82 00 2C */ beq lbl_800D2174 -/* 800D214C 88 1F 2F CE */ lbz r0, 0x2fce(r31) -/* 800D2150 28 00 00 00 */ cmplwi r0, 0 -/* 800D2154 40 82 00 20 */ bne lbl_800D2174 -/* 800D2158 7F E3 FB 78 */ mr r3, r31 -/* 800D215C 4B FE 05 5D */ bl swordSwingTrigger__9daAlink_cFv -/* 800D2160 2C 03 00 00 */ cmpwi r3, 0 -/* 800D2164 41 82 00 10 */ beq lbl_800D2174 -/* 800D2168 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 800D216C 60 00 00 02 */ ori r0, r0, 2 -/* 800D2170 90 1F 05 78 */ stw r0, 0x578(r31) -lbl_800D2174: -/* 800D2174 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D2178 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D217C 7C 08 03 A6 */ mtlr r0 -/* 800D2180 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2184 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCopyRodControllAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCopyRodControllAnime__9daAlink_cFv.s deleted file mode 100644 index e9969d64e5..0000000000 --- a/asm/d/a/d_a_alink/setCopyRodControllAnime__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800E158C: -/* 800E158C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1590 7C 08 02 A6 */ mflr r0 -/* 800E1594 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1598 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E159C 7C 7F 1B 78 */ mr r31, r3 -/* 800E15A0 4B FD 7C B5 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800E15A4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E15A8 41 82 00 40 */ beq lbl_800E15E8 -/* 800E15AC 7F E3 FB 78 */ mr r3, r31 -/* 800E15B0 4B FF FD C5 */ bl getCopyRodControllActor__9daAlink_cFv -/* 800E15B4 28 03 00 00 */ cmplwi r3, 0 -/* 800E15B8 41 82 00 30 */ beq lbl_800E15E8 -/* 800E15BC 7F E3 FB 78 */ mr r3, r31 -/* 800E15C0 38 80 02 02 */ li r4, 0x202 -/* 800E15C4 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E15C8 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 800E15CC 4B FC BD DD */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff -/* 800E15D0 38 00 00 02 */ li r0, 2 -/* 800E15D4 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 800E15D8 38 00 00 05 */ li r0, 5 -/* 800E15DC 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 800E15E0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E15E4 D0 1F 33 E8 */ stfs f0, 0x33e8(r31) -lbl_800E15E8: -/* 800E15E8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E15EC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E15F0 7C 08 03 A6 */ mtlr r0 -/* 800E15F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E15F8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCopyRodModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCopyRodModel__9daAlink_cFv.s deleted file mode 100644 index de9d1f76f8..0000000000 --- a/asm/d/a/d_a_alink/setCopyRodModel__9daAlink_cFv.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_800E1748: -/* 800E1748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E174C 7C 08 02 A6 */ mflr r0 -/* 800E1750 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E1758 93 C1 00 08 */ stw r30, 8(r1) -/* 800E175C 7C 7F 1B 78 */ mr r31, r3 -/* 800E1760 4B FC 25 2D */ bl setItemHeap__9daAlink_cFv -/* 800E1764 7C 7E 1B 78 */ mr r30, r3 -/* 800E1768 7F E3 FB 78 */ mr r3, r31 -/* 800E176C 38 80 03 15 */ li r4, 0x315 -/* 800E1770 38 A0 54 00 */ li r5, 0x5400 -/* 800E1774 4B FD E6 D5 */ bl loadAramBmd__9daAlink_cFUsUl -/* 800E1778 7C 64 1B 78 */ mr r4, r3 -/* 800E177C 7F E3 FB 78 */ mr r3, r31 -/* 800E1780 3C A0 00 08 */ lis r5, 8 -/* 800E1784 3C C0 01 00 */ lis r6, 0x100 -/* 800E1788 4B FC 25 F5 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl -/* 800E178C 90 7F 07 08 */ stw r3, 0x708(r31) -/* 800E1790 7F E3 FB 78 */ mr r3, r31 -/* 800E1794 38 80 03 23 */ li r4, 0x323 -/* 800E1798 80 BF 07 08 */ lwz r5, 0x708(r31) -/* 800E179C 4B FD E7 D5 */ bl loadAramItemBrk__9daAlink_cFUsP8J3DModel -/* 800E17A0 90 7F 07 24 */ stw r3, 0x724(r31) -/* 800E17A4 7F C3 F3 78 */ mr r3, r30 -/* 800E17A8 4B F2 DA 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 800E17AC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E17B0 80 7F 07 24 */ lwz r3, 0x724(r31) -/* 800E17B4 D0 03 00 08 */ stfs f0, 8(r3) -/* 800E17B8 38 00 00 02 */ li r0, 2 -/* 800E17BC 98 1F 2F 94 */ stb r0, 0x2f94(r31) -/* 800E17C0 38 60 00 00 */ li r3, 0 -/* 800E17C4 98 7F 12 A3 */ stb r3, 0x12a3(r31) -/* 800E17C8 98 7F 12 40 */ stb r3, 0x1240(r31) -/* 800E17CC 38 00 00 14 */ li r0, 0x14 -/* 800E17D0 98 1F 12 A0 */ stb r0, 0x12a0(r31) -/* 800E17D4 38 00 00 01 */ li r0, 1 -/* 800E17D8 98 1F 12 A2 */ stb r0, 0x12a2(r31) -/* 800E17DC 80 1F 12 2C */ lwz r0, 0x122c(r31) -/* 800E17E0 60 00 00 01 */ ori r0, r0, 1 -/* 800E17E4 90 1F 12 2C */ stw r0, 0x122c(r31) -/* 800E17E8 90 7F 12 8C */ stw r3, 0x128c(r31) -/* 800E17EC 98 7F 12 A1 */ stb r3, 0x12a1(r31) -/* 800E17F0 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 800E17F4 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800E17F8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 800E17FC A0 1F 30 C0 */ lhz r0, 0x30c0(r31) -/* 800E1800 1C 00 00 30 */ mulli r0, r0, 0x30 -/* 800E1804 7C 63 02 14 */ add r3, r3, r0 -/* 800E1808 80 9F 07 08 */ lwz r4, 0x708(r31) -/* 800E180C 38 84 00 24 */ addi r4, r4, 0x24 -/* 800E1810 48 26 4C A1 */ bl PSMTXCopy -/* 800E1814 80 7F 07 08 */ lwz r3, 0x708(r31) -/* 800E1818 81 83 00 00 */ lwz r12, 0(r3) -/* 800E181C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800E1820 7D 89 03 A6 */ mtctr r12 -/* 800E1824 4E 80 04 21 */ bctrl -/* 800E1828 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E182C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E1830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1834 7C 08 03 A6 */ mtlr r0 -/* 800E1838 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E183C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCutType__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setCutType__9daAlink_cFUc.s deleted file mode 100644 index f9cdb78e13..0000000000 --- a/asm/d/a/d_a_alink/setCutType__9daAlink_cFUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D152C: -/* 800D152C 98 83 05 68 */ stb r4, 0x568(r3) -/* 800D1530 80 03 05 80 */ lwz r0, 0x580(r3) -/* 800D1534 54 00 01 46 */ rlwinm r0, r0, 0, 5, 3 -/* 800D1538 90 03 05 80 */ stw r0, 0x580(r3) -/* 800D153C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDoubleAnimeBlendRatio__9daAlink_cFf.s b/asm/d/a/d_a_alink/setDoubleAnimeBlendRatio__9daAlink_cFf.s deleted file mode 100644 index 2a6bb80f95..0000000000 --- a/asm/d/a/d_a_alink/setDoubleAnimeBlendRatio__9daAlink_cFf.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_800AC738: -/* 800AC738 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800AC73C EC 00 08 28 */ fsubs f0, f0, f1 -/* 800AC740 D0 03 1F 28 */ stfs f0, 0x1f28(r3) -/* 800AC744 D0 23 1F 30 */ stfs f1, 0x1f30(r3) -/* 800AC748 D0 03 1F 40 */ stfs f0, 0x1f40(r3) -/* 800AC74C D0 23 1F 48 */ stfs f1, 0x1f48(r3) -/* 800AC750 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz.s b/asm/d/a/d_a_alink/setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz.s deleted file mode 100644 index 24ea500fee..0000000000 --- a/asm/d/a/d_a_alink/setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_80120634: -/* 80120634 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80120638 7C 08 02 A6 */ mflr r0 -/* 8012063C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80120640 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80120644 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80120648 7C 6A 1B 78 */ mr r10, r3 -/* 8012064C 7C 9E 23 78 */ mr r30, r4 -/* 80120650 7D 09 43 78 */ mr r9, r8 -/* 80120654 38 60 00 00 */ li r3, 0 -/* 80120658 90 61 00 08 */ stw r3, 8(r1) -/* 8012065C 90 61 00 0C */ stw r3, 0xc(r1) -/* 80120660 38 00 FF FF */ li r0, -1 -/* 80120664 90 01 00 10 */ stw r0, 0x10(r1) -/* 80120668 90 61 00 14 */ stw r3, 0x14(r1) -/* 8012066C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80120670 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80120674 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80120678 80 84 00 00 */ lwz r4, 0(r4) -/* 8012067C 39 0A 01 0C */ addi r8, r10, 0x10c -/* 80120680 39 40 00 00 */ li r10, 0 -/* 80120684 4B F2 D0 21 */ bl setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz -/* 80120688 90 7E 00 00 */ stw r3, 0(r30) -/* 8012068C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 80120690 38 63 02 10 */ addi r3, r3, 0x210 -/* 80120694 80 9E 00 00 */ lwz r4, 0(r30) -/* 80120698 4B F2 B2 1D */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl -/* 8012069C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) -/* 801206A0 38 63 02 10 */ addi r3, r3, 0x210 -/* 801206A4 80 9E 00 00 */ lwz r4, 0(r30) -/* 801206A8 4B F2 B2 71 */ bl getEmitter__Q213dPa_control_c7level_cFUl -/* 801206AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 801206B0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 801206B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801206B8 7C 08 03 A6 */ mtlr r0 -/* 801206BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801206C0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFallVoice__9daAlink_cFv.s b/asm/d/a/d_a_alink/setFallVoice__9daAlink_cFv.s deleted file mode 100644 index 1a10ca85a5..0000000000 --- a/asm/d/a/d_a_alink/setFallVoice__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800B5BC0: -/* 800B5BC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B5BC4 7C 08 02 A6 */ mflr r0 -/* 800B5BC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B5BCC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B5BD0 7C 7F 1B 78 */ mr r31, r3 -/* 800B5BD4 A8 03 30 14 */ lha r0, 0x3014(r3) -/* 800B5BD8 2C 00 00 00 */ cmpwi r0, 0 -/* 800B5BDC 40 82 00 44 */ bne lbl_800B5C20 -/* 800B5BE0 C0 42 93 88 */ lfs f2, lit_8782(r2) -/* 800B5BE4 C0 3F 33 C4 */ lfs f1, 0x33c4(r31) -/* 800B5BE8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 800B5BEC EC 01 00 28 */ fsubs f0, f1, f0 -/* 800B5BF0 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800B5BF4 C0 02 93 78 */ lfs f0, lit_8676(r2) -/* 800B5BF8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B5BFC 40 81 00 24 */ ble lbl_800B5C20 -/* 800B5C00 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001000C@ha */ -/* 800B5C04 38 84 00 0C */ addi r4, r4, 0x000C /* 0x0001000C@l */ -/* 800B5C08 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800B5C0C 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800B5C10 7D 89 03 A6 */ mtctr r12 -/* 800B5C14 4E 80 04 21 */ bctrl -/* 800B5C18 38 00 00 01 */ li r0, 1 -/* 800B5C1C B0 1F 30 14 */ sth r0, 0x3014(r31) -lbl_800B5C20: -/* 800B5C20 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B5C24 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B5C28 7C 08 03 A6 */ mtlr r0 -/* 800B5C2C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B5C30 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFastShotTimer__9daAlink_cFv.s b/asm/d/a/d_a_alink/setFastShotTimer__9daAlink_cFv.s deleted file mode 100644 index 4eaa5fc267..0000000000 --- a/asm/d/a/d_a_alink/setFastShotTimer__9daAlink_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800B7168: -/* 800B7168 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B716C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B7170 80 04 5F 18 */ lwz r0, 0x5f18(r4) -/* 800B7174 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 -/* 800B7178 4C 82 00 20 */ bnelr -/* 800B717C 3C 80 80 39 */ lis r4, m__18daAlinkHIO_item_c0@ha /* 0x8038EB50@ha */ -/* 800B7180 38 84 EB 50 */ addi r4, r4, m__18daAlinkHIO_item_c0@l /* 0x8038EB50@l */ -/* 800B7184 A8 04 00 28 */ lha r0, 0x28(r4) -/* 800B7188 B0 03 30 8E */ sth r0, 0x308e(r3) -/* 800B718C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setForceGrab__9daAlink_cFP10fopAc_ac_cii.s b/asm/d/a/d_a_alink/setForceGrab__9daAlink_cFP10fopAc_ac_cii.s deleted file mode 100644 index dea78e92ad..0000000000 --- a/asm/d/a/d_a_alink/setForceGrab__9daAlink_cFP10fopAc_ac_cii.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_800E3A9C: -/* 800E3A9C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800E3AA0 7C 08 02 A6 */ mflr r0 -/* 800E3AA4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800E3AA8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3AAC 48 27 E7 31 */ bl _savegpr_29 -/* 800E3AB0 7C 7D 1B 78 */ mr r29, r3 -/* 800E3AB4 7C 9E 23 78 */ mr r30, r4 -/* 800E3AB8 7C DF 33 78 */ mr r31, r6 -/* 800E3ABC 2C 05 00 00 */ cmpwi r5, 0 -/* 800E3AC0 40 82 00 10 */ bne lbl_800E3AD0 -/* 800E3AC4 48 03 21 5D */ bl checkEventRun__9daAlink_cCFv -/* 800E3AC8 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3ACC 40 82 00 E4 */ bne lbl_800E3BB0 -lbl_800E3AD0: -/* 800E3AD0 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 800E3AD4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800E3AD8 40 82 00 D8 */ bne lbl_800E3BB0 -/* 800E3ADC A0 7D 2F DC */ lhz r3, 0x2fdc(r29) -/* 800E3AE0 28 03 00 FF */ cmplwi r3, 0xff -/* 800E3AE4 41 82 00 18 */ beq lbl_800E3AFC -/* 800E3AE8 2C 1F 00 00 */ cmpwi r31, 0 -/* 800E3AEC 41 82 00 C4 */ beq lbl_800E3BB0 -/* 800E3AF0 48 07 B0 C9 */ bl checkHookshotItem__9daPy_py_cFi -/* 800E3AF4 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3AF8 41 82 00 B8 */ beq lbl_800E3BB0 -lbl_800E3AFC: -/* 800E3AFC 80 1D 31 A0 */ lwz r0, 0x31a0(r29) -/* 800E3B00 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 -/* 800E3B04 41 82 00 3C */ beq lbl_800E3B40 -/* 800E3B08 7F A3 EB 78 */ mr r3, r29 -/* 800E3B0C 48 00 95 69 */ bl checkHorseNoUpperAnime__9daAlink_cCFv -/* 800E3B10 2C 03 00 00 */ cmpwi r3, 0 -/* 800E3B14 40 82 00 5C */ bne lbl_800E3B70 -/* 800E3B18 38 60 00 00 */ li r3, 0 -/* 800E3B1C A0 1D 1F BC */ lhz r0, 0x1fbc(r29) -/* 800E3B20 28 00 02 4C */ cmplwi r0, 0x24c -/* 800E3B24 41 82 00 10 */ beq lbl_800E3B34 -/* 800E3B28 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E3B2C 28 00 02 4D */ cmplwi r0, 0x24d -/* 800E3B30 40 82 00 08 */ bne lbl_800E3B38 -lbl_800E3B34: -/* 800E3B34 38 60 00 01 */ li r3, 1 -lbl_800E3B38: -/* 800E3B38 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E3B3C 40 82 00 34 */ bne lbl_800E3B70 -lbl_800E3B40: -/* 800E3B40 2C 1F 00 00 */ cmpwi r31, 0 -/* 800E3B44 41 82 00 6C */ beq lbl_800E3BB0 -/* 800E3B48 38 60 00 00 */ li r3, 0 -/* 800E3B4C A0 1D 1F BC */ lhz r0, 0x1fbc(r29) -/* 800E3B50 28 00 01 8D */ cmplwi r0, 0x18d -/* 800E3B54 41 82 00 10 */ beq lbl_800E3B64 -/* 800E3B58 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800E3B5C 28 00 01 8C */ cmplwi r0, 0x18c -/* 800E3B60 40 82 00 08 */ bne lbl_800E3B68 -lbl_800E3B64: -/* 800E3B64 38 60 00 01 */ li r3, 1 -lbl_800E3B68: -/* 800E3B68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E3B6C 41 82 00 44 */ beq lbl_800E3BB0 -lbl_800E3B70: -/* 800E3B70 7F A3 EB 78 */ mr r3, r29 -/* 800E3B74 38 80 00 01 */ li r4, 1 -/* 800E3B78 38 A0 00 00 */ li r5, 0 -/* 800E3B7C 4B FD D7 61 */ bl deleteEquipItem__9daAlink_cFii -/* 800E3B80 7F A3 EB 78 */ mr r3, r29 -/* 800E3B84 7F C4 F3 78 */ mr r4, r30 -/* 800E3B88 48 00 20 2D */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c -/* 800E3B8C C0 02 93 94 */ lfs f0, lit_8785(r2) -/* 800E3B90 D0 1D 33 E4 */ stfs f0, 0x33e4(r29) -/* 800E3B94 7F A3 EB 78 */ mr r3, r29 -/* 800E3B98 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 800E3B9C 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 800E3BA0 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800E3BA4 48 00 02 19 */ bl setGrabUpperAnime__9daAlink_cFf -/* 800E3BA8 38 60 00 01 */ li r3, 1 -/* 800E3BAC 48 00 00 08 */ b lbl_800E3BB4 -lbl_800E3BB0: -/* 800E3BB0 38 60 00 00 */ li r3, 0 -lbl_800E3BB4: -/* 800E3BB4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800E3BB8 48 27 E6 71 */ bl _restgpr_29 -/* 800E3BBC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800E3BC0 7C 08 03 A6 */ mtlr r0 -/* 800E3BC4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800E3BC8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff.s b/asm/d/a/d_a_alink/setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff.s deleted file mode 100644 index 5021cb40fe..0000000000 --- a/asm/d/a/d_a_alink/setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_800AC394: -/* 800AC394 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800AC398 7C 08 02 A6 */ mflr r0 -/* 800AC39C 90 01 00 44 */ stw r0, 0x44(r1) -/* 800AC3A0 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 800AC3A4 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 800AC3A8 DB C1 00 20 */ stfd f30, 0x20(r1) -/* 800AC3AC F3 C1 00 28 */ psq_st f30, 40(r1), 0, 0 /* qr0 */ -/* 800AC3B0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC3B4 48 2B 5E 25 */ bl _savegpr_28 -/* 800AC3B8 7C 9C 23 78 */ mr r28, r4 -/* 800AC3BC 7C BD 2B 78 */ mr r29, r5 -/* 800AC3C0 7C DE 33 78 */ mr r30, r6 -/* 800AC3C4 7C FF 3B 78 */ mr r31, r7 -/* 800AC3C8 FF C0 08 90 */ fmr f30, f1 -/* 800AC3CC FF E0 10 90 */ fmr f31, f2 -/* 800AC3D0 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800AC3D4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800AC3D8 41 82 00 34 */ beq lbl_800AC40C -/* 800AC3DC 48 01 39 D5 */ bl checkZoraWearAbility__9daAlink_cCFv -/* 800AC3E0 2C 03 00 00 */ cmpwi r3, 0 -/* 800AC3E4 41 82 00 18 */ beq lbl_800AC3FC -/* 800AC3E8 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800AC3EC 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800AC3F0 C0 03 00 48 */ lfs f0, 0x48(r3) -/* 800AC3F4 EF DE 00 32 */ fmuls f30, f30, f0 -/* 800AC3F8 48 00 00 14 */ b lbl_800AC40C -lbl_800AC3FC: -/* 800AC3FC 3C 60 80 39 */ lis r3, m__24daAlinkHIO_magneBoots_c0@ha /* 0x8038E7F4@ha */ -/* 800AC400 38 63 E7 F4 */ addi r3, r3, m__24daAlinkHIO_magneBoots_c0@l /* 0x8038E7F4@l */ -/* 800AC404 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 800AC408 EF DE 00 32 */ fmuls f30, f30, f0 -lbl_800AC40C: -/* 800AC40C 7F 83 E3 78 */ mr r3, r28 -/* 800AC410 7F A4 EB 78 */ mr r4, r29 -/* 800AC414 7F C5 F3 78 */ mr r5, r30 -/* 800AC418 7F E6 FB 78 */ mr r6, r31 -/* 800AC41C FC 20 F0 90 */ fmr f1, f30 -/* 800AC420 FC 40 F8 90 */ fmr f2, f31 -/* 800AC424 48 0B 21 21 */ bl setFrameCtrl__16daPy_frameCtrl_cFUcssff -/* 800AC428 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 800AC42C CB E1 00 30 */ lfd f31, 0x30(r1) -/* 800AC430 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 /* qr0 */ -/* 800AC434 CB C1 00 20 */ lfd f30, 0x20(r1) -/* 800AC438 39 61 00 20 */ addi r11, r1, 0x20 -/* 800AC43C 48 2B 5D E9 */ bl _restgpr_28 -/* 800AC440 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800AC444 7C 08 03 A6 */ mtlr r0 -/* 800AC448 38 21 00 40 */ addi r1, r1, 0x40 -/* 800AC44C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setGoronSideMove__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setGoronSideMove__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index 8bd1f1751b..0000000000 --- a/asm/d/a/d_a_alink/setGoronSideMove__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800D08B0: -/* 800D08B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D08B4 7C 08 02 A6 */ mflr r0 -/* 800D08B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D08BC 38 00 00 2B */ li r0, 0x2b -/* 800D08C0 98 03 05 6A */ stb r0, 0x56a(r3) -/* 800D08C4 38 63 28 54 */ addi r3, r3, 0x2854 -/* 800D08C8 48 08 E3 F1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800D08CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D08D0 7C 08 03 A6 */ mtlr r0 -/* 800D08D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D08D8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setJumpMode__9daAlink_cFv.s b/asm/d/a/d_a_alink/setJumpMode__9daAlink_cFv.s deleted file mode 100644 index aa2baaec70..0000000000 --- a/asm/d/a/d_a_alink/setJumpMode__9daAlink_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_800B48D0: -/* 800B48D0 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 800B48D4 60 00 00 02 */ ori r0, r0, 2 -/* 800B48D8 90 03 31 A0 */ stw r0, 0x31a0(r3) -/* 800B48DC C0 03 04 D0 */ lfs f0, 0x4d0(r3) -/* 800B48E0 D0 03 34 F8 */ stfs f0, 0x34f8(r3) -/* 800B48E4 C0 03 04 D4 */ lfs f0, 0x4d4(r3) -/* 800B48E8 D0 03 34 FC */ stfs f0, 0x34fc(r3) -/* 800B48EC C0 03 04 D8 */ lfs f0, 0x4d8(r3) -/* 800B48F0 D0 03 35 00 */ stfs f0, 0x3500(r3) -/* 800B48F4 C0 03 34 FC */ lfs f0, 0x34fc(r3) -/* 800B48F8 D0 03 33 C4 */ stfs f0, 0x33c4(r3) -/* 800B48FC C0 03 34 FC */ lfs f0, 0x34fc(r3) -/* 800B4900 D0 03 33 C8 */ stfs f0, 0x33c8(r3) -/* 800B4904 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setLandPassiveData__9daAlink_cFv.s b/asm/d/a/d_a_alink/setLandPassiveData__9daAlink_cFv.s deleted file mode 100644 index d37d429972..0000000000 --- a/asm/d/a/d_a_alink/setLandPassiveData__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800B5C34: -/* 800B5C34 A0 83 30 F0 */ lhz r4, 0x30f0(r3) -/* 800B5C38 28 04 00 00 */ cmplwi r4, 0 -/* 800B5C3C 40 82 00 1C */ bne lbl_800B5C58 -/* 800B5C40 88 03 2F 8D */ lbz r0, 0x2f8d(r3) -/* 800B5C44 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b -/* 800B5C48 4D 82 00 20 */ beqlr -/* 800B5C4C 38 00 00 41 */ li r0, 0x41 -/* 800B5C50 B0 03 30 F0 */ sth r0, 0x30f0(r3) -/* 800B5C54 4E 80 00 20 */ blr -lbl_800B5C58: -/* 800B5C58 38 04 FF FF */ addi r0, r4, -1 -/* 800B5C5C B0 03 30 F0 */ sth r0, 0x30f0(r3) -/* 800B5C60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz.s b/asm/d/a/d_a_alink/setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz.s deleted file mode 100644 index 64bf2394e9..0000000000 --- a/asm/d/a/d_a_alink/setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_8009DC6C: -/* 8009DC6C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8009DC70 7C 08 02 A6 */ mflr r0 -/* 8009DC74 90 01 00 34 */ stw r0, 0x34(r1) -/* 8009DC78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8009DC7C 48 2C 45 55 */ bl _savegpr_26 -/* 8009DC80 7C 7A 1B 78 */ mr r26, r3 -/* 8009DC84 7C 9F 23 78 */ mr r31, r4 -/* 8009DC88 7C BB 2B 78 */ mr r27, r5 -/* 8009DC8C 7C DC 33 78 */ mr r28, r6 -/* 8009DC90 7C FD 3B 78 */ mr r29, r7 -/* 8009DC94 7D 1E 43 78 */ mr r30, r8 -/* 8009DC98 C0 04 00 0C */ lfs f0, 0xc(r4) -/* 8009DC9C D0 01 00 08 */ stfs f0, 8(r1) -/* 8009DCA0 C0 04 00 1C */ lfs f0, 0x1c(r4) -/* 8009DCA4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8009DCA8 C0 04 00 2C */ lfs f0, 0x2c(r4) -/* 8009DCAC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8009DCB0 28 09 00 00 */ cmplwi r9, 0 -/* 8009DCB4 41 82 00 10 */ beq lbl_8009DCC4 -/* 8009DCB8 7D 23 4B 78 */ mr r3, r9 -/* 8009DCBC 4B F6 F0 A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 8009DCC0 48 00 00 0C */ b lbl_8009DCCC -lbl_8009DCC4: -/* 8009DCC4 38 61 00 08 */ addi r3, r1, 8 -/* 8009DCC8 4B F6 F0 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz -lbl_8009DCCC: -/* 8009DCCC 7F 43 D3 78 */ mr r3, r26 -/* 8009DCD0 48 04 47 2D */ bl concatMagneBootMtx__9daAlink_cFv -/* 8009DCD4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DCD8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DCDC A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 8009DCE0 4B F6 E7 55 */ bl mDoMtx_YrotM__FPA4_fs -/* 8009DCE4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DCE8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DCEC 7F 64 DB 78 */ mr r4, r27 -/* 8009DCF0 7F 85 E3 78 */ mr r5, r28 -/* 8009DCF4 7F A6 EB 78 */ mr r6, r29 -/* 8009DCF8 4B F6 E5 A9 */ bl mDoMtx_ZXYrotM__FPA4_fsss -/* 8009DCFC 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DD00 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DD04 A8 1A 04 E6 */ lha r0, 0x4e6(r26) -/* 8009DD08 7C 00 00 D0 */ neg r0, r0 -/* 8009DD0C 7C 04 07 34 */ extsh r4, r0 -/* 8009DD10 4B F6 E7 25 */ bl mDoMtx_YrotM__FPA4_fs -/* 8009DD14 7F 43 D3 78 */ mr r3, r26 -/* 8009DD18 48 04 47 25 */ bl concatMagneBootInvMtx__9daAlink_cFv -/* 8009DD1C C0 01 00 08 */ lfs f0, 8(r1) -/* 8009DD20 FC 20 00 50 */ fneg f1, f0 -/* 8009DD24 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8009DD28 FC 40 00 50 */ fneg f2, f0 -/* 8009DD2C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8009DD30 FC 60 00 50 */ fneg f3, f0 -/* 8009DD34 4B F6 F0 69 */ bl transM__14mDoMtx_stack_cFfff -/* 8009DD38 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DD3C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DD40 7F E4 FB 78 */ mr r4, r31 -/* 8009DD44 7C 65 1B 78 */ mr r5, r3 -/* 8009DD48 48 2A 87 9D */ bl PSMTXConcat -/* 8009DD4C 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DD50 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DD54 7F E4 FB 78 */ mr r4, r31 -/* 8009DD58 48 2A 87 59 */ bl PSMTXCopy -/* 8009DD5C 2C 1E 00 00 */ cmpwi r30, 0 -/* 8009DD60 41 82 00 18 */ beq lbl_8009DD78 -/* 8009DD64 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8009DD68 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8009DD6C 3C 80 80 43 */ lis r4, mCurrentMtx__6J3DSys@ha /* 0x80434BE4@ha */ -/* 8009DD70 38 84 4B E4 */ addi r4, r4, mCurrentMtx__6J3DSys@l /* 0x80434BE4@l */ -/* 8009DD74 48 2A 87 3D */ bl PSMTXCopy -lbl_8009DD78: -/* 8009DD78 39 61 00 30 */ addi r11, r1, 0x30 -/* 8009DD7C 48 2C 44 A1 */ bl _restgpr_26 -/* 8009DD80 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8009DD84 7C 08 03 A6 */ mtlr r0 -/* 8009DD88 38 21 00 30 */ addi r1, r1, 0x30 -/* 8009DD8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMetamorphoseEffectStartLink__9daAlink_cFv.s b/asm/d/a/d_a_alink/setMetamorphoseEffectStartLink__9daAlink_cFv.s deleted file mode 100644 index 4d58e6408a..0000000000 --- a/asm/d/a/d_a_alink/setMetamorphoseEffectStartLink__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80124738: -/* 80124738 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8012473C 7C 08 02 A6 */ mflr r0 -/* 80124740 90 01 00 14 */ stw r0, 0x14(r1) -/* 80124744 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80124748 7C 7F 1B 78 */ mr r31, r3 -/* 8012474C 38 9F 31 F8 */ addi r4, r31, 0x31f8 -/* 80124750 38 A0 02 4F */ li r5, 0x24f -/* 80124754 38 DF 37 C8 */ addi r6, r31, 0x37c8 -/* 80124758 38 E0 00 00 */ li r7, 0 -/* 8012475C 4B FF BE 25 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 80124760 7F E3 FB 78 */ mr r3, r31 -/* 80124764 38 9F 31 FC */ addi r4, r31, 0x31fc -/* 80124768 38 A0 02 50 */ li r5, 0x250 -/* 8012476C 38 DF 37 C8 */ addi r6, r31, 0x37c8 -/* 80124770 38 E0 00 00 */ li r7, 0 -/* 80124774 4B FF BE 0D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 80124778 7F E3 FB 78 */ mr r3, r31 -/* 8012477C 38 9F 32 00 */ addi r4, r31, 0x3200 -/* 80124780 38 A0 06 E8 */ li r5, 0x6e8 -/* 80124784 3C C0 80 43 */ lis r6, Zero__4cXyz@ha /* 0x80430CF4@ha */ -/* 80124788 38 C6 0C F4 */ addi r6, r6, Zero__4cXyz@l /* 0x80430CF4@l */ -/* 8012478C 38 E0 00 00 */ li r7, 0 -/* 80124790 4B FF BD F1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz -/* 80124794 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80124798 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8012479C 7C 08 03 A6 */ mtlr r0 -/* 801247A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801247A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMidnaMsg__9daAlink_cFv.s b/asm/d/a/d_a_alink/setMidnaMsg__9daAlink_cFv.s deleted file mode 100644 index 89d85fb7df..0000000000 --- a/asm/d/a/d_a_alink/setMidnaMsg__9daAlink_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800B4938: -/* 800B4938 80 63 28 00 */ lwz r3, 0x2800(r3) -/* 800B493C 28 03 00 00 */ cmplwi r3, 0 -/* 800B4940 4D 82 00 20 */ beqlr -/* 800B4944 38 00 00 01 */ li r0, 1 -/* 800B4948 98 03 05 6C */ stb r0, 0x56c(r3) -/* 800B494C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setOctaIealWildHang__9daAlink_cFv.s b/asm/d/a/d_a_alink/setOctaIealWildHang__9daAlink_cFv.s deleted file mode 100644 index 9c3d2d0ca5..0000000000 --- a/asm/d/a/d_a_alink/setOctaIealWildHang__9daAlink_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D0B20: -/* 800D0B20 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0B24 28 00 00 DC */ cmplwi r0, 0xdc -/* 800D0B28 4C 82 00 20 */ bnelr -/* 800D0B2C 38 00 00 01 */ li r0, 1 -/* 800D0B30 B0 03 30 08 */ sth r0, 0x3008(r3) -/* 800D0B34 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf.s b/asm/d/a/d_a_alink/setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf.s deleted file mode 100644 index 4726bf36a2..0000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800ACFB0: -/* 800ACFB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ACFB4 7C 08 02 A6 */ mflr r0 -/* 800ACFB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ACFBC FC 60 08 90 */ fmr f3, f1 -/* 800ACFC0 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800ACFC4 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800ACFC8 38 A0 FF FF */ li r5, -1 -/* 800ACFCC 48 00 00 41 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800ACFD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ACFD4 7C 08 03 A6 */ mtlr r0 -/* 800ACFD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ACFDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff.s b/asm/d/a/d_a_alink/setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff.s deleted file mode 100644 index 2ced5145f7..0000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_800ACFE0: -/* 800ACFE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ACFE4 7C 08 02 A6 */ mflr r0 -/* 800ACFE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ACFEC FC 60 10 90 */ fmr f3, f2 -/* 800ACFF0 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800ACFF4 38 A0 FF FF */ li r5, -1 -/* 800ACFF8 48 00 00 15 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800ACFFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD000 7C 08 03 A6 */ mtlr r0 -/* 800AD004 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD008 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM.s b/asm/d/a/d_a_alink/setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM.s deleted file mode 100644 index 75438eb74e..0000000000 --- a/asm/d/a/d_a_alink/setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800ACF80: -/* 800ACF80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800ACF84 7C 08 02 A6 */ mflr r0 -/* 800ACF88 90 01 00 14 */ stw r0, 0x14(r1) -/* 800ACF8C C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800ACF90 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800ACF94 38 A0 FF FF */ li r5, -1 -/* 800ACF98 C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 800ACF9C 48 00 00 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 800ACFA0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800ACFA4 7C 08 03 A6 */ mtlr r0 -/* 800ACFA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800ACFAC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSumouGraspCancelCount__9daAlink_cFi.s b/asm/d/a/d_a_alink/setSumouGraspCancelCount__9daAlink_cFi.s deleted file mode 100644 index 762682d554..0000000000 --- a/asm/d/a/d_a_alink/setSumouGraspCancelCount__9daAlink_cFi.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0984: -/* 800D0984 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0988 28 00 00 CF */ cmplwi r0, 0xcf -/* 800D098C 4C 82 00 20 */ bnelr -/* 800D0990 B0 83 30 0C */ sth r4, 0x300c(r3) -/* 800D0994 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSumouLoseHeadUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSumouLoseHeadUp__9daAlink_cFv.s deleted file mode 100644 index 10de6563fe..0000000000 --- a/asm/d/a/d_a_alink/setSumouLoseHeadUp__9daAlink_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_800D0930: -/* 800D0930 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0934 28 00 00 D3 */ cmplwi r0, 0xd3 -/* 800D0938 4C 82 00 20 */ bnelr -/* 800D093C 38 00 00 25 */ li r0, 0x25 -/* 800D0940 98 03 05 6A */ stb r0, 0x56a(r3) -/* 800D0944 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSumouPushBackDirection__9daAlink_cFs.s b/asm/d/a/d_a_alink/setSumouPushBackDirection__9daAlink_cFs.s deleted file mode 100644 index 9c33000cf3..0000000000 --- a/asm/d/a/d_a_alink/setSumouPushBackDirection__9daAlink_cFs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D091C: -/* 800D091C A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0920 28 00 00 CF */ cmplwi r0, 0xcf -/* 800D0924 4C 82 00 20 */ bnelr -/* 800D0928 B0 83 30 10 */ sth r4, 0x3010(r3) -/* 800D092C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSumouReady__9daAlink_cFP10fopAc_ac_c.s b/asm/d/a/d_a_alink/setSumouReady__9daAlink_cFP10fopAc_ac_c.s deleted file mode 100644 index c1ca8b411c..0000000000 --- a/asm/d/a/d_a_alink/setSumouReady__9daAlink_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_800D08DC: -/* 800D08DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D08E0 7C 08 02 A6 */ mflr r0 -/* 800D08E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D08E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D08EC 7C 7F 1B 78 */ mr r31, r3 -/* 800D08F0 38 00 00 01 */ li r0, 1 -/* 800D08F4 98 03 05 6A */ stb r0, 0x56a(r3) -/* 800D08F8 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800D08FC 48 08 E3 BD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -/* 800D0900 38 00 00 01 */ li r0, 1 -/* 800D0904 90 1F 06 14 */ stw r0, 0x614(r31) -/* 800D0908 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D090C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D0910 7C 08 03 A6 */ mtlr r0 -/* 800D0914 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D0918 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordChargeVoiceSe__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSwordChargeVoiceSe__9daAlink_cFv.s deleted file mode 100644 index 5e56e03950..0000000000 --- a/asm/d/a/d_a_alink/setSwordChargeVoiceSe__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_800D22BC: -/* 800D22BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D22C0 7C 08 02 A6 */ mflr r0 -/* 800D22C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D22C8 A8 83 30 0C */ lha r4, 0x300c(r3) -/* 800D22CC 2C 04 00 00 */ cmpwi r4, 0 -/* 800D22D0 41 82 00 24 */ beq lbl_800D22F4 -/* 800D22D4 38 04 FF FF */ addi r0, r4, -1 -/* 800D22D8 B0 03 30 0C */ sth r0, 0x300c(r3) -/* 800D22DC A8 03 30 0C */ lha r0, 0x300c(r3) -/* 800D22E0 2C 00 00 00 */ cmpwi r0, 0 -/* 800D22E4 40 82 00 10 */ bne lbl_800D22F4 -/* 800D22E8 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010092@ha */ -/* 800D22EC 38 84 00 92 */ addi r4, r4, 0x0092 /* 0x00010092@l */ -/* 800D22F0 4B FF FF 95 */ bl setSwordVoiceSe__9daAlink_cFUl -lbl_800D22F4: -/* 800D22F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D22F8 7C 08 03 A6 */ mtlr r0 -/* 800D22FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2300 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordComboVoice__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSwordComboVoice__9daAlink_cFv.s deleted file mode 100644 index a71d69919f..0000000000 --- a/asm/d/a/d_a_alink/setSwordComboVoice__9daAlink_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800D2304: -/* 800D2304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2308 7C 08 02 A6 */ mflr r0 -/* 800D230C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2310 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D2314 28 00 00 26 */ cmplwi r0, 0x26 -/* 800D2318 41 82 00 10 */ beq lbl_800D2328 -/* 800D231C 88 03 05 69 */ lbz r0, 0x569(r3) -/* 800D2320 28 00 00 04 */ cmplwi r0, 4 -/* 800D2324 40 82 00 14 */ bne lbl_800D2338 -lbl_800D2328: -/* 800D2328 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010001@ha */ -/* 800D232C 38 84 00 01 */ addi r4, r4, 0x0001 /* 0x00010001@l */ -/* 800D2330 4B FF FF 55 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D2334 48 00 00 24 */ b lbl_800D2358 -lbl_800D2338: -/* 800D2338 28 00 00 01 */ cmplwi r0, 1 -/* 800D233C 40 82 00 10 */ bne lbl_800D234C -/* 800D2340 3C 80 00 01 */ lis r4, 1 -/* 800D2344 4B FF FF 41 */ bl setSwordVoiceSe__9daAlink_cFUl -/* 800D2348 48 00 00 10 */ b lbl_800D2358 -lbl_800D234C: -/* 800D234C 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010004@ha */ -/* 800D2350 38 84 00 04 */ addi r4, r4, 0x0004 /* 0x00010004@l */ -/* 800D2354 4B FF FF 31 */ bl setSwordVoiceSe__9daAlink_cFUl -lbl_800D2358: -/* 800D2358 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D235C 7C 08 03 A6 */ mtlr r0 -/* 800D2360 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D2364 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSwordModel__9daAlink_cFv.s deleted file mode 100644 index 265b443aa8..0000000000 --- a/asm/d/a/d_a_alink/setSwordModel__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800D1268: -/* 800D1268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D126C 7C 08 02 A6 */ mflr r0 -/* 800D1270 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D1274 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D1278 7C 7F 1B 78 */ mr r31, r3 -/* 800D127C 38 00 00 FF */ li r0, 0xff -/* 800D1280 B0 03 2F DE */ sth r0, 0x2fde(r3) -/* 800D1284 38 00 01 03 */ li r0, 0x103 -/* 800D1288 B0 03 2F DC */ sth r0, 0x2fdc(r3) -/* 800D128C 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 800D1290 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 800D1294 38 80 00 01 */ li r4, 1 -/* 800D1298 48 1E 4B ED */ bl bgmSetSwordUsing__8Z2SeqMgrFl -/* 800D129C 38 00 00 00 */ li r0, 0 -/* 800D12A0 98 1F 2F 94 */ stb r0, 0x2f94(r31) -/* 800D12A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800D12A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800D12AC 88 03 00 14 */ lbz r0, 0x14(r3) -/* 800D12B0 28 00 00 3F */ cmplwi r0, 0x3f -/* 800D12B4 40 82 00 28 */ bne lbl_800D12DC -/* 800D12B8 80 7F 06 B8 */ lwz r3, 0x6b8(r31) -/* 800D12BC 80 63 00 04 */ lwz r3, 4(r3) -/* 800D12C0 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800D12C4 80 63 00 04 */ lwz r3, 4(r3) -/* 800D12C8 80 63 00 08 */ lwz r3, 8(r3) -/* 800D12CC 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800D12D0 60 00 00 01 */ ori r0, r0, 1 -/* 800D12D4 90 03 00 0C */ stw r0, 0xc(r3) -/* 800D12D8 48 00 00 24 */ b lbl_800D12FC -lbl_800D12DC: -/* 800D12DC 80 7F 06 B8 */ lwz r3, 0x6b8(r31) -/* 800D12E0 80 63 00 04 */ lwz r3, 4(r3) -/* 800D12E4 80 63 00 60 */ lwz r3, 0x60(r3) -/* 800D12E8 80 63 00 00 */ lwz r3, 0(r3) -/* 800D12EC 80 63 00 08 */ lwz r3, 8(r3) -/* 800D12F0 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800D12F4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e -/* 800D12F8 90 03 00 0C */ stw r0, 0xc(r3) -lbl_800D12FC: -/* 800D12FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D1300 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D1304 7C 08 03 A6 */ mtlr r0 -/* 800D1308 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D130C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordVoiceSe__9daAlink_cFUl.s b/asm/d/a/d_a_alink/setSwordVoiceSe__9daAlink_cFUl.s deleted file mode 100644 index b9ba8d535d..0000000000 --- a/asm/d/a/d_a_alink/setSwordVoiceSe__9daAlink_cFUl.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_800D2284: -/* 800D2284 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D2288 7C 08 02 A6 */ mflr r0 -/* 800D228C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D2290 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800D2294 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 -/* 800D2298 40 82 00 14 */ bne lbl_800D22AC -/* 800D229C 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800D22A0 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800D22A4 7D 89 03 A6 */ mtctr r12 -/* 800D22A8 4E 80 04 21 */ bctrl -lbl_800D22AC: -/* 800D22AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D22B0 7C 08 03 A6 */ mtlr r0 -/* 800D22B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D22B8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setThrowBoomerangAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setThrowBoomerangAnime__9daAlink_cFv.s deleted file mode 100644 index f1b95b4a9e..0000000000 --- a/asm/d/a/d_a_alink/setThrowBoomerangAnime__9daAlink_cFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_800E05E8: -/* 800E05E8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E05EC 7C 08 02 A6 */ mflr r0 -/* 800E05F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E05F4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E05F8 7C 7F 1B 78 */ mr r31, r3 -/* 800E05FC 38 80 00 53 */ li r4, 0x53 -/* 800E0600 38 A0 00 02 */ li r5, 2 -/* 800E0604 3C C0 80 39 */ lis r6, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 800E0608 38 C6 E6 C8 */ addi r6, r6, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 800E060C 4B FC D0 E5 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -/* 800E0610 7F E3 FB 78 */ mr r3, r31 -/* 800E0614 38 80 00 00 */ li r4, 0 -/* 800E0618 4B FD 6B 79 */ bl cancelItemUseQuake__9daAlink_cFi -/* 800E061C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E0620 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E0624 7C 08 03 A6 */ mtlr r0 -/* 800E0628 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E062C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c.s b/asm/d/a/d_a_alink/setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c.s deleted file mode 100644 index d229c773cd..0000000000 --- a/asm/d/a/d_a_alink/setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_800B3358: -/* 800B3358 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B335C 7C 08 02 A6 */ mflr r0 -/* 800B3360 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B3364 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B3368 7C 7F 1B 78 */ mr r31, r3 -/* 800B336C 7C 83 23 78 */ mr r3, r4 -/* 800B3370 C0 22 93 1C */ lfs f1, lit_7448(r2) -/* 800B3374 48 27 50 B9 */ bl checkPass__12J3DFrameCtrlFf -/* 800B3378 2C 03 00 00 */ cmpwi r3, 0 -/* 800B337C 41 82 00 54 */ beq lbl_800B33D0 -/* 800B3380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B3384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B3388 A0 03 00 02 */ lhz r0, 2(r3) -/* 800B338C 28 00 00 02 */ cmplwi r0, 2 -/* 800B3390 41 81 00 24 */ bgt lbl_800B33B4 -/* 800B3394 7F E3 FB 78 */ mr r3, r31 -/* 800B3398 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010015@ha */ -/* 800B339C 38 84 00 15 */ addi r4, r4, 0x0015 /* 0x00010015@l */ -/* 800B33A0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800B33A4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800B33A8 7D 89 03 A6 */ mtctr r12 -/* 800B33AC 4E 80 04 21 */ bctrl -/* 800B33B0 48 00 00 20 */ b lbl_800B33D0 -lbl_800B33B4: -/* 800B33B4 7F E3 FB 78 */ mr r3, r31 -/* 800B33B8 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010014@ha */ -/* 800B33BC 38 84 00 14 */ addi r4, r4, 0x0014 /* 0x00010014@l */ -/* 800B33C0 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800B33C4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800B33C8 7D 89 03 A6 */ mtctr r12 -/* 800B33CC 4E 80 04 21 */ bctrl -lbl_800B33D0: -/* 800B33D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B33D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B33D8 7C 08 03 A6 */ mtlr r0 -/* 800B33DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B33E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWaterY__9daAlink_cFv.s b/asm/d/a/d_a_alink/setWaterY__9daAlink_cFv.s deleted file mode 100644 index e0cdbcf6af..0000000000 --- a/asm/d/a/d_a_alink/setWaterY__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_800B14B4: -/* 800B14B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B14B8 7C 08 02 A6 */ mflr r0 -/* 800B14BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B14C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B14C4 7C 7F 1B 78 */ mr r31, r3 -/* 800B14C8 80 03 19 9C */ lwz r0, 0x199c(r3) -/* 800B14CC 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 -/* 800B14D0 41 82 00 4C */ beq lbl_800B151C -/* 800B14D4 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800B14D8 60 00 00 80 */ ori r0, r0, 0x80 -/* 800B14DC 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800B14E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B14E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B14E8 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800B14EC 38 9F 1A F0 */ addi r4, r31, 0x1af0 -/* 800B14F0 4B FC 39 61 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo -/* 800B14F4 98 7F 2F BC */ stb r3, 0x2fbc(r31) -/* 800B14F8 C0 1F 1B 3C */ lfs f0, 0x1b3c(r31) -/* 800B14FC D0 1F 33 B4 */ stfs f0, 0x33b4(r31) -/* 800B1500 88 1F 2F BC */ lbz r0, 0x2fbc(r31) -/* 800B1504 28 00 00 06 */ cmplwi r0, 6 -/* 800B1508 41 82 00 30 */ beq lbl_800B1538 -/* 800B150C 7F E3 FB 78 */ mr r3, r31 -/* 800B1510 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) -/* 800B1514 48 05 F2 A9 */ bl checkWaterInKandelaar__9daAlink_cFf -/* 800B1518 48 00 00 20 */ b lbl_800B1538 -lbl_800B151C: -/* 800B151C 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 800B1520 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 800B1524 90 1F 05 70 */ stw r0, 0x570(r31) -/* 800B1528 38 00 00 10 */ li r0, 0x10 -/* 800B152C 98 1F 2F BC */ stb r0, 0x2fbc(r31) -/* 800B1530 C0 02 93 A4 */ lfs f0, lit_9138(r2) -/* 800B1534 D0 1F 33 B4 */ stfs f0, 0x33b4(r31) -lbl_800B1538: -/* 800B1538 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B153C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B1540 7C 08 03 A6 */ mtlr r0 -/* 800B1544 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B1548 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfDigStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setWolfDigStatus__9daAlink_cFUc.s deleted file mode 100644 index b28695c506..0000000000 --- a/asm/d/a/d_a_alink/setWolfDigStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80127D50: -/* 80127D50 38 00 00 0D */ li r0, 0xd -/* 80127D54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80127D58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80127D5C 98 03 5E 60 */ stb r0, 0x5e60(r3) -/* 80127D60 98 83 5E 62 */ stb r4, 0x5e62(r3) -/* 80127D64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfEnemyHangBiteAngle__9daAlink_cFs.s b/asm/d/a/d_a_alink/setWolfEnemyHangBiteAngle__9daAlink_cFs.s deleted file mode 100644 index 9d637f3f38..0000000000 --- a/asm/d/a/d_a_alink/setWolfEnemyHangBiteAngle__9daAlink_cFs.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_800D0970: -/* 800D0970 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800D0974 28 00 01 36 */ cmplwi r0, 0x136 -/* 800D0978 4C 82 00 20 */ bnelr -/* 800D097C B0 83 30 10 */ sth r4, 0x3010(r3) -/* 800D0980 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setWolfSenceStatus__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setWolfSenceStatus__9daAlink_cFUc.s deleted file mode 100644 index add16cb87d..0000000000 --- a/asm/d/a/d_a_alink/setWolfSenceStatus__9daAlink_cFUc.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80127D14: -/* 80127D14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80127D18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80127D1C 98 83 5E 5C */ stb r4, 0x5e5c(r3) -/* 80127D20 38 00 00 00 */ li r0, 0 -/* 80127D24 98 03 5E 5E */ stb r0, 0x5e5e(r3) -/* 80127D28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/skipPortalObjWarp__9daAlink_cFv.s b/asm/d/a/d_a_alink/skipPortalObjWarp__9daAlink_cFv.s deleted file mode 100644 index 08c5431531..0000000000 --- a/asm/d/a/d_a_alink/skipPortalObjWarp__9daAlink_cFv.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8011F8B8: -/* 8011F8B8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8011F8BC 7C 08 02 A6 */ mflr r0 -/* 8011F8C0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8011F8C4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8011F8C8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8011F8CC 7C 7F 1B 78 */ mr r31, r3 -/* 8011F8D0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 8011F8D4 28 00 01 4F */ cmplwi r0, 0x14f -/* 8011F8D8 40 82 00 10 */ bne lbl_8011F8E8 -/* 8011F8DC A8 1F 30 0E */ lha r0, 0x300e(r31) -/* 8011F8E0 2C 00 00 00 */ cmpwi r0, 0 -/* 8011F8E4 40 81 00 F0 */ ble lbl_8011F9D4 -lbl_8011F8E8: -/* 8011F8E8 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 8011F8EC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011F8F0 41 82 00 44 */ beq lbl_8011F934 -/* 8011F8F4 4B F1 01 CD */ bl dComIfGp_TargetWarpPt_get__Fv -/* 8011F8F8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011F8FC 28 00 00 09 */ cmplwi r0, 9 -/* 8011F900 40 82 00 34 */ bne lbl_8011F934 -/* 8011F904 4B F1 01 E5 */ bl dComIfGp_TransportWarp_check__Fv -/* 8011F908 2C 03 00 00 */ cmpwi r3, 0 -/* 8011F90C 41 82 00 28 */ beq lbl_8011F934 -/* 8011F910 38 60 00 02 */ li r3, 2 -/* 8011F914 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011F918 38 80 00 00 */ li r4, 0 -/* 8011F91C 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 8011F920 7C 05 07 74 */ extsb r5, r0 -/* 8011F924 A8 DF 04 E6 */ lha r6, 0x4e6(r31) -/* 8011F928 38 E0 FF FF */ li r7, -1 -/* 8011F92C 4B F0 78 45 */ bl dStage_changeScene__FifUlScsi -/* 8011F930 48 00 00 90 */ b lbl_8011F9C0 -lbl_8011F934: -/* 8011F934 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8011F938 3B C3 01 88 */ addi r30, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8011F93C 88 7E 00 4E */ lbz r3, 0x4e(r30) -/* 8011F940 38 80 00 00 */ li r4, 0 -/* 8011F944 38 A0 00 CA */ li r5, 0xca -/* 8011F948 38 C0 00 00 */ li r6, 0 -/* 8011F94C 48 03 F0 C1 */ bl setParamData__9daPy_py_cFiiii -/* 8011F950 7C 67 1B 78 */ mr r7, r3 -/* 8011F954 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8011F958 38 A3 01 88 */ addi r5, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8011F95C 38 85 00 40 */ addi r4, r5, 0x40 -/* 8011F960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011F964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011F968 38 63 0E D8 */ addi r3, r3, 0xed8 -/* 8011F96C 88 A5 00 50 */ lbz r5, 0x50(r5) -/* 8011F970 88 1E 00 4E */ lbz r0, 0x4e(r30) -/* 8011F974 7C 06 07 74 */ extsb r6, r0 -/* 8011F978 4B F1 56 2D */ bl set__17dSv_turnRestart_cFRC4cXyzsScUl -/* 8011F97C 38 00 00 01 */ li r0, 1 -/* 8011F980 90 01 00 08 */ stw r0, 8(r1) -/* 8011F984 38 00 00 00 */ li r0, 0 -/* 8011F988 90 01 00 0C */ stw r0, 0xc(r1) -/* 8011F98C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 8011F990 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 8011F994 38 63 00 38 */ addi r3, r3, 0x38 -/* 8011F998 38 80 FF FC */ li r4, -4 -/* 8011F99C 88 1E 00 4E */ lbz r0, 0x4e(r30) -/* 8011F9A0 7C 05 07 74 */ extsb r5, r0 -/* 8011F9A4 38 C0 FF FF */ li r6, -1 -/* 8011F9A8 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011F9AC 38 E0 00 00 */ li r7, 0 -/* 8011F9B0 39 00 00 01 */ li r8, 1 -/* 8011F9B4 39 20 00 00 */ li r9, 0 -/* 8011F9B8 A9 5F 04 E6 */ lha r10, 0x4e6(r31) -/* 8011F9BC 4B F0 D9 41 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii -lbl_8011F9C0: -/* 8011F9C0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 8011F9C4 28 00 01 4F */ cmplwi r0, 0x14f -/* 8011F9C8 40 82 00 0C */ bne lbl_8011F9D4 -/* 8011F9CC 38 00 FF FF */ li r0, -1 -/* 8011F9D0 B0 1F 30 0E */ sth r0, 0x300e(r31) -lbl_8011F9D4: -/* 8011F9D4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8011F9D8 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8011F9DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8011F9E0 7C 08 03 A6 */ mtlr r0 -/* 8011F9E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8011F9E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf.s deleted file mode 100644 index af2f95f5af..0000000000 --- a/asm/d/a/d_a_alink/tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8009DA98: -/* 8009DA98 80 06 00 10 */ lwz r0, 0x10(r6) -/* 8009DA9C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd -/* 8009DAA0 41 82 00 7C */ beq lbl_8009DB1C -/* 8009DAA4 C0 06 00 84 */ lfs f0, 0x84(r6) -/* 8009DAA8 D0 03 36 9C */ stfs f0, 0x369c(r3) -/* 8009DAAC C0 06 00 88 */ lfs f0, 0x88(r6) -/* 8009DAB0 D0 03 36 A0 */ stfs f0, 0x36a0(r3) -/* 8009DAB4 C0 06 00 8C */ lfs f0, 0x8c(r6) -/* 8009DAB8 D0 03 36 A4 */ stfs f0, 0x36a4(r3) -/* 8009DABC 38 E0 00 00 */ li r7, 0 -/* 8009DAC0 38 C0 00 00 */ li r6, 0 -/* 8009DAC4 38 00 00 03 */ li r0, 3 -/* 8009DAC8 7C 09 03 A6 */ mtctr r0 -lbl_8009DACC: -/* 8009DACC 38 06 08 50 */ addi r0, r6, 0x850 -/* 8009DAD0 7C 03 02 14 */ add r0, r3, r0 -/* 8009DAD4 7C 05 00 40 */ cmplw r5, r0 -/* 8009DAD8 40 82 00 34 */ bne lbl_8009DB0C -/* 8009DADC 88 A3 2F B8 */ lbz r5, 0x2fb8(r3) -/* 8009DAE0 38 00 00 01 */ li r0, 1 -/* 8009DAE4 7C 00 38 30 */ slw r0, r0, r7 -/* 8009DAE8 7C A0 03 78 */ or r0, r5, r0 -/* 8009DAEC 98 03 2F B8 */ stb r0, 0x2fb8(r3) -/* 8009DAF0 C0 04 04 D0 */ lfs f0, 0x4d0(r4) -/* 8009DAF4 D0 03 36 B4 */ stfs f0, 0x36b4(r3) -/* 8009DAF8 C0 04 04 D4 */ lfs f0, 0x4d4(r4) -/* 8009DAFC D0 03 36 B8 */ stfs f0, 0x36b8(r3) -/* 8009DB00 C0 04 04 D8 */ lfs f0, 0x4d8(r4) -/* 8009DB04 D0 03 36 BC */ stfs f0, 0x36bc(r3) -/* 8009DB08 4E 80 00 20 */ blr -lbl_8009DB0C: -/* 8009DB0C 38 E7 00 01 */ addi r7, r7, 1 -/* 8009DB10 38 C6 01 3C */ addi r6, r6, 0x13c -/* 8009DB14 42 00 FF B8 */ bdnz lbl_8009DACC -/* 8009DB18 4E 80 00 20 */ blr -lbl_8009DB1C: -/* 8009DB1C 38 C0 00 00 */ li r6, 0 -/* 8009DB20 38 80 00 00 */ li r4, 0 -/* 8009DB24 38 00 00 03 */ li r0, 3 -/* 8009DB28 7C 09 03 A6 */ mtctr r0 -lbl_8009DB2C: -/* 8009DB2C 38 04 08 50 */ addi r0, r4, 0x850 -/* 8009DB30 7C 03 02 14 */ add r0, r3, r0 -/* 8009DB34 7C 05 00 40 */ cmplw r5, r0 -/* 8009DB38 40 82 00 1C */ bne lbl_8009DB54 -/* 8009DB3C 88 83 2F B8 */ lbz r4, 0x2fb8(r3) -/* 8009DB40 38 00 00 01 */ li r0, 1 -/* 8009DB44 7C 00 30 30 */ slw r0, r0, r6 -/* 8009DB48 7C 80 00 78 */ andc r0, r4, r0 -/* 8009DB4C 98 03 2F B8 */ stb r0, 0x2fb8(r3) -/* 8009DB50 4E 80 00 20 */ blr -lbl_8009DB54: -/* 8009DB54 38 C6 00 01 */ addi r6, r6, 1 -/* 8009DB58 38 84 01 3C */ addi r4, r4, 0x13c -/* 8009DB5C 42 00 FF D0 */ bdnz lbl_8009DB2C -/* 8009DB60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/throwCopyRod__9daAlink_cFv.s b/asm/d/a/d_a_alink/throwCopyRod__9daAlink_cFv.s deleted file mode 100644 index 14ebe109c0..0000000000 --- a/asm/d/a/d_a_alink/throwCopyRod__9daAlink_cFv.s +++ /dev/null @@ -1,74 +0,0 @@ -lbl_800E191C: -/* 800E191C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E1920 7C 08 02 A6 */ mflr r0 -/* 800E1924 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E1928 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E192C 93 C1 00 08 */ stw r30, 8(r1) -/* 800E1930 7C 7F 1B 78 */ mr r31, r3 -/* 800E1934 83 C3 28 28 */ lwz r30, 0x2828(r3) -/* 800E1938 80 03 05 74 */ lwz r0, 0x574(r3) -/* 800E193C 64 00 00 01 */ oris r0, r0, 1 -/* 800E1940 90 03 05 74 */ stw r0, 0x574(r3) -/* 800E1944 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800E1948 81 8C 02 A0 */ lwz r12, 0x2a0(r12) -/* 800E194C 7D 89 03 A6 */ mtctr r12 -/* 800E1950 4E 80 04 21 */ bctrl -/* 800E1954 2C 03 00 00 */ cmpwi r3, 0 -/* 800E1958 41 82 00 30 */ beq lbl_800E1988 -/* 800E195C 38 00 00 02 */ li r0, 2 -/* 800E1960 90 1E 00 B0 */ stw r0, 0xb0(r30) -/* 800E1964 80 1F 28 24 */ lwz r0, 0x2824(r31) -/* 800E1968 90 1F 28 3C */ stw r0, 0x283c(r31) -/* 800E196C 80 1F 28 28 */ lwz r0, 0x2828(r31) -/* 800E1970 90 1F 28 40 */ stw r0, 0x2840(r31) -/* 800E1974 80 1F 05 7C */ lwz r0, 0x57c(r31) -/* 800E1978 64 00 00 04 */ oris r0, r0, 4 -/* 800E197C 90 1F 05 7C */ stw r0, 0x57c(r31) -/* 800E1980 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800E1984 48 07 D3 79 */ bl clearData__16daPy_actorKeep_cFv -lbl_800E1988: -/* 800E1988 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800E198C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800E1990 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800E1994 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 -/* 800E1998 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800E199C 38 00 FF FF */ li r0, -1 -/* 800E19A0 B0 1F 30 8E */ sth r0, 0x308e(r31) -/* 800E19A4 7F E3 FB 78 */ mr r3, r31 -/* 800E19A8 3C 80 00 01 */ lis r4, 1 -/* 800E19AC 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 800E19B0 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 800E19B4 7D 89 03 A6 */ mtctr r12 -/* 800E19B8 4E 80 04 21 */ bctrl -/* 800E19BC 7F E3 FB 78 */ mr r3, r31 -/* 800E19C0 3C 80 00 02 */ lis r4, 0x0002 /* 0x0002006A@ha */ -/* 800E19C4 38 84 00 6A */ addi r4, r4, 0x006A /* 0x0002006A@l */ -/* 800E19C8 4B FD D7 25 */ bl seStartSwordCut__9daAlink_cFUl -/* 800E19CC 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 800E19D0 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a -/* 800E19D4 41 82 00 44 */ beq lbl_800E1A18 -/* 800E19D8 7F E3 FB 78 */ mr r3, r31 -/* 800E19DC 4B FD 1F 29 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E19E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E19E4 41 82 00 18 */ beq lbl_800E19FC -/* 800E19E8 38 00 00 03 */ li r0, 3 -/* 800E19EC 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800E19F0 7F E3 FB 78 */ mr r3, r31 -/* 800E19F4 4B FE 1E D9 */ bl procAtnActorWaitInit__9daAlink_cFv -/* 800E19F8 48 00 00 0C */ b lbl_800E1A04 -lbl_800E19FC: -/* 800E19FC 7F E3 FB 78 */ mr r3, r31 -/* 800E1A00 4B FE 1F ED */ bl procAtnActorMoveInit__9daAlink_cFv -lbl_800E1A04: -/* 800E1A04 80 7F 20 60 */ lwz r3, 0x2060(r31) -/* 800E1A08 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800E1A0C 38 80 00 00 */ li r4, 0 -/* 800E1A10 38 A0 00 23 */ li r5, 0x23 -/* 800E1A14 4B F2 DE 35 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800E1A18: -/* 800E1A18 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E1A1C 83 C1 00 08 */ lwz r30, 8(r1) -/* 800E1A20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E1A24 7C 08 03 A6 */ mtlr r0 -/* 800E1A28 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E1A2C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/getThrowBoomerangActor__9daPy_py_cFv.s b/asm/d/a/d_a_player/getThrowBoomerangActor__9daPy_py_cFv.s deleted file mode 100644 index 574b7ead7a..0000000000 --- a/asm/d/a/d_a_player/getThrowBoomerangActor__9daPy_py_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8015F8D0: -/* 8015F8D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8015F8D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8015F8D8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F8DC 80 63 28 38 */ lwz r3, 0x2838(r3) -/* 8015F8E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_player/initOffset__20daPy_boomerangMove_cFPC4cXyz.s b/asm/d/a/d_a_player/initOffset__20daPy_boomerangMove_cFPC4cXyz.s deleted file mode 100644 index 5358a8ba5f..0000000000 --- a/asm/d/a/d_a_player/initOffset__20daPy_boomerangMove_cFPC4cXyz.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8015E5B0: -/* 8015E5B0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8015E5B4 7C 08 02 A6 */ mflr r0 -/* 8015E5B8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8015E5BC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015E5C0 48 20 3C 1D */ bl _savegpr_29 -/* 8015E5C4 7C 7D 1B 78 */ mr r29, r3 -/* 8015E5C8 7C 9E 23 78 */ mr r30, r4 -/* 8015E5CC 48 00 13 05 */ bl getThrowBoomerangActor__9daPy_py_cFv -/* 8015E5D0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8015E5D4 41 82 00 20 */ beq lbl_8015E5F4 -/* 8015E5D8 7F A3 EB 78 */ mr r3, r29 -/* 8015E5DC 7F C4 F3 78 */ mr r4, r30 -/* 8015E5E0 48 00 02 9D */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz -/* 8015E5E4 80 1F 09 64 */ lwz r0, 0x964(r31) -/* 8015E5E8 60 00 00 80 */ ori r0, r0, 0x80 -/* 8015E5EC 90 1F 09 64 */ stw r0, 0x964(r31) -/* 8015E5F0 48 00 00 44 */ b lbl_8015E634 -lbl_8015E5F4: -/* 8015E5F4 C0 22 9C 14 */ lfs f1, lit_4248(r2) -/* 8015E5F8 48 10 93 5D */ bl cM_rndF__Ff -/* 8015E5FC C0 02 9C 10 */ lfs f0, lit_4247(r2) -/* 8015E600 EC 00 08 2A */ fadds f0, f0, f1 -/* 8015E604 D0 1D 00 04 */ stfs f0, 4(r29) -/* 8015E608 C0 22 9C 18 */ lfs f1, lit_4249(r2) -/* 8015E60C 48 10 93 49 */ bl cM_rndF__Ff -/* 8015E610 C0 02 9C 18 */ lfs f0, lit_4249(r2) -/* 8015E614 EC 00 08 2A */ fadds f0, f0, f1 -/* 8015E618 D0 1D 00 08 */ stfs f0, 8(r29) -/* 8015E61C C0 22 9C 1C */ lfs f1, lit_4250(r2) -/* 8015E620 48 10 93 35 */ bl cM_rndF__Ff -/* 8015E624 FC 00 08 1E */ fctiwz f0, f1 -/* 8015E628 D8 01 00 08 */ stfd f0, 8(r1) -/* 8015E62C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8015E630 B0 1D 00 02 */ sth r0, 2(r29) -lbl_8015E634: -/* 8015E634 38 00 00 00 */ li r0, 0 -/* 8015E638 98 1D 00 00 */ stb r0, 0(r29) -/* 8015E63C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8015E640 48 20 3B E9 */ bl _restgpr_29 -/* 8015E644 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8015E648 7C 08 03 A6 */ mtlr r0 -/* 8015E64C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8015E650 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/advanceCut__11dEvDtBase_cFP12dEvDtEvent_c.s b/asm/d/event/d_event_data/advanceCut__11dEvDtBase_cFP12dEvDtEvent_c.s deleted file mode 100644 index 8f717c6317..0000000000 --- a/asm/d/event/d_event_data/advanceCut__11dEvDtBase_cFP12dEvDtEvent_c.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8004628C: -/* 8004628C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046290 7C 08 02 A6 */ mflr r0 -/* 80046294 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046298 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004629C 48 31 BF 3D */ bl _savegpr_28 -/* 800462A0 7C 7C 1B 78 */ mr r28, r3 -/* 800462A4 7C 9D 23 78 */ mr r29, r4 -/* 800462A8 3B C0 00 00 */ li r30, 0 -/* 800462AC 3B E0 00 00 */ li r31, 0 -/* 800462B0 48 00 00 28 */ b lbl_800462D8 -lbl_800462B4: -/* 800462B4 7F 83 E3 78 */ mr r3, r28 -/* 800462B8 80 9C 00 08 */ lwz r4, 8(r28) -/* 800462BC 38 1F 00 2C */ addi r0, r31, 0x2c -/* 800462C0 7C 1D 00 2E */ lwzx r0, r29, r0 -/* 800462C4 1C 00 00 50 */ mulli r0, r0, 0x50 -/* 800462C8 7C 84 02 14 */ add r4, r4, r0 -/* 800462CC 48 00 00 31 */ bl advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c -/* 800462D0 3B DE 00 01 */ addi r30, r30, 1 -/* 800462D4 3B FF 00 04 */ addi r31, r31, 4 -lbl_800462D8: -/* 800462D8 80 1D 00 7C */ lwz r0, 0x7c(r29) -/* 800462DC 7C 1E 00 00 */ cmpw r30, r0 -/* 800462E0 41 80 FF D4 */ blt lbl_800462B4 -/* 800462E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 800462E8 48 31 BF 3D */ bl _restgpr_28 -/* 800462EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800462F0 7C 08 03 A6 */ mtlr r0 -/* 800462F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800462F8 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/advanceCut__12dEvDtStaff_cFi.s b/asm/d/event/d_event_data/advanceCut__12dEvDtStaff_cFi.s deleted file mode 100644 index 97bccf3c4f..0000000000 --- a/asm/d/event/d_event_data/advanceCut__12dEvDtStaff_cFi.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80044170: -/* 80044170 90 83 00 38 */ stw r4, 0x38(r3) -/* 80044174 38 00 00 01 */ li r0, 1 -/* 80044178 98 03 00 40 */ stb r0, 0x40(r3) -/* 8004417C 38 00 00 00 */ li r0, 0 -/* 80044180 98 03 00 41 */ stb r0, 0x41(r3) -/* 80044184 38 00 FF FF */ li r0, -1 -/* 80044188 90 03 00 3C */ stw r0, 0x3c(r3) -/* 8004418C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/init__11dEvDtBase_cFPci.s b/asm/d/event/d_event_data/init__11dEvDtBase_cFPci.s deleted file mode 100644 index 27191a137d..0000000000 --- a/asm/d/event/d_event_data/init__11dEvDtBase_cFPci.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_8004616C: -/* 8004616C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046170 7C 08 02 A6 */ mflr r0 -/* 80046174 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046178 39 61 00 20 */ addi r11, r1, 0x20 -/* 8004617C 48 31 C0 61 */ bl _savegpr_29 -/* 80046180 7C 7D 1B 78 */ mr r29, r3 -/* 80046184 7C 9E 23 78 */ mr r30, r4 -/* 80046188 7C BF 2B 78 */ mr r31, r5 -/* 8004618C 4B FF FF AD */ bl init__11dEvDtBase_cFv -/* 80046190 28 1E 00 00 */ cmplwi r30, 0 -/* 80046194 40 82 00 0C */ bne lbl_800461A0 -/* 80046198 38 60 00 00 */ li r3, 0 -/* 8004619C 48 00 00 D8 */ b lbl_80046274 -lbl_800461A0: -/* 800461A0 93 DD 00 00 */ stw r30, 0(r29) -/* 800461A4 80 7D 00 00 */ lwz r3, 0(r29) -/* 800461A8 80 03 00 04 */ lwz r0, 4(r3) -/* 800461AC 2C 00 00 00 */ cmpwi r0, 0 -/* 800461B0 40 81 00 10 */ ble lbl_800461C0 -/* 800461B4 80 03 00 00 */ lwz r0, 0(r3) -/* 800461B8 7C 1E 02 14 */ add r0, r30, r0 -/* 800461BC 90 1D 00 04 */ stw r0, 4(r29) -lbl_800461C0: -/* 800461C0 80 7D 00 00 */ lwz r3, 0(r29) -/* 800461C4 80 03 00 0C */ lwz r0, 0xc(r3) -/* 800461C8 2C 00 00 00 */ cmpwi r0, 0 -/* 800461CC 40 81 00 10 */ ble lbl_800461DC -/* 800461D0 80 03 00 08 */ lwz r0, 8(r3) -/* 800461D4 7C 1E 02 14 */ add r0, r30, r0 -/* 800461D8 90 1D 00 08 */ stw r0, 8(r29) -lbl_800461DC: -/* 800461DC 80 7D 00 00 */ lwz r3, 0(r29) -/* 800461E0 80 03 00 14 */ lwz r0, 0x14(r3) -/* 800461E4 2C 00 00 00 */ cmpwi r0, 0 -/* 800461E8 40 81 00 10 */ ble lbl_800461F8 -/* 800461EC 80 03 00 10 */ lwz r0, 0x10(r3) -/* 800461F0 7C 1E 02 14 */ add r0, r30, r0 -/* 800461F4 90 1D 00 0C */ stw r0, 0xc(r29) -lbl_800461F8: -/* 800461F8 80 7D 00 00 */ lwz r3, 0(r29) -/* 800461FC 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80046200 2C 00 00 00 */ cmpwi r0, 0 -/* 80046204 40 81 00 10 */ ble lbl_80046214 -/* 80046208 80 03 00 18 */ lwz r0, 0x18(r3) -/* 8004620C 7C 1E 02 14 */ add r0, r30, r0 -/* 80046210 90 1D 00 10 */ stw r0, 0x10(r29) -lbl_80046214: -/* 80046214 80 7D 00 00 */ lwz r3, 0(r29) -/* 80046218 80 03 00 24 */ lwz r0, 0x24(r3) -/* 8004621C 2C 00 00 00 */ cmpwi r0, 0 -/* 80046220 40 81 00 10 */ ble lbl_80046230 -/* 80046224 80 03 00 20 */ lwz r0, 0x20(r3) -/* 80046228 7C 1E 02 14 */ add r0, r30, r0 -/* 8004622C 90 1D 00 14 */ stw r0, 0x14(r29) -lbl_80046230: -/* 80046230 80 7D 00 00 */ lwz r3, 0(r29) -/* 80046234 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80046238 2C 00 00 00 */ cmpwi r0, 0 -/* 8004623C 40 81 00 10 */ ble lbl_8004624C -/* 80046240 80 03 00 28 */ lwz r0, 0x28(r3) -/* 80046244 7C 1E 02 14 */ add r0, r30, r0 -/* 80046248 90 1D 00 18 */ stw r0, 0x18(r29) -lbl_8004624C: -/* 8004624C 80 7D 00 00 */ lwz r3, 0(r29) -/* 80046250 80 03 00 34 */ lwz r0, 0x34(r3) -/* 80046254 2C 00 00 00 */ cmpwi r0, 0 -/* 80046258 40 81 00 10 */ ble lbl_80046268 -/* 8004625C 80 03 00 30 */ lwz r0, 0x30(r3) -/* 80046260 7C 1E 02 14 */ add r0, r30, r0 -/* 80046264 90 1D 00 1C */ stw r0, 0x1c(r29) -lbl_80046268: -/* 80046268 93 FD 00 20 */ stw r31, 0x20(r29) -/* 8004626C 80 7D 00 00 */ lwz r3, 0(r29) -/* 80046270 80 63 00 04 */ lwz r3, 4(r3) -lbl_80046274: -/* 80046274 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046278 48 31 BF B1 */ bl _restgpr_29 -/* 8004627C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046280 7C 08 03 A6 */ mtlr r0 -/* 80046284 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046288 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/init__11dEvDtBase_cFv.s b/asm/d/event/d_event_data/init__11dEvDtBase_cFv.s deleted file mode 100644 index 912cd58f12..0000000000 --- a/asm/d/event/d_event_data/init__11dEvDtBase_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80046138: -/* 80046138 38 00 00 00 */ li r0, 0 -/* 8004613C 90 03 00 00 */ stw r0, 0(r3) -/* 80046140 90 03 00 04 */ stw r0, 4(r3) -/* 80046144 90 03 00 08 */ stw r0, 8(r3) -/* 80046148 90 03 00 0C */ stw r0, 0xc(r3) -/* 8004614C 90 03 00 10 */ stw r0, 0x10(r3) -/* 80046150 90 03 00 14 */ stw r0, 0x14(r3) -/* 80046154 90 03 00 18 */ stw r0, 0x18(r3) -/* 80046158 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8004615C 38 00 FF FF */ li r0, -1 -/* 80046160 90 03 00 20 */ stw r0, 0x20(r3) -/* 80046164 38 60 00 00 */ li r3, 0 -/* 80046168 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_data/init__12dEvDtStaff_cFv.s b/asm/d/event/d_event_data/init__12dEvDtStaff_cFv.s deleted file mode 100644 index 33e556c6dd..0000000000 --- a/asm/d/event/d_event_data/init__12dEvDtStaff_cFv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80044134: -/* 80044134 80 03 00 30 */ lwz r0, 0x30(r3) -/* 80044138 90 03 00 38 */ stw r0, 0x38(r3) -/* 8004413C 38 80 00 01 */ li r4, 1 -/* 80044140 98 83 00 40 */ stb r4, 0x40(r3) -/* 80044144 38 00 00 00 */ li r0, 0 -/* 80044148 98 03 00 41 */ stb r0, 0x41(r3) -/* 8004414C 38 00 FF FF */ li r0, -1 -/* 80044150 90 03 00 3C */ stw r0, 0x3c(r3) -/* 80044154 80 03 00 2C */ lwz r0, 0x2c(r3) -/* 80044158 2C 00 00 02 */ cmpwi r0, 2 -/* 8004415C 4C 82 00 20 */ bnelr -/* 80044160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80044164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80044168 90 83 51 84 */ stw r4, 0x5184(r3) -/* 8004416C 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getMySubstanceP__16dEvent_manager_cFiPCci.s b/asm/d/event/d_event_manager/getMySubstanceP__16dEvent_manager_cFiPCci.s deleted file mode 100644 index fcb2128946..0000000000 --- a/asm/d/event/d_event_manager/getMySubstanceP__16dEvent_manager_cFiPCci.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800480EC: -/* 800480EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800480F0 7C 08 02 A6 */ mflr r0 -/* 800480F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800480F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800480FC 93 C1 00 08 */ stw r30, 8(r1) -/* 80048100 7C 7E 1B 78 */ mr r30, r3 -/* 80048104 7C DF 33 78 */ mr r31, r6 -/* 80048108 38 C0 00 00 */ li r6, 0 -/* 8004810C 4B FF FE BD */ bl getMyDataP__16dEvent_manager_cFiPCci -/* 80048110 7C 64 1B 79 */ or. r4, r3, r3 -/* 80048114 40 82 00 0C */ bne lbl_80048120 -/* 80048118 38 60 00 00 */ li r3, 0 -/* 8004811C 48 00 00 10 */ b lbl_8004812C -lbl_80048120: -/* 80048120 7F C3 F3 78 */ mr r3, r30 -/* 80048124 7F E5 FB 78 */ mr r5, r31 -/* 80048128 4B FF E4 C1 */ bl getSubstance__16dEvent_manager_cFP11dEvDtData_ci -lbl_8004812C: -/* 8004812C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80048130 83 C1 00 08 */ lwz r30, 8(r1) -/* 80048134 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80048138 7C 08 03 A6 */ mtlr r0 -/* 8004813C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80048140 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/getSubstance__16dEvent_manager_cFP11dEvDtData_ci.s b/asm/d/event/d_event_manager/getSubstance__16dEvent_manager_cFP11dEvDtData_ci.s deleted file mode 100644 index 007a126648..0000000000 --- a/asm/d/event/d_event_manager/getSubstance__16dEvent_manager_cFP11dEvDtData_ci.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_800465E8: -/* 800465E8 80 A4 00 28 */ lwz r5, 0x28(r4) -/* 800465EC 2C 05 00 00 */ cmpwi r5, 0 -/* 800465F0 41 80 00 10 */ blt lbl_80046600 -/* 800465F4 80 04 00 2C */ lwz r0, 0x2c(r4) -/* 800465F8 2C 00 00 00 */ cmpwi r0, 0 -/* 800465FC 41 81 00 0C */ bgt lbl_80046608 -lbl_80046600: -/* 80046600 38 60 00 00 */ li r3, 0 -/* 80046604 4E 80 00 20 */ blr -lbl_80046608: -/* 80046608 80 04 00 24 */ lwz r0, 0x24(r4) -/* 8004660C 2C 00 00 03 */ cmpwi r0, 3 -/* 80046610 41 82 00 3C */ beq lbl_8004664C -/* 80046614 40 80 00 10 */ bge lbl_80046624 -/* 80046618 2C 00 00 00 */ cmpwi r0, 0 -/* 8004661C 40 80 00 14 */ bge lbl_80046630 -/* 80046620 48 00 00 60 */ b lbl_80046680 -lbl_80046624: -/* 80046624 2C 00 00 05 */ cmpwi r0, 5 -/* 80046628 40 80 00 58 */ bge lbl_80046680 -/* 8004662C 48 00 00 3C */ b lbl_80046668 -lbl_80046630: -/* 80046630 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80046634 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80046638 7C 63 02 14 */ add r3, r3, r0 -/* 8004663C 80 63 00 14 */ lwz r3, 0x14(r3) -/* 80046640 54 A0 10 3A */ slwi r0, r5, 2 -/* 80046644 7C 63 02 14 */ add r3, r3, r0 -/* 80046648 4E 80 00 20 */ blr -lbl_8004664C: -/* 8004664C 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 80046650 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80046654 7C 63 02 14 */ add r3, r3, r0 -/* 80046658 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8004665C 54 A0 10 3A */ slwi r0, r5, 2 -/* 80046660 7C 63 02 14 */ add r3, r3, r0 -/* 80046664 4E 80 00 20 */ blr -lbl_80046668: -/* 80046668 80 03 01 B4 */ lwz r0, 0x1b4(r3) -/* 8004666C 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80046670 7C 63 02 14 */ add r3, r3, r0 -/* 80046674 80 03 00 1C */ lwz r0, 0x1c(r3) -/* 80046678 7C 60 2A 14 */ add r3, r0, r5 -/* 8004667C 4E 80 00 20 */ blr -lbl_80046680: -/* 80046680 38 60 00 00 */ li r3, 0 -/* 80046684 4E 80 00 20 */ blr diff --git a/asm/d/event/d_event_manager/startProc__16dEvent_manager_cFP12dEvDtEvent_c.s b/asm/d/event/d_event_manager/startProc__16dEvent_manager_cFP12dEvDtEvent_c.s deleted file mode 100644 index 02339fa670..0000000000 --- a/asm/d/event/d_event_manager/startProc__16dEvent_manager_cFP12dEvDtEvent_c.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80046CB8: -/* 80046CB8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80046CBC 7C 08 02 A6 */ mflr r0 -/* 80046CC0 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046CC4 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046CC8 48 31 B5 0D */ bl _savegpr_27 -/* 80046CCC 7C 7D 1B 78 */ mr r29, r3 -/* 80046CD0 7C 9E 23 78 */ mr r30, r4 -/* 80046CD4 3B E0 00 00 */ li r31, 0 -/* 80046CD8 3B 80 00 00 */ li r28, 0 -/* 80046CDC 48 00 00 90 */ b lbl_80046D6C -lbl_80046CE0: -/* 80046CE0 38 1C 00 2C */ addi r0, r28, 0x2c -/* 80046CE4 7C 9E 00 2E */ lwzx r4, r30, r0 -/* 80046CE8 80 1D 01 B4 */ lwz r0, 0x1b4(r29) -/* 80046CEC 1C 00 00 24 */ mulli r0, r0, 0x24 -/* 80046CF0 7C 7D 02 14 */ add r3, r29, r0 -/* 80046CF4 80 63 00 08 */ lwz r3, 8(r3) -/* 80046CF8 1C 04 00 50 */ mulli r0, r4, 0x50 -/* 80046CFC 7F 63 02 14 */ add r27, r3, r0 -/* 80046D00 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 80046D04 2C 00 00 00 */ cmpwi r0, 0 -/* 80046D08 40 82 00 3C */ bne lbl_80046D44 -/* 80046D0C 7F A3 EB 78 */ mr r3, r29 -/* 80046D10 7F 64 DB 78 */ mr r4, r27 -/* 80046D14 38 A0 00 01 */ li r5, 1 -/* 80046D18 48 00 19 01 */ bl specialCast__16dEvent_manager_cFPCci -/* 80046D1C 28 03 00 00 */ cmplwi r3, 0 -/* 80046D20 40 82 00 10 */ bne lbl_80046D30 -/* 80046D24 7F 63 DB 78 */ mr r3, r27 -/* 80046D28 38 80 FF FF */ li r4, -1 -/* 80046D2C 4B FD 6A 75 */ bl fopAcM_searchFromName4Event__FPCcs -lbl_80046D30: -/* 80046D30 28 03 00 00 */ cmplwi r3, 0 -/* 80046D34 41 82 00 10 */ beq lbl_80046D44 -/* 80046D38 80 03 04 9C */ lwz r0, 0x49c(r3) -/* 80046D3C 60 00 80 00 */ ori r0, r0, 0x8000 -/* 80046D40 90 03 04 9C */ stw r0, 0x49c(r3) -lbl_80046D44: -/* 80046D44 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 80046D48 2C 00 00 01 */ cmpwi r0, 1 -/* 80046D4C 40 82 00 10 */ bne lbl_80046D5C -/* 80046D50 7F A3 EB 78 */ mr r3, r29 -/* 80046D54 7F 64 DB 78 */ mr r4, r27 -/* 80046D58 48 00 15 75 */ bl issueStaff__16dEvent_manager_cFPCc -lbl_80046D5C: -/* 80046D5C 7F 63 DB 78 */ mr r3, r27 -/* 80046D60 4B FF D3 D5 */ bl init__12dEvDtStaff_cFv -/* 80046D64 3B FF 00 01 */ addi r31, r31, 1 -/* 80046D68 3B 9C 00 04 */ addi r28, r28, 4 -lbl_80046D6C: -/* 80046D6C 80 1E 00 7C */ lwz r0, 0x7c(r30) -/* 80046D70 7C 1F 00 00 */ cmpw r31, r0 -/* 80046D74 41 80 FF 6C */ blt lbl_80046CE0 -/* 80046D78 38 00 00 01 */ li r0, 1 -/* 80046D7C 90 1E 00 A4 */ stw r0, 0xa4(r30) -/* 80046D80 38 7D 01 BC */ addi r3, r29, 0x1bc -/* 80046D84 4B FF D0 D5 */ bl init__11dEvDtFlag_cFv -/* 80046D88 39 61 00 20 */ addi r11, r1, 0x20 -/* 80046D8C 48 31 B4 95 */ bl _restgpr_27 -/* 80046D90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80046D94 7C 08 03 A6 */ mtlr r0 -/* 80046D98 38 21 00 20 */ addi r1, r1, 0x20 -/* 80046D9C 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h index 0c2f69d007..b6867363da 100644 --- a/include/JSystem/J2DGraph/J2DAnmLoader.h +++ b/include/JSystem/J2DGraph/J2DAnmLoader.h @@ -6,7 +6,7 @@ #include "dolphin/types.h" struct J2DAnmLoaderDataBase { - /* 80308A6C */ static void load(void const*); + /* 80308A6C */ static void* load(void const*); }; class J2DAnmLoader { diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index d73d42d169..a58858aa85 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -128,6 +128,7 @@ public: void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); void animationTransform(); void updateTransform(const J2DAnmTransform* transform); + void setUserInfo(u64 info) { mUserInfoTag = info; } static f32 static_mBounds[4]; diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index e0b78ce035..18ff4ee9e2 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -299,6 +299,8 @@ public: virtual ~J3DFrameCtrl() {} f32 getRate() const { return mRate; } + f32 getFrame() const { return mFrame; } + u8 getAttribute() const { return mAttribute; } void setAttribute(u8 attr) { mAttribute = attr; } void setEnd(s16 end) { mEnd = end; } void setRate(f32 rate) { mRate = rate; } diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h index 9cbf745d43..25a21bad57 100644 --- a/include/JSystem/J3DGraphAnimator/J3DJoint.h +++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h @@ -29,6 +29,14 @@ public: static J3DJoint* mJoint; }; // Size: 0x4 +class J3DMtxCalcNoAnmBase : public J3DMtxCalc { +public: + /* 8000FA8C */ virtual ~J3DMtxCalcNoAnmBase(); +}; + +template +class J3DMtxCalcNoAnm : public J3DMtxCalcNoAnmBase, public A, public B {}; + class J3DJoint; typedef int (*J3DJointCallBack)(J3DJoint*, int); diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h index 191908b869..f3c349f72a 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h @@ -124,6 +124,8 @@ public: /* 800A4820 */ virtual ~J3DMaterialAnm(); /* 8032C3C4 */ virtual void calc(J3DMaterial*) const; + const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; } + private: /* 0x04 */ J3DMatColorAnm mMatColorAnm[2]; /* 0x14 */ J3DTexMtxAnm mTexMtxAnm[8]; diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h index 290f05fe66..02c71511b1 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -34,7 +34,7 @@ public: /* 803281B4 */ void calcBumpMtx(); /* 803282B8 */ void calcBBoardMtx(); /* 803282EC */ void prepareShapePackets(); - Mtx* getAnmMtx(int); + MtxP getAnmMtx(int); /* 80327CA4 */ virtual void update(); /* 80327E4C */ virtual void entry(); @@ -48,6 +48,8 @@ public: void onFlag(u32 flag) { mFlags |= flag; } void offFlag(u32 flag) { mFlags &= ~flag; } bool checkFlag(u32 flag) const { return (mFlags & flag) ? true : false; } + Mtx& getBaseTRMtx() { return mBaseTransformMtx; } + void i_setBaseTRMtx(Mtx m) { PSMTXCopy(m, mBaseTransformMtx); } // is there a better way to handle inlines with same name as non-inlines? MtxP i_getAnmMtx(int p1) { return mMtxBuffer->getAnmMtx(p1); } diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index d4219a9985..5478f70764 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -49,6 +49,7 @@ public: J3DColorBlock* getColorBlock() const { return mColorBlock; } J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; } J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; } + J3DShape* getShape() { return mShape; } J3DMaterialAnm* getMaterialAnm() const { if ((u32)mMaterialAnm < 0xC0000000) { return mMaterialAnm; diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index 9410d61ab9..332acb3d15 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -48,6 +48,8 @@ public: void setVertexDataPointer(J3DVertexData* pVtxData) { mVertexData = pVtxData; } void* getVcdVatCmd() const { return mVcdVatCmd; } void setVcdVatCmd(void* pVatCmd) { mVcdVatCmd = pVatCmd; } + void show() { offFlag(1); } + void hide() { onFlag(1); } static void resetVcdVatCache() { sOldVcdVatCmd = NULL; } diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index d71f5de5e7..cb252d9aea 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -10,6 +10,14 @@ inline f32 JMAFastReciprocal(f32 value) { return __fres(value); } +inline f32 JMAFastSqrt(f32 input) { + if (input > 0.0f) { + f64 tmp = __frsqrte(input); + return tmp * input; + } + return input; +} + namespace JMath { inline f32 fastReciprocal(f32 value) { diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index dff6740eed..1bc91d70f0 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -273,6 +273,7 @@ public: u8 GetWeightUc() const { return mWeight; } void SetWeight(u8 weight) { mWeight = weight; } fopAc_ac_c* GetAc() { return mActor; } + void SetActor(void* ac) { mActor = (fopAc_ac_c*)ac; } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cCcD_Stts)); @@ -281,8 +282,8 @@ class cCcD_Obj; // placeholder class cCcD_ObjCommonBase { protected: - /* 0x00 */ int mSPrm; - /* 0x04 */ int mRPrm; + /* 0x00 */ u32 mSPrm; + /* 0x04 */ u32 mRPrm; /* 0x08 */ cCcD_Obj* mHitObj; /* 0x0C vtable */ public: @@ -295,6 +296,8 @@ public: s32 getRPrm() const { return mRPrm; } cCcD_Obj* getHitObj() { return mHitObj; } u32 MskSPrm(u32 mask) const { return mSPrm & mask; } + void OnSPrmBit(u32 flag) { mSPrm |= flag; } + void OffSPrmBit(u32 flag) { mSPrm &= ~flag; } }; STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); @@ -311,6 +314,8 @@ public: bool ChkSet() const { return MskSPrm(1); } u8 GetAtp() const { return mAtp; } u32 MskType(u32 msk) const { return mType & msk; } + void SetType(u32 type) { mType = type; } + void SetAtp(int atp) { mAtp = atp; } protected: /* 0x10 */ int mType; @@ -388,6 +393,11 @@ public: bool ChkAtType(u32 type) const { return mObjAt.MskType(type); } u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); } u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); } + void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); } + void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); } + void SetAtType(u32 type) { mObjAt.SetType(type); } + void OnAtSetBit() { mObjAt.OnSPrmBit(1); } + void SetAtAtp(int atp) { mObjAt.SetAtp(atp); } }; // Size = 0x40 diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 12d01b9f7c..21607f9b6d 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -47,6 +47,18 @@ inline u8 cLib_checkBit(u8& pVar, u8 pBit) { return pVar & pBit; } +template +inline T cLib_minMaxLimit(T param_0, T min, T max) { + if (param_0 < min) { + return max; + } + min = param_0; + if (min > max) { + min = max; + } + return min; +} + void MtxInit(void); void MtxTrans(float, float, float, unsigned char); void MtxScale(float, float, float, unsigned char); diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h index 47acd885af..14315a9fc3 100644 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ b/include/SSystem/SComponent/c_m3d_g_cps.h @@ -26,6 +26,7 @@ public: } bool Cross(cM3dGCyl const* cyl, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*this, *cyl, xyz); } bool Cross(cM3dGSph const* sph, cXyz* xyz) const { return cM3d_Cross_CpsSph(*this, *sph, xyz); } + void SetR(f32 r) { mRadius = r; } }; // Size = 0x20 diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index cdce05bcbf..d906fe333e 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1,6 +1,7 @@ #ifndef D_A_D_A_ALINK_H #define D_A_D_A_ALINK_H +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "Z2AudioLib/Z2Creature.h" #include "Z2AudioLib/Z2WolfHowlMgr.h" @@ -18,11 +19,12 @@ #include "d/particle/d_particle.h" #include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" +#include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h" +#include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h" class fopEn_enemy_c; class daAlinkHIO_anm_c; class J3DAnmTevRegKey; -class dCcG_At_Spl; class dDemo_actor_c; class J2DScreen; @@ -31,23 +33,29 @@ class J2DAnmBase; class daAlink_lockCursor_c : public dDlst_base_c { public: - /* 80125F14 */ void create(); + /* 80125F14 */ BOOL create(); /* 80126358 */ void update(); /* 80126424 */ virtual void draw(); /* 800CFE68 */ virtual ~daAlink_lockCursor_c(); + void initFrame() { + field_0x4 = false; + field_0x2c = 4.0f; + field_0x30 = 0.0f; + } + private: /* 0x04 */ bool field_0x4; /* 0x05 */ u8 field_0x5[3]; - /* 0x08 */ J2DScreen* field_0x8; + /* 0x08 */ J2DScreen* mScrn; /* 0x0C */ J2DPane* field_0xc; - /* 0x10 */ J2DPane* field_0x10; - /* 0x14 */ J2DPane* field_0x14; - /* 0x18 */ J2DPane* field_0x18; - /* 0x1C */ J2DAnmBase* field_0x1c; - /* 0x20 */ J2DAnmBase* field_0x20; - /* 0x24 */ J2DAnmBase* field_0x24; - /* 0x28 */ J2DAnmBase* field_0x28; + /* 0x10 */ J2DPane* mCursor0; + /* 0x14 */ J2DPane* mCursor1; + /* 0x18 */ J2DPane* mCursor2; + /* 0x1C */ J2DAnmTevRegKey* field_0x1c; + /* 0x20 */ J2DAnmTevRegKey* field_0x20; + /* 0x24 */ J2DAnmColorKey* field_0x24; + /* 0x28 */ J2DAnmTransformKey* field_0x28; /* 0x2C */ float field_0x2c; /* 0x30 */ float field_0x30; /* 0x34 */ float field_0x34; @@ -56,7 +64,7 @@ private: class daAlink_sight_c : public daPy_sightPacket_c { public: - /* 80126650 */ void create(); + /* 80126650 */ bool create(); /* 80126710 */ void onLockFlg(); /* 801266C0 */ virtual void draw(); @@ -65,7 +73,7 @@ public: private: /* 0x4C */ bool mLockFlag; /* 0x4D */ u8 field_0x4d[3]; - /* 0x50 */ daAlink_lockCursor_c field_0x50; + /* 0x50 */ daAlink_lockCursor_c mLockCursor; }; class daAlink_blur_c : public J3DPacket { @@ -78,12 +86,12 @@ public: /* 800CFD58 */ virtual ~daAlink_blur_c(); private: - /* 0x010 */ u8 field_0x10[4]; + /* 0x010 */ void* m_blurTex; /* 0x014 */ int field_0x14; /* 0x018 */ u8 field_0x18[4]; /* 0x01C */ int field_0x1c; /* 0x020 */ u8 field_0x20[4]; - /* 0x024 */ float field_0x24; + /* 0x024 */ f32 field_0x24; /* 0x028 */ u8 field_0x28[4]; /* 0x02C */ cXyz field_0x2c; /* 0x038 */ cXyz field_0x38[0x3C]; @@ -108,13 +116,76 @@ public: /* 800CFCF4 */ daAlink_footData_c(); private: - u8 field_0x00[0xa4]; + /* 0x00 */ u8 field_0x00[0x8]; + /* 0x08 */ cXyz field_0x8; + /* 0x14 */ Mtx field_0x14; + /* 0x44 */ Mtx field_0x44; + /* 0x74 */ Mtx field_0x74; +}; // Size: 0xA4 + +STATIC_ASSERT(sizeof(daAlink_footData_c) == 0xA4); + +class daAlink_matAnm_c : public J3DMaterialAnm { +public: + /* 8009D8E4 */ void init(); + /* 800D0180 */ void offSetFlg(); + + /* 800D0B8C */ virtual ~daAlink_matAnm_c(); + /* 8009D90C */ virtual void calc(J3DMaterial*) const; + +private: + /* 0x0F4 */ f32 field_0xf4; + /* 0x0F8 */ f32 field_0xf8; + /* 0x0FC */ f32 mNowOffsetX; + /* 0x100 */ f32 mNowOffsetY; + /* 0x104 */ int mSetFlag; }; +struct daAlink_AnmData { + /* 0x0 */ u16 field_0x0; + /* 0x2 */ u16 field_0x2; + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; + /* 0x6 */ u16 field_0x6; + /* 0x8 */ u16 field_0x8; + /* 0xA */ u16 field_0xa; +}; // Size: 0xC + +struct daAlink_WlAnmData { + /* 0x0 */ u16 field_0x0; + /* 0x2 */ u8 field_0x2; + /* 0x3 */ u8 field_0x3; + /* 0x4 */ u16 field_0x4; + /* 0x6 */ u8 field_0x6; + /* 0x7 */ u8 field_0x7; +}; // Size: 0x8 + class daAlink_c : public daPy_py_c { public: enum daAlink_ANM { - GANON_FINISH = 408 // name probably wrong, fix later + /* 0x13 */ ANM_DASH = 19, + /* 0x15 */ ANM_WAIT_TURN = 0x15, + /* 0x19 */ ANM_IDLE = 0x19, // name might be inaccurate + /* 0x1B */ ANM_WAIT_INIT = 0x1B, + /* 0x1D */ ANM_SIDE_STEP_LEFT = 0x1D, + /* 0x1E */ ANM_SIDE_STEP_RIGHT, + /* 0x1F */ ANM_SIDE_STEP_LEFT_LAND, + /* 0x20 */ ANM_SIDE_STEP_RIGHT_LAND, + /* 0x21 */ ANM_BACK_JUMP = 0x21, + /* 0x22 */ ANM_BACK_JUMP_LAND, + /* 0x23 */ ANM_FRONT_ROLL, + /* 0x24 */ ANM_ROLL_CRASH, + /* 0x71 */ ANM_CUT_JUMP = 0x71, + /* 0x90 */ ANM_SERVICE_WAIT = 0x90, + /* 0xB6 */ ANM_TIRED_WAIT = 0xB6, + /* 0xB7 */ ANM_TIRED_WAIT_INIT, + /* 0xBD */ ANM_FORWARD_SLIDE = 0xBD, + /* 0xBE */ ANM_BACKWARD_SLIDE, + /* 0xBF */ ANM_BACKWARD_SLIDE_LAND, + /* 0xC0 */ ANM_FORWARD_SLIDE_LAND, + + /* 0x18D */ ANM_CUT_JUMP_LARGE = 0x18D, // verify + ANM_GANON_FINISH = 408 // name probably wrong, fix later }; enum daAlink_UPPER { @@ -126,157 +197,203 @@ public: enum daAlink_UNDER {}; enum daAlink_FTANM {}; enum daAlink_WARP_MAT_MODE {}; - enum daAlink_WANM {}; + + enum daAlink_WANM { + /* 0x5E */ ANM_WOLF_HOWL_SUCCESS = 94 + }; enum MODE_FLG { - PLAYER_FLY = 0x70852, + /* 0x00000001 */ MODE_IDLE = (1 << 0), + /* 0x00000002 */ MODE_JUMP = (1 << 1), + /* 0x00000004 */ MODE_DISABLE_ITEMS = (1 << 2), // ? + /* 0x00000008 */ MODE_HIT_STUN = (1 << 3), + /* 0x00000010 */ MODE_CLIMB = (1 << 4), // ? + /* 0x00000020 */ MODE_UNK_20 = 0x20, // related to wolf? + /* 0x00000040 */ MODE_NO_COLLISION = 0x40, // disables wall col checks + /* 0x00000080 */ MODE_GUARD_ENABLED = 0x80, + /* 0x00000100 */ MODE_UNK_100 = 0x100, + /* 0x00000400 */ MODE_RIDING = 0x400, + /* 0x00000800 */ MODE_UNK_800 = 0x800, + /* 0x00001000 */ MODE_UNK_1000 = + 0x1000, // affects things like anim set when controlling rod statue + /* 0x00002000 */ MODE_UNK_2000 = 0x2000, + /* 0x00004000 */ MODE_UNK_4000 = 0x4000, + /* 0x00008000 */ MODE_UNK_8000 = 0x8000, + /* 0x00010000 */ MODE_VINE_CLIMB = 0x10000, // used for vine climbing + /* 0x00020000 */ MODE_ROPE_WALK = 0x20000, + /* 0x00040000 */ MODE_SWIMMING = 0x40000, // this might be more than swimming + /* 0x00100000 */ MODE_GRAB_PLACE = 0x100000, + /* 0x00800000 */ MODE_UNK_800000 = 0x800000, // moves camera down + /* 0x01000000 */ MODE_UNK_1000000 = 0x1000000, // attention related? + /* 0x02000000 */ MODE_UNK_2000000 = 0x2000000, // maybe related to snow/sand? + /* 0x04000000 */ MODE_UNK_4000000 = 0x4000000, + /* 0x08000000 */ MODE_UNK_8000000 = 0x8000000, + /* 0x10000000 */ MODE_UNK_10000000 = 0x10000000, // catch boomerang? + /* 0x20000000 */ MODE_UNK_20000000 = 0x20000000, + /* 0x40000000 */ MODE_UNK_40000000 = 0x40000000, + MODE_PLAYER_FLY = 0x70C52, }; enum daAlink_PROC { - PREACTION_UNEQUIP, - SERVICE_WAIT, - HUMAN_WAIT = 3, - HUMAN_SIDESTEP = 10, - HUMAN_SIDESTEP_LAND, - HUMAN_SLIDE, - FRONT_ROLL = 14, - FRONT_ROLL_CRASH, - HUMAN_KNOCKBACK, - SIDE_ROLL, - BACK_JUMP, - BACK_JUMP_LAND, - SLIP, - HUMAN_AUTOJUMP, - DIVE_JUMP, - ROLL_JUMP, - FALL, - LAND, - SMALL_JUMP, - STEP_MOVE, - GUARD_SLIP = 29, - GUARD_ATTACK, - GUARD_BREAK, - TURN_MOVE, - CUT_NORMAL, - CUT_FINISH, - CUT_FINISH_JUMP_UP, - CUT_FINISH_JUMP_UP_LAND, - CUT_REVERSE, - CUT_JUMP, - CUT_JUMP_LAND, - COMBO_CUT_TURN, - CUT_CHARGE, - CUT_TURN_MOVE, - CUT_DOWN, - CUT_DOWN_LAND, - CUT_HEAD, - CUT_HEAD_LAND, - CUT_LARGE_JUMP_CHARGE, - CUT_LARGE_JUMP, - CUT_LARGE_JUMP_LAND, - DAMAGE, - LAND_DAMAGE = 52, - CRAWL_START, - CRAWL_MOVE, - CRAWL_AUTOMOVE, - CRAWL_END, - PULL_MOVE, - HORSE_RIDE, - HORSE_GETOFF, - HORSE_TURN = 61, - HORSE_JUMP, - HORSE_LAND, - HORSE_SUBJECTIVITY, - HORSE_CUT, - HORSE_CUT_CHARGE_READY, - HORSE_CUT_TURN, - HORSE_DAMAGE, - RIDE_BOW_READY, - HORSE_BOTTLE_DRINK = 76, - HORSE_KANDELAAR_POUR = 78, - HORSE_RUN, - HORSE_HANG, - BOAR_RUN = 83, - HANG_START = 85, - HANG_FALL_START, - HANG_UP, - HANG_WAIT, - HANG_MOVE, - COPY_ROD_SWING = 101, - GRAB_READY = 108, - GRAB_UP, - GRAB_THROW = 111, - GRAB_DOWN, - GRAB_REBOUND = 114, - GRAB_STAND, - INSECT_CATCH, - PICK_UP, - PICK_PUT, - HUMAN_ST_ESCAPE, - CLIMB_MOVE_VERTICAL = 130, - CLIMB_MOVE_HORIZONTAL, - CANOE_RIDE = 140, - CANOE_JUMP_RIDE, - CANOE_GETOFF, - CANOE_ROW = 144, - CANOE_PADDLE_SHIFT, - CANOE_PADDLE_PUT, - CANOE_PADDLE_GRAB, - CANOE_ROD_GRAB, - CANOE_FISHING_REEL = 150, - CANOE_FISHING_GET, - CANOE_SUBJECTIVITY, - CANOE_BOTTLE_DRINK = 160, - CANOE_KANDELAAR_POUR, - FISHING_FOOD = 163, - BOARD_CUT_TURN = 173, - FM_CHAIN_UP, - BOTTLE_DRINK = 179, - EMPTY_BOTTLE_SWING = 181, - GRASS_WHISTLE = 186, - HAWK_WAIT = 188, - FLOOR_DOWN_REBOUND = 189, - GORON_RIDE_WAIT, - GOAT_THROW = 192, - GOAT_STROKE, - MAGNE_BOOTS_FLY = 204, - BOOTS_EQUIP, - SUMOU_PUSH = 207, - SUMOU_SIDE_MOVE, - SUMOU_ACTION, - SUMOU_STAGGER, - SUMOU_WIN_LOSE, - BOSS_ENEMY_HANG = 220, - SCREAM_WAIT = 222, - DUNGEON_WARP_READY = 234, - WOLF_HOWL = 237, - WOLF_WAIT = 241, - WOLF_DASH = 243, - WOLF_KNOCKBACK = 244, - WOLF_SIDESTEP = 247, - WOLF_AUTOJUMP = 252, - WOLF_RSIT = 255, - WOLF_DAMAGE = 263, - WOLF_SLIDE = 271, - WOLF_ROPE_HANG = 275, - WOLF_TAGLOCK_JUMP = 280, - WOLF_TAGLOCK_LAND, - WOLF_DOWNATTACK_PULLOUT = 291, - WOLF_JUMPATTACK = 284, - WOLF_ST_ESCAPE = 289, - WOLF_CHAIN = 305, - WOLF_DIG, - WOLF_ENEMY_HANG_BITE = 310, - SUBJECTIVITY = 318, - POLY_DAMAGE = 321, - ELEC_DAMAGE, - PUSH_PULL_WAIT, - PUSH_MOVE, - TRESURE_STAND = 328, - METAMORPHOSE = 333, - DEAD = 336, - LARGE_DAMAGE = 345, - LARGE_DAMAGE_WALL, + /* 0x000 */ PREACTION_UNEQUIP, + /* 0x001 */ SERVICE_WAIT, + /* 0x003 */ HUMAN_WAIT = 3, + /* 0x004 */ HUMAN_MOVE, + /* 0x005 */ HUMAN_ATN_MOVE, + /* 0x006 */ HUMAN_ATN_ACTOR_WAIT, + /* 0x007 */ HUMAN_ATN_ACTOR_MOVE, + /* 0x008 */ HUMAN_WAIT_TURN, + /* 0x009 */ HUMAN_MOVE_TURN, + /* 0x00A */ HUMAN_SIDESTEP, + /* 0x00B */ HUMAN_SIDESTEP_LAND, + /* 0x00C */ HUMAN_SLIDE, + /* 0x00D */ HUMAN_SLIDE_LAND, + /* 0x00E */ FRONT_ROLL, + /* 0x00F */ FRONT_ROLL_CRASH, + /* 0x010 */ HUMAN_KNOCKBACK, + /* 0x011 */ SIDE_ROLL, + /* 0x012 */ BACK_JUMP, + /* 0x013 */ BACK_JUMP_LAND, + /* 0x014 */ SLIP, + /* 0x015 */ HUMAN_AUTOJUMP, + /* 0x016 */ DIVE_JUMP, + /* 0x017 */ ROLL_JUMP, + /* 0x018 */ FALL, + /* 0x019 */ LAND, + /* 0x01A */ SMALL_JUMP, + /* 0x01B */ STEP_MOVE, + /* 0x01D */ GUARD_SLIP = 29, + /* 0x01E */ GUARD_ATTACK, + /* 0x01F */ GUARD_BREAK, + /* 0x020 */ TURN_MOVE, + /* 0x021 */ CUT_NORMAL, + /* 0x022 */ CUT_FINISH, + /* 0x023 */ CUT_FINISH_JUMP_UP, + /* 0x024 */ CUT_FINISH_JUMP_UP_LAND, + /* 0x025 */ CUT_REVERSE, + /* 0x026 */ CUT_JUMP, + /* 0x027 */ CUT_JUMP_LAND, + /* 0x028 */ COMBO_CUT_TURN, + /* 0x029 */ CUT_CHARGE, + /* 0x02A */ CUT_TURN_MOVE, + /* 0x02B */ CUT_DOWN, + /* 0x02C */ CUT_DOWN_LAND, + /* 0x02D */ CUT_HEAD, + /* 0x02E */ CUT_HEAD_LAND, + /* 0x02F */ CUT_LARGE_JUMP_CHARGE, + /* 0x030 */ CUT_LARGE_JUMP, + /* 0x031 */ CUT_LARGE_JUMP_LAND, + /* 0x032 */ DAMAGE, + /* 0x034 */ LAND_DAMAGE = 52, + /* 0x035 */ CRAWL_START, + /* 0x036 */ CRAWL_MOVE, + /* 0x037 */ CRAWL_AUTOMOVE, + /* 0x038 */ CRAWL_END, + /* 0x039 */ PULL_MOVE, + /* 0x03A */ HORSE_RIDE, + /* 0x03B */ HORSE_GETOFF, + /* 0x03D */ HORSE_TURN = 61, + /* 0x03E */ HORSE_JUMP, + /* 0x03F */ HORSE_LAND, + /* 0x040 */ HORSE_SUBJECTIVITY, + /* 0x041 */ HORSE_CUT, + /* 0x042 */ HORSE_CUT_CHARGE_READY, + /* 0x043 */ HORSE_CUT_TURN, + /* 0x044 */ HORSE_DAMAGE, + /* 0x045 */ RIDE_BOW_READY, + /* 0x04C */ HORSE_BOTTLE_DRINK = 76, + /* 0x04E */ HORSE_KANDELAAR_POUR = 78, + /* 0x04F */ HORSE_RUN, + /* 0x050 */ HORSE_HANG, + /* 0x053 */ BOAR_RUN = 83, + /* 0x055 */ HANG_START = 85, + /* 0x056 */ HANG_FALL_START, + /* 0x057 */ HANG_UP, + /* 0x058 */ HANG_WAIT, + /* 0x059 */ HANG_MOVE, + /* 0x065 */ COPY_ROD_SWING = 101, + /* 0x06B */ CLIMB_MOVE_LADDER = 107, + /* 0x06C */ GRAB_READY = 108, + /* 0x06D */ GRAB_UP, + /* 0x06F */ GRAB_THROW = 111, + /* 0x070 */ GRAB_DOWN, + /* 0x072 */ GRAB_REBOUND = 114, + /* 0x073 */ GRAB_STAND, + /* 0x074 */ INSECT_CATCH, + /* 0x075 */ PICK_UP, + /* 0x076 */ PICK_PUT, + /* 0x077 */ HUMAN_ST_ESCAPE, + /* 0x082 */ CLIMB_MOVE_VERTICAL = 130, + /* 0x083 */ CLIMB_MOVE_HORIZONTAL, + /* 0x084 */ CLIMB_HANG, + /* 0x08C */ CANOE_RIDE = 140, + /* 0x08D */ CANOE_JUMP_RIDE, + /* 0x08E */ CANOE_GETOFF, + /* 0x090 */ CANOE_ROW = 144, + /* 0x091 */ CANOE_PADDLE_SHIFT, + /* 0x092 */ CANOE_PADDLE_PUT, + /* 0x093 */ CANOE_PADDLE_GRAB, + /* 0x094 */ CANOE_ROD_GRAB, + /* 0x096 */ CANOE_FISHING_REEL = 150, + /* 0x097 */ CANOE_FISHING_GET, + /* 0x098 */ CANOE_SUBJECTIVITY, + /* 0x0A0 */ CANOE_BOTTLE_DRINK = 160, + /* 0x0A1 */ CANOE_KANDELAAR_POUR, + /* 0x0A3 */ FISHING_FOOD = 163, + /* 0x0AD */ BOARD_CUT_TURN = 173, + /* 0x0AF */ FM_CHAIN_UP, + /* 0x0B3 */ BOTTLE_DRINK = 179, + /* 0x0B5 */ BOTTLE_SWING = 181, + /* 0x0BA */ GRASS_WHISTLE = 186, + /* 0x0BC */ HAWK_WAIT = 188, + /* 0x0BD */ FLOOR_DOWN_REBOUND = 189, + /* 0x0BE */ GORON_RIDE_WAIT, + /* 0x0C0 */ GOAT_THROW = 192, + /* 0x0C1 */ GOAT_STROKE, + /* 0x0CC */ MAGNE_BOOTS_FLY = 204, + /* 0x0CD */ BOOTS_EQUIP, + /* 0x0CF */ SUMOU_PUSH = 207, + /* 0x0D0 */ SUMOU_SIDE_MOVE, + /* 0x0D1 */ SUMOU_ACTION, + /* 0x0D2 */ SUMOU_STAGGER, + /* 0x0D3 */ SUMOU_WIN_LOSE, + /* 0x0DC */ BOSS_ENEMY_HANG = 220, + /* 0x0DE */ SCREAM_WAIT = 222, + /* 0x0EA */ DUNGEON_WARP_READY = 234, + /* 0x0ED */ WOLF_HOWL = 237, + /* 0x0F1 */ WOLF_WAIT = 241, + /* 0x0F2 */ WOLF_MOVE, + /* 0x0F3 */ WOLF_DASH, + /* 0x0F4 */ WOLF_KNOCKBACK, + /* 0x0F6 */ WOLF_ATN_WAIT = 246, + /* 0x0F7 */ WOLF_SIDESTEP, + /* 0x0F8 */ WOLF_SIDESTEP_LAND, + /* 0x0F9 */ WOLF_BACKFLIP, + /* 0x0FA */ WOLF_BACKFLIP_LAND, + /* 0x0FC */ WOLF_AUTOJUMP = 252, + /* 0x0FF */ WOLF_RSIT = 255, + /* 0x107 */ WOLF_DAMAGE = 263, + /* 0x10F */ WOLF_SLIDE = 271, + /* 0x114 */ WOLF_ROPE_HANG = 276, + /* 0x118 */ WOLF_TAGLOCK_JUMP = 280, + /* 0x119 */ WOLF_TAGLOCK_LAND, + /* 0x11C */ WOLF_JUMPATTACK = 284, + /* 0x121 */ WOLF_ST_ESCAPE = 289, + /* 0x123 */ WOLF_DOWNATTACK_PULLOUT = 291, + /* 0x131 */ WOLF_CHAIN = 305, + /* 0x132 */ WOLF_DIG, + /* 0x136 */ WOLF_ENEMY_HANG_BITE = 310, + /* 0x13E */ SUBJECTIVITY = 318, + /* 0x141 */ POLY_DAMAGE = 321, + /* 0x142 */ ELEC_DAMAGE, + /* 0x143 */ PUSH_PULL_WAIT, + /* 0x144 */ PUSH_MOVE, + /* 0x148 */ TRESURE_STAND = 328, + /* 0x14D */ METAMORPHOSE = 333, + /* 0x14F */ WARP = 335, + /* 0x150 */ DEAD, + /* 0x159 */ LARGE_DAMAGE = 345, + /* 0x15A */ LARGE_DAMAGE_WALL, }; // this might be one of the above enums, but not clear yet @@ -289,30 +406,34 @@ public: }; class firePointEff_c { + public: /* 800CFC3C */ ~firePointEff_c(); /* 800CFC78 */ firePointEff_c(); - /* 0x00 */ u8 field_0x0[0xc]; + /* 0x00 */ u8 field_0x0; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ u32 field_0x8; /* 0x0C */ cXyz field_0xc; /* 0x18 */ cXyz field_0x18; /* 0x24 */ cXyz field_0x24; }; - class hsChainShape_c { - /* 800D0CDC */ ~hsChainShape_c(); - /* 80107900 */ void draw(); + class hsChainShape_c : public J3DPacket { + public: + /* 80107900 */ virtual void draw(); + /* 800D0CDC */ virtual ~hsChainShape_c(); }; /* 8009D87C */ bool getE3Zhint(); /* 8009D884 */ char* getAlinkArcName(); /* 8009DA60 */ static bool checkStageName(char const*); - /* 8009DA98 */ static void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); + /* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); /* 8009DB64 */ void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*); /* 8009DC6C */ void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*); /* 8009DD90 */ void jointControll(int); /* 8009E7B8 */ void setUpperFront(); /* 8009E91C */ void changeBlendRate(int); /* 8009EB18 */ void resetRootMtx(); - /* 8009EB58 */ void modelCallBack(int); + /* 8009EB58 */ bool modelCallBack(int); /* 8009ECA0 */ void headModelCallBack(int); /* 8009EF7C */ void wolfModelCallBack(int); /* 8009F034 */ void setHatAngle(); @@ -326,7 +447,7 @@ public: /* 800A1AEC */ void setEyeMove(cXyz*, s16, s16); /* 800A1F90 */ void setNeckAngle(); /* 800A2198 */ void commonLineCheck(cXyz*, cXyz*); - /* 800A21E0 */ void getMoveBGActorName(cBgS_PolyInfo&, int); + /* 800A21E0 */ static s16 getMoveBGActorName(cBgS_PolyInfo&, int); /* 800A2280 */ void checkGoronRide(); /* 800A22E8 */ void setMoveSlantAngle(); /* 800A2710 */ void setArmMatrix(); @@ -335,18 +456,18 @@ public: /* 800A2CE0 */ void setLegAngle(f32, daAlink_footData_c*, s16*, s16*, int); /* 800A3430 */ void footBgCheck(); /* 800A39B8 */ void handBgCheck(); - /* 800A3C8C */ void setItemHeap(); + /* 800A3C8C */ JKRHeap* setItemHeap(); /* 800A3CE4 */ void setIdxMask(u16*, u16*); /* 800A3D0C */ void getAnimeResource(daPy_anmHeap_c*, u16, u32); - /* 800A3D7C */ void initModel(J3DModelData*, u32, u32); + /* 800A3D7C */ J3DModel* initModel(J3DModelData*, u32, u32); /* 800A3E30 */ void initModel(u16, u32); /* 800A3E98 */ void initModelEnv(u16, u32); /* 800A3F00 */ void initDemoModel(J3DModel**, char const*, u32); /* 800A3F98 */ void initDemoBck(mDoExt_bckAnm**, char const*); - /* 800A4068 */ void createHeap(); + /* 800A4068 */ static void createHeap(); /* 800A4910 */ void setSelectEquipItem(int); - /* 800A4BC8 */ void checkBoarStart(); - /* 800A4C40 */ void checkCanoeStart(); + /* 800A4BC8 */ BOOL checkBoarStart(); + /* 800A4C40 */ BOOL checkCanoeStart(); /* 800A4CB4 */ void playerInit(); /* 800A54F4 */ BOOL checkHorseStart(u32, int); /* 800A551C */ void setStartProcInit(); @@ -436,25 +557,25 @@ public: /* 800B0150 */ void getRoofAngle(cBgS_PolyInfo*, s16); /* 800B01FC */ void getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int); /* 800B02BC */ void setFrontWallType(); - /* 800B1488 */ void checkWaterPolygonUnder(); + /* 800B1488 */ BOOL checkWaterPolygonUnder(); /* 800B14B4 */ void setWaterY(); /* 800B154C */ void setHangWaterY(); /* 800B172C */ void setSandDownBgCheckWallH(); /* 800B1770 */ void setBgCheckParam(); - /* 800B1B28 */ void checkNotJumpSinkLimit(); - /* 800B1B68 */ void checkNotItemSinkLimit(); + /* 800B1B28 */ BOOL checkNotJumpSinkLimit(); + /* 800B1B68 */ BOOL checkNotItemSinkLimit(); /* 800B1BAC */ void setSandShapeOffset(); /* 800B1FB8 */ bool checkLv2MiddleBossBgRide(s16); /* 800B1FD8 */ void getSlidePolygon(cM3dGPla*); - /* 800B21EC */ void checkSlope() const; - /* 800B25CC */ u32 itemTriggerCheck(u8); - /* 800B25E8 */ u32 itemButtonCheck(u8); + /* 800B21EC */ BOOL checkSlope() const; + /* 800B25CC */ BOOL itemTriggerCheck(u8); + /* 800B25E8 */ BOOL itemButtonCheck(u8); /* 800B2604 */ void itemButton(); /* 800B2634 */ void itemTrigger(); /* 800B2664 */ void spActionButton(); /* 800B2688 */ void spActionTrigger(); - /* 800B26AC */ u32 midnaTalkTrigger() const; - /* 800B26B8 */ void swordSwingTrigger(); + /* 800B26AC */ BOOL midnaTalkTrigger() const; + /* 800B26B8 */ BOOL swordSwingTrigger(); /* 800B26DC */ void setItemActionButtonStatus(u8); /* 800B26FC */ void itemActionTrigger(); /* 800B271C */ void setStickData(); @@ -465,7 +586,7 @@ public: /* 800B3268 */ void setDoStatusEmphasys(u8); /* 800B3280 */ void setDoStatusContinuation(u8); /* 800B3298 */ void setBStatus(u8); - /* 800B32B0 */ void checkAtnWaitAnime(); + /* 800B32B0 */ BOOL checkAtnWaitAnime(); /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*); /* 800B33E4 */ void checkRestHPAnime(); /* 800B3494 */ void getDirectionFromAngle(s16); @@ -473,7 +594,7 @@ public: /* 800B3630 */ void getShapeAngleYAtnActor(); /* 800B3734 */ void setShapeAngleToAtnActor(int); /* 800B3844 */ void initServiceWaitTime(); - /* 800B3904 */ void checkZeroSpeedF() const; + /* 800B3904 */ bool checkZeroSpeedF() const; /* 800B3924 */ void setNormalSpeedF(f32, f32); /* 800B3F2C */ void getStickAngleDistanceRate(); /* 800B3FD4 */ void setSpeedAndAngleNormal(); @@ -485,19 +606,19 @@ public: /* 800B4918 */ float getMetamorphoseFarDis() const; /* 800B4928 */ s16 getMetamorphoseFarAngle() const; /* 800B4938 */ void setMidnaMsg(); - /* 800B4950 */ void notTalk(); + /* 800B4950 */ bool notTalk(); /* 800B4A08 */ void setTalkStatus(); - /* 800B4B2C */ void getFrontRollRate(); + /* 800B4B2C */ f32 getFrontRollRate(); /* 800B4B7C */ void decideCommonDoStatus(); /* 800B5284 */ void decideDoStatus(); - /* 800B58EC */ void checkWaitAction(); + /* 800B58EC */ BOOL checkWaitAction(); /* 800B5BC0 */ void setFallVoice(); /* 800B5C34 */ void setLandPassiveData(); /* 800B5C64 */ void setStepLandVibration(); /* 800B5CCC */ void checkLandAction(int); - /* 800B5F6C */ void checkSlideAction(); + /* 800B5F6C */ BOOL checkSlideAction(); /* 800B607C */ void checkAutoJumpAction(); - /* 800B69CC */ void checkCutJumpInFly(); + /* 800B69CC */ bool checkCutJumpInFly(); /* 800B6A30 */ BOOL checkFrontWallTypeAction(); /* 800B6F28 */ void checkItemActionInitStart(); /* 800B7090 */ void checkItemChangeAutoAction(); @@ -505,23 +626,23 @@ public: /* 800B7190 */ void cancelItemUseQuake(int); /* 800B71EC */ void cancelUpperItemReadyAnime(int); /* 800B72E4 */ void checkItemActorPointer(); - /* 800B7390 */ void checkSwordTwirlAction(); - /* 800B74B4 */ void checkUpperItemActionFly(); + /* 800B7390 */ bool checkSwordTwirlAction(); + /* 800B74B4 */ BOOL checkUpperItemActionFly(); /* 800B7528 */ void checkItemButtonChange(); /* 800B75EC */ void checkUpperItemAction(); /* 800B7B7C */ void orderPeep(); /* 800B7BF8 */ void orderTalk(int); /* 800B80C4 */ void orderZTalk(); /* 800B8374 */ void checkNormalAction(); - /* 800B8930 */ void checkReadyItem(); + /* 800B8930 */ bool checkReadyItem(); /* 800B8988 */ void checkItemAction(); /* 800B9010 */ bool checkRAction(); /* 800B9018 */ void checkMoveDoAction(); - /* 800B9148 */ void checkSideRollAction(int); - /* 800B9254 */ void checkNoUpperAnime() const; + /* 800B9148 */ BOOL checkSideRollAction(int); + /* 800B9254 */ BOOL checkNoUpperAnime() const; /* 800B92D0 */ void checkOneHandItemEquipAnime() const; /* 800B92F8 */ void checkItemEquipAnime() const; - /* 800B9340 */ void checkEquipAnime() const; + /* 800B9340 */ BOOL checkEquipAnime() const; /* 800B9398 */ void checkWindDashAnime() const; /* 800B93CC */ void checkSwordTwirlAnime() const; /* 800B93F4 */ void swordEquip(int); @@ -530,9 +651,9 @@ public: /* 800B96A4 */ void itemUnequip(u16, f32); /* 800B97EC */ void checkFastUnequip(); /* 800B983C */ void allUnequip(int); - /* 800B994C */ void checkItemChangeFromButton(); - /* 800B9D2C */ void checkNextActionFromButton(); - /* 800B9F50 */ void checkGroundSpecialMode(); + /* 800B994C */ BOOL checkItemChangeFromButton(); + /* 800B9D2C */ BOOL checkNextActionFromButton(); + /* 800B9F50 */ BOOL checkGroundSpecialMode(); /* 800BA09C */ void commonCheckNextAction(int); /* 800BA0D0 */ int checkNextAction(int); /* 800BA6A0 */ void commonChangeItem(); @@ -544,7 +665,7 @@ public: /* 800BB2B0 */ void setBodyAngleXReadyAnime(int); /* 800BB324 */ void setMagicArmorBrk(int); /* 800BB408 */ BOOL checkMagicArmorHeavy() const; - /* 800BB4B8 */ void checkHeavyStateOn(int, int); + /* 800BB4B8 */ BOOL checkHeavyStateOn(int, int); /* 800BB644 */ void initGravity(); /* 800BB770 */ void setSpecialGravity(f32, f32, int); /* 800BB7A0 */ void transAnimeProc(cXyz*, f32, f32); @@ -571,14 +692,14 @@ public: /* 800BF79C */ void setMetamorphoseModel(int); /* 800BF854 */ void keepItemData(); /* 800BF884 */ void returnKeepItemData(); - /* 800BF8D0 */ void setItemModel(); - /* 800BF9F0 */ void setItemActor(); + /* 800BF8D0 */ BOOL setItemModel(); + /* 800BF9F0 */ BOOL setItemActor(); /* 800BFD74 */ void makeItemType(); - /* 800BFDB0 */ void checkZoraWearAbility() const; + /* 800BFDB0 */ BOOL checkZoraWearAbility() const; /* 800BFDFC */ BOOL checkMagicArmorWearAbility() const; - /* 800BFE48 */ void loadAramBmd(u16, u32); + /* 800BFE48 */ J3DModelData* loadAramBmd(u16, u32); /* 800BFF04 */ void loadAram(u16, u32); - /* 800BFF70 */ void loadAramItemBrk(u16, J3DModel*); + /* 800BFF70 */ J3DAnmTevRegKey* loadAramItemBrk(u16, J3DModel*); /* 800BFFCC */ void loadAramItemBtk(u16, J3DModel*); /* 800C0028 */ void loadAramItemBtp(u16, J3DModel*); /* 800C0084 */ void changeItemBck(u16, f32); @@ -588,16 +709,16 @@ public: /* 800C0284 */ void checkField(); /* 800C02C8 */ void checkBossRoom(); /* 800C0310 */ void checkDungeon(); - /* 800C0358 */ bool checkCastleTown(); - /* 800C03A0 */ void checkCloudSea(); - /* 800C03E8 */ void checkRoomOnly(); - /* 800C044C */ void checkLv2DungeonRoomSpecial(); - /* 800C04B4 */ void checkRoomSpecial(); - /* 800C0520 */ bool checkRoom(); - /* 800C0594 */ bool checkNotBattleStage(); - /* 800C05DC */ void checkNotHeavyBootsStage(); - /* 800C0630 */ void checkNotAutoJumpStage(); - /* 800C0678 */ void checkCastleTownUseItem(u16); + /* 800C0358 */ static bool checkCastleTown(); + /* 800C03A0 */ static bool checkCloudSea(); + /* 800C03E8 */ static bool checkRoomOnly(); + /* 800C044C */ static bool checkLv2DungeonRoomSpecial(); + /* 800C04B4 */ static bool checkRoomSpecial(); + /* 800C0520 */ static bool checkRoom(); + /* 800C0594 */ static bool checkNotBattleStage(); + /* 800C05DC */ bool checkNotHeavyBootsStage(); + /* 800C0630 */ bool checkNotAutoJumpStage(); + /* 800C0678 */ static bool checkCastleTownUseItem(u16); /* 800C077C */ void changeItemTriggerKeepProc(u8, int); /* 800C0A9C */ void checkNewItemChange(u8); /* 800C12DC */ void deleteEquipItem(int, int); @@ -609,41 +730,41 @@ public: /* 800C2DDC */ void procPreActionUnequipInit(int, fopAc_ac_c*); /* 800C2EAC */ void procPreActionUnequip(); /* 800C3098 */ bool procServiceWaitInit(); - /* 800C30F0 */ void procServiceWait(); + /* 800C30F0 */ bool procServiceWait(); /* 800C3224 */ void procTiredWaitInit(); - /* 800C3338 */ void procTiredWait(); - /* 800C33B8 */ void procWaitInit(); + /* 800C3338 */ bool procTiredWait(); + /* 800C33B8 */ bool procWaitInit(); /* 800C3504 */ void procWait(); - /* 800C36CC */ void procMoveInit(); - /* 800C3730 */ void procMove(); - /* 800C3810 */ void procAtnMoveInit(); + /* 800C36CC */ bool procMoveInit(); + /* 800C3730 */ bool procMove(); + /* 800C3810 */ bool procAtnMoveInit(); /* 800C3868 */ bool procAtnMove(); - /* 800C38CC */ void procAtnActorWaitInit(); - /* 800C397C */ void procAtnActorWait(); - /* 800C39EC */ void procAtnActorMoveInit(); - /* 800C3A44 */ void procAtnActorMove(); - /* 800C3A94 */ void procWaitTurnInit(); - /* 800C3B1C */ void procWaitTurn(); - /* 800C3C3C */ void procMoveTurnInit(int); - /* 800C3D38 */ void procMoveTurn(); - /* 800C3DA0 */ void procSideStepInit(int); - /* 800C3F60 */ void procSideStep(); - /* 800C40F0 */ void procSideStepLandInit(); - /* 800C4278 */ void procSideStepLand(); - /* 800C4378 */ void procSlideInit(s16); + /* 800C38CC */ bool procAtnActorWaitInit(); + /* 800C397C */ bool procAtnActorWait(); + /* 800C39EC */ bool procAtnActorMoveInit(); + /* 800C3A44 */ bool procAtnActorMove(); + /* 800C3A94 */ bool procWaitTurnInit(); + /* 800C3B1C */ BOOL procWaitTurn(); + /* 800C3C3C */ bool procMoveTurnInit(int); + /* 800C3D38 */ bool procMoveTurn(); + /* 800C3DA0 */ bool procSideStepInit(int); + /* 800C3F60 */ bool procSideStep(); + /* 800C40F0 */ bool procSideStepLandInit(); + /* 800C4278 */ bool procSideStepLand(); + /* 800C4378 */ bool procSlideInit(s16); /* 800C4514 */ void procSlide(); - /* 800C47AC */ void procSlideLandInit(int); - /* 800C4894 */ void procSlideLand(); - /* 800C494C */ void procFrontRollInit(); + /* 800C47AC */ bool procSlideLandInit(int); + /* 800C4894 */ bool procSlideLand(); + /* 800C494C */ bool procFrontRollInit(); /* 800C4B40 */ void procFrontRoll(); /* 800C4F14 */ void procFrontRollCrashInit(); /* 800C4FFC */ void procFrontRollCrash(); /* 800C5160 */ void procFrontRollSuccessInit(); /* 800C5240 */ void procFrontRollSuccess(); - /* 800C5328 */ void procSideRollInit(int); + /* 800C5328 */ bool procSideRollInit(int); /* 800C5484 */ void procSideRoll(); /* 800C5700 */ void backJumpSpeedDec(); - /* 800C57A4 */ void procBackJumpInit(int); + /* 800C57A4 */ bool procBackJumpInit(int); /* 800C5964 */ void procBackJump(); /* 800C5A54 */ void procBackJumpLandInit(int); /* 800C5AF0 */ void procBackJumpLand(); @@ -655,7 +776,7 @@ public: /* 800C6798 */ void procDiveJump(); /* 800C6850 */ void procRollJumpInit(); /* 800C692C */ void procRollJump(); - /* 800C6A48 */ void procFallInit(int, f32); + /* 800C6A48 */ bool procFallInit(int, f32); /* 800C6D20 */ void procFall(); /* 800C6F18 */ void procLandInit(f32); /* 800C6FE4 */ void procLand(); @@ -665,19 +786,19 @@ public: /* 800C755C */ void procStepMove(); /* 800C7690 */ void procCrouchInit(); /* 800C76F8 */ void procCrouch(); - /* 800C77F4 */ void procCoMetamorphoseInit(); + /* 800C77F4 */ bool procCoMetamorphoseInit(); /* 800C7C64 */ void procCoMetamorphose(); /* 800C82E8 */ void procCoMetamorphoseOnlyInit(); /* 800C83A0 */ void procCoMetamorphoseOnly(); - /* 800C8460 */ void procFloorDownReboundInit(); + /* 800C8460 */ BOOL procFloorDownReboundInit(); /* 800C84D0 */ void procFloorDownRebound(); /* 800C854C */ void procGoronRideWaitInit(fopAc_ac_c*); /* 800C85D8 */ void procGoronRideWait(); /* 800C8700 */ void execute(); /* 800CAFC8 */ void setDrawHand(); - /* 800CB480 */ void checkSwordDraw(); - /* 800CB53C */ void checkShieldDraw(); - /* 800CB5F8 */ void checkItemDraw(); + /* 800CB480 */ bool checkSwordDraw(); + /* 800CB53C */ bool checkShieldDraw(); + /* 800CB5F8 */ bool checkItemDraw(); /* 800CB694 */ void initShadowScaleLight(); /* 800CBA38 */ void moveShadowScaleLight(); /* 800CBC18 */ void shadowDraw(); @@ -715,45 +836,44 @@ public: /* 800D0164 */ void set3DStatus(u8, u8); /* 800D018C */ u32 checkModeFlg(u32) const; /* 800D2684 */ void checkCutTurnCharge(); - /* 800D07A4 */ void checkCutJumpCancelTurn() const; /* 800D0E08 */ void checkLightSwordMtrl(); - /* 800D0E98 */ void checkSwordEquipAnime() const; - /* 800D0ECC */ void checkCutDashAnime() const; - /* 800D0EFC */ void checkCutDashEnemyHit(dCcD_GObjInf&); - /* 800D0F5C */ void getSwordAtType(); + /* 800D0E98 */ BOOL checkSwordEquipAnime() const; + /* 800D0ECC */ BOOL checkCutDashAnime() const; + /* 800D0EFC */ BOOL checkCutDashEnemyHit(dCcD_GObjInf&); + /* 800D0F5C */ static u32 getSwordAtType(); /* 800D0F90 */ void initCutTurnAt(f32, int); - /* 800D102C */ void checkCutFinishJumpUp(); + /* 800D102C */ bool checkCutFinishJumpUp(); /* 800D1088 */ void changeCutFast(); /* 800D10E0 */ void checkCutFastReady(); /* 800D1268 */ void setSwordModel(); /* 800D1310 */ void offSwordModel(); - /* 800D13AC */ void checkCutTypeNoBlur() const; - /* 800D13E4 */ void checkCutTurnInput() const; - /* 800D1424 */ void getCutTurnDirection() const; + /* 800D13AC */ BOOL checkCutTypeNoBlur() const; + /* 800D13E4 */ bool checkCutTurnInput() const; + /* 800D1424 */ int getCutTurnDirection() const; /* 800D1430 */ void resetCombo(int); /* 800D1454 */ void checkComboCnt(); /* 800D152C */ void setCutType(u8); /* 800D1540 */ void setCylAtParam(u32, dCcG_At_Spl, u8, u8, int, f32, f32); /* 800D1688 */ void setSwordAtParam(dCcG_At_Spl, u8, u8, int, f32, f32); - /* 800D1788 */ void notSwordHitVibActor(fopAc_ac_c*); + /* 800D1788 */ static bool notSwordHitVibActor(fopAc_ac_c*); /* 800D17EC */ void setSwordHitVibration(dCcD_GObjInf*); - /* 800D1920 */ void checkAtShieldHit(dCcD_GObjInf&); - /* 800D1978 */ void checkCutReverseAt(dCcD_GObjInf*); - /* 800D19C8 */ void changeCutReverseProc(daAlink_c::daAlink_ANM); + /* 800D1920 */ BOOL checkAtShieldHit(dCcD_GObjInf&); + /* 800D1978 */ bool checkCutReverseAt(dCcD_GObjInf*); + /* 800D19C8 */ BOOL changeCutReverseProc(daAlink_c::daAlink_ANM); /* 800D1E1C */ void setCutDash(int, int); - /* 800D20B4 */ void checkForceSwordSwing(); + /* 800D20B4 */ BOOL checkForceSwordSwing(); /* 800D20FC */ void setComboReserb(); - /* 800D2188 */ void checkComboReserb(); - /* 800D21D0 */ void commonCutAction(); + /* 800D2188 */ BOOL checkComboReserb(); + /* 800D21D0 */ bool commonCutAction(); /* 800D2284 */ void setSwordVoiceSe(u32); /* 800D22BC */ void setSwordChargeVoiceSe(); /* 800D2304 */ void setSwordComboVoice(); - /* 800D2368 */ void checkCutTurnInputTrigger(); + /* 800D2368 */ bool checkCutTurnInputTrigger(); /* 800D23C0 */ void checkCutAction(); /* 800D26EC */ void getCutDirection(); /* 800D2760 */ void checkCutCancelNextMode(int); /* 800D27E4 */ void checkDoCutAction(); - /* 800D2890 */ void checkCutBackState(); + /* 800D2890 */ static BOOL checkCutBackState(); /* 800D28F4 */ void checkCutHeadState(); /* 800D29D4 */ void checkDownAttackState(); /* 800D2ABC */ void checkCutLargeTurnState() const; @@ -771,8 +891,8 @@ public: /* 800D3ECC */ void procCutFinishJumpUpLand(); /* 800D4068 */ void procCutReverseInit(daAlink_c::daAlink_ANM); /* 800D41FC */ void procCutReverse(); - /* 800D42FC */ void procCutJumpInit(int); - /* 800D43F8 */ void procCutJump(); + /* 800D42FC */ bool procCutJumpInit(int); + /* 800D43F8 */ bool procCutJump(); /* 800D452C */ void procCutJumpLandInit(int); /* 800D4684 */ void procCutJumpLand(); /* 800D47DC */ void procCutTurnInit(int, int); @@ -792,7 +912,7 @@ public: /* 800D6238 */ void procCutLargeJumpChargeInit(); /* 800D62A0 */ void procCutLargeJumpCharge(); /* 800D6374 */ void procCutLargeJumpInit(); - /* 800D6484 */ void procCutLargeJump(); + /* 800D6484 */ bool procCutLargeJump(); /* 800D66C0 */ void procCutLargeJumpLandInit(int); /* 800D67FC */ void procCutLargeJumpLand(); /* 800D698C */ void procSwordUnequipSpInit(); @@ -846,16 +966,16 @@ public: /* 800DC214 */ void procCoLavaReturn(); /* 800DC278 */ void procCoSwimFreezeReturnInit(); /* 800DC474 */ void procCoSwimFreezeReturn(); - /* 800DC548 */ void checkEnemyGroup(fopAc_ac_c*); - /* 800DC5A4 */ void checkSpecialNpc(fopAc_ac_c*); + /* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*); + /* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*); /* 800DC5DC */ void checkShieldAttackEmphasys(); - /* 800DC678 */ void checkGuardActionChange(); + /* 800DC678 */ BOOL checkGuardActionChange(); /* 800DC79C */ void stickArrowIncrement(int); /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int); /* 800DCA2C */ void checkWoodShieldEquipNotIronBall() const; /* 800DCA80 */ void getArrowShieldOffset(cXyz const*, csXyz const*, cXyz*, cXyz*) const; /* 800DCD74 */ void setArrowShieldPos(cXyz*, csXyz*, cXyz const*, cXyz const*) const; - /* 800DCDF0 */ void checkUpperGuardAnime() const; + /* 800DCDF0 */ BOOL checkUpperGuardAnime() const; /* 800DCF04 */ void checkPlayerGuardAndAttack() const; /* 800DCF64 */ void checkGuardAccept(); /* 800DD008 */ void setUpperGuardAnime(f32); @@ -868,14 +988,14 @@ public: /* 800DDBA8 */ void procGuardAttack(); /* 800DDE58 */ void procGuardBreakInit(); /* 800DDF2C */ void procGuardBreak(); - /* 800DE008 */ void procTurnMoveInit(int); + /* 800DE008 */ bool procTurnMoveInit(int); /* 800DE380 */ void procTurnMove(); /* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const; /* 800DE740 */ void getArrowIncAtR() const; /* 800DE750 */ void getBombArrowFlyExplodeTime() const; /* 800DE760 */ void getArrowIncAtMaxStart() const; /* 800DE770 */ void getArrowIncAtMax() const; - /* 800DE780 */ void checkBowAndSlingItem(int); + /* 800DE780 */ BOOL checkBowAndSlingItem(int); /* 800DE7D4 */ void setSlingModel(); /* 800DE884 */ void checkBowCameraArrowPosP(s16*, s16*); /* 800DE9B8 */ void checkBowReadyAnime() const; @@ -892,7 +1012,7 @@ public: /* 800DF798 */ void checkUpperItemActionBowFly(); /* 800DF814 */ void checkNextActionBow(); /* 800DFAE8 */ void setBowModel(); - /* 800DFBC8 */ void checkBowGrabLeftHand() const; + /* 800DFBC8 */ bool checkBowGrabLeftHand() const; /* 800DFC28 */ void setBowHangAnime(); /* 800DFC70 */ void setBowNormalAnime(); /* 800DFCD8 */ void setBowSight(); @@ -900,20 +1020,20 @@ public: /* 800DFDDC */ void procBowSubject(); /* 800DFE3C */ void procBowMoveInit(); /* 800DFEC0 */ void procBowMove(); - /* 800DFFE0 */ void checkBoomerangLockAccept(); - /* 800E0010 */ void getBoomSpeed(); - /* 800E00B0 */ void getBoomCatchSpeed() const; - /* 800E00C0 */ void getBoomFlyMax() const; - /* 800E011C */ void getBoomLockMax(); - /* 800E0190 */ void getBoomBgThroughTime() const; - /* 800E01A0 */ void checkBossBabaRoom(); + /* 800DFFE0 */ BOOL checkBoomerangLockAccept(); + /* 800E0010 */ f32 getBoomSpeed(); + /* 800E00B0 */ f32 getBoomCatchSpeed() const; + /* 800E00C0 */ f32 getBoomFlyMax() const; + /* 800E011C */ f32 getBoomLockMax(); + /* 800E0190 */ s16 getBoomBgThroughTime() const; + /* 800E01A0 */ bool checkBossBabaRoom(); /* 800E01CC */ void cancelBoomerangLock(fopAc_ac_c*); - /* 800E0210 */ void getBoomerangActor(); + /* 800E0210 */ fopAc_ac_c* getBoomerangActor(); /* 800E0244 */ void checkBoomerangChargeEnd(); /* 800E02B8 */ void checkBoomerangCarry(fopAc_ac_c*); /* 800E03D0 */ void initBoomerangUpperAnimeSpeed(int); - /* 800E0440 */ void checkBoomerangAnime() const; - /* 800E04AC */ void checkBoomerangThrowAnime() const; + /* 800E0440 */ BOOL checkBoomerangAnime() const; + /* 800E04AC */ BOOL checkBoomerangThrowAnime() const; /* 800E04E8 */ void setBoomerangReadyQuake(); /* 800E055C */ void setBoomerangReadyAnime(); /* 800E05E8 */ void setThrowBoomerangAnime(); @@ -931,14 +1051,14 @@ public: /* 800E10F4 */ void procBoomerangMove(); /* 800E11D8 */ void procBoomerangCatchInit(); /* 800E1248 */ void procBoomerangCatch(); - /* 800E12E0 */ void checkLv6BossRoom(); - /* 800E1310 */ void getCopyRodBallSpeed() const; - /* 800E1320 */ void getCopyRodBallReturnSpeed() const; - /* 800E1330 */ void getCopyRodBallDisMax() const; - /* 800E1374 */ void getCopyRodControllActor(); - /* 800E1390 */ void getCopyRodCameraActor(); + /* 800E12E0 */ static BOOL checkLv6BossRoom(); + /* 800E1310 */ f32 getCopyRodBallSpeed() const; + /* 800E1320 */ f32 getCopyRodBallReturnSpeed() const; + /* 800E1330 */ f32 getCopyRodBallDisMax() const; + /* 800E1374 */ fopAc_ac_c* getCopyRodControllActor(); + /* 800E1390 */ fopAc_ac_c* getCopyRodCameraActor(); /* 800E13AC */ void initCopyRodUpperAnimeSpeed(int); - /* 800E1408 */ void checkForestOldCentury(); + /* 800E1408 */ BOOL checkForestOldCentury(); /* 800E1530 */ void checkCopyRodAnime() const; /* 800E158C */ void setCopyRodControllAnime(); /* 800E15FC */ void setCopyRodControllUpperSpeedRate(); @@ -972,26 +1092,25 @@ public: /* 800E30DC */ void procBootsEquip(); /* 800E3218 */ void procMagneBootsFlyInit(); /* 800E3454 */ void procMagneBootsFly(); - /* 800E3760 */ void getBombExplodeTime() const; - /* 800E3770 */ void getBombGravity() const; - /* 800E3780 */ void getBombMaxFallSpeed() const; - /* 800E3790 */ void getBombBoundRate() const; - /* 800E37A0 */ void getBombStopSpeedY() const; - /* 800E37B0 */ void getBombMaxSpeedY() const; - /* 800E37C0 */ void getBombEffScale() const; - /* 800E37D0 */ void getBombAtR() const; - /* 800E37E0 */ void getEnemyBombColorR() const; - /* 800E37F0 */ void getBombWaterGravity() const; - /* 800E3800 */ void getBombWaterMaxFallSpeed() const; - /* 800E3810 */ void getBombExplodeWaterEffectLimit() const; - /* 800E3820 */ void getBombInsectLimitAngle() const; + /* 800E3760 */ s16 getBombExplodeTime() const; + /* 800E3770 */ f32 getBombGravity() const; + /* 800E3780 */ f32 getBombMaxFallSpeed() const; + /* 800E3790 */ f32 getBombBoundRate() const; + /* 800E37A0 */ f32 getBombStopSpeedY() const; + /* 800E37B0 */ f32 getBombMaxSpeedY() const; + /* 800E37C0 */ f32 getBombEffScale() const; + /* 800E37D0 */ f32 getBombAtR() const; + /* 800E37E0 */ s16 getEnemyBombColorR() const; + /* 800E37F0 */ f32 getBombWaterGravity() const; + /* 800E3800 */ f32 getBombWaterMaxFallSpeed() const; + /* 800E3810 */ f32 getBombExplodeWaterEffectLimit() const; + /* 800E3820 */ s16 getBombInsectLimitAngle() const; /* 800E38EC */ void checkGrabLineCheck(); - /* 800E3BCC */ void getGrabThrowRate(); /* 800E3C1C */ void checkGrabThrowAnime() const; /* 800E3C6C */ void checkGrabAnime() const; /* 800E3C9C */ void checkGrabAnimeAndThrow() const; - /* 800E3CF4 */ void checkGrabCarryActor(); + /* 800E3CF4 */ BOOL checkGrabCarryActor(); /* 800E3D1C */ void checkGrabSlowMoveActor(); /* 800E3D6C */ void checkGrabHeavyActor(); /* 800E3D94 */ void checkGrabSideActor(); @@ -1099,11 +1218,11 @@ public: /* 800ECDC4 */ void checkHorseWaitLashAnime() const; /* 800ECDEC */ void checkHorseReinLeftOnly() const; /* 800ECE10 */ void getReinHandType() const; - /* 800ECF04 */ void checkHorseLieAnime() const; + /* 800ECF04 */ BOOL checkHorseLieAnime() const; /* 800ECF5C */ void checkHorseSubjectivity() const; /* 800ECF9C */ void setHorseSwordUpAnime(); /* 800ECFF4 */ void setHorseTurnUpperAnime(int); - /* 800ED074 */ void checkHorseNoUpperAnime() const; + /* 800ED074 */ BOOL checkHorseNoUpperAnime() const; /* 800ED0D4 */ void getHorseReinHandPos(cXyz*, cXyz*); /* 800ED1F0 */ void checkHorseNotGrab() const; /* 800ED310 */ void setHorseStirrup(); @@ -1200,7 +1319,7 @@ public: /* 800F3EB8 */ void checkCanoePaddleGrab(fopAc_ac_c*) const; /* 800F3F38 */ void checkCanoeFishingRodGrabOrPut() const; /* 800F3FC4 */ void initCanoeRide(); - /* 800F4008 */ void checkCanoeJumpRide(); + /* 800F4008 */ BOOL checkCanoeJumpRide(); /* 800F40E4 */ void setArmReelAnime(); /* 800F4140 */ void setFishingWaitAction(); /* 800F4490 */ void setFishGetFace(); @@ -1562,7 +1681,7 @@ public: /* 80112E7C */ void setIronBallChainPos(); /* 80113CA0 */ void checkIronBallReturnChange(); /* 80113D58 */ void setIronBallPos(); - /* 801150E4 */ void checkIronBallAnime() const; + /* 801150E4 */ BOOL checkIronBallAnime() const; /* 8011510C */ void setIronBallReadyAnime(); /* 801151E0 */ void setIronBallBaseAnime(); /* 80115254 */ void checkUpperItemActionIronBall(); @@ -1575,7 +1694,7 @@ public: /* 80115860 */ void procIronBallThrow(); /* 801159F0 */ void procIronBallReturnInit(); /* 80115AA0 */ void procIronBallReturn(); - /* 80115C20 */ void checkEventRun() const; + /* 80115C20 */ BOOL checkEventRun() const; /* 80115C50 */ void createNpcTks(cXyz*, int, u32); /* 80115EC0 */ void checkDemoAction(); /* 80116E60 */ void checkDemoMoveMode(u32) const; @@ -1685,7 +1804,7 @@ public: /* 8011EC60 */ void procMasterSwordStick(); /* 8011ED18 */ bool procMasterSwordPullInit(); /* 8011ED8C */ void procMasterSwordPull(); - /* 8011EE40 */ void checkLv7DungeonShop(); + /* 8011EE40 */ static BOOL checkLv7DungeonShop(); /* 8011EE94 */ void procDungeonWarpReadyInit(); /* 8011EFB8 */ void procDungeonWarpReady(); /* 8011F084 */ void procDungeonWarpInit(); @@ -1756,18 +1875,18 @@ public: /* 80126F3C */ void changeLink(int); /* 80127C54 */ void onWolfEyeUp(); /* 80127CAC */ void offWolfEyeUp(); - /* 80127CF0 */ void wolfSenseTrigger(); + /* 80127CF0 */ BOOL wolfSenseTrigger(); /* 80127D14 */ void setWolfSenceStatus(u8); /* 80127D2C */ void wolfClawTrigger(); /* 80127D50 */ void setWolfDigStatus(u8); /* 80127D68 */ BOOL checkWolfShapeReverse() const; - /* 80127DC4 */ void checkWolfSideStep() const; + /* 80127DC4 */ BOOL checkWolfSideStep() const; /* 80127E08 */ void setWolfTailAngle(); - /* 80127F20 */ void checkWolfSlowDash(); + /* 80127F20 */ BOOL checkWolfSlowDash(); /* 80127F50 */ void setSpeedAndAngleWolf(); /* 80128478 */ void setSpeedAndAngleWolfAtn(); /* 80128798 */ void checkWolfAtnWait(); - /* 8012880C */ void checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const; + /* 8012880C */ BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const; /* 80128844 */ void setBlendWolfMoveAnime(f32); /* 80128F0C */ void checkWolfAtnMoveBack(s16); /* 80128F5C */ void setWolfAtnMoveDirection(); @@ -1781,9 +1900,9 @@ public: /* 80129704 */ void setSingleAnimeWolf(daAlink_c::daAlink_WANM, f32, f32, s16, f32); /* 80129848 */ void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM, daAlinkHIO_anm_c const*); /* 8012987C */ void checkWolfLandAction(int); - /* 80129958 */ void checkMidnaUseAbility() const; + /* 80129958 */ BOOL checkMidnaUseAbility() const; /* 801299A8 */ void checkWolfUseAbility(); - /* 80129A80 */ void checkWolfGroundSpecialMode(); + /* 80129A80 */ bool checkWolfGroundSpecialMode(); /* 80129B44 */ void checkNextActionWolf(int); /* 8012A02C */ void wolfSideBgCheck(s16); /* 8012A228 */ void checkWolfAttackReverse(int); @@ -1874,12 +1993,12 @@ public: /* 8013384C */ void procWolfRopeSubjectivityInit(); /* 80133930 */ void procWolfRopeSubjectivity(); /* 80133D6C */ void getWolfTagJumpTime() const; - /* 80133EF0 */ void checkMidnaLockJumpPoint() const; + /* 80133EF0 */ cXyz* checkMidnaLockJumpPoint() const; /* 80134000 */ void procWolfTagJumpInit(fopAc_ac_c*); /* 80134838 */ void procWolfTagJump(); /* 80134DB8 */ void procWolfTagJumpLandInit(fopAc_ac_c*); /* 80134EBC */ void procWolfTagJumpLand(); - /* 80135160 */ void procWolfGiantPuzzleInit(); + /* 80135160 */ bool procWolfGiantPuzzleInit(); /* 801351F8 */ void procWolfGiantPuzzle(); /* 80135458 */ void setWolfHangGroundY(); /* 801354C8 */ void changeWolfHangEndProc(); @@ -1897,7 +2016,7 @@ public: /* 80136C18 */ void procWolfLandDamageInit(int); /* 80136DE4 */ void procWolfLandDamage(); /* 80136EC4 */ void setWolfScreamWaitAnime(); - /* 80136F54 */ void procWolfScreamWaitInit(); + /* 80136F54 */ bool procWolfScreamWaitInit(); /* 80136FF8 */ void procWolfScreamWait(); /* 801370E4 */ void getWolfLieMoveAnmSpeed(); /* 8013712C */ void getWolfLieMoveSpeed(); @@ -1929,7 +2048,7 @@ public: /* 80138DC0 */ void setWolfBallModel(); /* 80138F18 */ void resetWolfBallGrab(); /* 80139048 */ void checkWolfLockData(); - /* 801391DC */ void getWolfLockActorEnd(); + /* 801391DC */ fopAc_ac_c* getWolfLockActorEnd(); /* 801391E4 */ void searchWolfLockEnemy(fopAc_ac_c*, void*); /* 801392E4 */ void checkWolfComboCnt(); /* 801393A4 */ void checkWolfAttackAction(); @@ -1977,7 +2096,7 @@ public: /* 8013D86C */ void procWolfGrabThrow(); /* 8013D930 */ void procWolfPushInit(); /* 8013DA8C */ void procWolfPush(); - /* 8013DB6C */ void procWolfCargoCarryInit(); + /* 8013DB6C */ bool procWolfCargoCarryInit(); /* 8013DC5C */ void procWolfCargoCarry(); /* 8013DDF8 */ void procWolfChainUpInit(); /* 8013DE70 */ void procWolfChainUp(); @@ -2008,68 +2127,68 @@ public: /* 80140984 */ void statusWindowDraw(); /* 80140AC8 */ void resetStatusWindow(); - virtual bool getMidnaAtnPos(void) const; + virtual cXyz* getMidnaAtnPos() const; virtual void setMidnaMsgNum(fopAc_ac_c*, u16); - virtual Mtx* getModelMtx(void); - virtual Mtx* getInvMtx(void); - virtual cXyz* getShadowTalkAtnPos(void); - virtual float getGroundY(); - virtual Mtx* getLeftItemMatrix(void); - virtual Mtx* getRightItemMatrix(void); - virtual Mtx* getLeftHandMatrix(void); - virtual Mtx* getRightHandMatrix(void); - virtual Mtx* getLinkBackBone1Matrix(void); - virtual Mtx* getWolfMouthMatrix(void); - virtual Mtx* getWolfBackbone2Matrix(void); - virtual bool getBottleMtx(void); - virtual bool checkPlayerGuard(void) const; + virtual MtxP getModelMtx(); + virtual MtxP getInvMtx(); + virtual cXyz* getShadowTalkAtnPos(); + virtual f32 getGroundY(); + virtual MtxP getLeftItemMatrix(); + virtual MtxP getRightItemMatrix(); + virtual MtxP getLeftHandMatrix(); + virtual MtxP getRightHandMatrix(); + virtual MtxP getLinkBackBone1Matrix(); + virtual MtxP getWolfMouthMatrix(); + virtual MtxP getWolfBackbone2Matrix(); + virtual MtxP getBottleMtx(); + virtual BOOL checkPlayerGuard() const; virtual u32 checkPlayerFly() const; virtual BOOL checkFrontRoll() const; - virtual bool checkWolfDash() const; - virtual bool checkAutoJump(void) const; - virtual bool checkSideStep(void) const; - virtual bool checkWolfTriggerJump(void) const; - virtual bool checkGuardBreakMode(void) const; - virtual bool checkLv3Slide(void) const; - virtual bool checkWolfHowlDemoMode(void) const; - virtual bool checkChainBlockPushPull(void); - virtual bool checkElecDamage(void) const; - virtual bool checkEmptyBottleSwing(void) const; - virtual bool checkBottleSwingMode(void) const; - virtual bool checkHawkWait(void) const; - virtual bool checkGoatThrow(void) const; - virtual bool checkGoatThrowAfter(void) const; - virtual bool checkWolfTagLockJump(void) const; - virtual bool checkWolfTagLockJumpLand(void) const; - virtual bool checkWolfRope(void); - virtual bool checkWolfRopeHang(void) const; - virtual bool checkRollJump(void) const; - virtual bool checkGoronRideWait(void) const; - virtual bool checkWolfChain(void) const; - virtual bool checkWolfWait(void) const; - virtual bool checkWolfJumpAttack(void) const; - virtual bool checkWolfRSit(void) const; - virtual bool checkBottleDrinkEnd(void) const; - virtual bool checkWolfDig(void) const; - virtual bool checkCutCharge(void) const; - virtual BOOL checkCutTurnCharge(void) const; - virtual bool checkCutLargeJumpCharge(void) const; - virtual bool checkComboCutTurn(void) const; - virtual bool checkClimbMove(void) const; - virtual bool checkGrassWhistle(void) const; - virtual bool checkBoarRun(void) const; - virtual float getBaseAnimeFrameRate(void) const; - virtual float getBaseAnimeFrame(void) const; + virtual BOOL checkWolfDash() const; + virtual BOOL checkAutoJump() const; + virtual bool checkSideStep() const; + virtual bool checkWolfTriggerJump() const; + virtual BOOL checkGuardBreakMode() const; + virtual bool checkLv3Slide() const; + virtual bool checkWolfHowlDemoMode() const; + virtual bool checkChainBlockPushPull(); + virtual BOOL checkElecDamage() const; + virtual BOOL checkEmptyBottleSwing() const; + virtual BOOL checkBottleSwingMode() const; + virtual BOOL checkHawkWait() const; + virtual BOOL checkGoatThrow() const; + virtual BOOL checkGoatThrowAfter() const; + virtual BOOL checkWolfTagLockJump() const; + virtual BOOL checkWolfTagLockJumpLand() const; + virtual bool checkWolfRope(); + virtual BOOL checkWolfRopeHang() const; + virtual BOOL checkRollJump() const; + virtual BOOL checkGoronRideWait() const; + virtual BOOL checkWolfChain() const; + virtual BOOL checkWolfWait() const; + virtual BOOL checkWolfJumpAttack() const; + virtual BOOL checkWolfRSit() const; + virtual BOOL checkBottleDrinkEnd() const; + virtual BOOL checkWolfDig() const; + virtual BOOL checkCutCharge() const; + virtual BOOL checkCutTurnCharge() const; + virtual BOOL checkCutLargeJumpCharge() const; + virtual BOOL checkComboCutTurn() const; + virtual BOOL checkClimbMove() const; + virtual BOOL checkGrassWhistle() const; + virtual BOOL checkBoarRun() const; + virtual f32 getBaseAnimeFrameRate() const; + virtual f32 getBaseAnimeFrame() const; virtual void setAnimeFrame(float); virtual bool checkWolfLock(fopAc_ac_c*) const; virtual bool cancelWolfLock(fopAc_ac_c*); - virtual s32 getAtnActorID(void) const; - virtual s32 getItemID(void) const; - virtual s32 getGrabActorID(void) const; + virtual s32 getAtnActorID() const; + virtual s32 getItemID() const; + virtual s32 getGrabActorID() const; virtual bool exchangeGrabActor(fopAc_ac_c*); virtual bool setForceGrab(fopAc_ac_c*, int, int); virtual void setForcePutPos(cXyz const&); - virtual bool checkPlayerNoDraw(void); + virtual BOOL checkPlayerNoDraw(); virtual void voiceStart(u32); virtual void seStartOnlyReverb(u32); virtual void seStartOnlyReverbLevel(u32); @@ -2077,11 +2196,12 @@ public: virtual void setGrabCollisionOffset(float, float, cBgS_PolyInfo*); virtual void onFrollCrashFlg(u8, int); virtual MtxP getModelJointMtx(u16); - virtual bool getHeadMtx(void); + virtual MtxP getHeadMtx(); virtual bool setHookshotCarryOffset(unsigned int, cXyz const*); - virtual bool checkIronBallReturn(void) const; - virtual bool checkIronBallGroundStop(void) const; - virtual bool checkSingleBoarBattleSecondBowReady(void) const; + virtual BOOL checkCutJumpCancelTurn() const; + virtual bool checkIronBallReturn() const; + virtual bool checkIronBallGroundStop() const; + virtual BOOL checkSingleBoarBattleSecondBowReady() const; virtual void setClothesChange(int); virtual void setPlayerPosAndAngle(float (*)[4]); virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); @@ -2090,7 +2210,7 @@ public: virtual bool checkSetNpcTks(cXyz*, int, int); virtual bool setRollJump(float, float, short); virtual void playerStartCollisionSE(u32, u32); - virtual void cancelDungeonWarpReadyNeck(void); + virtual void cancelDungeonWarpReadyNeck(); virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*); virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*); virtual void onSceneChangeDead(u8, int); @@ -2099,15 +2219,15 @@ public: virtual u32 checkCanoeRide() const; virtual u32 checkBoardRide() const; virtual u32 checkSpinnerRide() const; - virtual fopAc_ac_c* getSpinnerActor(void); - virtual bool checkHorseRideNotReady(void) const; - virtual bool checkArrowChargeEnd(void) const; - virtual void getSearchBallScale(void) const; - virtual bool checkFastShotTime(void); - virtual bool checkNoEquipItem(void) const; + virtual fopAc_ac_c* getSpinnerActor(); + virtual BOOL checkHorseRideNotReady() const; + virtual bool checkArrowChargeEnd() const; + virtual f32 getSearchBallScale() const; + virtual s16 checkFastShotTime(); + virtual bool checkNoEquipItem() const; virtual bool checkKandelaarSwing(int) const; - virtual bool getBoardCutTurnOffsetAngleY(void) const; - virtual cXyz* getMagneBootsTopVec(void); + virtual s16 getBoardCutTurnOffsetAngleY() const; + virtual cXyz* getMagneBootsTopVec(); virtual bool getKandelaarFlamePos(); virtual bool checkUseKandelaar(int); virtual void setDkCaught(fopAc_ac_c*); @@ -2118,64 +2238,101 @@ public: virtual void setWolfEnemyHangBiteAngle(short); virtual void setKandelaarMtx(float (*)[4], int, int); virtual bool getStickAngleFromPlayerShape(short*) const; - virtual bool checkSpinnerPathMove(void); - virtual bool checkSpinnerTriggerAttack(void); - virtual void onSpinnerPathForceRemove(void); - virtual bool getIronBallBgHit(void) const; - virtual bool getIronBallCenterPos(void); - virtual bool checkCanoeFishingGetLeft(void) const; - virtual bool checkCanoeFishingGetRight(void) const; - virtual bool checkBeeChildDrink(void) const; - virtual void skipPortalObjWarp(void); + virtual bool checkSpinnerPathMove(); + virtual bool checkSpinnerTriggerAttack(); + virtual void onSpinnerPathForceRemove(); + virtual bool getIronBallBgHit() const; + virtual bool getIronBallCenterPos(); + virtual bool checkCanoeFishingGetLeft() const; + virtual bool checkCanoeFishingGetRight() const; + virtual u8 checkBeeChildDrink() const; + virtual void skipPortalObjWarp(); virtual bool checkTreasureRupeeReturn(int) const; virtual void setSumouReady(fopAc_ac_c*); virtual void checkAcceptDungeonWarpAlink(int); - virtual s16 getSumouCounter(void) const; - virtual s16 checkSumouWithstand(void) const; - virtual void cancelGoronThrowEvent(void); + virtual s16 getSumouCounter() const; + virtual s16 checkSumouWithstand() const; + virtual void cancelGoronThrowEvent(); virtual void setSumouGraspCancelCount(int); virtual void setSumouPushBackDirection(short); - virtual void setSumouLoseHeadUp(void); - virtual s16 getGiantPuzzleAimAngle(void) const; + virtual void setSumouLoseHeadUp(); + virtual s16 getGiantPuzzleAimAngle() const; virtual void setGoronSideMove(fopAc_ac_c*); virtual void setCargoCarry(fopAc_ac_c*); - virtual bool getHookshotTopPos(void); - virtual bool checkHookshotReturnMode(void) const; - virtual bool checkHookshotShootReturnMode(void) const; - virtual bool checkOctaIealHang(void) const; - virtual void cancelOctaIealHang(void); - virtual void cancelDragonHangBackJump(void); - virtual void setOctaIealWildHang(void); - virtual bool checkDragonHangRide(void) const; + virtual bool getHookshotTopPos(); + virtual bool checkHookshotReturnMode() const; + virtual bool checkHookshotShootReturnMode() const; + virtual bool checkOctaIealHang() const; + virtual void cancelOctaIealHang(); + virtual void cancelDragonHangBackJump(); + virtual void setOctaIealWildHang(); + virtual bool checkDragonHangRide() const; virtual void changeDragonActor(fopAc_ac_c*); - virtual u8 getClothesChangeWaitTimer(void) const; - virtual u8 getShieldChangeWaitTimer(void) const; - virtual bool getSwordChangeWaitTimer(void) const; - virtual bool checkMetamorphose(void) const; - virtual bool checkWolfDownAttackPullOut(void) const; - virtual BOOL checkBootsOrArmorHeavy(void) const; - virtual s32 getBottleOpenAppearItem(void) const; - virtual bool checkItemSwordEquip(void) const; - virtual float getSinkShapeOffset(void) const; - virtual bool checkSinkDead(void) const; - virtual bool checkHorseStart(void); - virtual bool getWolfHowlMgrP(void); - virtual bool checkWolfHowlSuccessAnime(void) const; - virtual bool checkCopyRodTopUse(void); - virtual bool checkCopyRodEquip(void) const; - virtual bool checkCutJumpMode(void) const; + virtual u8 getClothesChangeWaitTimer() const; + virtual u8 getShieldChangeWaitTimer() const; + virtual u8 getSwordChangeWaitTimer() const; + virtual BOOL checkMetamorphose() const; + virtual BOOL checkWolfDownAttackPullOut() const; + virtual BOOL checkBootsOrArmorHeavy() const; + virtual s32 getBottleOpenAppearItem() const; + virtual bool checkItemSwordEquip() const; + virtual float getSinkShapeOffset() const; + virtual BOOL checkSinkDead() const; + virtual BOOL checkHorseStart(); + virtual Z2WolfHowlMgr* getWolfHowlMgrP(); + virtual BOOL checkWolfHowlSuccessAnime() const; + virtual BOOL checkCopyRodTopUse(); + virtual bool checkCopyRodEquip() const; + virtual BOOL checkCutJumpMode() const; - // inlined version of checkModeFlg + // inlined dupes u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; } + bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); } + bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); } + BOOL i_checkAttentionLock() { return mAttention->Lockon(); } + bool checkUpperAnime(u16 pIdx) const { return mUpperAnime[UPPER_NOW].getIdx() == pIdx; } bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); } + bool checkHorseTurnLAnime() const { return checkUpperAnime(0x24C); } + bool checkHorseTurnRAnime() const { return checkUpperAnime(0x24D); } + bool checkHorseTurnAnime() const { return checkHorseTurnLAnime() || checkHorseTurnRAnime(); } + bool checkHookshotShootAnime() const { return checkUpperAnime(0x18C); } + bool checkHookshotReadyAnime() const { return checkUpperAnime(0x18D); } + bool checkHookshotAnime() const { + return checkHookshotReadyAnime() || checkHookshotShootAnime(); + } + BOOL checkBoomerangReadyAnime() const { + return (mEquipItem == BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(0x54); + } + s16 checkWolfEyeUp() const { return mWolfEyeUp; } + void onModeFlg(u32 flag) { mModeFlg |= flag; } + void offModeFlg(u32 flag) { mModeFlg &= ~flag; } + bool swordButton() { return itemButtonCheck(8); } + daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangActor; } + s32 getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } + bool checkFisingRodLure() const { return mEquipItem == 0x105; } + bool doTrigger() const { return mItemTrigger & 0x10; } + u32 getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; } + bool checkInputOnR() const { return field_0x33ac <= 0.05f; } + static int getSightBti() { return 0x5B; } + bool checkBoomerangChargeEndWait() const { + return mEquipItem != 0x102 && checkBoomerangAnime(); + } + J3DAnmTransform* getNowAnmPackUpper(daAlink_UPPER param_0) { + return mNowAnmPack[param_0].getAnmTransform(); + } + void setFacePriBck(u16 param_0) { setFaceBck(param_0, 1, 0xFFFF); } + + BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } + + inline u16 getReadyItem(); static u8 const m_mainBckShield[80]; static u8 const m_mainBckSword[20]; static u8 const m_mainBckFishing[112]; - static u8 const m_anmDataTable[4968]; - static void* const m_wlAnmDataTable[294]; + static daAlink_AnmData const m_anmDataTable[414]; + static daAlink_WlAnmData const m_wlAnmDataTable[147]; static u8 const m_faceTexDataTable[652]; static u8 const m_handLeftOutSidePos[12]; static u8 const m_handRightOutSidePos[12]; @@ -2187,12 +2344,12 @@ public: private: /* 0x0062C */ void* field_0x062C; - /* 0x00630 */ void* field_0x0630; - /* 0x00634 */ void* field_0x0634; + /* 0x00630 */ int field_0x0630; + /* 0x00634 */ char* mArcName; /* 0x00638 */ JKRExpHeap** field_0x0638; /* 0x0063C */ void* field_0x063C; - /* 0x00640 */ void* field_0x0640; - /* 0x00644 */ void* field_0x0644; + /* 0x00640 */ int field_0x0640; + /* 0x00644 */ char* mShieldArcName; /* 0x00648 */ JKRExpHeap** field_0x0648; /* 0x0064C */ J3DModelData* field_0x064C; /* 0x00650 */ J3DModel* field_0x0650; @@ -2205,14 +2362,14 @@ private: /* 0x0066C */ J3DModel* field_0x066c; /* 0x00670 */ J3DModel* field_0x0670; /* 0x00674 */ J3DModel* field_0x0674; - /* 0x00678 */ J3DModel* field_0x0678; + /* 0x00678 */ J3DModel* mShieldModel; /* 0x0067C */ J3DAnmBase* field_0x067c; /* 0x00680 */ J3DAnmBase* field_0x0680; /* 0x00684 */ J3DModel* field_0x0684; /* 0x00688 */ J3DModel* field_0x0688; /* 0x0068C */ J3DAnmBase* field_0x068c; /* 0x00690 */ mDoExt_baseAnm** field_0x0690; - /* 0x00694 */ void* field_0x0694; // J3DDeformData + /* 0x00694 */ J3DDeformData* field_0x0694; /* 0x00698 */ void* field_0x0698; /* 0x0069C */ void* field_0x069c; /* 0x006A0 */ J3DModel* field_0x06a0; @@ -2221,12 +2378,12 @@ private: /* 0x006AC */ mDoExt_bckAnm* field_0x06ac; /* 0x006B0 */ mDoExt_bckAnm* field_0x06b0; /* 0x006B4 */ J3DAnmTransform* field_0x06b4; - /* 0x006B8 */ J3DModel* field_0x06b8; + /* 0x006B8 */ J3DModel* mSwordModel; /* 0x006BC */ J3DModel* field_0x06bc; /* 0x006C0 */ J3DModelData* field_0x06c0; - /* 0x006C4 */ J3DAnmBase* field_0x06c4; - /* 0x006C8 */ J3DAnmBase* field_0x06c8; - /* 0x006CC */ J3DAnmBase* field_0x06cc; + /* 0x006C4 */ J3DAnmBase* m_nSwordBtk; + /* 0x006C8 */ J3DAnmBase* m_mSwordBtk; + /* 0x006CC */ J3DAnmBase* m_mSwordBck; /* 0x006D0 */ void* field_0x06d0; /* 0x006D4 */ void* field_0x06d4; /* 0x006D8 */ void* field_0x06d8; @@ -2241,20 +2398,20 @@ private: /* 0x006FC */ J3DModel* field_0x06fc; /* 0x00700 */ J3DModel* field_0x0700; /* 0x00704 */ J3DAnmBase* field_0x0704; - /* 0x00708 */ J3DModel* field_0x0708; + /* 0x00708 */ J3DModel* mHeldItemModel; /* 0x0070C */ J3DModel* field_0x070c; /* 0x00710 */ J3DModel* field_0x0710; /* 0x00714 */ J3DModel* field_0x0714; /* 0x00718 */ J3DAnmBase* field_0x0718; /* 0x0071C */ J3DAnmBase* field_0x071c; /* 0x00720 */ J3DAnmBase* field_0x0720; - /* 0x00724 */ J3DAnmBase* field_0x0724; + /* 0x00724 */ J3DAnmTevRegKey* field_0x0724; /* 0x00728 */ J3DAnmBase* field_0x0728; /* 0x0072C */ J3DAnmBase* field_0x072c; /* 0x00730 */ mDoExt_bckAnm field_0x730; /* 0x0074C */ mDoExt_bckAnm field_0x74C; /* 0x00768 */ u8 field_0x0768[0x5C]; - /* 0x007C4 */ daPy_actorKeep_c field_0x07C4[10]; + /* 0x007C4 */ daPy_actorKeep_c mWolfLockAcKeep[10]; /* 0x00814 */ dCcD_Stts field_0x814; /* 0x00850 */ dCcD_Cyl field_0x850[3]; /* 0x00C04 */ dCcD_Cyl field_0xC04[3]; @@ -2281,12 +2438,12 @@ private: /* 0x01ECC */ dBgS_ObjGndChk mObjGndChk; /* 0x01F20 */ u8 field_0x1f20[8]; /* 0x01F28 */ mDoExt_AnmRatioPack field_0x1f28[3]; - /* 0x01F40 */ mDoExt_AnmRatioPack field_0x1f40[3]; + /* 0x01F40 */ mDoExt_AnmRatioPack mNowAnmPack[3]; /* 0x01F58 */ daPy_anmHeap_c mUnderAnime[3]; /* 0x01F94 */ daPy_anmHeap_c mUpperAnime[3]; /* 0x01FD0 */ daPy_frameCtrl_c mFrameCtrl1[3]; /* 0x02018 */ daPy_frameCtrl_c mFrameCtrl2[3]; - /* 0x02060 */ void* field_0x2060; // mDoExt_MtxCalcOldFrame* + /* 0x02060 */ mDoExt_MtxCalcOldFrame* field_0x2060; /* 0x02064 */ daAlink_sight_c mSight; /* 0x020F0 */ daPy_anmHeap_c mAnmHeap3; /* 0x02104 */ daPy_anmHeap_c mAnmHeap4; @@ -2300,29 +2457,29 @@ private: /* 0x021B0 */ daPy_anmHeap_c mItemHeap[2]; /* 0x021D8 */ daPy_anmHeap_c mAnmHeap9; /* 0x021EC */ u8 field_0x21ec[4]; - /* 0x021F0 */ daAlink_blur_c mBlur; + /* 0x021F0 */ daAlink_blur_c m_swordBlur; /* 0x027C8 */ dAlink_bottleWaterPcallBack_c field_0x27c8; /* 0x027E0 */ dAttention_c* mAttention; /* 0x027E4 */ dAttList_c* mAttList; /* 0x027E8 */ dAttList_c* mAttList2; /* 0x027EC */ fopAc_ac_c* mTargetedActor; /* 0x027F0 */ fopAc_ac_c* field_0x27f0; - /* 0x027F4 */ fopAc_ac_c* field_0x27f4; + /* 0x027F4 */ kytag05_class* field_0x27f4; /* 0x027F8 */ fopAc_ac_c* field_0x27f8; /* 0x027FC */ fopAc_ac_c* field_0x27fc; - /* 0x02800 */ fopAc_ac_c* field_0x2800; + /* 0x02800 */ daTagMmsg_c* mMidnaMsg; /* 0x02804 */ fopAc_ac_c* field_0x2804; /* 0x02808 */ fopAc_ac_c* field_0x2808; /* 0x0280C */ daPy_actorKeep_c field_0x280c; /* 0x02814 */ daPy_actorKeep_c mRideActor; // daspinnerc? /* 0x0281C */ daPy_actorKeep_c field_0x281c; /* 0x02824 */ daPy_actorKeep_c mItemActor; // name might be wrong - /* 0x0282C */ daPy_actorKeep_c field_0x282c; - /* 0x02834 */ daPy_actorKeep_c field_0x2834; - /* 0x0283C */ daPy_actorKeep_c field_0x283c; + /* 0x0282C */ daPy_actorKeep_c mGrabItemActor; + /* 0x02834 */ daPy_actorKeep_c mThrowBoomerangActor; + /* 0x0283C */ daPy_actorKeep_c mCopyRodAcKeep; /* 0x02844 */ daPy_actorKeep_c field_0x2844; /* 0x0284C */ daPy_actorKeep_c field_0x284c; - /* 0x02854 */ daPy_actorKeep_c field_0x2854; + /* 0x02854 */ daPy_actorKeep_c mCargoCarryActor; /* 0x0285C */ daPy_actorKeep_c field_0x285c; /* 0x02864 */ dMsgFlow_c mMsgFlow; /* 0x028B0 */ u8 field_0x28b0[0x40]; @@ -2338,11 +2495,11 @@ private: /* 0x02B98 */ float* field_0x2b9c; /* 0x02BA0 */ float* field_0x2ba0; /* 0x02BA4 */ float* field_0x2ba4; - /* 0x02BA8 */ float* field_0x2ba8; + /* 0x02BA8 */ f32 mSinkShapeOffset; /* 0x02BAC */ cXyz field_0x2bac; /* 0x02BB8 */ Mtx mInvMtx; /* 0x02BE8 */ Mtx field_0x2be8; - /* 0x02C18 */ Mtx field_0x2c18; + /* 0x02C18 */ Mtx mRootMtx; /* 0x02C48 */ Mtx field_0x2c48; /* 0x02C78 */ Mtx field_0x2c78; /* 0x02CA8 */ Z2CreatureLink mZ2Link; @@ -2375,17 +2532,17 @@ private: /* 0x02F97 */ u8 field_0x2f97; /* 0x02F98 */ u8 field_0x2f98; /* 0x02F99 */ u8 field_0x2f99; - /* 0x02F9A */ s8 field_0x2f9a; + /* 0x02F9A */ s8 mVoiceReverbIntensity; /* 0x02F9B */ u8 field_0x2f9b; /* 0x02F9C */ u8 mSelectItemId; /* 0x02F9D */ u8 field_0x2f9d; /* 0x02F9E */ u8 field_0x2f9e; /* 0x02F9F */ u8 field_0x2f9f; /* 0x02FA0 */ u8 field_0x2fa0; - /* 0x02FA1 */ u8 field_0x2fa1; - /* 0x02FA2 */ u8 field_0x2fa2; + /* 0x02FA1 */ u8 mRunCutComboCount; + /* 0x02FA2 */ u8 mActiveBombNum; /* 0x02FA3 */ u8 field_0x2fa3; - /* 0x02FA4 */ u8 field_0x2fa4; + /* 0x02FA4 */ u8 mRollCrashFlg; /* 0x02FA5 */ u8 field_0x2fa5; /* 0x02FA6 */ u8 field_0x2fa6; /* 0x02FA7 */ u8 field_0x2fa7; @@ -2398,8 +2555,8 @@ private: /* 0x02FAE */ u8 field_0x2fae; /* 0x02FAF */ u8 field_0x2faf; /* 0x02FB0 */ u8 field_0x2fb0; - /* 0x02FB1 */ u8 field_0x2fb1; - /* 0x02FB2 */ u8 field_0x2fb2; + /* 0x02FB1 */ u8 mWolfLockNum; + /* 0x02FB2 */ u8 mMidnaTalkDelayTimer; /* 0x02FB3 */ u8 field_0x2fb3; /* 0x02FB4 */ u8 field_0x2fb4; /* 0x02FB5 */ u8 field_0x2fb5; @@ -2435,11 +2592,11 @@ private: /* 0x02FD3 */ u8 field_0x2fd3; /* 0x02FD4 */ u8 field_0x2fd4; /* 0x02FD5 */ u8 field_0x2fd5; - /* 0x02FD6 */ u8 field_0x2fd6; + /* 0x02FD6 */ u8 mSwordChangeWaitTimer; /* 0x02FD7 */ u8 field_0x2fd7; /* 0x02FD8 */ u8 field_0x2fd8; /* 0x02FD9 */ u8 field_0x2fd9[3]; - /* 0x02FDC */ u16 field_0x2fdc; + /* 0x02FDC */ u16 mEquipItem; /* 0x02FDE */ u16 field_0x2fde; /* 0x02FE0 */ u16 field_0x2fe0; /* 0x02FE2 */ s16 field_0x2fe2; @@ -2467,7 +2624,7 @@ private: /* 0x0300E */ s16 field_0x300e; /* 0x03010 */ s16 field_0x3010; /* 0x03012 */ s16 field_0x3012; - /* 0x03014 */ s16 field_0x3014; + /* 0x03014 */ s16 mFallVoiceInit; /* 0x03016 */ u8 field_0x3016[2]; /* 0x03018 */ s16 field_0x3018; /* 0x0301A */ s16 field_0x301a; @@ -2525,7 +2682,7 @@ private: /* 0x03088 */ s16 field_0x3088; /* 0x0308A */ s16 field_0x308a; /* 0x0308C */ s16 field_0x308c; - /* 0x0308E */ s16 field_0x308e; + /* 0x0308E */ s16 mFastShotTime; /* 0x03090 */ s16 field_0x3090; /* 0x03092 */ s16 field_0x3092; /* 0x03094 */ s16 field_0x3094; @@ -2565,7 +2722,7 @@ private: /* 0x030EE */ s16 field_0x30ee; /* 0x030F0 */ u16 field_0x30f0; /* 0x030F2 */ u8 field_0x30f2[2]; - /* 0x030F4 */ s16 field_0x30f4; + /* 0x030F4 */ s16 mSwordFlourishTimer; /* 0x030F6 */ s16 field_0x30f6; /* 0x030F8 */ s16 field_0x30f8; /* 0x030FA */ s16 field_0x30fa; @@ -2602,7 +2759,7 @@ private: /* 0x03172 */ u8 field_0x3172[2]; /* 0x03174 */ int field_0x3174; /* 0x03178 */ int field_0x3178; - /* 0x0317C */ dAttention_c* field_0x317c; + /* 0x0317C */ int field_0x317c; /* 0x03180 */ int field_0x3180; /* 0x03184 */ int field_0x3184; /* 0x03184 */ int field_0x3188; @@ -2664,11 +2821,11 @@ private: /* 0x033A8 */ float field_0x33a8; /* 0x033AC */ float field_0x33ac; /* 0x033B0 */ float field_0x33b0; - /* 0x033B4 */ float field_0x33b4; + /* 0x033B4 */ float mWaterY; /* 0x033B8 */ float field_0x33b8; /* 0x033BC */ float field_0x33bc; /* 0x033C0 */ float field_0x33c0; - /* 0x033C4 */ float field_0x33c4; + /* 0x033C4 */ float mFallHeight; /* 0x033C8 */ float field_0x33c8; /* 0x033CC */ float field_0x33cc; /* 0x033D0 */ float field_0x33d0; @@ -2712,14 +2869,14 @@ private: /* 0x03468 */ float field_0x3468; /* 0x0346C */ float field_0x346c; /* 0x03470 */ float field_0x3470; - /* 0x03474 */ float field_0x3474; + /* 0x03474 */ float mSwordUpColorIntensity; /* 0x03478 */ float field_0x3478; /* 0x0347C */ float field_0x347c; /* 0x03480 */ float field_0x3480; /* 0x03484 */ float field_0x3484; /* 0x03488 */ float field_0x3488; /* 0x0348C */ float field_0x348c; - /* 0x03490 */ float field_0x3490; + /* 0x03490 */ float mSearchBallScale; /* 0x03494 */ float field_0x3494; /* 0x03498 */ cXyz field_0x3498; /* 0x034A4 */ cXyz field_0x34a4; @@ -2729,7 +2886,7 @@ private: /* 0x034D4 */ cXyz field_0x34d4; /* 0x034E0 */ cXyz field_0x34e0; /* 0x034EC */ cXyz field_0x34ec; - /* 0x034F8 */ cXyz field_0x34f8; + /* 0x034F8 */ cXyz mLastJumpPos; /* 0x03504 */ cXyz field_0x3504; /* 0x03510 */ cXyz field_0x3510; /* 0x0351C */ cXyz field_0x351c; @@ -2756,7 +2913,7 @@ private: /* 0x0363C */ cXyz field_0x363c[4]; /* 0x0366C */ cXyz field_0x366c[4]; /* 0x0369C */ cXyz field_0x369c; - /* 0x036A8 */ cXyz field_0x36a8; + /* 0x036A8 */ cXyz mMagneBootsTopVec; /* 0x036B4 */ cXyz field_0x36b4; /* 0x036C0 */ cXyz field_0x36c0[4]; /* 0x036F0 */ cXyz field_0x36f0[4]; @@ -2787,15 +2944,18 @@ private: /* 0x03844 */ csXyz* mIronBallChainAngle; /* 0x03848 */ void* field_0x3848; /* 0x0384C */ float* field_0x384c; + /* 0x03850 */ u32 field_0x3850; + /* 0x03854 */ u32 field_0x3854; + /* 0x03858 */ u32 field_0x3858; }; struct daAlinkHIO_anm_c { - /* 0x00 */ s16 field_0x00; - /* 0x04 */ f32 field_0x04; - /* 0x08 */ f32 field_0x08; - /* 0x0C */ f32 field_0x0c; - /* 0x10 */ f32 field_0x10; -}; // size = 0x14 + /* 0x00 */ s16 field_0x00; // end f? + /* 0x04 */ f32 field_0x04; // speed? + /* 0x08 */ f32 field_0x08; // start? + /* 0x0C */ f32 field_0x0c; // interpolation? + /* 0x10 */ f32 field_0x10; // CF? +}; // size = 0x14 struct daAlinkHIO_basic_c1 { /* 0x00 */ bool mOneHitKill; @@ -2831,6 +2991,21 @@ public: static daAlinkHIO_basic_c1 const m; }; +class daAlinkHIO_backJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +class daAlinkHIO_backJump_c0 { +public: + static daAlinkHIO_backJump_c1 const m; +}; + class daAlinkHIO_autoJump_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mJump; @@ -2871,6 +3046,489 @@ public: static daAlinkHIO_autoJump_c1 const m; }; +class daAlinkHIO_cut_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; + /* 0x14 */ daAlinkHIO_anm_c mReleaseAnm; + /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; + /* 0x3C */ daAlinkHIO_anm_c mStabAnm; + /* 0x50 */ bool mForceHitCombo; + /* 0x52 */ s16 mComboDuration; + /* 0x54 */ s16 mBlurAlpha; + /* 0x56 */ s16 mNormalSwingDuration; + /* 0x58 */ s16 mDashBlurAlpha; + /* 0x5A */ s16 mUnkTime; // might be related to flourish + /* 0x5C */ s16 mFlourishTime; + /* 0x5E */ s16 mUnkBodyDownwards; // ? + /* 0x60 */ s16 mUnkBodyUpwards; // ? + /* 0x62 */ s16 mSpinSlashWait; // ? maybe related to wii? + /* 0x64 */ f32 mRecoilSpeed; + /* 0x68 */ f32 mRecoilDeceleration; + /* 0x6C */ f32 mFlourishAnmSpeed; + /* 0x70 */ f32 mFlourishEndAnmSpeed; + /* 0x74 */ f32 mSwordLength; + /* 0x78 */ f32 mSwordRadius; + /* 0x7C */ f32 mSwordLengthHorseback; + /* 0x80 */ f32 mSwordRadiusHorseback; + /* 0x84 */ f32 mRunCutLength; + /* 0x88 */ f32 mRunCutRadius; + /* 0x8C */ f32 mUnkReleaseASpeed; + /* 0x90 */ f32 mSwordLengthHorsebackFight; + /* 0x94 */ f32 mSwordRadiusHorsebackFight; + /* 0x98 */ f32 mFlourishControlStartFrame; +}; // Size: 0x9C + +class daAlinkHIO_cut_c0 { +public: + static daAlinkHIO_cut_c1 const m; +}; + +class daAlinkHIO_cutJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ f32 mBaseJumpSpeedH; + /* 0x2C */ f32 mBaseJumpSpeedV; + /* 0x30 */ f32 mAirJumpSpeedH; + /* 0x34 */ f32 mAirJumpSpeedV; + /* 0x38 */ f32 mStartAttackFrame; + /* 0x3C */ f32 mEndAttackFrame; + /* 0x40 */ f32 mJumpSpinDelay; +}; // Size: 0x44 + +class daAlinkHIO_cutJump_c0 { +public: + static daAlinkHIO_cutJump_c1 const m; +}; + +class daAlinkHIO_cutLargeJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; // ? + /* 0x14 */ daAlinkHIO_anm_c mChargeMoveAnm; // ? + /* 0x28 */ daAlinkHIO_anm_c mCutAnm; + /* 0x3C */ daAlinkHIO_anm_c mLandAnm; + /* 0x50 */ f32 mCutSpeedH; + /* 0x54 */ f32 mCutSpeedV; + /* 0x58 */ f32 mJumpAttackStartF; + /* 0x5C */ f32 mJumpAttackEndF; + /* 0x60 */ f32 mCutInitF; + /* 0x64 */ f32 mLandAttackInitF; + /* 0x68 */ f32 mLandAttackEndF; + /* 0x6C */ f32 mLandAttackRadius; + /* 0x70 */ f32 mSpinSlashUnkCF; +}; // Size: 0x74 + +class daAlinkHIO_cutLargeJump_c0 { +public: + static daAlinkHIO_cutLargeJump_c1 const m; +}; + +class daAlinkHIO_move_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSlideAnm; + /* 0x14 */ s16 mMaxTurnAngle; + /* 0x16 */ s16 mMinTurnAngle; + /* 0x18 */ s16 mTurnAngleRate; + /* 0x1C */ f32 mWaitAnmSpeed; + /* 0x20 */ f32 mWalkAnmSpeed; + /* 0x24 */ f32 mRunAnmSpeed; + /* 0x28 */ f32 mWalkChangeRate; + /* 0x2C */ f32 mRunChangeRate; + /* 0x30 */ f32 mMaxSpeed; + /* 0x34 */ f32 mAcceleration; + /* 0x38 */ f32 mDeceleration; + /* 0x3C */ f32 mSlideThresholdSpeed; // speed needed to trigger a slide + /* 0x40 */ f32 mSlideSpeed; + /* 0x44 */ f32 mSlideDeceleration; + /* 0x48 */ f32 mFootPositionRatio; + /* 0x4C */ f32 mUnkInterpolation; + /* 0x50 */ f32 mMinWalkFrame; + /* 0x54 */ f32 mMinTiredWalkFrame; +}; // Size: 0x58 + +class daAlinkHIO_move_c0 { +public: + static daAlinkHIO_move_c1 const m; +}; + +class daAlinkHIO_sideStep_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSideJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mSideLandAnm; + /* 0x28 */ daAlinkHIO_anm_c mBackJumpAnm; + /* 0x3C */ daAlinkHIO_anm_c mBackLandAnm; + /* 0x50 */ f32 mSideJumpSpeedH; + /* 0x54 */ f32 mSideJumpSpeedV; + /* 0x58 */ f32 mBackJumpSpeedH; + /* 0x5C */ f32 mBackJumpSpeedV; + /* 0x60 */ f32 mFallHeight; + /* 0x64 */ f32 mFallInterpolation; +}; // Size: 0x68 + +class daAlinkHIO_sideStep_c0 { +public: + static daAlinkHIO_sideStep_c1 const m; +}; + +class daAlinkHIO_atnMove_c1 { +public: + /* 0x00 */ s16 mMaxTurnAngle; + /* 0x02 */ s16 mMinTurnAngle; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mWaitAnmSpeed; + /* 0x0C */ f32 mWalkAnmSpeed; + /* 0x10 */ f32 mRunAnmSpeed; + /* 0x14 */ f32 mWalkChangeRate; + /* 0x18 */ f32 mRunChangeRate; + /* 0x1C */ f32 mMaxSpeed; + /* 0x20 */ f32 mAcceleration; + /* 0x24 */ f32 mDeceleration; + /* 0x28 */ f32 mBackWalkAnmSpeed; + /* 0x2C */ f32 mBackRunAnmSpeed; + /* 0x30 */ f32 mBackWalkChangeRate; + /* 0x34 */ f32 mBackRunChangeRate; + /* 0x38 */ f32 mMaxBackwardsSpeed; + /* 0x3C */ f32 mBackAcceleration; + /* 0x40 */ f32 mBackDeceleration; + /* 0x44 */ f32 mMinWalkFrame; + /* 0x48 */ f32 mMinBackWalkFrame; + /* 0x4C */ f32 mWalkForwardAnmSpeed; + /* 0x50 */ f32 mRunForwardAnmSpeed; +}; // Size: 0x54 + +class daAlinkHIO_atnMove_c0 { +public: + static daAlinkHIO_atnMove_c1 const m; +}; + +class daAlinkHIO_wallMove_c1 { +public: + /* 0x00 */ f32 mMinAnmSpeed; + /* 0x04 */ f32 mMaxAnmSpeed; + /* 0x08 */ f32 mInterpolation; + /* 0x0C */ f32 mMinSpeed; + /* 0x10 */ f32 mMaxSpeed; +}; + +class daAlinkHIO_wallMove_c0 { +public: + static daAlinkHIO_wallMove_c1 const m; +}; + +class daAlinkHIO_turnMove_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mTurnAnm; + /* 0x14 */ s16 mTurnSpeedRate; + /* 0x16 */ s16 mMaxTurnSpeed; + /* 0x18 */ s16 mMinTurnSpeed; + /* 0x1A */ s16 mMaxHalfTurnSpeed; + /* 0x1C */ f32 mHalfTurnAnmSpeed; + /* 0x20 */ f32 mTwirlCutDelayF; + /* 0x24 */ f32 mSideRollAnmSpeed; + /* 0x28 */ f32 mSideRollSpeed; +}; // Size: 0x2C + +class daAlinkHIO_turnMove_c0 { +public: + static daAlinkHIO_turnMove_c1 const m; +}; + +class daAlinkHIO_slide_c1 { +public: + // most of these havent been verified yet + /* 0x00 */ daAlinkHIO_anm_c mForwardSlideAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackwardSlideAnm; + /* 0x28 */ daAlinkHIO_anm_c mForwardLandAnm; // this and 0x3C might have names reversed? + /* 0x3C */ daAlinkHIO_anm_c mBackwardLandAnm; + /* 0x50 */ f32 mMaxSpeed; + /* 0x54 */ f32 mAcceleration; + /* 0x58 */ f32 mSlideAngle; + /* 0x5C */ f32 mClimbAngle; + /* 0x60 */ f32 mClimbAnmMinSpeed; + /* 0x64 */ f32 mMaxClimbSpeed; + /* 0x68 */ f32 mLavaFloorSlideAngle; // ? + /* 0x6C */ f32 mLavaFloorWeakSlideAngle; // ? + /* 0x70 */ f32 mLavaFloorWeakSlideSpeed; + /* 0x74 */ f32 mMaxClimbAnmSpeed; +}; // Size: 0x78 + +class daAlinkHIO_slide_c0 { +public: + static daAlinkHIO_slide_c1 const m; +}; + +class daAlinkHIO_frontRoll_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mRollAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrashAnm; + /* 0x28 */ daAlinkHIO_anm_c mCrashHitAnm; // ? + /* 0x3C */ s16 mCrashAngleThreshold; + /* 0x3E */ s16 mTurnRate; + /* 0x40 */ s16 mTurnMaxAngle; + /* 0x42 */ s16 mTurnMinAngle; + /* 0x44 */ f32 mInitSpeed; + /* 0x48 */ f32 mSpeedRate; + /* 0x4C */ f32 mMinSpeed; + /* 0x50 */ f32 mCrashSpeedThreshold; + /* 0x54 */ f32 mCrashInitF; + /* 0x58 */ f32 mCrashEndF; + /* 0x5C */ f32 mCrashSpeedH; + /* 0x60 */ f32 mCrashSpeedV; + /* 0x64 */ f32 mBootsAttackInitF; + /* 0x68 */ f32 mBootsAttackEndF; + /* 0x6C */ f32 mBootsAttackRadius; +}; // Size: 0x70 + +class daAlinkHIO_frontRoll_c0 { +public: + static daAlinkHIO_frontRoll_c1 const m; +}; + +class daAlinkHIO_swim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mResurfaceAnm; + /* 0x14 */ daAlinkHIO_anm_c mDiveAnm; + /* 0x28 */ daAlinkHIO_anm_c mUnderwaterDiveAnm; + /* 0x3C */ daAlinkHIO_anm_c mDashAnm; + /* 0x50 */ s16 mTurnRate; + /* 0x52 */ s16 mTurnMin; + /* 0x54 */ s16 mTurnMax; + /* 0x56 */ s16 mUnderwaterTurnRate; + /* 0x58 */ s16 mUnderwaterTurnMin; + /* 0x5A */ s16 mUnderwaterTurnMax; + /* 0x5C */ s16 val1a; // related to dash + /* 0x5E */ s16 val1a_; // related to dash + /* 0x60 */ f32 mInitHeight; + /* 0x64 */ f32 mResurfaceHeight; + /* 0x68 */ f32 mMaxForwardSpeed; + /* 0x6C */ f32 mMaxStrafeSpeed; + /* 0x70 */ f32 mMaxBackwardSpeed; + /* 0x74 */ f32 mMaxUnderwaterSpeed; + /* 0x78 */ f32 mUnderwaterMaxSinkSpeed; + /* 0x7C */ f32 mAcceleration; + /* 0x80 */ f32 mDeceleration; + /* 0x84 */ f32 mMaxSinkSpeed; + /* 0x88 */ f32 mMaxFloatUpSpeed; + /* 0x8C */ f32 mBuoyancy; // ? + /* 0x90 */ f32 mWaitAnmSpeed; + /* 0x94 */ f32 mWaitInterpolation; + /* 0x98 */ f32 mWaitVibrationIntensity; + /* 0x9C */ f32 mForwardMinAnmSpeed; + /* 0xA0 */ f32 mForwardMaxAnmSpeed; + /* 0xA4 */ f32 mStrafeMinAnmSpeed; + /* 0xA8 */ f32 mStrafeMaxAnmSpeed; + /* 0xAC */ f32 mBackwardMinAnmSpeed; + /* 0xB0 */ f32 mBackwardMaxAnmSpeed; + /* 0xB4 */ f32 mUnderwaterMinAnmSpeed; + /* 0xB8 */ f32 mUnderwaterMaxAnmSpeed; + /* 0xBC */ f32 mMoveInterpolation; + /* 0xC0 */ f32 mClimbHeight; + /* 0xC4 */ f32 mUnderwaterClimbHeight; + /* 0xC8 */ f32 mForwardMinSpeed; + /* 0xCC */ f32 mInitMaxSinkSpeed; + /* 0xD0 */ f32 mBootsMaxSinkSpeed; + /* 0xD4 */ f32 mNormalFloatDepth; + /* 0xD8 */ f32 mZoraFloatDepth; + /* 0xDC */ f32 mUnderwaterButtonSpeed; + /* 0xE0 */ f32 mUnderwaterButtonAnmSpeed; // ? + /* 0xE4 */ f32 mBootsGravity; + /* 0xE8 */ f32 mSurfaceSwimSpeedRate; + /* 0xEC */ f32 mDMaxSpeed; // ? + /* 0xF0 */ f32 mDDeceleration; + /* 0xF4 */ f32 mDMinAnmSpeed; + /* 0xF8 */ f32 mDMaxAnmSpeed; +}; // Size: 0xFC + +class daAlinkHIO_swim_c0 { +public: + static daAlinkHIO_swim_c1 const m; +}; + +class daAlinkHIO_ladder_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; +}; // Size: 0x70 + +class daAlinkHIO_ladder_c0 { +public: + static daAlinkHIO_ladder_c1 const m; +}; + +class daAlinkHIO_horse_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ s16 field_0x52; + /* 0x54 */ s16 field_0x54; + /* 0x56 */ s16 field_0x56; + /* 0x58 */ s16 field_0x58; + /* 0x5A */ s16 field_0x5A; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; +}; // Size: 0x6C + +class daAlinkHIO_horse_c0 { +public: + static daAlinkHIO_horse_c1 const m; +}; + +class daAlinkHIO_wolf_c1 { +public: + /* 0x00 */ s16 mMaxNeckTurnH; + /* 0x02 */ s16 mMaxNeckTurnUp; + /* 0x04 */ s16 mMaxNeckTurnDown; + /* 0x06 */ s16 mMaxTiredNeckTurnH; + /* 0x08 */ s16 mMaxTiredNeckTurnUp; + /* 0x0A */ s16 mMaxTiredNeckTurnDown; + /* 0x0C */ s16 mSensesLingerTime; // ? + /* 0x0E */ s16 mLightDropR; + /* 0x10 */ s16 mLightDropG; + /* 0x12 */ s16 mLightDropB; + /* 0x14 */ f32 mSwampInputRate; // ? +}; // Size: 0x18 + +class daAlinkHIO_wolf_c0 { +public: + static daAlinkHIO_wolf_c1 const m; +}; + +class daAlinkHIO_wlMove_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ s16 field_0x52; + /* 0x54 */ s16 field_0x54; + /* 0x56 */ s16 field_0x56; + /* 0x58 */ s16 field_0x58; + /* 0x5A */ s16 field_0x5A; + /* 0x5C */ s16 field_0x5C; + /* 0x5E */ s16 field_0x5E; + /* 0x60 */ s16 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; + /* 0x9C */ f32 field_0x9C; + /* 0xA0 */ f32 field_0xA0; + /* 0xA4 */ f32 field_0xA4; + /* 0xA8 */ f32 field_0xA8; + /* 0xAC */ f32 field_0xAC; + /* 0xB0 */ f32 field_0xB0; + /* 0xB4 */ f32 field_0xB4; + /* 0xB8 */ f32 field_0xB8; + /* 0xBC */ f32 field_0xBC; + /* 0xC0 */ f32 field_0xC0; + /* 0xC4 */ f32 field_0xC4; + /* 0xC8 */ f32 field_0xC8; + /* 0xCC */ f32 field_0xCC; + /* 0xD0 */ f32 field_0xD0; + /* 0xD4 */ f32 field_0xD4; + /* 0xD8 */ f32 field_0xD8; + /* 0xDC */ f32 field_0xDC; + /* 0xE0 */ f32 field_0xE0; + /* 0xE4 */ f32 field_0xE4; + /* 0xE8 */ f32 field_0xE8; + /* 0xEC */ f32 field_0xEC; + /* 0xF0 */ f32 field_0xF0; + /* 0xF4 */ f32 field_0xF4; + /* 0xF8 */ f32 field_0xF8; + /* 0xFC */ f32 field_0xFC; +}; // Size: 0x100 + +class daAlinkHIO_wlMove_c0 { +public: + static daAlinkHIO_wlMove_c1 const m; +}; + +class daAlinkHIO_wlMoveNoP_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; +}; // Size: 0x48 + +class daAlinkHIO_wlMoveNoP_c0 { +public: + static daAlinkHIO_wlMoveNoP_c1 const m; +}; + +class daAlinkHIO_wlAtnMove_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +class daAlinkHIO_wlAtnMove_c0 { +public: + static daAlinkHIO_wlAtnMove_c1 const m; +}; + class daAlinkHIO_wlAutoJump_c1 { public: /* 0x00 */ daAlinkHIO_anm_c field_0x00; @@ -2901,38 +3559,1060 @@ public: static daAlinkHIO_wlAutoJump_c1 const m; }; -class daHorse_c { +class daAlinkHIO_wlSlide_c1 { public: - fopAc_ac_c* getZeldaActor(); + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ s16 field_0x52; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; +}; // Size: 0x7C -private: - /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0568 */ u8 field_0x568[0xCEC]; - /* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep; +class daAlinkHIO_wlSlide_c0 { +public: + static daAlinkHIO_wlSlide_c1 const m; }; -class daMidna_c { +class daAlinkHIO_wlSideStep_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; +}; // Size: 0x68 + +class daAlinkHIO_wlSideStep_c0 { +public: + static daAlinkHIO_wlSideStep_c1 const m; +}; + +class daAlinkHIO_wlBackJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +class daAlinkHIO_wlBackJump_c0 { +public: + static daAlinkHIO_wlBackJump_c1 const m; +}; + +class daAlinkHIO_wlRope_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +class daAlinkHIO_wlRope_c0 { +public: + static daAlinkHIO_wlRope_c1 const m; +}; + +class daAlinkHIO_wlPush_c1 { +public: + /* 0x00 */ f32 field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; +}; // Size: 0x14 + +class daAlinkHIO_wlPush_c0 { +public: + static daAlinkHIO_wlPush_c1 const m; +}; + +class daAlinkHIO_wlPoint_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; +}; // Size: 0x7C + +class daAlinkHIO_wlPoint_c0 { +public: + static daAlinkHIO_wlPoint_c1 const m; +}; + +class daAlinkHIO_wlWallHang_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; +}; // Size: 0x9C + +class daAlinkHIO_wlWallHang_c0 { +public: + static daAlinkHIO_wlWallHang_c1 const m; +}; + +class daAlinkHIO_wlSwim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ s16 field_0x3C; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ s16 field_0x40; + /* 0x42 */ s16 field_0x42; + /* 0x44 */ s16 field_0x44; + /* 0x46 */ s16 field_0x46; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; + /* 0x9C */ f32 field_0x9C; + /* 0xA0 */ f32 field_0xA0; + /* 0xA4 */ f32 field_0xA4; +}; // Size: 0xA8 + +class daAlinkHIO_wlSwim_c0 { +public: + static daAlinkHIO_wlSwim_c1 const m; +}; + +class daAlinkHIO_wlAttack_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLandAnm; + /* 0x14 */ s16 mUnkTime; + /* 0x16 */ s16 mComboDuration; + /* 0x18 */ f32 mFallHeight; + /* 0x1C */ f32 mFallInterpolation; + /* 0x20 */ f32 mReadyInterpolation; + /* 0x24 */ f32 mAttackRange; + /* 0x28 */ f32 mJumpBackSpeedH; + /* 0x2C */ f32 mJumpBackSpeedV; + /* 0x30 */ f32 mJumpAttackSpeedV; + /* 0x34 */ f32 mJumpAttackSpeedH; +}; // Size: 0x38 + +class daAlinkHIO_wlAttack_c0 { +public: + static daAlinkHIO_wlAttack_c1 const m; +}; + +class daAlinkHIO_wlHowl_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; +}; // Size: 0x60 + +class daAlinkHIO_wlHowl_c0 { +public: + static daAlinkHIO_wlHowl_c1 const m; +}; + +class daAlinkHIO_wlGrab_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; +}; // Size: 0x64 + +class daAlinkHIO_wlGrab_c0 { +public: + static daAlinkHIO_wlGrab_c1 const m; +}; + +class daAlinkHIO_wlChain_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ s16 field_0x3C; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; +}; // Size: 0x5C + +class daAlinkHIO_wlChain_c0 { +public: + static daAlinkHIO_wlChain_c1 const m; +}; + +class daAlinkHIO_wlBall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +class daAlinkHIO_wlBall_c0 { +public: + static daAlinkHIO_wlBall_c1 const m; +}; + +class daAlinkHIO_wlLie_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ s16 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; +}; // Size: 0x4C + +class daAlinkHIO_wlLie_c0 { +public: + static daAlinkHIO_wlLie_c1 const m; +}; + +class daAlinkHIO_wlLight_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_wlLight_c0 { +public: + static daAlinkHIO_wlLight_c1 const m; +}; + +class daAlinkHIO_wlAtWaTl_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; +}; // Size: 0x3C + +class daAlinkHIO_wlAtWaTl_c0 { +public: + static daAlinkHIO_wlAtWaTl_c1 const m; +}; + +class daAlinkHIO_wlAtWaSc_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; +}; // Size: 0x3C + +class daAlinkHIO_wlAtWaSc_c0 { +public: + static daAlinkHIO_wlAtWaSc_c1 const m; +}; + +class daAlinkHIO_wlAtWaLr_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; +}; // Size: 0x3C + +class daAlinkHIO_wlAtWaLr_c0 { +public: + static daAlinkHIO_wlAtWaLr_c1 const m; +}; + +class daAlinkHIO_wlAtRoll_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_wlAtRoll_c0 { +public: + static daAlinkHIO_wlAtRoll_c1 const m; +}; + +class daAlinkHIO_wlAtNjump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; +}; // Size: 0x3C + +class daAlinkHIO_wlAtNjump_c0 { +public: + static daAlinkHIO_wlAtNjump_c1 const m; +}; + +class daAlinkHIO_wlAtLock_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; +}; // Size: 0x54 + +class daAlinkHIO_wlAtLock_c0 { +public: + static daAlinkHIO_wlAtLock_c1 const m; +}; + +class daAlinkHIO_wlAtLand_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ f32 field_0x3C; +}; // Size: 0x40 + +class daAlinkHIO_wlAtLand_c0 { +public: + static daAlinkHIO_wlAtLand_c1 const m; +}; + +class daAlinkHIO_wlDamage_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_wlDamage_c0 { +public: + static daAlinkHIO_wlDamage_c1 const m; +}; + +class daAlinkHIO_wlDamNormal_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; +}; // Size: 0x60 + +class daAlinkHIO_wlDamNormal_c0 { +public: + static daAlinkHIO_wlDamNormal_c1 const m; +}; + +class daAlinkHIO_wlDamLarge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; +}; // Size: 0x6C + +class daAlinkHIO_wlDamLarge_c0 { +public: + static daAlinkHIO_wlDamLarge_c1 const m; +}; + +class daAlinkHIO_wlDamHuge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; +}; // Size: 0x6C + +class daAlinkHIO_wlDamHuge_c0 { +public: + static daAlinkHIO_wlDamHuge_c1 const m; +}; + +class daAlinkHIO_wlDamFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; +}; // Size: 0x40 + +class daAlinkHIO_wlDamFall_c0 { +public: + static daAlinkHIO_wlDamFall_c1 const m; +}; + +class daAlinkHIO_wlDamCaught_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; +}; // Size: 0x10 + +class daAlinkHIO_wlDamCaught_c0 { +public: + static daAlinkHIO_wlDamCaught_c1 const m; +}; + +class daAlinkHIO_zwLight_c1 { // may be wrong +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_zwLight_c0 { +public: + static daAlinkHIO_zwLight_c1 const m; +}; + +class daAlinkHIO_board_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; +}; // Size: 0x9C + +class daAlinkHIO_board_c0 { +public: + static daAlinkHIO_board_c1 const m; +}; + +class daAlinkHIO_item_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mOneHandEquipAnm; + /* 0x14 */ daAlinkHIO_anm_c mTwoHandEquipAnm; + /* 0x28 */ s16 mItemFPTransitionTimer; + /* 0x2A */ s16 mItemFPMaxUnk; + /* 0x2C */ s16 mItemFPUpMaxUnk; + /* 0x2E */ s16 mWiiItemFPDownMaxUnk; + /* 0x30 */ s16 mWiiItemFPUpMaxUnk; + /* 0x34 */ f32 mOneHandReleaseAnmSpeed; + /* 0x38 */ f32 mTwoHandReleaseAnmSpeed; +}; // Size: 0x3C + +class daAlinkHIO_item_c0 { +public: + static daAlinkHIO_item_c1 const m; +}; + +class daAlinkHIO_bottle_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x8C */ daAlinkHIO_anm_c field_0x8C; + /* 0xA0 */ daAlinkHIO_anm_c field_0xA0; +}; // Size: 0xB4 + +class daAlinkHIO_bottle_c0 { +public: + static daAlinkHIO_bottle_c1 const m; +}; + +class daAlinkHIO_boom_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mThrowAnm; + /* 0x14 */ daAlinkHIO_anm_c mCatchAnm; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 mBgThroughTime; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 mCatchSpeed; +}; // Size: 0x4c + +class daAlinkHIO_boom_c0 { +public: + static daAlinkHIO_boom_c1 const m; +}; + +class daAlinkHIO_bow_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c val0; + /* 0x14 */ daAlinkHIO_anm_c val5; + /* 0x28 */ s16 vala; + /* 0x2A */ s16 valb; + /* 0x2C */ s16 valc; + /* 0x30 */ f32 vale; + /* 0x34 */ f32 valf; + /* 0x38 */ f32 val10; + /* 0x3C */ f32 val11; + /* 0x40 */ f32 val12; + /* 0x44 */ f32 val13; + /* 0x48 */ f32 val14; + /* 0x4C */ f32 val15; + /* 0x50 */ f32 val16; + /* 0x54 */ f32 val17; + /* 0x58 */ f32 val18; + /* 0x5C */ f32 val19; + /* 0x60 */ f32 val1a; + /* 0x64 */ f32 val1b; + /* 0x68 */ f32 val1c; + /* 0x6C */ f32 val1d; +}; // Size: 0x70 + +class daAlinkHIO_bow_c0 { +public: + static daAlinkHIO_bow_c1 const m; +}; + +class daAlinkHIO_copyRod_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSwingAnm; + /* 0x14 */ daAlinkHIO_anm_c mBigSwingAnm; + /* 0x28 */ f32 mBallSpeed; + /* 0x2c */ f32 mBallMaxDistance; + /* 0x30 */ f32 mBallReturnSpeed; + /* 0x34 */ f32 mBossBallMaxDistance; +}; // Size: 0x38 + +class daAlinkHIO_copyRod_c0 { +public: + static daAlinkHIO_copyRod_c1 const m; +}; + +class daAlinkHIO_bomb_c1 { +public: + /* 0x00 */ s16 mExplodeTime; + /* 0x02 */ s16 mEnemyBombColorR; + /* 0x04 */ s16 mBombInsectLimitAngle; + /* 0x08 */ f32 mGravity; + /* 0x0C */ f32 mMaxFallSpeed; + /* 0x10 */ f32 mBoundRate; + /* 0x14 */ f32 mStopSpeedY; + /* 0x18 */ f32 mMaxSpeedY; + /* 0x1C */ f32 mEffScale; + /* 0x20 */ f32 mAtRadius; + /* 0x24 */ f32 mPokeBombTrackRate; + /* 0x28 */ f32 mWaterGravity; + /* 0x2C */ f32 mWaterMaxFallSpeed; + /* 0x30 */ f32 mThrowSpeedH; + /* 0x34 */ f32 mThrowSpeedV; + /* 0x38 */ f32 mWaterThrowSpeedH; + /* 0x3C */ f32 mWaterThrowSpeedV; + /* 0x40 */ f32 mWolfThrowSpeedH; + /* 0x44 */ f32 mWolfThrowSpeedV; + /* 0x48 */ f32 mExplodeWaterEffectLimit; +}; // Size: 0x4C + +class daAlinkHIO_bomb_c0 { +public: + static daAlinkHIO_bomb_c1 const m; +}; + +class daAlinkHIO_magneBoots_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; + /* 0x14 */ f32 mInputFactor; + /* 0x18 */ f32 mFeetPositionRatio; + /* 0x1C */ f32 mWalkAnmSpeedMax; + /* 0x20 */ f32 mWalkAnmSpeedMin; + /* 0x24 */ f32 mWaterInputFactor; + /* 0x28 */ f32 mWaterStartWalkAnmRate; + /* 0x2C */ f32 mWaterWalkAnmRate; + /* 0x30 */ f32 mMaxMagneFlySpeed; + /* 0x34 */ f32 mMagneFlyAccelRate; + /* 0x38 */ f32 mWaterVelocityY; + /* 0x3C */ f32 mWaterVelocityX; + /* 0x40 */ f32 mWaterVelRateSword; + /* 0x44 */ f32 mZoraWaterInputFactor; + /* 0x48 */ f32 mZoraWaterAnmSpeed; +}; // Size: 0x4C + +class daAlinkHIO_magneBoots_c0 { +public: + static daAlinkHIO_magneBoots_c1 const m; +}; + +class daAlinkHIO_spinner_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s16 field_0x1A; + /* 0x1C */ s16 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; +}; // Size: 0x40 + +class daAlinkHIO_spinner_c0 { +public: + static daAlinkHIO_spinner_c1 const m; +}; + +class daAlinkHIO_hookshot_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; +}; // Size: 0x70 + +class daAlinkHIO_hookshot_c0 { +public: + static daAlinkHIO_hookshot_c1 const m; +}; + +class daHorseRein_c { +private: + /* 0x00 */ cXyz* field_0x0[2]; + /* 0x08 */ int field_0x8[2]; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ cXyz field_0x1c; +}; // Size: 0x28 + +class daHorseFootData_c { +private: + /* 0x0 */ u8 field_0x0[0xE4]; +}; // Size: 0xE4 + +class daHorse_c : public fopAc_ac_c { +public: + enum daHorse_ERFLG0 { + /* 0x010 */ MOVE_ACCEPT = 0x10, + /* 0x080 */ RIDE_RUN_FLG = 0x80, + /* 0x100 */ CUT_TURN_CANCEL = 0x100, + }; + + enum daHorse_RFLG0 { + /* 0x02 */ ENEMY_SEARCH = 2, + /* 0x08 */ LASH_DASH_START = 8, + /* 0x10 */ TURN_STAND = 0x10, + /* 0x40 */ TURN_STAND_CAMERA = 0x40, + }; + + enum daHorse_FLG0 { + /* 0x00000020 */ RODEO_LEFT = 0x20, + /* 0x00000040 */ RIDE_START_FLG = 0x40, + /* 0x00010000 */ PLAYER_BACK_RIDE_LASH = 0x10000, + /* 0x20000000 */ TURN_CANCEL_KEEP = 0x20000000, + /* 0x80000000 */ RODEO_MODE = 0x80000000 + }; + + fopAc_ac_c* getZeldaActor(); + + bool checkNoBombProc() const { return field_0x16b4 == 0 || field_0x16b4 == 1; } + bool checkResetStateFlg0(daHorse_RFLG0 flag) { return mResetStateFlg0 & flag; } + bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) { return mEndResetStateFlg0 & flag; } + bool checkStateFlg0(daHorse_FLG0 flag) { return mStateFlg0 & flag; } + +private: + /* 0x0568 */ u8 field_0x568[8]; + /* 0x0570 */ J3DModel* field_0x570; + /* 0x0574 */ void* field_0x574; + /* 0x0578 */ J3DFrameCtrl field_0x578; + /* 0x058C */ int field_0x58c; + /* 0x0590 */ u8 field_0x590[4]; + /* 0x0594 */ mDoExt_AnmRatioPack field_0x594[3]; + /* 0x05AC */ void* field_0x5ac; + /* 0x05B0 */ daPy_frameCtrl_c field_0x5b0[3]; + /* 0x05F8 */ u8 field_0x5f8[4]; + /* 0x05FC */ dBgS_AcchCir field_0x5fc[3]; + /* 0x06BC */ dBgS_Acch field_0x6bc; + /* 0x0894 */ dCcD_Stts field_0x894; + /* 0x08D0 */ dBgS_HorseLinChk field_0x8d0; + /* 0x0940 */ dCcD_Cyl field_0x940[3]; + /* 0x0CF4 */ dCcD_Cyl field_0xcf4; + /* 0x0E30 */ dCcD_Cyl field_0xe30; + /* 0x0F6C */ dCcD_Sph field_0xf6c; + /* 0x10A4 */ Z2CreatureRide field_0x10a4; + /* 0x1140 */ u8 field_0x1140[0x10]; + /* 0x1150 */ daHorseRein_c field_0x1150[3]; + /* 0x11C8 */ u8 field_0x11c8[0x40]; + /* 0x1208 */ dMsgFlow_c field_0x1208; + /* 0x1254 */ daPy_actorKeep_c mZeldaActorKeep; + /* 0x125C */ u8 field_0x125c[0xC8]; + /* 0x1324 */ daHorseFootData_c mFootData[4]; + /* 0x16B4 */ u8 field_0x16b4; + /* 0x16B5 */ u8 field_0x16b5[3]; + /* 0x16B8 */ u8 field_0x16b8; + /* 0x16B9 */ u8 field_0x16b9[2]; + /* 0x16BB */ u8 mRodeoPointCnt; + /* 0x16BC */ u8 field_0x16bc[0x36]; + /* 0x16F2 */ s16 mAimNeckAngleY; + /* 0x16F4 */ u8 field_0x16f4[0xA]; + /* 0x16FC */ s16 mDemoMoveAngle; + /* 0x16FE */ u8 field_0x16fe[4]; + /* 0x1702 */ s16 field_0x1702; + /* 0x1704 */ u8 field_0x1704[2]; + /* 0x1706 */ s16 mCowHitAngle; + /* 0x1708 */ s16 mCowHit; + /* 0x170A */ u8 field_0x170a[0x1E]; + /* 0x1728 */ int field_0x1728; + /* 0x172C */ u8 field_0x172c[0x14]; + /* 0x1740 */ u32 field_0x1740; + /* 0x1744 */ u32 mStateFlg0; + /* 0x1748 */ u32 mResetStateFlg0; + /* 0x174C */ u32 mEndResetStateFlg0; + /* 0x1750 */ f32 mMorfFrame; + /* 0x1754 */ u8 field_0x1754[0x14]; + /* 0x1768 */ f32 field_0x1768; + /* 0x176C */ f32 field_0x176c; + /* 0x1770 */ f32 field_0x1770; + /* 0x1774 */ u8 field_0x1774[0x14]; + /* 0x1788 */ f32 mDemoStickR; + /* 0x178C */ f32 mNormalMaxSpeedF; + /* 0x1790 */ f32 mLashMaxSpeedF; + /* 0x1794 */ u8 field_0x1794[0x30]; + /* 0x17C4 */ cXyz mDemoPos0; +}; + +class mDoExt_morf_c; + +class daMidna_c : public fopAc_ac_c { public: enum daMidna_ERFLG0 { - NoServiceWait = 128, - ForcePanic = 8, + NO_SERVICE_WAIT = 128, + FORCE_PANIC = 8, }; - enum daMidna_FLG1 { ForceNormalColor = 8, ForceTiredColor = 4 }; - void onForcePanic(void); - u32 checkForceNormalColor(void) const; - u32 checkForceTiredColor(void) const; - bool checkMidnaTired(void); - void onNoServiceWait(void); + enum daMidna_FLG1 { FORCE_NORMAL_COLOR = 8, FORCE_TIRED_COLOR = 4 }; + + enum daMidna_ANM {}; + + void onForcePanic(); + u32 checkForceNormalColor() const; + u32 checkForceTiredColor() const; + bool checkMidnaTired(); + void onNoServiceWait(); + /* 804BC3E0 */ void modelCallBack(int); + /* 804BC5C4 */ void changeUpperBck(); + /* 804BC614 */ void changeFaceBck(); + /* 804BC670 */ void baseModelCallBack(int); + /* 804BC740 */ void initInvModel(u16, J3DModel**, mDoExt_invisibleModel*, u32); + /* 804BC7D4 */ void initDemoModel(J3DModel**, char const*, u32); + /* 804BC868 */ void createHeap(); + /* 804BD274 */ void create(); + /* 804BD93C */ void allAnimePlay(); + /* 804BDE04 */ void setMatrix(); + /* 804BE470 */ void setBodyPartMatrix(); + /* 804BED1C */ void setRoomInfo(); + /* 804BEDB8 */ void setBodyPartPos(); + /* 804BEFA0 */ void checkAppear(); + /* 804BF070 */ void checkMidnaPosState(); + /* 804BFF80 */ void setUpperAnime(u16, u16); + /* 804C0020 */ void setUpperAnimeAndSe(daMidna_c::daMidna_ANM); + /* 804C0094 */ void setFaceAnime(u16, u16); + /* 804C0134 */ void endHighModel(); + /* 804C0238 */ void setDemoAnm(); + /* 804C0BAC */ void setFaceBtp(u16, int); + /* 804C0C6C */ void setFaceBtk(u16, int); + /* 804C0D2C */ void setLeftHandShape(u16); + /* 804C0E18 */ void setRightHandShape(u16); + /* 804C0F04 */ void checkHairOnlyAnime(int) const; + /* 804C0F24 */ void setBckAnime(J3DAnmTransform*, int, f32); + /* 804C103C */ void setAnm(); + /* 804C287C */ void getNeckAimAngle(cXyz const*, s16*, s16*, s16*, s16*); + /* 804C2A68 */ void clearEyeMove(); + /* 804C2AB8 */ void setEyeMove(cXyz const*, s16, s16); + /* 804C2EBC */ void setNeckAngle(); + /* 804C3168 */ void initHairAngle(); + /* 804C3298 */ void setHairAngle(); + /* 804C3F04 */ void setDemoData(); + /* 804C4394 */ void setSimpleBrk(J3DModelData*, u16); + /* 804C4444 */ void setSimpleBtk(J3DModelData*, u16); + /* 804C44CC */ void initMidnaModel(); + /* 804C49B8 */ void setMidnaNoDrawFlg(); + /* 804C4AE8 */ void checkMetamorphoseEnableBase(); + /* 804C4B68 */ void checkNoDrawState(); + /* 804C4BC0 */ void setSound(); + /* 804C4FDC */ void execute(); + /* 804C5A08 */ void draw(); + /* 804C61A4 */ ~daMidna_c(); void onEndResetStateFlg0(daMidna_ERFLG0 pFlg) { mEndResetStateFlg0 |= pFlg; } u32 checkStateFlg1(daMidna_FLG1 pFlg) const { return mStateFlg1 & pFlg; } + static u8 const m_texDataTable[84]; + static u8 const m_anmDataTable[636]; + private: - /* 0x0000 */ fopAc_ac_c mActor; - /* 0x0568 */ u8 field_0x568[0x32C]; + /* 0x0568 */ request_of_phase_process_class* field_0x568; + /* 0x056C */ u8 field_0x56c[4]; + /* 0x0570 */ J3DModel* field_0x570; + /* 0x0574 */ J3DModel* field_0x574; + /* 0x0578 */ mDoExt_morf_c* field_0x578; + /* 0x057C */ mDoExt_McaMorfCallBack1_c* field_0x57c; + /* 0x0580 */ cXyz* field_0x580; + /* 0x0584 */ mDoExt_bckAnm field_0x584; + /* 0x05A0 */ mDoExt_bckAnm field_0x5a0; + /* 0x05BC */ u8 field_0x5bc[8]; + /* 0x05C4 */ mDoExt_invisibleModel field_0x5c4; + /* 0x05CC */ mDoExt_invisibleModel field_0x5cc; + /* 0x05D4 */ mDoExt_invisibleModel field_0x5d4; + /* 0x05DC */ mDoExt_invisibleModel field_0x5dc; + /* 0x05E4 */ daPy_anmHeap_c field_0x5e4[3]; + /* 0x0620 */ daPy_anmHeap_c field_0x620; + /* 0x0634 */ daPy_anmHeap_c field_0x634; + /* 0x0648 */ J3DAnmBase* field_0x648; + /* 0x064C */ J3DAnmBase* field_0x64c; + /* 0x0650 */ J3DAnmBase* field_0x650; + /* 0x0654 */ J3DAnmBase* field_0x654; + /* 0x0658 */ u8 field_0x658[0x10]; + /* 0x0668 */ J3DAnmBase* field_0x668; + /* 0x066C */ J3DAnmBase* field_0x66c; + /* 0x0670 */ u8 field_0x670[4]; + /* 0x0674 */ J3DModel* field_0x674; + /* 0x0678 */ u8 field_0x678[4]; + /* 0x067C */ J3DModel* field_0x67c; + /* 0x0680 */ u8 field_0x680[4]; + /* 0x0684 */ J3DModel* field_0x684; + /* 0x0688 */ J3DModel* field_0x688; + /* 0x068C */ J3DModel* field_0x68c; + /* 0x0690 */ J3DModel* field_0x690; + /* 0x0694 */ J3DModel* field_0x694; + /* 0x0698 */ J3DModel* field_0x698; + /* 0x069C */ u8 field_0x98c[0x10]; + /* 0x06AC */ J3DModel* field_0x6ac; + /* 0x06B0 */ J3DModel* field_0x6b0; + /* 0x06B4 */ u8 field_0x6b4[4]; + /* 0x06B8 */ mDoExt_bckAnm* field_0x6b8; + /* 0x06BC */ J3DDeformData* field_0x6bc; + /* 0x06C0 */ u8 field_0x6c0[4]; + /* 0x06C4 */ J3DFrameCtrl* field_0x6c4; + /* 0x06C8 */ J3DModel* field_0x6c8; + /* 0x06CC */ mDoExt_bckAnm* field_0x6cc; + /* 0x06D0 */ J3DModel* field_0x6d0; + /* 0x06D4 */ mDoExt_bckAnm* field_0x6d4; + /* 0x06D8 */ J3DModel* field_0x6d8; + /* 0x06DC */ mDoExt_bckAnm* field_0x6dc; + /* 0x06E0 */ s16 field_0x6e0; + /* 0x06E2 */ s16 field_0x6e2; + /* 0x06E4 */ s16 field_0x6e4; + /* 0x06E6 */ s16 field_0x6e6; + /* 0x06E8 */ u8 field_0x6e8; + /* 0x06E9 */ u8 field_0x6e9; + /* 0x06EA */ u8 field_0x6ea; + /* 0x06EB */ u8 field_0x6eb; + /* 0x06EC */ u8 field_0x6ec; + /* 0x06ED */ u8 field_0x6ed; + /* 0x06EE */ u8 field_0x6ee; + /* 0x06EF */ u8 field_0x6ef; + /* 0x06F0 */ u8 field_0x6f0[8]; + /* 0x06F8 */ void* field_0x6f8; + /* 0x06FC */ Z2Creature field_0x6fc; + /* 0x078C */ dMsgFlow_c field_0x78c; + /* 0x07D8 */ dBgS_LinkLinChk field_0x7d8; + /* 0x0848 */ u8 mMotionNum; + /* 0x0849 */ u8 mFaceNum; + /* 0x084A */ u8 field_0x84a[4]; + /* 0x084E */ u8 field_0x84e; + /* 0x084F */ u8 mDemoType; + /* 0x0850 */ u8 field_0x850[0xA]; + /* 0x085A */ s16 field_0x85a; + /* 0x085C */ u8 field_0x85c[0x22]; + /* 0x087E */ s16 field_0x87e; + /* 0x0880 */ u8 field_0x880[0x10]; + /* 0x0890 */ u32 mStateFlg0; /* 0x0894 */ u32 mStateFlg1; /* 0x0898 */ u32 mEndResetStateFlg0; + /* 0x089C */ u8 field_0x89c[0x24]; + /* 0x08C0 */ u32 mDemoMode; + /* 0x08C4 */ u8 field_0x8c4[4]; + /* 0x08C8 */ f32 field_0x8c8; + /* 0x08CC */ u8 field_0x8cc[0x14]; + /* 0x08E0 */ cXyz field_0x8e0[5]; + /* 0x091C */ cXyz field_0x91c[5]; + /* 0x0958 */ u8 field_0x958[0xC]; + /* 0x0964 */ cXyz field_0x964[5]; + /* 0x09A0 */ u8 field_0x9a0[0x14]; + /* 0x09C4 */ cXyz field_0x9c4; }; #endif /* D_A_D_A_ALINK_H */ \ No newline at end of file diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 5807f9b45c..fa7b20ef7b 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -12,12 +12,15 @@ #include "f_op/f_op_actor.h" class daPy_sightPacket_c : public dDlst_base_c { +public: /* 8015F1A0 */ virtual void draw(); /* 80140CDC */ virtual ~daPy_sightPacket_c(); /* 8015F2FC */ void setSight(); /* 8015F384 */ void setSightImage(ResTIMG*); + bool getDrawFlg() { return mDrawFlag; } + private: /* 0x04 */ bool mDrawFlag; /* 0x05 */ u8 field_0x5[3]; @@ -27,11 +30,18 @@ private: /* 0x48 */ ResTIMG* field_0x48; }; -struct daPy_boomerangMove_c { +class daPy_boomerangMove_c { +public: /* 8015E5B0 */ void initOffset(cXyz const*); /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; + +private: + /* 0x0 */ u8 field_0x0; + /* 0x2 */ u16 field_0x2; + /* 0x4 */ f32 field_0x4; + /* 0x8 */ f32 field_0x8; +}; // Size: 0xC class daPy_anmHeap_c { public: @@ -47,12 +57,13 @@ public: J3DAnmBase* loadDataIdx(u16); J3DAnmBase* loadDataPriIdx(u16); J3DAnmBase* loadDataDemoRID(u16, u16); - void setAnimeHeap(); + JKRHeap* setAnimeHeap(); u16 getIdx() const { return mIdx; } void resetIdx() { mIdx = 0xffff; } void resetPriIdx() { mPriIdx = 0xffff; } void resetArcNo() { mArcNo = 0xffff; } + bool checkNoSetArcNo() const { return mArcNo == 0xFFFF; } private: /* 0x00 */ u16 mIdx; @@ -66,26 +77,27 @@ private: class daPy_actorKeep_c { public: - daPy_actorKeep_c(void); - void setActor(void); + daPy_actorKeep_c(); + void setActor(); void setData(fopAc_ac_c*); - void clearData(void); + void clearData(); - u32 getID(void) const { return mID; } + u32 getID() const { return mID; } void setID(u32 id) { mID = id; } - fopAc_ac_c* getActor(void) const { return mActor; } + fopAc_ac_c* getActor() const { return mActor; } + fopAc_ac_c* getActorConst() const { return mActor; } private: - u32 mID; - fopAc_ac_c* mActor; -}; + /* 0x0 */ u32 mID; + /* 0x4 */ fopAc_ac_c* mActor; +}; // Size: 0x8 class daPy_frameCtrl_c : public J3DFrameCtrl { public: /* 80140D24 */ ~daPy_frameCtrl_c(); /* 80140D80 */ daPy_frameCtrl_c(); - bool checkAnmEnd(void); - void updateFrame(void); + bool checkAnmEnd(); + void updateFrame(); void setFrameCtrl(u8, short, short, float, float); u16 getEndFlg() { return mEndFlg; } @@ -103,12 +115,18 @@ private: /* 0x16 */ u16 mNowSetFlg; }; +class Z2WolfHowlMgr; +class daBoomerang_c; + class daPy_demo_c { public: void setSpecialDemoType(); void setDemoType(u16 pType) { mDemoType = pType; } u16 getDemoType() const { return mDemoType; } + void setDemoMode(u32 mode) { mDemoMode = mode; } + u32 getDemoMode() const { return mDemoMode; } + void i_setSpecialDemoType() { setDemoType(5); } private: /* 0x00 */ u16 mDemoType; @@ -117,24 +135,34 @@ private: /* 0x06 */ s16 mParam2; /* 0x08 */ int mParam0; /* 0x0C */ int mParam1; - /* 0x10 */ int mDemoMode; + /* 0x10 */ u32 mDemoMode; /* 0x14 */ float mStick; /* 0x18 */ cXyz mDemoPos0; -}; // Size = 0x24 +}; // Size: 0x24 + +class daMidna_c; class daPy_py_c : public fopAc_ac_c { public: - /* 0x0568 */ u8 field_0x568[8]; - /* 0x0570 */ int mNoResetFlg0; - /* 0x0574 */ int mNoResetFlg1; - /* 0x0578 */ int mNoResetFlg2; - /* 0x057C */ int mNoResetFlg3; - /* 0x0580 */ int mResetFlg0; - /* 0x0584 */ int mResetFlg1; - /* 0x0588 */ int mEndResetFlg0; - /* 0x058C */ int mEndResetFlg1; - /* 0x0590 */ int mEndResetFlg2; - /* 0x0594 */ u8 field_0x594[0x10]; + /* 0x0568 */ u8 mCutType; + /* 0x0569 */ u8 mComboCutCount; + /* 0x056A */ u8 mSpecialMode; // maybe needs better name + /* 0x056B */ u8 field_0x56b; + /* 0x056C */ s16 mDamageTimer; + /* 0x056E */ u16 mSwordUpTimer; + /* 0x0570 */ u32 mNoResetFlg0; + /* 0x0574 */ u32 mNoResetFlg1; + /* 0x0578 */ u32 mNoResetFlg2; + /* 0x057C */ u32 mNoResetFlg3; + /* 0x0580 */ u32 mResetFlg0; + /* 0x0584 */ u32 mResetFlg1; + /* 0x0588 */ u32 mEndResetFlg0; + /* 0x058C */ u32 mEndResetFlg1; + /* 0x0590 */ u32 mEndResetFlg2; + /* 0x0594 */ f32 field_0x594; + /* 0x0598 */ u8 field_0x598[0x4]; + /* 0x059C */ s16 mLookAngleY; + /* 0x059E */ u8 field_0x59e[0x6]; /* 0x05A4 */ cXyz mHeadTopPos; /* 0x05B0 */ cXyz mItemPos; /* 0x05BC */ cXyz mSwordTopPos; @@ -147,23 +175,96 @@ public: public: enum daPy_FLG0 { - EquipHeavyBoots = 0x2000000, - MagneBootsOn = 0x1000, - UnkFrollCrashFlg2 = 0x10, - UnkFrollCrashFlg1 = 0x8 - }; - enum daPy_FLG1 { Wolf = 0x2000000, ThrowDamage = 0x4000 }; - enum daPy_FLG2 { BoarSingleBattle = 0x1800000, UnkArmor = 0x80000, Unk = 1 }; - enum daPy_FLG3 { CopyRodThrowAfter = 0x40000 }; - enum daPy_ERFLG0 {}; - enum daPy_ERFLG1 { GanonFinish = 0x80000000, UnkForcePutPos = 0x2000 }; - enum daPy_ERFLG2 {}; - enum daPy_RFLG0 {}; + FLG0_UNK_40000000 = 0x40000000, + EQUIP_HEAVY_BOOTS = 0x2000000, + FLG0_UNK_8000000 = 0x8000000, + FLG0_UNK_1000000 = 0x1000000, + UNDER_WATER_MOVEMENT = 0x800000, + FLG0_UNK_80000 = 0x80000, + FLG0_UNK_20000 = 0x20000, + FLG0_UNK_8000 = 0x8000, + MAGNE_BOOTS_ON = 0x1000, + FLG0_UNK_80 = 0x80, + FLG0_UNK_40 = 0x40, + FLG0_UNK_20 = 0x20, + UNK_F_ROLL_CRASH_2 = 0x10, + UNK_F_ROLL_CRASH_1 = 0x8, + FLG0_UNK_4 = 4, - void setParamData(int, int, int, int); + HEAVY_STATE_BOOTS = FLG0_UNK_40000000 | EQUIP_HEAVY_BOOTS | FLG0_UNK_20000, + }; + enum daPy_FLG1 { IS_WOLF = 0x2000000, FLG1_UNK_10000 = 0x10000, THROW_DAMAGE = 0x4000 }; + enum daPy_FLG2 { + FLG2_UNK_4080000 = 0x4080000, + FLG2_UNK_2080000 = 0x2080000, + BOAR_SINGLE_BATTLE = 0x1800000, + STATUS_WINDOW_DRAW = 0x400000, + UNK_ARMOR = 0x80000, + UNK_FLG2_2 = 2, + UNK_DAPY_FLG2_1 = 1 + }; + enum daPy_FLG3 { + FLG3_UNK_2000000 = 0x2000000, + FLG3_UNK_100000 = 0x100000, + COPY_ROD_THROW_AFTER = 0x40000 + }; + enum daPy_ERFLG0 { + ERFLG0_UNK_8000000 = 0x8000000, + ERFLG0_UNK_1000000 = 0x1000000, + ERFLG0_UNK_100000 = 0x100000, + ERFLG0_UNK_1 = 1, + }; + enum daPy_ERFLG1 { + GANON_FINISH = 0x80000000, + UNK_FORCE_PUT_POS = 0x2000, + ERFLG1_UNK_1 = 1, + }; + enum daPy_ERFLG2 {}; + enum daPy_RFLG0 { + RFLG0_UNK_8000000 = 0x8000000, + RFLG0_UNK_80 = 0x80, + RFLG0_UNK_40 = 0x40, + RFLG0_UNK_2 = 0x2, + }; + + enum { + /* 0x01 */ SMODE_SUMO_READY = 1, + /* 0x25 */ SMODE_SUMO_LOSE = 37, + /* 0x27 */ SMODE_WOLF_PUZZLE = 39, + /* 0x2A */ SMODE_GOAT_STOP = 42, + /* 0x2B */ SMODE_GORON_THROW, + /* 0x2C */ SMODE_CARGO_CARRY, + }; + + enum CutType { + /* 0x01 */ TYPE_CUT_VERTICAL = 1, + /* 0x02 */ TYPE_CUT_STAB, + /* 0x03 */ TYPE_CUT_SWEEP, + /* 0x04 */ TYPE_CUT_HORIZONTAL, + /* 0x05 */ TYPE_CUT_HEAD, // Helm Splitter + /* 0x06 */ TYPE_CUT_LEFT_SWEEP_FINISH, + /* 0x07 */ TYPE_CUT_DOWN_FINISH, + /* 0x08 */ TYPE_CUT_TURN_RIGHT, + /* 0x0A */ TYPE_CUT_JUMP = 10, + /* 0x10 */ TYPE_CUT_AIR = 0x10, + /* 0x12 */ TYPE_CUT_LARGE_JUMP_INIT = 0x12, + /* 0x13 */ TYPE_CUT_LARGE_JUMP, + /* 0x14 */ TYPE_CUT_LARGE_JUMP_FINISH, + /* 0x15 */ TYPE_CUT_RIGHT_SWEEP_FINISH, + /* 0x16 */ TYPE_CUT_TURN_LEFT, + /* 0x17 */ TYPE_CUT_LARGE_TURN_LEFT, + /* 0x18 */ TYPE_CUT_LARGE_TURN_RIGHT, + /* 0x1A */ TYPE_CUT_FAST_MOVE = 0x1A, + /* 0x1E */ TYPE_CUT_TWIRL = 0x1E, // Back Slice + /* 0x1F */ TYPE_CUT_FAST, + /* 0x20 */ TYPE_CUT_STAB_FINISH, + /* 0x21 */ TYPE_CUT_STAB_COMBO, + }; + + static u32 setParamData(int, int, int, int); int checkFishingRodItem(int); - void checkBombItem(int); - void checkBottleItem(int); + static BOOL checkBombItem(int); + static BOOL checkBottleItem(int); void checkDrinkBottleItem(int); static BOOL checkOilBottleItem(int); static BOOL checkOpenBottleItem(int); @@ -171,7 +272,7 @@ public: static BOOL checkHookshotItem(int); static BOOL checkTradeItem(int); static BOOL checkDungeonWarpItem(int); - BOOL checkMasterSwordEquip(); + static BOOL checkMasterSwordEquip(); void checkWoodShieldEquip(); f32 getAttentionOffsetY(); s16 checkNowWolfEyeUp(); @@ -183,105 +284,104 @@ public: void linkGrabSubjectNoDraw(fopAc_ac_c*); void wolfGrabSubjectNoDraw(fopAc_ac_c*); void checkRoomRestartStart(); - void checkCarryStartLightBallA(); - void checkCarryStartLightBallB(); + static u32 checkCarryStartLightBallA(); + static u32 checkCarryStartLightBallB(); float getSpinnerRideSpeed() const; void checkSpinnerReflectEffect(); void checkBoomerangCharge(); bool checkBoomerangChargeTime(); - void getThrowBoomerangActor(); + static daBoomerang_c* getThrowBoomerangActor(); void cancelBoomerangLockActor(fopAc_ac_c*); void setPlayerDamage(int, int); void setMidnaMotionNum(int); void setMidnaFaceNum(int); int checkNoResetFlg0(daPy_FLG0) const; int checkEquipHeavyBoots() const; - int checkBoarSingleBattle(void) const; + int checkBoarSingleBattle() const; int checkEndResetFlg0(daPy_ERFLG0) const; void onNoResetFlg2(daPy_py_c::daPy_FLG2); void offNoResetFlg0(daPy_py_c::daPy_FLG0); int checkEndResetFlg2(daPy_py_c::daPy_ERFLG2) const; bool getSumouMode() const; int checkNoResetFlg3(daPy_py_c::daPy_FLG3) const; - void checkShieldGet(); + BOOL checkShieldGet(); void onNoResetFlg0(daPy_py_c::daPy_FLG0); int checkEndResetFlg1(daPy_py_c::daPy_ERFLG1) const; void offNoResetFlg1(daPy_py_c::daPy_FLG1); void offNoResetFlg2(daPy_py_c::daPy_FLG2); int checkWolf() const; - void checkSwordGet(); + BOOL checkSwordGet(); int checkResetFlg0(daPy_py_c::daPy_RFLG0) const; int checkNoResetFlg2(daPy_py_c::daPy_FLG2) const; int checkMagneBootsOn() const; - virtual void unk(); - virtual bool getMidnaAtnPos(void) const; + virtual cXyz* getMidnaAtnPos() const; virtual void setMidnaMsgNum(fopAc_ac_c*, u16); - virtual Mtx* getModelMtx(void); - virtual Mtx* getInvMtx(void); - virtual cXyz* getShadowTalkAtnPos(void); - virtual float getGroundY(); - virtual Mtx* getLeftItemMatrix(void); - virtual Mtx* getRightItemMatrix(void); - virtual Mtx* getLeftHandMatrix(void); - virtual Mtx* getRightHandMatrix(void); - virtual Mtx* getLinkBackBone1Matrix(void); - virtual Mtx* getWolfMouthMatrix(void); - virtual Mtx* getWolfBackbone2Matrix(void); - virtual bool getBottleMtx(void); - virtual bool checkPlayerGuard(void) const; - virtual bool checkPlayerFly() const; - virtual bool checkFrontRoll() const; - virtual bool checkWolfDash() const; - virtual bool checkAutoJump(void) const; - virtual bool checkSideStep(void) const; - virtual bool checkWolfTriggerJump(void) const; - virtual bool checkGuardBreakMode(void) const; - virtual bool checkLv3Slide(void) const; - virtual bool checkWolfHowlDemoMode(void) const; - virtual bool checkChainBlockPushPull(void); - virtual bool checkElecDamage(void) const; - virtual bool checkEmptyBottleSwing(void) const; - virtual bool checkBottleSwingMode(void) const; - virtual bool checkHawkWait(void) const; - virtual bool checkGoatThrow(void) const; - virtual bool checkGoatThrowAfter(void) const; - virtual bool checkWolfTagLockJump(void) const; - virtual bool checkWolfTagLockJumpLand(void) const; - virtual bool checkWolfRope(void); - virtual bool checkWolfRopeHang(void) const; - virtual bool checkRollJump(void) const; - virtual bool checkGoronRideWait(void) const; - virtual bool checkWolfChain(void) const; - virtual bool checkWolfWait(void) const; - virtual bool checkWolfJumpAttack(void) const; - virtual bool checkWolfRSit(void) const; - virtual bool checkBubbleFly(void) const; - virtual bool checkBottleDrinkEnd(void) const; - virtual bool checkWolfDig(void) const; - virtual bool checkCutCharge(void) const; - virtual bool checkCutTurnCharge(void) const; - virtual bool checkCutLargeJumpCharge(void) const; + virtual MtxP getModelMtx(); + virtual MtxP getInvMtx(); + virtual cXyz* getShadowTalkAtnPos(); + virtual f32 getGroundY(); + virtual MtxP getLeftItemMatrix(); + virtual MtxP getRightItemMatrix(); + virtual MtxP getLeftHandMatrix(); + virtual MtxP getRightHandMatrix(); + virtual MtxP getLinkBackBone1Matrix(); + virtual MtxP getWolfMouthMatrix(); + virtual MtxP getWolfBackbone2Matrix(); + virtual MtxP getBottleMtx(); + virtual BOOL checkPlayerGuard() const; + virtual u32 checkPlayerFly() const; + virtual BOOL checkFrontRoll() const; + virtual BOOL checkWolfDash() const; + virtual BOOL checkAutoJump() const; + virtual bool checkSideStep() const; + virtual bool checkWolfTriggerJump() const; + virtual BOOL checkGuardBreakMode() const; + virtual bool checkLv3Slide() const; + virtual bool checkWolfHowlDemoMode() const; + virtual bool checkChainBlockPushPull(); + virtual BOOL checkElecDamage() const; + virtual BOOL checkEmptyBottleSwing() const; + virtual BOOL checkBottleSwingMode() const; + virtual BOOL checkHawkWait() const; + virtual BOOL checkGoatThrow() const; + virtual BOOL checkGoatThrowAfter() const; + virtual BOOL checkWolfTagLockJump() const; + virtual BOOL checkWolfTagLockJumpLand() const; + virtual bool checkWolfRope(); + virtual BOOL checkWolfRopeHang() const; + virtual BOOL checkRollJump() const; + virtual BOOL checkGoronRideWait() const; + virtual BOOL checkWolfChain() const; + virtual BOOL checkWolfWait() const; + virtual BOOL checkWolfJumpAttack() const; + virtual BOOL checkWolfRSit() const; + virtual bool checkBubbleFly() const; + virtual BOOL checkBottleDrinkEnd() const; + virtual BOOL checkWolfDig() const; + virtual BOOL checkCutCharge() const; + virtual BOOL checkCutTurnCharge() const; + virtual BOOL checkCutLargeJumpCharge() const; virtual bool getBokoFlamePos(cXyz*); - virtual bool checkComboCutTurn(void) const; - virtual bool checkClimbMove(void) const; - virtual bool checkGrassWhistle(void) const; - virtual bool checkBoarRun(void) const; - virtual bool checkFmChainPut(void) const; - virtual bool checkHorseElecDamage(void) const; - virtual float getBaseAnimeFrameRate(void) const; - virtual float getBaseAnimeFrame(void) const; + virtual BOOL checkComboCutTurn() const; + virtual BOOL checkClimbMove() const; + virtual BOOL checkGrassWhistle() const; + virtual BOOL checkBoarRun() const; + virtual bool checkFmChainPut() const; + virtual bool checkHorseElecDamage() const; + virtual float getBaseAnimeFrameRate() const; + virtual float getBaseAnimeFrame() const; virtual void setAnimeFrame(float); virtual bool checkWolfLock(fopAc_ac_c*) const; virtual bool cancelWolfLock(fopAc_ac_c*); - virtual bool getAtnActorID(void) const; - virtual s32 getItemID(void) const; - virtual bool getGrabActorID(void) const; + virtual s32 getAtnActorID() const; + virtual s32 getItemID() const; + virtual s32 getGrabActorID() const; virtual bool exchangeGrabActor(fopAc_ac_c*); virtual bool setForceGrab(fopAc_ac_c*, int, int); virtual void setForcePutPos(cXyz const&); - virtual bool checkPlayerNoDraw(void); - virtual bool checkRopeTag(void); + virtual bool checkPlayerNoDraw(); + virtual bool checkRopeTag(); virtual void voiceStart(u32); virtual void seStartOnlyReverb(u32); virtual void seStartOnlyReverbLevel(u32); @@ -289,14 +389,14 @@ public: virtual void setGrabCollisionOffset(float, float, cBgS_PolyInfo*); virtual void onMagneGrab(float, float); virtual void onFrollCrashFlg(u8, int); - virtual bool getModelJointMtx(u16); - virtual bool getHeadMtx(void); + virtual MtxP getModelJointMtx(u16); + virtual MtxP getHeadMtx(); virtual bool setHookshotCarryOffset(unsigned int, cXyz const*); - // virtual void checkCutJumpCancelTurn() const; - virtual bool checkIronBallReturn(void) const; - virtual bool checkIronBallGroundStop(void) const; - virtual bool checkSingleBoarBattleSecondBowReady(void) const; - virtual bool checkPointSubWindowMode(void) const; + virtual BOOL checkCutJumpCancelTurn() const; + virtual bool checkIronBallReturn() const; + virtual bool checkIronBallGroundStop() const; + virtual BOOL checkSingleBoarBattleSecondBowReady() const; + virtual bool checkPointSubWindowMode() const; virtual void setClothesChange(int); virtual void setPlayerPosAndAngle(float (*)[4]); virtual void setPlayerPosAndAngle(cXyz const*, csXyz const*); @@ -306,27 +406,27 @@ public: virtual bool setRollJump(float, float, short); virtual void playerStartCollisionSE(u32, u32); virtual void changeTextureAnime(u16, u16, int); - virtual void cancelChangeTextureAnime(void); - virtual void cancelDungeonWarpReadyNeck(void); + virtual void cancelChangeTextureAnime(); + virtual void cancelDungeonWarpReadyNeck(); virtual void onSceneChangeArea(u8, u8, fopAc_ac_c*); virtual void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*); virtual void onSceneChangeDead(u8, int); - virtual bool checkHorseRide() const; - virtual bool checkBoarRide() const; - virtual bool checkCanoeRide() const; - virtual bool checkBoardRide() const; + virtual u32 checkHorseRide() const; + virtual u32 checkBoarRide() const; + virtual u32 checkCanoeRide() const; + virtual u32 checkBoardRide() const; virtual u32 checkSpinnerRide() const; - virtual bool getSpinnerActor(void); - virtual bool checkHorseRideNotReady(void) const; - virtual bool checkArrowChargeEnd(void) const; - virtual void getSearchBallScale(void) const; - virtual bool checkFastShotTime(void); - virtual bool checkNoEquipItem(void) const; - virtual bool checkFireMaterial(void) const; + virtual fopAc_ac_c* getSpinnerActor(); + virtual BOOL checkHorseRideNotReady() const; + virtual bool checkArrowChargeEnd() const; + virtual f32 getSearchBallScale() const; + virtual s16 checkFastShotTime(); + virtual bool checkNoEquipItem() const; + virtual bool checkFireMaterial() const; virtual bool checkKandelaarSwing(int) const; - virtual bool getBoardCutTurnOffsetAngleY(void) const; - virtual cXyz* getMagneHitPos(void); - virtual cXyz* getMagneBootsTopVec(void); + virtual s16 getBoardCutTurnOffsetAngleY() const; + virtual cXyz* getMagneHitPos(); + virtual cXyz* getMagneBootsTopVec(); virtual bool getKandelaarFlamePos(); virtual bool checkUseKandelaar(int); virtual void setDkCaught(fopAc_ac_c*); @@ -337,53 +437,53 @@ public: virtual void setWolfEnemyHangBiteAngle(short); virtual void setKandelaarMtx(float (*)[4], int, int); virtual bool getStickAngleFromPlayerShape(short*) const; - virtual bool checkSpinnerPathMove(void); - virtual bool checkSpinnerTriggerAttack(void); - virtual void onSpinnerPathForceRemove(void); - virtual bool getIronBallBgHit(void) const; - virtual bool getIronBallCenterPos(void); - virtual bool checkCanoeFishingGetLeft(void) const; - virtual bool checkCanoeFishingGetRight(void) const; - virtual bool checkBeeChildDrink(void) const; - virtual void skipPortalObjWarp(void); + virtual bool checkSpinnerPathMove(); + virtual bool checkSpinnerTriggerAttack(); + virtual void onSpinnerPathForceRemove(); + virtual bool getIronBallBgHit() const; + virtual bool getIronBallCenterPos(); + virtual bool checkCanoeFishingGetLeft() const; + virtual bool checkCanoeFishingGetRight() const; + virtual u8 checkBeeChildDrink() const; + virtual void skipPortalObjWarp(); virtual bool checkTreasureRupeeReturn(int) const; virtual void setSumouReady(fopAc_ac_c*); virtual bool checkAcceptDungeonWarpAlink(int); - virtual bool getSumouCounter(void) const; - virtual bool checkSumouWithstand(void) const; - virtual void cancelGoronThrowEvent(void); + virtual s16 getSumouCounter() const; + virtual s16 checkSumouWithstand() const; + virtual void cancelGoronThrowEvent(); virtual void setSumouGraspCancelCount(int); virtual void setSumouPushBackDirection(short); - virtual void setSumouLoseHeadUp(void); - virtual s16 getGiantPuzzleAimAngle(void) const; + virtual void setSumouLoseHeadUp(); + virtual s16 getGiantPuzzleAimAngle() const; virtual void setGoronSideMove(fopAc_ac_c*); virtual void setCargoCarry(fopAc_ac_c*); - virtual bool getDpdFarFlg(void) const; - virtual bool getHookshotTopPos(void); - virtual bool checkHookshotReturnMode(void) const; - virtual bool checkHookshotShootReturnMode(void) const; - virtual bool checkOctaIealHang(void) const; - virtual void cancelOctaIealHang(void); - virtual void cancelDragonHangBackJump(void); - virtual void setOctaIealWildHang(void); - virtual bool checkDragonHangRide(void) const; + virtual bool getDpdFarFlg() const; + virtual bool getHookshotTopPos(); + virtual bool checkHookshotReturnMode() const; + virtual bool checkHookshotShootReturnMode() const; + virtual bool checkOctaIealHang() const; + virtual void cancelOctaIealHang(); + virtual void cancelDragonHangBackJump(); + virtual void setOctaIealWildHang(); + virtual bool checkDragonHangRide() const; virtual void changeDragonActor(fopAc_ac_c*); - virtual bool getClothesChangeWaitTimer(void) const; - virtual bool getShieldChangeWaitTimer(void) const; - virtual bool getSwordChangeWaitTimer(void) const; - virtual bool checkMetamorphose(void) const; - virtual bool checkWolfDownAttackPullOut(void) const; - virtual bool checkBootsOrArmorHeavy(void) const; - virtual s32 getBottleOpenAppearItem(void) const; - virtual bool checkItemSwordEquip(void) const; - virtual float getSinkShapeOffset(void) const; - virtual bool checkSinkDead(void) const; - virtual bool checkHorseStart(void); - virtual bool getWolfHowlMgrP(void); - virtual bool checkWolfHowlSuccessAnime(void) const; - virtual bool checkCopyRodTopUse(void); - virtual bool checkCopyRodEquip(void) const; - virtual bool checkCutJumpMode(void) const; + virtual u8 getClothesChangeWaitTimer() const; + virtual u8 getShieldChangeWaitTimer() const; + virtual u8 getSwordChangeWaitTimer() const; + virtual BOOL checkMetamorphose() const; + virtual BOOL checkWolfDownAttackPullOut() const; + virtual BOOL checkBootsOrArmorHeavy() const; + virtual s32 getBottleOpenAppearItem() const; + virtual bool checkItemSwordEquip() const; + virtual float getSinkShapeOffset() const; + virtual BOOL checkSinkDead() const; + virtual BOOL checkHorseStart(); + virtual Z2WolfHowlMgr* getWolfHowlMgrP(); + virtual BOOL checkWolfHowlSuccessAnime() const; + virtual BOOL checkCopyRodTopUse(); + virtual bool checkCopyRodEquip() const; + virtual BOOL checkCutJumpMode() const; bool getSumouCameraMode() const { bool sumouCameraMode = false; @@ -393,20 +493,43 @@ public: return sumouCameraMode; } + bool checkStatusWindowDraw() { return i_checkNoResetFlg2(STATUS_WINDOW_DRAW); } + bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; } + bool getHeavyStateAndBoots() { return i_checkNoResetFlg0(HEAVY_STATE_BOOTS); } + // some functions use these function as an inline // is there a better way to handle this? int i_checkNoResetFlg0(daPy_FLG0 pFlag) const { return mNoResetFlg0 & pFlag; } int i_checkNoResetFlg1(daPy_FLG1 pFlag) const { return mNoResetFlg1 & pFlag; } int i_checkNoResetFlg2(daPy_FLG2 pFlag) const { return mNoResetFlg2 & pFlag; } + int i_checkNoResetFlg3(daPy_FLG3 pFlag) const { return mNoResetFlg3 & pFlag; } void i_onNoResetFlg0(int pFlg) { mNoResetFlg0 |= pFlg; } + void i_onNoResetFlg1(int pFlg) { mNoResetFlg1 |= pFlg; } + void i_onNoResetFlg2(int pFlg) { mNoResetFlg2 |= pFlg; } void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; } + void i_offNoResetFlg0(int pFlg) { mNoResetFlg0 &= ~pFlg; } void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; } + void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; } + void i_onResetFlg0(int flag) { mResetFlg0 |= flag; } + void i_onResetFlg1(int flag) { mResetFlg1 |= flag; } + void i_onEndResetFlg0(int flag) { mEndResetFlg0 |= flag; } + int i_checkResetFlg0(daPy_py_c::daPy_RFLG0 flag) const { return mResetFlg0 & flag; } + int i_checkEndResetFlg0(daPy_py_c::daPy_ERFLG0 flag) const { return mEndResetFlg0 & flag; } + int i_checkEndResetFlg1(daPy_py_c::daPy_ERFLG1 flag) const { return mEndResetFlg1 & flag; } void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; } - int i_checkWolf() { return i_checkNoResetFlg1(Wolf); } - BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EquipHeavyBoots); } - inline BOOL checkNowWolf(); + int i_checkWolf() const { return i_checkNoResetFlg1(IS_WOLF); } + BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EQUIP_HEAVY_BOOTS); } + BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(MAGNE_BOOTS_ON); } + bool i_checkMidnaRide() const { return i_checkNoResetFlg0(FLG0_UNK_4); } - static u8 m_midnaActor[4]; + inline u32 getLastSceneMode(); + inline bool checkWoodSwordEquip(); + inline BOOL i_checkSwordGet(); + inline bool i_checkShieldGet() const; + inline BOOL checkNowWolf(); + inline bool checkZoraWearFlg() const; + + static daMidna_c* m_midnaActor; }; #endif /* D_A_D_A_PLAYER_H */ diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index a1d6f5dc10..e07a458783 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -137,6 +137,8 @@ public: void SetGroundHit() { m_flags |= GROUND_HIT; } void SetGroundLanding() { m_flags |= GROUND_LANDING; } void SetGroundAway() { m_flags |= GROUND_AWAY; } + const u32 MaskWaterHit() { return m_flags & WATER_HIT; } + const bool ChkWaterHit() { return MaskWaterHit(); } // inline dupe void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; } diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 0c86f48f73..011835eb3b 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -57,6 +57,7 @@ public: /* 80083830 */ void Move(); /* 8008523C */ virtual ~dCcD_GStts() {} void ClrTg() { mTg = 0; } + void SetAtApid(unsigned int id) { mAtApid = id; } // private: /* 0x04 */ u8 mAt; @@ -82,11 +83,19 @@ public: }; // Size = 0x3C +enum dCcG_At_Spl { + /* 0x0 */ dCcG_At_Spl_UNK_0, + /* 0x1 */ dCcG_At_Spl_UNK_01, +}; + +class dCcD_GObjInf; +typedef void (*dCcD_AtHitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); + class dCcD_GAtTgCoCommonBase { public: /* 0x00 */ u32 mGFlag; /* 0x04 */ u32 mRPrm; - /* 0x08 */ u32 field_0x08; + /* 0x08 */ dCcD_AtHitCallback mHitCallback; /* 0x0C */ u32 mApid; /* 0x10 */ fopAc_ac_c* mAc; /* 0x14 */ s8 mEffCounter; @@ -108,7 +117,12 @@ public: u32 GetGFlag() const { return mGFlag; } u32 GetRPrm() const { return mRPrm; } u32 MskSPrm(u32 mask) const { return mGFlag & mask; } + u32 MskRPrm(u32 mask) const { return mRPrm & mask; } bool ChkSPrm(u32 mask) const { return MskSPrm(mask); } + void OnSPrm(u32 flag) { mGFlag |= flag; } + void OffSPrm(u32 flag) { mGFlag &= ~flag; } + bool ChkRPrm(u32 flag) const { return MskRPrm(flag); } + void SetHitCallback(dCcD_AtHitCallback callback) { mHitCallback = callback; } }; // Size = 0x1C class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase { @@ -117,6 +131,11 @@ public: /* 80083C44 */ virtual ~dCcD_GObjAt() {} void SetVec(cXyz& vec) { mVec = vec; } cXyz& GetVec() { return mVec; } + cXyz* GetVecP() { return &mVec; } + void SetHitMark(u8 mark) { mHitMark = mark; } + void SetSe(u8 se) { mSe = se; } + void SetMtrl(u8 mtrl) { mMtrl = mtrl; } + void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; } // private: /* 0x1C */ u8 mSe; @@ -156,7 +175,7 @@ public: /* 800840E4 */ virtual ~dCcD_GObjInf(); /* 80084268 */ cCcD_GObjInf* GetGObjInf(); /* 8008426C */ virtual void ClrAtHit(); - /* 800842C0 */ s32 ChkAtHit(); + /* 800842C0 */ u32 ChkAtHit(); /* 80084318 */ void ResetAtHit(); /* 80084358 */ cCcD_Obj* GetAtHitObj(); /* 800843A8 */ cCcD_GObjInf* GetAtHitGObj(); @@ -176,6 +195,18 @@ public: void SetAtVec(cXyz& vec) { mGObjAt.SetVec(vec); } bool ChkAtNoMass() const { return mGObjAt.ChkSPrm(8); } + void OnAtNoHitMark() { mGObjAt.OnSPrm(2); } + void OffAtNoHitMark() { mGObjAt.OffSPrm(2); } + void OnAtNoConHit() { mGObjAt.OnSPrm(1); } + void OffAtNoConHit() { mGObjAt.OffSPrm(1); } + void SetAtHitMark(u8 mark) { mGObjAt.SetHitMark(mark); } + void SetAtSe(u8 se) { mGObjAt.SetSe(se); } + void SetAtMtrl(u8 mtrl) { mGObjAt.SetMtrl(mtrl); } + fopAc_ac_c* GetAtHitAc() { return mGObjAt.GetAc(); } + bool ChkAtShieldHit() { return mGObjAt.ChkRPrm(1); } + cXyz* GetAtVecP() { return mGObjAt.GetVecP(); } + void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); } + void SetAtHitCallback(dCcD_AtHitCallback callback) { mGObjAt.SetHitCallback(callback); } static u32 const m_hitSeID[24]; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index caa7ccf7e2..202b637c5e 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -11,6 +11,7 @@ #include "d/d_vibration.h" #include "d/event/d_event.h" #include "d/event/d_event_manager.h" +#include "d/particle/d_particle.h" #include "d/save/d_save.h" #include "dolphin/types.h" @@ -68,6 +69,10 @@ STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38); enum PlayerPtr { LINK_PTR, HORSE_PTR }; +class daHorse_c; +class dPa_control_c; +class daAlink_c; + class dComIfG_play_c { public: dComIfG_play_c() { this->ct(); } @@ -138,6 +143,14 @@ public: mAStatus = status; mASetFlag = flag; } + void setXStatus(u8 status, u8 flag) { + mXStatus = status; + mXSetFlag = flag; + } + void setYStatus(u8 status, u8 flag) { + mYStatus = status; + mYSetFlag = flag; + } void setBottleStatus(u8 status, u8 flag) { mBottleStatus = status; mBottleSetFlag = flag; @@ -178,6 +191,20 @@ public: void* getPlayerPtr(int ptrIdx) { return mPlayerPtr[ptrIdx]; } JKRArchive* getMain2DArchive() { return mMain2DArchive; } J2DGrafContext* getCurrentGrafPort() { return mCurrentGrafPort; } + dVibration_c& getVibration() { return mVibration; } + void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] |= flag; } + void clearPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[i] &= ~flag; } + bool checkPlayerStatus(int param_0, int i, u32 flag) { return flag & mPlayerStatus[i]; } + BOOL checkCameraAttentionStatus(int i, u32 flag) { + return mCameraInfo[i].mCameraAttentionStatus & flag; + } + s8 getPlayerCameraID(int i) { return mPlayerCameraID[i]; } + dPa_control_c* getParticle() { return mParticle; } + void set3DStatus(u8 status, u8 direction, u8 flag) { + m3DStatus = status; + m3DDirection = direction; + m3DSetFlag = flag; + } public: /* 0x00000 */ dBgS mDBgS; @@ -217,7 +244,7 @@ public: /* 0x04DBC */ JKRArchive* mMsgDtArchive[15]; /* 0x04DF8 */ JKRArchive* mMain2DArchive; /* 0x04DFC */ void* field_0x4dfc[2]; - /* 0x04E04 */ void* mParticle; + /* 0x04E04 */ dPa_control_c* mParticle; /* 0x04E08 */ void* mSimpleModel; /* 0x04E0C */ u8 mWindowNum; /* 0x04E0D */ u8 mLayerOld; @@ -319,7 +346,7 @@ public: /* 0x04F23 */ u8 mZSetFlagForce; /* 0x04F24 */ u8 mXStatus; /* 0x04F25 */ u8 mXStatusForce; - /* 0x04F26 */ u8 field_0x4fbe; // related to XStatus + /* 0x04F26 */ u8 mXSetFlag; /* 0x04F27 */ u8 mXSetFlagForce; /* 0x04F28 */ u8 mYStatus; /* 0x04F29 */ u8 mYStatusForce; @@ -386,8 +413,8 @@ public: /* 0x04FD4 */ fopAc_ac_c* mMesgCamInfoActor8; /* 0x04FD8 */ fopAc_ac_c* mMesgCamInfoActor9; /* 0x04FDC */ fopAc_ac_c* mMesgCamInfoActor10; - /* 0x04FE0 */ int mPlayerStatus; - /* 0x04FE4 */ u8 field_0x4fe4[0x14]; + /* 0x04FE0 */ u32 mPlayerStatus[2]; + /* 0x04FE8 */ u8 field_0x4fe8[0x10]; /* 0x04FF8 */ __d_timer_info_c mTimerInfo; /* 0x0500C */ dDlst_window_c* mCurrentWindow; /* 0x05010 */ void* mCurrentView; @@ -453,6 +480,18 @@ void dComIfGs_setSelectEquipSword(u8); void dComIfGs_setSelectEquipShield(u8); void* dComIfG_getStageRes(char const*); void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**param_1)(void*), void*); +void dComIfGp_addSelectItemNum(int, s16); +BOOL dComIfGs_isOneZoneSwitch(int, int); +u8 dComIfGp_getSelectItem(int); +u8 dComIfGp_TargetWarpPt_get(); +void dComIfGp_TargetWarpPt_set(u8); +BOOL dComIfGp_TransportWarp_check(); +void dComIfGp_setNextStage(char const*, s16, s8, s8, f32, u32, int, s8, s16, int, int); +cXyz& dComIfGs_getWarpPlayerPos(); +const char* dComIfGs_getWarpStageName(); +s16 dComIfGs_getWarpPlayerAngleY(); +s8 dComIfGs_getWarpRoomNo(); +char* dComIfG_getRoomArcName(int); inline void dComIfGp_setRStatus(u8 status, u8 flag) { g_dComIfG_gameInfo.play.setRStatus(status, flag); @@ -707,7 +746,7 @@ inline s16 dComIfGs_getLastWarpMarkPlayerAngleY() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getAngleY(); } -inline s8 dComIfGs_getLastWarpMarkRoomNo() { +inline u8 dComIfGs_getLastWarpMarkRoomNo() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getRoomNo(); } @@ -1033,4 +1072,124 @@ inline dBgS& dComIfG_Bgsp() { return g_dComIfG_gameInfo.play.mDBgS; } +inline s16 dComIfGs_getStartPoint() { + return g_dComIfG_gameInfo.info.getRestart().getStartPoint(); +} + +inline dVibration_c& dComIfGp_getVibration() { + return g_dComIfG_gameInfo.play.getVibration(); +} + +inline void dComIfGp_setPlayerStatus0(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 0, flag); +} + +inline void dComIfGp_setPlayerStatus1(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.setPlayerStatus(param_0, 1, flag); +} + +inline dEvent_manager_c* dComIfGp_getPEvtManager() { + return &g_dComIfG_gameInfo.play.getEvtManager(); +} + +inline void dComIfGp_evmng_cutEnd(int param_0) { + dComIfGp_getPEvtManager()->cutEnd(param_0); +} + +inline BOOL dComIfGp_checkCameraAttentionStatus(int i, u32 flag) { + return g_dComIfG_gameInfo.play.checkCameraAttentionStatus(i, flag); +} + +inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) { + g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag); +} + +inline u8 dComIfGs_getLastSceneMode() { + return g_dComIfG_gameInfo.info.getRestart().getLastMode(); +} + +inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, + const dKy_tevstr_c* param_3, const csXyz* param_4, + const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, + s8 param_8, const GXColor* param_9, const GXColor* param_10, + const cXyz* param_11) { + return g_dComIfG_gameInfo.play.getParticle()->setNormal( + param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, + param_10, param_11, 1.0f); +} + +inline void dComIfGp_particle_levelEmitterOnEventMove(u32 param_0) { + g_dComIfG_gameInfo.play.getParticle()->forceOnEventMove(param_0); +} + +inline dPa_control_c::level_c::emitter_c* dComIfGp_particle_getEmitter(u32 param_0) { + return g_dComIfG_gameInfo.play.getParticle()->getEmitter(param_0); +} + +inline u32 dComIfGp_particle_setPolyColor(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, + const cXyz* param_3, const dKy_tevstr_c* param_4, + const csXyz* param_5, const cXyz* param_6, int param_7, + dPa_levelEcallBack* param_8, s8 param_9, + const cXyz* param_10) { + return g_dComIfG_gameInfo.play.getParticle()->setPoly(param_0, param_1, param_2, param_3, + param_4, param_5, param_6, param_7, + param_8, param_9, param_10); +} + +inline dRes_info_c* dComIfG_getObjectResInfo(const char* arc_name) { + return g_dComIfG_gameInfo.mResControl.getObjectResInfo(arc_name); +} + +inline void dComIfGp_setXStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setXStatus(status, flag); +} + +inline void dComIfGp_setYStatus(u8 status, u8 flag) { + g_dComIfG_gameInfo.play.setYStatus(status, flag); +} + +inline BOOL dComIfGp_event_compulsory(void* param_0, const char* param_1, u16 param_2) { + return g_dComIfG_gameInfo.play.getEvent().compulsory(param_0, param_1, param_2); +} + +inline void dComIfGs_setTurnRestart(const cXyz& param_0, s16 param_1, s8 param_2, u32 param_3) { + g_dComIfG_gameInfo.info.getTurnRestart().set(param_0, param_1, param_2, param_3); +} + +inline void dComIfGs_setRestartRoom(const cXyz& param_0, s16 param_1, s8 param_2) { + g_dComIfG_gameInfo.info.getRestart().setRoom(param_0, param_1, param_2); +} + +inline s8 dComIfGs_getRestartRoomNo() { + return g_dComIfG_gameInfo.info.getRestart().getRoomNo(); +} + +inline void dComIfGs_setRestartRoomParam(u32 param) { + g_dComIfG_gameInfo.info.getRestart().setRoomParam(param); +} + +inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) { + g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag); +} + +inline int* dComIfGp_evmng_getMyIntegerP(int index, char* name) { + return (int*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_INT); +} + +inline char* dComIfGp_evmng_getMyStringP(int index, char* name) { + return (char*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_STRING); +} + +inline f32* dComIfGp_evmng_getMyFloatP(int index, char* name) { + return (f32*)dComIfGp_getPEvtManager()->getMySubstanceP(index, name, dEvDtData_c::TYPE_FLOAT); +} + +inline stage_scls_info_dummy_class* dComIfGp_getStageSclsInfo() { + return g_dComIfG_gameInfo.play.getStage().getSclsInfo(); +} + +inline dStage_roomStatus_c* dComIfGp_roomControl_getStatusRoomDt(int room_no) { + return g_dComIfG_gameInfo.play.getRoomControl()->getStatusRoomDt(room_no); +} + #endif /* D_COM_D_COM_INF_GAME_H */ diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 0edb7ab71b..ed98d11aa1 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -148,6 +148,16 @@ public: /* 80070178 */ virtual void execute(u16, J3DTransformInfo*); }; +struct dist_entry { + f32 field_0x0; + f32 field_0x4; + f32 field_0x8; + f32 field_0xc; + f32 field_0x10; + f32 field_0x14; + u32 field_0x18; +}; // Size: 0x1C + class dAttention_c { public: dAttention_c() {} @@ -185,14 +195,26 @@ public: /* 800736CC */ void LockonTargetPId(s32); /* 80073734 */ void ActionTarget(s32); /* 8007378C */ void CheckObjectTarget(s32); - /* 800737E4 */ void LockonTruth(); + /* 800737E4 */ bool LockonTruth(); /* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32); dAttCatch_c& getCatghTarget() { return mCatghTarget; } + bool chkFlag(u32 flag) { return mFlags & flag; } + BOOL Lockon() { + bool chk = true; + if (!LockonTruth()) { + if (!chkFlag(0x20000000)) { + chk = false; + } + } + return chk; + + // return !LockonTruth() && !chkFlag(0x20000000); + } static u8 loc_type_tbl[12]; static u8 act_type_tbl[20]; - static u8 dist_table[6552]; + static dist_entry dist_table[234]; static u32 loc_type_num; static u32 act_type_num; static u32 chk_type_tbl; diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 7a9b57caee..cc3d612a85 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -41,6 +41,14 @@ public: bool checkFlowerBombWait(fopAc_ac_c*); bool checkWaterBomb(fopAc_ac_c*); bool checkInsectBombMove(fopAc_ac_c*); + + static fopAc_ac_c* createNormalBombPlayer(cXyz* p_pos) { + return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 8, p_pos, -1, NULL, NULL, -1, NULL, NULL); + } + + static fopAc_ac_c* createWaterBombPlayer(cXyz* p_pos) { + return (fopAc_ac_c*)fopAcM_fastCreate(0x221, 9, p_pos, -1, NULL, NULL, -1, NULL, NULL); + } }; #endif /* D_D_BOMB_H */ diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 2b88c55ed3..71d566c05d 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -20,6 +20,8 @@ public: /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*); + bool checkPassNum(int bit) { return field_0xc & (1 << bit); } + /* 0x00 */ dJntColData_c* mData; /* 0x04 */ J3DModel* mModel; /* 0x08 */ int field_0x8; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 8c038fcdfb..67e81da529 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -91,6 +91,10 @@ public: return getRes(arcName, resName, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); } + dRes_info_c* getObjectResInfo(const char* arcName) { + return getResInfo(arcName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + /* 0x0000 */ dRes_info_c mObjectInfo[0x80]; /* 0x1200 */ dRes_info_c mStageInfo[0x40]; }; // Size: 0x1B00 diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 5b9a134a5a..c5b70bd256 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -45,7 +45,23 @@ struct stage_stag_info_class { /* 0x2A */ u16 mStageTitleNo; }; // Size: Unknown -struct stage_scls_info_dummy_class {}; +inline u16 dStage_stagInfo_GetUpButton(stage_stag_info_class* p_info) { + return p_info->field_0x10 & 7; +} + +struct stage_scls_info_class { + /* 0x0 */ char mStage[8]; + /* 0x8 */ u8 mStart; + /* 0x9 */ s8 mRoom; + /* 0xA */ s8 field_0xa; + /* 0xB */ s8 field_0xb; + /* 0xC */ s8 mWipe; +}; // Size: 0xD + +struct stage_scls_info_dummy_class { + /* 0x00 */ int numEntries; + /* 0x04 */ stage_scls_info_class* mEntries; +}; struct stage_pure_lightvec_info_class {}; @@ -650,6 +666,7 @@ static int dStage_fieldMapFiliInfo2Init(dStage_dt_c*, void*, int, void*); static int dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*); u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int); +void dStage_changeScene(int, f32, u32, s8, s16, int); inline u8 dStage_roomRead_dt_c_GetLoadRoomIndex(u8 param_0) { return param_0 & 0x3f; @@ -659,4 +676,24 @@ inline u32 dStage_stagInfo_GetSTType(stage_stag_info_class* pstag) { return pstag->field_0x0c >> 0x10 & 7; } +inline u32 dStage_stagInfo_GetEscapeWarp(stage_stag_info_class* pstag) { + return pstag->field_0x10 >> 0x18; +} + +inline s8 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) { + return p_info->field_0xb & 0xF; +} + +inline s8 dStage_sclsInfo_getWipe(stage_scls_info_class* p_info) { + return p_info->mWipe; +} + +inline s8 dStage_sclsInfo_getWipeTime(stage_scls_info_class* p_info) { + return p_info->field_0xb >> 5; +} + +inline s8 dStage_sclsInfo_getTimeH(stage_scls_info_class* p_info) { + return (p_info->field_0xa >> 4) | (p_info->field_0xb & 16); +} + #endif /* D_D_STAGE_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 748dfb38be..6fdb8b79a4 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -60,7 +60,7 @@ public: void skipper(); void Step(); void moveApproval(void*); - bool compulsory(void*, char const*, u16); + BOOL compulsory(void*, char const*, u16); void remove(); void* getStageEventDt(); // ret type probably wrong, fix later void sceneChange(int); @@ -80,6 +80,9 @@ public: void isOrderOK(); u16 chkFlag2(u16 flag) { return flag & mFlag2; } + bool runCheck() { return field_0xe5 != 0; } + u16 chkEventFlag(u16 flag) { return flag & mEventFlag; } + u8 getMode() const { return mMode; } public: /* 0x000 */ u8 field_0x0[4]; diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index 49f4aeea78..b1517d7bfa 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -5,25 +5,80 @@ #include "d/save/d_save.h" #include "dolphin/types.h" -struct event_binary_data_header {}; +struct event_binary_data_header { + /* 0x00 */ u32 eventTop; // offset to Event chunk + /* 0x04 */ s32 eventNum; + /* 0x08 */ u32 staffTop; // offset to Staff chunk + /* 0x0C */ s32 staffNum; + /* 0x10 */ u32 cutTop; // offset to Cut chunk + /* 0x14 */ s32 cutNum; + /* 0x18 */ u32 dataTop; // offset to Data chunk + /* 0x1C */ s32 dataNum; + /* 0x20 */ u32 fDataTop; // offset to FData chunk + /* 0x24 */ s32 fDataNum; + /* 0x28 */ u32 iDataTop; // offset to IData chunk + /* 0x2C */ s32 iDataNum; + /* 0x30 */ u32 sDataTop; // offset to SData chunk + /* 0x34 */ s32 sDataNum; + /* 0x38 */ u8 unk[8]; +}; // Size: 0x40 -struct dEvDtData_c {}; +class dEvDtData_c { +public: + enum DataType { + /* 0x0 */ TYPE_FLOAT, + /* 0x1 */ TYPE_VEC, + /* 0x3 */ TYPE_INT = 3, + /* 0x4 */ TYPE_STRING + }; + + int getIndex() { return mDataIndex; } + int getNumber() { return mNumber; } + int getType() { return mType; } + int getNext() { return mNext; } + char* getName() { return mName; } + + /* 0x00 */ char mName[32]; + /* 0x20 */ u32 mIndex; + /* 0x24 */ int mType; + /* 0x28 */ int mDataIndex; + /* 0x2C */ int mNumber; + /* 0x30 */ int mNext; + /* 0x34 */ u8 field_0x34[12]; +}; // Size: 0x40 class dEvDtCut_c { public: void startCheck(); + int getDataTop() { return mDataTop; } + private: - /* 0x00 */ u8 field_0x0[0x20]; + /* 0x00 */ char mName[32]; /* 0x20 */ u32 mTagID; - /* 0x28 */ int field_0x28[3]; + /* 0x24 */ u32 mIndex; + /* 0x28 */ int mFlags[3]; /* 0x34 */ u32 mFlagId; - /* 0x38 */ u32 mDataTop; - /* 0x3C */ u32 mNext; -}; + /* 0x38 */ int mDataTop; + /* 0x3C */ int mNext; + /* 0x40 */ u8 field_0x40[0x10]; +}; // Size: 0x50 class dEvDtStaff_c { public: + enum StaffType { + /* 0x0 */ TYPE_DEFAULT, + /* 0x1 */ TYPE_ALL, + /* 0x2 */ TYPE_CAMERA, + /* 0x4 */ TYPE_TIMEKEEPER = 4, + /* 0x6 */ TYPE_DIRECTOR = 6, + /* 0x7 */ TYPE_MESSAGE, + /* 0x8 */ TYPE_SOUND, + /* 0x9 */ TYPE_LIGHT, + /* 0xB */ TYPE_PACKAGE = 11, + /* 0xC */ TYPE_CREATE, + }; + void specialProc_WaitStart(int); void specialProc_WaitProc(int); void specialProc(); @@ -38,40 +93,52 @@ public: void specialProcTimekeeper(); void specialProcEffect(); + int getType() { return mType; } + char* getName() { return mName; } + int getCurrentCut() { return mCurrentCut; } + int getStartCut() { return mStartCut; } + 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]; + /* 0x00 */ char mName[32]; /* 0x20 */ u32 mTagID; - /* 0x24 */ u32 field_0x24; - /* 0x28 */ u8 field_0x28[4]; + /* 0x24 */ u32 mIndex; + /* 0x28 */ u32 mFlagID; /* 0x2C */ int mType; - /* 0x30 */ u32 mStartCut; + /* 0x30 */ int 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; + /* 0x40 */ bool field_0x40; + /* 0x41 */ bool field_0x41; /* 0x42 */ s16 field_0x42; /* 0x44 */ s16 mSoundWait; - /* 0x46 */ u8 field_0x46[4]; - /* 0x4A */ int field_0x4a; -}; + /* 0x46 */ u8 field_0x46[10]; +}; // Size: 0x50 class dEvDtEvent_c { public: void finishCheck(); void forceFinish(); void specialStaffProc(dEvDtStaff_c*); + int getNStaff() { return mNStaff; } + int getStaff(int idx) { return mStaff[idx]; } - /* 0x00 */ s32 mEventNum; - /* 0x04 */ u8 field_0x4[0xA0]; - /* 0xA4 */ int field_0xa4; -}; + /* 0x00 */ char mName[32]; + /* 0x20 */ u32 mIndex; + /* 0x24 */ int field_0x24; + /* 0x28 */ int mPriority; + /* 0x2C */ int mStaff[20]; + /* 0x7C */ int mNStaff; + /* 0x80 */ u8 field_0x80[4]; + /* 0x84 */ int field_0x84; + /* 0x88 */ int field_0x88[2]; + /* 0x90 */ int field_0x90; + /* 0x94 */ bool mPlaySound; + /* 0x95 */ u8 field_0x95[0xF]; + /* 0xA4 */ int mEventState; + /* 0xA8 */ u8 field_0xa8[8]; +}; // Size: 0xB0 class dEvDtFlag_c { public: @@ -91,23 +158,56 @@ class dEvDtBase_c { public: dEvDtBase_c(); ~dEvDtBase_c() {} - void init(); - void init(char*, int); + int init(); + int init(char*, int); void advanceCut(dEvDtEvent_c*); void advanceCutLocal(dEvDtStaff_c*); event_binary_data_header* getHeaderP() { return mHeaderP; } - s32 getEventNum() { return mEventP->mEventNum; } + dEvDtStaff_c* getStaffP(int i) { return &mStaffP[i]; } + dEvDtEvent_c* getEventP(int i) { return &mEventP[i]; } + dEvDtData_c* getDataP(int i) { return &mDataP[i]; } + dEvDtCut_c* getCutP(int i) { return &mCutP[i]; } + int getStaffCurrentCut(int i) { return mStaffP[i].getCurrentCut(); } + dEvDtCut_c* getCutStaffCurrentCutP(int i) { return getCutP(getStaffCurrentCut(i)); } + int getStaffStartCut(int i) { return mStaffP[i].getStartCut(); } + dEvDtCut_c* getCutStaffStartCutP(int i) { return getCutP(getStaffStartCut(i)); } + int* getIDataP(int i) { return &mIDataP[i]; } + f32* getFDataP(int i) { return &mFDataP[i]; } + char* getSDataP(int i) { return &mSDataP[i]; } + u32 getEventTop() { return mHeaderP->eventTop; } + s32 getEventNum() { return mHeaderP->eventNum; } + u32 getStaffTop() { return mHeaderP->staffTop; } + s32 getStaffNum() { return mHeaderP->staffNum; } + u32 getCutTop() { return mHeaderP->cutTop; } + s32 getCutNum() { return mHeaderP->cutNum; } + u32 getDataTop() { return mHeaderP->dataTop; } + s32 getDataNum() { return mHeaderP->dataNum; } + u32 getFDataTop() { return mHeaderP->fDataTop; } + s32 getFDataNum() { return mHeaderP->fDataNum; } + u32 getIDataTop() { return mHeaderP->iDataTop; } + s32 getIDataNum() { return mHeaderP->iDataNum; } + u32 getSDataTop() { return mHeaderP->sDataTop; } + s32 getSDataNum() { return mHeaderP->sDataNum; } s32 roomNo() { return mRoomNo; } + void setHeaderP(event_binary_data_header* p_header) { mHeaderP = p_header; } + void setEventP(dEvDtEvent_c* p_event) { mEventP = p_event; } + void setStaffP(dEvDtStaff_c* p_staff) { mStaffP = p_staff; } + void setCutP(dEvDtCut_c* p_cut) { mCutP = p_cut; } + void setDataP(dEvDtData_c* p_data) { mDataP = p_data; } + void setFDataP(f32* p_fdata) { mFDataP = p_fdata; } + void setIDataP(int* p_idata) { mIDataP = p_idata; } + void setSDataP(char* p_sdata) { mSDataP = p_sdata; } + private: /* 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; + /* 0x14 */ f32* mFDataP; + /* 0x18 */ int* mIDataP; /* 0x1C */ char* mSDataP; /* 0x20 */ s32 mRoomNo; }; // Size = 0x24 diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index 45d0c24903..7427c80c4d 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -22,7 +22,7 @@ private: class dEvent_manager_c { public: - void getSubstance(dEvDtData_c*, int); + void* getSubstance(dEvDtData_c*, int); dEvent_manager_c(); ~dEvent_manager_c() {} int create(); @@ -48,12 +48,12 @@ public: void startCheckOld(char const*); void endCheck(s16); void endCheckOld(char const*); - void getMyStaffId(char const*, fopAc_ac_c*, int); + s32 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); + dEvDtData_c* 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); @@ -63,11 +63,13 @@ public: void getGoal(); void getRunEventName(); void specialCast_Shutter(s16, int); - void specialCast(char const*, int); + fopAc_ac_c* specialCast(char const*, int); void ChkPresentEnd(); void checkStartDemo(); void setStartDemo(int param_0) { mEventException.setStartDemo(param_0); } + void setCameraPlay(int status) { mCameraPlay = status; } + dEvDtBase_c& getBase() { return mEventList[field_0x1b4]; } private: /* 0x0000 */ dEvDtBase_c mEventList[11]; @@ -77,7 +79,7 @@ private: /* 0x01A8 */ u8 field_0x1a8[2]; /* 0x01AA */ s16 field_0x1aa; /* 0x01AC */ u8 field_0x1ac[4]; - /* 0x01B0 */ u32 field_0x1b0; + /* 0x01B0 */ int mRoomNo; /* 0x01B4 */ u32 field_0x1b4; /* 0x01B8 */ u32 field_0x1b8; /* 0x01BC */ dEvDtFlag_c mFlags; diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 4a35b1fc32..60bb54f246 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -12,6 +12,7 @@ #include "m_Do/m_Do_ext.h" void dKankyo_DayProc(); +void dKy_set_nexttime(f32); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE(); @@ -114,7 +115,6 @@ struct GB_MAPLE_COL_CHANGE { class dKy_tevstr_c { public: -private: /* 0x000 */ J3DLightObj field_0x000; /* 0x074 */ J3DLightObj field_0x074[6]; /* 0x32C */ cXyz field_0x32c; @@ -124,10 +124,18 @@ private: /* 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; + /* 0x358 */ u16 field_0x358; + /* 0x35A */ u16 field_0x35a; + /* 0x35C */ u16 field_0x35c; + /* 0x35E */ u8 field_0x35e[2]; + /* 0x360 */ u8 field_0x360; + /* 0x361 */ u8 field_0x361; + /* 0x362 */ u8 field_0x362; + /* 0x363 */ u8 field_0x363; + /* 0x364 */ u8 field_0x364; + /* 0x365 */ u8 field_0x365; + /* 0x366 */ u8 field_0x366; + /* 0x367 */ u8 field_0x367; /* 0x368 */ f32 field_0x368; /* 0x36C */ f32 field_0x36c; /* 0x370 */ f32 field_0x370; @@ -656,5 +664,6 @@ public: STATIC_ASSERT(sizeof(dScnKy_env_light_c) == 4880); BOOL dKy_darkworld_stage_check(char const*, int); +BOOL dKy_withwarp_capture_check(); #endif /* D_KANKYO_D_KANKYO_H */ diff --git a/include/d/meter/d_meter2.h b/include/d/meter/d_meter2.h index aa8d94eadd..890777f971 100644 --- a/include/d/meter/d_meter2.h +++ b/include/d/meter/d_meter2.h @@ -1,6 +1,158 @@ #ifndef D_METER_D_METER2_H #define D_METER_D_METER2_H +#include "JSystem/JKernel/JKRExpHeap.h" +#include "d/com/d_com_inf_game.h" +#include "d/meter/d_meter2_draw.h" +#include "d/meter/d_meter_map.h" #include "dolphin/types.h" +class msg_class { +public: + /* 0x0 */ u8 field_0x0[0x100]; +}; + +class dMeterMap_c; + +class dMeter2_c { +public: + /* 8021EA14 */ void _create(); + /* 8021F128 */ void _execute(); + /* 8021F370 */ void _draw(); + /* 8021F49C */ void _delete(); + /* 8021F6EC */ void emphasisButtonDelete(); + /* 8021F780 */ void setLifeZero(); + /* 8021F7B0 */ void checkStatus(); + /* 8021FD60 */ void moveLife(); + /* 80220180 */ void moveKantera(); + /* 8022051C */ void moveOxygen(); + /* 80220888 */ void moveLightDrop(); + /* 80220C30 */ void moveRupee(); + /* 802210AC */ void moveKey(); + /* 80221244 */ void moveButtonA(); + /* 802217F4 */ void moveButtonB(); + /* 80221EC8 */ void moveButtonR(); + /* 80222000 */ void moveButtonZ(); + /* 802222A0 */ void moveButton3D(); + /* 80222364 */ void moveButtonC(); + /* 80222494 */ void moveButtonS(); + /* 80222518 */ void moveButtonXY(); + /* 80222E88 */ void moveButtonCross(); + /* 802230F8 */ void moveTouchSubMenu(); + /* 802230FC */ void moveSubContents(); + /* 802231C8 */ void move2DContents(); + /* 802237D4 */ void checkSubContents(); + /* 80223BC4 */ void check2DContents(); + /* 80223E00 */ void moveBombNum(); + /* 80224258 */ void moveBottleNum(); + /* 80224354 */ void moveArrowNum(); + /* 80224680 */ void movePachinkoNum(); + /* 802248E4 */ void alphaAnimeLife(); + /* 80224A04 */ void alphaAnimeKantera(); + /* 80224BAC */ void alphaAnimeOxygen(); + /* 80224D6C */ void alphaAnimeLightDrop(); + /* 80224DC0 */ void alphaAnimeRupee(); + /* 80224F70 */ void alphaAnimeKey(); + /* 802250F4 */ void alphaAnimeButton(); + /* 802254C0 */ void alphaAnimeButtonCross(); + /* 802256DC */ void isShowLightDrop(); + /* 802258A0 */ void killSubContents(u8); + /* 80225960 */ void isKeyVisible(); + /* 802259F8 */ void isArrowEquip(); + /* 80225A64 */ void isPachinkoEquip(); + +private: + /* 0x100 */ JKRExpHeap* mpHeap; + /* 0x104 */ JKRExpHeap* mpSubHeap; + /* 0x108 */ void* field_0x108; + /* 0x10C */ dMeter2Draw_c* mpMeterDraw; + /* 0x110 */ dDlst_base_c* field_0x110; + /* 0x114 */ dDlst_base_c* field_0x114; + /* 0x118 */ dDlst_base_c* field_0x118; + /* 0x11C */ void* field_0x11c; + /* 0x120 */ dMeterMap_c* mpMap; + /* 0x124 */ u32 field_0x124; + /* 0x128 */ int field_0x128; + /* 0x12C */ int field_0x12c; + /* 0x130 */ f32 field_0x130; + /* 0x134 */ f32 field_0x134[2]; + /* 0x13C */ f32 field_0x13c[2]; + /* 0x144 */ f32 field_0x144; + /* 0x148 */ f32 field_0x148[2]; + /* 0x150 */ f32 field_0x150[2]; + /* 0x158 */ f32 field_0x158; + /* 0x15C */ f32 field_0x15c; + /* 0x160 */ f32 field_0x160[4]; + /* 0x170 */ u8 field_0x170[4]; + /* 0x174 */ f32 field_0x174[4]; + /* 0x184 */ u8 field_0x184[4]; + /* 0x188 */ f32 field_0x188; + /* 0x18C */ f32 field_0x18c; + /* 0x190 */ s16 field_0x190; + /* 0x192 */ s16 mNowLifeGauge; + /* 0x194 */ s16 field_0x194; + /* 0x196 */ s16 field_0x196; + /* 0x198 */ s16 field_0x198; + /* 0x19A */ s16 field_0x19a; + /* 0x19C */ int field_0x19c; + /* 0x1A0 */ int field_0x1a0; + /* 0x1A4 */ int field_0x1a4; + /* 0x1A8 */ int field_0x1a8; + /* 0x1AC */ int field_0x1ac; + /* 0x1B0 */ u16 field_0x1b0; + /* 0x1B2 */ u16 field_0x1b2; + /* 0x1B4 */ u16 field_0x1b4; + /* 0x1B6 */ u16 mSubContentsStringType; + /* 0x1B8 */ u16 field_0x1b8[5]; + /* 0x1C2 */ u8 field_0x1c2; + /* 0x1C3 */ u8 field_0x1c3; + /* 0x1C4 */ u8 field_0x1c4; + /* 0x1C5 */ u8 field_0x1c5; + /* 0x1C6 */ u8 field_0x1c6; + /* 0x1C7 */ u8 field_0x1c7; + /* 0x1C8 */ u8 field_0x1c8; + /* 0x1C9 */ u8 field_0x1c9; + /* 0x1CA */ u8 field_0x1ca; + /* 0x1CB */ u8 field_0x1cb; + /* 0x1CC */ u8 field_0x1cc; + /* 0x1CD */ u8 field_0x1cd; + /* 0x1CE */ u8 field_0x1ce; + /* 0x1CF */ u8 field_0x1cf; + /* 0x1D0 */ u8 field_0x1d0; + /* 0x1D1 */ u8 field_0x1d1; + /* 0x1D2 */ u8 field_0x1d2[4]; + /* 0x1D6 */ u8 field_0x1d6[2]; + /* 0x1D8 */ u8 field_0x1d8[2]; + /* 0x1DA */ u8 field_0x1da; + /* 0x1DB */ u8 field_0x1db; + /* 0x1DC */ u8 field_0x1dc; + /* 0x1DD */ u8 field_0x1dd; + /* 0x1DE */ u8 field_0x1de; + /* 0x1DF */ u8 field_0x1df; + /* 0x1E0 */ u8 field_0x1e0; + /* 0x1E1 */ u8 field_0x1e1; + /* 0x1E2 */ u8 field_0x1e2; + /* 0x1E3 */ u8 field_0x1e3; + /* 0x1E4 */ u8 field_0x1e4; + /* 0x1E5 */ u8 mSubContents; + /* 0x1E6 */ u8 field_0x1e6; + /* 0x1E7 */ u8 field_0x1e7; + /* 0x1E8 */ u8 field_0x1e8; + /* 0x1E9 */ u8 field_0x1e9; + /* 0x1EA */ u8 field_0x1ea; + /* 0x1EB */ u8 field_0x1eb; + /* 0x1EC */ u8 field_0x1ec; + /* 0x1ED */ u8 field_0x1ed; + /* 0x1EE */ u8 field_0x1ee; + /* 0x1EF */ u8 field_0x1ef[4]; + /* 0x1F3 */ u8 field_0x1f3[3]; + /* 0x1F6 */ u8 field_0x1f6[3]; + /* 0x1F9 */ u8 field_0x1f9[4]; + /* 0x1FD */ u8 field_0x1fd; + /* 0x1FE */ u8 field_0x1fe; + /* 0x1FF */ u8 field_0x1ff; + /* 0x200 */ u8 field_0x200; + /* 0x201 */ u8 field_0x201; +}; + #endif /* D_METER_D_METER2_H */ diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index ee222f506a..8a3cd44dcd 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -1,6 +1,364 @@ #ifndef D_METER_D_METER2_DRAW_H #define D_METER_D_METER2_DRAW_H +#include "JSystem/J2DGraph/J2DAnimation.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JUtility/TColor.h" +#include "d/d_drawlist.h" +#include "d/pane/d_pane_class.h" #include "dolphin/types.h" +class dKantera_icon_c; + +class dMeter2Draw_c : public dDlst_base_c { +public: + /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); + /* 80210FB0 */ void init(); + /* 8021135C */ void exec(u32); + /* 8021151C */ void draw(); + /* 80211BEC */ void initLife(); + /* 80211E64 */ void initMagic(); + /* 80212190 */ void initLightDrop(); + /* 80212404 */ void initRupeeKey(); + /* 802126E4 */ void initButton(); + /* 8021350C */ void initButtonCross(); + /* 80213CEC */ void playPikariBckAnimation(f32); + /* 80213D6C */ void setPikariBpkAnimation(J2DAnmColor*); + /* 80213E3C */ void playPikariBpkAnimation(f32); + /* 80213E94 */ void playOxygenBpkAnimation(J2DAnmColor*); + /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, + JUtility::TColor, JUtility::TColor, f32, u8); + /* 80213FF0 */ void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor, + JUtility::TColor, JUtility::TColor, f32, u8); + /* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor, + JUtility::TColor, JUtility::TColor); + /* 802147CC */ void changeTextureLife(int, bool, u8); + /* 802149F4 */ void drawLife(s16, s16, f32, f32); + /* 80214C20 */ void setAlphaLifeChange(bool); + /* 80214DF4 */ void setAlphaLifeAnimeMin(); + /* 80214E54 */ void setAlphaLifeAnimeMax(); + /* 80214EB4 */ void drawKanteraScreen(u8); + /* 80215290 */ void drawMagic(s16, s16, f32, f32); + /* 80215380 */ void setAlphaMagicChange(bool); + /* 802154A8 */ void drawKantera(s32, s32, f32, f32); + /* 802155B8 */ void setAlphaKanteraChange(bool); + /* 802156E0 */ void setAlphaKanteraAnimeMin(); + /* 8021575C */ void setAlphaKanteraAnimeMax(); + /* 802157E0 */ void drawOxygen(s32, s32, f32, f32); + /* 802158F0 */ void setAlphaOxygenChange(bool); + /* 80215A18 */ void setAlphaOxygenAnimeMin(); + /* 80215A94 */ void setAlphaOxygenAnimeMax(); + /* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8); + /* 80215DA4 */ void setAlphaLightDropChange(bool); + /* 80215DA8 */ void getNowLightDropRateCalc(); + /* 80215E40 */ void setAlphaLightDropAnimeMin(); + /* 80215F88 */ void setAlphaLightDropAnimeMax(); + /* 8021632C */ void drawRupee(s16); + /* 80216684 */ void setAlphaRupeeChange(bool); + /* 802168D0 */ void setAlphaRupeeAnimeMin(); + /* 80216990 */ void setAlphaRupeeAnimeMax(); + /* 80216A40 */ void drawKey(s16); + /* 80216B28 */ void setAlphaKeyChange(bool); + /* 80216CA8 */ void setAlphaKeyAnimeMin(); + /* 80216D2C */ void setAlphaKeyAnimeMax(); + /* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool); + /* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool); + /* 8021764C */ void drawButtonR(u8, u8, bool, bool); + /* 802176EC */ void drawButtonZ(u8); + /* 80217904 */ void drawButton3D(u8); + /* 80217954 */ void drawButtonC(u8, bool); + /* 802179C0 */ void drawButtonS(u8); + /* 80217A10 */ void drawButtonBin(u8); + /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool); + /* 80218238 */ void getButtonCrossParentInitTransY(); + /* 80218254 */ void drawButtonCross(f32, f32); + /* 80218338 */ void setAlphaButtonCrossAnimeMin(); + /* 802183A8 */ void setAlphaButtonCrossAnimeMax(); + /* 80218448 */ void setAlphaButtonCrossItemAnimeMin(); + /* 80218524 */ void setAlphaButtonCrossItemAnimeMax(); + /* 802185E8 */ void setAlphaButtonCrossMapAnimeMin(); + /* 802186C4 */ void setAlphaButtonCrossMapAnimeMax(); + /* 80218788 */ void setAlphaButtonChange(bool); + /* 8021901C */ void setAlphaButtonAnimeMin(); + /* 802190A8 */ void setAlphaButtonAnimeMax(); + /* 80219174 */ void setAlphaButtonAAnimeMin(); + /* 80219258 */ void setAlphaButtonAAnimeMax(); + /* 80219324 */ void setAlphaButtonBAnimeMin(); + /* 80219474 */ void setAlphaButtonBAnimeMax(); + /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool); + /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool); + /* 80219A84 */ void setButtonIconMidonaAlpha(u32); + /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool); + /* 8021A29C */ void getNumberTexture(int); + /* 8021A2F4 */ void getActionString(u8, u8, u8*); + /* 8021A468 */ void changeTextureItemB(u8); + /* 8021A71C */ void changeTextureItemXY(int, u8); + /* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16); + /* 8021AAA4 */ void setAlphaAnimeMax(CPaneMgrAlpha*, s16); + /* 8021AB84 */ void setItemNum(u8, u8, u8); + /* 8021AEC8 */ void drawItemNum(u8, f32); + /* 8021AF78 */ void drawKanteraMeter(u8, f32); + /* 8021B0C8 */ void isButtonVisible(); + /* 8021B104 */ void setItemParamX(u8); + /* 8021B364 */ void setItemParamY(u8); + /* 8021B5B0 */ void setItemParamZ(u8); + /* 8021B810 */ void setItemParamB(u8); + /* 8021BB6C */ void getFishingType(); + /* 8021BBB4 */ void getCanoeFishing(); + /* 8021BC24 */ void getCameraSubject(); + /* 8021BC54 */ void getItemSubject(); + /* 8021BCAC */ void getPlayerSubject(); + /* 8021BCC0 */ void isBButtonShow(bool); + /* 8021BDD0 */ void getButtonTimer(); + + /* 802102F8 */ virtual ~dMeter2Draw_c(); + +private: + /* 0x004 */ f32 field_0x4; + /* 0x008 */ f32 field_0x8; + /* 0x00C */ f32 field_0xc; + /* 0x010 */ f32 field_0x10; + /* 0x014 */ f32 field_0x14; + /* 0x028 */ f32 field_0x18; + /* 0x01C */ f32 field_0x1c; + /* 0x020 */ f32 field_0x20; + /* 0x024 */ f32 field_0x24; + /* 0x028 */ f32 field_0x28; + /* 0x02C */ f32 field_0x2c; + /* 0x030 */ f32 field_0x30; + /* 0x034 */ f32 field_0x34; + /* 0x038 */ f32 field_0x38; + /* 0x03C */ f32 field_0x3c; + /* 0x040 */ f32 field_0x40; + /* 0x044 */ f32 field_0x44; + /* 0x048 */ f32 field_0x48; + /* 0x04C */ f32 field_0x4c; + /* 0x050 */ f32 field_0x50; + /* 0x054 */ f32 field_0x54; + /* 0x058 */ f32 field_0x58; + /* 0x05C */ f32 field_0x5c; + /* 0x060 */ f32 field_0x60; + /* 0x064 */ f32 field_0x64; + /* 0x068 */ f32 field_0x68; + /* 0x06C */ f32 field_0x6c; + /* 0x070 */ f32 field_0x70; + /* 0x074 */ JKRExpHeap* mp_heap; + /* 0x078 */ J2DScreen* mpScreen; + /* 0x07C */ J2DScreen* mpKanteraScreen; + /* 0x080 */ J2DScreen* mpPikariScreen; + /* 0x084 */ J2DScreen* mpItemNumTex[2][3]; + /* 0x09C */ int field_0x9c[3]; + /* 0x0A8 */ int field_0xa8; + /* 0x0AC */ dKantera_icon_c* mpKanteraMeter[2]; + /* 0x0B4 */ u8 field_0xb4[8]; + /* 0x0BC */ void* mpParent; + /* 0x0C0 */ CPaneMgr* mpAText[5]; + /* 0x0D4 */ CPaneMgr* mpBText[5]; + /* 0x0E8 */ CPaneMgr* mpXYText[5][3]; + /* 0x124 */ CPaneMgr* mpLifeParent; + /* 0x128 */ CPaneMgr* mpLifeParts[20]; + /* 0x178 */ CPaneMgr* mpHeartMask[20]; + /* 0x1C8 */ CPaneMgr* mpBigHeart; + /* 0x1CC */ CPaneMgr* mpMagicParent; + /* 0x1D0 */ CPaneMgr* mpMagicBase; + /* 0x1D4 */ CPaneMgr* mpMagicFrameL; + /* 0x1D8 */ CPaneMgr* mpMagicMeter; + /* 0x1DC */ CPaneMgr* mpMagicFrameR; + /* 0x1E0 */ CPaneMgr* mpLightDropParent; + /* 0x1E4 */ int field_0x1e4; + /* 0x1E8 */ CPaneMgr* mpSIParent[2]; + /* 0x1F0 */ CPaneMgr* mpSIParts[16][3]; + /* 0x2B0 */ CPaneMgr* mpRupeeKeyParent; + /* 0x2B4 */ CPaneMgr* mpRupeeParent[3]; + /* 0x2C0 */ CPaneMgr* mpRupeeTexture[4][2]; + /* 0x2E0 */ CPaneMgr* mpKeyParent; + /* 0x2E4 */ CPaneMgr* mpKeyTexture[5]; + /* 0x2F8 */ CPaneMgr* mpButtonParent; + /* 0x2FC */ int field_0x2fc; + /* 0x300 */ CPaneMgr* mpButtonA; + /* 0x304 */ CPaneMgr* mpButtonB; + /* 0x308 */ CPaneMgr* mpButtonMidona; + /* 0x30C */ CPaneMgr* mpButtonXY[3]; + /* 0x318 */ CPaneMgr* mpLightB; + /* 0x31C */ CPaneMgr* mpLightXY[3]; + /* 0x328 */ CPaneMgr* mpItemB; + /* 0x32C */ CPaneMgr* mpItemXY[2]; + /* 0x334 */ CPaneMgr* mpItemR; + /* 0x338 */ CPaneMgr* mpBTextA; + /* 0x33C */ CPaneMgr* mpBTextB; + /* 0x340 */ CPaneMgr* mpBTextXY[2]; + /* 0x348 */ int field_0x348; + /* 0x34C */ CPaneMgr* mpTextA; + /* 0x350 */ CPaneMgr* mpTextB; + /* 0x354 */ CPaneMgr* mpTextXY[3]; + /* 0x360 */ CPaneMgr* mpTextI; + /* 0x364 */ CPaneMgr* mpTextM; + /* 0x368 */ CPaneMgr* mpButtonCrossParent; + /* 0x36C */ int field_0x36c; + /* 0x370 */ u8 field_0x370[0x2C]; + /* 0x39C */ CPaneMgr* mpPikariParent; + /* 0x3A0 */ CPaneMgr* mpLifeTexture[20][2]; + /* 0x440 */ CPaneMgr* mpHeartBase[20]; + /* 0x490 */ CPaneMgr* mpJujiI[5]; + /* 0x4A4 */ CPaneMgr* mpJujiM[5]; + /* 0x4B8 */ CPaneMgr* mpUzu; + /* 0x4BC */ u8 field_0x4bc[0x28]; + /* 0x4E4 */ JKRHeap* mpItemBTex[2][2]; + /* 0x4F4 */ JKRHeap* mpItemXYTex[2][2][2]; + /* 0x514 */ J2DPicture* mpItemBPane; + /* 0x518 */ J2DPicture* mpItemXYPane[3]; + /* 0x524 */ int field_0x524[2][2]; + /* 0x534 */ u8 field_0x534[8]; + /* 0x53C */ void* field_0x53c; + /* 0x540 */ J2DAnmBase* field_0x540; // bpk + /* 0x544 */ J2DAnmBase* field_0x544; // bpk + /* 0x548 */ u8 field_0x548[8]; + /* 0x550 */ f32 field_0x550; + /* 0x554 */ f32 field_0x554; + /* 0x558 */ f32 field_0x558; + /* 0x55C */ f32 field_0x55c; + /* 0x560 */ f32 field_0x560; + /* 0x564 */ f32 field_0x564; + /* 0x568 */ f32 field_0x568; + /* 0x56C */ f32 field_0x56c; + /* 0x570 */ f32 field_0x570; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ f32 field_0x578; + /* 0x57C */ f32 field_0x57c; + /* 0x580 */ f32 field_0x580; + /* 0x584 */ u8 field_0x584[0x78]; + /* 0x5FC */ f32 field_0x5fc[3]; + /* 0x608 */ f32 field_0x608; + /* 0x60C */ f32 field_0x60c; + /* 0x610 */ f32 field_0x610[3]; + /* 0x61C */ f32 field_0x61c; + /* 0x620 */ f32 field_0x620[3]; + /* 0x62C */ f32 field_0x62c[16]; + /* 0x66C */ f32 field_0x66c[16]; + /* 0x6AC */ f32 field_0x6ac[3]; + /* 0x6B8 */ f32 field_0x6b8[3]; + /* 0x6C4 */ f32 field_0x6c4[3]; + /* 0x6D0 */ f32 field_0x6d0[3]; + /* 0x6DC */ f32 field_0x6dc; + /* 0x6E0 */ f32 field_0x6e0; + /* 0x6E4 */ f32 field_0x6e4; + /* 0x6E8 */ f32 field_0x6e8; + /* 0x6EC */ f32 field_0x6ec; + /* 0x6F0 */ f32 field_0x6f0; + /* 0x6F4 */ f32 field_0x6f4; + /* 0x6F8 */ f32 field_0x6f8; + /* 0x6FC */ f32 field_0x6fc; + /* 0x700 */ u8 field_0x700[0x18]; + /* 0x718 */ f32 field_0x718; + /* 0x71C */ u8 field_0x71c[4]; + /* 0x720 */ f32 mZButtonAlpha; + /* 0x724 */ f32 field_0x724; + /* 0x728 */ f32 field_0x728; + /* 0x72C */ f32 field_0x72c; + /* 0x730 */ f32 field_0x730; + /* 0x734 */ f32 field_0x734; + /* 0x738 */ f32 field_0x738; + /* 0x73C */ u8 field_0x73c[4]; + /* 0x740 */ u16 field_0x740; + /* 0x742 */ u16 field_0x742[3]; + /* 0x748 */ u8 field_0x748[0xE]; + /* 0x756 */ u16 field_0x754; + /* 0x756 */ u16 field_0x756; + /* 0x758 */ u8 field_0x758; + /* 0x759 */ u8 field_0x759; + /* 0x75A */ u8 field_0x75a; + /* 0x75B */ u8 field_0x75b; + /* 0x75C */ u8 field_0x75c[3]; + /* 0x75F */ u8 field_0x75f; + /* 0x760 */ u8 field_0x760; + /* 0x761 */ u8 field_0x761; + /* 0x762 */ u8 field_0x762; + /* 0x763 */ u8 field_0x763; + /* 0x764 */ u8 field_0x764; + /* 0x765 */ u8 field_0x765; + /* 0x766 */ u8 field_0x766; + /* 0x767 */ u8 field_0x767; + /* 0x768 */ u8 field_0x768[3]; + /* 0x76B */ u8 field_0x76b; + /* 0x76C */ u8 field_0x76c[2]; + /* 0x76E */ u8 field_0x76e; + /* 0x76F */ u8 field_0x76f; + /* 0x770 */ u8 field_0x770; + /* 0x771 */ u8 field_0x771; + /* 0x772 */ u8 field_0x772; + /* 0x773 */ u8 field_0x773[2]; + /* 0x778 */ f32 field_0x778; + /* 0x77C */ f32 field_0x77c; + /* 0x780 */ f32 field_0x780; + /* 0x784 */ f32 field_0x784; + /* 0x788 */ f32 field_0x788; + /* 0x78C */ f32 field_0x78c; + /* 0x790 */ f32 field_0x790; + /* 0x794 */ f32 field_0x794; + /* 0x798 */ f32 field_0x798; + /* 0x79C */ f32 field_0x79c; + /* 0x7A0 */ f32 field_0x7a0; + /* 0x7A4 */ f32 field_0x7a4; + /* 0x7A8 */ f32 field_0x7a8; + /* 0x7AC */ f32 field_0x7ac; + /* 0x7B0 */ f32 field_0x7b0; + /* 0x7B4 */ f32 field_0x7b4; + /* 0x7B8 */ f32 field_0x7b8; + /* 0x7BC */ f32 field_0x7bc; + /* 0x7C0 */ f32 field_0x7c0; + /* 0x7C4 */ f32 field_0x7c4; + /* 0x7C8 */ f32 field_0x7c8; + /* 0x7CC */ f32 field_0x7cc; + /* 0x7D0 */ f32 field_0x7d0; + /* 0x7D4 */ f32 field_0x7d4; + /* 0x7D8 */ f32 field_0x7d8; + /* 0x7DC */ f32 field_0x7dc; + /* 0x7E0 */ f32 field_0x7e0; + /* 0x7E4 */ f32 field_0x7e4; + /* 0x7E8 */ f32 field_0x7e8; + /* 0x7EC */ f32 field_0x7ec; + /* 0x7F0 */ f32 field_0x7f0; + /* 0x7F4 */ f32 field_0x7f4; + /* 0x7F8 */ f32 field_0x7f8; + /* 0x7FC */ f32 field_0x7fc; + /* 0x800 */ f32 field_0x800; + /* 0x804 */ f32 field_0x804; + /* 0x808 */ f32 field_0x808; + /* 0x80C */ f32 field_0x80c; + /* 0x810 */ f32 field_0x810; + /* 0x814 */ f32 field_0x814[2]; + /* 0x81C */ f32 field_0x81c[2]; + /* 0x824 */ f32 field_0x824[2]; + /* 0x82C */ f32 field_0x82c[2]; + /* 0x834 */ f32 field_0x834; + /* 0x838 */ f32 field_0x838; + /* 0x83C */ f32 field_0x83c; + /* 0x840 */ f32 field_0x840; + /* 0x844 */ f32 field_0x844; + /* 0x848 */ f32 field_0x848; + /* 0x84C */ u8 field_0x84c; + /* 0x84D */ u8 field_0x84d; + /* 0x84E */ u8 field_0x84e; + /* 0x84F */ u8 field_0x84f; + /* 0x850 */ u8 field_0x850; + /* 0x851 */ u8 field_0x851; + /* 0x852 */ u8 field_0x852; + /* 0x853 */ u8 field_0x853; + /* 0x854 */ u8 field_0x854; + /* 0x855 */ u8 field_0x855; + /* 0x856 */ u8 field_0x856; + /* 0x857 */ u8 field_0x857; + /* 0x858 */ u8 field_0x858; + /* 0x859 */ u8 field_0x859; + /* 0x85A */ u8 field_0x85a; + /* 0x85B */ u8 field_0x85b; + /* 0x85C */ u8 field_0x85c; + /* 0x85D */ u8 field_0x85d; + /* 0x85E */ u8 field_0x85e; + /* 0x85F */ u8 field_0x85f; + /* 0x860 */ u8 field_0x860; + /* 0x861 */ u8 field_0x861; +}; + #endif /* D_METER_D_METER2_DRAW_H */ diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 1a4884dec7..5d3f9847c3 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -4,6 +4,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "d/d_resorce.h" #include "d/menu/d_menu_window.h" +#include "d/meter/d_meter2.h" #include "d/msg/d_msg_flow.h" #include "d/pane/d_pane_class.h" #include "dolphin/types.h" @@ -13,18 +14,9 @@ struct dMsgObject_c { /* 802384C4 */ static void setLetterNameID(u16); /* 802379AC */ void setKillMessageFlag(); /* 8023822C */ void getStatus(); + /* 802371E4 */ void isPlaceMessage(); }; -class dMeterMap_c { -public: - /* 8020D900 */ static bool isMapOpenCheck(); - /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); - /* 8020D874 */ void setDispPosInsideFlg_SE_On(); - /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); -}; - -struct J2DPicture {}; - struct JMSMesgEntry_c { /* 0x00 */ u32 mStringOffset; /* 0x04 */ u16 mStringId; @@ -64,11 +56,9 @@ struct dItem_data { }; class dMw_c; - -class dMeter2_c { -public: - /* 8021F6EC */ void emphasisButtonDelete(); -}; +class dMeter2_c; +class J2DPicture; +class dMeterMap_c; class dMeter2Info_c { public: @@ -95,7 +85,7 @@ public: void getStringKana(u32, char*, JMSMesgEntry_c*); void getStringKanji(u32, char*, JMSMesgEntry_c*); double getStringLength(J2DTextBox*, char*); // define J2DTextBox - dMeter2Info_c* getStringLength(JUTFont*, float, float, char*); + dMeter2Info_c* getStringLength(JUTFont*, f32, f32, char*); void onDirectUseItem(int); bool isDirectUseItem(int); int setMeterString(s32); @@ -132,6 +122,13 @@ public: dMw_c* getMenuWindowClass() { return mMenuWindowClass; } void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; } u16 getOilGaugeBackUp() { return mOilGaugeBackUp; } + u8 getWarpStatus() { return mWarpStatus; } + u8 getWarpRoomNo() { return mWarpInfo.mRoomNo; } + u8 getWarpPlayerNo() { return mWarpInfo.mWarpPlayerNo; } + cXyz& getWarpPos() { return mWarpInfo.mPosition; } + const char* getWarpStageName() { return mWarpInfo.mStageName; } + void setNowCount(u8 count) { mNowCount = count; } + void setMaxCount(u8 count) { mMaxCount = count; } private: /* 0x04 */ u8 unk4[4]; @@ -144,18 +141,18 @@ private: /* 0x24 */ dMw_c* mMenuWindowClass; /* 0x28 */ CPaneMgr* mMeterItemPanePtr[4]; /* 0x38 */ WarpInfo_c mWarpInfo; - /* 0x54 */ float unk84; - /* 0x58 */ float unk88; - /* 0x5C */ float unk92; - /* 0x60 */ float unk96; - /* 0x64 */ float unk100; - /* 0x68 */ float unk104; - /* 0x6C */ float unk108; - /* 0x70 */ float m2DWidth; - /* 0x74 */ float m2DHeight; - /* 0x78 */ float m2DPosH; - /* 0x7C */ float m2DPosV; - /* 0x80 */ float unk128; + /* 0x54 */ f32 unk84; + /* 0x58 */ f32 unk88; + /* 0x5C */ f32 unk92; + /* 0x60 */ f32 unk96; + /* 0x64 */ f32 unk100; + /* 0x68 */ f32 unk104; + /* 0x6C */ f32 unk108; + /* 0x70 */ f32 m2DWidth; + /* 0x74 */ f32 m2DHeight; + /* 0x78 */ f32 m2DPosH; + /* 0x7C */ f32 m2DPosV; + /* 0x80 */ f32 unk128; /* 0x84 */ u32 mTimeMs; /* 0x88 */ u32 mMsgTimeMs; /* 0x8C */ u32 mMeterString; @@ -252,4 +249,32 @@ inline void dMeter2Info_setSaveStageName(const char* name) { g_meter2_info.setSaveStageName(name); } +inline u8 dMeter2Info_getWarpStatus() { + return g_meter2_info.getWarpStatus(); +} + +inline u8 dMeter2Info_getWarpRoomNo() { + return g_meter2_info.getWarpRoomNo(); +} + +inline u8 dMeter2Info_getWarpPlayerNo() { + return g_meter2_info.getWarpPlayerNo(); +} + +inline cXyz& dMeter2Info_getWarpPos() { + return g_meter2_info.getWarpPos(); +} + +inline const char* dMeter2Info_getWarpStageName() { + return g_meter2_info.getWarpStageName(); +} + +inline void dMeter2Info_setNowCount(u8 count) { + g_meter2_info.setNowCount(count); +} + +inline void dMeter2Info_setMaxCount(u8 count) { + g_meter2_info.setMaxCount(count); +} + #endif /* D_METER_D_METER2_INFO_H */ diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h index 82798fb016..4d10d3521e 100644 --- a/include/d/meter/d_meter_map.h +++ b/include/d/meter/d_meter_map.h @@ -1,6 +1,38 @@ #ifndef D_METER_D_METER_MAP_H #define D_METER_D_METER_MAP_H +#include "JSystem/J2DGraph/J2DScreen.h" #include "dolphin/types.h" +class dMeterMap_c { +public: + /* 8020D49C */ void isEnableDispMap(); + /* 8020D528 */ void getMapDispSizeTypeNo(); + /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); + /* 8020D690 */ void getMapDispEdgeBottomY_Layout(); + /* 8020D698 */ void isEventRunCheck(); + /* 8020D72C */ void getMapDispEdgeLeftX_Layout(); + /* 8020D75C */ void getMapDispEdgeTop(); + /* 8020D7E4 */ bool getDispPosInside_OffsetX(); + /* 8020D7EC */ void getDispPosOutSide_OffsetX(); + /* 8020D874 */ void setDispPosInsideFlg_SE_On(); + /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); + /* 8020D8F8 */ void setMapAlpha(u8); + /* 8020D900 */ static bool isMapOpenCheck(); + /* 8020D948 */ dMeterMap_c(J2DScreen*); + /* 8020D990 */ ~dMeterMap_c(); + /* 8020D9EC */ void _create(J2DScreen*); + /* 8020DC50 */ void _delete(); + /* 8020DCE4 */ void _move(u32); + /* 8020DF1C */ void _draw(); + /* 8020DF68 */ void draw(); + /* 8020E070 */ void ctrlShowMap(); + /* 8020E45C */ void checkMoveStatus(); + /* 8020E4C8 */ void isShow(u32); + /* 8020E620 */ void isFmapScreen(); + /* 8020E70C */ void isDmapScreen(); + /* 8020E754 */ void meter_map_move(u32); + /* 8020E9CC */ void keyCheck(); +}; + #endif /* D_METER_D_METER_MAP_H */ diff --git a/include/d/particle/d_particle.h b/include/d/particle/d_particle.h index 5bb102e092..17c46ea4c0 100644 --- a/include/d/particle/d_particle.h +++ b/include/d/particle/d_particle.h @@ -7,33 +7,181 @@ class JPAEmitterCallBack { public: - /* 80050368 */ void execute(JPABaseEmitter*); - /* 8005036C */ void draw(JPABaseEmitter*); - /* 80050370 */ void drawAfter(JPABaseEmitter*); - /* 80050374 */ void executeAfter(JPABaseEmitter*); - /* 8027E6A4 */ ~JPAEmitterCallBack(); + /* 8027E6A4 */ virtual ~JPAEmitterCallBack() = 0; + /* 80050368 */ virtual void execute(JPABaseEmitter*); + /* 80050374 */ virtual void executeAfter(JPABaseEmitter*); + /* 8005036C */ virtual void draw(JPABaseEmitter*); + /* 80050370 */ virtual void drawAfter(JPABaseEmitter*); +}; + +struct JPAResourceManager { + /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*); + /* 80273EA8 */ void checkUserIndexDuplication(u16) const; + /* 80273EEC */ void swapTexture(ResTIMG const*, char const*); + /* 80273FCC */ void getResUserWork(u16) const; }; class dPa_levelEcallBack : public JPAEmitterCallBack { public: - /* 8004FB18 */ ~dPa_levelEcallBack(); - /* 8004FB8C */ void cleanup(); + /* 8004FB18 */ virtual ~dPa_levelEcallBack(); + /* 8004FB8C */ virtual void cleanup(); }; class dPa_hermiteEcallBack_c : public dPa_levelEcallBack { public: /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*); - /* 8004F6C4 */ void executeAfter(JPABaseEmitter*); - /* 8004FABC */ void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); - /* 8004FCC8 */ ~dPa_hermiteEcallBack_c(); + + /* 8004FCC8 */ virtual ~dPa_hermiteEcallBack_c(); + /* 8004F6C4 */ virtual void executeAfter(JPABaseEmitter*); + /* 8004FABC */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); private: - /* 0x00 */ void* vtable; - /* 0x04 */ float mRate; + /* 0x04 */ f32 mRate; /* 0x08 */ int mMaxCnt; /* 0x0C */ cXyz* field_0xc; /* 0x10 */ cXyz* field_0x10; /* 0x14 */ cXyz* field_0x14; }; +class mDoDvdThd_toMainRam_c; +class cBgS_PolyInfo; +class JPAEmitterManager; +struct JPADrawInfo; + +class dPa_simpleEcallBack : public JPAEmitterCallBack { +public: + /* 8004ADF4 */ dPa_simpleEcallBack(); + /* 8004AF98 */ void create(JPAEmitterManager*, u16, u8); + /* 8004B064 */ void createEmitter(JPAEmitterManager*); + /* 8004B168 */ void set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, + int, f32); + + /* 8004FC08 */ virtual ~dPa_simpleEcallBack(); + /* 8004AE1C */ virtual void executeAfter(JPABaseEmitter*); + /* 8004AF94 */ virtual void draw(JPABaseEmitter*); + + /* 0x04 */ JPABaseEmitter* mEmitter; + /* 0x08 */ u16 mID; + /* 0x0A */ u8 field_0xa; + /* 0x0C */ s16 field_0xc; + /* 0x10 */ void* mData; +}; // Size: 0x14 + +class dPa_control_c { +public: + class level_c { + public: + class emitter_c { + public: + /* 8004B504 */ void onActive(); + /* 8004B544 */ void entry(u32, u16, JPABaseEmitter*, dPa_levelEcallBack*); + /* 8004B5AC */ void cleanup(); + /* 8004FBFC */ emitter_c(); + + private: + /* 0x00 */ u32 mId; + /* 0x04 */ u16 mNameId; + /* 0x06 */ u8 mStatus; + /* 0x08 */ JPABaseEmitter* mEmitter; + /* 0x0C */ dPa_levelEcallBack* mCallback; + /* 0x10 */ emitter_c* mPre; + /* 0x14 */ emitter_c* mNext; + }; // Size: 0x18 + + /* 8004B688 */ level_c(); + /* 8004B7A8 */ void execute(); + /* 8004B6F8 */ void execute(dPa_control_c::level_c::emitter_c*); + /* 8004B808 */ void cleanup(); + /* 8004B874 */ void get(u32); + /* 8004B8B4 */ void forceOnEventMove(u32); + /* 8004B8E8 */ void allForceOnEventMove(); + /* 8004B918 */ emitter_c* getEmitter(u32); + /* 8004B94C */ void entry(u16, JPABaseEmitter*, dPa_levelEcallBack*); + /* 8004BA40 */ void addTable(dPa_control_c::level_c::emitter_c*); + /* 8004BA74 */ void cutTable(dPa_control_c::level_c::emitter_c*); + + /* 0x000 */ u32 field_0x0; + /* 0x004 */ u8 field_0x4; + /* 0x005 */ u8 field_0x5; + /* 0x006 */ u8 field_0x6; + /* 0x008 */ emitter_c mEmitter[0x80]; + /* 0xC08 */ + }; + + /* 8004BACC */ dPa_control_c(); + /* 8004BB70 */ void getRM_ID(u16); + /* 8004BB78 */ void createCommon(void const*); + /* 8004BCDC */ void createRoomScene(); + /* 8004BDFC */ void readScene(u8, mDoDvdThd_toMainRam_c**); + /* 8004BEB0 */ void createScene(void const*); + /* 8004BF3C */ void removeRoomScene(bool); + /* 8004BFD4 */ void removeScene(bool); + /* 8004C054 */ void cleanup(); + /* 8004C078 */ void calc3D(); + /* 8004C0EC */ void calc2D(); + /* 8004C134 */ void calcMenu(); + /* 8004C188 */ void draw(JPADrawInfo*, u8); + /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); + /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*, + cXyz const*, s8); + /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, + u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, + cXyz const*, f32); + /* 8004D4CC */ u32 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); + /* 8004CF90 */ void getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*); + /* 8004D6A4 */ u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, + csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8, + cXyz const*); + /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, + cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); + /* 8004D128 */ void newSimple(u16, u8, u32*); + /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, + _GXColor const&, int, f32); + /* 8004D23C */ void getSimple(u16); + /* 8004D770 */ void setStopContinue(u32); + /* 8004D7C4 */ void setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, + int, csXyz const*, cXyz const*, dPa_levelEcallBack*, s8, + cXyz const*); + /* 8004D988 */ void setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*, + dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8); + + void forceOnEventMove(u32 param_0) { field_0x210.forceOnEventMove(param_0); } + level_c::emitter_c* getEmitter(u32 param_0) { return field_0x210.getEmitter(param_0); } + u32 setNormal(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, + const csXyz* param_4, const cXyz* param_5, u8 param_6, + dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, + const GXColor* param_10, const cXyz* param_11, f32 param_12) { + return set(param_0, 0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, + param_8, param_9, param_10, param_11, param_12); + } + + static u8 mTsubo[64]; + static u8 mLifeBall[24]; + static u8 mWindViewMatrix[48]; + static u8 mEmitterMng[4]; + static u8 mWaterBubblePcallBack[4]; + static u8 mFsenthPcallBack[4]; + static u8 mLight8EcallBack[4]; + static u8 mLight8PcallBack[4]; + static u8 m_b_Light8EcallBack[4]; + static u8 m_b_Light8PcallBack[4]; + static u8 m_d_Light8EcallBack[4]; + static u8 m_d_Light8PcallBack[4]; + static u8 mParticleTracePCB[4 + 4 /* padding */]; + +private: + /* 0x000 */ JKRSolidHeap* mHeap; + /* 0x004 */ JPAResourceManager* mCommonResMng; + /* 0x008 */ JKRExpHeap* m_resHeap; + /* 0x00C */ JKRSolidHeap* m_sceneHeap; + /* 0x010 */ void* m_sceneRes; + /* 0x014 */ JPAResourceManager* mSceneResMng; + /* 0x018 */ u8 field_0x18; + /* 0x019 */ u8 field_0x19; + /* 0x01C */ dPa_simpleEcallBack field_0x1c[25]; + /* 0x210 */ level_c field_0x210; +}; + #endif /* D_PARTICLE_D_PARTICLE_H */ diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 96baf9dc29..217ba4c419 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -315,6 +315,10 @@ enum ItemTable { /* 0xFF */ NO_ITEM }; +enum EquipItem { + /* 0x103 */ EQUIP_SWORD = 0x103, +}; + enum CollectItem { /* 0x0 */ COLLECT_CLOTHING, /* 0x1 */ COLLECT_SWORD, @@ -915,6 +919,11 @@ class dSv_restart_c { public: void setRoom(const cXyz&, s16, s8); + void setRoomParam(u32 param) { mRoomParam = param; } + s16 getStartPoint() const { return mStartPoint; } + u32 getLastMode() const { return mLastMode; } + s8 getRoomNo() const { return mRoomNo; } + private: /* 0x00 */ s8 mRoomNo; /* 0x01 */ u8 field_0x01[3]; @@ -999,6 +1008,9 @@ public: dSv_zone_c* getZones() { return mZone; } dSv_player_c& getPlayer() { return mSavedata.getPlayer(); } dSv_event_c& getTmp() { return mTmp; } + dSv_restart_c& getRestart() { return mRestart; } + dSv_turnRestart_c& getTurnRestart() { return mTurnRestart; } + dSv_event_c& getEvent() { return mSavedata.getEvent(); } s64 getStartTime() { return mStartTime; } s64 getSaveTotalTime() { return mSaveTotalTime; } void initDan(s8 param_0) { mDan.init(param_0); } diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index b709c27196..bf16d5b99a 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -19,7 +19,7 @@ public: void onCondition(u16); void offCondition(u16); bool checkCommandCatch(); - bool checkCommandDoor(); + BOOL checkCommandDoor(); bool checkCommandDemoAccrpt(); void setCommand(u16 command) { mCommand = command; } @@ -52,7 +52,7 @@ public: struct actor_place { cXyz mPosition; csXyz mAngle; - u8 mRoomNo; + s8 mRoomNo; }; struct actor_attention_types { @@ -88,7 +88,7 @@ public: /* 0x4E4 */ csXyz mCollisionRot; /* 0x4EC */ cXyz mScale; /* 0x4F8 */ cXyz mSpeed; - /* 0x504 */ Mtx* mCullMtx; + /* 0x504 */ MtxP mCullMtx; union { struct { /* 0x508 */ cXyz mMin; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index ac29bdf894..dc72b471b2 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -54,6 +54,8 @@ public: static bool gndCheck(const cXyz*); static u8 mGndCheck[84]; static f32 mGroundY; + + static f32 getGroundY() { return mGroundY; } }; class fopAcM_wt_c { @@ -100,6 +102,14 @@ inline u32 fopAcM_GetParam(const void* pActor) { return fpcM_GetParam(pActor); } +inline void fopAcM_SetParam(void* p_actor, u32 param) { + fpcM_SetParam(p_actor, param); +} + +inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) { + return p_actor->mGroup; +} + inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) { pActor->mStatus |= flag; } @@ -132,6 +142,14 @@ inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) { return pActor->mCollisionRot; } +inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) { + return p_actor->mCondition & flag; +} + +inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) { + p_actor->mCondition |= flag; +} + void* fopAcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData); void fopAcM_setStageLayer(void*); int fopAcM_setRoomLayer(void*, int); @@ -230,7 +248,7 @@ static const char* fopAcM_getProcNameString(const fopAc_ac_c*); // s32 fopAcM_findObjectCB(const fopAc_ac_c*, void*); s32 fopAcM_searchFromName(const char*, u32, u32); s32 fopAcM_findObject4EventCB(fopAc_ac_c*, void*); -s32 fopAcM_searchFromName4Event(const char*, s16); +fopAc_ac_c* fopAcM_searchFromName4Event(const char*, s16); s32 fopAcM_getWaterY(const cXyz*, f32*); void fpoAcM_relativePos(const fopAc_ac_c*, const cXyz*, cXyz*); s32 fopAcM_getWaterStream(const cXyz*, const cBgS_PolyInfo&, cXyz*, int*, int); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index e5796a0a8d..f97e09759d 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -6,4 +6,6 @@ typedef int (*fopMsgCreateFunc)(void*); +JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*); + #endif \ No newline at end of file diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 1d13f495d3..772db2e504 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -22,6 +22,10 @@ inline u32 fpcM_GetParam(const void* pActor) { return ((base_process_class*)pActor)->mParameters; } +inline void fpcM_SetParam(void* p_actor, u32 param) { + ((base_process_class*)p_actor)->mParameters = param; +} + void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); void fpcM_Execute(void* pProc); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index c9f4cfaab0..aebbcd2b20 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -31,4 +31,8 @@ public: extern JKRSolidHeap* g_mDoAud_audioHeap; +inline void mDoAud_bgmSetSwordUsing(s32 id) { + Z2AudioMgr::getInterface()->mSeqMgr.bgmSetSwordUsing(id); +} + #endif /* M_DO_M_DO_AUDIO_H */ diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 47c48def6c..ff338d68b0 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -15,61 +15,57 @@ public: /* 8000D428 */ void play(); private: - J3DFrameCtrl frame_control; -}; + /* 0x0 */ J3DFrameCtrl mFrameCtrl; +}; // Size: 0x14 -class mDoExt_btkAnm { +class mDoExt_btkAnm : public mDoExt_baseAnm { public: - mDoExt_btkAnm(void) { field_0x14 = 0; } + mDoExt_btkAnm(void) { mBtkAnm = 0; } /* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16); /* 8000D6D8 */ void entry(J3DMaterialTable*, f32); private: - mDoExt_baseAnm base_anm; - u32 field_0x14; -}; + /* 0x14 */ u32 mBtkAnm; +}; // Size: 0x18 STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18); -class mDoExt_brkAnm { +class mDoExt_brkAnm : public mDoExt_baseAnm { public: - mDoExt_brkAnm(void) { field_0x14 = 0; } + mDoExt_brkAnm(void) { mBrkAnm = 0; } /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16); /* 8000D7A8 */ void entry(J3DMaterialTable*, f32); private: - mDoExt_baseAnm mDoExt_baseAnm; - u32 field_0x14; -}; + /* 0x14 */ u32 mBrkAnm; +}; // Size: 0x18 STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18); -class mDoExt_bpkAnm { +class mDoExt_bpkAnm : public mDoExt_baseAnm { public: - mDoExt_bpkAnm(void) { field_0x14 = 0; } + mDoExt_bpkAnm(void) { mBpkAnm = 0; } /* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16); /* 8000D518 */ void entry(J3DMaterialTable*, f32); private: - mDoExt_baseAnm mDoExt_baseAnm; - u32 field_0x14; -}; + /* 0x14 */ u32 mBpkAnm; +}; // Size: 0x18 STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18); -class mDoExt_bckAnm { +class mDoExt_bckAnm : public mDoExt_baseAnm { public: - mDoExt_bckAnm(void) { field_0x18 = 0; } + mDoExt_bckAnm(void) { mAnm = 0; } /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); /* 8000D990 */ void changeBckOnly(J3DAnmTransform*); /* 8000D9CC */ void entry(J3DModelData*, f32); /* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32); private: - mDoExt_baseAnm base_anm; - u8 field_0x14[4]; - u32 field_0x18; -}; // Size = 0x1C + /* 0x14 */ u32 mBckAnm; + /* 0x18 */ u32 mAnm; +}; // Size: 0x1C STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C); @@ -77,8 +73,6 @@ class J3DTransformInfo; class mDoExt_McaMorfCallBack1_c { public: -private: - /*void* vtable;*/ virtual void execute(u16, J3DTransformInfo*) = 0; }; @@ -87,10 +81,71 @@ public: /* 80140DF0 */ ~mDoExt_AnmRatioPack(); /* 80140E2C */ mDoExt_AnmRatioPack(); + void setRatio(f32 ratio) { mRatio = ratio; } + J3DAnmTransform* getAnmTransform() { return mAnmTransform; } + private: - /* 0x0 */ float mRatio; + /* 0x0 */ f32 mRatio; /* 0x4 */ J3DAnmTransform* mAnmTransform; -}; // Size = 0x8 +}; // Size: 0x8 + +class mDoExt_invJntPacket : public J3DPacket { +public: + /* 8000E654 */ mDoExt_invJntPacket(); + + /* 80012220 */ virtual void draw(); + /* 8000E5F8 */ virtual ~mDoExt_invJntPacket(); + +private: + /* 0x10 */ J3DModel* field_0x10; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u8 field_0x16; +}; // Size: 0x18 + +class mDoExt_invisibleModel { +public: + /* 8000E53C */ void create(J3DModel*, u8); + /* 8000E6C8 */ void entryJoint(cXyz*); + /* 8000E7C0 */ void entryDL(cXyz*); + + /* 0x0 */ J3DModel* mModel; + /* 0x4 */ mDoExt_invJntPacket* field_0x4; +}; + +class mDoExt_morf_c + : public J3DMtxCalcNoAnm { +public: + /* 8000F950 */ mDoExt_morf_c(); + /* 8000FB7C */ void setMorf(f32); + /* 8000FBC0 */ void frameUpdate(); + + /* 8000FAE8 */ virtual ~mDoExt_morf_c(); + +private: + /* 0x04 */ u32 field_0x4; + /* 0x08 */ u32 mAnm; + /* 0x0C */ J3DFrameCtrl mFrameCtrl; + /* 0x20 */ u32 field_0x20; + /* 0x24 */ u32 field_0x24; +}; + +class mDoExt_MtxCalcOldFrame { +public: + /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); + /* 8000F8CC */ void decOldFrameMorfCounter(); + +private: + /* 0x00 */ bool mOldFrameFlg; + /* 0x04 */ f32 mOldFrameMorfCounter; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 mOldFrameRate; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ u16 mOldFrameStartJoint; + /* 0x1A */ u16 mOldFrameEndJoint; + /* 0x1C */ J3DTransformInfo* mOldFrameTransInfo; + /* 0x20 */ Quaternion* mOldFrameQuaternion; +}; // Size: 0x24 JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32, u32); void mDoExt_destroySolidHeap(JKRSolidHeap*); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 7eaa3aa2e2..79c09b2fbf 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -61,4 +61,10 @@ public: /* 0x118 */ mDoMtx_quatStack_c* field_0x118; }; // Size: 0x11C +inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) { + param_1->x = param_0[0][3]; + param_1->y = param_0[1][3]; + param_1->z = param_0[2][3]; +} + #endif /* M_DO_M_DO_MTX_H */ diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h index 6317a31575..cd39bb9e4f 100644 --- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h +++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h @@ -1,6 +1,128 @@ #ifndef D_A_BOOMERANG_H #define D_A_BOOMERANG_H +#include "JSystem/J2DGraph/J2DScreen.h" +#include "Z2AudioLib/Z2SoundObject.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +class daBoomerang_sight_c { +public: + /* 8049E0B8 */ void createHeap(); + /* 8049E36C */ void initialize(); + /* 8049EB64 */ void playAnime(int, int); + /* 8049EDA8 */ void initFrame(int); + /* 8049EDE8 */ void copyNumData(int); + /* 8049EEC8 */ void setSight(cXyz const*, int); + /* 8049EF60 */ void draw(); + + /* 804A278C */ virtual ~daBoomerang_sight_c(); + +private: + /* 0x04 */ J2DScreen* field_0x4; + /* 0x08 */ J2DPane* field_0x8; + /* 0x0C */ J2DPane* field_0xc; + /* 0x10 */ J2DPane* field_0x10; + /* 0x14 */ J2DPane* field_0x14; + /* 0x18 */ J2DAnmBase* field_0x18; + /* 0x1C */ J2DAnmBase* field_0x1c; + /* 0x20 */ J2DScreen* field_0x20; + /* 0x24 */ J2DPane* field_0x24; + /* 0x28 */ J2DPane* field_0x28; + /* 0x2C */ J2DPane* field_0x2c; + /* 0x30 */ J2DPane* field_0x30; + /* 0x34 */ J2DAnmBase* field_0x34; + /* 0x38 */ J2DAnmBase* field_0x38; + /* 0x3C */ J2DScreen* field_0x3c; + /* 0x40 */ J2DPane* field_0x40; + /* 0x44 */ J2DPane* field_0x44; + /* 0x48 */ J2DPane* field_0x48; + /* 0x4C */ J2DPane* field_0x4c; + /* 0x50 */ J2DAnmBase* field_0x50; + /* 0x54 */ J2DAnmBase* field_0x54; + /* 0x58 */ J2DAnmBase* field_0x58; + /* 0x5C */ J2DAnmBase* field_0x5c; + /* 0x60 */ bool mRedSight; + /* 0x61 */ u8 mReserve; + /* 0x62 */ u8 mAlpha[6]; + /* 0x68 */ f32 field_0x68[6]; + /* 0x80 */ f32 field_0x80[6]; + /* 0x98 */ f32 field_0x98[6]; + /* 0xB0 */ f32 field_0xb0[6]; + /* 0xC8 */ cXyz field_0xc8[6]; +}; // Size: 0x110 + +struct daMirror_c; +class daAlink_c; + +class daBoomerang_c : public fopAc_ac_c { +public: + enum daBoomerang_FLG0 { + /* 0x80 */ WIND_CATCH = 0x80, + }; + + /* 8049F280 */ void windModelCallBack(); + /* 8049F39C */ void draw(); + /* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*); + /* 8049F660 */ void moveLineCallback(fopAc_ac_c*); + /* 8049F710 */ void pushLockList(int); + /* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*); + /* 8049F874 */ void setAimActorBase(fopAc_ac_c*); + /* 8049F8B0 */ void setLockActor(fopAc_ac_c*, int); + /* 8049F9A4 */ void resetLockActor(); + /* 8049F9F0 */ void setRoomInfo(); + /* 8049FAA4 */ void setKeepMatrix(); + /* 8049FBAC */ void setMoveMatrix(); + /* 8049FCD0 */ void setRotAngle(); + /* 8049FD6C */ void setAimPos(); + /* 8049FE6C */ void checkBgHit(cXyz*, cXyz*); + /* 804A006C */ void setEffectTraceMatrix(u32*, u16); + /* 804A012C */ void setEffect(); + /* 804A0874 */ void procWait(); + /* 804A0F0C */ void procMove(); + /* 804A1814 */ void execute(); + /* 804A1BF4 */ ~daBoomerang_c(); + /* 804A1EE4 */ void createHeap(); + /* 804A2084 */ void create(); + /* 804A230C */ daBoomerang_c(); + + void onStateFlg0(daBoomerang_FLG0 flag) { mStateFlg0 |= flag; } + void onWindCatch() { onStateFlg0(WIND_CATCH); } + +private: + /* 0x568 */ daMirror_c* field_0x568; + /* 0x56C */ J3DModel* field_0x56c; + /* 0x570 */ daAlink_c* field_0x570; + /* 0x574 */ u8 field_0x574[0x1C]; + /* 0x590 */ J3DModel* field_0x590; + /* 0x594 */ void* field_0x594; + /* 0x598 */ daBoomerang_sight_c mSight; + /* 0x6A8 */ int field_0x6a8; + /* 0x6AC */ int field_0x6ac[5]; + /* 0x6C0 */ fopAc_ac_c* field_0x6c0[5]; + /* 0x6D4 */ u8 field_0x6d4[8]; + /* 0x6DC */ cXyz field_0x6dc[5]; + /* 0x718 */ u8 field_0x718[5]; + /* 0x720 */ Z2SoundObjSimple field_0x720; + /* 0x740 */ dBgS_Acch field_0x740; + /* 0x918 */ dPaPo_c field_0x918; + /* 0x950 */ u8 field_0x950; + /* 0x951 */ u8 field_0x951; + /* 0x952 */ u8 field_0x952; + /* 0x953 */ u8 field_0x953; + /* 0x954 */ u8 field_0x954; + /* 0x955 */ u8 field_0x955; + /* 0x956 */ u8 field_0x956; + /* 0x957 */ u8 field_0x957; + /* 0x958 */ s16 field_0x958; + /* 0x95A */ s16 field_0x95a; + /* 0x95C */ s16 field_0x95c; + /* 0x95E */ s16 field_0x95e; + /* 0x960 */ s16 field_0x960; + /* 0x962 */ s16 field_0x962; + /* 0x964 */ u32 mStateFlg0; +}; #endif /* D_A_BOOMERANG_H */ diff --git a/include/rel/d/a/d_a_crod/d_a_crod.h b/include/rel/d/a/d_a_crod/d_a_crod.h index c357d01fc0..422d74dcc9 100644 --- a/include/rel/d/a/d_a_crod/d_a_crod.h +++ b/include/rel/d/a/d_a_crod/d_a_crod.h @@ -1,6 +1,53 @@ #ifndef D_A_CROD_H #define D_A_CROD_H +#include "d/a/d_a_player.h" +#include "d/cc/d_cc_d.h" #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" + +class daCrod_c : public fopAc_ac_c { +public: + /* 80141A94 */ void setControllActorData(); + /* 804A2E38 */ void createHeap(); + /* 804A2F18 */ void create(); + /* 804A3304 */ ~daCrod_c(); + /* 804A34B0 */ void setRoomInfo(); + /* 804A34B4 */ void setMatrix(); + /* 804A3500 */ void posMove(); + /* 804A3580 */ void setBckAnm(u16); + /* 804A35FC */ void setReturn(); + /* 804A365C */ void setLightPower(); + /* 804A36D8 */ void execute(); + /* 804A3FD4 */ void draw(); + + static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) { + return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->mCurrent.mPosition, + fopAcM_GetRoomNo(p_actor), NULL, NULL, -1, NULL, + NULL); + } + + fopAc_ac_c* getControllActor() { return mControllActor.getActor(); } + + fopAc_ac_c* getCameraActor() { return mCameraActor.getActor(); } + + void setThrow() { fopAcM_SetParam(this, 2); } + +private: + /* 0x568 */ J3DModel* field_568; + /* 0x56C */ mDoExt_bckAnm field_0x56c; + /* 0x588 */ J3DAnmTevRegKey* field_0x588; + /* 0x58C */ J3DAnmTextureSRTKey* field_0x58c; + /* 0x590 */ dCcD_Stts field_0x590; + /* 0x5CC */ dCcD_Cps field_0x5cc; + /* 0x710 */ LIGHT_INFLUENCE field_0x710; + /* 0x730 */ u8 field_0x730; + /* 0x731 */ u8 field_0x731; + /* 0x732 */ u8 field_0x732; + /* 0x734 */ cXyz field_0x734; + /* 0x740 */ daPy_actorKeep_c mControllActor; + /* 0x748 */ daPy_actorKeep_c mCameraActor; +}; // Size: 0x750 #endif /* D_A_CROD_H */ diff --git a/include/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h b/include/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h index 25408550ad..49c654ce50 100644 --- a/include/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h +++ b/include/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h @@ -2,5 +2,14 @@ #define D_A_KYTAG05_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +class kytag05_class : public fopAc_ac_c { +public: + u8 getSceneListID() const { return mSceneListID; } + + /* 0x568 */ u8 field_0x568[5]; + /* 0x56D */ u8 mSceneListID; +}; #endif /* D_A_KYTAG05_H */ diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h index 04447c6feb..ee58264a42 100644 --- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h +++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h @@ -1,6 +1,204 @@ #ifndef D_A_OBJ_CARRY_H #define D_A_OBJ_CARRY_H +#include "SSystem/SComponent/c_xyz.h" +#include "d/bg/d_bg_s_acch.h" +#include "d/cc/d_cc_d.h" #include "dolphin/types.h" +class daObjCarry_c : public fopAc_ac_c { +public: + enum { + /* 0x0 */ TYPE_TSUBO, // Small Blue Pot + /* 0x1 */ TYPE_OOTSUBO, // Big Red Pot + /* 0x2 */ TYPE_KIBAKO, // Box + /* 0x3 */ TYPE_IRON_BALL, // Cannon Ball + /* 0x4 */ TYPE_TARU, // Barrel + /* 0x5 */ TYPE_DOKURO, // Skull + /* 0x6 */ TYPE_BOKKURI, // Deku Nut + /* 0x7 */ TYPE_TSUBO_2, // Small Red Pot + /* 0x8 */ TYPE_BALL_S, // Light Ball A + /* 0x9 */ TYPE_BALL_S_2, // Light Ball B + /* 0xA */ TYPE_AOTSUBO, // Big Blue Pot + /* 0xB */ TYPE_LV8_BALL, + /* 0xC */ TYPE_TSUBO_S, // Small pot - Twilight + /* 0xD */ TYPE_TSUBO_B, // Big pot - Twilight + }; + + /* 80031CF8 */ static void clrSaveFlag(); + /* 80031D04 */ static void setSaveFlag(); + /* 80031D10 */ void chkSaveFlag(); + /* 80031D24 */ void getPos(int); + /* 80031D38 */ void savePos(int, cXyz); + /* 80031D64 */ void onSttsFlag(int, u8); + /* 80031D78 */ void offSttsFlag(int, u8); + /* 80031D8C */ void chkSttsFlag(int, u8); + /* 80031DAC */ void setRoomNo(int, s8); + /* 80031DB8 */ void getRoomNo(int); + /* 8046F6A4 */ void data(); + /* 8046F6BC */ void getArcName(); + /* 8046F6D4 */ void getBmdName(); + /* 8046F6EC */ void checkFlag(u8); + /* 8046F724 */ void initBaseMtx(); + /* 8046F7AC */ void setBaseMtx(); + /* 8046FACC */ void preInit(); + /* 8046FB78 */ daObjCarry_c(); + /* 8046FFA4 */ void checkBreakWolfAttack(); + /* 8046FFF8 */ void checkCarryBoomerang(); + /* 80470054 */ void checkCarryHookshot(); + /* 80470080 */ void checkCarryWolf(); + /* 804700B4 */ void checkCarryOneHand(); + /* 804700F0 */ void Create(); + /* 804705DC */ void CreateInit_tsubo(); + /* 80470650 */ void CreateInit_ootubo(); + /* 80470674 */ void CreateInit_kibako(); + /* 804706D4 */ void CreateInit_ironball(); + /* 804707E0 */ void CreateInit_taru(); + /* 80470840 */ void CreateInit_dokuro(); + /* 80470890 */ void CreateInit_bokkuri(); + /* 804709DC */ void CreateInit_LightBall(); + /* 80470AB4 */ void CreateInit_Lv8Ball(); + /* 80470B5C */ void CreateHeap(); + /* 80470BF4 */ void create(); + /* 80470CF0 */ void checkCreate_LightBallA(); + /* 8047114C */ void checkCreate_LightBallB(); + /* 804715A8 */ void checkCreate_Lv8Ball(); + /* 80471680 */ void resetIconPosForLightBallA(); + /* 804716D4 */ void setIconPosForLightBallAAtR00(); + /* 804717B4 */ void setIconPosForLightBallBAtR00(); + /* 80471894 */ void resetIconPosForLightBallB(); + /* 804718E8 */ void execute(); + /* 8047233C */ void checkCulling(); + /* 80472460 */ void draw(); + /* 80472730 */ void debugDraw(); + /* 80472734 */ void _delete(); + /* 80472B54 */ void crr_pos(); + /* 80472D8C */ void check_sink(f32*); + /* 80472E5C */ void calc_gravity(); + /* 80472EF0 */ void checkRollAngle(); + /* 80473050 */ void mode_proc_call(); + /* 804733E8 */ void mode_init_wait(); + /* 804734B0 */ void mode_proc_wait(); + /* 80473718 */ void mode_init_walk(u8); + /* 804737CC */ void mode_proc_walk(); + /* 80473ED8 */ void mode_init_carry(); + /* 804741A8 */ void mode_proc_carry(); + /* 80474448 */ void mode_init_drop(u8); + /* 80474540 */ void mode_proc_drop(); + /* 80474618 */ void mode_init_float(); + /* 80474734 */ void mode_proc_float(); + /* 80474A08 */ void mode_init_sink(); + /* 80474B8C */ void mode_proc_sink(); + /* 80474D64 */ void mode_init_yogan(); + /* 80474E08 */ void mode_proc_yogan(); + /* 80474E98 */ bool mode_proc_magne(); + /* 80474EA0 */ bool mode_proc_magneCarry(); + /* 80474EA8 */ void mode_init_boomCarry(); + /* 80474FA8 */ void mode_proc_boomCarry(); + /* 80475014 */ void mode_init_growth(); + /* 804750C8 */ void mode_proc_growth(); + /* 8047515C */ bool mode_proc_end(); + /* 80475164 */ void mode_init_dbDrop(u8); + /* 80475210 */ void mode_proc_dbDrop(); + /* 80475238 */ void mode_init_hookCarry(); + /* 80475354 */ void mode_proc_hookCarry(); + /* 80475384 */ void mode_init_fit(); + /* 80475450 */ void mode_proc_fit(); + /* 80475478 */ void mode_proc_controled(); + /* 804754D0 */ void mode_init_resetLightBall(); + /* 80475598 */ void mode_proc_resetLightBall(); + /* 80475618 */ void chkSinkAll(); + /* 8047567C */ void chkWaterLineIn(); + /* 804756D4 */ void chkSinkObj(); + /* 8047573C */ void bg_check(); + /* 80476618 */ void check_bg_damage_proc_base(); + /* 80476764 */ void bg_damage_proc_kotubo(); + /* 804767C4 */ void bg_damage_proc_ootubo(); + /* 804767E4 */ void bg_damage_proc_kibako(); + /* 80476804 */ bool bg_damage_proc_ironball(); + /* 8047680C */ void bg_damage_proc_taru(); + /* 8047682C */ void bg_damage_proc_dokuro(); + /* 8047684C */ void bg_damage_proc_bokkuri(); + /* 80476930 */ bool bg_damage_proc_LightBall(); + /* 80476938 */ bool bg_damage_proc_Lv8Ball(); + /* 80476940 */ void obj_break(bool, bool, bool); + /* 80476A5C */ void check_cc_damage_proc_base(bool); + /* 80476B04 */ void cc_damage_proc_kotubo(); + /* 80476B68 */ void cc_damage_proc_ootubo(); + /* 80476B88 */ void cc_damage_proc_kibako(); + /* 80476CE4 */ void cc_damage_proc_ironball(); + /* 80476E04 */ void cc_damage_proc_taru(); + /* 80476F88 */ void cc_damage_proc_dokuro(); + /* 80476FA8 */ void cc_damage_proc_bokkuri(); + /* 804771B0 */ bool cc_damage_proc_LightBall(); + /* 804771B8 */ bool cc_damage_proc_Lv8Ball(); + /* 804771C0 */ void eff_break_tuboBmd(u16, cXyz); + /* 8047731C */ void eff_break_kibakoBmd(cXyz); + /* 8047747C */ void eff_break_tsubo(); + /* 804774D4 */ void eff_break_ootubo(); + /* 8047752C */ void eff_break_kibako(); + /* 80477574 */ void eff_break_ironball(); + /* 80477578 */ void eff_break_taru(); + /* 804775BC */ void eff_break_dokuro(); + /* 80477614 */ void eff_break_bokkuri(); + /* 80477798 */ void eff_break_kotubo2(); + /* 804777F0 */ void eff_break_LightBall(); + /* 804777F4 */ void eff_break_ootubo2(); + /* 8047784C */ void eff_break_Lv8Ball(); + /* 80477850 */ void eff_break_tsuboL8(); + /* 804778A8 */ void eff_break_ootuboL8(); + /* 80477900 */ void se_break(cBgS_PolyInfo*); + /* 80477990 */ void se_put(cBgS_PolyInfo*); + /* 80477A14 */ void se_put_water(); + /* 80477A98 */ void se_fall_water(); + /* 80477B1C */ void calc_rot_axis_base(u8); + /* 80477FE0 */ void calc_rot_axis_tsubo(); + /* 80478004 */ void calc_rot_axis_ootubo(); + /* 80478028 */ void calc_rot_axis_kibako(); + /* 8047814C */ void calc_rot_axis_ironball(); + /* 80478170 */ void calc_rot_axis_taru(); + /* 80478190 */ void calc_rot_axis_dokuro(); + /* 804781B4 */ void calc_rot_axis_bokkuri(); + /* 804783C0 */ void calc_rot_axis_kotubo2(); + /* 804783E4 */ void calc_rot_axis_LightBall(); + /* 80478408 */ void calc_rot_axis_Lv8Ball(); + /* 8047842C */ void set_wind_power(); + /* 80478808 */ void exec_proc_tsubo(); + /* 80478828 */ void exec_proc_ootubo(); + /* 80478848 */ void exec_proc_kibako(); + /* 8047884C */ void exec_proc_ironball(); + /* 804788C4 */ void exec_proc_taru(); + /* 804788C8 */ void exec_proc_dokuro(); + /* 804788CC */ void exec_proc_bokkuri(); + /* 80478C18 */ void exec_proc_LightBall(); + /* 80478CE4 */ void exec_proc_Lv8Ball(); + /* 80478D78 */ void bg_damage_proc_call(); + /* 80478F50 */ void cc_damage_proc_call(); + /* 80479128 */ void eff_break_call(); + /* 804792D4 */ void calc_rot_call(); + /* 80479480 */ void obj_execute_proc_call(); + /* 8047962C */ void setTgHitCallBack(); + /* 80479648 */ void setCoHitCallBack(); + /* 80479664 */ void CreateInitCall(); + + s32 getType() { return mType; } + + static u8 const mData[2072]; + +private: + /* 0x568 */ u8 field_0x568[8]; + /* 0x570 */ J3DModel* field_0x570; + /* 0x574 */ dBgS_Acch field_0x574; + /* 0x74C */ dBgS_AcchCir field_0x74c; + /* 0x78C */ dCcD_Stts field_0x78c; + /* 0x7C8 */ dCcD_Cyl field_0x7c8; + /* 0x904 */ dCcD_Sph field_0x904; + /* 0xA3C */ dCcD_Cps field_0xa3c; + /* 0xB80 */ dCcD_Cyl field_0xb80; + /* 0xCBC */ u8 field_0xcbc[0x34]; + /* 0xCF0 */ u8 mType; + /* 0xCF4 */ cXyz field_0xcf4; + /* 0xD00 */ +}; + #endif /* D_A_OBJ_CARRY_H */ diff --git a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h index 940e95c355..08fe8b32b9 100644 --- a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h +++ b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h @@ -1,6 +1,28 @@ #ifndef D_A_TAG_MMSG_H #define D_A_TAG_MMSG_H +#include "d/a/d_a_player.h" #include "dolphin/types.h" +class daTagMmsg_c : public fopAc_ac_c { +public: + /* 80D5B918 */ void create(); + /* 80D5BAB4 */ ~daTagMmsg_c(); + /* 80D5BB30 */ void execute(); + + void onUseFlg() { mUseFlg = true; } + +private: + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 field_0x569; + /* 0x56A */ u8 mAttention; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ bool mUseFlg; + /* 0x56D */ u8 field_0x56d[3]; + /* 0x570 */ u16 field_0x570; + /* 0x572 */ u16 field_0x572; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ f32 field_0x578; +}; + #endif /* D_A_TAG_MMSG_H */ diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp index fb82f433ef..1463e95602 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp @@ -177,7 +177,7 @@ SECTION_SDATA2 static f32 lit_1581[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DAnmLoaderDataBase::load(void const* param_0) { +asm void* J2DAnmLoaderDataBase::load(void const* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DAnmLoader/load__20J2DAnmLoaderDataBaseFPCv.s" } diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index 4819b54c46..cd4fb3689b 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -11,21 +11,6 @@ // Types: // -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266C18 */ void operator/(f32) const; - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - /* 8049EE8C */ ~cXyz(); - /* 804A27FC */ cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -34,77 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct fopAcM_rc_c { - /* 8001DD1C */ void roofCheck(cXyz const*); - - static u8 mRoofCheck[80]; - static f32 mRoofY; -}; - -struct J3DModel {}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; -struct daBoomerang_sight_c { - /* 8049E0B8 */ void createHeap(); - /* 8049E36C */ void initialize(); - /* 8049EB64 */ void playAnime(int, int); - /* 8049EDA8 */ void initFrame(int); - /* 8049EDE8 */ void copyNumData(int); - /* 8049EEC8 */ void setSight(cXyz const*, int); - /* 8049EF60 */ void draw(); - /* 804A278C */ ~daBoomerang_sight_c(); -}; - -struct daBoomerang_c { - /* 8049F280 */ void windModelCallBack(); - /* 8049F39C */ void draw(); - /* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*); - /* 8049F660 */ void moveLineCallback(fopAc_ac_c*); - /* 8049F710 */ void pushLockList(int); - /* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*); - /* 8049F874 */ void setAimActorBase(fopAc_ac_c*); - /* 8049F8B0 */ void setLockActor(fopAc_ac_c*, int); - /* 8049F9A4 */ void resetLockActor(); - /* 8049F9F0 */ void setRoomInfo(); - /* 8049FAA4 */ void setKeepMatrix(); - /* 8049FBAC */ void setMoveMatrix(); - /* 8049FCD0 */ void setRotAngle(); - /* 8049FD6C */ void setAimPos(); - /* 8049FE6C */ void checkBgHit(cXyz*, cXyz*); - /* 804A006C */ void setEffectTraceMatrix(u32*, u16); - /* 804A012C */ void setEffect(); - /* 804A0874 */ void procWait(); - /* 804A0F0C */ void procMove(); - /* 804A1814 */ void execute(); - /* 804A1BF4 */ ~daBoomerang_c(); - /* 804A1EE4 */ void createHeap(); - /* 804A2084 */ void create(); - /* 804A230C */ daBoomerang_c(); -}; - struct daBoomerang_HIO_c0 { static u16 const m_lockWaitTime; static f32 const m_minCircleR; @@ -114,8 +32,6 @@ struct daBoomerang_HIO_c0 { static f32 const m_lockWindScale; }; -struct J3DAnmBase {}; - struct daAlink_c { /* 8009D884 */ void getAlinkArcName(); /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); @@ -129,24 +45,8 @@ struct daAlink_c { /* 800E08C4 */ void returnBoomerang(int); }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -157,8 +57,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct cBgS_PolyInfo {}; - struct dBgS { /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 80074DAC */ void GetUnderwaterRoofCode(cBgS_PolyInfo const&); @@ -166,29 +64,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); -}; - -struct dDlst_base_c { - /* 804A2718 */ void draw(); -}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct cCcD_Obj {}; struct dCcMassS_Mng { @@ -223,47 +98,6 @@ struct dCcD_Cps { /* 80084824 */ void CalcAtVec(); }; -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_ObjGndChk { - /* 804A2524 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 804A2688 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_BoomerangLinChk { - /* 800782B8 */ dBgS_BoomerangLinChk(); - /* 80078314 */ ~dBgS_BoomerangLinChk(); -}; - -struct cM3dGPla { - /* 804A082C */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 804A259C */ ~cM3dGCyl(); -}; - struct cM3dGCps { /* 8026EF88 */ cM3dGCps(); /* 8026EFA4 */ ~cM3dGCps(); @@ -282,29 +116,12 @@ struct cCcD_GStts { /* 804A271C */ ~cCcD_GStts(); }; -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); /* 800744A0 */ void GroundCross(cBgS_GndChk*); /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -317,47 +134,6 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRArchive {}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 804A2800 */ ~J3DFrameCtrl(); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; @@ -547,11 +323,6 @@ extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData(); extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -585,13 +356,10 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mRoofCheck__11fopAcM_rc_c[80]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mRoofY__11fopAcM_rc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; extern "C" extern u8 struct_8045101C[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -831,7 +599,8 @@ asm void daBoomerang_sight_c::copyNumData(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__4cXyzFv.s" } @@ -1600,7 +1369,8 @@ asm void daBoomerang_c::setEffect() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__8cM3dGPlaFv.s" } @@ -1813,7 +1583,8 @@ asm daBoomerang_c::daBoomerang_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__14dBgS_ObjGndChkFv.s" } @@ -1823,7 +1594,8 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__8cM3dGCylFv.s" } @@ -1853,7 +1625,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__12dBgS_ObjAcchFv.s" } @@ -1871,7 +1644,7 @@ static asm void daBoomerang_Create(fopAc_ac_c* param_0) { #pragma pop /* 804A2718-804A271C 0046D8 0004+00 1/0 0/0 0/0 .text draw__12dDlst_base_cFv */ -void dDlst_base_c::draw() { +void draw__12dDlst_base_cFv() { /* empty function */ } @@ -1939,14 +1712,15 @@ static asm void func_804A2784() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daBoomerang_sight_c::~daBoomerang_sight_c() { +// asm daBoomerang_sight_c::~daBoomerang_sight_c() { +extern "C" asm void __dt__19daBoomerang_sight_cFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__19daBoomerang_sight_cFv.s" } #pragma pop /* 804A27FC-804A2800 0047BC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +extern "C" void __ct__4cXyzFv() { /* empty function */ } @@ -1954,7 +1728,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 1297281f70..f748ef4e37 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -11,15 +11,6 @@ // Types: // -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80267128 */ void atan2sX_Z() const; -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -27,45 +18,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daPy_actorKeep_c { - /* 8015ECB8 */ void setData(fopAc_ac_c*); - /* 8015ECFC */ void clearData(); -}; - -struct daCrod_c { - /* 804A2E38 */ void createHeap(); - /* 804A2F18 */ void create(); - /* 804A3304 */ ~daCrod_c(); - /* 804A34B0 */ void setRoomInfo(); - /* 804A34B4 */ void setMatrix(); - /* 804A3500 */ void posMove(); - /* 804A3580 */ void setBckAnm(u16); - /* 804A35FC */ void setReturn(); - /* 804A365C */ void setLightPower(); - /* 804A36D8 */ void execute(); - /* 804A3FD4 */ void draw(); -}; - -struct J3DAnmBase {}; - struct daAlink_c { /* 8009D884 */ void getAlinkArcName(); /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); @@ -74,68 +26,10 @@ struct daAlink_c { /* 800E1A30 */ void returnCopyRod(); }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcCps {}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 804A3240 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084318 */ void ResetAtHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct cM3dGLin { - /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); -}; - -struct cM3dGAab { - /* 804A31F8 */ ~cM3dGAab(); -}; - -struct cCcD_Obj {}; - struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct cCcD_GStts { - /* 804A409C */ ~cCcD_GStts(); -}; - struct JAISoundID {}; struct Z2SeMgr { @@ -147,32 +41,10 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct LIGHT_INFLUENCE {}; - struct JMath { static u8 sincosTable_[65536]; }; -struct J3DModel {}; - -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 804A329C */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -251,11 +123,6 @@ extern "C" void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData(); extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData(); extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); @@ -271,7 +138,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_804A4218[4]; @@ -396,7 +262,8 @@ asm void daCrod_c::create() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +// asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { nofralloc #include "asm/rel/d/a/d_a_crod/d_a_crod/__dt__8cM3dGAabFv.s" } @@ -406,7 +273,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +// asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_crod/d_a_crod/__dt__10dCcD_GSttsFv.s" } @@ -416,7 +284,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/d_a_crod/d_a_crod/__dt__12J3DFrameCtrlFv.s" } @@ -631,7 +500,8 @@ static asm void daCrod_Draw(daCrod_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +// asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { nofralloc #include "asm/rel/d/a/d_a_crod/d_a_crod/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index 7cb0988b00..ba6a472226 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -7,16 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct kytag05_class {}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - // // Forward References: // diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 86c07b80e7..4b40263df9 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -11,14 +11,6 @@ // Types: // -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Quaternion {}; - struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -27,211 +19,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); - /* 80266FDC */ void normalizeRS(); - /* 8026706C */ bool operator!=(Vec const&) const; - /* 802670AC */ void isZero() const; - - static f32 Zero[3]; - static u8 BaseX[12]; -}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct daPy_py_c { - /* 8015F60C */ void wolfGrabSubjectNoDraw(fopAc_ac_c*); - /* 8015F698 */ void checkCarryStartLightBallA(); - /* 8015F730 */ void checkCarryStartLightBallB(); -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct daObjCarry_c { - /* 80031D10 */ void chkSaveFlag(); - /* 80031D24 */ void getPos(int); - /* 80031D38 */ void savePos(int, cXyz); - /* 80031D64 */ void onSttsFlag(int, u8); - /* 80031D78 */ void offSttsFlag(int, u8); - /* 80031D8C */ void chkSttsFlag(int, u8); - /* 80031DAC */ void setRoomNo(int, s8); - /* 80031DB8 */ void getRoomNo(int); - /* 8046F6A4 */ void data(); - /* 8046F6BC */ void getArcName(); - /* 8046F6D4 */ void getBmdName(); - /* 8046F6EC */ void checkFlag(u8); - /* 8046F724 */ void initBaseMtx(); - /* 8046F7AC */ void setBaseMtx(); - /* 8046FACC */ void preInit(); - /* 8046FB78 */ daObjCarry_c(); - /* 8046FFA4 */ void checkBreakWolfAttack(); - /* 8046FFF8 */ void checkCarryBoomerang(); - /* 80470054 */ void checkCarryHookshot(); - /* 80470080 */ void checkCarryWolf(); - /* 804700B4 */ void checkCarryOneHand(); - /* 804700F0 */ void Create(); - /* 804705DC */ void CreateInit_tsubo(); - /* 80470650 */ void CreateInit_ootubo(); - /* 80470674 */ void CreateInit_kibako(); - /* 804706D4 */ void CreateInit_ironball(); - /* 804707E0 */ void CreateInit_taru(); - /* 80470840 */ void CreateInit_dokuro(); - /* 80470890 */ void CreateInit_bokkuri(); - /* 804709DC */ void CreateInit_LightBall(); - /* 80470AB4 */ void CreateInit_Lv8Ball(); - /* 80470B5C */ void CreateHeap(); - /* 80470BF4 */ void create(); - /* 80470CF0 */ void checkCreate_LightBallA(); - /* 8047114C */ void checkCreate_LightBallB(); - /* 804715A8 */ void checkCreate_Lv8Ball(); - /* 80471680 */ void resetIconPosForLightBallA(); - /* 804716D4 */ void setIconPosForLightBallAAtR00(); - /* 804717B4 */ void setIconPosForLightBallBAtR00(); - /* 80471894 */ void resetIconPosForLightBallB(); - /* 804718E8 */ void execute(); - /* 8047233C */ void checkCulling(); - /* 80472460 */ void draw(); - /* 80472730 */ void debugDraw(); - /* 80472734 */ void _delete(); - /* 80472B54 */ void crr_pos(); - /* 80472D8C */ void check_sink(f32*); - /* 80472E5C */ void calc_gravity(); - /* 80472EF0 */ void checkRollAngle(); - /* 80473050 */ void mode_proc_call(); - /* 804733E8 */ void mode_init_wait(); - /* 804734B0 */ void mode_proc_wait(); - /* 80473718 */ void mode_init_walk(u8); - /* 804737CC */ void mode_proc_walk(); - /* 80473ED8 */ void mode_init_carry(); - /* 804741A8 */ void mode_proc_carry(); - /* 80474448 */ void mode_init_drop(u8); - /* 80474540 */ void mode_proc_drop(); - /* 80474618 */ void mode_init_float(); - /* 80474734 */ void mode_proc_float(); - /* 80474A08 */ void mode_init_sink(); - /* 80474B8C */ void mode_proc_sink(); - /* 80474D64 */ void mode_init_yogan(); - /* 80474E08 */ void mode_proc_yogan(); - /* 80474E98 */ bool mode_proc_magne(); - /* 80474EA0 */ bool mode_proc_magneCarry(); - /* 80474EA8 */ void mode_init_boomCarry(); - /* 80474FA8 */ void mode_proc_boomCarry(); - /* 80475014 */ void mode_init_growth(); - /* 804750C8 */ void mode_proc_growth(); - /* 8047515C */ bool mode_proc_end(); - /* 80475164 */ void mode_init_dbDrop(u8); - /* 80475210 */ void mode_proc_dbDrop(); - /* 80475238 */ void mode_init_hookCarry(); - /* 80475354 */ void mode_proc_hookCarry(); - /* 80475384 */ void mode_init_fit(); - /* 80475450 */ void mode_proc_fit(); - /* 80475478 */ void mode_proc_controled(); - /* 804754D0 */ void mode_init_resetLightBall(); - /* 80475598 */ void mode_proc_resetLightBall(); - /* 80475618 */ void chkSinkAll(); - /* 8047567C */ void chkWaterLineIn(); - /* 804756D4 */ void chkSinkObj(); - /* 8047573C */ void bg_check(); - /* 80476618 */ void check_bg_damage_proc_base(); - /* 80476764 */ void bg_damage_proc_kotubo(); - /* 804767C4 */ void bg_damage_proc_ootubo(); - /* 804767E4 */ void bg_damage_proc_kibako(); - /* 80476804 */ bool bg_damage_proc_ironball(); - /* 8047680C */ void bg_damage_proc_taru(); - /* 8047682C */ void bg_damage_proc_dokuro(); - /* 8047684C */ void bg_damage_proc_bokkuri(); - /* 80476930 */ bool bg_damage_proc_LightBall(); - /* 80476938 */ bool bg_damage_proc_Lv8Ball(); - /* 80476940 */ void obj_break(bool, bool, bool); - /* 80476A5C */ void check_cc_damage_proc_base(bool); - /* 80476B04 */ void cc_damage_proc_kotubo(); - /* 80476B68 */ void cc_damage_proc_ootubo(); - /* 80476B88 */ void cc_damage_proc_kibako(); - /* 80476CE4 */ void cc_damage_proc_ironball(); - /* 80476E04 */ void cc_damage_proc_taru(); - /* 80476F88 */ void cc_damage_proc_dokuro(); - /* 80476FA8 */ void cc_damage_proc_bokkuri(); - /* 804771B0 */ bool cc_damage_proc_LightBall(); - /* 804771B8 */ bool cc_damage_proc_Lv8Ball(); - /* 804771C0 */ void eff_break_tuboBmd(u16, cXyz); - /* 8047731C */ void eff_break_kibakoBmd(cXyz); - /* 8047747C */ void eff_break_tsubo(); - /* 804774D4 */ void eff_break_ootubo(); - /* 8047752C */ void eff_break_kibako(); - /* 80477574 */ void eff_break_ironball(); - /* 80477578 */ void eff_break_taru(); - /* 804775BC */ void eff_break_dokuro(); - /* 80477614 */ void eff_break_bokkuri(); - /* 80477798 */ void eff_break_kotubo2(); - /* 804777F0 */ void eff_break_LightBall(); - /* 804777F4 */ void eff_break_ootubo2(); - /* 8047784C */ void eff_break_Lv8Ball(); - /* 80477850 */ void eff_break_tsuboL8(); - /* 804778A8 */ void eff_break_ootuboL8(); - /* 80477900 */ void se_break(cBgS_PolyInfo*); - /* 80477990 */ void se_put(cBgS_PolyInfo*); - /* 80477A14 */ void se_put_water(); - /* 80477A98 */ void se_fall_water(); - /* 80477B1C */ void calc_rot_axis_base(u8); - /* 80477FE0 */ void calc_rot_axis_tsubo(); - /* 80478004 */ void calc_rot_axis_ootubo(); - /* 80478028 */ void calc_rot_axis_kibako(); - /* 8047814C */ void calc_rot_axis_ironball(); - /* 80478170 */ void calc_rot_axis_taru(); - /* 80478190 */ void calc_rot_axis_dokuro(); - /* 804781B4 */ void calc_rot_axis_bokkuri(); - /* 804783C0 */ void calc_rot_axis_kotubo2(); - /* 804783E4 */ void calc_rot_axis_LightBall(); - /* 80478408 */ void calc_rot_axis_Lv8Ball(); - /* 8047842C */ void set_wind_power(); - /* 80478808 */ void exec_proc_tsubo(); - /* 80478828 */ void exec_proc_ootubo(); - /* 80478848 */ void exec_proc_kibako(); - /* 8047884C */ void exec_proc_ironball(); - /* 804788C4 */ void exec_proc_taru(); - /* 804788C8 */ void exec_proc_dokuro(); - /* 804788CC */ void exec_proc_bokkuri(); - /* 80478C18 */ void exec_proc_LightBall(); - /* 80478CE4 */ void exec_proc_Lv8Ball(); - /* 80478D78 */ void bg_damage_proc_call(); - /* 80478F50 */ void cc_damage_proc_call(); - /* 80479128 */ void eff_break_call(); - /* 804792D4 */ void calc_rot_call(); - /* 80479480 */ void obj_execute_proc_call(); - /* 8047962C */ void setTgHitCallBack(); - /* 80479648 */ void setCoHitCallBack(); - /* 80479664 */ void CreateInitCall(); - - static u8 const mData[2072]; -}; - -struct J3DModel {}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; @@ -240,40 +27,6 @@ struct dTres_c { /* 8009C3CC */ void setPosition(int, u8, Vec const*, int); }; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; - /* 800356B4 */ void offActor(int, int); -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dStage_roomControl_c { - /* 800244E8 */ void checkRoomDisp(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - struct dPa_modelEcallBack { /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, u8); @@ -283,8 +36,6 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -302,81 +53,10 @@ struct dJntCol_c { /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); }; -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct cCcD_Obj {}; - struct dCcMassS_Mng { /* 80085D98 */ void Set(cCcD_Obj*, u8); }; -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 8046FE68 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct dBgS_SplGrpChk { - /* 80078B90 */ void Set(cXyz&, f32); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); - /* 80078E74 */ void ClrObj(); - /* 80078E98 */ void SetLink(); - /* 80078F94 */ void SetIronBall(); - /* 80078FA0 */ void ClrIronBall(); -}; - -struct dBgS_ObjAcch { - /* 8046FF34 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8046FEC4 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); @@ -384,64 +64,16 @@ struct dBgS { /* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*); }; -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773A4 */ void ClrMoveBGOnly(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8046FD90 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 8046F2F4 */ ~cM3dGPla(); -}; - -struct cM3dGCylS {}; - -struct cM3dGCyl { - /* 8026F114 */ void Set(cM3dGCylS const&); - /* 8026F1DC */ void SetC(cXyz const&); - /* 8046FDD8 */ ~cM3dGCyl(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 8046FE20 */ ~cM3dGAab(); -}; - struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct cCcD_Stts { - /* 8026395C */ void ClrCcMove(); -}; - -struct cCcD_GStts { - /* 80479890 */ ~cCcD_GStts(); -}; - struct cBgS { /* 80074618 */ void GetActorPointer(int) const; /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct _GXTexObj {}; - struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); }; @@ -462,16 +94,10 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct DALKMIST_INFLUENCE {}; - // // Forward References: // @@ -657,7 +283,6 @@ extern "C" extern char const* const d_a_obj_carry__stringBase0; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); @@ -796,20 +421,6 @@ extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void C_VECReflect(); -extern "C" void PSVECSquareDistance(); -extern "C" void PSQUATMultiply(); -extern "C" void C_QUATSlerp(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_23(); @@ -826,7 +437,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 ZeroQuat[16]; @@ -848,9 +458,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseX__4cXyz[12]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -2499,7 +2107,8 @@ static asm void bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { + // asm cM3dGPla::~cM3dGPla() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGPlaFv.s" } @@ -2782,7 +2391,8 @@ asm daObjCarry_c::daObjCarry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { + // asm cM3dGSph::~cM3dGSph() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGSphFv.s" } @@ -2792,7 +2402,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { + // asm cM3dGCyl::~cM3dGCyl() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGCylFv.s" } @@ -2802,7 +2413,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { + // asm cM3dGAab::~cM3dGAab() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGAabFv.s" } @@ -2812,7 +2424,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { + // asm dCcD_GStts::~dCcD_GStts() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__10dCcD_GSttsFv.s" } @@ -2822,7 +2435,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { + // asm dBgS_AcchCir::~dBgS_AcchCir() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__12dBgS_AcchCirFv.s" } @@ -2832,7 +2446,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { + // asm dBgS_ObjAcch::~dBgS_ObjAcch() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__12dBgS_ObjAcchFv.s" } @@ -4690,7 +4305,8 @@ static asm void daObjCarry_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { + // asm cCcD_GStts::~cCcD_GStts() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index fd40bd4011..1cbe7b23be 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -7,38 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagMmsg_c { - /* 80D5B918 */ void create(); - /* 80D5BAB4 */ ~daTagMmsg_c(); - /* 80D5BB30 */ void execute(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - // // Forward References: // diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 40f1dbab12..124c12632e 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -4,16 +4,23 @@ // #include "d/a/d_a_alink.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" +#include "JSystem/JMath/JMath.h" #include "JSystem/JStudio/JStudio/stb.h" +#include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2AudioMgr.h" #include "d/a/d_a_horse_static.h" #include "d/com/d_com_inf_game.h" +#include "d/d_bomb.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" +#include "rel/d/a/d_a_crod/d_a_crod.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // // Types: @@ -23,10 +30,6 @@ struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; -struct mDoExt_MtxCalcOldFrame { - /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); -}; - struct mDoExt_MtxCalcAnmBlendTbl { /* 800D00BC */ void getAnm(int); }; @@ -71,160 +74,15 @@ struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; -struct daCrod_c { - /* 80141A94 */ void setControllActorData(); -}; - -struct daAlink_matAnm_c { - /* 8009D8E4 */ void init(); - /* 8009D90C */ void calc(J3DMaterial*) const; - /* 800D0180 */ void offSetFlg(); - /* 800D0B8C */ ~daAlink_matAnm_c(); -}; - -struct dCcG_At_Spl {}; - struct dDemo_actor_c { /* 8003819C */ void getPrm_Morf(); /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; -struct daAlinkHIO_zwLight_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_wolf_c0 { - static u8 const m[24]; -}; - struct daAlinkHIO_wolf_c { /* 80140B98 */ ~daAlinkHIO_wolf_c(); }; -struct daAlinkHIO_wlWallHang_c0 { - static u8 const m[156]; -}; - -struct daAlinkHIO_wlSwim_c0 { - static u8 const m[168]; -}; - -struct daAlinkHIO_wlSlide_c0 { - static u8 const m[124]; -}; - -struct daAlinkHIO_wlSideStep_c0 { - static u8 const m[104]; -}; - -struct daAlinkHIO_wlRope_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_wlPush_c0 { - static u8 const m[20]; -}; - -struct daAlinkHIO_wlPoint_c0 { - static u8 const m[124]; -}; - -struct daAlinkHIO_wlMove_c0 { - static u8 const m[256]; -}; - -struct daAlinkHIO_wlMoveNoP_c0 { - static u8 const m[72]; -}; - -struct daAlinkHIO_wlLight_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_wlLie_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_wlHowl_c0 { - static u8 const m[96]; -}; - -struct daAlinkHIO_wlGrab_c0 { - static u8 const m[100]; -}; - -struct daAlinkHIO_wlDamage_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_wlDamNormal_c0 { - static u8 const m[96]; -}; - -struct daAlinkHIO_wlDamLarge_c0 { - static u8 const m[108]; -}; - -struct daAlinkHIO_wlDamHuge_c0 { - static u8 const m[108]; -}; - -struct daAlinkHIO_wlDamFall_c0 { - static u8 const m[64]; -}; - -struct daAlinkHIO_wlDamCaught_c0 { - static u8 const m[16]; -}; - -struct daAlinkHIO_wlChain_c0 { - static u8 const m[92]; -}; - -struct daAlinkHIO_wlBall_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_wlBackJump_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_wlAttack_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_wlAtnMove_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_wlAtWaTl_c0 { - static u8 const m[60]; -}; - -struct daAlinkHIO_wlAtWaSc_c0 { - static u8 const m[60]; -}; - -struct daAlinkHIO_wlAtWaLr_c0 { - static u8 const m[60]; -}; - -struct daAlinkHIO_wlAtRoll_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_wlAtNjump_c0 { - static u8 const m[60]; -}; - -struct daAlinkHIO_wlAtLock_c0 { - static u8 const m[84]; -}; - -struct daAlinkHIO_wlAtLand_c0 { - static u8 const m[64]; -}; - struct daAlinkHIO_wlAtDown_c0 { static u8 const m[156]; }; @@ -237,10 +95,6 @@ struct daAlinkHIO_wlAtBite_c0 { static u8 const m[92]; }; -struct daAlinkHIO_wallMove_c0 { - static u8 const m[20]; -}; - struct daAlinkHIO_wallHang_c0 { static u8 const m[28]; }; @@ -253,30 +107,10 @@ struct daAlinkHIO_wallCatch_c0 { static u8 const m[84]; }; -struct daAlinkHIO_turnMove_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_swim_c0 { - static u8 const m[252]; -}; - -struct daAlinkHIO_spinner_c0 { - static u8 const m[64]; -}; - struct daAlinkHIO_smallJump_c0 { static u8 const m[72]; }; -struct daAlinkHIO_slide_c0 { - static u8 const m[120]; -}; - -struct daAlinkHIO_sideStep_c0 { - static u8 const m[104]; -}; - struct daAlinkHIO_roofHang_c0 { static u8 const m[76]; }; @@ -293,26 +127,10 @@ struct daAlinkHIO_noActAtnMove_c0 { static u8 const m[84]; }; -struct daAlinkHIO_move_c0 { - static u8 const m[88]; -}; - -struct daAlinkHIO_magneBoots_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_ladder_c0 { - static u8 const m[112]; -}; - struct daAlinkHIO_kandelaar_c0 { static u8 const m[80]; }; -struct daAlinkHIO_item_c0 { - static u8 const m[60]; -}; - struct daAlinkHIO_ironBall_c0 { static u8 const m[140]; }; @@ -321,14 +139,6 @@ struct daAlinkHIO_huLight_c0 { static u8 const m[28]; }; -struct daAlinkHIO_horse_c0 { - static u8 const m[108]; -}; - -struct daAlinkHIO_hookshot_c0 { - static u8 const m[112]; -}; - struct daAlinkHIO_hoCutRB_c0 { static u8 const m[32]; }; @@ -365,10 +175,6 @@ struct daAlinkHIO_gAtKick_c0 { static u8 const m[36]; }; -struct daAlinkHIO_frontRoll_c0 { - static u8 const m[112]; -}; - struct daAlinkHIO_fmChain_c0 { static u8 const m[40]; }; @@ -405,10 +211,6 @@ struct daAlinkHIO_damCaught_c0 { static u8 const m[36]; }; -struct daAlinkHIO_cut_c0 { - static u8 const m[156]; -}; - struct daAlinkHIO_cut_c { /* 80140BD4 */ ~daAlinkHIO_cut_c(); }; @@ -437,14 +239,6 @@ struct daAlinkHIO_cutNmL_c0 { static u8 const m[32]; }; -struct daAlinkHIO_cutLargeJump_c0 { - static u8 const m[116]; -}; - -struct daAlinkHIO_cutJump_c0 { - static u8 const m[68]; -}; - struct daAlinkHIO_cutHead_c0 { static u8 const m[96]; }; @@ -497,10 +291,6 @@ struct daAlinkHIO_crouch_c0 { static u8 const m[76]; }; -struct daAlinkHIO_copyRod_c0 { - static u8 const m[56]; -}; - struct daAlinkHIO_canoe_c0 { static u8 const m[72]; }; @@ -510,60 +300,6 @@ struct daAlinkHIO_c { /* 80140C10 */ ~daAlinkHIO_c(); }; -struct daAlinkHIO_bow_c0 { - static u8 const m[112]; -}; - -struct daAlinkHIO_bottle_c0 { - static u8 const m[180]; -}; - -struct daAlinkHIO_boom_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_bomb_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_board_c0 { - static u8 const m[156]; -}; - -struct daAlinkHIO_backJump_c0 { - static u8 const m[56]; -}; - -struct daAlinkHIO_atnMove_c0 { - static u8 const m[84]; -}; - -struct dPa_control_c { - struct level_c { - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B918 */ void getEmitter(u32); - }; - - /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); - /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*, - cXyz const*, s8); - /* 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); - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 8004CF90 */ void getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*); - /* 8004D6A4 */ void setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, - csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8, - cXyz const*); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); - - static u8 mWaterBubblePcallBack[4]; - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - struct dPaPoF_c { /* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, cXyz const*, cXyz const*, cXyz const*, cXyz const*, @@ -608,16 +344,6 @@ struct JAISeq { /* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr*); }; -struct J3DMaterialAnm { - /* 800A4820 */ ~J3DMaterialAnm(); - /* 8032C320 */ void initialize(); - /* 8032C3C4 */ void calc(J3DMaterial*) const; -}; - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; - // // Forward References: // @@ -3624,6 +3350,14 @@ inline Z2CreatureLink* Z2GetLink() { return Z2CreatureLink::mLinkPtr; } +inline u16 i_dComIfGs_getLife() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); +} + +inline BOOL i_dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); +} + /* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text getE3Zhint__9daAlink_cFv */ bool daAlink_c::getE3Zhint() { return false; @@ -3688,7 +3422,7 @@ static asm void daAlink_coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1 /* ############################################################################################## */ /* 80450FC0-80450FC4 0004C0 0004+00 1/1 0/0 0/0 .sbss it$36766 */ -static u8 it[4]; +static int it; /* 80450FC4-80450FC8 -00001 0004+00 1/1 0/0 0/0 .sbss None */ /* 80450FC4 0001+00 data_80450FC4 None */ @@ -3699,8 +3433,10 @@ static u8 struct_80450FC4[4]; /* 80450FC8-80450FCC -00001 0004+00 5/5 0/0 0/0 .sbss None */ /* 80450FC8 0001+00 data_80450FC8 None */ +static bool struct_80450FC8; // sEyeMoveFlg + /* 80450FC9 0003+00 data_80450FC9 None */ -static u8 struct_80450FC8[4]; +static u8 sMorfFrame; /* 80452C98-80452C9C 001298 0004+00 102/102 0/0 0/0 .sdata2 @5943 */ SECTION_SDATA2 static f32 lit_5943 = 0.5f; @@ -3738,14 +3474,16 @@ SECTION_SDATA2 static u8 lit_6108[4] = { }; /* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text init__16daAlink_matAnm_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_matAnm_c::init() { - nofralloc -#include "asm/d/a/d_a_alink/init__16daAlink_matAnm_cFv.s" +void daAlink_matAnm_c::init() { + f32 tmp_0 = FLOAT_LABEL(lit_6108); + field_0xf4 = tmp_0; + field_0xf8 = tmp_0; + mNowOffsetX = tmp_0; + mNowOffsetY = tmp_0; + struct_80450FC8 = false; // sEyeMoveFlg + sMorfFrame = 0; + mSetFlag = 0; } -#pragma pop /* 8009D90C-8009DA60 09824C 0154+00 1/0 0/0 0/0 .text calc__16daAlink_matAnm_cCFP11J3DMaterial */ #pragma push @@ -3757,21 +3495,63 @@ asm void daAlink_matAnm_c::calc(J3DMaterial* param_0) const { } #pragma pop +/* void daAlink_matAnm_c::calc(J3DMaterial* param_0) const { + J3DMaterialAnm::calc(param_0); + + if (!daAlink_getAlinkActorClass()->checkStatusWindowDraw()) { + for (u32 i = 0; i < 8; i++) { + if (getTexMtxAnm(i).getAnmFlag()) { + J3DTexMtxInfo* info = ¶m_0->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo(); + if (sMorfFrame != 0) { + if (mSetFlag == 0) { + f32 tmp = 1.0f / sMorfFrame; + info->field_0x10.field_0xc = field_0xf4 * (1.0f - tmp) + +info->field_0x10.field_0xc * tmp; info->field_0x10.field_0x10 = field_0xf8 * (1.0f - tmp) + +info->field_0x10.field_0xc * tmp; + //mSetFlag = 1; + } else { + info->field_0x10.field_0xc = field_0xf4; + info->field_0x10.field_0x10 = field_0xf8; + } + } + + if (struct_80450FC8) { + info->field_0x10.field_0xc = mNowOffsetX; + info->field_0x10.field_0x10 = mNowOffsetY; + } + + + + } + } + } +} */ + bool daAlink_c::checkStageName(const char* stage) { return strcmp(dComIfGp_getStartStageName(), stage) == 0; } /* 8009DA98-8009DB64 0983D8 00CC+00 1/1 0/0 0/0 .text * tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, - dCcD_GObjInf* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf.s" +void daAlink_c::tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, dCcD_GObjInf* param_2) { + if (param_2->ChkAtType(0x40000)) { + field_0x369c = *param_2->GetAtVecP(); + for (int i = 0; i < 3; i++) { + if (param_1 == &field_0x850[i]) { + field_0x2fb8 |= (1 << i); + field_0x36b4 = param_0->mCurrent.mPosition; + return; + } + } + } else { + for (int i = 0; i < 3; i++) { + if (param_1 == &field_0x850[i]) { + field_0x2fb8 &= ~(1 << i); + return; + } + } + } } -#pragma pop /* 8009DB64-8009DC6C 0984A4 0108+00 1/1 0/0 0/0 .text * coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf */ @@ -3786,15 +3566,28 @@ asm void daAlink_c::coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1) { /* 8009DC6C-8009DD90 0985AC 0124+00 5/5 0/0 0/0 .text * setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMatrixWorldAxisRot(f32 (*param_0)[4], s16 param_1, s16 param_2, s16 param_3, - int param_4, cXyz const* param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz.s" +void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s16 param_3, + int param_4, cXyz const* param_5) { + cXyz tmp; + mDoMtx_multVecZero(param_0, &tmp); + if (param_5 != NULL) { + mDoMtx_stack_c::transS(*param_5); + } else { + mDoMtx_stack_c::transS(tmp); + } + + concatMagneBootMtx(); + mDoMtx_stack_c::YrotM(mCollisionRot.y); + mDoMtx_stack_c::ZXYrotM(param_1, param_2, param_3); + mDoMtx_stack_c::YrotM(-mCollisionRot.y); + concatMagneBootInvMtx(); + mDoMtx_stack_c::transM(-tmp.x, -tmp.y, -tmp.z); + PSMTXConcat(*mDoMtx_stack_c::get(), param_0, *mDoMtx_stack_c::get()); + PSMTXCopy(*mDoMtx_stack_c::get(), param_0); + if (param_4 != 0) { + PSMTXCopy(*mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + } } -#pragma pop /* 8009DD90-8009E7B8 0986D0 0A28+00 2/2 0/0 0/0 .text jointControll__9daAlink_cFi */ #pragma push @@ -3827,24 +3620,43 @@ asm void daAlink_c::changeBlendRate(int param_0) { #pragma pop /* 8009EB18-8009EB58 099458 0040+00 1/1 0/0 0/0 .text resetRootMtx__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetRootMtx() { - nofralloc -#include "asm/d/a/d_a_alink/resetRootMtx__9daAlink_cFv.s" +void daAlink_c::resetRootMtx() { + PSMTXCopy(mRootMtx, J3DSys::mCurrentMtx); + field_0x2f90 = 0; } -#pragma pop /* 8009EB58-8009EC28 099498 00D0+00 1/1 0/0 0/0 .text modelCallBack__9daAlink_cFi */ +#ifdef NONMATCHING +bool daAlink_c::modelCallBack(int param_0) { + jointControll(param_0); + if (param_0 == 0) { + setUpperFront(); + } else if (param_0 == 0x1A) { + bool check = false; + if (mSpecialMode == 0 || mSpecialMode < 0x26) { + check = true; + } + if (!check) { + setFootMatrix(); + } + setArmMatrix(); + } + if (field_0x2fb6 != 0 && + (param_0 == 0 || param_0 == 10 || param_0 - 4 < 1 || param_0 == 13 || param_0 == 15)) { + changeBlendRate(param_0); + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::modelCallBack(int param_0) { +asm bool daAlink_c::modelCallBack(int param_0) { nofralloc #include "asm/d/a/d_a_alink/modelCallBack__9daAlink_cFi.s" } #pragma pop +#endif /* 8009EC28-8009ECA0 099568 0078+00 1/1 0/0 0/0 .text daAlink_modelCallBack__FP8J3DJointi */ @@ -5062,26 +4874,30 @@ daAlinkHIO_basic_c1 const daAlinkHIO_basic_c0::m = { 60.0f, 85.0f, 300.0f, 200.0f, 20.0f, 30.0f, 23.0f, 41.0f, 0.7f, 0.5f, 0.7f, 400.0f, 5000.0f}; /* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata m__18daAlinkHIO_move_c0 */ -SECTION_RODATA u8 const daAlinkHIO_move_c0::m[88] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x40, 0x40, 0x00, 0x00, 0x40, 0x80, 0x00, - 0x00, 0x41, 0x40, 0x00, 0x00, 0x11, 0x94, 0x00, 0x64, 0x00, 0x05, 0x00, 0x00, 0x3F, 0x80, - 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, - 0x4C, 0xCC, 0xCD, 0x41, 0xB8, 0x00, 0x00, 0x3F, 0xF3, 0x33, 0x33, 0x40, 0x0C, 0xCC, 0xCD, - 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x7D, 0x70, - 0xA4, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x3E, 0xCC, 0xCC, 0xCD, -}; -COMPILER_STRIP_GATE(0x8038D6BC, &daAlinkHIO_move_c0::m); +daAlinkHIO_move_c1 const daAlinkHIO_move_c0::m = {{11, 0.7f, 3.0f, 4.0f, 12.0f}, + 4500, + 100, + 5, + 1.0f, + 0.75f, + 1.5f, + 0.4f, + 0.8f, + 23.0f, + 1.9f, + 2.2f, + 0.6f, + 1.1f, + 1.5f, + 0.99f, + 3.0f, + 0.7f, + 0.4f}; /* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata m__21daAlinkHIO_atnMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_atnMove_c0::m[84] = { - 0x0B, 0xB8, 0x07, 0xD0, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x8C, - 0xCC, 0xCD, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, - 0x41, 0x50, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x3F, 0x33, - 0x33, 0x33, 0x3F, 0xB3, 0x33, 0x33, 0x3E, 0x80, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, - 0x41, 0x70, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0x00, - 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, -}; -COMPILER_STRIP_GATE(0x8038D714, &daAlinkHIO_atnMove_c0::m); +daAlinkHIO_atnMove_c1 const daAlinkHIO_atnMove_c0::m = { + 3000, 2000, 6, 1.2f, 1.1f, 1.5f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, + 0.7f, 1.4f, 0.25f, 0.7f, 15.0f, 2.5f, 8.0f, 0.5f, 0.4f, 1.0f, 1.3f}; /* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata m__26daAlinkHIO_noActAtnMove_c0 */ SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = { @@ -5095,50 +4911,63 @@ SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = { COMPILER_STRIP_GATE(0x8038D768, &daAlinkHIO_noActAtnMove_c0::m); /* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */ -SECTION_RODATA u8 const daAlinkHIO_frontRoll_c0::m[112] = { - 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xB0, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x27, 0x10, 0x00, 0x05, - 0x03, 0xE8, 0x00, 0x64, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0xC8, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x41, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x41, 0x98, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, +daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = { + {29, 1.1f, 0.0f, 3.0f, 22.0f}, + {29, 0.8f, 3.0f, 2.0f, 25.0f}, + {33, 1.2f, 0.0f, 1.0f, 25.0f}, + 10000, + 5, + 1000, + 100, + 3.0f, + 1.3f, + 25.0f, + 10.0f, + 3.0f, + 15.0f, + 10.0f, + 12.0f, + 9.0f, + 19.0f, + 60.0f, }; -COMPILER_STRIP_GATE(0x8038D7BC, &daAlinkHIO_frontRoll_c0::m); /* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_backJump_c0::m[56] = { - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xC0, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = { + {9, 0.7f, 0.0f, 2.0f, 12.0f}, {17, 1.0f, 2.0f, 2.0f, 3.0f}, 24.0f, 10.0f, 100.0f, 10.0f, }; -COMPILER_STRIP_GATE(0x8038D82C, &daAlinkHIO_backJump_c0::m); /* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */ -SECTION_RODATA u8 const daAlinkHIO_sideStep_c0::m[104] = { - 0x00, 0x05, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x3F, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xC8, - 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = { + {5, 1.1f, 1.0f, 3.0f, 6.0f}, + {9, 1.0f, 0.0f, 3.0f, 2.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {9, 1.1f, 0.0f, 3.0f, 4.0f}, + 28.0f, + 22.0f, + 25.0f, + 20.0f, + 100.0f, + 10.0f, }; -COMPILER_STRIP_GATE(0x8038D864, &daAlinkHIO_sideStep_c0::m); /* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */ -SECTION_RODATA u8 const daAlinkHIO_slide_c0::m[120] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, - 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x3F, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, - 0x00, 0x14, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, - 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x41, 0x40, 0x00, 0x00, 0x42, - 0x48, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, +daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = { + {14, 0.75f, 0.0f, 5.0f, 15.0f}, + {6, 0.9f, 0.0f, 3.0f, 7.0f}, + {15, 1.0f, 0.0f, 3.0f, 9.0f}, + {20, 1.0f, 0.0f, 3.0f, 16.0f}, + 40.0f, + 3.0f, + 50.0f, + 27.0f, + 0.2f, + 12.0f, + 50.0f, + 3.0f, + 33.0f, + 1.2f, }; -COMPILER_STRIP_GATE(0x8038D8CC, &daAlinkHIO_slide_c0::m); /* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */ #pragma push @@ -5268,14 +5097,17 @@ SECTION_RODATA u8 const daAlinkHIO_cutFnJU_c0::m[84] = { COMPILER_STRIP_GATE(0x8038DAEC, &daAlinkHIO_cutFnJU_c0::m); /* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutJump_c0::m[68] = { - 0x00, 0x11, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x41, 0xC8, - 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, - 0x41, 0x50, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, +daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = { + {17, 1.1f, 0.0f, 2.0f, 18.0f}, + {29, 1.0f, 2.0f, 0.0f, 9.0f}, + 25.0f, + 27.0f, + 15.0f, + 13.0f, + 13.0f, + 1.0f, + 3.0f, }; -COMPILER_STRIP_GATE(0x8038DB40, &daAlinkHIO_cutJump_c0::m); /* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */ SECTION_RODATA u8 const daAlinkHIO_cutTurn_c0::m[152] = { @@ -5398,32 +5230,53 @@ SECTION_RODATA u8 const daAlinkHIO_cutHead_c0::m[96] = { COMPILER_STRIP_GATE(0x8038DDB8, &daAlinkHIO_cutHead_c0::m); /* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutLargeJump_c0::m[116] = { - 0x00, 0x1D, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3F, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, - 0x00, 0x23, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, - 0x20, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, +daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = { + {29, 1.3f, 0.0f, 3.0f, 30.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {16, 1.0f, 0.0f, 2.0f, 17.0f}, + {35, 1.25f, 0.0f, 0.0f, 22.0f}, + 20.0f, + 33.0f, + 2.0f, + 6.0f, + 13.0f, + 0.0f, + 10.0f, + 250.0f, + 5.0f, }; -COMPILER_STRIP_GATE(0x8038DE18, &daAlinkHIO_cutLargeJump_c0::m); /* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cut_c0::m[156] = { - 0x00, 0x12, 0x00, 0x00, 0xBF, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0xBF, 0x80, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x08, 0x00, 0x0A, 0x00, 0x5A, 0x00, 0x4B, 0x0F, 0xA0, - 0xF0, 0x60, 0x00, 0x1E, 0x41, 0x40, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x42, 0x34, 0x00, 0x00, 0x3F, 0xD3, 0x33, 0x33, - 0x42, 0x82, 0x00, 0x00, 0x3F, 0x9A, 0xE1, 0x48, 0x42, 0x0C, 0x00, 0x00, 0x40, 0x13, 0x33, 0x33, - 0x40, 0x0C, 0xCC, 0xCD, 0x42, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = { + {18, -1.100f, 0.0f, 3.0f, -1.0f}, + {22, 0.9f, 0.0f, 3.0f, 23.0f}, + {45, 1.0f, 0.0f, 3.0f, 15.0f}, + {47, 1.0f, 0.0f, 5.0f, 27.0f}, + 0, + 1, + 15, + 8, + 10, + 90, + 75, + 4000, + -4000, + 30, + 12.0f, + 1.250f, + 1.0f, + 1.0f, + 1.6f, + 45.0f, + 1.65f, + 65.0f, + 1.21f, + 35.0f, + 2.3f, + 2.2f, + 65.0f, + 0.0f, }; -COMPILER_STRIP_GATE(0x8038DE8C, &daAlinkHIO_cut_c0::m); /* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */ SECTION_RODATA u8 const daAlinkHIO_gAtPush_c0::m[36] = { @@ -5445,12 +5298,9 @@ COMPILER_STRIP_GATE(0x8038DF4C, &daAlinkHIO_gAtKick_c0::m); #pragma pop /* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_turnMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_turnMove_c0::m[44] = { - 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xB0, 0x00, 0x00, 0x00, 0x05, 0x09, 0xC4, 0x00, 0xC8, 0x03, 0xE8, 0x3F, 0x8C, - 0xCC, 0xCD, 0x41, 0x98, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, +daAlinkHIO_turnMove_c1 const daAlinkHIO_turnMove_c0::m = { + {27, 1.0f, 0.0f, 3.0f, 22.0f}, 5, 2500, 200, 1000, 1.1f, 19.0f, 1.5f, 25.0f, }; -COMPILER_STRIP_GATE(0x8038DF70, &daAlinkHIO_turnMove_c0::m); /* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata m__19daAlinkHIO_guard_c0 */ SECTION_RODATA u8 const daAlinkHIO_guard_c0::m[128] = { @@ -5476,37 +5326,39 @@ SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = { COMPILER_STRIP_GATE(0x8038E01C, &daAlinkHIO_crouch_c0::m); /* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ -daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = {{6, 1.2f, 3.0f, 6.0f, 7.0f}, - {7, 0.9f, 1.0f, 0.0f, 5.0f}, - {4, 0.75f, 0.0f, 2.0f, 5.0f}, - {10, 0.6f, 0.0f, 2.0f, 11.0f}, - 1, - 9158, - 12287, - 8, - 16384, - 10.0f, - 10.0f, - 1.3f, - 5.0f, - 10.0f, - 3.0f, - -3.4f, - -200.0f, - 26.0f, - 3.0f, - 4.0f, - 10.0f, - 1.0f, - 170.0f, - 100.0f, - 20.0f, - 30.0f, - 20.0f, - -3.4f, - 14.0f, - -5.0f, - 23.0f}; +daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = { + {6, 1.2f, 3.0f, 6.0f, 7.0f}, + {7, 0.9f, 1.0f, 0.0f, 5.0f}, + {4, 0.75f, 0.0f, 2.0f, 5.0f}, + {10, 0.6f, 0.0f, 2.0f, 11.0f}, + 1, + 9158, + 12287, + 8, + 16384, + 10.0f, + 10.0f, + 1.3f, + 5.0f, + 10.0f, + 3.0f, + -3.4f, + -200.0f, + 26.0f, + 3.0f, + 4.0f, + 10.0f, + 1.0f, + 170.0f, + 100.0f, + 20.0f, + 30.0f, + 20.0f, + -3.4f, + 14.0f, + -5.0f, + 23.0f, +}; /* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = { @@ -5538,11 +5390,7 @@ SECTION_RODATA u8 const daAlinkHIO_wallFall_c0::m[40] = { COMPILER_STRIP_GATE(0x8038E1B8, &daAlinkHIO_wallFall_c0::m); /* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wallMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wallMove_c0::m[20] = { - 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x40, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E1E0, &daAlinkHIO_wallMove_c0::m); +daAlinkHIO_wallMove_c1 const daAlinkHIO_wallMove_c0::m = {0.8f, 1.1f, 3.0f, 2.0f, 3.0f}; /* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata m__22daAlinkHIO_wallHang_c0 */ SECTION_RODATA u8 const daAlinkHIO_wallHang_c0::m[28] = { @@ -5658,16 +5506,22 @@ SECTION_RODATA u8 const daAlinkHIO_damage_c0::m[88] = { COMPILER_STRIP_GATE(0x8038E54C, &daAlinkHIO_damage_c0::m); /* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata m__19daAlinkHIO_horse_c0 */ -SECTION_RODATA u8 const daAlinkHIO_horse_c0::m[108] = { - 0x00, 0x12, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x41, 0x98, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x3F, 0xB9, 0x99, 0x9A, - 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x30, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, - 0x00, 0x64, 0x7F, 0xFF, 0x00, 0x1E, 0x00, 0x19, 0x15, 0x7C, 0xCD, 0x38, 0x3F, 0x99, 0x99, 0x9A, - 0x41, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, +daAlinkHIO_horse_c1 const daAlinkHIO_horse_c0::m = { + {18, 1.2f, 0.0f, 5.0f, 19.0f}, + {22, 1.2f, 0.0f, 3.0f, 23.0f}, + {43, 1.45f, 3.0f, 3.0f, 44.0f}, + {18, 1.2f, 0.0f, 3.0f, 23.0f}, + 100, + 32767, + 30, + 25, + 5500, + -13000, + 1.2f, + 8.0f, + 8.0f, + 5.0f, }; -COMPILER_STRIP_GATE(0x8038E5A4, &daAlinkHIO_horse_c0::m); /* 800A07D8-800A0868 09B118 0090+00 2/2 0/0 0/0 .text checkAttentionPosAngle__9daAlink_cFP4cXyz */ #pragma push @@ -5713,36 +5567,50 @@ SECTION_RODATA u8 const daAlinkHIO_canoe_c0::m[72] = { COMPILER_STRIP_GATE(0x8038E610, &daAlinkHIO_canoe_c0::m); /* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata m__17daAlinkHIO_bow_c0 */ -SECTION_RODATA u8 const daAlinkHIO_bow_c0::m[112] = { - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x46, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, 0x44, 0x48, 0x00, 0x00, - 0x46, 0x0C, 0xA0, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, - 0x43, 0x66, 0x00, 0x00, 0x45, 0x5A, 0xC0, 0x00, 0x44, 0x16, 0x00, 0x00, 0x46, 0x0C, 0xA0, 0x00, - 0x44, 0x7A, 0x00, 0x00, 0x45, 0x7A, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, +daAlinkHIO_bow_c1 const daAlinkHIO_bow_c0::m = { + {9, 1.0f, 0.0f, 3.0f, 5.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + 10, + 30, + 70, + 5.0f, + 300.0f, + 5000.0f, + 800.0f, + 9000.0f, + 50.0f, + 200.0f, + 3000.0f, + 230.0f, + 3500.0f, + 600.0f, + 9000.0f, + 1000.0f, + 4000.0f, + 250.0f, + 800.0f, }; -COMPILER_STRIP_GATE(0x8038E658, &daAlinkHIO_bow_c0::m); /* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata m__18daAlinkHIO_boom_c0 */ -SECTION_RODATA u8 const daAlinkHIO_boom_c0::m[76] = { - 0x00, 0x15, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0xB0, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, - 0x45, 0x3B, 0x80, 0x00, 0x45, 0x3B, 0x80, 0x00, 0x42, 0x20, 0x00, 0x00, +daAlinkHIO_boom_c1 const daAlinkHIO_boom_c0::m = { + {21, 0.9f, 3.0f, 2.0f, 22.0f}, + {25, 1.0f, 3.0f, 1.0f, 10.0f}, + 40, + 0, + 1.0f, + 3.0f, + 60.0f, + 60.0f, + 2000.0f, + 3000.0f, + 3000.0f, + 40.0f, }; -COMPILER_STRIP_GATE(0x8038E6C8, &daAlinkHIO_boom_c0::m); /* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata m__18daAlinkHIO_bomb_c0 */ -SECTION_RODATA u8 const daAlinkHIO_bomb_c0::m[76] = { - 0x00, 0xA0, 0x00, 0x32, 0x00, 0x32, 0x00, 0x00, 0xC0, 0x86, 0x66, 0x66, 0xC2, 0xC8, 0x00, 0x00, - 0x3E, 0xB3, 0x33, 0x33, 0x40, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, - 0x43, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x4C, 0xCC, 0xCD, 0xC0, 0xE0, 0x00, 0x00, - 0x41, 0xD0, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E714, &daAlinkHIO_bomb_c0::m); +daAlinkHIO_bomb_c1 const daAlinkHIO_bomb_c0::m = { + 160, 50, 50, -4.2f, -100.0f, 0.350f, 2.0f, 20.0f, 1.3f, 225.0f, + 0.0f, -0.8f, -7.0f, 26.0f, 33.0f, 10.0f, 15.0f, 40.0f, 15.0f, 300.0f}; /* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_huLight_c0 */ #pragma push @@ -5773,14 +5641,23 @@ SECTION_RODATA u8 const daAlinkHIO_fmChain_c0::m[40] = { COMPILER_STRIP_GATE(0x8038E7CC, &daAlinkHIO_fmChain_c0::m); /* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */ -SECTION_RODATA u8 const daAlinkHIO_magneBoots_c0::m[76] = { - 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xB8, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, - 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x40, 0x00, 0x00, 0x3E, 0xE6, 0x66, 0x66, 0x3F, 0x19, 0x99, 0x9A, - 0x42, 0x48, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0x3E, 0x99, 0x99, 0x9A, - 0x3F, 0x33, 0x33, 0x33, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x33, 0x33, 0x33, +daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = { + {29, 1.1f, 0.0f, 3.0f, 23.0f}, + 0.4f, + 1.0f, + 1.8f, + 0.7f, + 0.75f, + 0.45, + 0.6f, + 50.0f, + 10.0f, + 0.35f, + 0.3f, + 0.7f, + 0.8f, + 0.7f, }; -COMPILER_STRIP_GATE(0x8038E7F4, &daAlinkHIO_magneBoots_c0::m); /* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */ SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = { @@ -5791,57 +5668,76 @@ SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = { COMPILER_STRIP_GATE(0x8038E840, &daAlinkHIO_pickUp_c0::m); /* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata m__19daAlinkHIO_board_c0 */ -SECTION_RODATA u8 const daAlinkHIO_board_c0::m[156] = { - 0x00, 0x09, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x00, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, - 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, - 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, - 0x42, 0x8C, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x42, 0x5C, 0x00, 0x00, - 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, - 0x41, 0xC0, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, +daAlinkHIO_board_c1 const daAlinkHIO_board_c0::m = { + {9, 2.5f, 0.0f, 3.0f, 10.0f}, + {14, 0.7f, 0.0f, 8.0f, 15.0f}, + {24, 1.6f, 5.0f, 5.0f, 25.0f}, + {24, 0.8f, 0.0f, 3.0f, 25.0f}, + 70.0f, + 4.0f, + 22.0f, + 35.0f, + 1.0f, + 4.0f, + 1.0f, + 3.0f, + 2.0f, + 30.0f, + 0.9f, + 55.0f, + 4.0f, + 3.0f, + 1.0f, + 20.0f, + 24.0f, + 35.0f, + 50.0f, }; -COMPILER_STRIP_GATE(0x8038E870, &daAlinkHIO_board_c0::m); /* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata m__20daAlinkHIO_bottle_c0 */ -SECTION_RODATA u8 const daAlinkHIO_bottle_c0::m[180] = { - 0x00, 0x38, 0x00, 0x00, 0x3F, 0x93, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x42, 0x64, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x3F, - 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, - 0x00, 0x36, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x3F, - 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x2F, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x42, 0x40, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xAE, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x3F, - 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, +daAlinkHIO_bottle_c1 const daAlinkHIO_bottle_c0::m = { + {56, 1.15f, 0.0f, 3.0f, 57.0f}, {39, 1.2f, 0.0f, 3.0f, 40.0f}, {44, 1.2f, 0.0f, 3.0f, 50.0f}, + {54, 1.1f, 0.0f, 3.0f, 55.0f}, {24, 1.0f, 0.0f, 3.0f, 25.0f}, {12, 0.6f, 1.0f, 3.0f, 10.0f}, + {47, 1.0f, 0.0f, 3.0f, 48.0f}, {86, 1.0f, 0.0f, 3.0f, 87.0f}, {29, 1.2f, 0.0f, 3.0f, 30.0f}, }; -COMPILER_STRIP_GATE(0x8038E90C, &daAlinkHIO_bottle_c0::m); /* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata m__22daAlinkHIO_hookshot_c0 */ -SECTION_RODATA u8 const daAlinkHIO_hookshot_c0::m[112] = { - 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x50, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x43, 0x16, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, - 0x45, 0x3B, 0x80, 0x00, 0x43, 0x16, 0x00, 0x00, 0x43, 0x61, 0x00, 0x00, 0x42, 0xB4, 0x00, 0x00, +daAlinkHIO_hookshot_c1 const daAlinkHIO_hookshot_c0::m = { + {12, 1.0f, 0.0f, 0.0f, 13.0f}, + {39, 1.0f, 0.0f, 1.0f, 11.0f}, + {28, 1.0f, 0.0f, 2.0f, 7.0f}, + 0.0f, + 1.0f, + 3.0f, + 2000.0f, + 100.0f, + 150.0f, + 60.0f, + 5.0f, + 13.0f, + 3000.0f, + 150.0f, + 225.0f, + 90.0f, }; -COMPILER_STRIP_GATE(0x8038E9C0, &daAlinkHIO_hookshot_c0::m); /* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata m__21daAlinkHIO_spinner_c0 */ -SECTION_RODATA u8 const daAlinkHIO_spinner_c0::m[64] = { - 0x00, 0x15, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x50, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x0F, 0x01, 0x68, 0x01, 0x68, 0x00, 0x96, 0x00, 0x00, - 0xC0, 0x6C, 0xCC, 0xCD, 0xC2, 0x48, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x41, 0xD0, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x3C, 0x23, 0xD7, 0x0A, 0x42, 0x70, 0x00, 0x00, +daAlinkHIO_spinner_c1 const daAlinkHIO_spinner_c0::m = { + {21, 0.8f, 0.0f, 3.0f, 13.0f}, + 30, + 15, + 360, + 360, + 150, + -3.7f, + -50.0f, + 0.9f, + 26.0f, + 0.5f, + 0.1f, + 0.01f, + 60.0f, }; -COMPILER_STRIP_GATE(0x8038EA30, &daAlinkHIO_spinner_c0::m); /* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata m__22daAlinkHIO_ironBall_c0 */ SECTION_RODATA u8 const daAlinkHIO_ironBall_c0::m[140] = { @@ -5858,44 +5754,55 @@ SECTION_RODATA u8 const daAlinkHIO_ironBall_c0::m[140] = { COMPILER_STRIP_GATE(0x8038EA70, &daAlinkHIO_ironBall_c0::m); /* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_copyRod_c0 */ -SECTION_RODATA u8 const daAlinkHIO_copyRod_c0::m[56] = { - 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xA0, - 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, +daAlinkHIO_copyRod_c1 const daAlinkHIO_copyRod_c0::m = { + 19, 1.0f, 0.0f, 3.0f, 14.0f, 39, 1.0f, 0.0f, 3.0f, 30.0f, 80.0f, 1500.0f, 100.0f, 2000.0f, }; -COMPILER_STRIP_GATE(0x8038EAFC, &daAlinkHIO_copyRod_c0::m); /* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_zwLight_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_zwLight_c0::m[28] = { - 0x03, 0x03, 0x00, 0x00, 0x00, 0xB6, 0x00, 0xE1, 0x00, 0xF3, 0xFF, 0xA9, 0x3F, 0x80, - 0x00, 0x00, 0x42, 0x8D, 0x81, 0x00, 0x43, 0x03, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, +daAlinkHIO_zwLight_c1 const daAlinkHIO_zwLight_c0::m = { + 771, 0, 182, 225, 243, -87, 1.0f, 70.75195f, 131.83594f, 0.0f, }; COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m); #pragma pop /* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */ -SECTION_RODATA u8 const daAlinkHIO_item_c0::m[60] = { - 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x50, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x0F, 0x27, 0x10, 0xCD, - 0x38, 0x17, 0x70, 0xDC, 0xD8, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0xA6, 0x66, 0x66, +daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = { + {12, 1.0f, 0.0f, 3.0f, 13.0f}, + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + 15, + 10000, + -13000, + 6000, + -9000, + 1.3f, + 1.3f, }; -COMPILER_STRIP_GATE(0x8038EB50, &daAlinkHIO_item_c0::m); /* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */ -SECTION_RODATA u8 const daAlinkHIO_ladder_c0::m[112] = { - 0x00, 0x0D, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x42, 0x40, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0xA0, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x66, 0x66, 0x66, - 0x40, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, - 0x3F, 0x93, 0x33, 0x33, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0xAC, 0xCC, 0xCD, 0x42, 0xA0, 0x00, 0x00, +daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = { + {13, 0.8f, 2.0f, 3.0f, 10.0f}, + {47, 1.25f, 0.0f, 2.0f, 48.0f}, + 0.8f, + 5.0f, + 1.0f, + 0.0f, + 1.0f, + 5.0f, + 1.2f, + 0.0f, + 0.4f, + 0.9f, + 2.0f, + 18.0f, + 40.0f, + 0.8f, + 1.15f, + 0.9f, + 1.35f, + 80.0f, }; -COMPILER_STRIP_GATE(0x8038EB8C, &daAlinkHIO_ladder_c0::m); /* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata m__22daAlinkHIO_roofHang_c0 */ SECTION_RODATA u8 const daAlinkHIO_roofHang_c0::m[76] = { @@ -5928,97 +5835,157 @@ SECTION_RODATA u8 const daAlinkHIO_grab_c0::m[228] = { COMPILER_STRIP_GATE(0x8038EC48, &daAlinkHIO_grab_c0::m); /* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata m__18daAlinkHIO_swim_c0 */ -SECTION_RODATA u8 const daAlinkHIO_swim_c0::m[252] = { - 0x00, 0x19, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0xBF, 0x80, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0x18, 0x00, 0x00, - 0x00, 0x0F, 0x03, 0x20, 0x13, 0x88, 0x00, 0x0F, 0x00, 0xC8, 0x13, 0x88, 0x00, 0x5A, 0x00, 0x32, - 0x43, 0x0C, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, - 0x40, 0xC0, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, - 0x3F, 0x4C, 0xCC, 0xCD, 0x41, 0x70, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x00, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x70, 0x00, 0x00, - 0x42, 0x16, 0x00, 0x00, 0xC2, 0x16, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, - 0xC1, 0xA0, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x3F, 0x66, 0x66, 0x66, 0xBF, 0x33, 0x33, 0x33, 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x50, 0x00, 0x00, - 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, +daAlinkHIO_swim_c1 const daAlinkHIO_swim_c0::m = { + {25, 1.0f, 0.0f, 3.0f, -1.0f}, + {23, 1.0f, 0.0f, 3.0f, 24.0f}, + {12, 2.0f, 0.0f, 10.0f, 24.0f}, + {37, 1.0f, 3.0f, 5.0f, 38.0f}, + 15, + 800, + 5000, + 15, + 200, + 5000, + 90, + 50, + 140.0f, + 50.0f, + 8.0f, + 8.0f, + 6.0f, + 12.0f, + 8.0f, + 5.0f, + 0.5f, + -7.0f, + 6.0f, + 0.2f, + 0.8f, + 15.0f, + 3.5f, + 0.5f, + 1.0f, + 0.5f, + 1.3f, + 0.5f, + 1.3f, + 0.4f, + 0.6f, + 15.0f, + 37.5f, + -37.5f, + 3.0f, + -4.0f, + -20.0f, + 250.0f, + 0.0f, + 10.0f, + 0.9f, + -0.7f, + 0.6f, + 13.0f, + 0.3f, + 0.5f, + 1.3f, }; -COMPILER_STRIP_GATE(0x8038ED2C, &daAlinkHIO_swim_c0::m); /* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata m__20daAlinkHIO_wlMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlMove_c0::m[256] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x70, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, - 0x23, 0x28, 0x00, 0x64, 0x00, 0x05, 0x00, 0x5A, 0x00, 0x32, 0x00, 0x3C, 0x00, 0x32, 0x00, 0x2D, - 0x00, 0x32, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x3F, 0xCC, 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x0C, 0xCC, 0xCD, 0x3F, 0x99, 0x99, 0x9A, - 0x3F, 0xA6, 0x66, 0x66, 0x3D, 0xCC, 0xCC, 0xCD, 0x3E, 0xCC, 0xCC, 0xCD, 0x3E, 0xCC, 0xCC, 0xCD, - 0x3F, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, - 0x3F, 0x59, 0x99, 0x9A, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x20, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, - 0x40, 0xC0, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, - 0x42, 0x04, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x3F, 0x00, 0x00, 0x00, +daAlinkHIO_wlMove_c1 const daAlinkHIO_wlMove_c0::m = { + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {14, 1.0f, 0.0f, 3.0f, 12.0f}, + {8, 1.0f, 0.0f, 1.0f, 20.0f}, + {41, 1.0f, 0.0f, 3.0f, 20.0f}, + 9000, + 100, + 5, + 90, + 50, + 60, + 50, + 45, + 50, + 40.0f, + 4.0f, + 3.0f, + 1.6f, + 1.1f, + 2.2f, + 1.2f, + 1.3f, + 0.1f, + 0.4f, + 0.4f, + 0.5f, + 5.0f, + 5.0f, + 0.3f, + 0.85f, + 0.9f, + 2.5f, + 40.0f, + 5.0f, + 22.0f, + 1.0f, + 5.0f, + 100.0f, + 10.0f, + 45.0f, + 1.3f, + 6.0f, + 65.0f, + 20.0f, + 15.0f, + 33.0f, + 35.0f, + 1.2f, + 3.0f, + 25.0f, + 35.0f, + 1.1f, + 0.5f, }; -COMPILER_STRIP_GATE(0x8038EE28, &daAlinkHIO_wlMove_c0::m); /* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata m__23daAlinkHIO_wlMoveNoP_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlMoveNoP_c0::m[72] = { - 0x23, 0x28, 0x00, 0x64, 0x00, 0x05, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x0C, - 0xCC, 0xCD, 0x3F, 0x8C, 0xCC, 0xCD, 0x3D, 0xCC, 0xCC, 0xCD, 0x3F, 0x19, 0x99, 0x9A, 0x3F, - 0x19, 0x99, 0x9A, 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x59, 0x99, 0x9A, - 0x3F, 0x66, 0x66, 0x66, 0x40, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, +daAlinkHIO_wlMoveNoP_c1 const daAlinkHIO_wlMoveNoP_c0::m = { + 9000, 100, 5, 25.0f, 3.0f, 1.8f, 1.0f, 0.8f, 2.2f, 1.1f, + 0.1f, 0.6f, 0.6f, 5.0f, 0.5f, 0.85f, 0.9f, 2.5f, 30.0f, }; -COMPILER_STRIP_GATE(0x8038EF28, &daAlinkHIO_wlMoveNoP_c0::m); /* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata m__23daAlinkHIO_wlAtnMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtnMove_c0::m[56] = { - 0x23, 0x28, 0x00, 0x64, 0x00, 0x03, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0xE6, - 0x66, 0x66, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0x19, 0x99, 0x9A, 0x41, 0x90, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3E, 0xCC, - 0xCC, 0xCD, 0x41, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, +daAlinkHIO_wlAtnMove_c1 const daAlinkHIO_wlAtnMove_c0::m = { + 9000, 100, 3, 0.8f, 1.8f, 0.2f, 0.6f, 18.0f, 2.0f, 2.0f, 1.7f, 0.4f, 12.0f, 3.0f, 2.0f, }; -COMPILER_STRIP_GATE(0x8038EF70, &daAlinkHIO_wlAtnMove_c0::m); /* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata m__24daAlinkHIO_wlSideStep_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlSideStep_c0::m[104] = { - 0x00, 0x05, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x3F, - 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x00, 0x17, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x41, 0xF0, - 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_wlSideStep_c1 const daAlinkHIO_wlSideStep_c0::m = { + {5, 1.0f, 0.0f, 3.0f, 6.0f}, + {23, 1.0f, 1.0f, 2.0f, 2.0f}, + {4, 0.9f, 0.0f, 3.0f, 5.0f}, + {23, 1.0f, 1.0f, 2.0f, 3.0f}, + 33.0f, + 23.0f, + 30.0f, + 22.0f, + 100.0f, + 10.0f, }; -COMPILER_STRIP_GATE(0x8038EFA8, &daAlinkHIO_wlSideStep_c0::m); /* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata m__24daAlinkHIO_wlBackJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlBackJump_c0::m[56] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0xF0, - 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_wlBackJump_c1 const daAlinkHIO_wlBackJump_c0::m = { + {11, 0.8f, 0.0f, 2.0f, 12.0f}, {28, 1.0f, 0.0f, 3.0f, 1.0f}, 30.0f, 20.0f, 100.0f, 10.0f, }; -COMPILER_STRIP_GATE(0x8038F010, &daAlinkHIO_wlBackJump_c0::m); /* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata m__20daAlinkHIO_wlHowl_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlHowl_c0::m[96] = { - 0x00, 0x31, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x90, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, - 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3F, 0x33, 0x33, 0x33, +daAlinkHIO_wlHowl_c1 const daAlinkHIO_wlHowl_c0::m = { + {49, 1.0f, 0.0f, 3.0f, 40.0f}, + {71, 1.0f, 0.0f, 3.0f, 72.0f}, + {14, 1.3f, 1.0f, 3.0f, 11.0f}, + {17, 0.9f, 0.0f, 3.0f, 18.0f}, + 3.0f, + 8.0f, + 1.7f, + 0.7f, }; -COMPILER_STRIP_GATE(0x8038F048, &daAlinkHIO_wlHowl_c0::m); /* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = {{3, 1.2f, 1.0f, 2.0f, 4.0f}, @@ -6044,181 +6011,227 @@ daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = {{3, 1.2f, 1.0f, 2. 100.0f}; /* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlPush_c0::m[20] = { - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, +daAlinkHIO_wlPush_c1 const daAlinkHIO_wlPush_c0::m = { + 1.0f, 3.0f, 1.0f, 3.0f, 0.75f, }; -COMPILER_STRIP_GATE(0x8038F124, &daAlinkHIO_wlPush_c0::m); /* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata m__19daAlinkHIO_wlLie_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlLie_c0::m[76] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0xF4, 0x00, 0x32, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x3F, 0x33, 0x33, 0x33, - 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, +daAlinkHIO_wlLie_c1 const daAlinkHIO_wlLie_c0::m = { + {14, 1.5f, 0.0f, 3.0f, 10.0f}, + {11, 1.5f, 3.0f, 3.0f, 8.0f}, + 5, + 500, + 50, + 3.0f, + 8.0f, + 1.7f, + 0.7f, + 5.0f, + 0.8f, + 3.0f, }; -COMPILER_STRIP_GATE(0x8038F138, &daAlinkHIO_wlLie_c0::m); /* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_wlLight_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlLight_c0::m[28] = { - 0x02, 0x03, 0x00, 0x00, 0x00, 0x78, 0x00, 0x78, 0x00, 0x78, 0xFF, 0xE2, 0x40, 0x40, - 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0xC4, 0x1F, 0x80, 0x00, +daAlinkHIO_wlLight_c1 const daAlinkHIO_wlLight_c0::m = { + 515, 0, 120, 120, 120, -30, 3.0f, 20.0f, 512.0f, -638.0f, }; -COMPILER_STRIP_GATE(0x8038F184, &daAlinkHIO_wlLight_c0::m); #pragma pop /* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata m__24daAlinkHIO_wlWallHang_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlWallHang_c0::m[156] = { - 0x00, 0x0D, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x60, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xF8, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x00, 0x06, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0xE0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, - 0x41, 0x70, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_wlWallHang_c1 const daAlinkHIO_wlWallHang_c0::m = { + {13, 1.2f, 8.0f, 2.0f, 14.0f}, + {39, 1.1f, 0.0f, 3.0f, 31.0f}, + {39, 1.0f, 0.0f, 5.0f, 40.0f}, + {5, 1.0f, 0.0f, 3.0f, 6.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {16, 1.0f, 0.0f, 3.0f, 10.0f}, + 50.0f, + 100.0f, + 200.0f, + 250.0f, + 100.0f, + 17.0f, + 15.0f, + 10.0f, + 10.0f, }; -COMPILER_STRIP_GATE(0x8038F1A0, &daAlinkHIO_wlWallHang_c0::m); /* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata m__25daAlinkHIO_wlDamNormal_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlDamNormal_c0::m[96] = { - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x3C, 0x23, 0xD7, 0x0A, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, +daAlinkHIO_wlDamNormal_c1 const daAlinkHIO_wlDamNormal_c0::m = { + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + 10.0f, + 0.01f, + 1.0f, + 0.25f, }; -COMPILER_STRIP_GATE(0x8038F23C, &daAlinkHIO_wlDamNormal_c0::m); /* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata m__24daAlinkHIO_wlDamLarge_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlDamLarge_c0::m[108] = { - 0x00, 0x31, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, - 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, - 0x05, 0x14, 0x00, 0x00, 0xC0, 0xA6, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x41, 0x70, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, +daAlinkHIO_wlDamLarge_c1 const daAlinkHIO_wlDamLarge_c0::m = { + {49, 1.0f, 0.0f, 3.0f, 40.0f}, + {39, 1.0f, 0.0f, 3.0f, 35.0f}, + {34, 1.1f, 0.0f, 3.0f, 32.0f}, + {34, 1.1f, 0.0f, 3.0f, 32.0f}, + 1300, + -5.2f, + 3.0f, + 10.0f, + 15.0f, + 15.0f, + 0.5f, }; -COMPILER_STRIP_GATE(0x8038F29C, &daAlinkHIO_wlDamLarge_c0::m); /* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata m__23daAlinkHIO_wlDamHuge_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlDamHuge_c0::m[108] = { - 0x00, 0x31, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, - 0x07, 0xD0, 0x00, 0x00, 0xC0, 0xF0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, - 0x42, 0x34, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, +daAlinkHIO_wlDamHuge_c1 const daAlinkHIO_wlDamHuge_c0::m = { + {49, 1.1f, 0.0f, 3.0f, 40.0f}, + {39, 1.1f, 0.0f, 3.0f, 35.0f}, + {34, 1.2f, 0.0f, 3.0f, 30.0f}, + {34, 1.2f, 0.0f, 3.0f, 30.0f}, + 2000, + -7.5f, + 3.0f, + 85.0f, + 45.0f, + 15.0f, + 0.5f, }; -COMPILER_STRIP_GATE(0x8038F308, &daAlinkHIO_wlDamHuge_c0::m); #pragma pop /* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata m__23daAlinkHIO_wlDamFall_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlDamFall_c0::m[64] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x40, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x23, 0x42, 0x20, 0x00, 0x00, - 0x42, 0x70, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, +daAlinkHIO_wlDamFall_c1 const daAlinkHIO_wlDamFall_c0::m = { + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + {17, 0.8f, 0.0f, 0.0f, 12.0f}, + 15, + 35, + 40.0f, + 60.0f, + 3.0f, + 1.0f, + 15.0f, }; -COMPILER_STRIP_GATE(0x8038F374, &daAlinkHIO_wlDamFall_c0::m); /* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata m__25daAlinkHIO_wlDamCaught_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlDamCaught_c0::m[16] = { - 0x01, 0x2C, 0x00, 0x05, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, +daAlinkHIO_wlDamCaught_c1 const daAlinkHIO_wlDamCaught_c0::m = { + 300, 5, 1.2f, 3.0f, 1.5f, }; -COMPILER_STRIP_GATE(0x8038F3B4, &daAlinkHIO_wlDamCaught_c0::m); /* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata m__22daAlinkHIO_wlDamage_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlDamage_c0::m[44] = { - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, +daAlinkHIO_wlDamage_c1 const daAlinkHIO_wlDamage_c0::m = { + {9, 1.1f, 0.0f, 3.0f, 10.0f}, + {9, 1.1f, 0.0f, 3.0f, 7.0f}, + 0.7f, }; -COMPILER_STRIP_GATE(0x8038F3C4, &daAlinkHIO_wlDamage_c0::m); /* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata m__21daAlinkHIO_wlSlide_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlSlide_c0::m[124] = { - 0x00, 0x14, 0x00, 0x00, 0x3F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xC8, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x40, 0x42, 0x0C, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, - 0x42, 0x0C, 0x00, 0x00, 0x40, 0x26, 0x66, 0x66, 0x41, 0x90, 0x00, 0x00, 0x40, 0x06, 0x66, 0x66, - 0x41, 0x20, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x41, 0xF0, 0x00, 0x00, +daAlinkHIO_wlSlide_c1 const daAlinkHIO_wlSlide_c0::m = { + {20, 1.25f, 0.0f, 3.0f, 25.0f}, + {7, 1.0f, 0.0f, 3.0f, 8.0f}, + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {29, 1.0f, 0.0f, 3.0f, 27.0f}, + 512, + 64, + 35.0f, + 3.0f, + 50.0f, + 35.0f, + 2.6f, + 18.0f, + 2.1f, + 10.0f, + 0.7f, + 30.0f, }; -COMPILER_STRIP_GATE(0x8038F3F0, &daAlinkHIO_wlSlide_c0::m); /* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata m__20daAlinkHIO_wlRope_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlRope_c0::m[56] = { - 0x00, 0x10, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x1E, 0x3F, 0x00, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x80, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, +daAlinkHIO_wlRope_c1 const daAlinkHIO_wlRope_c0::m = { + {16, 1.0f, 0.0f, 3.0f, 17.0f}, 90, 30, 0.5f, 1.2f, 3.0f, 15.0f, 1.0f, 3.0f, 3.0f, 0.8f, }; -COMPILER_STRIP_GATE(0x8038F46C, &daAlinkHIO_wlRope_c0::m); /* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaLr_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlAtWaLr_c0::m[60] = { - 0x00, 0x29, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x80, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, - 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x40, - 0xA0, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, +daAlinkHIO_wlAtWaLr_c1 const daAlinkHIO_wlAtWaLr_c0::m = { + {41, 0.9f, 4.0f, 3.0f, 16.0f}, + 5, + 3, + 0.0f, + 10.0f, + 4.0f, + 11.0f, + 18.0f, + 5.0f, + 70.0f, + 70.0f, + 150.0f, }; -COMPILER_STRIP_GATE(0x8038F4A4, &daAlinkHIO_wlAtWaLr_c0::m); #pragma pop /* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaSc_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlAtWaSc_c0::m[60] = { - 0x00, 0x0F, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xAA, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, +daAlinkHIO_wlAtWaSc_c1 const daAlinkHIO_wlAtWaSc_c0::m = { + {15, 0.9f, 0.0f, 3.0f, 15.0f}, + 5, + 5, + 10.0f, + 3.0f, + 5.0f, + 11.0f, + 18.0f, + 0.0f, + 100.0f, + 85.0f, + 150.0f, }; -COMPILER_STRIP_GATE(0x8038F4E0, &daAlinkHIO_wlAtWaSc_c0::m); #pragma pop /* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaTl_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlAtWaTl_c0::m[60] = { - 0x00, 0x2A, 0x00, 0x00, 0x3F, 0x86, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, +daAlinkHIO_wlAtWaTl_c1 const daAlinkHIO_wlAtWaTl_c0::m = { + {42, 1.05f, 3.0f, 3.0f, 28.0f}, + 0, + 3, + 10.0f, + 5.0f, + 10.0f, + 14.0f, + 25.0f, + 0.0f, + 40.0f, + 150.0f, + 100.0f, }; -COMPILER_STRIP_GATE(0x8038F51C, &daAlinkHIO_wlAtWaTl_c0::m); #pragma pop /* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wlAtRoll_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtRoll_c0::m[32] = { - 0x00, 0x28, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xB8, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +daAlinkHIO_wlAtRoll_c1 const daAlinkHIO_wlAtRoll_c0::m = { + {40, 1.0f, 4.0f, 3.0f, 23.0f}, + 250.0f, + 20.0f, + 0.0f, }; -COMPILER_STRIP_GATE(0x8038F558, &daAlinkHIO_wlAtRoll_c0::m); /* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata m__23daAlinkHIO_wlAtNjump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtNjump_c0::m[60] = { - 0x00, 0x06, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0xB8, - 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x42, - 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, +daAlinkHIO_wlAtNjump_c1 const daAlinkHIO_wlAtNjump_c0::m = { + {6, 1.0f, 4.0f, 3.0f, 7.0f}, + 30.0f, + 40.0f, + 23.0f, + 17.0f, + 0.8f, + 2.0f, + 80.0f, + 60.0f, + 120.0f, + 10.0f, }; -COMPILER_STRIP_GATE(0x8038F578, &daAlinkHIO_wlAtNjump_c0::m); /* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata m__23daAlinkHIO_wlAtCjump_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtCjump_c0::m[100] = { @@ -6233,13 +6246,12 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtCjump_c0::m[100] = { COMPILER_STRIP_GATE(0x8038F5B4, &daAlinkHIO_wlAtCjump_c0::m); /* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLand_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtLand_c0::m[64] = { - 0x00, 0x13, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, +daAlinkHIO_wlAtLand_c1 const daAlinkHIO_wlAtLand_c0::m = { + {19, 0.9f, 0.0f, 2.0f, 2.0f}, + {14, 1.0f, 0.0f, 3.0f, 1.0f}, + {19, 1.1f, 0.0f, 2.0f, 1.0f}, + 2.0f, }; -COMPILER_STRIP_GATE(0x8038F618, &daAlinkHIO_wlAtLand_c0::m); /* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata m__22daAlinkHIO_wlAtDown_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtDown_c0::m[156] = { @@ -6257,15 +6269,17 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtDown_c0::m[156] = { COMPILER_STRIP_GATE(0x8038F658, &daAlinkHIO_wlAtDown_c0::m); /* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLock_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtLock_c0::m[84] = { - 0x00, 0x06, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x78, - 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x41, 0xC8, 0x00, 0x00, - 0x42, 0xAA, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, - 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, +daAlinkHIO_wlAtLock_c1 const daAlinkHIO_wlAtLock_c0::m = { + {6, 3.0f, 0.0f, 3.0f, 15.0f}, + {6, 2.0f, 0.0f, 2.0f, 20.0f}, + {120, 100.0f, 550.0f, 25.0f, 85.0f}, + 80.0f, + 60.0f, + 120.0f, + -8.0f, + 700.0f, + 1000.0f, }; -COMPILER_STRIP_GATE(0x8038F6F4, &daAlinkHIO_wlAtLock_c0::m); /* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_wlAtBite_c0 */ SECTION_RODATA u8 const daAlinkHIO_wlAtBite_c0::m[92] = { @@ -6279,84 +6293,95 @@ SECTION_RODATA u8 const daAlinkHIO_wlAtBite_c0::m[92] = { COMPILER_STRIP_GATE(0x8038F748, &daAlinkHIO_wlAtBite_c0::m); /* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata m__22daAlinkHIO_wlAttack_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAttack_c0::m[56] = { - 0x00, 0x3B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x05, 0x42, 0xC8, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x43, 0x66, 0x00, 0x00, 0x41, 0x20, - 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038F7A4, &daAlinkHIO_wlAttack_c0::m); +daAlinkHIO_wlAttack_c1 const daAlinkHIO_wlAttack_c0::m = { + {59, 1.2f, 0.0f, 2.0f, 5.0f}, 15, 5, 100.0f, 10.0f, 5.0f, 230.0f, 10.0f, 12.0f, 35.0f, 30.0f}; /* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_wlPoint_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlPoint_c0::m[124] = { - 0x00, 0x06, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0xE0, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x00, 0x14, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x42, 0x48, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0x42, 0x82, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, +daAlinkHIO_wlPoint_c1 const daAlinkHIO_wlPoint_c0::m = { + {6, 0.9f, 2.0f, 3.0f, 7.0f}, + {7, 1.0f, 0.0f, 3.0f, 8.0f}, + {11, 0.75f, 0.0f, 3.0f, 5.0f}, + {14, 1.0f, 0.0f, 3.0f, 3.0f}, + {20, 1.0f, 3.0f, 5.0f, 50.0f}, + 45.0f, + 65.0f, + 15.0f, + 0.5f, + 0.5f, + 0.2f, }; -COMPILER_STRIP_GATE(0x8038F7DC, &daAlinkHIO_wlPoint_c0::m); /* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata m__21daAlinkHIO_wlChain_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlChain_c0::m[92] = { - 0x00, 0x27, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0xA4, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x40, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x71, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, +daAlinkHIO_wlChain_c1 const daAlinkHIO_wlChain_c0::m = { + {39, 1.0f, 0.0f, 3.0f, 40.0f}, + {81, 1.0f, 0.0f, 3.0f, 82.0f}, + {47, 1.0f, 0.0f, 0.0f, 48.0f}, + 20, + 5, + 1.0f, + 3.0f, + 1.0f, + 3.0f, + 15.1f, + 1.0f, + 5.0f, }; -COMPILER_STRIP_GATE(0x8038F858, &daAlinkHIO_wlChain_c0::m); /* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata m__20daAlinkHIO_wlSwim_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlSwim_c0::m[168] = { - 0x00, 0x19, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0xBF, 0x80, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x05, 0x03, 0xE8, - 0x06, 0x40, 0x00, 0x05, 0x09, 0xC4, 0x04, 0x00, 0x42, 0xB4, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, - 0x41, 0xA0, 0x00, 0x00, 0x3E, 0xB3, 0x33, 0x33, 0xC1, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xB3, 0x33, 0x33, 0x41, 0x20, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0x16, 0x00, 0x00, - 0x41, 0x10, 0x00, 0x00, 0x3E, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, - 0x3F, 0x99, 0x99, 0x9A, 0xC2, 0x16, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, - 0xC0, 0xE0, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, +daAlinkHIO_wlSwim_c1 const daAlinkHIO_wlSwim_c0::m = { + {25, 0.9f, 0.0f, 5.0f, -1.0f}, + {45, 1.0f, 0.0f, 3.0f, 20.0f}, + {28, 1.1f, 0.0f, 1.0f, 32.0f}, + 5, + 1000, + 1600, + 5, + 2500, + 1024, + 90.0f, + 50.0f, + 20.0f, + 0.35f, + -10.0f, + 10.0f, + 1.5f, + 1.4f, + 10.0f, + 3.5f, + 0.5f, + 1.5f, + 5.0f, + 37.5f, + 9.0f, + 0.25f, + 1.0f, + 0.4f, + 1.2f, + -37.5f, + 8.0f, + 0.2f, + -7.0f, + 7.0f, }; -COMPILER_STRIP_GATE(0x8038F8B4, &daAlinkHIO_wlSwim_c0::m); /* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_wlGrab_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlGrab_c0::m[100] = { - 0x00, 0x14, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0xBF, 0xA6, 0x66, 0x66, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x3F, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, - 0x00, 0x0E, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x40, 0x80, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, +daAlinkHIO_wlGrab_c1 const daAlinkHIO_wlGrab_c0::m = { + {20, 1.5f, 0.0f, 3.0f, 15.0f}, {20, -1.3f, 0.0f, 3.0f, 5.0f}, {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {14, -1.0f, 0.0f, 3.0f, -1.0f}, {19, 1.3f, 4.0f, 3.0f, 15.0f}, }; -COMPILER_STRIP_GATE(0x8038F95C, &daAlinkHIO_wlGrab_c0::m); /* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata m__20daAlinkHIO_wlBall_c0 */ #pragma push #pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_wlBall_c0::m[56] = { - 0x00, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x3C, - 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, +daAlinkHIO_wlBall_c1 const daAlinkHIO_wlBall_c0::m = { + {64, 1.0f, 0.0f, 3.0f, 35.0f}, {54, 1.0f, 0.0f, 3.0f, 55.0f}, 60, -5.0f, 60.0f, 20.0f, }; -COMPILER_STRIP_GATE(0x8038F9C0, &daAlinkHIO_wlBall_c0::m); #pragma pop /* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata m__18daAlinkHIO_wolf_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wolf_c0::m[24] = { - 0x32, 0xC8, 0xD8, 0xF0, 0x1F, 0x40, 0x0F, 0xA0, 0xF8, 0x30, 0x1F, 0x40, - 0x00, 0x96, 0x00, 0x05, 0x00, 0x23, 0x00, 0x3C, 0x3F, 0x33, 0x33, 0x33, +daAlinkHIO_wolf_c1 const daAlinkHIO_wolf_c0::m = { + 13000, -10000, 8000, 4000, -2000, 8000, 150, 5, 35, 60, 0.7f, }; -COMPILER_STRIP_GATE(0x8038F9F8, &daAlinkHIO_wolf_c0::m); /* 800A142C-800A1AEC 09BD6C 06C0+00 1/1 0/0 0/0 .text getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs */ @@ -6430,7 +6455,7 @@ asm void daAlink_c::commonLineCheck(cXyz* param_0, cXyz* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getMoveBGActorName(cBgS_PolyInfo& param_0, int param_1) { +asm s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& param_0, int param_1) { nofralloc #include "asm/d/a/d_a_alink/getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi.s" } @@ -6722,619 +6747,500 @@ COMPILER_STRIP_GATE(0x8038FC38, &daAlink_c::m_mainBckFishing); #pragma pop /* 8038FCA8-80391010 01C308 1368+00 3/4 0/0 0/0 .rodata m_anmDataTable__9daAlink_c */ -SECTION_RODATA u8 const daAlink_c::m_anmDataTable[4968] = { - 0x00, 0x25, 0x00, 0x24, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x23, 0x00, 0x22, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x12, 0x00, 0x12, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x21, 0x00, 0x1F, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x1D, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x3B, 0x04, 0x0A, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x2B, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x3E, 0x00, 0x3D, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x2D, - 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x30, 0x00, 0x2F, 0x04, 0x0A, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x28, 0x00, 0x27, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x32, 0x00, 0x31, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x29, - 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x74, 0x02, 0x74, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x20, 0x00, 0x1A, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1A, 0x00, 0x0E, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x0E, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x77, 0x02, 0x77, 0x04, 0x0A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0x00, 0xC5, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x43, 0x02, 0x43, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x59, 0x00, 0x00, 0x02, 0x33, 0x02, 0x33, - 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x34, 0x02, 0x34, 0x04, 0x0A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x33, 0x02, 0x5C, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x34, 0x02, 0x5C, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x6A, 0x02, 0x6A, - 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x56, 0x02, 0x56, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x57, 0x02, 0x57, 0x01, 0x06, 0x00, 0x00, 0x01, 0x5F, 0x00, 0x00, - 0x00, 0xC6, 0x00, 0xC6, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x36, 0x00, 0x36, - 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x48, 0x00, 0x00, 0x00, 0x38, 0x00, 0x38, 0xFE, 0xFE, 0x00, 0x00, - 0x01, 0x48, 0x00, 0x00, 0x00, 0x35, 0x00, 0x35, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x37, 0x00, 0x37, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x34, 0x00, 0x34, - 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x48, 0x00, 0x00, 0x00, 0x33, 0x00, 0x33, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x07, 0x02, 0x07, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x48, 0x00, 0x00, - 0x02, 0x09, 0x02, 0x09, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x08, 0x02, 0x08, - 0x01, 0x06, 0x00, 0x26, 0x01, 0x4F, 0x00, 0x00, 0x02, 0x06, 0x02, 0x06, 0x04, 0x0A, 0x00, 0x00, - 0x01, 0x48, 0x00, 0x00, 0x02, 0x05, 0x02, 0x05, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x2F, 0x02, 0x2F, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x7B, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x7E, 0xFE, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x13, 0x00, 0x13, 0xFE, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x15, 0x00, 0x15, 0xFE, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x7C, - 0xFE, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x17, 0x00, 0x17, 0xFE, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0xFE, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x14, 0x00, 0x14, 0x01, 0x06, 0x00, 0x7D, 0x00, 0xE9, 0x00, 0x00, 0x01, 0xA5, 0x01, 0xA5, - 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x47, 0x00, 0x00, 0x01, 0xA3, 0x01, 0xA3, 0xFE, 0xFE, 0x00, 0x00, - 0x01, 0x47, 0x00, 0x00, 0x01, 0xA4, 0x01, 0xA4, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xB4, 0x01, 0xB4, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xB5, 0x01, 0xB5, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x69, 0x02, 0x69, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xF7, 0x01, 0xF7, 0xFE, 0xFE, 0x00, 0x0A, 0x01, 0x4D, 0x00, 0x00, - 0x01, 0xF6, 0x01, 0xF6, 0xFE, 0xFE, 0x00, 0x04, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xF5, 0x01, 0xF5, - 0xFE, 0xFE, 0x00, 0x04, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xF4, 0x01, 0xF4, 0x00, 0x05, 0x00, 0x0B, - 0x01, 0x4C, 0x00, 0x00, 0x01, 0xF3, 0x01, 0xF3, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0xF2, 0x01, 0xF2, 0x00, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xFE, 0x01, 0xFE, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xFF, 0x01, 0xFF, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xFD, 0x01, 0xFD, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x00, 0xE1, 0x00, 0xE1, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE2, 0x00, 0xE2, - 0x04, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x35, 0x02, 0x35, 0x04, 0x05, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x36, 0x02, 0x36, 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x32, 0x02, 0x32, 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xA2, 0x01, 0xA2, - 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xA0, 0x01, 0xA0, 0x04, 0x05, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0xA1, 0x01, 0xA1, 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x66, 0x02, 0x66, 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x75, 0x02, 0x75, - 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x76, 0x02, 0x76, 0x04, 0x05, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x00, 0xCA, 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0xCB, 0x00, 0xCB, 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x03, 0x0D, 0x02, 0x66, - 0x04, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x00, 0xDD, 0x04, 0x05, 0x00, 0x00, - 0x01, 0x02, 0x00, 0x00, 0x01, 0xB3, 0x01, 0xB3, 0x04, 0x05, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, - 0x00, 0x95, 0x00, 0x95, 0x64, 0x05, 0x00, 0x24, 0x01, 0x10, 0x00, 0x00, 0x02, 0x38, 0x02, 0x38, - 0x04, 0x05, 0x00, 0x37, 0x01, 0x52, 0x00, 0x00, 0x02, 0x39, 0x02, 0x39, 0x04, 0x05, 0x00, 0x38, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0x00, 0xD6, 0x04, 0x0A, 0x00, 0x58, 0x01, 0x2C, 0x00, 0x00, - 0x02, 0x4B, 0x02, 0x4B, 0x04, 0x05, 0x00, 0x25, 0x00, 0x00, 0x00, 0x00, 0x02, 0x65, 0x02, 0x65, - 0x04, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x30, 0x02, 0x30, 0x04, 0x05, 0x00, 0x6D, - 0x01, 0x50, 0x00, 0x00, 0x02, 0x31, 0x02, 0x31, 0x04, 0x05, 0x00, 0x6D, 0x01, 0x50, 0x00, 0x00, - 0x01, 0x75, 0x01, 0x75, 0x04, 0x05, 0x00, 0x6E, 0x01, 0x41, 0x00, 0x00, 0x01, 0x76, 0x01, 0x76, - 0x04, 0x05, 0x00, 0x6E, 0x01, 0x41, 0x00, 0x00, 0x02, 0x4C, 0x02, 0x4C, 0x04, 0x05, 0x00, 0x72, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x4D, 0x02, 0x4D, 0x04, 0x05, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x02, 0x00, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x01, 0x02, 0x01, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE3, 0x00, 0xE3, 0x04, 0x0A, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE4, 0x00, 0xE4, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x70, 0x02, 0x70, 0xFE, 0xFE, 0x00, 0x10, 0x01, 0x65, 0x00, 0x00, 0x02, 0x6F, 0x02, 0x6F, - 0x04, 0x05, 0x00, 0x11, 0x01, 0x64, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x7F, 0x64, 0x06, 0x00, 0x2E, - 0x01, 0x03, 0x00, 0x00, 0x00, 0x99, 0x00, 0x99, 0x00, 0x06, 0x00, 0x2F, 0x01, 0x13, 0x00, 0x00, - 0x00, 0x9A, 0x00, 0x9A, 0x00, 0x06, 0x00, 0x30, 0x01, 0x14, 0x00, 0x00, 0x00, 0x8F, 0x00, 0x8F, - 0x64, 0x06, 0x00, 0x31, 0x01, 0x0B, 0x00, 0x00, 0x00, 0x90, 0x00, 0x90, 0x64, 0x06, 0x00, 0x31, - 0x01, 0x0B, 0x00, 0x00, 0x00, 0x84, 0x00, 0x84, 0x64, 0x06, 0x00, 0x32, 0x01, 0x06, 0x00, 0x00, - 0x00, 0x85, 0x00, 0x85, 0x64, 0x06, 0x00, 0x33, 0x01, 0x07, 0x00, 0x00, 0x00, 0x86, 0x00, 0x86, - 0x64, 0x05, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x8A, 0x00, 0x05, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0x89, 0x00, 0x89, 0x64, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x00, 0x8B, 0x00, 0x8B, 0x64, 0x05, 0x00, 0x34, 0x01, 0x08, 0x00, 0x00, 0x00, 0x88, 0x00, 0x88, - 0x00, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x87, 0x00, 0x87, 0x64, 0x05, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0x9B, 0x00, 0x9B, 0x00, 0x06, 0x00, 0x59, 0x01, 0x15, 0x00, 0x00, - 0x00, 0x9C, 0x00, 0x9C, 0x00, 0x06, 0x00, 0x59, 0x01, 0x15, 0x00, 0x00, 0x00, 0x98, 0x00, 0x98, - 0x64, 0x06, 0x00, 0x3C, 0x01, 0x12, 0x00, 0x00, 0x00, 0x97, 0x00, 0x97, 0x64, 0x06, 0x00, 0x3D, - 0x01, 0x11, 0x00, 0x00, 0x00, 0x9F, 0x00, 0x9F, 0x64, 0x06, 0x00, 0x3A, 0x01, 0x18, 0x00, 0x00, - 0x00, 0x9E, 0x00, 0x9E, 0x64, 0x06, 0x00, 0x3B, 0x01, 0x17, 0x00, 0x00, 0x00, 0xA4, 0x00, 0xA4, - 0x00, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0xA5, 0x00, 0xA5, 0x64, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0xA6, 0x00, 0xA6, 0x64, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0xAA, 0x00, 0xAA, 0x00, 0x05, 0x00, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0xA7, 0x00, 0xA7, - 0x00, 0x05, 0x00, 0x5A, 0x01, 0x1D, 0x00, 0x00, 0x00, 0xA8, 0x00, 0xA8, 0x00, 0x05, 0x00, 0x00, - 0x01, 0x1E, 0x00, 0x00, 0x00, 0xA9, 0x00, 0xA9, 0x64, 0x05, 0x00, 0x12, 0x01, 0x1F, 0x00, 0x00, - 0x00, 0x8E, 0x00, 0x8E, 0x00, 0x06, 0x00, 0x7F, 0x01, 0x0A, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x8C, - 0x00, 0x06, 0x00, 0x80, 0x01, 0x09, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x8D, 0x00, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0xAE, 0x00, 0xAE, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, - 0x00, 0xAC, 0x00, 0xAC, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, 0x00, 0xBD, 0x00, 0xBD, - 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, 0x00, 0xBE, 0x00, 0xBE, 0x01, 0x06, 0x00, 0x27, - 0x00, 0xEA, 0x00, 0x00, 0x00, 0xB2, 0x00, 0xB2, 0xFE, 0xFE, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, - 0x00, 0xAF, 0x00, 0xAF, 0xFE, 0xFE, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, 0x00, 0xB4, 0x00, 0xB4, - 0xFE, 0xFE, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, 0x00, 0xB6, 0x00, 0xB6, 0xFE, 0xFE, 0x00, 0x28, - 0x00, 0xF8, 0x00, 0x00, 0x00, 0xB3, 0x00, 0xB3, 0xFE, 0xFE, 0x00, 0x2A, 0x01, 0x24, 0x00, 0x00, - 0x00, 0xB0, 0x00, 0xB0, 0xFE, 0xFE, 0x00, 0x2B, 0x01, 0x22, 0x00, 0x00, 0x00, 0xB5, 0x00, 0xB5, - 0xFE, 0xFE, 0x00, 0x2C, 0x01, 0x25, 0x00, 0x00, 0x00, 0xB7, 0x00, 0xB7, 0xFE, 0xFE, 0x00, 0x2C, - 0x01, 0x25, 0x00, 0x00, 0x00, 0xAB, 0x00, 0xAB, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, - 0x01, 0xAF, 0x01, 0xAF, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, 0x01, 0xB0, 0x01, 0xB0, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0x44, 0x01, 0x44, 0x00, 0x06, 0x00, 0x06, - 0x01, 0x31, 0x00, 0x00, 0x01, 0x45, 0x01, 0x45, 0x00, 0x0A, 0x00, 0x07, 0x01, 0x32, 0x00, 0x00, - 0x02, 0x37, 0x02, 0x37, 0x04, 0x0A, 0x00, 0x1C, 0x01, 0x51, 0x00, 0x00, 0x02, 0x4F, 0x02, 0x4F, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x50, 0x02, 0x50, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x51, 0x02, 0x51, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x52, 0x02, 0x52, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0x74, 0x01, 0x74, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0x7A, 0x01, 0x7A, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0x78, 0x01, 0x78, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0x79, 0x01, 0x79, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xAE, 0x01, 0xAE, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xAC, 0x01, 0xAC, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xAD, 0x01, 0xAD, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xA9, 0x01, 0xA9, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xA7, 0x01, 0xA7, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xA8, 0x01, 0xA8, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xAB, 0x01, 0xAB, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xAA, 0x01, 0xAA, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x6A, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x70, 0x00, 0x70, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x6C, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x6D, 0x00, 0x6D, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x6E, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x6F, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x6B, 0x03, 0x09, 0x00, 0x5C, 0x00, 0xFE, 0x00, 0x00, - 0x02, 0x0F, 0x02, 0x0F, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x10, 0x02, 0x10, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x0A, 0x02, 0x0A, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x0C, 0x02, 0x0C, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x0D, 0x02, 0x0D, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x0E, 0x02, 0x0E, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x0B, 0x02, 0x0B, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x6E, 0x01, 0x6E, 0xFE, 0xFE, 0x00, 0x18, 0x01, 0x39, 0x00, 0x00, - 0x01, 0x71, 0x01, 0x71, 0xFE, 0xFE, 0x00, 0x19, 0x01, 0x3C, 0x00, 0x00, 0x01, 0x70, 0x01, 0x70, - 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x3B, 0x00, 0x00, 0x01, 0x7B, 0x01, 0x7B, 0xFE, 0xFE, 0x00, 0x1A, - 0x01, 0x42, 0x00, 0x00, 0x01, 0x6D, 0x01, 0x6D, 0xFE, 0xFE, 0x00, 0x1B, 0x01, 0x38, 0x00, 0x00, - 0x01, 0x6F, 0x01, 0x6F, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x3A, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x5F, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x5C, 0x02, 0x5C, 0x04, 0x0A, 0x00, 0x01, - 0x01, 0x60, 0x00, 0x00, 0x02, 0x54, 0x02, 0x54, 0x04, 0x0A, 0x00, 0x01, 0x01, 0x5D, 0x00, 0x00, - 0x02, 0x49, 0x02, 0x49, 0x04, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x6C, 0x02, 0x6C, - 0x01, 0x06, 0x00, 0x0C, 0x01, 0x63, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x9D, 0x01, 0x06, 0x00, 0x0D, - 0x01, 0x16, 0x00, 0x00, 0x00, 0x52, 0x00, 0x52, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x02, 0x78, 0x02, 0x78, 0x01, 0x06, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x2D, 0x02, 0x2D, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x2B, 0x02, 0x2B, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x2E, 0x02, 0x2E, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x2C, 0x02, 0x2C, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x3E, 0x02, 0x3E, - 0xFE, 0xFE, 0x00, 0x15, 0x01, 0x56, 0x00, 0x00, 0x02, 0x42, 0x02, 0x42, 0xFE, 0xFE, 0x00, 0x16, - 0x01, 0x58, 0x00, 0x00, 0x00, 0x39, 0x00, 0x39, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x3A, 0x00, 0x3A, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x11, 0x00, 0x11, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x3A, 0x02, 0x3A, 0xFE, 0xFE, 0x00, 0x03, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x3D, 0x02, 0x3D, 0xFE, 0xFE, 0x00, 0x17, 0x01, 0x55, 0x00, 0x00, - 0x02, 0x41, 0x02, 0x41, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x40, 0x02, 0x40, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0xC1, 0x00, 0xC1, 0x01, 0x06, 0x00, 0x27, - 0x00, 0xEA, 0x00, 0x00, 0x00, 0xC0, 0x00, 0xC0, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, - 0x00, 0xC2, 0x00, 0xC2, 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, 0x00, 0xC3, 0x00, 0xC3, - 0x01, 0x06, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, 0x00, 0xC4, 0x00, 0xC4, 0x01, 0x06, 0x00, 0x27, - 0x00, 0xEA, 0x00, 0x00, 0x00, 0x57, 0x00, 0x57, 0xFE, 0xFE, 0x00, 0x4D, 0x00, 0xF7, 0x00, 0x00, - 0x00, 0x56, 0x00, 0x56, 0xFE, 0xFE, 0x00, 0x4E, 0x00, 0xF6, 0x00, 0x00, 0x00, 0x55, 0x00, 0x55, - 0xFE, 0xFE, 0x00, 0x4F, 0x00, 0xF5, 0x00, 0x00, 0x01, 0x69, 0x01, 0x69, 0xFE, 0xFE, 0x00, 0x00, - 0x01, 0x34, 0x00, 0x00, 0x01, 0x6A, 0x01, 0x6A, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, - 0x01, 0x6A, 0x02, 0x6A, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x33, 0x00, 0x00, 0x01, 0x6A, 0x01, 0x7D, - 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x33, 0x00, 0x00, 0x02, 0x4A, 0x02, 0x4A, 0x04, 0x0A, 0x00, 0x29, - 0x01, 0x5A, 0x00, 0x00, 0x02, 0x53, 0x02, 0x53, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x5C, 0x00, 0x00, - 0x02, 0x6B, 0x02, 0x6B, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x5B, 0x02, 0x5A, - 0xFE, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x5B, 0x02, 0x5B, 0x00, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x6B, 0x02, 0x15, 0xFE, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x6B, 0x02, 0x16, 0x00, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x6B, 0x02, 0x13, - 0xFE, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x6B, 0x02, 0x14, 0x00, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x6B, 0x00, 0x67, 0xFE, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x00, 0x5A, 0x00, 0x5A, 0x02, 0xFE, 0x00, 0x00, 0x01, 0x30, 0x00, 0x00, 0x00, 0x5B, 0x00, 0x5B, - 0x02, 0xFE, 0x00, 0x00, 0x01, 0x30, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x5C, 0x02, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x5E, 0x02, 0x05, 0x00, 0x78, 0x00, 0xF9, 0x00, 0x00, - 0x01, 0xEB, 0x01, 0xEB, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xFA, 0x01, 0xFA, - 0x02, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xFC, 0x01, 0xFC, 0x02, 0x05, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xB2, 0x01, 0xB2, 0x02, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x00, 0xD9, 0x00, 0xD9, 0x04, 0x0A, 0x00, 0x1E, 0x01, 0x2D, 0x00, 0x00, 0x00, 0xDA, 0x00, 0xDA, - 0x04, 0x0A, 0x00, 0x1F, 0x01, 0x2E, 0x00, 0x00, 0x00, 0xD7, 0x00, 0xD7, 0x03, 0x0A, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0xD8, 0x00, 0xD8, 0x03, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x00, 0xDB, 0x00, 0xDB, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xDC, 0x00, 0xDC, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xEC, 0x01, 0xEC, 0xFE, 0xFE, 0x00, 0x1D, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x11, 0x02, 0x11, 0x01, 0x06, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xE4, 0x01, 0xE4, 0x01, 0x06, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xE5, 0x01, 0xE5, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x28, 0x02, 0x28, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x20, 0x02, 0x20, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x1F, 0x02, 0x1F, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x25, 0x02, 0x25, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x23, 0x02, 0x23, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x21, 0x02, 0x21, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x22, 0x02, 0x22, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x24, 0x02, 0x24, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x02, 0x27, 0x02, 0x27, 0x64, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x02, 0x26, 0x02, 0x26, 0x64, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x12, 0x02, 0x12, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x66, 0x00, 0x66, - 0xFE, 0xFE, 0x00, 0x35, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x69, 0x00, 0x69, 0xFE, 0xFE, 0x00, 0x36, - 0x00, 0xFD, 0x00, 0x00, 0x02, 0x71, 0x02, 0x71, 0x04, 0x0A, 0x00, 0x00, 0x01, 0x66, 0x00, 0x00, - 0x00, 0x48, 0x00, 0x48, 0x03, 0xFE, 0x00, 0x3E, 0x00, 0xEE, 0x00, 0x00, 0x00, 0x46, 0x00, 0x46, - 0x03, 0xFE, 0x00, 0x3F, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x47, 0x00, 0x47, 0x03, 0xFE, 0x00, 0x40, - 0x00, 0xED, 0x00, 0x00, 0x00, 0x45, 0x00, 0x45, 0x03, 0xFE, 0x00, 0x41, 0x00, 0xEB, 0x00, 0x00, - 0x00, 0x4B, 0x00, 0x4B, 0x03, 0xFE, 0x00, 0x42, 0x00, 0xF1, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x4C, - 0x03, 0x05, 0x00, 0x43, 0x00, 0xF2, 0x00, 0x00, 0x00, 0x49, 0x00, 0x49, 0x03, 0x05, 0x00, 0x44, - 0x00, 0xEF, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x4E, 0x03, 0xFE, 0x00, 0x45, 0x00, 0xF3, 0x00, 0x00, - 0x00, 0x4F, 0x00, 0x4F, 0x03, 0xFE, 0x00, 0x46, 0x00, 0xF4, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x4A, - 0x03, 0xFE, 0x00, 0x47, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x4D, 0x03, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0xB6, 0x01, 0xB6, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xEF, 0x01, 0xEF, 0x00, 0x09, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xED, 0x01, 0xED, - 0x00, 0x09, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0xEE, 0x01, 0xEE, 0x00, 0x09, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0x73, 0x01, 0x73, 0x02, 0xFE, 0x00, 0x4A, 0x01, 0x3F, 0x00, 0x00, - 0x01, 0x72, 0x01, 0x72, 0x02, 0xFE, 0x00, 0x4C, 0x01, 0x3E, 0x00, 0x00, 0x00, 0x61, 0x00, 0x61, - 0x02, 0xFE, 0x00, 0x4B, 0x00, 0xFB, 0x00, 0x00, 0x02, 0x6D, 0x02, 0x6D, 0x02, 0xFE, 0x00, 0x4B, - 0x00, 0xFB, 0x00, 0x00, 0x02, 0x5D, 0x02, 0x5D, 0x01, 0x06, 0x00, 0x0E, 0x01, 0x63, 0x00, 0x00, - 0x02, 0x62, 0x02, 0x62, 0x01, 0x06, 0x00, 0x0F, 0x01, 0x61, 0x00, 0x00, 0x01, 0xE3, 0x01, 0xE3, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xD4, 0x00, 0xD4, 0x04, 0x0A, 0x00, 0x50, - 0x01, 0x2A, 0x00, 0x00, 0x00, 0xD5, 0x00, 0xD5, 0x04, 0x0A, 0x00, 0x51, 0x01, 0x2B, 0x00, 0x00, - 0x02, 0x3B, 0x02, 0x3B, 0xFE, 0xFE, 0x00, 0x52, 0x01, 0x53, 0x00, 0x00, 0x02, 0x3C, 0x02, 0x3C, - 0xFE, 0xFE, 0x00, 0x53, 0x01, 0x54, 0x00, 0x00, 0x00, 0x72, 0x00, 0x72, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xFF, 0x00, 0x00, 0x00, 0x74, 0x00, 0x74, 0x03, 0x09, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x73, 0x00, 0x73, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x71, 0x00, 0x71, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x75, 0x00, 0x75, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x77, 0x00, 0x77, 0x03, 0x09, 0x00, 0x56, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x78, 0x00, 0x78, 0x03, 0x09, 0x00, 0x57, 0x01, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x79, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x7A, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x76, 0x00, 0x76, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x30, 0x00, 0x00, - 0x00, 0xDE, 0x00, 0xDE, 0x04, 0x0A, 0x00, 0x54, 0x01, 0x2F, 0x00, 0x00, 0x00, 0xE0, 0x00, 0xE0, - 0xFE, 0xFE, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, 0x00, 0x08, 0x00, 0x08, 0x00, 0x05, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x02, 0x2A, 0x02, 0x2A, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x29, 0x02, 0x29, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x01, 0x8A, 0x01, 0x8A, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x8B, 0x01, 0x8B, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x8C, 0x01, 0x8C, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x80, 0x01, 0x80, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x81, 0x01, 0x81, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x82, 0x01, 0x82, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x84, 0x01, 0x84, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x88, 0x01, 0x88, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x89, 0x01, 0x89, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x86, 0x01, 0x86, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x87, 0x01, 0x87, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x83, 0x01, 0x83, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x85, 0x01, 0x85, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x8E, 0x01, 0x8E, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x8F, 0x01, 0x8F, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x90, 0x01, 0x90, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x91, 0x01, 0x91, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x94, 0x01, 0x94, 0x01, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x95, 0x01, 0x95, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x92, 0x01, 0x92, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x93, 0x01, 0x93, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0xF8, 0x01, 0xF8, 0xFE, 0xFE, 0x00, 0x00, - 0x01, 0x4E, 0x00, 0x00, 0x10, 0x2E, 0x10, 0x2E, 0x00, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x2D, 0x10, 0x2D, 0x00, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x0A, 0x10, 0x0A, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x08, 0x10, 0x08, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x10, 0x09, 0x10, 0x09, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x07, 0x10, 0x07, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x21, 0x10, 0x21, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x23, 0x10, 0x23, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x10, 0x22, 0x10, 0x22, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x24, 0x10, 0x24, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x25, 0x10, 0x25, - 0xFE, 0xFE, 0x00, 0x5E, 0x10, 0x11, 0x00, 0x00, 0x10, 0x28, 0x10, 0x28, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x10, 0x29, 0x10, 0x29, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x26, 0x10, 0x26, 0xFE, 0xFE, 0x00, 0x5F, 0x10, 0x12, 0x00, 0x00, 0x10, 0x27, 0x10, 0x27, - 0xFE, 0xFE, 0x00, 0x5F, 0x10, 0x12, 0x00, 0x00, 0x10, 0x2A, 0x10, 0x2A, 0xFE, 0xFE, 0x00, 0x63, - 0x10, 0x13, 0x00, 0x00, 0x10, 0x19, 0x10, 0x19, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x1B, 0x10, 0x1B, 0xFE, 0xFE, 0x00, 0x61, 0x10, 0x0E, 0x00, 0x00, 0x10, 0x1C, 0x10, 0x1C, - 0xFE, 0xFE, 0x00, 0x62, 0x10, 0x0F, 0x00, 0x00, 0x10, 0x1A, 0x10, 0x1A, 0xFE, 0xFE, 0x00, 0x60, - 0x10, 0x0D, 0x00, 0x00, 0x10, 0x20, 0x10, 0x20, 0xFE, 0xFE, 0x00, 0x5F, 0x10, 0x12, 0x00, 0x00, - 0x10, 0x1D, 0x10, 0x1D, 0xFE, 0xFE, 0x00, 0x65, 0x10, 0x10, 0x00, 0x00, 0x10, 0x17, 0x10, 0x17, - 0xFE, 0xFE, 0x00, 0x64, 0x10, 0x0C, 0x00, 0x00, 0x10, 0x18, 0x10, 0x18, 0xFE, 0xFE, 0x00, 0x64, - 0x10, 0x0C, 0x00, 0x00, 0x10, 0x2B, 0x10, 0x2B, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x2C, 0x10, 0x2C, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x15, 0x10, 0x15, - 0xFE, 0xFE, 0x00, 0x66, 0x10, 0x0B, 0x00, 0x00, 0x10, 0x16, 0x10, 0x16, 0xFE, 0xFE, 0x00, 0x66, - 0x10, 0x0B, 0x00, 0x00, 0x10, 0x06, 0x10, 0x06, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x10, 0x14, 0x10, 0x14, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x1E, 0x10, 0x1E, - 0x00, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x10, 0x1F, 0x10, 0x1F, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x00, 0xB1, 0x00, 0xB1, 0xFE, 0xFE, 0x00, 0x5D, 0x01, 0x23, 0x00, 0x00, - 0x01, 0x9C, 0x01, 0x9C, 0xFE, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x9D, 0x01, 0x9D, - 0xFE, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x96, 0x01, 0x96, 0x00, 0x05, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x9B, 0x01, 0x9B, 0x00, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x01, 0x9A, 0x01, 0x9A, 0x00, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x99, 0x01, 0x99, - 0x00, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x97, 0x01, 0x97, 0xFE, 0x05, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x01, 0x98, 0x01, 0x98, 0xFE, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x20, 0x0C, 0x20, 0x0C, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x20, 0x0D, 0x20, 0x0D, - 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x20, 0x0E, 0x20, 0x0E, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x20, 0x0F, 0x20, 0x0F, 0x64, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x20, 0x09, 0x20, 0x09, 0x64, 0x09, 0x00, 0x67, 0x00, 0xE8, 0x00, 0x00, 0x20, 0x0A, 0x20, 0x0A, - 0x64, 0x09, 0x00, 0x68, 0x00, 0xE8, 0x00, 0x00, 0x20, 0x0B, 0x20, 0x0B, 0x64, 0x0A, 0x00, 0x69, - 0x20, 0x08, 0x00, 0x00, 0x20, 0x10, 0x20, 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x50, 0x0D, 0x50, 0x0D, 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x50, 0x0E, 0x50, 0x0E, - 0x01, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x50, 0x0A, 0x50, 0x0A, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x50, 0x0B, 0x50, 0x0B, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x50, 0x0C, 0x50, 0x0C, 0x64, 0xFE, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x50, 0x07, 0x50, 0x07, - 0x64, 0x09, 0x00, 0x6A, 0x00, 0xE8, 0x00, 0x00, 0x50, 0x08, 0x50, 0x08, 0x64, 0x09, 0x00, 0x6B, - 0x00, 0xE8, 0x00, 0x00, 0x50, 0x09, 0x50, 0x09, 0x64, 0x0A, 0x00, 0x6C, 0x50, 0x0F, 0x00, 0x00, - 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x00, 0x6F, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x04, 0x02, 0x04, - 0x02, 0x05, 0x00, 0x70, 0x00, 0xE8, 0x00, 0x00, 0x01, 0x6B, 0x01, 0x6B, 0x02, 0x0A, 0x00, 0x71, - 0x01, 0x35, 0x00, 0x00, 0x02, 0x5E, 0x02, 0x5E, 0x03, 0x09, 0x00, 0x27, 0x00, 0xEA, 0x00, 0x00, - 0x01, 0xE6, 0x01, 0xE6, 0x03, 0x09, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, 0x01, 0xE7, 0x01, 0xE7, - 0x03, 0x09, 0x00, 0x28, 0x00, 0xF8, 0x00, 0x00, 0x01, 0xA6, 0x01, 0xA6, 0x04, 0x05, 0x00, 0x74, - 0x01, 0x4A, 0x00, 0x00, 0x02, 0x66, 0x01, 0x6A, 0xFE, 0xFE, 0x00, 0x00, 0x01, 0x36, 0x00, 0x00, - 0x30, 0x04, 0x30, 0x04, 0x01, 0x06, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x65, 0x00, 0x65, - 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x62, 0x00, 0x62, 0x03, 0x09, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0x64, 0x00, 0x64, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x00, 0x63, 0x00, 0x63, 0x03, 0x09, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x02, 0x67, 0x02, 0x67, - 0x04, 0x0A, 0x00, 0x79, 0x01, 0x62, 0x00, 0x00, 0x00, 0xD0, 0x00, 0xD0, 0x04, 0x0A, 0x00, 0x7E, - 0x01, 0x27, 0x00, 0x00, 0x01, 0x77, 0x01, 0x77, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x02, 0x79, 0x02, 0x79, 0x04, 0x0A, 0x00, 0x00, 0x01, 0x67, 0x00, 0x00, 0x02, 0x7A, 0x02, 0x7A, - 0x04, 0x0A, 0x00, 0x00, 0x01, 0x33, 0x00, 0x00, 0x00, 0xCF, 0x00, 0xCF, 0x00, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x00, 0xA2, 0x00, 0xA2, 0x64, 0x06, 0x00, 0x81, 0x01, 0x1B, 0x00, 0x00, - 0x00, 0xA3, 0x00, 0xA3, 0x64, 0x06, 0x00, 0x81, 0x00, 0xE8, 0x00, 0x00, 0x00, 0xA0, 0x00, 0xA0, - 0x64, 0x06, 0x00, 0x83, 0x01, 0x19, 0x00, 0x00, 0x00, 0xA1, 0x00, 0xA1, 0x64, 0x06, 0x00, 0x84, - 0x01, 0x1A, 0x00, 0x00, 0x60, 0x0B, 0x60, 0x0B, 0x00, 0x0A, 0x00, 0x85, 0x60, 0x09, 0x00, 0x00, - 0x60, 0x0C, 0x60, 0x0C, 0x00, 0x05, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x60, 0x0A, 0x60, 0x0A, - 0x64, 0x05, 0x00, 0x00, 0x60, 0x08, 0x00, 0x00, 0x70, 0x0A, 0x70, 0x0A, 0x00, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x70, 0x0B, 0x70, 0x0B, 0x00, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, - 0x70, 0x0C, 0x70, 0x0C, 0x00, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x70, 0x0E, 0x70, 0x0E, - 0x00, 0x06, 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x70, 0x0D, 0x70, 0x0D, 0x00, 0x06, 0x00, 0x00, - 0x00, 0xE8, 0x00, 0x00, 0x70, 0x08, 0x70, 0x08, 0x00, 0x05, 0x00, 0x86, 0x70, 0x10, 0x00, 0x00, - 0x70, 0x09, 0x70, 0x09, 0x00, 0x05, 0x00, 0x00, 0x70, 0x11, 0x00, 0x00, 0x02, 0x66, 0x70, 0x0F, - 0x04, 0x05, 0x00, 0x87, 0x70, 0x12, 0x00, 0x00, 0x01, 0x9F, 0x01, 0x9F, 0xFE, 0xFE, 0x00, 0x00, - 0x00, 0xDF, 0x00, 0x00, 0x01, 0x9E, 0x01, 0x9E, 0xFE, 0xFE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, - 0x01, 0xEA, 0x01, 0xEA, 0xFE, 0xFE, 0x00, 0x88, 0x01, 0x4B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x0B, - 0xFE, 0xFE, 0x00, 0x89, 0x00, 0xE7, 0x00, 0x00, +daAlink_AnmData const daAlink_c::m_anmDataTable[414] = { + {37, 36, 254, 254, 0, 232, 0}, + {35, 34, 254, 254, 0, 232, 0}, + {18, 18, 254, 254, 0, 232, 0}, + {16, 16, 254, 254, 0, 232, 0}, + {33, 31, 254, 254, 0, 232, 0}, + {30, 29, 254, 254, 0, 232, 0}, + {60, 59, 4, 10, 0, 232, 0}, + {44, 43, 4, 10, 0, 232, 0}, + {62, 61, 4, 10, 0, 232, 0}, + {46, 45, 4, 10, 0, 232, 0}, + {48, 47, 4, 10, 0, 232, 0}, + {40, 39, 4, 10, 0, 232, 0}, + {50, 49, 4, 10, 0, 232, 0}, + {42, 41, 4, 10, 0, 232, 0}, + {628, 628, 254, 254, 0, 232, 0}, + {32, 26, 254, 254, 0, 0, 0}, + {26, 14, 254, 254, 0, 232, 0}, + {28, 14, 254, 254, 0, 232, 0}, + {631, 631, 4, 10, 0, 0, 0}, + {205, 197, 4, 10, 0, 232, 0}, + {579, 579, 254, 254, 0, 345, 0}, + {563, 563, 4, 10, 0, 0, 0}, + {564, 564, 4, 10, 0, 0, 0}, + {563, 604, 4, 10, 0, 0, 0}, + {564, 604, 4, 10, 0, 0, 0}, + {618, 618, 4, 10, 0, 0, 0}, + {598, 598, 1, 6, 0, 232, 0}, + {599, 599, 1, 6, 0, 351, 0}, + {198, 198, 1, 6, 0, 232, 0}, + {54, 54, 254, 254, 0, 328, 0}, + {56, 56, 254, 254, 0, 328, 0}, + {53, 53, 1, 6, 0, 232, 0}, + {55, 55, 1, 6, 0, 232, 0}, + {52, 52, 254, 254, 0, 328, 0}, + {51, 51, 1, 6, 0, 232, 0}, + {519, 519, 254, 254, 0, 328, 0}, + {521, 521, 254, 254, 0, 223, 0}, + {520, 520, 1, 6, 38, 335, 0}, + {518, 518, 4, 10, 0, 328, 0}, + {517, 517, 4, 10, 0, 232, 0}, + {559, 559, 254, 254, 0, 232, 0}, + {123, 123, 254, 254, 0, 0, 0}, + {126, 126, 254, 6, 0, 232, 0}, + {19, 19, 254, 6, 0, 232, 0}, + {21, 21, 254, 6, 0, 232, 0}, + {124, 124, 254, 6, 0, 232, 0}, + {23, 23, 254, 6, 0, 232, 0}, + {24, 24, 254, 6, 0, 232, 0}, + {20, 20, 1, 6, 125, 233, 0}, + {421, 421, 254, 254, 0, 327, 0}, + {419, 419, 254, 254, 0, 327, 0}, + {420, 420, 254, 254, 0, 223, 0}, + {436, 436, 254, 254, 0, 223, 0}, + {437, 437, 254, 254, 0, 223, 0}, + {617, 617, 254, 254, 0, 223, 0}, + {503, 503, 254, 254, 10, 333, 0}, + {502, 502, 254, 254, 4, 232, 0}, + {501, 501, 254, 254, 4, 232, 0}, + {500, 500, 0, 5, 11, 332, 0}, + {499, 499, 254, 254, 0, 232, 0}, + {498, 498, 0, 5, 0, 232, 0}, + {510, 510, 254, 254, 0, 223, 0}, + {511, 511, 254, 254, 0, 223, 0}, + {509, 509, 254, 254, 0, 223, 0}, + {225, 225, 4, 10, 0, 223, 0}, + {226, 226, 4, 10, 0, 223, 0}, + {565, 565, 4, 5, 0, 232, 0}, + {566, 566, 4, 5, 0, 232, 0}, + {562, 562, 4, 5, 0, 232, 0}, + {418, 418, 4, 5, 0, 232, 0}, + {416, 416, 4, 5, 0, 232, 0}, + {417, 417, 4, 5, 0, 232, 0}, + {614, 614, 4, 5, 0, 0, 0}, + {629, 629, 4, 5, 0, 0, 0}, + {630, 630, 4, 5, 0, 0, 0}, + {202, 202, 4, 5, 0, 232, 0}, + {203, 203, 4, 5, 0, 232, 0}, + {781, 614, 4, 5, 0, 0, 0}, + {221, 221, 4, 5, 0, 258, 0}, + {435, 435, 4, 5, 0, 261, 0}, + {149, 149, 100, 5, 36, 272, 0}, + {568, 568, 4, 5, 55, 338, 0}, + {569, 569, 4, 5, 56, 0, 0}, + {214, 214, 4, 10, 88, 300, 0}, + {587, 587, 4, 5, 37, 0, 0}, + {613, 613, 4, 5, 0, 232, 0}, + {560, 560, 4, 5, 109, 336, 0}, + {561, 561, 4, 5, 109, 336, 0}, + {373, 373, 4, 5, 110, 321, 0}, + {374, 374, 4, 5, 110, 321, 0}, + {588, 588, 4, 5, 114, 0, 0}, + {589, 589, 4, 5, 115, 0, 0}, + {512, 512, 254, 254, 0, 223, 0}, + {513, 513, 254, 254, 0, 223, 0}, + {227, 227, 4, 10, 0, 223, 0}, + {228, 228, 4, 10, 0, 223, 0}, + {624, 624, 254, 254, 16, 357, 0}, + {623, 623, 4, 5, 17, 356, 0}, + {127, 127, 100, 6, 46, 259, 0}, + {153, 153, 0, 6, 47, 275, 0}, + {154, 154, 0, 6, 48, 276, 0}, + {143, 143, 100, 6, 49, 267, 0}, + {144, 144, 100, 6, 49, 267, 0}, + {132, 132, 100, 6, 50, 262, 0}, + {133, 133, 100, 6, 51, 263, 0}, + {134, 134, 100, 5, 0, 261, 0}, + {138, 138, 0, 5, 0, 223, 0}, + {137, 137, 100, 5, 0, 223, 0}, + {139, 139, 100, 5, 52, 264, 0}, + {136, 136, 0, 5, 0, 223, 0}, + {135, 135, 100, 5, 0, 223, 0}, + {155, 155, 0, 6, 89, 277, 0}, + {156, 156, 0, 6, 89, 277, 0}, + {152, 152, 100, 6, 60, 274, 0}, + {151, 151, 100, 6, 61, 273, 0}, + {159, 159, 100, 6, 58, 280, 0}, + {158, 158, 100, 6, 59, 279, 0}, + {164, 164, 0, 6, 0, 232, 0}, + {165, 165, 100, 6, 0, 232, 0}, + {166, 166, 100, 6, 0, 232, 0}, + {170, 170, 0, 5, 0, 261, 0}, + {167, 167, 0, 5, 90, 285, 0}, + {168, 168, 0, 5, 0, 286, 0}, + {169, 169, 100, 5, 18, 287, 0}, + {142, 142, 0, 6, 127, 266, 0}, + {140, 140, 0, 6, 128, 265, 0}, + {141, 141, 0, 6, 0, 232, 0}, + {174, 174, 1, 6, 39, 234, 0}, + {172, 172, 1, 6, 39, 234, 0}, + {189, 189, 1, 6, 39, 234, 0}, + {190, 190, 1, 6, 39, 234, 0}, + {178, 178, 254, 254, 40, 248, 0}, + {175, 175, 254, 254, 40, 248, 0}, + {180, 180, 254, 254, 40, 248, 0}, + {182, 182, 254, 254, 40, 248, 0}, + {179, 179, 254, 254, 42, 292, 0}, + {176, 176, 254, 254, 43, 290, 0}, + {181, 181, 254, 254, 44, 293, 0}, + {183, 183, 254, 254, 44, 293, 0}, + {171, 171, 1, 6, 39, 234, 0}, + {431, 431, 1, 6, 39, 234, 0}, + {432, 432, 254, 254, 0, 223, 0}, + {324, 324, 0, 6, 6, 305, 0}, + {325, 325, 0, 10, 7, 306, 0}, + {567, 567, 4, 10, 28, 337, 0}, + {591, 591, 254, 254, 0, 223, 0}, + {592, 592, 254, 254, 0, 223, 0}, + {593, 593, 254, 254, 0, 223, 0}, + {594, 594, 254, 254, 0, 223, 0}, + {372, 372, 254, 254, 0, 223, 0}, + {378, 378, 254, 254, 0, 223, 0}, + {376, 376, 254, 254, 0, 223, 0}, + {377, 377, 254, 254, 0, 223, 0}, + {430, 430, 254, 254, 0, 223, 0}, + {428, 428, 254, 254, 0, 223, 0}, + {429, 429, 254, 254, 0, 223, 0}, + {425, 425, 254, 254, 0, 223, 0}, + {423, 423, 254, 254, 0, 223, 0}, + {424, 424, 254, 254, 0, 223, 0}, + {427, 427, 254, 254, 0, 223, 0}, + {426, 426, 254, 254, 0, 223, 0}, + {106, 106, 3, 9, 0, 232, 0}, + {112, 112, 3, 9, 0, 232, 0}, + {108, 108, 3, 9, 0, 232, 0}, + {109, 109, 3, 9, 0, 232, 0}, + {110, 110, 3, 9, 0, 232, 0}, + {111, 111, 3, 9, 0, 232, 0}, + {107, 107, 3, 9, 92, 254, 0}, + {527, 527, 3, 9, 0, 232, 0}, + {528, 528, 3, 9, 0, 232, 0}, + {522, 522, 3, 9, 0, 232, 0}, + {524, 524, 3, 9, 0, 232, 0}, + {525, 525, 3, 9, 0, 232, 0}, + {526, 526, 3, 9, 0, 232, 0}, + {523, 523, 3, 9, 0, 232, 0}, + {366, 366, 254, 254, 24, 313, 0}, + {369, 369, 254, 254, 25, 316, 0}, + {368, 368, 254, 254, 0, 315, 0}, + {379, 379, 254, 254, 26, 322, 0}, + {365, 365, 254, 254, 27, 312, 0}, + {367, 367, 254, 254, 0, 314, 0}, + {95, 95, 254, 254, 0, 223, 0}, + {604, 604, 4, 10, 1, 352, 0}, + {596, 596, 4, 10, 1, 349, 0}, + {585, 585, 4, 10, 0, 223, 0}, + {620, 620, 1, 6, 12, 355, 0}, + {157, 157, 1, 6, 13, 278, 0}, + {82, 82, 254, 254, 0, 232, 0}, + {632, 632, 1, 6, 0, 223, 0}, + {557, 557, 254, 254, 0, 223, 0}, + {555, 555, 254, 254, 0, 223, 0}, + {558, 558, 254, 254, 0, 223, 0}, + {556, 556, 254, 254, 0, 223, 0}, + {574, 574, 254, 254, 21, 342, 0}, + {578, 578, 254, 254, 22, 344, 0}, + {57, 57, 254, 254, 0, 232, 0}, + {58, 58, 254, 254, 0, 232, 0}, + {17, 17, 254, 254, 0, 232, 0}, + {570, 570, 254, 254, 3, 232, 0}, + {573, 573, 254, 254, 23, 341, 0}, + {577, 577, 254, 254, 0, 232, 0}, + {576, 576, 254, 254, 0, 232, 0}, + {193, 193, 1, 6, 39, 234, 0}, + {192, 192, 1, 6, 39, 234, 0}, + {194, 194, 1, 6, 39, 234, 0}, + {195, 195, 1, 6, 39, 234, 0}, + {196, 196, 1, 6, 39, 234, 0}, + {87, 87, 254, 254, 77, 247, 0}, + {86, 86, 254, 254, 78, 246, 0}, + {85, 85, 254, 254, 79, 245, 0}, + {361, 361, 254, 254, 0, 308, 0}, + {362, 362, 254, 254, 0, 310, 0}, + {362, 618, 254, 254, 0, 307, 0}, + {362, 381, 254, 254, 0, 307, 0}, + {586, 586, 4, 10, 41, 346, 0}, + {595, 595, 254, 254, 0, 348, 0}, + {619, 619, 254, 254, 0, 223, 0}, + {603, 602, 254, 5, 0, 223, 0}, + {603, 603, 0, 254, 0, 223, 0}, + {619, 533, 254, 5, 0, 223, 0}, + {619, 534, 0, 254, 0, 223, 0}, + {619, 531, 254, 5, 0, 223, 0}, + {619, 532, 0, 254, 0, 223, 0}, + {619, 103, 254, 5, 0, 223, 0}, + {90, 90, 2, 254, 0, 304, 0}, + {91, 91, 2, 254, 0, 304, 0}, + {92, 92, 2, 254, 0, 223, 0}, + {94, 94, 2, 5, 120, 249, 0}, + {491, 491, 254, 254, 0, 223, 0}, + {506, 506, 2, 5, 0, 223, 0}, + {508, 508, 2, 5, 0, 223, 0}, + {434, 434, 2, 5, 0, 223, 0}, + {217, 217, 4, 10, 30, 301, 0}, + {218, 218, 4, 10, 31, 302, 0}, + {215, 215, 3, 10, 0, 223, 0}, + {216, 216, 3, 10, 0, 223, 0}, + {219, 219, 254, 254, 0, 223, 0}, + {220, 220, 254, 254, 0, 223, 0}, + {492, 492, 254, 254, 29, 223, 0}, + {529, 529, 1, 6, 0, 223, 0}, + {484, 484, 1, 6, 0, 223, 0}, + {485, 485, 1, 6, 0, 223, 0}, + {552, 552, 254, 254, 0, 223, 0}, + {544, 544, 254, 254, 0, 223, 0}, + {543, 543, 254, 254, 0, 223, 0}, + {549, 549, 254, 254, 0, 223, 0}, + {547, 547, 254, 254, 0, 223, 0}, + {545, 545, 254, 254, 0, 223, 0}, + {546, 546, 254, 254, 0, 223, 0}, + {548, 548, 254, 254, 0, 223, 0}, + {551, 551, 100, 254, 0, 223, 0}, + {550, 550, 100, 254, 0, 223, 0}, + {530, 530, 254, 254, 0, 223, 0}, + {102, 102, 254, 254, 53, 252, 0}, + {105, 105, 254, 254, 54, 253, 0}, + {625, 625, 4, 10, 0, 358, 0}, + {72, 72, 3, 254, 62, 238, 0}, + {70, 70, 3, 254, 63, 236, 0}, + {71, 71, 3, 254, 64, 237, 0}, + {69, 69, 3, 254, 65, 235, 0}, + {75, 75, 3, 254, 66, 241, 0}, + {76, 76, 3, 5, 67, 242, 0}, + {73, 73, 3, 5, 68, 239, 0}, + {78, 78, 3, 254, 69, 243, 0}, + {79, 79, 3, 254, 70, 244, 0}, + {74, 74, 3, 254, 71, 240, 0}, + {77, 77, 3, 254, 0, 223, 0}, + {438, 438, 0, 10, 0, 223, 0}, + {495, 495, 0, 9, 0, 223, 0}, + {493, 493, 0, 9, 0, 223, 0}, + {494, 494, 0, 9, 0, 223, 0}, + {371, 371, 2, 254, 74, 319, 0}, + {370, 370, 2, 254, 76, 318, 0}, + {97, 97, 2, 254, 75, 251, 0}, + {621, 621, 2, 254, 75, 251, 0}, + {605, 605, 1, 6, 14, 355, 0}, + {610, 610, 1, 6, 15, 353, 0}, + {483, 483, 254, 254, 0, 223, 0}, + {212, 212, 4, 10, 80, 298, 0}, + {213, 213, 4, 10, 81, 299, 0}, + {571, 571, 254, 254, 82, 339, 0}, + {572, 572, 254, 254, 83, 340, 0}, + {114, 114, 3, 9, 0, 255, 0}, + {116, 116, 3, 9, 85, 256, 0}, + {115, 115, 3, 9, 0, 232, 0}, + {113, 113, 3, 9, 0, 232, 0}, + {117, 117, 3, 9, 0, 232, 0}, + {119, 119, 3, 9, 86, 257, 0}, + {120, 120, 3, 9, 87, 257, 0}, + {28, 121, 3, 9, 0, 232, 0}, + {122, 122, 3, 9, 0, 232, 0}, + {118, 118, 254, 254, 0, 304, 0}, + {222, 222, 4, 10, 84, 303, 0}, + {224, 224, 254, 254, 40, 248, 0}, + {8, 8, 0, 5, 0, 232, 0}, + {554, 554, 254, 254, 0, 223, 0}, + {553, 553, 254, 254, 0, 223, 0}, + {394, 394, 1, 6, 0, 232, 0}, + {395, 395, 1, 6, 0, 232, 0}, + {396, 396, 254, 254, 0, 232, 0}, + {384, 384, 1, 6, 0, 232, 0}, + {385, 385, 1, 6, 0, 232, 0}, + {386, 386, 1, 6, 0, 232, 0}, + {388, 388, 1, 6, 0, 232, 0}, + {392, 392, 1, 6, 0, 232, 0}, + {393, 393, 1, 6, 0, 232, 0}, + {390, 390, 1, 6, 0, 232, 0}, + {391, 391, 1, 6, 0, 232, 0}, + {387, 387, 1, 6, 0, 232, 0}, + {389, 389, 1, 6, 0, 232, 0}, + {398, 398, 1, 6, 0, 232, 0}, + {399, 399, 1, 6, 0, 232, 0}, + {400, 400, 1, 6, 0, 232, 0}, + {401, 401, 1, 6, 0, 232, 0}, + {404, 404, 1, 6, 0, 232, 0}, + {405, 405, 1, 6, 0, 232, 0}, + {402, 402, 1, 6, 0, 232, 0}, + {403, 403, 1, 6, 0, 232, 0}, + {504, 504, 254, 254, 0, 334, 0}, + {4142, 4142, 0, 5, 0, 223, 0}, + {4141, 4141, 0, 5, 0, 223, 0}, + {4106, 4106, 254, 254, 0, 223, 0}, + {4104, 4104, 254, 254, 0, 223, 0}, + {4105, 4105, 254, 254, 0, 223, 0}, + {4103, 4103, 254, 254, 0, 223, 0}, + {4129, 4129, 254, 254, 0, 223, 0}, + {4131, 4131, 254, 254, 0, 223, 0}, + {4130, 4130, 254, 254, 0, 223, 0}, + {4132, 4132, 254, 254, 0, 223, 0}, + {4133, 4133, 254, 254, 94, 4113, 0}, + {4136, 4136, 254, 254, 0, 223, 0}, + {4137, 4137, 254, 254, 0, 223, 0}, + {4134, 4134, 254, 254, 95, 4114, 0}, + {4135, 4135, 254, 254, 95, 4114, 0}, + {4138, 4138, 254, 254, 99, 4115, 0}, + {4121, 4121, 254, 254, 0, 223, 0}, + {4123, 4123, 254, 254, 97, 4110, 0}, + {4124, 4124, 254, 254, 98, 4111, 0}, + {4122, 4122, 254, 254, 96, 4109, 0}, + {4128, 4128, 254, 254, 95, 4114, 0}, + {4125, 4125, 254, 254, 101, 4112, 0}, + {4119, 4119, 254, 254, 100, 4108, 0}, + {4120, 4120, 254, 254, 100, 4108, 0}, + {4139, 4139, 254, 254, 0, 223, 0}, + {4140, 4140, 254, 254, 0, 223, 0}, + {4117, 4117, 254, 254, 102, 4107, 0}, + {4118, 4118, 254, 254, 102, 4107, 0}, + {4102, 4102, 254, 254, 0, 223, 0}, + {4116, 4116, 254, 254, 0, 223, 0}, + {4126, 4126, 0, 5, 0, 223, 0}, + {4127, 4127, 254, 254, 0, 223, 0}, + {177, 177, 254, 254, 93, 291, 0}, + {412, 412, 254, 5, 0, 232, 0}, + {413, 413, 254, 5, 0, 232, 0}, + {406, 406, 0, 5, 0, 232, 0}, + {411, 411, 0, 5, 0, 232, 0}, + {410, 410, 0, 5, 0, 232, 0}, + {409, 409, 0, 5, 0, 232, 0}, + {407, 407, 254, 5, 0, 232, 0}, + {408, 408, 254, 5, 0, 232, 0}, + {8204, 8204, 3, 9, 0, 232, 0}, + {8205, 8205, 3, 9, 0, 232, 0}, + {8206, 8206, 3, 9, 0, 232, 0}, + {8207, 8207, 100, 254, 0, 232, 0}, + {8201, 8201, 100, 9, 103, 232, 0}, + {8202, 8202, 100, 9, 104, 232, 0}, + {8203, 8203, 100, 10, 105, 8200, 0}, + {8208, 8208, 0, 5, 0, 223, 0}, + {20493, 20493, 1, 6, 0, 232, 0}, + {20494, 20494, 1, 6, 0, 232, 0}, + {20490, 20490, 3, 9, 0, 232, 0}, + {20491, 20491, 3, 9, 0, 232, 0}, + {20492, 20492, 100, 254, 0, 232, 0}, + {20487, 20487, 100, 9, 106, 232, 0}, + {20488, 20488, 100, 9, 107, 232, 0}, + {20489, 20489, 100, 10, 108, 20495, 0}, + {515, 515, 2, 5, 111, 232, 0}, + {516, 516, 2, 5, 112, 232, 0}, + {363, 363, 2, 10, 113, 309, 0}, + {606, 606, 3, 9, 39, 234, 0}, + {486, 486, 3, 9, 40, 248, 0}, + {487, 487, 3, 9, 40, 248, 0}, + {422, 422, 4, 5, 116, 330, 0}, + {614, 362, 254, 254, 0, 310, 0}, + {12292, 12292, 1, 6, 0, 12291, 0}, + {101, 101, 254, 254, 0, 223, 0}, + {98, 98, 3, 9, 0, 232, 0}, + {100, 100, 3, 9, 0, 232, 0}, + {99, 99, 3, 9, 0, 232, 0}, + {615, 615, 4, 10, 121, 354, 0}, + {208, 208, 4, 10, 126, 295, 0}, + {375, 375, 254, 254, 0, 223, 0}, + {633, 633, 4, 10, 0, 359, 0}, + {634, 634, 4, 10, 0, 307, 0}, + {207, 207, 0, 6, 0, 232, 0}, + {162, 162, 100, 6, 129, 283, 0}, + {163, 163, 100, 6, 129, 232, 0}, + {160, 160, 100, 6, 131, 281, 0}, + {161, 161, 100, 6, 132, 282, 0}, + {24587, 24587, 0, 10, 133, 24585, 0}, + {24588, 24588, 0, 5, 0, 232, 0}, + {24586, 24586, 100, 5, 0, 24584, 0}, + {28682, 28682, 0, 6, 0, 232, 0}, + {28683, 28683, 0, 6, 0, 232, 0}, + {28684, 28684, 0, 6, 0, 232, 0}, + {28686, 28686, 0, 6, 0, 232, 0}, + {28685, 28685, 0, 6, 0, 232, 0}, + {28680, 28680, 0, 5, 134, 28688, 0}, + {28681, 28681, 0, 5, 0, 28689, 0}, + {614, 28687, 4, 5, 135, 28690, 0}, + {415, 415, 254, 254, 0, 223, 0}, + {414, 414, 254, 254, 0, 223, 0}, + {490, 490, 254, 254, 136, 331, 0}, + {11, 11, 254, 254, 137, 231, 0}, }; -COMPILER_STRIP_GATE(0x8038FCA8, &daAlink_c::m_anmDataTable); /* 80391010-803914A8 -00001 0498+00 4/4 0/0 0/0 .rodata m_wlAnmDataTable__9daAlink_c */ -SECTION_RODATA void* const daAlink_c::m_wlAnmDataTable[294] = { - (void*)0x02FF0001, - (void*)0x0A28FFFF, - (void*)0x030A0002, - (void*)0x010EFFFF, - (void*)0x030B0002, - (void*)0x010EFFFF, - (void*)0x02B4000C, - (void*)0xFFFFFFFF, - (void*)0x02CC010C, - (void*)0xFFFFFFFF, - (void*)0x02CA010C, - (void*)0xFFFFFFFF, - (void*)0x02CB010C, - (void*)0xFFFFFFFF, - (void*)0x03050001, - (void*)0x0FFFFFFF, - (void*)0x02E00007, - (void*)0x02FFFFFF, - (void*)0x02DF0007, - (void*)0x0620FFFF, - (void*)0x02DE000C, - (void*)0xFFFFFFFF, - (void*)0x02E90100, - (void*)0x07FFFFFF, - (void*)0x02D4010C, - (void*)0xFFFFFFFF, - (void*)0x02D5020C, - (void*)0xFFFFFFFF, - (void*)0x03060100, - (void*)0x01FFFFFF, - (void*)0x029A0107, - (void*)0x09FFFFFF, - (void*)0x02FE0105, - (void*)0x09FFFFFF, - (void*)0x029C0105, - (void*)0x03FFFFFF, - (void*)0x029B010C, - (void*)0xFFFFFFFF, - (void*)0x02FD0106, - (void*)0x19FFFFFF, - (void*)0x02FC010C, - (void*)0xFFFFFFFF, - (void*)0x02FB0008, - (void*)0x03FFFFFF, - (void*)0x02A7000C, - (void*)0xFFFFFFFF, - (void*)0x03030003, - (void*)0x0A1E32FF, - (void*)0x03000003, - (void*)0x06FFFFFF, - (void*)0x02C20105, - (void*)0x06FFFFFF, - (void*)0x02EE010C, - (void*)0xFFFFFFFF, - (void*)0x02FA010C, - (void*)0xFFFFFFFF, - (void*)0x027E000C, - (void*)0xFFFFFFFF, - (void*)0x030C0102, - (void*)0x0112FFFF, - (void*)0x02EA010C, - (void*)0xFFFFFFFF, - (void*)0x02EB010C, - (void*)0xFFFFFFFF, - (void*)0x02EC020C, - (void*)0xFFFFFFFF, - (void*)0x02E70002, - (void*)0x010EFFFF, - (void*)0x02E30105, - (void*)0x14FFFFFF, - (void*)0x02E40105, - (void*)0x1AFFFFFF, - (void*)0x02E6000C, - (void*)0xFFFFFFFF, - (void*)0x02E80801, - (void*)0x1932FFFF, - (void*)0x02E50902, - (void*)0x010E1E2D, - (void*)0x02B5010C, - (void*)0xFFFFFFFF, - (void*)0x02AC020C, - (void*)0xFFFFFFFF, - (void*)0x02AA020C, - (void*)0xFFFFFFFF, - (void*)0x02AE020C, - (void*)0xFFFFFFFF, - (void*)0x02B0020C, - (void*)0xFFFFFFFF, - (void*)0x02AD020A, - (void*)0x20FFFFFF, - (void*)0x02AB020B, - (void*)0x14FFFFFF, - (void*)0x02AF020C, - (void*)0xFFFFFFFF, - (void*)0x02B1020C, - (void*)0xFFFFFFFF, - (void*)0x02F0000C, - (void*)0xFFFFFFFF, - (void*)0x03020001, - (void*)0x0A28FFFF, - (void*)0x02CF000C, - (void*)0xFFFFFFFF, - (void*)0x02D0000C, - (void*)0xFFFFFFFF, - (void*)0x02CD000C, - (void*)0xFFFFFFFF, - (void*)0x02CE000C, - (void*)0xFFFFFFFF, - (void*)0x02F7010C, - (void*)0xFFFFFFFF, - (void*)0x02F80001, - (void*)0x0DFFFFFF, - (void*)0x02F60002, - (void*)0x01FFFFFF, - (void*)0x02F30004, - (void*)0x03FFFFFF, - (void*)0x02F1010C, - (void*)0xFFFFFFFF, - (void*)0x0307000C, - (void*)0xFFFFFFFF, - (void*)0x02A9010C, - (void*)0xFFFFFFFF, - (void*)0x02A8010C, - (void*)0xFFFFFFFF, - (void*)0x02B2010C, - (void*)0xFFFFFFFF, - (void*)0x02B3010C, - (void*)0xFFFFFFFF, - (void*)0x028D010C, - (void*)0xFFFFFFFF, - (void*)0x028E010C, - (void*)0xFFFFFFFF, - (void*)0x028F000C, - (void*)0xFFFFFFFF, - (void*)0x0290010C, - (void*)0xFFFFFFFF, - (void*)0x027F000C, - (void*)0xFFFFFFFF, - (void*)0x0281000C, - (void*)0xFFFFFFFF, - (void*)0x0280000C, - (void*)0xFFFFFFFF, - (void*)0x02DA000C, - (void*)0xFFFFFFFF, - (void*)0x0285010C, - (void*)0xFFFFFFFF, - (void*)0x0284010C, - (void*)0xFFFFFFFF, - (void*)0x0287010C, - (void*)0xFFFFFFFF, - (void*)0x0286010C, - (void*)0xFFFFFFFF, - (void*)0x0283010C, - (void*)0xFFFFFFFF, - (void*)0x0282010C, - (void*)0xFFFFFFFF, - (void*)0x02DB000C, - (void*)0xFFFFFFFF, - (void*)0x02DC0009, - (void*)0x07FFFFFF, - (void*)0x028C010C, - (void*)0xFFFFFFFF, - (void*)0x0288010C, - (void*)0xFFFFFFFF, - (void*)0x0289010C, - (void*)0xFFFFFFFF, - (void*)0x028B010C, - (void*)0xFFFFFFFF, - (void*)0x028A010C, - (void*)0xFFFFFFFF, - (void*)0x0295020C, - (void*)0xFFFFFFFF, - (void*)0x0294020C, - (void*)0xFFFFFFFF, - (void*)0x02C3010C, - (void*)0xFFFFFFFF, - (void*)0x02C5010C, - (void*)0xFFFFFFFF, - (void*)0x02C4010C, - (void*)0xFFFFFFFF, - (void*)0x02A4000C, - (void*)0xFFFFFFFF, - (void*)0x02A6000C, - (void*)0xFFFFFFFF, - (void*)0x02C6000C, - (void*)0xFFFFFFFF, - (void*)0x02C7010C, - (void*)0xFFFFFFFF, - (void*)0x02C8010C, - (void*)0xFFFFFFFF, - (void*)0x02C90001, - (void*)0x1EFFFFFF, - (void*)0x02D2010C, - (void*)0xFFFFFFFF, - (void*)0x02D3010A, - (void*)0x04FFFFFF, - (void*)0x0299000C, - (void*)0xFFFFFFFF, - (void*)0x0296010C, - (void*)0xFFFFFFFF, - (void*)0x0297010C, - (void*)0xFFFFFFFF, - (void*)0x0298010B, - (void*)0x28FFFFFF, - (void*)0x02E2010C, - (void*)0xFFFFFFFF, - (void*)0x02E1010C, - (void*)0xFFFFFFFF, - (void*)0x02B9000B, - (void*)0x41FFFFFF, - (void*)0x02BA0D0C, - (void*)0xFFFFFFFF, - (void*)0x02F90005, - (void*)0x394655FF, - (void*)0x02ED0106, - (void*)0x01FFFFFF, - (void*)0x02D1010C, - (void*)0xFFFFFFFF, - (void*)0x02DD000C, - (void*)0xFFFFFFFF, - (void*)0x02A5000C, - (void*)0xFFFFFFFF, - (void*)0x02A2000C, - (void*)0xFFFFFFFF, - (void*)0x02A3000C, - (void*)0xFFFFFFFF, - (void*)0x0308010C, - (void*)0xFFFFFFFF, - (void*)0x02EF000C, - (void*)0xFFFFFFFF, - (void*)0x02B60204, - (void*)0x01FFFFFF, - (void*)0x0293010C, - (void*)0xFFFFFFFF, - (void*)0x0291010C, - (void*)0xFFFFFFFF, - (void*)0x02BC000C, - (void*)0xFFFFFFFF, - (void*)0x02BF000C, - (void*)0xFFFFFFFF, - (void*)0x029E020C, - (void*)0xFFFFFFFF, - (void*)0x029D020C, - (void*)0xFFFFFFFF, - (void*)0x02920105, - (void*)0x10FFFFFF, - (void*)0x02B8060C, - (void*)0xFFFFFFFF, - (void*)0x02F4070C, - (void*)0xFFFFFFFF, - (void*)0x02F5070C, - (void*)0xFFFFFFFF, - (void*)0x0304020C, - (void*)0xFFFFFFFF, - (void*)0x03010001, - (void*)0x0FFFFFFF, - (void*)0x02F20001, - (void*)0x0F2DFFFF, - (void*)0x02D7000C, - (void*)0xFFFFFFFF, - (void*)0x02BB030C, - (void*)0xFFFFFFFF, - (void*)0x02C1010C, - (void*)0xFFFFFFFF, - (void*)0x02C00100, - (void*)0x05FFFFFF, - (void*)0x03090001, - (void*)0x01FFFFFF, - (void*)0x029F050C, - (void*)0xFFFFFFFF, - (void*)0x02D8000C, - (void*)0xFFFFFFFF, - (void*)0x02D9020C, - (void*)0xFFFFFFFF, - (void*)0x4003000C, - (void*)0xFFFFFFFF, - (void*)0x02A0000C, - (void*)0xFFFFFFFF, - (void*)0x02A1000C, - (void*)0xFFFFFFFF, - (void*)0x02D60100, - (void*)0x143AFFFF, - (void*)(((char*)JPACalcKeyAnmValue__FfUsPCf) + 0x88), - (void*)0xFFFFFFFF, - (void*)(((char*)cLib_chasePosXZ__FP4cXyzRC4cXyzf) + 0x7C), - (void*)0xFFFFFFFF, - (void*)(((char*)func_802A0A8C) + 0x80), - (void*)0xFFFFFFFF, - (void*)(((char*)getAramHeap__9JASKernelFv) + 0x4), - (void*)0xFFFFFFFF, - (void*)(((char*)startCollisionSE__10Z2CreatureFUlUl) + 0x24), - (void*)0xFFFFFFFF, - (void*)(((char*)changeBgmStatus__8Z2SeqMgrFl) + 0xC80), - (void*)0xFFFFFFFF, +daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[147] = { + {767, 0, 1, 2600, 255, 255}, {778, 0, 2, 270, 255, 255}, + {779, 0, 2, 270, 255, 255}, {692, 0, 12, 65535, 255, 255}, + {716, 1, 12, 65535, 255, 255}, {714, 1, 12, 65535, 255, 255}, + {715, 1, 12, 65535, 255, 255}, {773, 0, 1, 4095, 255, 255}, + {736, 0, 7, 767, 255, 255}, {735, 0, 7, 1568, 255, 255}, + {734, 0, 12, 65535, 255, 255}, {745, 1, 0, 2047, 255, 255}, + {724, 1, 12, 65535, 255, 255}, {725, 2, 12, 65535, 255, 255}, + {774, 1, 0, 511, 255, 255}, {666, 1, 7, 2559, 255, 255}, + {766, 1, 5, 2559, 255, 255}, {668, 1, 5, 1023, 255, 255}, + {667, 1, 12, 65535, 255, 255}, {765, 1, 6, 6655, 255, 255}, + {764, 1, 12, 65535, 255, 255}, {763, 0, 8, 1023, 255, 255}, + {679, 0, 12, 65535, 255, 255}, {771, 0, 3, 2590, 50, 255}, + {768, 0, 3, 1791, 255, 255}, {706, 1, 5, 1791, 255, 255}, + {750, 1, 12, 65535, 255, 255}, {762, 1, 12, 65535, 255, 255}, + {638, 0, 12, 65535, 255, 255}, {780, 1, 2, 274, 255, 255}, + {746, 1, 12, 65535, 255, 255}, {747, 1, 12, 65535, 255, 255}, + {748, 2, 12, 65535, 255, 255}, {743, 0, 2, 270, 255, 255}, + {739, 1, 5, 5375, 255, 255}, {740, 1, 5, 6911, 255, 255}, + {742, 0, 12, 65535, 255, 255}, {744, 8, 1, 6450, 255, 255}, + {741, 9, 2, 270, 30, 45}, {693, 1, 12, 65535, 255, 255}, + {684, 2, 12, 65535, 255, 255}, {682, 2, 12, 65535, 255, 255}, + {686, 2, 12, 65535, 255, 255}, {688, 2, 12, 65535, 255, 255}, + {685, 2, 10, 8447, 255, 255}, {683, 2, 11, 5375, 255, 255}, + {687, 2, 12, 65535, 255, 255}, {689, 2, 12, 65535, 255, 255}, + {752, 0, 12, 65535, 255, 255}, {770, 0, 1, 2600, 255, 255}, + {719, 0, 12, 65535, 255, 255}, {720, 0, 12, 65535, 255, 255}, + {717, 0, 12, 65535, 255, 255}, {718, 0, 12, 65535, 255, 255}, + {759, 1, 12, 65535, 255, 255}, {760, 0, 1, 3583, 255, 255}, + {758, 0, 2, 511, 255, 255}, {755, 0, 4, 1023, 255, 255}, + {753, 1, 12, 65535, 255, 255}, {775, 0, 12, 65535, 255, 255}, + {681, 1, 12, 65535, 255, 255}, {680, 1, 12, 65535, 255, 255}, + {690, 1, 12, 65535, 255, 255}, {691, 1, 12, 65535, 255, 255}, + {653, 1, 12, 65535, 255, 255}, {654, 1, 12, 65535, 255, 255}, + {655, 0, 12, 65535, 255, 255}, {656, 1, 12, 65535, 255, 255}, + {639, 0, 12, 65535, 255, 255}, {641, 0, 12, 65535, 255, 255}, + {640, 0, 12, 65535, 255, 255}, {730, 0, 12, 65535, 255, 255}, + {645, 1, 12, 65535, 255, 255}, {644, 1, 12, 65535, 255, 255}, + {647, 1, 12, 65535, 255, 255}, {646, 1, 12, 65535, 255, 255}, + {643, 1, 12, 65535, 255, 255}, {642, 1, 12, 65535, 255, 255}, + {731, 0, 12, 65535, 255, 255}, {732, 0, 9, 2047, 255, 255}, + {652, 1, 12, 65535, 255, 255}, {648, 1, 12, 65535, 255, 255}, + {649, 1, 12, 65535, 255, 255}, {651, 1, 12, 65535, 255, 255}, + {650, 1, 12, 65535, 255, 255}, {661, 2, 12, 65535, 255, 255}, + {660, 2, 12, 65535, 255, 255}, {707, 1, 12, 65535, 255, 255}, + {709, 1, 12, 65535, 255, 255}, {708, 1, 12, 65535, 255, 255}, + {676, 0, 12, 65535, 255, 255}, {678, 0, 12, 65535, 255, 255}, + {710, 0, 12, 65535, 255, 255}, {711, 1, 12, 65535, 255, 255}, + {712, 1, 12, 65535, 255, 255}, {713, 0, 1, 7935, 255, 255}, + {722, 1, 12, 65535, 255, 255}, {723, 1, 10, 1279, 255, 255}, + {665, 0, 12, 65535, 255, 255}, {662, 1, 12, 65535, 255, 255}, + {663, 1, 12, 65535, 255, 255}, {664, 1, 11, 10495, 255, 255}, + {738, 1, 12, 65535, 255, 255}, {737, 1, 12, 65535, 255, 255}, + {697, 0, 11, 16895, 255, 255}, {698, 13, 12, 65535, 255, 255}, + {761, 0, 5, 14662, 85, 255}, {749, 1, 6, 511, 255, 255}, + {721, 1, 12, 65535, 255, 255}, {733, 0, 12, 65535, 255, 255}, + {677, 0, 12, 65535, 255, 255}, {674, 0, 12, 65535, 255, 255}, + {675, 0, 12, 65535, 255, 255}, {776, 1, 12, 65535, 255, 255}, + {751, 0, 12, 65535, 255, 255}, {694, 2, 4, 511, 255, 255}, + {659, 1, 12, 65535, 255, 255}, {657, 1, 12, 65535, 255, 255}, + {700, 0, 12, 65535, 255, 255}, {703, 0, 12, 65535, 255, 255}, + {670, 2, 12, 65535, 255, 255}, {669, 2, 12, 65535, 255, 255}, + {658, 1, 5, 4351, 255, 255}, {696, 6, 12, 65535, 255, 255}, + {756, 7, 12, 65535, 255, 255}, {757, 7, 12, 65535, 255, 255}, + {772, 2, 12, 65535, 255, 255}, {769, 0, 1, 4095, 255, 255}, + {754, 0, 1, 3885, 255, 255}, {727, 0, 12, 65535, 255, 255}, + {699, 3, 12, 65535, 255, 255}, {705, 1, 12, 65535, 255, 255}, + {704, 1, 0, 1535, 255, 255}, {777, 0, 1, 511, 255, 255}, + {671, 5, 12, 65535, 255, 255}, {728, 0, 12, 65535, 255, 255}, + {729, 2, 12, 65535, 255, 255}, {16387, 0, 12, 65535, 255, 255}, + {672, 0, 12, 65535, 255, 255}, {673, 0, 12, 65535, 255, 255}, + {726, 1, 0, 5178, 255, 255}, {32808, 10, 12, 65535, 255, 255}, + {32807, 10, 12, 65535, 255, 255}, {32810, 11, 12, 65535, 255, 255}, + {32809, 11, 12, 65535, 255, 255}, {32812, 12, 12, 65535, 255, 255}, + {32811, 12, 12, 65535, 255, 255}, }; -COMPILER_STRIP_GATE(0x80391010, &daAlink_c::m_wlAnmDataTable); /* 803914A8-80391734 01DB08 028C+00 2/2 0/0 0/0 .rodata m_faceTexDataTable__9daAlink_c */ SECTION_RODATA u8 const daAlink_c::m_faceTexDataTable[652] = { @@ -7391,101 +7297,61 @@ COMPILER_STRIP_GATE(0x80391734, &lit_5908); /* 80391740-80391754 01DDA0 0014+00 0/1 0/0 0/0 .rodata atnNormalType1$6976 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const atnNormalType1[20] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80391740, &atnNormalType1); +static int const atnNormalType1[5] = {4, 1, 1, 2, 0}; #pragma pop /* 80391754-80391768 01DDB4 0014+00 0/1 0/0 0/0 .rodata atnNormalType2$6977 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const atnNormalType2[20] = { - 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80391754, &atnNormalType2); +static int const atnNormalType2[5] = {3, 0, 0, 1, 1}; #pragma pop /* 80391768-8039177C 01DDC8 0014+00 0/1 0/0 0/0 .rodata atnNormalType3$6978 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const atnNormalType3[20] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80391768, &atnNormalType3); +static int const atnNormalType3[5] = {4, 1, 1, 0, 0}; #pragma pop /* 8039177C-80391790 01DDDC 0014+00 0/1 0/0 0/0 .rodata atnFinishType$6979 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const atnFinishType[20] = { - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x8039177C, &atnFinishType); +static int const atnFinishType[5] = {2, 1, 0, 5, 1}; #pragma pop /* 80391790-803917A4 01DDF0 0014+00 0/1 0/0 0/0 .rodata hitType$6980 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const hitType[20] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x80391790, &hitType); +static int const hitType[5] = {4, 0, 5, 0, 1}; #pragma pop /* 803917A4-803917B8 01DE04 0014+00 0/1 0/0 0/0 .rodata hitFinishType$6981 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const hitFinishType[20] = { - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803917A4, &hitFinishType); +static int const hitFinishType[5] = {2, 1, 0, 5, 0}; #pragma pop /* 803917B8-803917CC 01DE18 0014+00 0/1 0/0 0/0 .rodata normalType1$6982 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const normalType1_6982[20] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x803917B8, &normalType1_6982); +static int const normalType1_6982[5] = {0, 2, 1, 2, 1}; #pragma pop /* 803917CC-803917E0 01DE2C 0014+00 0/1 0/0 0/0 .rodata normalType2$6983 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const normalType2[20] = { - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, -}; -COMPILER_STRIP_GATE(0x803917CC, &normalType2); +static int const normalType2[5] = {1, 1, 2, 1, 2}; #pragma pop /* 803917E0-803917F4 01DE40 0014+00 0/1 0/0 0/0 .rodata normalType3$6984 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const normalType3[20] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x803917E0, &normalType3); +static int const normalType3[5] = {4, 0, 1, 2, 1}; #pragma pop /* 803917F4-80391808 01DE54 0014+00 0/1 0/0 0/0 .rodata finishType$6985 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const finishType[20] = { - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, -}; -COMPILER_STRIP_GATE(0x803917F4, &finishType); +static int const finishType[5] = {2, 0, 0, 5, 1}; #pragma pop /* 80391808-80391858 01DE68 0050+00 0/1 0/0 0/0 .rodata cutParamTable$7312 */ @@ -7516,28 +7382,16 @@ COMPILER_STRIP_GATE(0x80391858, &cutParamTable_7455); #pragma pop /* 803918B8-803918C4 01DF18 000C+00 1/1 0/0 0/0 .rodata localCenter$11047 */ -SECTION_RODATA static u8 const localCenter[12] = { - 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803918B8, &localCenter); +static Vec const localCenter = {-15.0f, 0.0f, 18.0f}; /* 803918C4-803918D0 01DF24 000C+00 1/1 0/0 0/0 .rodata localPos$11819 */ -SECTION_RODATA static u8 const localPos[12] = { - 0x40, 0x5C, 0xCC, 0xCD, 0x42, 0x35, 0x47, 0xAE, 0xC0, 0xE0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803918C4, &localPos); +static Vec const localPos = {3.45f, 45.32f, -7.0f}; /* 803918D0-803918DC 01DF30 000C+00 1/1 0/0 0/0 .rodata slingLocalPos$12042 */ -SECTION_RODATA static u8 const slingLocalPos[12] = { - 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x803918D0, &slingLocalPos); +static Vec const slingLocalPos = {10.0f, 10.0f, 0.0f}; /* 803918DC-803918E8 01DF3C 000C+00 1/1 0/0 0/0 .rodata localSidePos$14270 */ -SECTION_RODATA static u8 const localSidePos[12] = { - 0x40, 0x13, 0x33, 0x33, 0xC1, 0x78, 0x00, 0x00, 0x41, 0x79, 0x99, 0x9A, -}; -COMPILER_STRIP_GATE(0x803918DC, &localSidePos); +static Vec const localSidePos = {2.3f, -15.5f, 15.6f}; /* 803918E8-803918F4 01DF48 000C+00 0/1 0/0 0/0 .rodata m_handLeftOutSidePos__9daAlink_c */ #pragma push @@ -8017,26 +7871,16 @@ SECTION_RODATA static u8 const getSeType[255 + 1 /* padding */] = { COMPILER_STRIP_GATE(0x80391A5C, &getSeType); /* 80391B5C-80391B7C 01E1BC 0020+00 1/1 0/0 0/0 .rodata bgmLabel$37391 */ -SECTION_RODATA static u8 const bgmLabel[32] = { - 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x0B, 0x01, 0x00, 0x00, 0x14, - 0x01, 0x00, 0x00, 0x81, 0x01, 0x00, 0x00, 0x82, 0x01, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0xA0, -}; -COMPILER_STRIP_GATE(0x80391B5C, &bgmLabel); +static u32 const bgmLabel[8] = {0x100001C, 0x100000A, 0x100000B, 0x1000014, + 0x1000081, 0x1000082, 0x1000083, 0x10000A0}; /* 80391B7C-80391B8C 01E1DC 0010+00 1/1 0/0 0/0 .rodata rupeeCount$37407 */ -SECTION_RODATA static u8 const rupeeCount[16] = { - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xC8, -}; -COMPILER_STRIP_GATE(0x80391B7C, &rupeeCount); +static int const rupeeCount[4] = {20, 50, 100, 200}; /* 80391B8C-80391BA0 01E1EC 0014+00 0/1 0/0 0/0 .rodata heartPieceMessage$37580 */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const heartPieceMessage[20] = { - 0x00, 0x00, 0x00, 0x86, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, - 0x00, 0x9D, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x9F, -}; -COMPILER_STRIP_GATE(0x80391B8C, &heartPieceMessage); +static u32 const heartPieceMessage[5] = {0x86, 0x9C, 0x9D, 0x9E, 0x9F}; #pragma pop /* 80391BA0-80391BAC 01E200 000C+00 0/1 0/0 0/0 .rodata effName$39419 */ @@ -8261,10 +8105,7 @@ SECTION_RODATA static u8 const effName_41208[12] = { COMPILER_STRIP_GATE(0x80391D38, &effName_41208); /* 80391D44-80391D54 01E3A4 0010+00 1/1 0/0 0/0 .rodata swordUpColor$41733 */ -SECTION_RODATA static u8 const swordUpColor[16] = { - 0x00, 0x0D, 0x00, 0x0A, 0x00, 0x02, 0x00, 0xFF, 0x00, 0x1C, 0x00, 0x10, 0x00, 0x04, 0x00, 0xFF, -}; -COMPILER_STRIP_GATE(0x80391D44, &swordUpColor); +static GXColorS10 const swordUpColor[2] = {{13, 10, 2, 255}, {28, 16, 4, 255}}; /* 80391D54-80391D60 01E3B4 000C+00 1/1 0/0 0/0 .rodata swordCutSplashScale$41755 */ SECTION_RODATA static u8 const swordCutSplashScale[12] = { @@ -8572,7 +8413,7 @@ asm void daAlink_c::handBgCheck() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setItemHeap() { +asm JKRHeap* daAlink_c::setItemHeap() { nofralloc #include "asm/d/a/d_a_alink/setItemHeap__9daAlink_cFv.s" } @@ -8604,7 +8445,7 @@ asm void daAlink_c::getAnimeResource(daPy_anmHeap_c* param_0, u16 param_1, u32 p #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::initModel(J3DModelData* param_0, u32 param_1, u32 param_2) { +asm J3DModel* daAlink_c::initModel(J3DModelData* param_0, u32 param_1, u32 param_2) { nofralloc #include "asm/d/a/d_a_alink/initModel__9daAlink_cFP12J3DModelDataUlUl.s" } @@ -8771,21 +8612,7 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803AF99C-803AF9A8 00CABC 000A+02 2/2 0/0 0/0 .data l_peepEventName */ -SECTION_DATA static u8 l_peepEventName[10 + 2 /* padding */] = { - 0x50, - 0x45, - 0x45, - 0x50, - 0x5F, - 0x48, - 0x4F, - 0x4C, - 0x45, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static const char l_peepEventName[10] = "PEEP_HOLE"; /* 803AF9A8-803AF9B4 -00001 000C+00 0/1 0/0 0/0 .data @4422 */ #pragma push @@ -13552,84 +13379,31 @@ SECTION_DATA static void* l_wolfJntColData[54] = { /* 803B2C40-803B2C50 00FD60 000D+03 0/1 0/0 0/0 .data defaultPortal$39238 */ #pragma push #pragma force_active on -SECTION_DATA static u8 defaultPortal[13 + 3 /* padding */] = { - 0x50, - 0x4F, - 0x54, - 0x41, - 0x4C, - 0x5F, - 0x57, - 0x41, - 0x52, - 0x50, - 0x49, - 0x4E, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static const char defaultPortal[13] = "POTAL_WARPIN"; #pragma pop /* 803B2C50-803B2C64 00FD70 0014+00 0/1 0/0 0/0 .data kBridgePortal$39239 */ #pragma push #pragma force_active on -SECTION_DATA static u8 kBridgePortal[20] = { - 0x50, 0x4F, 0x52, 0x54, 0x41, 0x4C, 0x5F, 0x57, 0x41, 0x52, - 0x50, 0x5F, 0x4B, 0x42, 0x52, 0x49, 0x44, 0x47, 0x45, 0x00, -}; +SECTION_DATA static const char kBridgePortal[20] = "PORTAL_WARP_KBRIDGE"; #pragma pop /* 803B2C64-803B2C78 00FD84 0014+00 0/1 0/0 0/0 .data oBridgePortal$39240 */ #pragma push #pragma force_active on -SECTION_DATA static u8 oBridgePortal[20] = { - 0x50, 0x4F, 0x52, 0x54, 0x41, 0x4C, 0x5F, 0x57, 0x41, 0x52, - 0x50, 0x5F, 0x4F, 0x42, 0x52, 0x49, 0x44, 0x47, 0x45, 0x00, -}; +SECTION_DATA static const char oBridgePortal[20] = "PORTAL_WARP_OBRIDGE"; #pragma pop /* 803B2C78-803B2C8C 00FD98 0014+00 0/1 0/0 0/0 .data volcBomPortal$39241 */ #pragma push #pragma force_active on -SECTION_DATA static u8 volcBomPortal[20] = { - 0x50, 0x4F, 0x52, 0x54, 0x41, 0x4C, 0x5F, 0x57, 0x41, 0x52, - 0x50, 0x5F, 0x42, 0x49, 0x47, 0x56, 0x4F, 0x4C, 0x43, 0x00, -}; +SECTION_DATA static const char volcBomPortal[20] = "PORTAL_WARP_BIGVOLC"; #pragma pop /* 803B2C8C-803B2CA4 00FDAC 0016+02 0/1 0/0 0/0 .data cannonPortal$39242 */ #pragma push #pragma force_active on -SECTION_DATA static u8 cannonPortal[22 + 2 /* padding */] = { - 0x53, - 0x4B, - 0x59, - 0x5F, - 0x43, - 0x41, - 0x4E, - 0x4E, - 0x4F, - 0x4E, - 0x5F, - 0x57, - 0x41, - 0x52, - 0x50, - 0x5F, - 0x53, - 0x54, - 0x41, - 0x52, - 0x54, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static const char cannonPortal[22] = "SKY_CANNON_WARP_START"; #pragma pop /* 803B2CA4-803B2CB0 -00001 000C+00 0/1 0/0 0/0 .data @39610 */ @@ -14320,7 +14094,8 @@ asm void daAlink_c::createHeap() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMaterialAnm::~J3DMaterialAnm() { +// asm J3DMaterialAnm::~J3DMaterialAnm() { +extern "C" asm void __dt__14J3DMaterialAnmFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__14J3DMaterialAnmFv.s" } @@ -14328,14 +14103,9 @@ asm J3DMaterialAnm::~J3DMaterialAnm() { /* 800A48F0-800A4910 09F230 0020+00 1/1 0/0 0/0 .text daAlink_createHeap__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_createHeap(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_createHeap__FP10fopAc_ac_c.s" +static void daAlink_createHeap(fopAc_ac_c* param_0) { + daAlink_c::createHeap(); } -#pragma pop /* 800A4910-800A4BC8 09F250 02B8+00 5/5 0/0 0/0 .text setSelectEquipItem__9daAlink_cFi */ #pragma push @@ -14348,24 +14118,16 @@ asm void daAlink_c::setSelectEquipItem(int param_0) { #pragma pop /* 800A4BC8-800A4C40 09F508 0078+00 2/2 0/0 0/0 .text checkBoarStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoarStart() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoarStart__9daAlink_cFv.s" +BOOL daAlink_c::checkBoarStart() { + // Stage: Bulblin Camp Room: Outside Arbiter's + return (checkStageName("F_SP118") && getStartRoomNo() == 3) && dComIfGs_getStartPoint() == 0; } -#pragma pop /* 800A4C40-800A4CB4 09F580 0074+00 2/2 0/0 0/0 .text checkCanoeStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeStart() { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeStart__9daAlink_cFv.s" +BOOL daAlink_c::checkCanoeStart() { + // Stage: Lake Hylia Room: Lake + return (checkStageName("F_SP115") && getStartRoomNo() == 0) && dComIfGs_getStartPoint() == 2; } -#pragma pop /* 800A4CB4-800A54F4 09F5F4 0840+00 1/1 0/0 0/0 .text playerInit__9daAlink_cFv */ #pragma push @@ -14379,13 +14141,7 @@ asm void daAlink_c::playerInit() { /* 800A54F4-800A551C 09FE34 0028+00 3/3 0/0 0/0 .text checkHorseStart__9daAlink_cFUli */ BOOL daAlink_c::checkHorseStart(u32 pLastMode, int pStartMode) { - bool horseStart = false; - - if (pLastMode == 1 || pStartMode == 2 || pLastMode == 8) { - horseStart = true; - } - - return horseStart; + return pLastMode == 1 || pStartMode == 2 || pLastMode == 8; } /* 800A551C-800A5CC8 09FE5C 07AC+00 1/1 0/0 0/0 .text setStartProcInit__9daAlink_cFv */ @@ -14400,7 +14156,7 @@ asm void daAlink_c::setStartProcInit() { /* ############################################################################################## */ /* 80450FCC-80450FD0 0004CC 0004+00 1/1 0/0 0/0 .sbss bgWaitFlg$58404 */ -static u8 bgWaitFlg[4]; +static s32 bgWaitFlg; /* 80450FD0-80450FD8 -00001 0008+00 2/2 0/0 0/0 .sbss None */ /* 80450FD0 0001+00 data_80450FD0 None */ @@ -15049,24 +14805,21 @@ asm void daAlink_c::setWolfCollisionPos() { #pragma pop /* 800ABAE0-800ABB28 0A6420 0048+00 2/2 0/0 0/0 .text initLockAt__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initLockAt() { - nofralloc -#include "asm/d/a/d_a_alink/initLockAt__9daAlink_cFv.s" +void daAlink_c::initLockAt() { + field_0x122C[0].OnAtSPrmBit(0x20); + field_0x122C[0].OnAtNoHitMark(); + field_0x122C[0].OffAtNoConHit(); + field_0x122C[0].ResetAtHit(); } -#pragma pop /* 800ABB28-800ABB84 0A6468 005C+00 3/3 0/0 0/0 .text cancelLockAt__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelLockAt() { - nofralloc -#include "asm/d/a/d_a_alink/cancelLockAt__9daAlink_cFv.s" +void daAlink_c::cancelLockAt() { + field_0x122C[0].OffAtSPrmBit(0x20); + field_0x122C[0].OffAtNoHitMark(); + field_0x122C[0].OnAtNoConHit(); + field_0x122C[0].ResetAtHit(); + field_0x814.SetAtApid(0xFFFFFFFF); } -#pragma pop /* 800ABB84-800ABDB8 0A64C4 0234+00 1/1 0/0 0/0 .text setCollisionPos__9daAlink_cFv */ #pragma push @@ -15099,26 +14852,28 @@ asm float daAlink_c::getBaseAnimeFrame() const { #pragma pop /* 800AC378-800AC394 0A6CB8 001C+00 1/0 0/0 0/0 .text setAnimeFrame__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setAnimeFrame(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setAnimeFrame__9daAlink_cFf.s" +void daAlink_c::setAnimeFrame(f32 frame) { + mFrameCtrl1[0].setFrame(frame); + mFrameCtrl1[1].setFrame(frame); + mFrameCtrl1[2].setFrame(frame); + mFrameCtrl2[0].setFrame(frame); + mFrameCtrl2[1].setFrame(frame); + mFrameCtrl2[2].setFrame(frame); } -#pragma pop /* 800AC394-800AC450 0A6CD4 00BC+00 6/6 0/0 0/0 .text * setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* param_0, u8 param_1, s16 param_2, s16 param_3, - f32 param_4, f32 param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff.s" +void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* p_ctrl, u8 attr, s16 start, s16 end, f32 rate, + f32 frame) { + if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + if (checkZoraWearAbility()) { + rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; + } else { + rate *= daAlinkHIO_magneBoots_c0::m.mWaterWalkAnmRate; + } + } + p_ctrl->setFrameCtrl(attr, start, end, rate, frame); } -#pragma pop /* ############################################################################################## */ /* 80453278-80453280 001878 0008+00 1/1 0/0 0/0 .sdata2 kandelaarAnm$62207 */ @@ -15173,14 +14928,13 @@ asm void daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM param_0, J3DAnmTra #pragma pop /* 800AC738-800AC754 0A7078 001C+00 7/7 0/0 0/0 .text setDoubleAnimeBlendRatio__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDoubleAnimeBlendRatio(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDoubleAnimeBlendRatio__9daAlink_cFf.s" +void daAlink_c::setDoubleAnimeBlendRatio(f32 param_0) { + f32 tmp = lit_6040; // remove later + field_0x1f28[0].setRatio(tmp - param_0); + field_0x1f28[1].setRatio(param_0); + mNowAnmPack[0].setRatio(tmp - param_0); + mNowAnmPack[1].setRatio(param_0); } -#pragma pop /* 800AC754-800ACA14 0A7094 02C0+00 2/2 0/0 0/0 .text * commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi @@ -15223,37 +14977,21 @@ asm void daAlink_c::commonSingleAnime(J3DAnmTransform* param_0, J3DAnmTransform* /* 800ACF80-800ACFB0 0A78C0 0030+00 88/88 0/0 0/0 .text * setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeBase(daAlink_c::daAlink_ANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" +void daAlink_c::setSingleAnimeBase(daAlink_c::daAlink_ANM anm) { + setSingleAnime(anm, lit_6040, FLOAT_LABEL(lit_6108), -1, lit_6109); } -#pragma pop /* 800ACFB0-800ACFE0 0A78F0 0030+00 27/27 0/0 0/0 .text * setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf.s" +void daAlink_c::setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anm, f32 param_1) { + setSingleAnime(anm, lit_6040, FLOAT_LABEL(lit_6108), -1, param_1); } -#pragma pop /* 800ACFE0-800AD00C 0A7920 002C+00 77/77 0/0 0/0 .text * setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM param_0, f32 param_1, - f32 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff.s" +void daAlink_c::setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anm, f32 param_1, f32 param_2) { + setSingleAnime(anm, param_1, FLOAT_LABEL(lit_6108), -1, param_2); } -#pragma pop /* 800AD00C-800AD0F4 0A794C 00E8+00 58/58 0/0 0/0 .text * setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf */ @@ -15281,14 +15019,12 @@ asm void daAlink_c::setSingleAnimeParam(daAlink_c::daAlink_ANM param_0, /* 800AD128-800AD170 0A7A68 0048+00 1/1 0/0 0/0 .text * animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::animePlay(J3DAnmTransform* param_0, daPy_frameCtrl_c* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c.s" +void daAlink_c::animePlay(J3DAnmTransform* param_0, daPy_frameCtrl_c* param_1) { + if (param_0 != NULL) { + param_1->updateFrame(); + param_0->setFrame(param_1->getFrame()); + } } -#pragma pop /* 800AD170-800AD2D8 0A7AB0 0168+00 2/2 0/0 0/0 .text allAnimePlay__9daAlink_cFv */ #pragma push @@ -15696,24 +15432,25 @@ void dBgS_RoofChk::SetPos(cXyz const& pos) { } /* 800B1488-800B14B4 0ABDC8 002C+00 4/4 0/0 0/0 .text checkWaterPolygonUnder__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWaterPolygonUnder() { - nofralloc -#include "asm/d/a/d_a_alink/checkWaterPolygonUnder__9daAlink_cFv.s" +BOOL daAlink_c::checkWaterPolygonUnder() { + return i_checkModeFlg(MODE_SWIMMING) || mCurrent.mPosition.y < mWaterY; } -#pragma pop /* 800B14B4-800B154C 0ABDF4 0098+00 2/2 0/0 0/0 .text setWaterY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterY() { - nofralloc -#include "asm/d/a/d_a_alink/setWaterY__9daAlink_cFv.s" +void daAlink_c::setWaterY() { + if (mLinkAcch.ChkWaterHit()) { + i_onNoResetFlg0(FLG0_UNK_80); + field_0x2fbc = dComIfG_Bgsp().GetPolyAtt0(mLinkAcch.m_wtr); + mWaterY = mLinkAcch.m_wtr.GetHeight(); + if (field_0x2fbc != 6) { + checkWaterInKandelaar(mWaterY); + } + } else { + i_offNoResetFlg0(FLG0_UNK_80); + field_0x2fbc = 16; + mWaterY = lit_9138; + } } -#pragma pop /* 800B154C-800B172C 0ABE8C 01E0+00 2/2 0/0 0/0 .text setHangWaterY__9daAlink_cFv */ #pragma push @@ -15763,25 +15500,17 @@ asm void daAlink_c::setBgCheckParam() { /* 800B1B28-800B1B68 0AC468 0040+00 4/4 0/0 0/0 .text checkNotJumpSinkLimit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotJumpSinkLimit() { - nofralloc -#include "asm/d/a/d_a_alink/checkNotJumpSinkLimit__9daAlink_cFv.s" +BOOL daAlink_c::checkNotJumpSinkLimit() { + return mSinkShapeOffset < lit_14614 || field_0x2fbd == 3 || + (field_0x2fbd == 4 && mSinkShapeOffset < lit_14624); } -#pragma pop /* 800B1B68-800B1BAC 0AC4A8 0044+00 2/2 0/0 0/0 .text checkNotItemSinkLimit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotItemSinkLimit() { - nofralloc -#include "asm/d/a/d_a_alink/checkNotItemSinkLimit__9daAlink_cFv.s" +BOOL daAlink_c::checkNotItemSinkLimit() { + return mSinkShapeOffset < lit_28045 && + (field_0x2fbd == 1 || field_0x2fbd == 2 || field_0x2fbd == 3 || field_0x2fbd == 4); } -#pragma pop /* ############################################################################################## */ /* 804532A8-804532AC 0018A8 0004+00 1/1 0/0 0/0 .sdata2 @64730 */ @@ -15801,27 +15530,9 @@ asm void daAlink_c::setSandShapeOffset() { #pragma pop /* 800B1FB8-800B1FD8 0AC8F8 0020+00 2/2 0/0 0/0 .text checkLv2MiddleBossBgRide__9daAlink_cFs */ -#ifdef NONMATCHING -bool daAlink_c::checkLv2MiddleBossBgRide(short param1) { - bool check = false; - - // beqlr needs to be beq - if (param1 != 0x7B && param1 == 0x7D) { - check = true; - } - - return check; +bool daAlink_c::checkLv2MiddleBossBgRide(short param_0) { + return param_0 == 0x7B || param_0 == 0x7D; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkLv2MiddleBossBgRide(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkLv2MiddleBossBgRide__9daAlink_cFs.s" -} -#pragma pop -#endif /* 800B1FD8-800B21EC 0AC918 0214+00 11/11 0/0 0/0 .text getSlidePolygon__9daAlink_cFP8cM3dGPla */ #pragma push @@ -15834,14 +15545,9 @@ asm void daAlink_c::getSlidePolygon(cM3dGPla* param_0) { #pragma pop /* 800B21EC-800B221C 0ACB2C 0030+00 4/4 0/0 0/0 .text checkSlope__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSlope() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSlope__9daAlink_cCFv.s" +BOOL daAlink_c::checkSlope() const { + return field_0x3174 != 8 && field_0x2ff0 < -field_0x3122; } -#pragma pop /* 800B221C-800B23FC 0ACB5C 01E0+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi */ @@ -15877,13 +15583,13 @@ asm void daAlink_c::setPlayerPosAndAngle(f32 (*param_0)[4]) { /* 800B25CC-800B25E8 0ACF0C 001C+00 16/16 0/0 0/0 .text itemTriggerCheck__9daAlink_cFUc */ -u32 daAlink_c::itemTriggerCheck(u8 pTrigger) { +BOOL daAlink_c::itemTriggerCheck(u8 pTrigger) { field_0x2fae |= pTrigger; return mItemTrigger & pTrigger; } /* 800B25E8-800B2604 0ACF28 001C+00 11/11 0/0 0/0 .text itemButtonCheck__9daAlink_cFUc */ -u32 daAlink_c::itemButtonCheck(u8 pButton) { +BOOL daAlink_c::itemButtonCheck(u8 pButton) { field_0x2fae |= pButton; return mItemButton & pButton; } @@ -15904,12 +15610,12 @@ void daAlink_c::spActionTrigger() { itemTriggerCheck(64); } -u32 daAlink_c::midnaTalkTrigger() const { +BOOL daAlink_c::midnaTalkTrigger() const { return mItemTrigger & 4; } -void daAlink_c::swordSwingTrigger() { - itemTriggerCheck(8); +BOOL daAlink_c::swordSwingTrigger() { + return itemTriggerCheck(8); } /* 800B26DC-800B26FC 0AD01C 0020+00 2/2 0/0 0/0 .text setItemActionButtonStatus__9daAlink_cFUc */ @@ -15977,7 +15683,7 @@ void daAlink_c::setBStatus(u8 status) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkAtnWaitAnime() { +asm BOOL daAlink_c::checkAtnWaitAnime() { nofralloc #include "asm/d/a/d_a_alink/checkAtnWaitAnime__9daAlink_cFv.s" } @@ -15985,14 +15691,15 @@ asm void daAlink_c::checkAtnWaitAnime() { /* 800B3358-800B33E4 0ADC98 008C+00 2/2 0/0 0/0 .text * setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTiredVoice(daPy_frameCtrl_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c.s" +void daAlink_c::setTiredVoice(daPy_frameCtrl_c* param_0) { + if (param_0->checkPass(lit_7448)) { + if (i_dComIfGs_getLife() <= 2) { + voiceStart(Z2SE_AL_V_TIRED_L); + } else { + voiceStart(Z2SE_AL_V_TIRED_S); + } + } } -#pragma pop /* 800B33E4-800B3494 0ADD24 00B0+00 4/4 0/0 0/0 .text checkRestHPAnime__9daAlink_cFv */ #pragma push @@ -16057,14 +15764,9 @@ asm void daAlink_c::initServiceWaitTime() { #pragma pop /* 800B3904-800B3924 0AE244 0020+00 50/50 0/0 0/0 .text checkZeroSpeedF__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkZeroSpeedF() const { - nofralloc -#include "asm/d/a/d_a_alink/checkZeroSpeedF__9daAlink_cCFv.s" +bool daAlink_c::checkZeroSpeedF() const { + return fabsf(mNormalSpeed) < lit_12328; } -#pragma pop /* 800B3924-800B3F2C 0AE264 0608+00 14/14 0/0 0/0 .text setNormalSpeedF__9daAlink_cFff */ #pragma push @@ -16130,22 +15832,20 @@ asm void daAlink_c::checkServiceWaitMode() { #pragma pop /* 800B48D0-800B4908 0AF210 0038+00 18/18 0/0 0/0 .text setJumpMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setJumpMode() { - nofralloc -#include "asm/d/a/d_a_alink/setJumpMode__9daAlink_cFv.s" +void daAlink_c::setJumpMode() { + onModeFlg(MODE_JUMP); + mLastJumpPos = mCurrent.mPosition; + mFallHeight = mLastJumpPos.y; + field_0x33c8 = mLastJumpPos.y; } -#pragma pop /* 800B4908-800B4918 0AF248 0010+00 0/0 0/0 1/1 .text getMetamorphoseNearDis__9daAlink_cCFv */ -float daAlink_c::getMetamorphoseNearDis() const { +f32 daAlink_c::getMetamorphoseNearDis() const { return daAlinkHIO_basic_c0::m.mTransformBlockNearDis; } /* 800B4918-800B4928 0AF258 0010+00 0/0 0/0 1/1 .text getMetamorphoseFarDis__9daAlink_cCFv */ -float daAlink_c::getMetamorphoseFarDis() const { +f32 daAlink_c::getMetamorphoseFarDis() const { return daAlinkHIO_basic_c0::m.mTransformBlockFarDis; } @@ -16155,24 +15855,30 @@ s16 daAlink_c::getMetamorphoseFarAngle() const { } /* 800B4938-800B4950 0AF278 0018+00 0/0 1/1 0/0 .text setMidnaMsg__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMidnaMsg() { - nofralloc -#include "asm/d/a/d_a_alink/setMidnaMsg__9daAlink_cFv.s" +void daAlink_c::setMidnaMsg() { + if (mMidnaMsg != NULL) { + mMidnaMsg->onUseFlg(); + } } -#pragma pop /* 800B4950-800B4A08 0AF290 00B8+00 3/3 0/0 0/0 .text notTalk__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::notTalk() { - nofralloc -#include "asm/d/a/d_a_alink/notTalk__9daAlink_cFv.s" +bool daAlink_c::notTalk() { + BOOL chk; + if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && dBgS_CheckBGroundPoly(mLinkAcch.m_gnd)) { + chk = true; + } else { + chk = false; + } + + if ((mMidnaTalkDelayTimer != 0 || + (i_checkMagneBootsOn() && !cBgW_CheckBGround(mMagneBootsTopVec.y))) || + !i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | + MODE_RIDING | MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP) && + !chk) { + return true; + } + return false; } -#pragma pop /* 800B4A08-800B4B2C 0AF348 0124+00 11/11 0/0 0/0 .text setTalkStatus__9daAlink_cFv */ #pragma push @@ -16185,14 +15891,13 @@ asm void daAlink_c::setTalkStatus() { #pragma pop /* 800B4B2C-800B4B7C 0AF46C 0050+00 1/1 0/0 0/0 .text getFrontRollRate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFrontRollRate() { - nofralloc -#include "asm/d/a/d_a_alink/getFrontRollRate__9daAlink_cFv.s" +f32 daAlink_c::getFrontRollRate() { + if (checkHeavyStateOn(1, 1)) { + return lit_16641 * mHeavySpeedMultiplier; + } else { + return lit_16641; + } } -#pragma pop /* 800B4B7C-800B5284 0AF4BC 0708+00 2/2 0/0 0/0 .text decideCommonDoStatus__9daAlink_cFv */ @@ -16219,34 +15924,47 @@ asm void daAlink_c::decideDoStatus() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWaitAction() { +asm BOOL daAlink_c::checkWaitAction() { nofralloc #include "asm/d/a/d_a_alink/checkWaitAction__9daAlink_cFv.s" } #pragma pop /* 800B5BC0-800B5C34 0B0500 0074+00 3/3 0/0 0/0 .text setFallVoice__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFallVoice() { - nofralloc -#include "asm/d/a/d_a_alink/setFallVoice__9daAlink_cFv.s" +void daAlink_c::setFallVoice() { + if (mFallVoiceInit == 0 && lit_8782 * (mFallHeight - mCurrent.mPosition.y) > lit_8676) { + voiceStart(Z2SE_AL_V_FALL); + mFallVoiceInit = 1; + } } -#pragma pop /* 800B5C34-800B5C64 0B0574 0030+00 2/2 0/0 0/0 .text setLandPassiveData__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLandPassiveData() { - nofralloc -#include "asm/d/a/d_a_alink/setLandPassiveData__9daAlink_cFv.s" +void daAlink_c::setLandPassiveData() { + if (field_0x30f0 == 0) { + if (doTrigger()) { + field_0x30f0 = 0x41; + } + } else { + field_0x30f0--; + } } -#pragma pop /* 800B5C64-800B5CCC 0B05A4 0068+00 5/5 0/0 0/0 .text setStepLandVibration__9daAlink_cFv */ +// cXyz issues +#ifdef NONMATCHING +void daAlink_c::setStepLandVibration() { + int shock; + if (checkBootsOrArmorHeavy()) { + shock = 3; + } else { + shock = 1; + } + cXyz xyz(0.0f, 1.0f, 0.0f); + + dComIfGp_getVibration().StartShock(shock, 15, xyz); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -16255,6 +15973,7 @@ asm void daAlink_c::setStepLandVibration() { #include "asm/d/a/d_a_alink/setStepLandVibration__9daAlink_cFv.s" } #pragma pop +#endif /* 800B5CCC-800B5F6C 0B060C 02A0+00 5/5 0/0 0/0 .text checkLandAction__9daAlink_cFi */ #pragma push @@ -16270,7 +15989,7 @@ asm void daAlink_c::checkLandAction(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSlideAction() { +asm BOOL daAlink_c::checkSlideAction() { nofralloc #include "asm/d/a/d_a_alink/checkSlideAction__9daAlink_cFv.s" } @@ -16288,14 +16007,12 @@ asm void daAlink_c::checkAutoJumpAction() { #pragma pop /* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text checkCutJumpInFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutJumpInFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutJumpInFly__9daAlink_cFv.s" +bool daAlink_c::checkCutJumpInFly() { + if ((mEquipItem == EQUIP_SWORD && i_checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) { + return procCutJumpInit(1); + } + return false; } -#pragma pop /* ############################################################################################## */ /* 80450698-8045069C 000118 0004+00 4/4 0/0 0/0 .sdata l_ladderAnmBaseTransY */ @@ -16331,15 +16048,16 @@ asm void daAlink_c::checkItemChangeAutoAction() { } #pragma pop -/* 800B7168-800B7190 0B1AA8 0028+00 7/7 0/0 0/0 .text setFastShotTimer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFastShotTimer() { - nofralloc -#include "asm/d/a/d_a_alink/setFastShotTimer__9daAlink_cFv.s" +inline bool i_dComIfGp_checkPlayerStatus0(int param_0, u32 flag) { + return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 0, flag); +} + +/* 800B7168-800B7190 0B1AA8 0028+00 7/7 0/0 0/0 .text setFastShotTimer__9daAlink_cFv */ +void daAlink_c::setFastShotTimer() { + if (!i_dComIfGp_checkPlayerStatus0(0, 0x2000)) { + mFastShotTime = daAlinkHIO_item_c0::m.mItemFPTransitionTimer; + } } -#pragma pop /* 800B7190-800B71EC 0B1AD0 005C+00 9/9 0/0 0/0 .text cancelItemUseQuake__9daAlink_cFi */ #pragma push @@ -16377,21 +16095,24 @@ asm void daAlink_c::checkItemActorPointer() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSwordTwirlAction() { +asm bool daAlink_c::checkSwordTwirlAction() { nofralloc #include "asm/d/a/d_a_alink/checkSwordTwirlAction__9daAlink_cFv.s" } #pragma pop /* 800B74B4-800B7528 0B1DF4 0074+00 3/3 0/0 0/0 .text checkUpperItemActionFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionFly__9daAlink_cFv.s" +BOOL daAlink_c::checkUpperItemActionFly() { + if (checkBowAndSlingItem(mEquipItem)) { + checkUpperItemActionBowFly(); + } else if (mEquipItem == BOOMERANG) { + checkUpperItemActionBoomerangFly(); + } else if (mEquipItem == COPY_ROD) { + checkUpperItemActionCopyRodFly(); + } + + return checkCanoeJumpRide(); } -#pragma pop /* 800B7528-800B75EC 0B1E68 00C4+00 1/1 0/0 0/0 .text checkItemButtonChange__9daAlink_cFv */ @@ -16416,23 +16137,20 @@ asm void daAlink_c::checkUpperItemAction() { #pragma pop /* 800B7B7C-800B7BF8 0B24BC 007C+00 1/1 0/0 0/0 .text orderPeep__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::orderPeep() { - nofralloc -#include "asm/d/a/d_a_alink/orderPeep__9daAlink_cFv.s" +void daAlink_c::orderPeep() { + field_0x2fad = field_0x27f4->getSceneListID(); + field_0x2ff2 = 20; + fopAcM_orderOtherEvent(this, field_0x27f4, l_peepEventName, 0xFFFF, 1, 0); + if (i_checkWolf()) { + procWolfWaitInit(); + } else { + procWaitInit(); + } } -#pragma pop /* ############################################################################################## */ /* 804532B0-804532B4 0018B0 0004+00 1/1 0/0 0/0 .sdata2 itemTalkType$67468 */ -SECTION_SDATA2 static u8 itemTalkType[4] = { - 0x00, - 0x06, - 0x00, - 0x07, -}; +SECTION_SDATA2 static u16 itemTalkType[2] = {6, 7}; /* 800B7BF8-800B7D4C 0B2538 0154+00 13/13 0/0 0/0 .text orderTalk__9daAlink_cFi */ #pragma push @@ -16488,15 +16206,18 @@ asm void daAlink_c::checkNormalAction() { } #pragma pop -/* 800B8930-800B8988 0B3270 0058+00 11/11 0/0 0/0 .text checkReadyItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkReadyItem() { - nofralloc -#include "asm/d/a/d_a_alink/checkReadyItem__9daAlink_cFv.s" +u16 daAlink_c::getReadyItem() { + return dComIfGp_getSelectItem(mSelectItemId); +} + +/* 800B8930-800B8988 0B3270 0058+00 11/11 0/0 0/0 .text checkReadyItem__9daAlink_cFv */ +bool daAlink_c::checkReadyItem() { + if (mEquipItem == NO_ITEM) { + return false; + } + + return getReadyItem() == mEquipItem; } -#pragma pop /* 800B8988-800B9010 0B32C8 0688+00 2/2 0/0 0/0 .text checkItemAction__9daAlink_cFv */ #pragma push @@ -16525,21 +16246,42 @@ asm void daAlink_c::checkMoveDoAction() { /* 800B9148-800B9254 0B3A88 010C+00 3/3 0/0 0/0 .text checkSideRollAction__9daAlink_cFi */ +#ifdef NONMATCHING +BOOL daAlink_c::checkSideRollAction(int param_0) { + if (checkNotJumpSinkLimit() || checkHeavyStateOn(1, 1) || checkInputOnR() || + checkCutBackState()) { + return false; + } else { + if (mTargetedActor != NULL) { + if (checkEnemyGroup(mTargetedActor) && + mTargetedActor->mCurrent.mPosition.abs2XZ(mCurrent.mPosition) <= lit_6237) { + return procSideRollInit(param_0); + } else { + return procTurnMoveInit(param_0); + } + } else { + return procSideRollInit(param_0); + } + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSideRollAction(int param_0) { +asm BOOL daAlink_c::checkSideRollAction(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkSideRollAction__9daAlink_cFi.s" } #pragma pop +#endif /* 800B9254-800B92D0 0B3B94 007C+00 35/35 0/0 0/0 .text checkNoUpperAnime__9daAlink_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNoUpperAnime() const { +asm BOOL daAlink_c::checkNoUpperAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkNoUpperAnime__9daAlink_cCFv.s" } @@ -16570,7 +16312,7 @@ asm void daAlink_c::checkItemEquipAnime() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkEquipAnime() const { +asm BOOL daAlink_c::checkEquipAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkEquipAnime__9daAlink_cCFv.s" } @@ -16623,14 +16365,14 @@ asm void daAlink_c::swordUnequip() { #pragma pop /* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text itemEquip__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::itemEquip(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/itemEquip__9daAlink_cFUs.s" +void daAlink_c::itemEquip(u16 item_id) { + if (mThrowBoomerangActor.getActor() == NULL || item_id != BOOMERANG) { + field_0x2fde = item_id; + dComIfGp_clearPlayerStatus0(0, 0x400000); + i_offNoResetFlg3(0x40000); + itemUnequip(field_0x2fde, lit_6041); + } } -#pragma pop /* 800B96A4-800B97EC 0B3FE4 0148+00 2/2 0/0 0/0 .text itemUnequip__9daAlink_cFUsf */ #pragma push @@ -16666,7 +16408,7 @@ asm void daAlink_c::allUnequip(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkItemChangeFromButton() { +asm BOOL daAlink_c::checkItemChangeFromButton() { nofralloc #include "asm/d/a/d_a_alink/checkItemChangeFromButton__9daAlink_cFv.s" } @@ -16676,7 +16418,7 @@ asm void daAlink_c::checkItemChangeFromButton() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNextActionFromButton() { +asm BOOL daAlink_c::checkNextActionFromButton() { nofralloc #include "asm/d/a/d_a_alink/checkNextActionFromButton__9daAlink_cFv.s" } @@ -16686,7 +16428,7 @@ asm void daAlink_c::checkNextActionFromButton() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGroundSpecialMode() { +asm BOOL daAlink_c::checkGroundSpecialMode() { nofralloc #include "asm/d/a/d_a_alink/checkGroundSpecialMode__9daAlink_cFv.s" } @@ -16806,36 +16548,27 @@ inline u16 i_dComIfGs_getRupee() { /* 800BB408-800BB458 0B5D48 0050+00 6/6 0/0 0/0 .text checkMagicArmorHeavy__9daAlink_cCFv */ BOOL daAlink_c::checkMagicArmorHeavy() const { - bool check = false; - - if (checkMagicArmorWearAbility() && i_dComIfGs_getRupee() == 0) { - check = true; - } - - return check; + return checkMagicArmorWearAbility() && i_dComIfGs_getRupee() == 0; } /* 800BB458-800BB4B8 0B5D98 0060+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daAlink_cCFv */ BOOL daAlink_c::checkBootsOrArmorHeavy() const { - bool check = false; - - if (i_checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime()) { - check = true; - } - - return check; + return i_checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime(); } /* 800BB4B8-800BB560 0B5DF8 00A8+00 29/29 0/0 0/0 .text checkHeavyStateOn__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHeavyStateOn(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkHeavyStateOn__9daAlink_cFii.s" +// param_0 something related to boots +BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) { + if (!checkEventRun()) { + if ((param_1 != 0 && mSinkShapeOffset < lit_14614) || + (param_0 != 0 && checkIronBallWaitAnime()) || checkIronBallAnime() || + checkMagicArmorHeavy() || getHeavyStateAndBoots()) { + return true; + } + } + return false; } -#pragma pop /* 800BB560-800BB644 0B5EA0 00E4+00 1/0 0/0 0/0 .text setOutPower__9daAlink_cFfsi */ #pragma push @@ -17045,6 +16778,12 @@ asm void daAlink_c::checkSceneChange(int param_0) { #pragma pop /* 800BF084-800BF0B8 0B99C4 0034+00 1/0 0/0 0/0 .text voiceStart__9daAlink_cFUl */ +// matches, but JAISoundID(u32) constructor needs to be inlined? +#ifdef NONMATCHING +void daAlink_c::voiceStart(u32 sfx_id) { + mZ2Link.startLinkVoice(sfx_id, mVoiceReverbIntensity); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -17053,6 +16792,7 @@ asm void daAlink_c::voiceStart(u32 param_0) { #include "asm/d/a/d_a_alink/voiceStart__9daAlink_cFUl.s" } #pragma pop +#endif /* 800BF0B8-800BF0EC 0B99F8 0034+00 14/14 0/0 0/0 .text voiceStartLevel__9daAlink_cFUl */ #pragma push @@ -17188,45 +16928,144 @@ asm void daAlink_c::returnKeepItemData() { } #pragma pop +inline daHorse_c* i_dComIfGp_getHorseActor() { + return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1); +} + /* 800BF8D0-800BF9F0 0BA210 0120+00 2/2 0/0 0/0 .text setItemModel__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setItemModel() { +asm BOOL daAlink_c::setItemModel() { nofralloc #include "asm/d/a/d_a_alink/setItemModel__9daAlink_cFv.s" } #pragma pop /* 800BF9F0-800BFD74 0BA330 0384+00 4/4 0/0 0/0 .text setItemActor__9daAlink_cFv */ +// register issues +#ifdef NONMATCHING +BOOL daAlink_c::setItemActor() { + if (mEquipItem == BOOMERANG) { + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(0xFE, 0, &mCurrent.mPosition, -1, NULL, + NULL, -1, NULL, NULL); + if (actor == NULL) { + deleteEquipItem(0, 0); + return false; + } else { + mItemActor.setData(actor); + field_0x2f94 = 2; + return true; + } + } else if (mEquipItem == COPY_ROD) { + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 0, &mCurrent.mPosition, -1, NULL, + NULL, -1, NULL, NULL); + if (actor == NULL) { + deleteEquipItem(0, 0); + return false; + } else { + mItemActor.setData(actor); + field_0x2f94 = 2; + return true; + } + } else if (mEquipItem == IRONBALL) { + fopAc_ac_c* actor = daCrod_c::makeIronBallDummy(this); + if (actor == NULL) { + if (checkIronBallWaitAnime()) { + resetUpperAnime(UPPER_NOW, -1.0f); + } + deleteEquipItem(0, 0); + return false; + } else { + mItemActor.setData(actor); + field_0x173c.SetActor(actor); + return true; + } + } else if (checkFisingRodLure()) { + u32 id = fopAcM_create(0x2E4, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF); + mItemActor.setID(id); + initFishingRodHand(); + return 1; + } else if (checkFishingRodItem(mEquipItem)) { + setGroundFishingRodActor(); + return 1; + } else if (checkBombItem(mEquipItem)) { + if (checkHorseRide()) { + if (!i_dComIfGp_getHorseActor()->checkNoBombProc() && + (mActionID != HORSE_TURN || !i_checkModeFlg(MODE_DISABLE_ITEMS))) { + mEquipItem = NO_ITEM; + return 1; + } + } + cXyz create_pos = (mLeftHandPos + mRightHandPos) * 0.5f; + if (checkReadyItem()) { + fopAc_ac_c* actor; + if (mEquipItem == NORMAL_BOMB) { + actor = dBomb_c::createNormalBombPlayer(&create_pos); + } else { + actor = dBomb_c::createWaterBombPlayer(&create_pos); + } + if (actor != NULL) { + mActiveBombNum++; + setGrabItemActor(actor); + dComIfGp_addSelectItemNum(mSelectItemId, -1); + field_0x33e4 = 38.0f; + setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } + } + mEquipItem = NO_ITEM; + return true; + } + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setItemActor() { +asm BOOL daAlink_c::setItemActor() { nofralloc #include "asm/d/a/d_a_alink/setItemActor__9daAlink_cFv.s" } #pragma pop +#endif /* 800BFD74-800BFDB0 0BA6B4 003C+00 2/2 0/0 0/0 .text makeItemType__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::makeItemType() { - nofralloc -#include "asm/d/a/d_a_alink/makeItemType__9daAlink_cFv.s" +void daAlink_c::makeItemType() { + if (!setItemModel()) { + setItemActor(); + } +} + +bool daPy_py_c::checkZoraWearFlg() const { + return dComIfGs_getSelectEquipClothes() == WEAR_ZORA; } -#pragma pop /* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */ +// li 0 needs to be mr +#ifdef NONMATCHING +BOOL daAlink_c::checkZoraWearAbility() const { + bool ret = false; + bool wear_zora = false; + if (!i_checkWolf()) { + if (checkZoraWearFlg()) { + wear_zora = true; + } + } + if (wear_zora && !i_checkNoResetFlg2(UNK_ARMOR)) { + ret = true; + } + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkZoraWearAbility() const { +asm BOOL daAlink_c::checkZoraWearAbility() const { nofralloc #include "asm/d/a/d_a_alink/checkZoraWearAbility__9daAlink_cCFv.s" } #pragma pop +#endif /* 800BFDFC-800BFE48 0BA73C 004C+00 5/5 0/0 0/0 .text checkMagicArmorWearAbility__9daAlink_cCFv */ #pragma push @@ -17242,7 +17081,7 @@ asm BOOL daAlink_c::checkMagicArmorWearAbility() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::loadAramBmd(u16 param_0, u32 param_1) { +asm J3DModelData* daAlink_c::loadAramBmd(u16 param_0, u32 param_1) { nofralloc #include "asm/d/a/d_a_alink/loadAramBmd__9daAlink_cFUsUl.s" } @@ -17262,7 +17101,7 @@ asm void daAlink_c::loadAram(u16 param_0, u32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::loadAramItemBrk(u16 param_0, J3DModel* param_1) { +asm J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 param_0, J3DModel* param_1) { nofralloc #include "asm/d/a/d_a_alink/loadAramItemBrk__9daAlink_cFUsP8J3DModel.s" } @@ -17373,7 +17212,7 @@ asm bool daAlink_c::checkCastleTown() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCloudSea() { +asm bool daAlink_c::checkCloudSea() { nofralloc #include "asm/d/a/d_a_alink/checkCloudSea__9daAlink_cFv.s" } @@ -17383,109 +17222,76 @@ asm void daAlink_c::checkCloudSea() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkRoomOnly() { +asm bool daAlink_c::checkRoomOnly() { nofralloc #include "asm/d/a/d_a_alink/checkRoomOnly__9daAlink_cFv.s" } #pragma pop -/* ############################################################################################## */ -/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803925C2 = "D_MN04"; -#pragma pop - /* 800C044C-800C04B4 0BAD8C 0068+00 3/3 0/0 0/0 .text checkLv2DungeonRoomSpecial__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLv2DungeonRoomSpecial() { - nofralloc -#include "asm/d/a/d_a_alink/checkLv2DungeonRoomSpecial__9daAlink_cFv.s" +bool daAlink_c::checkLv2DungeonRoomSpecial() { + return checkStageName("D_MN04") && + (dComIfGp_roomControl_getStayNo() == 14 || dComIfGp_roomControl_getStayNo() == 16 || + dComIfGp_roomControl_getStayNo() == 17); } -#pragma pop /* 800C04B4-800C0520 0BADF4 006C+00 2/2 0/0 0/0 .text checkRoomSpecial__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkRoomSpecial() { - nofralloc -#include "asm/d/a/d_a_alink/checkRoomSpecial__9daAlink_cFv.s" -} -#pragma pop - -/* 800C0520-800C0594 0BAE60 0074+00 1/1 0/0 0/0 .text checkRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkRoom__9daAlink_cFv.s" -} -#pragma pop - -/* 800C0594-800C05DC 0BAED4 0048+00 8/8 0/0 0/0 .text checkNotBattleStage__9daAlink_cFv - */ +// 1 wrong branch #ifdef NONMATCHING -bool daAlink_c::checkNotBattleStage(void) { - bool isNotBattleStage = false; - - if (checkRoom() || checkCastleTown()) { - isNotBattleStage = true; - } - - return isNotBattleStage; +bool daAlink_c::checkRoomSpecial() { + return !checkStageName("D_MN11") || dComIfGp_roomControl_getStayNo() == 1 || + dComIfGp_roomControl_getStayNo() == 2 || checkLv2DungeonRoomSpecial(); } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daAlink_c::checkNotBattleStage() { +asm bool daAlink_c::checkRoomSpecial() { nofralloc -#include "asm/d/a/d_a_alink/checkNotBattleStage__9daAlink_cFv.s" +#include "asm/d/a/d_a_alink/checkRoomSpecial__9daAlink_cFv.s" } #pragma pop #endif -/* 800C05DC-800C0630 0BAF1C 0054+00 2/2 0/0 0/0 .text checkNotHeavyBootsStage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotHeavyBootsStage() { - nofralloc -#include "asm/d/a/d_a_alink/checkNotHeavyBootsStage__9daAlink_cFv.s" +/* 800C0520-800C0594 0BAE60 0074+00 1/1 0/0 0/0 .text checkRoom__9daAlink_cFv */ +bool daAlink_c::checkRoom() { + return checkRoomOnly() || checkRoomSpecial() || + checkStageName("R_SP161") && !dComIfGs_isOneZoneSwitch(14, -1); +} + +/* 800C0594-800C05DC 0BAED4 0048+00 8/8 0/0 0/0 .text checkNotBattleStage__9daAlink_cFv + */ +bool daAlink_c::checkNotBattleStage() { + return checkRoom() || checkCastleTown(); +} + +/* 800C05DC-800C0630 0BAF1C 0054+00 2/2 0/0 0/0 .text checkNotHeavyBootsStage__9daAlink_cFv */ +bool daAlink_c::checkNotHeavyBootsStage() { + return (checkNotBattleStage() || checkCloudSea()) && !checkLv2DungeonRoomSpecial(); } -#pragma pop /* 800C0630-800C0678 0BAF70 0048+00 1/1 0/0 0/0 .text checkNotAutoJumpStage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotAutoJumpStage() { - nofralloc -#include "asm/d/a/d_a_alink/checkNotAutoJumpStage__9daAlink_cFv.s" +bool daAlink_c::checkNotAutoJumpStage() { + return checkRoomOnly() || checkCastleTown(); } -#pragma pop - -/* ############################################################################################## */ -/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803925C9 = "R_SP128"; -#pragma pop /* 800C0678-800C077C 0BAFB8 0104+00 3/3 0/0 0/0 .text checkCastleTownUseItem__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCastleTownUseItem(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkCastleTownUseItem__9daAlink_cFUs.s" +bool daAlink_c::checkCastleTownUseItem(u16 item_id) { + if (checkNotBattleStage()) { + if (item_id == KANTERA || checkTradeItem(item_id) || + (item_id == DUNGEON_BACK && checkLv7DungeonShop()) || + (checkRoomSpecial() && (item_id == EMPTY_BOTTLE || checkDungeonWarpItem(item_id))) || + (checkStageName("R_SP128") && item_id == COPY_ROD) || + (checkLv2DungeonRoomSpecial() && item_id == HVY_BOOTS) || + (checkBottleItem(item_id) && item_id != EMPTY_BOTTLE)) { + return true; + } else { + return false; + } + } + return true; } -#pragma pop /* 800C077C-800C0A9C 0BB0BC 0320+00 1/1 0/0 0/0 .text changeItemTriggerKeepProc__9daAlink_cFUci */ #pragma push @@ -17580,11 +17386,11 @@ MtxP daAlink_c::getModelJointMtx(u16 param_0) { /* 800C1DE0-800C1E0C 0BC720 002C+00 1/0 0/0 0/0 .text onFrollCrashFlg__9daAlink_cFUci */ void daAlink_c::onFrollCrashFlg(u8 param_0, int param_1) { if (param_1 != 0) { - i_onNoResetFlg0(UnkFrollCrashFlg2); + i_onNoResetFlg0(UNK_F_ROLL_CRASH_2); } else { - i_onNoResetFlg0(UnkFrollCrashFlg1); + i_onNoResetFlg0(UNK_F_ROLL_CRASH_1); } - field_0x2fa4 = param_0; + mRollCrashFlg = param_0; } /* ############################################################################################## */ @@ -17643,7 +17449,7 @@ void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { field_0x280c.setData(param_1); field_0x300e = 1; if (fopAcM_GetName(param_1) == 0x2cb) { - if (field_0x2fdc == 0x48) { + if (mEquipItem == KANTERA) { field_0x3010 = 1; } else { if (i_checkNoResetFlg2(1) != 0) { @@ -17680,35 +17486,33 @@ asm void daAlink_c::procPreActionUnequip() { /* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text procServiceWaitInit__9daAlink_cFv */ -#ifdef NONMATCHING bool daAlink_c::procServiceWaitInit() { commonProcInit(SERVICE_WAIT); - setSingleAnimeBase(0x90); - mNormalSpeed = 0.0f; - mNext.mAngle.y = mCollisionRot.y; + setSingleAnimeBase(ANM_SERVICE_WAIT); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCurrent.mAngle.y = mCollisionRot.y; field_0x2f98 = 4; return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procServiceWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procServiceWaitInit__9daAlink_cFv.s" -} -#pragma pop -#endif /* 800C30F0-800C3224 0BDA30 0134+00 1/0 0/0 0/0 .text procServiceWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procServiceWait() { - nofralloc -#include "asm/d/a/d_a_alink/procServiceWait__9daAlink_cFv.s" +bool daAlink_c::procServiceWait() { + J3DFrameCtrl* ctrl = &mFrameCtrl1[0]; + if ((!checkNextAction(0) && !checkFrontWallTypeAction()) && + (checkEventRun() || checkGuardActionChange() || mCollisionRot.y != field_0x2fe6)) { + ctrl->setRate(FLOAT_LABEL(lit_6108)); + procWaitInit(); + } else { + if (ctrl->checkPass(lit_10040)) { + voiceStart(Z2SE_AL_V_RELAX_A); + } else if (ctrl->checkPass(lit_11673)) { + voiceStart(Z2SE_AL_V_RELAX_B); + } else if (ctrl->checkPass(lit_25684)) { + voiceStart(Z2SE_AL_V_RELAX_C); + } + } + return true; } -#pragma pop /* 800C3224-800C3338 0BDB64 0114+00 2/2 0/0 0/0 .text procTiredWaitInit__9daAlink_cFv */ #pragma push @@ -17721,20 +17525,23 @@ asm void daAlink_c::procTiredWaitInit() { #pragma pop /* 800C3338-800C33B8 0BDC78 0080+00 1/0 0/0 0/0 .text procTiredWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTiredWait() { - nofralloc -#include "asm/d/a/d_a_alink/procTiredWait__9daAlink_cFv.s" +bool daAlink_c::procTiredWait() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + if (!checkNextAction(0)) { + if (ctrl->checkAnmEnd()) { + setSingleAnimeBase(ANM_TIRED_WAIT); + } else if (ctrl->getAttribute() == 2) { + setTiredVoice(ctrl); + } + } + return true; } -#pragma pop /* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text procWaitInit__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWaitInit() { +asm bool daAlink_c::procWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s" } @@ -17751,34 +17558,53 @@ asm void daAlink_c::procWait() { #pragma pop /* 800C36CC-800C3730 0BE00C 0064+00 3/3 0/0 0/0 .text procMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procMoveInit__9daAlink_cFv.s" +bool daAlink_c::procMoveInit() { + if (!commonProcInitNotSameProc(HUMAN_MOVE)) { + return false; + } + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + setFootEffectProcType(3); + return true; } -#pragma pop /* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text procMove__9daAlink_cFv */ +// results of cLib_minMaxLimit are put in r4 instead of r3 +#ifdef NONMATCHING +bool daAlink_c::procMove() { + setFootEffectProcType(3); + if (!checkNextAction(0) && !checkFrontWallTypeAction()) { + if (mDemo.getDemoMode() == 2 && + mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) { + mNormalSpeed = field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate; + } + setBlendMoveAnime(-1.0f); + if (field_0x3174 != 8) { + field_0x30a0 = + cLib_minMaxLimit((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, + daAlinkHIO_basic_c0::m.mNeckMaxDown); + } + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procMove() { +asm bool daAlink_c::procMove() { nofralloc #include "asm/d/a/d_a_alink/procMove__9daAlink_cFv.s" } #pragma pop +#endif /* 800C3810-800C3868 0BE150 0058+00 1/1 0/0 0/0 .text procAtnMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnMoveInit__9daAlink_cFv.s" +bool daAlink_c::procAtnMoveInit() { + if (!commonProcInitNotSameProc(HUMAN_ATN_MOVE)) { + return false; + } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return true; } -#pragma pop /* 800C3868-800C38CC 0BE1A8 0064+00 1/0 0/0 0/0 .text procAtnMove__9daAlink_cFv */ bool daAlink_c::procAtnMove() { @@ -17792,136 +17618,328 @@ bool daAlink_c::procAtnMove() { /* 800C38CC-800C397C 0BE20C 00B0+00 4/4 0/0 0/0 .text procAtnActorWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnActorWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnActorWaitInit__9daAlink_cFv.s" +bool daAlink_c::procAtnActorWaitInit() { + if (!commonProcInitNotSameProc(HUMAN_ATN_ACTOR_WAIT)) { + return false; + } + + if (mTargetedActor != NULL) { + fopAcM_searchActorAngleY(this, mTargetedActor); + } + mNormalSpeed = FLOAT_LABEL(lit_6108); + if (field_0x2f98 != 2) { + field_0x2f98 = 3; + } + + if (checkAtnWaitAnime()) { + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } else { + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } + + return true; } -#pragma pop /* 800C397C-800C39EC 0BE2BC 0070+00 1/0 0/0 0/0 .text procAtnActorWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnActorWait() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnActorWait__9daAlink_cFv.s" +bool daAlink_c::procAtnActorWait() { + if (!checkNextAction(0)) { + if (checkAtnWaitAnime()) { + setBlendAtnMoveAnime(lit_6041); + } else { + setBlendMoveAnime(lit_6041); + } + checkSwordTwirlAction(); + } + return true; } -#pragma pop /* 800C39EC-800C3A44 0BE32C 0058+00 3/3 0/0 0/0 .text procAtnActorMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnActorMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnActorMoveInit__9daAlink_cFv.s" +bool daAlink_c::procAtnActorMoveInit() { + if (!commonProcInitNotSameProc(HUMAN_ATN_ACTOR_MOVE)) { + return false; + } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return true; } -#pragma pop /* 800C3A44-800C3A94 0BE384 0050+00 1/0 0/0 0/0 .text procAtnActorMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAtnActorMove() { - nofralloc -#include "asm/d/a/d_a_alink/procAtnActorMove__9daAlink_cFv.s" +bool daAlink_c::procAtnActorMove() { + if (!checkNextAction(0)) { + setBlendAtnMoveAnime(lit_6041); + checkSwordTwirlAction(); + } + return 1; } -#pragma pop /* 800C3A94-800C3B1C 0BE3D4 0088+00 2/2 0/0 0/0 .text procWaitTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWaitTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWaitTurnInit__9daAlink_cFv.s" +bool daAlink_c::procWaitTurnInit() { + if (!commonProcInitNotSameProc(HUMAN_WAIT_TURN)) { + return false; + } + + setSingleAnimeBaseSpeed(ANM_WAIT_TURN, daAlinkHIO_basic_c0::m.mWaitTurnSpeed, + daAlinkHIO_basic_c0::m.mAnmBlendFactor); + if (checkEventRun()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + field_0x300e = field_0x2fe2; + mCurrent.mAngle.y = mCollisionRot.y; + return true; } -#pragma pop /* 800C3B1C-800C3C3C 0BE45C 0120+00 1/0 0/0 0/0 .text procWaitTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWaitTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procWaitTurn__9daAlink_cFv.s" +BOOL daAlink_c::procWaitTurn() { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + if (checkGroundSpecialMode()) { + return true; + } else { + if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { + return procFloorDownReboundInit(); + } else { + s16 angle = cLib_addCalcAngleS(&mCollisionRot.y, field_0x300e, 30, 0x3CDF, 8000); + mCurrent.mAngle.y = mCollisionRot.y; + if (checkNextActionFromButton()) { + return true; + } else { + if (angle == 0) { + if (checkEventRun()) { + if (mDemo.getDemoMode() == 5) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (!checkNextAction(0)) { + checkWaitAction(); + } + } else { + checkNextAction(0); + } + } + } + } + } + return true; } -#pragma pop /* 800C3C3C-800C3D38 0BE57C 00FC+00 2/2 0/0 0/0 .text procMoveTurnInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMoveTurnInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procMoveTurnInit__9daAlink_cFi.s" +bool daAlink_c::procMoveTurnInit(int param_0) { + if (!commonProcInitNotSameProc(HUMAN_MOVE_TURN)) { + return false; + } + + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + dComIfGp_setPlayerStatus0(0, 0x800); + + if (param_0 != 0) { + field_0x300e = (daAlinkHIO_move_c0::m.mMaxTurnAngle << 2) + 19030; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x300a = 2; + mCurrent.mAngle.y = field_0x2fe2; + mNormalSpeed *= lit_5943; + } else { + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; + field_0x300a = 3; + } + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; + return true; } -#pragma pop /* 800C3D38-800C3DA0 0BE678 0068+00 1/0 0/0 0/0 .text procMoveTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMoveTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procMoveTurn__9daAlink_cFv.s" +bool daAlink_c::procMoveTurn() { + setSpeedAndAngleNormal(); + cLib_addCalcAngleS(&mCollisionRot.y, mCurrent.mAngle.y, field_0x300a, field_0x300e, + field_0x3010); + + if (!checkNextAction(0)) { + setBlendMoveAnime(lit_6041); + } + return true; } -#pragma pop /* 800C3DA0-800C3F60 0BE6E0 01C0+00 2/2 0/0 0/0 .text procSideStepInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSideStepInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSideStepInit__9daAlink_cFi.s" +bool daAlink_c::procSideStepInit(int jump_type) { + if (jump_type == 1 && !checkHeavyStateOn(1, 1) && + (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) { + return procBackJumpInit(0); + } else { + commonProcInit(HUMAN_SIDESTEP); + field_0x2f98 = jump_type; + + if (field_0x2f98 == 1) { + mCurrent.mAngle.y = mCollisionRot.y + 0x8000; + setSingleAnimeParam(ANM_BACK_JUMP, &daAlinkHIO_sideStep_c0::m.mBackJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedV; + field_0x300a = 0; + } else { + daAlink_ANM anm_id; + if (field_0x2f98 == 2) { + anm_id = ANM_SIDE_STEP_LEFT; + mCurrent.mAngle.y = mCollisionRot.y + 0x4000; + } else { + anm_id = ANM_SIDE_STEP_RIGHT; + mCurrent.mAngle.y = mCollisionRot.y - 0x4000; + } + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedV; + field_0x300a = 1; + } + if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } + voiceStart(Z2SE_AL_V_JUMP_S); + mCommonCounter = 0; + field_0x300e = 0; + return 1; + } } -#pragma pop /* 800C3F60-800C40F0 0BE8A0 0190+00 1/0 0/0 0/0 .text procSideStep__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSideStep() { - nofralloc -#include "asm/d/a/d_a_alink/procSideStep__9daAlink_cFv.s" +bool daAlink_c::procSideStep() { + if (mTargetedActor != NULL && field_0x300a != 0) { + s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor); + cLib_addCalcAngleS(&mCollisionRot.y, actor_angle, 5, 0x5E8, 0x13C); + if (field_0x2f98 == 2) { + mCurrent.mAngle.y = mCollisionRot.y + 0x4000; + } else { + mCurrent.mAngle.y = mCollisionRot.y - 0x4000; + } + } + if (doTrigger() && field_0x300a != 0) { + mCommonCounter = 1; + } + + if (checkUpperItemActionFly()) { + return true; + } else if (mLinkAcch.ChkGroundHit() && field_0x300e != 0) { + if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + return true; + } else { + return procSideStepLandInit(); + } + } else if (checkNoUpperAnime() && checkForceSwordSwing()) { + setCutDash(1, 0); + } else if (mDemo.getDemoMode() != 16 && + mCurrent.mPosition.y < mLastJumpPos.y - daAlinkHIO_sideStep_c0::m.mFallHeight) { + return procFallInit(2, daAlinkHIO_sideStep_c0::m.mFallInterpolation); + } + + field_0x300e = 1; + checkItemChangeFromButton(); + return true; } -#pragma pop /* 800C40F0-800C4278 0BEA30 0188+00 1/1 0/0 0/0 .text procSideStepLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSideStepLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSideStepLandInit__9daAlink_cFv.s" +bool daAlink_c::procSideStepLandInit() { + commonProcInit(HUMAN_SIDESTEP_LAND); + if (field_0x2f98 == 1) { + field_0x2f9d = 4; + setSingleAnimeParam(ANM_BACK_JUMP_LAND, &daAlinkHIO_sideStep_c0::m.mBackLandAnm); + field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.field_0x10; + field_0x2f98 = 2; + field_0x300a = 0; + field_0x2fb0 = 0; + field_0x2fcc = 10; + } else { + daAlink_ANM anm_id; + u16 uvar3; + if (field_0x2f98 == 2) { + anm_id = ANM_SIDE_STEP_LEFT_LAND; + uvar3 = 0x3F; + } else { + anm_id = ANM_SIDE_STEP_RIGHT_LAND; + uvar3 = 0x40; + } + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideLandAnm); + field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.field_0x10; + field_0x300a = 1; + field_0x2fb0 = 8; + field_0x2fcc = 0; + if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) { + setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, lit_6041); + seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING); + } + } + field_0x2f9d = 4; + setFootEffectProcType(2); + i_onResetFlg1(0x30); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + mCurrent.mAngle.y = mCollisionRot.y; + setStepLandVibration(); + return true; } -#pragma pop /* 800C4278-800C4378 0BEBB8 0100+00 1/0 0/0 0/0 .text procSideStepLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSideStepLand() { - nofralloc -#include "asm/d/a/d_a_alink/procSideStepLand__9daAlink_cFv.s" +bool daAlink_c::procSideStepLand() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + if (field_0x2fcc != 0) { + field_0x2fcc = 10; + } + + if (doTrigger() && field_0x300a != 0) { + mCommonCounter = 1; + } + + if (ctrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 16) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if (ctrl->getFrame() > field_0x3478) { + if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + return true; + } + checkNextAction(1); + } + + return true; } -#pragma pop /* 800C4378-800C4514 0BECB8 019C+00 1/1 0/0 0/0 .text procSlideInit__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlideInit(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSlideInit__9daAlink_cFs.s" +bool daAlink_c::procSlideInit(s16 param_0) { + commonProcInit(HUMAN_SLIDE); + + field_0x814.SetWeight(255); + field_0x3090 = 8; + mCurrent.mAngle.y = param_0; + + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == 0xD4) { + field_0x300e = 1; + } else { + field_0x300e = 0; + } + + if (cLib_distanceAngleS(param_0, mCollisionRot.y) < 0x3800 || field_0x300e != 0) { + field_0x3198 = 1; + setSingleAnimeParam(ANM_FORWARD_SLIDE, &daAlinkHIO_slide_c0::m.mForwardSlideAnm); + dComIfGp_setPlayerStatus1(0, 0x100); + onModeFlg(MODE_UNK_8000); + onModeFlg(MODE_UNK_2000000); + onModeFlg(MODE_UNK_20000000); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f9d = 4; + setUpperAnimeBaseMorf(0xCE, lit_6041); + i_onNoResetFlg1(0x10000000); + setFootEffectProcType(0); + } else { + field_0x3198 = 0; + setSingleAnimeParam(ANM_BACKWARD_SLIDE, &daAlinkHIO_slide_c0::m.mBackwardSlideAnm); + dComIfGp_setPlayerStatus1(0, 0x200); + field_0x2f9d = 0x60; + setFootEffectProcType(1); + } + field_0x594 = daAlinkHIO_slide_c0::m.mMaxSpeed; + field_0x33cc = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + field_0x3010 = 0; + return true; } -#pragma pop /* ############################################################################################## */ /* 804532E0-804532E4 0018E0 0004+00 1/1 0/0 0/0 .sdata2 @73057 */ @@ -17938,34 +17956,116 @@ asm void daAlink_c::procSlide() { #pragma pop /* 800C47AC-800C4894 0BF0EC 00E8+00 1/1 0/0 0/0 .text procSlideLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlideLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSlideLandInit__9daAlink_cFi.s" +bool daAlink_c::procSlideLandInit(int param_0) { + commonProcInit(HUMAN_SLIDE_LAND); + + if (param_0 != 0) { + setSingleAnimeParam(ANM_BACKWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mForwardLandAnm); + field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.field_0x10; + field_0x3198 = 1; + field_0x2f99 = 4; + field_0x3588.x = l_waitBaseAnime[0]; + field_0x3588.y = l_waitBaseAnime[1]; + field_0x3588.z = l_waitBaseAnime[2]; + } else { + setSingleAnimeParam(ANM_FORWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mBackwardLandAnm); + field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.field_0x10; + field_0x3198 = 0; + } + field_0x814.SetWeight(255); + mNormalSpeed *= lit_5943; + return true; } -#pragma pop /* 800C4894-800C494C 0BF1D4 00B8+00 1/0 0/0 0/0 .text procSlideLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlideLand() { - nofralloc -#include "asm/d/a/d_a_alink/procSlideLand__9daAlink_cFv.s" +bool daAlink_c::procSlideLand() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_7450); + if (field_0x3198 != 0) { + field_0x2f99 = 4; + } + + if (ctrl->checkAnmEnd()) { + mCurrent.mAngle.y = mCollisionRot.y; + checkNextAction(0); + } else { + if (ctrl->getFrame() > field_0x3478) { + s16 tmp_angle = mCurrent.mAngle.y; + mCurrent.mAngle.y = mCollisionRot.y; + if (!checkNextAction(1)) { + mCurrent.mAngle.y = tmp_angle; + } + } + } + return true; } -#pragma pop /* 800C494C-800C4B40 0BF28C 01F4+00 4/3 0/0 0/0 .text procFrontRollInit__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::procFrontRollInit() { + BOOL check = checkUpperGuardAnime(); + if (mActionID == FRONT_ROLL && mDemo.getDemoMode() == 0x28) { + return 0; + } else { + BOOL check = mActionID == 0x16; + commonProcInit(FRONT_ROLL); + + f32 fvar1; + if (!check) { + fvar1 = daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04; + } else { + fvar1 = lit_7977; + } + setSingleAnime(ANM_FRONT_ROLL, daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04, fvar1, + daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x00, + daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x0c); + mNormalSpeed = + mSpeedF * daAlinkHIO_frontRoll_c0::m.mInitSpeed + daAlinkHIO_frontRoll_c0::m.mSpeedRate; + if (mNormalSpeed > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08) { + mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08; + } + if (mNormalSpeed < daAlinkHIO_frontRoll_c0::m.mMinSpeed) { + mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mMinSpeed; + } + + if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + if (checkHeavyStateOn(1, 1)) { + mNormalSpeed *= mHeavySpeedMultiplier; + } + } else { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + } + mCurrent.mAngle.y = mCollisionRot.y; + voiceStart(Z2SE_AL_V_BACKTEN); + mCommonCounter = 0; + setFootEffectProcType(0); + if (check) { + i_onNoResetFlg0(2); + } + if (i_checkEquipHeavyBoots()) { + field_0xFB8.SetAtType(0x200000); + field_0xFB8.SetAtHitMark(1); + field_0xFB8.SetAtSe(9); + field_0xFB8.SetAtAtp(2); + field_0xFB8.SetAtMtrl(0); + field_0xFB8.ResetAtHit(); + field_0xFB8.SetR(daAlinkHIO_frontRoll_c0::m.mBootsAttackRadius); + field_0xFB8.OnAtSetBit(); + } + return true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFrontRollInit() { +asm bool daAlink_c::procFrontRollInit() { nofralloc #include "asm/d/a/d_a_alink/procFrontRollInit__9daAlink_cFv.s" } #pragma pop +#endif /* 800C4B40-800C4F14 0BF480 03D4+00 1/0 0/0 0/0 .text procFrontRoll__9daAlink_cFv */ #pragma push @@ -18022,7 +18122,7 @@ asm void daAlink_c::procFrontRollSuccess() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procSideRollInit(int param_0) { +asm bool daAlink_c::procSideRollInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s" } @@ -18039,20 +18139,31 @@ asm void daAlink_c::procSideRoll() { #pragma pop /* 800C5700-800C57A4 0C0040 00A4+00 2/2 0/0 0/0 .text backJumpSpeedDec__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::backJumpSpeedDec() { - nofralloc -#include "asm/d/a/d_a_alink/backJumpSpeedDec__9daAlink_cFv.s" +void daAlink_c::backJumpSpeedDec() { + if (mLinkAcch.ChkGroundHit()) { + if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { + f32 jump_speed; + if (dBgS_CheckBWallPoly(mLinkAcch.m_gnd)) { + jump_speed = FLOAT_LABEL(lit_6108); + } else { + jump_speed = field_0x3478 * cM_scos(field_0x2ff0); + if (field_0x2ff0 > 0) { + jump_speed *= cM_scos(field_0x2ff0); + } + } + + if (mNormalSpeed > jump_speed) { + mNormalSpeed = jump_speed; + } + } + } } -#pragma pop /* 800C57A4-800C5964 0C00E4 01C0+00 6/6 0/0 0/0 .text procBackJumpInit__9daAlink_cFi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procBackJumpInit(int param_0) { +asm bool daAlink_c::procBackJumpInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s" } @@ -18181,7 +18292,7 @@ asm void daAlink_c::procRollJump() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFallInit(int param_0, f32 param_1) { +asm bool daAlink_c::procFallInit(int param_0, f32 param_1) { nofralloc #include "asm/d/a/d_a_alink/procFallInit__9daAlink_cFif.s" } @@ -18307,7 +18418,7 @@ static f32 l_wolfBaseAnime[3]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphoseInit() { +asm bool daAlink_c::procCoMetamorphoseInit() { nofralloc #include "asm/d/a/d_a_alink/procCoMetamorphoseInit__9daAlink_cFv.s" } @@ -18390,7 +18501,7 @@ asm void daAlink_c::procCoMetamorphoseOnly() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procFloorDownReboundInit() { +asm BOOL daAlink_c::procFloorDownReboundInit() { nofralloc #include "asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s" } @@ -18488,35 +18599,38 @@ asm void daAlink_c::setDrawHand() { } #pragma pop -/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwordDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwordDraw__9daAlink_cFv.s" +BOOL daPy_py_c::i_checkSwordGet() { + return dComIfGs_getSelectEquipSword() != 0xFF; +} + +/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */ +bool daAlink_c::checkSwordDraw() { + return ((i_checkSwordGet() && mSwordChangeWaitTimer == 0) && + !i_checkNoResetFlg2(FLG2_UNK_2080000)) && + (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); +} + +bool daPy_py_c::i_checkShieldGet() const { + return dComIfGs_getSelectEquipShield() != NO_ITEM; } -#pragma pop /* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text checkShieldDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkShieldDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkShieldDraw__9daAlink_cFv.s" +bool daAlink_c::checkShieldDraw() { + return ((i_checkShieldGet() && mShieldChangeWaitTimer == 0) && + !i_checkNoResetFlg2(FLG2_UNK_4080000)) && + (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); } -#pragma pop /* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkItemDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkItemDraw__9daAlink_cFv.s" +bool daAlink_c::checkItemDraw() { + if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) { + if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() || + field_0x2e44.checkPassNum(15)) { + return true; + } + } + return false; } -#pragma pop /* 800CB694-800CBA38 0C5FD4 03A4+00 0/0 0/0 1/1 .text initShadowScaleLight__9daAlink_cFv */ @@ -18555,14 +18669,11 @@ asm void daAlink_c::shadowDraw() { #pragma pop /* 800CC25C-800CC298 0C6B9C 003C+00 3/3 0/0 0/0 .text modelCalc__9daAlink_cFP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::modelCalc(J3DModel* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/modelCalc__9daAlink_cFP8J3DModel.s" +void daAlink_c::modelCalc(J3DModel* p_model) { + if (mClothesChangeWaitTimer == 0) { + p_model->calc(); + } } -#pragma pop /* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */ #pragma push @@ -18603,14 +18714,14 @@ asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) { #pragma pop /* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initTevCustomColor() { - nofralloc -#include "asm/d/a/d_a_alink/initTevCustomColor__9daAlink_cFv.s" +void daAlink_c::initTevCustomColor() { + mTevStr.field_0x367 = 0; + mTevStr.field_0x358 = 0; + mTevStr.field_0x35a = 0; + mTevStr.field_0x35c = 0; + mTevStr.field_0x360 = 0; + mTevStr.field_0x362 = 0; } -#pragma pop /* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */ #pragma push @@ -18678,14 +18789,30 @@ asm daAlink_c::~daAlink_c() { #pragma pop /* 800CE208-800CE294 0C8B48 008C+00 1/0 0/0 0/0 .text daAlink_Delete__FP9daAlink_c */ +// destructor issue +#ifdef NONMATCHING +static bool daAlink_Delete(daAlink_c* p_link) { + if (p_link->getClothesChangeWaitTimer() != 0) { + p_link->loadModelDVD(); + return false; + } else if (p_link->getShieldChangeWaitTimer() != 0) { + p_link->loadShieldModelDVD(); + return false; + } else { + delete p_link; + return true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void daAlink_Delete(daAlink_c* param_0) { +static asm bool daAlink_Delete(daAlink_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/daAlink_Delete__FP9daAlink_c.s" } #pragma pop +#endif /* 800CE294-800CE468 0C8BD4 01D4+00 1/1 0/0 0/0 .text checkNoSubjectModeCamera__9daAlink_cFv */ #pragma push @@ -18864,14 +18991,9 @@ u32 daAlink_c::checkHorseRide() const { } /* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getLeftItemMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLeftItemMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getLeftItemMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30c0); } -#pragma pop /* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text checkBoarRide__9daAlink_cCFv */ u32 daAlink_c::checkBoarRide() const { @@ -18884,55 +19006,33 @@ u32 daAlink_c::checkSpinnerRide() const { } /* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getLeftHandMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLeftHandMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getLeftHandMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30b8); } -#pragma pop /* 800CF2F8-800CF314 0C9C38 001C+00 1/0 0/0 0/0 .text getRightHandMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getRightHandMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getRightHandMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getRightHandMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30ba); } -#pragma pop /* 800CF314-800CF328 0C9C54 0014+00 1/0 0/0 0/0 .text * onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onSceneChangeArea(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c.s" +void daAlink_c::onSceneChangeArea(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { + field_0x3112 = param_0; + field_0x2fac = param_1; + field_0x2808 = param_2; } -#pragma pop /* 800CF328-800CF344 0C9C68 001C+00 1/0 0/0 0/0 .text getRightItemMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getRightItemMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getRightItemMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getRightItemMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30c2); } -#pragma pop /* 800CF344-800CF380 0C9C84 003C+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkPlayerNoDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerNoDraw__9daAlink_cFv.s" +BOOL daAlink_c::checkPlayerNoDraw() { + return dComIfGp_checkCameraAttentionStatus(field_0x317c, 2) || + i_checkNoResetFlg0(FLG0_UNK_8000000); } -#pragma pop /* 800CF380-800CFC3C 0C9CC0 08BC+00 1/1 0/0 0/0 .text __ct__9daAlink_cFv */ #pragma push @@ -19053,33 +19153,18 @@ static asm void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* p #pragma pop /* 800CFFE0-800CFFF4 0CA920 0014+00 1/1 0/0 0/0 .text getAnmMtx__8J3DModelFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* J3DModel::getAnmMtx(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getAnmMtx__8J3DModelFi.s" +MtxP J3DModel::getAnmMtx(int i) { + return mMtxBuffer->getAnmMtx(i); } -#pragma pop /* 800CFFF4-800D0020 0CA934 002C+00 1/1 0/0 0/0 .text setBaseTRMtx__8J3DModelFPA4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DModel::setBaseTRMtx(f32 (*param_0)[4]) { - nofralloc -#include "asm/d/a/d_a_alink/setBaseTRMtx__8J3DModelFPA4_f.s" +void J3DModel::setBaseTRMtx(MtxP matrix) { + PSMTXCopy(matrix, mBaseTransformMtx); } -#pragma pop /* 800D0020-800D0048 0CA960 0028+00 1/1 0/0 0/0 .text checkFmChainGrabAnime__9daAlink_cCFv */ BOOL daAlink_c::checkFmChainGrabAnime() const { - bool fmChainGrab = false; - - if (checkUpperAnime(ANM_HUMAN_CHAIN_GRAB) || checkUpperAnime(ANM_WOLF_CHAIN_GRAB)) { - fmChainGrab = true; - } - return fmChainGrab; + return checkUpperAnime(ANM_HUMAN_CHAIN_GRAB) || checkUpperAnime(ANM_WOLF_CHAIN_GRAB); } /* 800D0048-800D005C 0CA988 0014+00 1/1 0/0 0/0 .text checkSmallUpperGuardAnime__9daAlink_cCFv */ @@ -19125,35 +19210,14 @@ void dBgS_Acch::ClrGroundHit() { } /* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ -// regalloc -#ifdef NONMATCHING BOOL daAlink_c::checkReinRide() const { - bool reinRide = false; - - if (mRideStatus == 1 || mRideStatus == 2) { - reinRide = true; - } - return reinRide; + return mRideStatus == 1 || mRideStatus == 2; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkReinRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkReinRide__9daAlink_cCFv.s" -} -#pragma pop -#endif /* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ BOOL daAlink_c::checkWolfEnemyThrowAnime() const { - bool wolfEnemyThrowAnime = false; - - if (checkUpperAnime(ANM_WOLF_ENEMY_THROW_LEFT) || checkUpperAnime(ANM_WOLF_ENEMY_THROW_RIGHT)) { - wolfEnemyThrowAnime = true; - } - return wolfEnemyThrowAnime; + return checkUpperAnime(ANM_WOLF_ENEMY_THROW_LEFT) || + checkUpperAnime(ANM_WOLF_ENEMY_THROW_RIGHT); } /* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv @@ -19169,24 +19233,14 @@ void daAlink_c::setMidnaTalkStatus(u8 status) { } /* 800D0164-800D0180 0CAAA4 001C+00 1/1 0/0 0/0 .text set3DStatus__9daAlink_cFUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::set3DStatus(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/set3DStatus__9daAlink_cFUcUc.s" +void daAlink_c::set3DStatus(u8 status, u8 direction) { + dComIfGp_set3DStatus(status, direction, 0); } -#pragma pop /* 800D0180-800D018C 0CAAC0 000C+00 1/1 0/0 0/0 .text offSetFlg__16daAlink_matAnm_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_matAnm_c::offSetFlg() { - nofralloc -#include "asm/d/a/d_a_alink/offSetFlg__16daAlink_matAnm_cFv.s" +void daAlink_matAnm_c::offSetFlg() { + mSetFlag = 0; } -#pragma pop /* 800D018C-800D0198 0CAACC 000C+00 1/1 0/0 0/0 .text checkModeFlg__9daAlink_cCFUl */ u32 daAlink_c::checkModeFlg(u32 pFlag) const { @@ -19204,24 +19258,18 @@ u8 daAlink_c::getClothesChangeWaitTimer() const { } /* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkHorseStart() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseStart__9daAlink_cFv.s" +u32 daPy_py_c::getLastSceneMode() { + return dComIfGs_getLastSceneMode(); +} + +BOOL daAlink_c::checkHorseStart() { + return checkHorseStart(getLastSceneMode() & 0xF, getStartMode()); } -#pragma pop /* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv */ BOOL daAlink_c::checkCutTurnCharge() const { - bool cutTurnCharge = false; - - if (mActionID == CUT_TURN_MOVE && mCommonCounter == 0) { - cutTurnCharge = true; - } - return cutTurnCharge; + return mActionID == CUT_TURN_MOVE && mCommonCounter == 0; } /* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ @@ -19256,86 +19304,55 @@ s16 daAlink_c::checkSumouWithstand() const { */ void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { mMidnaMsgNum = pMsgNum; - field_0x2800 = param_0; + static_cast(mMidnaMsg) = param_0; } /* 800D0290-800D029C 0CABD0 000C+00 1/0 0/0 0/0 .text getModelMtx__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getModelMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getModelMtx__9daAlink_cFv.s" +MtxP daAlink_c::getModelMtx() { + return field_0x0650->getBaseTRMtx(); } -#pragma pop /* 800D029C-800D02A4 0CABDC 0008+00 1/0 0/0 0/0 .text getInvMtx__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getInvMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getInvMtx__9daAlink_cFv.s" +MtxP daAlink_c::getInvMtx() { + return mInvMtx; } -#pragma pop /* 800D02A4-800D02B8 0CABE4 0014+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getLinkBackBone1Matrix() { - nofralloc -#include "asm/d/a/d_a_alink/getLinkBackBone1Matrix__9daAlink_cFv.s" +MtxP daAlink_c::getLinkBackBone1Matrix() { + return field_0x0650->i_getAnmMtx(1); } -#pragma pop /* 800D02B8-800D02CC 0CABF8 0014+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getWolfMouthMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfMouthMatrix__9daAlink_cFv.s" +MtxP daAlink_c::getWolfMouthMatrix() { + return field_0x0650->i_getAnmMtx(13); } -#pragma pop /* 800D02CC-800D02E0 0CAC0C 0014+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Mtx* daAlink_c::getWolfBackbone2Matrix() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfBackbone2Matrix__9daAlink_cFv.s" +MtxP daAlink_c::getWolfBackbone2Matrix() { + return field_0x0650->i_getAnmMtx(2); } -#pragma pop /* 800D02E0-800D0334 0CAC20 0054+00 1/0 0/0 0/0 .text getBottleMtx__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getBottleMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getBottleMtx__9daAlink_cFv.s" +MtxP daAlink_c::getBottleMtx() { + if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) { + return mHeldItemModel->getBaseTRMtx(); + } + + return NULL; } -#pragma pop /* 800D0334-800D0350 0CAC74 001C+00 1/0 0/0 0/0 .text getHeadMtx__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getHeadMtx() { - nofralloc -#include "asm/d/a/d_a_alink/getHeadMtx__9daAlink_cFv.s" +MtxP daAlink_c::getHeadMtx() { + return field_0x0650->i_getAnmMtx(field_0x30b4); } -#pragma pop /* 800D0350-800D0358 0CAC90 0008+00 1/0 0/0 0/0 .text getGroundY__9daAlink_cFv */ -float daAlink_c::getGroundY() { +f32 daAlink_c::getGroundY() { return mLinkAcch.GetGroundH(); } /* 800D0358-800D0360 0CAC98 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daAlink_cCFv */ -float daAlink_c::getBaseAnimeFrameRate() const { +f32 daAlink_c::getBaseAnimeFrameRate() const { return mFrameCtrl1[0].getRate(); } @@ -19351,10 +19368,10 @@ s32 daAlink_c::getItemID() const { /* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ s32 daAlink_c::getGrabActorID() const { - if (field_0x2fdc == 0x102) { + if (mEquipItem == 0x102) { return mItemActor.getID(); } else { - return field_0x282c.getID(); + return mGrabItemActor.getID(); } } @@ -19362,12 +19379,13 @@ s32 daAlink_c::getGrabActorID() const { */ void daAlink_c::setForcePutPos(cXyz const& pPutPos) { mForcePutPos = pPutPos; - i_onEndResetFlg1(UnkForcePutPos); + i_onEndResetFlg1(UNK_FORCE_PUT_POS); } /* 800D03B4-800D03C8 0CACF4 0014+00 1/0 0/0 0/0 .text checkPlayerFly__9daAlink_cCFv */ u32 daAlink_c::checkPlayerFly() const { - return i_checkModeFlg(PLAYER_FLY); + return i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | + MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP); } /* 800D03C8-800D03DC 0CAD08 0014+00 1/0 0/0 0/0 .text checkFrontRoll__9daAlink_cCFv */ @@ -19376,605 +19394,350 @@ BOOL daAlink_c::checkFrontRoll() const { } /* 800D03DC-800D03F0 0CAD1C 0014+00 1/0 0/0 0/0 .text checkWolfDash__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfDash() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfDash__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfDash() const { + return mActionID == WOLF_DASH; } -#pragma pop /* 800D03F0-800D0414 0CAD30 0024+00 1/0 0/0 0/0 .text checkAutoJump__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkAutoJump() const { - nofralloc -#include "asm/d/a/d_a_alink/checkAutoJump__9daAlink_cCFv.s" +BOOL daAlink_c::checkAutoJump() const { + return mActionID == HUMAN_AUTOJUMP || mActionID == WOLF_AUTOJUMP; } -#pragma pop /* 800D0414-800D0444 0CAD54 0030+00 1/0 0/0 0/0 .text checkSideStep__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSideStep() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSideStep__9daAlink_cCFv.s" +bool daAlink_c::checkSideStep() const { + return (mActionID == HUMAN_SIDESTEP || mActionID == WOLF_SIDESTEP) && field_0x300a != 0; } -#pragma pop /* 800D0444-800D0468 0CAD84 0024+00 1/0 0/0 0/0 .text checkWolfTriggerJump__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfTriggerJump() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfTriggerJump__9daAlink_cCFv.s" +bool daAlink_c::checkWolfTriggerJump() const { + return mActionID == WOLF_SIDESTEP || mActionID == WOLF_JUMPATTACK; } -#pragma pop /* 800D0468-800D047C 0CADA8 0014+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkGuardBreakMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGuardBreakMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkGuardBreakMode() const { + return mActionID == GUARD_BREAK; } -#pragma pop /* 800D047C-800D04A4 0CADBC 0028+00 1/0 0/0 0/0 .text checkLv3Slide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkLv3Slide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkLv3Slide__9daAlink_cCFv.s" +bool daAlink_c::checkLv3Slide() const { + return mActionID == HUMAN_SLIDE && field_0x300e != 0; } -#pragma pop /* 800D04A4-800D04B8 0CADE4 0014+00 1/0 0/0 0/0 .text checkWolfHowlDemoMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfHowlDemoMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfHowlDemoMode__9daAlink_cCFv.s" +bool daAlink_c::checkWolfHowlDemoMode() const { + return mActionID == WOLF_HOWL; } -#pragma pop /* 800D04B8-800D04CC 0CADF8 0014+00 1/0 0/0 0/0 .text checkElecDamage__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkElecDamage() const { - nofralloc -#include "asm/d/a/d_a_alink/checkElecDamage__9daAlink_cCFv.s" +BOOL daAlink_c::checkElecDamage() const { + return mActionID == ELEC_DAMAGE; } -#pragma pop /* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkEmptyBottleSwing() const { - nofralloc -#include "asm/d/a/d_a_alink/checkEmptyBottleSwing__9daAlink_cCFv.s" +BOOL daAlink_c::checkEmptyBottleSwing() const { + return mEquipItem == EMPTY_BOTTLE && mActionID == BOTTLE_SWING; } -#pragma pop /* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBottleSwingMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBottleSwingMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkBottleSwingMode() const { + return mActionID == BOTTLE_SWING; } -#pragma pop /* 800D0508-800D051C 0CAE48 0014+00 1/0 0/0 0/0 .text checkHawkWait__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkHawkWait() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHawkWait__9daAlink_cCFv.s" +BOOL daAlink_c::checkHawkWait() const { + return mActionID == HAWK_WAIT; } -#pragma pop /* 800D051C-800D0544 0CAE5C 0028+00 1/0 0/0 0/0 .text checkGoatThrow__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkGoatThrow() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGoatThrow__9daAlink_cCFv.s" +BOOL daAlink_c::checkGoatThrow() const { + return mActionID == GOAT_THROW && mCommonCounter != 0; } -#pragma pop /* 800D0544-800D0570 0CAE84 002C+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkGoatThrowAfter() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGoatThrowAfter__9daAlink_cCFv.s" +BOOL daAlink_c::checkGoatThrowAfter() const { + return mActionID == GOAT_THROW && field_0x3478 > FLOAT_LABEL(lit_6108); } -#pragma pop /* 800D0570-800D0598 0CAEB0 0028+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfTagLockJump() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfTagLockJump__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfTagLockJump() const { + return mActionID == WOLF_TAGLOCK_JUMP && field_0x3198 == 0; } -#pragma pop /* 800D0598-800D05AC 0CAED8 0014+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfTagLockJumpLand() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfTagLockJumpLand__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfTagLockJumpLand() const { + return mActionID == WOLF_TAGLOCK_LAND; } -#pragma pop /* 800D05AC-800D05C0 0CAEEC 0014+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfRopeHang() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRopeHang__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfRopeHang() const { + return mActionID == WOLF_ROPE_HANG; } -#pragma pop /* 800D05C0-800D05D4 0CAF00 0014+00 1/0 0/0 0/0 .text checkRollJump__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkRollJump() const { - nofralloc -#include "asm/d/a/d_a_alink/checkRollJump__9daAlink_cCFv.s" +BOOL daAlink_c::checkRollJump() const { + return mActionID == ROLL_JUMP; } -#pragma pop /* 800D05D4-800D05E8 0CAF14 0014+00 1/0 0/0 0/0 .text checkGoronRideWait__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkGoronRideWait() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGoronRideWait__9daAlink_cCFv.s" +BOOL daAlink_c::checkGoronRideWait() const { + return mActionID == GORON_RIDE_WAIT; } -#pragma pop /* 800D05E8-800D05FC 0CAF28 0014+00 1/0 0/0 0/0 .text checkWolfChain__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfChain() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfChain__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfChain() const { + return mActionID == WOLF_CHAIN; } -#pragma pop /* 800D05FC-800D0610 0CAF3C 0014+00 1/0 0/0 0/0 .text checkWolfWait__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfWait() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfWait__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfWait() const { + return mActionID == WOLF_WAIT; } -#pragma pop /* 800D0610-800D0624 0CAF50 0014+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfJumpAttack() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfJumpAttack__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfJumpAttack() const { + return mActionID == WOLF_JUMPATTACK; } -#pragma pop /* 800D0624-800D0638 0CAF64 0014+00 1/0 0/0 0/0 .text checkWolfRSit__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfRSit() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRSit__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfRSit() const { + return mActionID == WOLF_RSIT; } -#pragma pop /* 800D0638-800D0660 0CAF78 0028+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBottleDrinkEnd() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBottleDrinkEnd__9daAlink_cCFv.s" +BOOL daAlink_c::checkBottleDrinkEnd() const { + return mActionID == BOTTLE_DRINK && field_0x300e != 0; } -#pragma pop /* 800D0660-800D0674 0CAFA0 0014+00 1/0 0/0 0/0 .text checkWolfDig__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfDig() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfDig__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfDig() const { + return mActionID == WOLF_DIG; } -#pragma pop /* 800D0674-800D0688 0CAFB4 0014+00 1/0 0/0 0/0 .text checkCutCharge__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutCharge() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutCharge__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutCharge() const { + return mActionID == CUT_TURN_MOVE; } -#pragma pop /* 800D0688-800D06B0 0CAFC8 0028+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutLargeJumpCharge() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutLargeJumpCharge__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutLargeJumpCharge() const { + return mActionID == CUT_TURN_MOVE && mCommonCounter != 0; } -#pragma pop /* 800D06B0-800D06D8 0CAFF0 0028+00 1/0 0/0 0/0 .text checkComboCutTurn__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkComboCutTurn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkComboCutTurn__9daAlink_cCFv.s" +BOOL daAlink_c::checkComboCutTurn() const { + return mActionID == COMBO_CUT_TURN && mComboCutCount != 0; } -#pragma pop /* 800D06D8-800D0704 0CB018 002C+00 1/0 0/0 0/0 .text checkClimbMove__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkClimbMove() const { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbMove__9daAlink_cCFv.s" +BOOL daAlink_c::checkClimbMove() const { + return mActionID == CLIMB_MOVE_VERTICAL || mActionID == CLIMB_MOVE_LADDER || + mActionID == CLIMB_MOVE_HORIZONTAL; } -#pragma pop /* 800D0704-800D0718 0CB044 0014+00 1/0 0/0 0/0 .text checkGrassWhistle__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkGrassWhistle() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrassWhistle__9daAlink_cCFv.s" +BOOL daAlink_c::checkGrassWhistle() const { + return mActionID == GRASS_WHISTLE; } -#pragma pop /* 800D0718-800D072C 0CB058 0014+00 1/0 0/0 0/0 .text checkBoarRun__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBoarRun() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoarRun__9daAlink_cCFv.s" +BOOL daAlink_c::checkBoarRun() const { + return mActionID == BOAR_RUN; } -#pragma pop /* 800D072C-800D0794 0CB06C 0068+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkHorseRideNotReady() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseRideNotReady__9daAlink_cCFv.s" +BOOL daAlink_c::checkHorseRideNotReady() const { + return checkHorseRide() && mActionID != HORSE_RIDE && mActionID != HORSE_GETOFF; } -#pragma pop /* 800D0794-800D079C 0CB0D4 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSearchBallScale() const { - nofralloc -#include "asm/d/a/d_a_alink/getSearchBallScale__9daAlink_cCFv.s" +f32 daAlink_c::getSearchBallScale() const { + return mSearchBallScale; } -#pragma pop /* 800D079C-800D07A4 0CB0DC 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkFastShotTime() { - nofralloc -#include "asm/d/a/d_a_alink/checkFastShotTime__9daAlink_cFv.s" +s16 daAlink_c::checkFastShotTime() { + return mFastShotTime; } -#pragma pop /* 800D07A4-800D07D4 0CB0E4 0030+00 1/0 0/0 0/0 .text checkCutJumpCancelTurn__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutJumpCancelTurn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutJumpCancelTurn__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutJumpCancelTurn() const { + return (mActionID == CUT_JUMP || mActionID == CUT_JUMP_LAND) && field_0x3198 != 2; } -#pragma pop /* 800D07D4-800D07FC 0CB114 0028+00 1/0 0/0 0/0 .text * checkSingleBoarBattleSecondBowReady__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSingleBoarBattleSecondBowReady() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSingleBoarBattleSecondBowReady__9daAlink_cCFv.s" +BOOL daAlink_c::checkSingleBoarBattleSecondBowReady() const { + return mActionID == RIDE_BOW_READY && mCommonCounter != 0; } -#pragma pop /* 800D07FC-800D0818 0CB13C 001C+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelDungeonWarpReadyNeck() { - nofralloc -#include "asm/d/a/d_a_alink/cancelDungeonWarpReadyNeck__9daAlink_cFv.s" +void daAlink_c::cancelDungeonWarpReadyNeck() { + if (mActionID != DUNGEON_WARP_READY) { + return; + } + offModeFlg(MODE_UNK_100); } -#pragma pop /* 800D0818-800D0830 0CB158 0018+00 1/0 0/0 0/0 .text * onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onSceneChangeAreaJump(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c.s" +void daAlink_c::onSceneChangeAreaJump(u8 param_0, u8 param_1, fopAc_ac_c* param_2) { + field_0x3112 = param_0 | 0x8000; + field_0x2fac = param_1; + field_0x2808 = param_2; } -#pragma pop /* 800D0830-800D084C 0CB170 001C+00 1/0 0/0 0/0 .text onSceneChangeDead__9daAlink_cFUci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onSceneChangeDead__9daAlink_cFUci.s" +void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { + if (mActionID != DEAD) { + return; + } + field_0x3012 = param_0; + field_0x3198 = param_1; } -#pragma pop /* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkNoEquipItem() const { - nofralloc -#include "asm/d/a/d_a_alink/checkNoEquipItem__9daAlink_cCFv.s" +bool daAlink_c::checkNoEquipItem() const { + return mEquipItem == NO_ITEM; } -#pragma pop /* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getBoardCutTurnOffsetAngleY() const { - nofralloc -#include "asm/d/a/d_a_alink/getBoardCutTurnOffsetAngleY__9daAlink_cCFv.s" +s16 daAlink_c::getBoardCutTurnOffsetAngleY() const { + if (mActionID == BOARD_CUT_TURN) { + return field_0x3012; + } + return 0; } -#pragma pop /* 800D087C-800D0884 0CB1BC 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz* daAlink_c::getMagneBootsTopVec() { - nofralloc -#include "asm/d/a/d_a_alink/getMagneBootsTopVec__9daAlink_cFv.s" +cXyz* daAlink_c::getMagneBootsTopVec() { + return &mMagneBootsTopVec; } -#pragma pop /* 800D0884-800D08B0 0CB1C4 002C+00 1/0 0/0 0/0 .text setCargoCarry__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCargoCarry(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setCargoCarry__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::setCargoCarry(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_CARGO_CARRY; + mCargoCarryActor.setData(p_actor); } -#pragma pop /* 800D08B0-800D08DC 0CB1F0 002C+00 1/0 0/0 0/0 .text setGoronSideMove__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGoronSideMove(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGoronSideMove__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::setGoronSideMove(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_GORON_THROW; + mCargoCarryActor.setData(p_actor); } -#pragma pop /* 800D08DC-800D091C 0CB21C 0040+00 1/0 0/0 0/0 .text setSumouReady__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouReady(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSumouReady__9daAlink_cFP10fopAc_ac_c.s" +void daAlink_c::setSumouReady(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_SUMO_READY; + mCargoCarryActor.setData(p_actor); + mDemo.setDemoMode(1); } -#pragma pop /* 800D091C-800D0930 0CB25C 0014+00 1/0 0/0 0/0 .text setSumouPushBackDirection__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouPushBackDirection(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSumouPushBackDirection__9daAlink_cFs.s" +void daAlink_c::setSumouPushBackDirection(s16 param_0) { + if (mActionID != SUMOU_PUSH) { + return; + } + field_0x3010 = param_0; } -#pragma pop /* 800D0930-800D0948 0CB270 0018+00 1/0 0/0 0/0 .text setSumouLoseHeadUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouLoseHeadUp() { - nofralloc -#include "asm/d/a/d_a_alink/setSumouLoseHeadUp__9daAlink_cFv.s" +void daAlink_c::setSumouLoseHeadUp() { + if (mActionID != SUMOU_WIN_LOSE) { + return; + } + mSpecialMode = SMODE_SUMO_LOSE; } -#pragma pop /* 800D0948-800D095C 0CB288 0014+00 1/0 0/0 0/0 .text checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c.s" +bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* p_actor) const { + return field_0x27f4 == p_actor; } -#pragma pop /* 800D095C-800D0970 0CB29C 0014+00 1/0 0/0 0/0 .text * checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c.s" +bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { + return field_0x281c.getActorConst() == p_actor; } -#pragma pop /* 800D0970-800D0984 0CB2B0 0014+00 1/0 0/0 0/0 .text setWolfEnemyHangBiteAngle__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfEnemyHangBiteAngle(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfEnemyHangBiteAngle__9daAlink_cFs.s" +void daAlink_c::setWolfEnemyHangBiteAngle(s16 angle) { + if (mActionID != WOLF_ENEMY_HANG_BITE) { + return; + } + field_0x3010 = angle; } -#pragma pop /* 800D0984-800D0998 0CB2C4 0014+00 1/0 0/0 0/0 .text setSumouGraspCancelCount__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouGraspCancelCount(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSumouGraspCancelCount__9daAlink_cFi.s" +void daAlink_c::setSumouGraspCancelCount(int param_0) { + if (mActionID != SUMOU_PUSH) { + return; + } + mCommonCounter = param_0; } -#pragma pop /* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkItemSwordEquip() const { - nofralloc -#include "asm/d/a/d_a_alink/checkItemSwordEquip__9daAlink_cCFv.s" +bool daAlink_c::checkItemSwordEquip() const { + return mEquipItem == EQUIP_SWORD; } -#pragma pop /* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm float daAlink_c::getSinkShapeOffset() const { - nofralloc -#include "asm/d/a/d_a_alink/getSinkShapeOffset__9daAlink_cCFv.s" +f32 daAlink_c::getSinkShapeOffset() const { + return mSinkShapeOffset; } -#pragma pop /* 800D09B4-800D09C8 0CB2F4 0014+00 1/0 0/0 0/0 .text checkSinkDead__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSinkDead() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSinkDead__9daAlink_cCFv.s" +BOOL daAlink_c::checkSinkDead() const { + return field_0x2fbd == 0xFF; } -#pragma pop /* 800D09C8-800D09DC 0CB308 0014+00 1/0 0/0 0/0 .text checkCutJumpMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutJumpMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutJumpMode__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutJumpMode() const { + return mActionID == CUT_JUMP; } -#pragma pop /* 800D09DC-800D09E4 0CB31C 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 daAlink_c::getGiantPuzzleAimAngle() const { - nofralloc -#include "asm/d/a/d_a_alink/getGiantPuzzleAimAngle__9daAlink_cCFv.s" +s16 daAlink_c::getGiantPuzzleAimAngle() const { + return mCommonCounter; } -#pragma pop /* 800D09E4-800D09EC 0CB324 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getSwordChangeWaitTimer() const { - nofralloc -#include "asm/d/a/d_a_alink/getSwordChangeWaitTimer__9daAlink_cCFv.s" +u8 daAlink_c::getSwordChangeWaitTimer() const { + return mSwordChangeWaitTimer; } -#pragma pop /* 800D09EC-800D0A14 0CB32C 0028+00 1/0 0/0 0/0 .text checkMetamorphose__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkMetamorphose() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMetamorphose__9daAlink_cCFv.s" +BOOL daAlink_c::checkMetamorphose() const { + return mActionID == METAMORPHOSE && field_0x300a == 0; } -#pragma pop /* 800D0A14-800D0A28 0CB354 0014+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfDownAttackPullOut() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfDownAttackPullOut__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfDownAttackPullOut() const { + return mActionID == WOLF_DOWNATTACK_PULLOUT; } -#pragma pop /* 800D0A28-800D0A30 0CB368 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daAlink_cCFv */ +// vtable issue +#ifdef NONMATCHING +cXyz* daAlink_c::getMidnaAtnPos() const { + return &mMidnaAtnPos; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -19984,135 +19747,86 @@ extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() { #include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s" } #pragma pop +#endif /* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCopyRodEquip() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCopyRodEquip__9daAlink_cCFv.s" +bool daAlink_c::checkCopyRodEquip() const { + return mEquipItem == COPY_ROD; } -#pragma pop /* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCanoeFishingGetLeft() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeFishingGetLeft__9daAlink_cCFv.s" +bool daAlink_c::checkCanoeFishingGetLeft() const { + return mActionID == CANOE_FISHING_GET && field_0x300e == 0; } -#pragma pop /* 800D0A6C-800D0A94 0CB3AC 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetRight__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCanoeFishingGetRight() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeFishingGetRight__9daAlink_cCFv.s" +bool daAlink_c::checkCanoeFishingGetRight() const { + return mActionID == CANOE_FISHING_GET && field_0x300e == 1; } -#pragma pop /* 800D0A94-800D0A9C 0CB3D4 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBeeChildDrink() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBeeChildDrink__9daAlink_cCFv.s" +u8 daAlink_c::checkBeeChildDrink() const { + return field_0x2fd3; } -#pragma pop /* 800D0A9C-800D0AA4 0CB3DC 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getWolfHowlMgrP() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfHowlMgrP__9daAlink_cFv.s" +Z2WolfHowlMgr* daAlink_c::getWolfHowlMgrP() { + return &mZ2WolfHowlMgr; } -#pragma pop /* 800D0AA4-800D0AC8 0CB3E4 0024+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfHowlSuccessAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfHowlSuccessAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfHowlSuccessAnime() const { + return checkUnderMove0BckNoArcWolf(ANM_WOLF_HOWL_SUCCESS); } -#pragma pop /* 800D0AC8-800D0AF0 0CB408 0028+00 1/0 0/0 0/0 .text checkOctaIealHang__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkOctaIealHang() const { - nofralloc -#include "asm/d/a/d_a_alink/checkOctaIealHang__9daAlink_cCFv.s" +bool daAlink_c::checkOctaIealHang() const { + return mActionID == BOSS_ENEMY_HANG && field_0x32cc == 0; } -#pragma pop /* 800D0AF0-800D0B08 0CB430 0018+00 1/0 0/0 0/0 .text cancelOctaIealHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelOctaIealHang() { - nofralloc -#include "asm/d/a/d_a_alink/cancelOctaIealHang__9daAlink_cFv.s" +void daAlink_c::cancelOctaIealHang() { + if (mActionID != BOSS_ENEMY_HANG) { + return; + } + field_0x300e = 1; } -#pragma pop /* 800D0B08-800D0B20 0CB448 0018+00 1/0 0/0 0/0 .text cancelDragonHangBackJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelDragonHangBackJump() { - nofralloc -#include "asm/d/a/d_a_alink/cancelDragonHangBackJump__9daAlink_cFv.s" +void daAlink_c::cancelDragonHangBackJump() { + if (mActionID != BOSS_ENEMY_HANG) { + return; + } + field_0x300e = -1; } -#pragma pop /* 800D0B20-800D0B38 0CB460 0018+00 1/0 0/0 0/0 .text setOctaIealWildHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setOctaIealWildHang() { - nofralloc -#include "asm/d/a/d_a_alink/setOctaIealWildHang__9daAlink_cFv.s" +void daAlink_c::setOctaIealWildHang() { + if (mActionID != BOSS_ENEMY_HANG) { + return; + } + field_0x3008 = 1; } -#pragma pop /* 800D0B38-800D0B60 0CB478 0028+00 1/0 0/0 0/0 .text checkDragonHangRide__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkDragonHangRide() const { - nofralloc -#include "asm/d/a/d_a_alink/checkDragonHangRide__9daAlink_cCFv.s" +bool daAlink_c::checkDragonHangRide() const { + return mActionID == BOSS_ENEMY_HANG && field_0x32cc != 0; } -#pragma pop /* 800D0B60-800D0B8C 0CB4A0 002C+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daAlink_cFUlUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::playerStartCollisionSE(u32 param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/playerStartCollisionSE__9daAlink_cFUlUl.s" +void daAlink_c::playerStartCollisionSE(u32 param_0, u32 param_1) { + mZ2Link.startCollisionSE(param_0, param_1); } -#pragma pop /* 800D0B8C-800D0C6C 0CB4CC 00E0+00 1/0 0/0 0/0 .text __dt__16daAlink_matAnm_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daAlink_matAnm_c::~daAlink_matAnm_c() { +// asm daAlink_matAnm_c::~daAlink_matAnm_c() { +extern "C" asm void __dt__16daAlink_matAnm_cFv() { nofralloc #include "asm/d/a/d_a_alink/__dt__16daAlink_matAnm_cFv.s" } @@ -20193,76 +19907,71 @@ asm void daAlink_c::checkLightSwordMtrl() { /* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text checkSwordEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwordEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSwordEquipAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkSwordEquipAnime() const { + return !i_checkNoResetFlg0(FLG0_UNK_1000000) && + (checkUpperAnime(0x255) || checkUpperAnime(0x261)); } -#pragma pop /* 800D0ECC-800D0EFC 0CB80C 0030+00 8/8 0/0 0/0 .text checkCutDashAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutDashAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutDashAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutDashAnime() const { + return checkUpperAnime(0x80) || checkUpperAnime(0x82) || checkUpperAnime(0x81); } -#pragma pop /* 800D0EFC-800D0F5C 0CB83C 0060+00 1/1 0/0 0/0 .text * checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf.s" +BOOL daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf& obj) { + return obj.ChkAtHit() && checkEnemyGroup(obj.GetAtHitAc()); } -#pragma pop /* 800D0F5C-800D0F90 0CB89C 0034+00 6/6 0/0 0/0 .text getSwordAtType__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSwordAtType() { - nofralloc -#include "asm/d/a/d_a_alink/getSwordAtType__9daAlink_cFv.s" +u32 daAlink_c::getSwordAtType() { + return checkMasterSwordEquip() ? 0x4000002 : 2; } -#pragma pop /* 800D0F90-800D102C 0CB8D0 009C+00 3/3 0/0 0/0 .text initCutTurnAt__9daAlink_cFfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/initCutTurnAt__9daAlink_cFfi.s" +void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { + field_0xFB8.ResetAtHit(); + field_0xFB8.OnAtSetBit(); + field_0xFB8.SetAtType(getSwordAtType()); + field_0xFB8.SetAtHitMark(3); + field_0xFB8.SetAtSe(1); + field_0xFB8.SetAtAtp(param_1); + u8 mtrl; + if (!i_checkNoResetFlg3(FLG3_UNK_100000)) { + mtrl = 0; + } else { + mtrl = 4; + } + field_0xFB8.SetAtMtrl(mtrl); + field_0xFB8.SetR(param_0); + field_0x2fd0 = 1; } -#pragma pop /* 800D102C-800D1088 0CB96C 005C+00 2/2 0/0 0/0 .text checkCutFinishJumpUp__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::checkCutFinishJumpUp() { + return checkCutBackState() && (!checkNotBattleStage() && swordSwingTrigger()); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutFinishJumpUp() { +asm bool daAlink_c::checkCutFinishJumpUp() { nofralloc #include "asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s" } #pragma pop +#endif /* 800D1088-800D10E0 0CB9C8 0058+00 2/2 0/0 0/0 .text changeCutFast__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeCutFast() { - nofralloc -#include "asm/d/a/d_a_alink/changeCutFast__9daAlink_cFv.s" +void daAlink_c::changeCutFast() { + deleteEquipItem(0, 0); + setSwordModel(); + mComboCutCount = 3; + checkCutAction(); + i_onNoResetFlg0(FLG0_UNK_80000); } -#pragma pop /* 800D10E0-800D1268 0CBA20 0188+00 1/1 0/0 0/0 .text checkCutFastReady__9daAlink_cFv */ #pragma push @@ -20274,42 +19983,48 @@ asm void daAlink_c::checkCutFastReady() { } #pragma pop -/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordModel() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordModel__9daAlink_cFv.s" +bool daPy_py_c::checkWoodSwordEquip() { + return dComIfGs_getSelectEquipSword() == WOOD_STICK; +} + +/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */ +void daAlink_c::setSwordModel() { + field_0x2fde = 0xFF; + mEquipItem = EQUIP_SWORD; + + mDoAud_bgmSetSwordUsing(1); + field_0x2f94 = 0; + + if (checkWoodSwordEquip()) { + mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide(); + } else { + mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->show(); + } } -#pragma pop /* 800D1310-800D13AC 0CBC50 009C+00 2/2 0/0 0/0 .text offSwordModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offSwordModel() { - nofralloc -#include "asm/d/a/d_a_alink/offSwordModel__9daAlink_cFv.s" +void daAlink_c::offSwordModel() { + mDoAud_bgmSetSwordUsing(0); + + if (mSwordModel == field_0x0668 || mSwordModel == field_0x0660) { + mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); + } else if (mSwordModel == field_0x0670) { + field_0x0670->getModelData()->getMaterialNodePointer(1)->getShape()->show(); + } } -#pragma pop /* 800D13AC-800D13E4 0CBCEC 0038+00 1/1 0/0 0/0 .text checkCutTypeNoBlur__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutTypeNoBlur() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTypeNoBlur__9daAlink_cCFv.s" +BOOL daAlink_c::checkCutTypeNoBlur() const { + return mCutType == TYPE_CUT_STAB || mCutType == TYPE_CUT_STAB_COMBO || + mCutType == TYPE_CUT_STAB_FINISH || i_checkNoResetFlg0(UNDER_WATER_MOVEMENT); } -#pragma pop /* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text checkCutTurnInput__9daAlink_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutTurnInput() const { +asm bool daAlink_c::checkCutTurnInput() const { nofralloc #include "asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s" } @@ -20317,26 +20032,35 @@ asm void daAlink_c::checkCutTurnInput() const { /* 800D1424-800D1430 0CBD64 000C+00 7/7 0/0 0/0 .text getCutTurnDirection__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCutTurnDirection() const { - nofralloc -#include "asm/d/a/d_a_alink/getCutTurnDirection__9daAlink_cCFv.s" +int daAlink_c::getCutTurnDirection() const { + return field_0x3180 < 0; } -#pragma pop /* 800D1430-800D1454 0CBD70 0024+00 17/17 0/0 0/0 .text resetCombo__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetCombo(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/resetCombo__9daAlink_cFi.s" +void daAlink_c::resetCombo(int param_0) { + mComboCutCount = 0; + i_offNoResetFlg0(FLG0_UNK_8000); + if (param_0 != 0) { + mRunCutComboCount = 0; + } } -#pragma pop /* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ +// something with i_checkAttentionLock +#ifdef NONMATCHING +void daAlink_c::checkComboCnt() { + if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && + (i_checkAttentionLock() && (field_0x122C[0].ChkAtHit() || field_0x122C[1].ChkAtHit() || + field_0x122C[2].ChkAtHit()))) { + i_onNoResetFlg0(FLG0_UNK_8000); + } + if (field_0x307e > 0) { + field_0x307e--; + } else { + resetCombo(1); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -20345,16 +20069,13 @@ asm void daAlink_c::checkComboCnt() { #include "asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s" } #pragma pop +#endif /* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text setCutType__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutType(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setCutType__9daAlink_cFUc.s" +void daAlink_c::setCutType(u8 type) { + mCutType = type; + i_offResetFlg0(RFLG0_UNK_8000000); } -#pragma pop /* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text * setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff */ @@ -20382,14 +20103,15 @@ asm void daAlink_c::setSwordAtParam(dCcG_At_Spl param_0, u8 param_1, u8 param_2, /* 800D1788-800D17EC 0CC0C8 0064+00 1/1 0/0 1/1 .text * notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::notSwordHitVibActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c.s" +bool daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) { + if (p_actor != NULL && fopAcM_GetGroup(p_actor) == 4) { + s16 name = fopAcM_GetName(p_actor); + if (!checkSpecialNpc(p_actor) && name != 0x108 && name != 0x240) { + return true; + } + } + return false; } -#pragma pop /* 800D17EC-800D1920 0CC12C 0134+00 4/4 0/0 0/0 .text * setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf */ @@ -20404,32 +20126,23 @@ asm void daAlink_c::setSwordHitVibration(dCcD_GObjInf* param_0) { /* 800D1920-800D1978 0CC260 0058+00 3/3 0/0 0/0 .text checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkAtShieldHit(dCcD_GObjInf& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf.s" +BOOL daAlink_c::checkAtShieldHit(dCcD_GObjInf& param_0) { + return param_0.ChkAtHit() && param_0.ChkAtShieldHit(); } -#pragma pop /* 800D1978-800D19C8 0CC2B8 0050+00 1/1 0/0 0/0 .text * checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf.s" +bool daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) { + param_0->GetAtHitAc(); + return checkAtShieldHit(*param_0) ? true : false; } -#pragma pop /* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text * changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { +asm BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { nofralloc #include "asm/d/a/d_a_alink/changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" } @@ -20447,85 +20160,86 @@ asm void daAlink_c::setCutDash(int param_0, int param_1) { /* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkForceSwordSwing() { - nofralloc -#include "asm/d/a/d_a_alink/checkForceSwordSwing__9daAlink_cFv.s" +BOOL daAlink_c::checkForceSwordSwing() { + return mEquipItem == EQUIP_SWORD && swordSwingTrigger(); } -#pragma pop /* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setComboReserb() { - nofralloc -#include "asm/d/a/d_a_alink/setComboReserb__9daAlink_cFv.s" +void daAlink_c::setComboReserb() { + if (i_checkWolf()) { + field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; + } else { + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + } + if (mComboCutCount != 4 && field_0x2fce == 0 && swordSwingTrigger()) { + i_onNoResetFlg2(UNK_FLG2_2); + } } -#pragma pop /* 800D2188-800D21D0 0CCAC8 0048+00 1/1 0/0 0/0 .text checkComboReserb__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkComboReserb() { - nofralloc -#include "asm/d/a/d_a_alink/checkComboReserb__9daAlink_cFv.s" +BOOL daAlink_c::checkComboReserb() { + return i_checkNoResetFlg2(UNK_FLG2_2) && !checkEventRun(); +} + +inline u8 i_dComIfGp_getDoStatus() { + return g_dComIfG_gameInfo.play.getDoStatus(); } -#pragma pop /* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text commonCutAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonCutAction() { - nofralloc -#include "asm/d/a/d_a_alink/commonCutAction__9daAlink_cFv.s" +bool daAlink_c::commonCutAction() { + if (mComboCutCount == 4) { + resetCombo(1); + } + + if (i_dComIfGp_getDoStatus() == 4) { + setDoStatus(0); + } + mComboCutCount++; + + if (i_checkReinRide()) { + procHorseCutInit(); + if (mComboCutCount > 1) { + mComboCutCount = 1; + } + return true; + } else { + return false; + } } -#pragma pop /* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text setSwordVoiceSe__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordVoiceSe(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordVoiceSe__9daAlink_cFUl.s" +void daAlink_c::setSwordVoiceSe(u32 sfx_id) { + if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + voiceStart(sfx_id); + } } -#pragma pop /* 800D22BC-800D2304 0CCBFC 0048+00 3/3 0/0 0/0 .text setSwordChargeVoiceSe__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordChargeVoiceSe() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordChargeVoiceSe__9daAlink_cFv.s" +void daAlink_c::setSwordChargeVoiceSe() { + if (mCommonCounter != 0) { + mCommonCounter--; + if (mCommonCounter == 0) { + setSwordVoiceSe(Z2SE_AL_V_TAME); + } + } } -#pragma pop /* 800D2304-800D2368 0CCC44 0064+00 3/3 0/0 0/0 .text setSwordComboVoice__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordComboVoice() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordComboVoice__9daAlink_cFv.s" +void daAlink_c::setSwordComboVoice() { + if (mActionID == CUT_JUMP || mComboCutCount == 4) { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_L); + } else if (mComboCutCount == 1) { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_S); + } else { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_M); + } } -#pragma pop /* 800D2368-800D23C0 0CCCA8 0058+00 3/3 0/0 0/0 .text checkCutTurnInputTrigger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutTurnInputTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTurnInputTrigger__9daAlink_cFv.s" +bool daAlink_c::checkCutTurnInputTrigger() { + return swordSwingTrigger() && checkCutTurnInput(); } -#pragma pop /* 800D23C0-800D2684 0CCD00 02C4+00 7/7 0/0 0/0 .text checkCutAction__9daAlink_cFv */ #pragma push @@ -20538,14 +20252,17 @@ asm void daAlink_c::checkCutAction() { #pragma pop /* 800D2684-800D26EC 0CCFC4 0068+00 9/9 0/0 0/0 .text checkCutTurnCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutTurnCharge() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTurnCharge__9daAlink_cFv.s" +void daAlink_c::checkCutTurnCharge() { + if (swordButton()) { + if (field_0x3012 < 3) { + field_0x3012++; + } else { + i_onResetFlg0(RFLG0_UNK_40); + } + } else { + field_0x3012 = 0; + } } -#pragma pop /* 800D26EC-800D2760 0CD02C 0074+00 4/4 0/0 0/0 .text getCutDirection__9daAlink_cFv */ #pragma push @@ -20581,7 +20298,7 @@ asm void daAlink_c::checkDoCutAction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCutBackState() { +asm BOOL daAlink_c::checkCutBackState() { nofralloc #include "asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s" } @@ -20650,6 +20367,47 @@ asm void daAlink_c::checkCutAtnActorChange() { #pragma pop /* 800D2C78-800D2F58 0CD5B8 02E0+00 2/2 0/0 0/0 .text setCutJumpSpeed__9daAlink_cFi */ +// literals, and small issue with JMAFastSqrt instructions +#ifdef NONMATCHING +void daAlink_c::setCutJumpSpeed(int cut_type) { + if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } else if (checkHeavyStateOn(1, 1)) { + mSpeed.y *= 1.35f; + } + + // cut_type 0 = standing jump attack + if (mTargetedActor != NULL && cut_type == 0) { + mCollisionRot.y = cLib_targetAngleY(&mCurrent.mPosition, &mTargetedActor->mEyePos); + cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(mCollisionRot.y) * 70.0f), + mTargetedActor->mEyePos.y + 50.0f, + mTargetedActor->mEyePos.z - (cM_scos(mCollisionRot.y) * 70.0f)); + + if (fopAcM_gc_c::gndCheck(&targetPos)) { + targetPos.y = fopAcM_gc_c::getGroundY(); + } else { + targetPos.y = mTargetedActor->mEyePos.y; + } + + f32 dvar12 = mSpeed.y + mGravity; + f32 dvar10 = 1.0f / mGravity; + f32 fvar1 = targetPos.y - (mCurrent.mPosition.y - (dvar10 * (dvar12 * dvar12) * 0.5f)); + + if (fvar1 > 0.0f) { + fvar1 = 0.0f; + } + f32 sqrt = JMAFastSqrt(fvar1 * 2.0f * dvar10); + f32 speedDiv = sqrt - (dvar12 * dvar10); + f32 squareDist = mCurrent.mPosition.absXZ(targetPos); + + if (squareDist > 500.0f) { + squareDist = 500.0f; + } + mNormalSpeed = squareDist / speedDiv; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -20658,6 +20416,7 @@ asm void daAlink_c::setCutJumpSpeed(int param_0) { #include "asm/d/a/d_a_alink/setCutJumpSpeed__9daAlink_cFi.s" } #pragma pop +#endif /* 800D2F58-800D31B8 0CD898 0260+00 3/3 0/0 0/0 .text procCutNormalInit__9daAlink_cFi */ #pragma push @@ -20762,24 +20521,62 @@ asm void daAlink_c::procCutReverse() { #pragma pop /* 800D42FC-800D43F8 0CEC3C 00FC+00 2/2 0/0 0/0 .text procCutJumpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutJumpInit__9daAlink_cFi.s" +bool daAlink_c::procCutJumpInit(int jump_type) { + commonProcInit(CUT_JUMP); + setSingleAnimeParam(ANM_CUT_JUMP, &daAlinkHIO_cutJump_c0::m.mCutAnm); + if (jump_type != 0) { + mNormalSpeed = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedH; + mSpeed.y = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedV; + } else { + mNormalSpeed = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedH; + mSpeed.y = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedV; + } + setCutJumpSpeed(jump_type); + mCurrent.mAngle.y = mCollisionRot.y; + setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setCutType(TYPE_CUT_JUMP); + setSwordComboVoice(); + dComIfGp_setPlayerStatus0(0, 0x8000); + field_0x3198 = 2; + return true; } -#pragma pop /* 800D43F8-800D452C 0CED38 0134+00 1/0 0/0 0/0 .text procCutJump__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::procCutJump() { + if (mCurrent.mAngle.y == mCollisionRot.y && changeCutReverseProc(ANM_CUT_JUMP)) { + mCurrent.mAngle.y += 0x8000; + mNormalSpeed = 27.0f; + cXyz xyz(0.0f, 1.0f, 0.0f); + dComIfGp_getVibration().StartShock(5, 31, xyz); + } else if (mCurrent.mAngle.y != mCollisionRot.y) { + cLib_chaseF(&mNormalSpeed, 5.0f, 1.0f); + } + + if (checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + if (mLinkAcch.ChkGroundHit()) { + procCutJumpLandInit(field_0x3198); + } else if (mFrameCtrl1[0].getFrame() >= daAlinkHIO_cutJump_c0::m.mStartAttackFrame) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_L); + } + i_onResetFlg0(RFLG0_UNK_2); + } + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procCutJump() { +asm bool daAlink_c::procCutJump() { nofralloc #include "asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s" } #pragma pop +#endif /* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text procCutJumpLandInit__9daAlink_cFi */ @@ -20978,14 +20775,66 @@ asm void daAlink_c::procCutLargeJumpInit() { #pragma pop /* 800D6484-800D66C0 0D0DC4 023C+00 1/0 0/0 0/0 .text procCutLargeJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJump() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJump__9daAlink_cFv.s" +bool daAlink_c::procCutLargeJump() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + + if (field_0x3010 != 0) { + field_0x2f99 = 4; + } + + if (i_checkModeFlg(2) && checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + + if (mCommonCounter == 0) { + if (ctrl->checkAnmEnd()) { + field_0x2f99 = 12; + setSingleAnimeParam(ANM_CUT_JUMP_LARGE, &daAlinkHIO_cutLargeJump_c0::m.mCutAnm); + mCommonCounter = 1; + setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_2); + } else { + if (ctrl->getFrame() >= lit_7307) { + field_0x3010 = 1; + } + + if (!i_checkModeFlg(2) && ctrl->getFrame() >= lit_7808) { + setJumpMode(); + mNormalSpeed = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedH; + mSpeed.y = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedV; + setCutJumpSpeed(0); + } + + if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartF && + ctrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndF) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); + } + i_onResetFlg0(2); + } + } + } else { + if (field_0x300e != 0) { + field_0x300e--; + if (field_0x300e == 0) { + setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 4, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setCutType(TYPE_CUT_LARGE_JUMP); + } + } + + if (mLinkAcch.ChkGroundHit()) { + procCutLargeJumpLandInit(field_0x3198); + } else { + if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitF) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); + } + i_onResetFlg0(2); + } + } + } + return true; } -#pragma pop /* 800D66C0-800D67FC 0D1000 013C+00 1/1 0/0 0/0 .text procCutLargeJumpLandInit__9daAlink_cFi */ #pragma push @@ -21570,7 +21419,7 @@ asm void daAlink_c::procCoSwimFreezeReturn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { +asm BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s" } @@ -21580,7 +21429,7 @@ asm void daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) { +asm BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) { nofralloc #include "asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s" } @@ -21600,7 +21449,7 @@ asm void daAlink_c::checkShieldAttackEmphasys() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGuardActionChange() { +asm BOOL daAlink_c::checkGuardActionChange() { nofralloc #include "asm/d/a/d_a_alink/checkGuardActionChange__9daAlink_cFv.s" } @@ -21667,21 +21516,43 @@ asm void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkUpperGuardAnime() const { +asm BOOL daAlink_c::checkUpperGuardAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s" } #pragma pop /* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */ +#ifdef NONMATCHING +BOOL daAlink_c::checkPlayerGuard() const { + bool ret = true; + bool bvar2 = true; + if (!i_checkSmallUpperGuardAnime()) { + bool bvar1 = false; + if (i_checkShieldGet() && checkHorseLieAnime()) { + bvar1 = true; + } + if (!bvar1) { + bvar2 = false; + } + } + + if (!bvar2 && !checkUpperGuardAnime()) { + ret = false; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daAlink_c::checkPlayerGuard() const { +asm BOOL daAlink_c::checkPlayerGuard() const { nofralloc #include "asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s" } #pragma pop +#endif /* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */ #pragma push @@ -21810,7 +21681,7 @@ asm void daAlink_c::procGuardBreak() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procTurnMoveInit(int param_0) { +asm bool daAlink_c::procTurnMoveInit(int param_0) { nofralloc #include "asm/d/a/d_a_alink/procTurnMoveInit__9daAlink_cFi.s" } @@ -21881,7 +21752,7 @@ asm void daAlink_c::getArrowIncAtMax() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBowAndSlingItem(int param_0) { +asm BOOL daAlink_c::checkBowAndSlingItem(int param_0) { nofralloc #include "asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s" } @@ -22065,7 +21936,7 @@ asm void daAlink_c::setBowModel() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBowGrabLeftHand() const { +asm bool daAlink_c::checkBowGrabLeftHand() const { nofralloc #include "asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s" } @@ -22142,75 +22013,75 @@ asm void daAlink_c::procBowMove() { #pragma pop /* 800DFFE0-800E0010 0DA920 0030+00 0/0 0/0 1/1 .text checkBoomerangLockAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoomerangLockAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangLockAccept__9daAlink_cFv.s" +BOOL daAlink_c::checkBoomerangLockAccept() { + return mSight.getDrawFlg() && i_dComIfGp_checkPlayerStatus0(0, 0x80000); } -#pragma pop /* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text getBoomSpeed__9daAlink_cFv */ +// small regalloc +#ifdef NONMATCHING +f32 daAlink_c::getBoomSpeed() { + f32 speed; + if (checkBoomerangChargeEndWait()) { + speed = daAlinkHIO_boom_c0::m.field_0x38; + } else { + speed = daAlinkHIO_boom_c0::m.field_0x34; + } + + if (i_checkModeFlg(0x400) && mRideActor.getActor() != NULL && mSpeedF > FLOAT_LABEL(lit_6108)) { + speed += mSpeedF; + } + + return speed; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getBoomSpeed() { +asm f32 daAlink_c::getBoomSpeed() { nofralloc #include "asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s" } #pragma pop +#endif /* 800E00B0-800E00C0 0DA9F0 0010+00 0/0 0/0 1/1 .text getBoomCatchSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoomCatchSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getBoomCatchSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getBoomCatchSpeed() const { + return daAlinkHIO_boom_c0::m.mCatchSpeed; } -#pragma pop /* 800E00C0-800E011C 0DAA00 005C+00 1/1 0/0 1/1 .text getBoomFlyMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoomFlyMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getBoomFlyMax__9daAlink_cCFv.s" +f32 daAlink_c::getBoomFlyMax() const { + if (i_checkModeFlg(0x400) && !checkCanoeRide()) { + return daAlinkHIO_boom_c0::m.field_0x40; + } else { + return daAlinkHIO_boom_c0::m.field_0x3c; + } } -#pragma pop /* 800E011C-800E0190 0DAA5C 0074+00 1/1 0/0 2/2 .text getBoomLockMax__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoomLockMax() { - nofralloc -#include "asm/d/a/d_a_alink/getBoomLockMax__9daAlink_cFv.s" +f32 daAlink_c::getBoomLockMax() { + f32 max = getBoomFlyMax(); + + if (checkBossBabaRoom()) { + return lit_12475; + } else if (daAlinkHIO_boom_c0::m.field_0x44 > max) { + return daAlinkHIO_boom_c0::m.field_0x44; + } else { + return max; + } } -#pragma pop /* 800E0190-800E01A0 0DAAD0 0010+00 0/0 0/0 1/1 .text getBoomBgThroughTime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoomBgThroughTime() const { - nofralloc -#include "asm/d/a/d_a_alink/getBoomBgThroughTime__9daAlink_cCFv.s" +s16 daAlink_c::getBoomBgThroughTime() const { + return daAlinkHIO_boom_c0::m.mBgThroughTime; } -#pragma pop /* 800E01A0-800E01CC 0DAAE0 002C+00 1/1 0/0 0/0 .text checkBossBabaRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBossBabaRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkBossBabaRoom__9daAlink_cFv.s" +bool daAlink_c::checkBossBabaRoom() { + return checkStageName("D_MN05A"); } -#pragma pop /* 800E01CC-800E0210 0DAB0C 0044+00 0/0 1/1 0/0 .text * cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c */ @@ -22224,14 +22095,17 @@ asm void daAlink_c::cancelBoomerangLock(fopAc_ac_c* param_0) { #pragma pop /* 800E0210-800E0244 0DAB50 0034+00 2/2 0/0 0/0 .text getBoomerangActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoomerangActor() { - nofralloc -#include "asm/d/a/d_a_alink/getBoomerangActor__9daAlink_cFv.s" +fopAc_ac_c* daAlink_c::getBoomerangActor() { + if (mThrowBoomerangActor.getID() != 0xFFFFFFFF) { + return mThrowBoomerangActor.getActor(); + } + + if (mEquipItem == BOOMERANG) { + return mItemActor.getActor(); + } + + return NULL; } -#pragma pop /* 800E0244-800E02B8 0DAB84 0074+00 0/0 1/1 0/0 .text checkBoomerangChargeEnd__9daAlink_cFv */ #pragma push @@ -22256,31 +22130,30 @@ asm void daAlink_c::checkBoomerangCarry(fopAc_ac_c* param_0) { /* 800E03D0-800E0440 0DAD10 0070+00 6/6 0/0 0/0 .text initBoomerangUpperAnimeSpeed__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/initBoomerangUpperAnimeSpeed__9daAlink_cFi.s" +void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) { + if (!checkBoomerangThrowAnime()) { + if (param_0 != 0) { + f32 tmp = FLOAT_LABEL(lit_6108); + mFrameCtrl2[2].setRate(tmp); + mFrameCtrl2[2].setFrame(tmp); + getNowAnmPackUpper(UPPER_NOW)->setFrame(tmp); + } else { + mFrameCtrl2[2].setRate(daAlinkHIO_boom_c0::m.field_0x2c); + } + } } -#pragma pop /* 800E0440-800E04AC 0DAD80 006C+00 9/9 0/0 0/0 .text checkBoomerangAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoomerangAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangAnime__9daAlink_cCFv.s" +BOOL daAlink_c::checkBoomerangAnime() const { + return checkBoomerangReadyAnime() || checkBoomerangThrowAnime(); } -#pragma pop /* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkBoomerangThrowAnime() const { +asm BOOL daAlink_c::checkBoomerangThrowAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkBoomerangThrowAnime__9daAlink_cCFv.s" } @@ -22307,24 +22180,20 @@ asm void daAlink_c::setBoomerangReadyAnime() { #pragma pop /* 800E05E8-800E0630 0DAF28 0048+00 2/2 0/0 0/0 .text setThrowBoomerangAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setThrowBoomerangAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setThrowBoomerangAnime__9daAlink_cFv.s" +void daAlink_c::setThrowBoomerangAnime() { + setUpperAnimeParam(0x53, UPPER_NOW, &daAlinkHIO_boom_c0::m.mThrowAnm); + cancelItemUseQuake(0); } -#pragma pop /* 800E0630-800E06B8 0DAF70 0088+00 2/2 0/0 0/0 .text setBoomerangCatchAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangCatchAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangCatchAnime__9daAlink_cFv.s" +void daAlink_c::setBoomerangCatchAnime() { + setUpperAnimeParam(0x52, UPPER_NOW, &daAlinkHIO_boom_c0::m.mCatchAnm); + setFacePriBck(0xE8); + field_0x2f97 = 254; + if (mEquipItem != COPY_ROD) { + seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); + } } -#pragma pop /* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text throwBoomerang__9daAlink_cFv */ #pragma push @@ -22461,67 +22330,49 @@ asm void daAlink_c::procBoomerangCatch() { #pragma pop /* 800E12E0-800E1310 0DBC20 0030+00 1/1 0/0 0/0 .text checkLv6BossRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLv6BossRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkLv6BossRoom__9daAlink_cFv.s" +BOOL daAlink_c::checkLv6BossRoom() { + return checkStageName("D_MN06A"); } -#pragma pop /* 800E1310-800E1320 0DBC50 0010+00 0/0 0/0 1/1 .text getCopyRodBallSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCopyRodBallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCopyRodBallSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getCopyRodBallSpeed() const { + return daAlinkHIO_copyRod_c0::m.mBallSpeed; } -#pragma pop /* 800E1320-800E1330 0DBC60 0010+00 0/0 0/0 1/1 .text getCopyRodBallReturnSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCopyRodBallReturnSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCopyRodBallReturnSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getCopyRodBallReturnSpeed() const { + return daAlinkHIO_copyRod_c0::m.mBallReturnSpeed; } -#pragma pop /* 800E1330-800E1374 0DBC70 0044+00 3/3 0/0 2/2 .text getCopyRodBallDisMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCopyRodBallDisMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getCopyRodBallDisMax__9daAlink_cCFv.s" +f32 daAlink_c::getCopyRodBallDisMax() const { + if (checkLv6BossRoom()) { + return daAlinkHIO_copyRod_c0::m.mBossBallMaxDistance; + } + + return daAlinkHIO_copyRod_c0::m.mBallMaxDistance; } -#pragma pop /* 800E1374-800E1390 0DBCB4 001C+00 6/6 0/0 7/7 .text getCopyRodControllActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCopyRodControllActor() { - nofralloc -#include "asm/d/a/d_a_alink/getCopyRodControllActor__9daAlink_cFv.s" +fopAc_ac_c* daAlink_c::getCopyRodControllActor() { + if (mCopyRodAcKeep.getActor() != NULL) { + return static_cast(mCopyRodAcKeep.getActor())->getControllActor(); + } + + return NULL; } -#pragma pop /* 800E1390-800E13AC 0DBCD0 001C+00 0/0 4/4 1/1 .text getCopyRodCameraActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCopyRodCameraActor() { - nofralloc -#include "asm/d/a/d_a_alink/getCopyRodCameraActor__9daAlink_cFv.s" +fopAc_ac_c* daAlink_c::getCopyRodCameraActor() { + if (mCopyRodAcKeep.getActor() != NULL) { + return static_cast(mCopyRodAcKeep.getActor())->getCameraActor(); + } + + return NULL; } -#pragma pop /* 800E13AC-800E1408 0DBCEC 005C+00 2/2 0/0 0/0 .text initCopyRodUpperAnimeSpeed__9daAlink_cFi */ #pragma push @@ -22533,22 +22384,29 @@ asm void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { } #pragma pop +/* void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { + if (checkCopyRodThrowAnime()) { + if (param_1 == 0) { + mFrameCtrl2[2].setRate(); + } + f32 tmp = FLOAT_LABEL(lit_6108); + mFrameCtrl2[2].setRate(tmp); + mFrameCtrl2[2].setFrame(tmp); + + } +} */ + /* 800E1408-800E145C 0DBD48 0054+00 2/2 0/0 0/0 .text checkForestOldCentury__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkForestOldCentury() { - nofralloc -#include "asm/d/a/d_a_alink/checkForestOldCentury__9daAlink_cFv.s" +BOOL daAlink_c::checkForestOldCentury() { + return checkStageName("F_SP117") && dComIfGp_roomControl_getStayNo() == 2; } -#pragma pop /* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daAlink_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool daAlink_c::checkCopyRodTopUse() { +asm BOOL daAlink_c::checkCopyRodTopUse() { nofralloc #include "asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s" } @@ -22565,14 +22423,14 @@ asm void daAlink_c::checkCopyRodAnime() const { #pragma pop /* 800E158C-800E15FC 0DBECC 0070+00 2/2 0/0 0/0 .text setCopyRodControllAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodControllAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodControllAnime__9daAlink_cFv.s" +void daAlink_c::setCopyRodControllAnime() { + if (checkNoUpperAnime() && getCopyRodControllActor()) { + setUpperAnimeBaseSpeed(0x202, FLOAT_LABEL(lit_6108), lit_6109); + field_0x2f96 = 2; + field_0x2f97 = 5; + field_0x33e8 = FLOAT_LABEL(lit_6108); + } } -#pragma pop /* 800E15FC-800E1748 0DBF3C 014C+00 1/1 0/0 0/0 .text * setCopyRodControllUpperSpeedRate__9daAlink_cFv */ @@ -22586,17 +22444,48 @@ asm void daAlink_c::setCopyRodControllUpperSpeedRate() { #pragma pop /* 800E1748-800E1840 0DC088 00F8+00 2/2 0/0 0/0 .text setCopyRodModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodModel() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodModel__9daAlink_cFv.s" +void daAlink_c::setCopyRodModel() { + JKRHeap* heap = setItemHeap(); + J3DModelData* mdl_data = loadAramBmd(0x315, 0x5400); + mHeldItemModel = initModel(mdl_data, 0x80000, 0x1000000); + field_0x0724 = loadAramItemBrk(0x323, mHeldItemModel); + mDoExt_setCurrentHeap(heap); + field_0x0724->setFrame(FLOAT_LABEL(lit_6108)); + field_0x2f94 = 2; + field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); + field_0x122C[0].SetAtAtp(0); + field_0x122C[0].SetAtSe(20); + field_0x122C[0].SetAtHitMark(1); + field_0x122C[0].OnAtSetBit(); + field_0x122C[0].SetAtHitCallback(NULL); + field_0x122C[0].SetAtMtrl(0); + mHeldItemModel->i_setBaseTRMtx(field_0x0650->i_getAnmMtx(field_0x30c0)); + mHeldItemModel->calc(); } -#pragma pop /* 800E1840-800E191C 0DC180 00DC+00 2/2 0/0 0/0 .text setCopyRodReadyAnime__9daAlink_cFv */ +// regalloc +#ifdef NONMATCHING +void daAlink_c::setCopyRodReadyAnime() { + f32 tmp; + if (i_checkAttentionLock()) { + tmp = daAlinkHIO_boom_c0::m.valc; + } else { + tmp = FLOAT_LABEL(lit_6108); + } + + setUpperAnimeBaseSpeed(0x54, tmp, lit_6109); + if (checkCopyRodTopUse()) { + seStartSwordCut(Z2SE_AL_COPYROD_READY); + } else { + seStartSwordCut(Z2SE_AL_COPYROD_READY_OFF); + } + field_0x122C[0].SetR(lit_8676); + field_0x122C[0].SetAtType(0x1000000); + initLockAt(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -22605,16 +22494,34 @@ asm void daAlink_c::setCopyRodReadyAnime() { #include "asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s" } #pragma pop +#endif /* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text throwCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::throwCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/throwCopyRod__9daAlink_cFv.s" +void daAlink_c::throwCopyRod() { + daCrod_c* copy_rod = static_cast(mItemActor.getActor()); + i_onNoResetFlg1(FLG1_UNK_10000); + + if (checkCopyRodTopUse()) { + copy_rod->setThrow(); + mCopyRodAcKeep = mItemActor; + i_onNoResetFlg3(COPY_ROD_THROW_AFTER); + mItemActor.clearData(); + } + dComIfGp_clearPlayerStatus0(0, 0x80); + mFastShotTime = -1; + voiceStart(Z2SE_AL_V_ATTACK_S); + seStartSwordCut(Z2SE_AL_COPYROD_SWING); + + if (mLinkAcch.ChkGroundHit()) { + if (checkZeroSpeedF()) { + field_0x2f98 = 3; + procAtnActorWaitInit(); + } else { + procAtnActorMoveInit(); + } + field_0x2060->initOldFrameMorf(FLOAT_LABEL(lit_6108), 0, 35); + } } -#pragma pop /* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text returnCopyRod__9daAlink_cFv */ #pragma push @@ -22626,6 +22533,18 @@ asm void daAlink_c::returnCopyRod() { } #pragma pop +/* void daAlink_c::returnCopyRod() { + i_offNoResetFlg3(COPY_ROD_THROW_AFTER); + + if (mEquipItem == 0x46) { + mItemActor = mCopyRodAcKeep; + i_onNoResetFlg0(FLG0_UNK_20); + cXyz tmp(0, 1, 0); + dComIfGp_getVibration().StartShock(1, 1, tmp); + } + mCopyRodAcKeep.clearData(); +} */ + /* 800E1ADC-800E1BB4 0DC41C 00D8+00 2/2 0/0 0/0 .text checkUpperItemActionCopyRod__9daAlink_cFv */ #pragma push #pragma optimization_level 0 @@ -22897,168 +22816,100 @@ asm void daAlink_c::procMagneBootsFly() { /* 800E3760-800E3770 0DE0A0 0010+00 0/0 0/0 7/7 .text getBombExplodeTime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombExplodeTime() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombExplodeTime__9daAlink_cCFv.s" +s16 daAlink_c::getBombExplodeTime() const { + return daAlinkHIO_bomb_c0::m.mExplodeTime; } -#pragma pop /* 800E3770-800E3780 0DE0B0 0010+00 0/0 0/0 2/2 .text getBombGravity__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombGravity() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombGravity__9daAlink_cCFv.s" +f32 daAlink_c::getBombGravity() const { + return daAlinkHIO_bomb_c0::m.mGravity; } -#pragma pop /* 800E3780-800E3790 0DE0C0 0010+00 0/0 0/0 2/2 .text getBombMaxFallSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombMaxFallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombMaxFallSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getBombMaxFallSpeed() const { + return daAlinkHIO_bomb_c0::m.mMaxFallSpeed; } -#pragma pop /* 800E3790-800E37A0 0DE0D0 0010+00 0/0 0/0 1/1 .text getBombBoundRate__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombBoundRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombBoundRate__9daAlink_cCFv.s" +f32 daAlink_c::getBombBoundRate() const { + return daAlinkHIO_bomb_c0::m.mBoundRate; } -#pragma pop /* 800E37A0-800E37B0 0DE0E0 0010+00 0/0 0/0 1/1 .text getBombStopSpeedY__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombStopSpeedY() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombStopSpeedY__9daAlink_cCFv.s" +f32 daAlink_c::getBombStopSpeedY() const { + return daAlinkHIO_bomb_c0::m.mStopSpeedY; } -#pragma pop /* 800E37B0-800E37C0 0DE0F0 0010+00 0/0 0/0 1/1 .text getBombMaxSpeedY__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombMaxSpeedY() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombMaxSpeedY__9daAlink_cCFv.s" +f32 daAlink_c::getBombMaxSpeedY() const { + return daAlinkHIO_bomb_c0::m.mMaxSpeedY; } -#pragma pop /* 800E37C0-800E37D0 0DE100 0010+00 0/0 0/0 1/1 .text getBombEffScale__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombEffScale() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombEffScale__9daAlink_cCFv.s" +f32 daAlink_c::getBombEffScale() const { + return daAlinkHIO_bomb_c0::m.mEffScale; } -#pragma pop /* 800E37D0-800E37E0 0DE110 0010+00 0/0 0/0 1/1 .text getBombAtR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombAtR() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombAtR__9daAlink_cCFv.s" +f32 daAlink_c::getBombAtR() const { + return daAlinkHIO_bomb_c0::m.mAtRadius; } -#pragma pop /* 800E37E0-800E37F0 0DE120 0010+00 0/0 0/0 1/1 .text getEnemyBombColorR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getEnemyBombColorR() const { - nofralloc -#include "asm/d/a/d_a_alink/getEnemyBombColorR__9daAlink_cCFv.s" +s16 daAlink_c::getEnemyBombColorR() const { + return daAlinkHIO_bomb_c0::m.mEnemyBombColorR; } -#pragma pop /* 800E37F0-800E3800 0DE130 0010+00 0/0 0/0 2/2 .text getBombWaterGravity__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombWaterGravity() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombWaterGravity__9daAlink_cCFv.s" +f32 daAlink_c::getBombWaterGravity() const { + return daAlinkHIO_bomb_c0::m.mWaterGravity; } -#pragma pop /* 800E3800-800E3810 0DE140 0010+00 0/0 0/0 2/2 .text getBombWaterMaxFallSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombWaterMaxFallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombWaterMaxFallSpeed__9daAlink_cCFv.s" +f32 daAlink_c::getBombWaterMaxFallSpeed() const { + return daAlinkHIO_bomb_c0::m.mWaterMaxFallSpeed; } -#pragma pop /* 800E3810-800E3820 0DE150 0010+00 0/0 0/0 1/1 .text * getBombExplodeWaterEffectLimit__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombExplodeWaterEffectLimit() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombExplodeWaterEffectLimit__9daAlink_cCFv.s" +f32 daAlink_c::getBombExplodeWaterEffectLimit() const { + return daAlinkHIO_bomb_c0::m.mExplodeWaterEffectLimit; } -#pragma pop /* 800E3820-800E3830 0DE160 0010+00 0/0 0/0 1/1 .text getBombInsectLimitAngle__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombInsectLimitAngle() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombInsectLimitAngle__9daAlink_cCFv.s" +s16 daAlink_c::getBombInsectLimitAngle() const { + return daAlinkHIO_bomb_c0::m.mBombInsectLimitAngle; } -#pragma pop /* 800E3830-800E3858 0DE170 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallA__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_checkLightBallA(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_checkLightBallA__FP10fopAc_ac_c.s" +static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) { + if (fopAcM_GetName(p_actor) == 0x2FC && + static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S) { + return true; + } + return false; } -#pragma pop /* 800E3858-800E3880 0DE198 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallB__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_checkLightBallB(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_checkLightBallB__FP10fopAc_ac_c.s" +static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor) { + if (fopAcM_GetName(p_actor) == 0x2FC && + static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S_2) { + return true; + } + return false; } -#pragma pop /* 800E3880-800E38EC 0DE1C0 006C+00 1/1 0/0 0/0 .text daAlink_searchLightBall__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchLightBall(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchLightBall__FP10fopAc_ac_cPv.s" +static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1) { + if ((daPy_py_c::checkCarryStartLightBallA() && daAlink_checkLightBallA(p_actor)) || + (daPy_py_c::checkCarryStartLightBallB() && daAlink_checkLightBallB(p_actor))) { + return p_actor; + } + return NULL; } -#pragma pop /* 800E38EC-800E3994 0DE22C 00A8+00 1/1 0/0 0/0 .text checkGrabLineCheck__9daAlink_cFv */ #pragma push @@ -23083,24 +22934,39 @@ asm void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyIn /* 800E3A14-800E3A9C 0DE354 0088+00 1/0 0/0 0/0 .text exchangeGrabActor__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::exchangeGrabActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/exchangeGrabActor__9daAlink_cFP10fopAc_ac_c.s" +bool daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { + fopAc_ac_c* actor = mGrabItemActor.getActor(); + + if (actor == NULL) { + return false; + } + + fopAcM_cancelCarryNow(actor); + actor->mCollisionRot.z = 0; + actor->mCollisionRot.x = 0; + if (checkGrabCarryActor()) { + actor->mCurrent.mAngle.z = 0; + actor->mCurrent.mAngle.x = 0; + } + setGrabItemActor(p_actor); + return true; } -#pragma pop /* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::setForceGrab(fopAc_ac_c* param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setForceGrab__9daAlink_cFP10fopAc_ac_cii.s" +bool daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { + if (((param_1 != 0 || !checkEventRun()) && !i_checkWolf()) && + (((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && + ((i_checkModeFlg(MODE_UNK_10000000) && + (checkHorseNoUpperAnime() || checkHorseTurnAnime())) || + param_2 != 0 && checkHookshotAnime()))) { + deleteEquipItem(1, 0); + setGrabItemActor(p_actor); + field_0x33e4 = lit_8785; + setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return true; + } + return false; } -#pragma pop /* 800E3BCC-800E3C1C 0DE50C 0050+00 2/2 0/0 0/0 .text getGrabThrowRate__9daAlink_cFv */ #pragma push @@ -23148,7 +23014,7 @@ asm void daAlink_c::checkGrabAnimeAndThrow() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkGrabCarryActor() { +asm BOOL daAlink_c::checkGrabCarryActor() { nofralloc #include "asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s" } @@ -23686,14 +23552,19 @@ asm void daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int #pragma pop /* 800E7BD0-800E7C30 0E2510 0060+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkChainBlockPushPull() { - nofralloc -#include "asm/d/a/d_a_alink/checkChainBlockPushPull__9daAlink_cFv.s" +bool daAlink_c::checkChainBlockPushPull() { + if (i_checkFmChainGrabAnime()) { + fopAc_ac_c* actor = field_0x2844.getActor(); + if (actor != NULL) { + s16 name = fopAcM_GetName(actor); + // actor is Cblock || chainSw || Cwall + if (name == 0x7E || name == 0x16F || name == 0x7F) { + return true; + } + } + } + return false; } -#pragma pop /* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text procFmChainUpInit__9daAlink_cFv */ #pragma push @@ -23801,10 +23672,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_0x560[0xA] != 0x2a) { + if (mSpecialMode != SMODE_GOAT_STOP) { return; } else { - field_0x560[0xA] = 0; + mSpecialMode = 0; } } @@ -24043,8 +23914,8 @@ 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_0x560[0xA] = 0; + mCargoCarryActor.clearData(); + mSpecialMode = 0; } /* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text sumouPunchTrigger__9daAlink_cFv */ @@ -24372,7 +24243,7 @@ asm void daAlink_c::getReinHandType() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHorseLieAnime() const { +asm BOOL daAlink_c::checkHorseLieAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s" } @@ -24413,7 +24284,7 @@ asm void daAlink_c::setHorseTurnUpperAnime(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkHorseNoUpperAnime() const { +asm BOOL daAlink_c::checkHorseNoUpperAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s" } @@ -25422,7 +25293,7 @@ asm void daAlink_c::initCanoeRide() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkCanoeJumpRide() { +asm BOOL daAlink_c::checkCanoeJumpRide() { nofralloc #include "asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s" } @@ -27956,7 +27827,8 @@ asm void daAlink_c::procBoardCutTurn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::hsChainShape_c::draw() { +extern "C" asm void draw__Q29daAlink_c14hsChainShape_cFv() { + // asm void daAlink_c::hsChainShape_c::draw() { nofralloc #include "asm/d/a/d_a_alink/draw__Q29daAlink_c14hsChainShape_cFv.s" } @@ -29502,7 +29374,7 @@ asm void daAlink_c::setIronBallPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkIronBallAnime() const { +asm BOOL daAlink_c::checkIronBallAnime() const { nofralloc #include "asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s" } @@ -29638,7 +29510,7 @@ asm void daAlink_c::procIronBallReturn() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkEventRun() const { +asm BOOL daAlink_c::checkEventRun() const { nofralloc #include "asm/d/a/d_a_alink/checkEventRun__9daAlink_cCFv.s" } @@ -30725,10 +30597,10 @@ asm void daAlink_c::procGanonFinishInit() { /* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ bool daAlink_c::procGanonFinish() { - i_onEndResetFlg1(GanonFinish); + i_onEndResetFlg1(GANON_FINISH); mCurrent.mPosition = field_0x37c8; if (mFrameCtrl1[0].checkAnmEnd()) { - setSingleAnimeBaseMorf(GANON_FINISH, lit_6041); + setSingleAnimeBaseMorf(ANM_GANON_FINISH, lit_6041); } return true; } @@ -30801,7 +30673,7 @@ asm void daAlink_c::procMasterSwordPull() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkLv7DungeonShop() { +asm BOOL daAlink_c::checkLv7DungeonShop() { nofralloc #include "asm/d/a/d_a_alink/checkLv7DungeonShop__9daAlink_cFv.s" } @@ -30903,34 +30775,85 @@ asm void daAlink_c::checkAcceptWarp() { #pragma pop /* 8011F7D8-8011F8B8 11A118 00E0+00 2/2 0/0 0/0 .text dungeonReturnWarp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::dungeonReturnWarp() { - nofralloc -#include "asm/d/a/d_a_alink/dungeonReturnWarp__9daAlink_cFv.s" +void daAlink_c::dungeonReturnWarp() { + cXyz pos = dComIfGs_getWarpPlayerPos(); + s16 angle = dComIfGs_getWarpPlayerAngleY(); + s8 room = dComIfGs_getWarpRoomNo(); + char name[8]; + strcpy(name, dComIfGs_getWarpStageName()); + + dComIfGs_setRestartRoom(pos, angle, room); + dComIfGp_setNextStage(name, -1, dComIfGs_getRestartRoomNo(), -1, FLOAT_LABEL(lit_6108), 12, 0, + 0, 0, 1, 0); + u32 data = setParamData(dComIfGs_getRestartRoomNo(), 0, 0xCA, 0); + dComIfGs_setRestartRoomParam(data); } -#pragma pop /* 8011F8B8-8011F9EC 11A1F8 0134+00 1/0 0/0 0/0 .text skipPortalObjWarp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::skipPortalObjWarp() { - nofralloc -#include "asm/d/a/d_a_alink/skipPortalObjWarp__9daAlink_cFv.s" +void daAlink_c::skipPortalObjWarp() { + if (mActionID == WARP && field_0x300e <= 0) { + return; + } + + if (i_checkNoResetFlg3(FLG3_UNK_2000000) && + (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { + dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), mCollisionRot.y, + -1); + } else { + u32 data = setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0); + dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), + dMeter2Info_getWarpRoomNo(), data); + dComIfGp_setNextStage(dMeter2Info_getWarpStageName(), -4, dMeter2Info_getWarpRoomNo(), -1, + FLOAT_LABEL(lit_6108), 0, 1, 0, mCollisionRot.y, 1, 0); + } + + if (mActionID == WARP) { + field_0x300e = -1; + } } -#pragma pop /* 8011F9EC-8011FBC0 11A32C 01D4+00 1/1 0/0 0/0 .text checkWarpStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWarpStart() { - nofralloc -#include "asm/d/a/d_a_alink/checkWarpStart__9daAlink_cFv.s" +void daAlink_c::checkWarpStart() { + if (dMeter2Info_getWarpStatus() != 0) { + if (dMeter2Info_getWarpStatus() == 3 || dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + i_onNoResetFlg0(0x4000); + if (dMeter2Info_getWarpStatus() == 3) { + const char* portal; + if (!i_checkMidnaRide()) { + if (dComIfGp_TargetWarpPt_get() == 3) { + mEvtInfo.setArchiveName("Obj_kbrg"); + portal = kBridgePortal; + } else if (dComIfGp_TargetWarpPt_get() == 6) { + mEvtInfo.setArchiveName("Obj_obrg"); + portal = oBridgePortal; + } else if (dComIfGp_TargetWarpPt_get() == 9) { + mEvtInfo.setArchiveName("M_VolcBom"); + portal = volcBomPortal; + } else if (dComIfGp_TargetWarpPt_get() == 8) { + mEvtInfo.setArchiveName("SCanCrs"); + portal = cannonPortal; + } else { + portal = defaultPortal; + } + } else { + dComIfGp_TargetWarpPt_set(0xFF); + portal = defaultPortal; + } + fopAcM_orderOtherEvent(this, portal, 0xFFFF, 1, 1); + } else { + mDemo.i_setSpecialDemoType(); + if (dMeter2Info_getWarpStatus() == 1) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + u32 tmp = dStage_stagInfo_GetEscapeWarp(stag_info); + dStage_changeScene(tmp, FLOAT_LABEL(lit_6108), 0, -1, mCollisionRot.y, -1); + } else { + dungeonReturnWarp(); + } + } + } + g_meter2_info.resetWarpStatus(); + } } -#pragma pop /* 8011FBC0-8011FD4C 11A500 018C+00 3/3 0/0 0/0 .text warpModelTexScroll__9daAlink_cFv */ #pragma push @@ -31001,6 +30924,15 @@ void daAlink_c::commonFallInit(int param_0) { /* 80120580-80120634 11AEC0 00B4+00 21/21 0/0 0/0 .text * setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ +// matches with literal +#ifdef NONMATCHING +void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) { + *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &mTevStr, param_3, NULL, 0xFF, + NULL, 0xFF, NULL, NULL, NULL); + dComIfGp_particle_levelEmitterOnEventMove(*param_0); + dComIfGp_particle_getEmitter(*param_0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -31010,18 +30942,17 @@ asm void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, #include "asm/d/a/d_a_alink/setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" } #pragma pop +#endif /* 80120634-801206C4 11AF74 0090+00 4/4 0/0 0/0 .text * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, - cXyz const* param_3, csXyz const* param_4) { - nofralloc -#include "asm/d/a/d_a_alink/setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz.s" +void daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, + cXyz const* param_3, csXyz const* param_4) { + *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr, + param_4, NULL, 0, NULL, -1, NULL); + dComIfGp_particle_levelEmitterOnEventMove(*param_0); + dComIfGp_particle_getEmitter(*param_0); } -#pragma pop /* 801206C4-80120778 11B004 00B4+00 2/2 0/0 0/0 .text * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ @@ -31353,6 +31284,24 @@ asm void daAlink_c::setWaterDropEffect() { /* 801244E4-801245EC 11EE24 0108+00 1/1 0/0 0/0 .text setSwordUpColorEffect__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setSwordUpColorEffect() { + f32 max_intensity; + if (mSwordUpTimer != 0) { + max_intensity = 1.0f; + } else { + max_intensity = 0.0f; + } + cLib_chaseF(&mSwordUpColorIntensity, max_intensity, 0.1f); + + for (int i = 0; i < 2; i++) { + field_0x32b0[i].mColor.r = mSwordUpColorIntensity * swordUpColor[i].r; + field_0x32b0[i].mColor.g = mSwordUpColorIntensity * swordUpColor[i].g; + field_0x32b0[i].mColor.b = mSwordUpColorIntensity * swordUpColor[i].b; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -31361,6 +31310,7 @@ asm void daAlink_c::setSwordUpColorEffect() { #include "asm/d/a/d_a_alink/setSwordUpColorEffect__9daAlink_cFv.s" } #pragma pop +#endif /* 801245EC-80124738 11EF2C 014C+00 1/1 0/0 0/0 .text setSwordCutSplash__9daAlink_cFv */ #pragma push @@ -31374,14 +31324,11 @@ asm void daAlink_c::setSwordCutSplash() { /* 80124738-801247A8 11F078 0070+00 1/1 0/0 0/0 .text setMetamorphoseEffectStartLink__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMetamorphoseEffectStartLink() { - nofralloc -#include "asm/d/a/d_a_alink/setMetamorphoseEffectStartLink__9daAlink_cFv.s" +void daAlink_c::setMetamorphoseEffectStartLink() { + setEmitter(&field_0x31f8, 0x24F, &field_0x37c8, NULL); + setEmitter(&field_0x31fc, 0x250, &field_0x37c8, NULL); + setEmitter(&field_0x3200, 0x6E8, &cXyz::Zero, NULL); } -#pragma pop /* 801247A8-801248A8 11F0E8 0100+00 1/1 0/0 0/0 .text setMetamorphoseEffect__9daAlink_cFv */ @@ -31418,14 +31365,10 @@ extern "C" asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP1 #pragma pop /* 80124B68-80124BA4 11F4A8 003C+00 2/2 0/0 0/0 .text resetFairyEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFairyEffect() { - nofralloc -#include "asm/d/a/d_a_alink/resetFairyEffect__9daAlink_cFv.s" +void daAlink_c::resetFairyEffect() { + stopDrawParticle(field_0x3258); + stopDrawParticle(field_0x325c); } -#pragma pop /* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text setBottleEffect__9daAlink_cFv */ #pragma push @@ -31438,14 +31381,16 @@ asm void daAlink_c::setBottleEffect() { #pragma pop /* 80124E28-80124EA8 11F768 0080+00 2/2 0/0 0/0 .text clearFirePointDamageEffect__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::clearFirePointDamageEffect(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/clearFirePointDamageEffect__9daAlink_cFi.s" +void daAlink_c::clearFirePointDamageEffect(int i) { + firePointEff_c* fire_eff = &field_0x32d8[i]; + + if (fire_eff->field_0x0 != 0) { + stopDrawParticle(fire_eff->field_0x4); + stopDrawParticle(fire_eff->field_0x8); + } + fire_eff->field_0x0 = 0; + fire_eff->field_0x24 = cXyz::Zero; } -#pragma pop /* 80124EA8-80124FA4 11F7E8 00FC+00 1/1 0/0 0/0 .text initFirePointDamageEffectAll__9daAlink_cFv */ @@ -31500,6 +31445,16 @@ asm void daAlink_c::setWoodShieldBurnEffect() { #pragma pop /* 801255BC-80125628 11FEFC 006C+00 3/3 0/0 0/0 .text clearWoodShieldBurnEffect__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::clearWoodShieldBurnEffect() { + if (field_0x2fcb != 0) { + for (int i = 0; i < 2; i++) { + stopDrawParticle(field_0x3260[i].field_0x0); + } + field_0x2fcb = 0; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -31508,6 +31463,7 @@ asm void daAlink_c::clearWoodShieldBurnEffect() { #include "asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s" } #pragma pop +#endif /* 80125628-801256EC 11FF68 00C4+00 1/1 0/0 0/0 .text setWoodShieldBurnOutEffect__9daAlink_cFv */ #pragma push @@ -31521,15 +31477,17 @@ asm void daAlink_c::setWoodShieldBurnOutEffect() { /* 801256EC-80125778 12002C 008C+00 2/2 0/0 0/0 .text * initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, - cXyz const* param_3, cXyz const* param_4) { - nofralloc -#include "asm/d/a/d_a_alink/initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz.s" +void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, cXyz const* param_3, + cXyz const* param_4) { + field_0x24 = param_0; + field_0x1c = param_1; + field_0x2c = *param_4; + field_0x38[0] = *param_2; + field_0x308[0] = *param_3; + field_0x38[1] = field_0x38[0]; + field_0x308[1] = field_0x308[0]; + field_0x14 = 0; } -#pragma pop /* 80125778-8012589C 1200B8 0124+00 1/1 0/0 0/0 .text * setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz */ @@ -31589,14 +31547,82 @@ extern "C" asm void draw__14daAlink_blur_cFv() { #pragma pop /* 80125F14-80126350 120854 043C+00 1/1 0/0 0/0 .text create__20daAlink_lockCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_lockCursor_c::create() { - nofralloc -#include "asm/d/a/d_a_alink/create__20daAlink_lockCursor_cFv.s" +BOOL daAlink_lockCursor_c::create() { + JKRArchive* arc = dComIfG_getObjectResInfo(l_arcName)->getArchive(); + + f32 tmp = FLOAT_LABEL(lit_6108); + field_0x2c = tmp; + field_0x4 = false; + field_0x30 = tmp; + + mScrn = new J2DScreen(); + if (mScrn == NULL) { + return false; + } + + mScrn->setPriority("zelda_v_cursor_new_yellow.blo", 0x100000, arc); + dPaneClass_showNullPane(mScrn); + + void* tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bpk", arc); + field_0x24 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x24 == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bck", arc); + field_0x28 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x28 == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow_02.brk", arc); + field_0x1c = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x1c == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.brk", arc); + field_0x20 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x20 == NULL) { + return false; + } + + field_0xc = mScrn->search('n_all'); + mCursor0 = mScrn->search('cursor0'); + mCursor1 = mScrn->search('cursor1'); + mCursor2 = mScrn->search('cursor2'); + + field_0x28->searchUpdateMaterialID(mScrn); + field_0xc->setAnimation(field_0x28); + mCursor0->setAnimation(field_0x28); + mCursor1->setAnimation(field_0x28); + mCursor2->setAnimation(field_0x28); + field_0x28->setFrame(FLOAT_LABEL(lit_6108)); + + field_0x24->searchUpdateMaterialID(mScrn); + mCursor0->setAnimation(field_0x24); + mCursor1->setAnimation(field_0x24); + mCursor2->setAnimation(field_0x24); + mScrn->search('flash')->setAnimation(field_0x24); + field_0x24->setFrame(FLOAT_LABEL(lit_6108)); + + field_0x1c->searchUpdateMaterialID(mScrn); + field_0x20->searchUpdateMaterialID(mScrn); + mCursor0->setAnimation(field_0x1c); + mCursor1->setAnimation(field_0x1c); + mCursor2->setAnimation(field_0x1c); + mCursor0->setAnimation(field_0x20); + mCursor1->setAnimation(field_0x20); + mCursor2->setAnimation(field_0x20); + f32 tmp2 = FLOAT_LABEL(lit_6108); + field_0x1c->setFrame(tmp2); + field_0x20->setFrame(tmp2); + + mScrn->animation(); + mScrn->setUserInfo('n_43'); + field_0xc->setUserInfo(0x20); + return true; } -#pragma pop /* 80126350-80126354 120C90 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTevRegKey */ void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) { @@ -31630,14 +31656,14 @@ extern "C" asm void draw__20daAlink_lockCursor_cFv() { #pragma pop /* 80126650-801266C0 120F90 0070+00 1/1 0/0 0/0 .text create__15daAlink_sight_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_sight_c::create() { - nofralloc -#include "asm/d/a/d_a_alink/create__15daAlink_sight_cFv.s" +bool daAlink_sight_c::create() { + if (!mLockCursor.create()) { + return false; + } + ResTIMG* data = (ResTIMG*)dComIfG_getObjectRes(l_arcName, daAlink_c::getSightBti()); + setSightImage(data); + return true; } -#pragma pop /* 801266C0-80126710 121000 0050+00 1/0 0/0 0/0 .text draw__15daAlink_sight_cFv */ #pragma push @@ -31651,6 +31677,16 @@ extern "C" asm void draw__15daAlink_sight_cFv() { #pragma pop /* 80126710-80126740 121050 0030+00 2/2 0/0 0/0 .text onLockFlg__15daAlink_sight_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_sight_c::onLockFlg() { + if (mLockFlag) { + return; + } + mLockFlag = true; + mLockCursor.initFrame(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -31659,6 +31695,7 @@ asm void daAlink_sight_c::onLockFlg() { #include "asm/d/a/d_a_alink/onLockFlg__15daAlink_sight_cFv.s" } #pragma pop +#endif /* 80126740-80126928 121080 01E8+00 2/2 0/0 0/0 .text changeCommon__9daAlink_cFv */ #pragma push @@ -31691,40 +31728,33 @@ asm void daAlink_c::changeLink(int param_0) { #pragma pop /* 80127C54-80127CAC 122594 0058+00 2/2 0/0 0/0 .text onWolfEyeUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onWolfEyeUp() { - nofralloc -#include "asm/d/a/d_a_alink/onWolfEyeUp__9daAlink_cFv.s" +void daAlink_c::onWolfEyeUp() { + if (mWolfEyeUp == 0) { + mZ2Link.setWolfEyeOpen(true); + mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; + field_0x2fd2 = 20; + } } -#pragma pop /* 80127CAC-80127CF0 1225EC 0044+00 5/5 0/0 0/0 .text offWolfEyeUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offWolfEyeUp() { - nofralloc -#include "asm/d/a/d_a_alink/offWolfEyeUp__9daAlink_cFv.s" +void daAlink_c::offWolfEyeUp() { + if (mWolfEyeUp != 0) { + mWolfEyeUp = 0; + field_0x2fd2 = 20; + mZ2Link.setWolfEyeOpen(false); + } } -#pragma pop /* 80127CF0-80127D14 122630 0024+00 1/1 0/0 0/0 .text wolfSenseTrigger__9daAlink_cFv */ -void daAlink_c::wolfSenseTrigger() { - itemTriggerCheck(1); +BOOL daAlink_c::wolfSenseTrigger() { + return itemTriggerCheck(1); } /* 80127D14-80127D2C 122654 0018+00 1/1 0/0 0/0 .text setWolfSenceStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfSenceStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfSenceStatus__9daAlink_cFUc.s" +void daAlink_c::setWolfSenceStatus(u8 status) { + dComIfGp_setXStatus(status, 0); } -#pragma pop /* 80127D2C-80127D50 12266C 0024+00 1/1 0/0 0/0 .text wolfClawTrigger__9daAlink_cFv */ void daAlink_c::wolfClawTrigger() { @@ -31732,14 +31762,9 @@ void daAlink_c::wolfClawTrigger() { } /* 80127D50-80127D68 122690 0018+00 2/2 0/0 0/0 .text setWolfDigStatus__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfDigStatus(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfDigStatus__9daAlink_cFUc.s" +void daAlink_c::setWolfDigStatus(u8 flag) { + dComIfGp_setYStatus(13, flag); } -#pragma pop /* 80127D68-80127DC4 1226A8 005C+00 4/4 0/0 0/0 .text checkWolfShapeReverse__9daAlink_cCFv */ #pragma push @@ -31752,14 +31777,11 @@ asm BOOL daAlink_c::checkWolfShapeReverse() const { #pragma pop /* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text checkWolfSideStep__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfSideStep() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfSideStep__9daAlink_cCFv.s" +BOOL daAlink_c::checkWolfSideStep() const { + return field_0x2f98 != 0 && + ((mActionID == WOLF_ATN_WAIT && !i_checkModeFlg(1)) || mActionID == WOLF_SIDESTEP_LAND || + mActionID == WOLF_BACKFLIP_LAND); } -#pragma pop /* 80127E08-80127F20 122748 0118+00 1/1 0/0 0/0 .text setWolfTailAngle__9daAlink_cFv */ #pragma push @@ -31772,14 +31794,9 @@ asm void daAlink_c::setWolfTailAngle() { #pragma pop /* 80127F20-80127F50 122860 0030+00 5/5 0/0 0/0 .text checkWolfSlowDash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfSlowDash() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfSlowDash__9daAlink_cFv.s" +BOOL daAlink_c::checkWolfSlowDash() { + return field_0x2fc7 == 1 || field_0x2fc7 == 3 || field_0x3174 == 11; } -#pragma pop /* 80127F50-80128478 122890 0528+00 1/1 0/0 0/0 .text setSpeedAndAngleWolf__9daAlink_cFv */ @@ -31812,16 +31829,17 @@ asm void daAlink_c::checkWolfAtnWait() { } #pragma pop +/* void daAlink_c::checkWolfAtnWait() { + return checkEnemyGroup(mTargetedActor) && mDemo.getDemoMode() == 0x17 || mTargetedActor != NULL +|| fopAcM_GetName(mTargetedActor) == 0x262 || +} */ + /* 8012880C-80128844 12314C 0038+00 27/27 0/0 0/0 .text * checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM.s" +BOOL daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM anm_id) const { + return mUnderAnime[0].checkNoSetArcNo() && + m_wlAnmDataTable[anm_id].field_0x0 == mUnderAnime[0].getIdx(); } -#pragma pop /* 80128844-80128F0C 123184 06C8+00 11/11 0/0 0/0 .text setBlendWolfMoveAnime__9daAlink_cFf */ #pragma push @@ -31957,38 +31975,54 @@ asm void daAlink_c::checkWolfLandAction(int param_0) { } #pragma pop +inline bool i_dComIfGp_checkPlayerStatus1(int param_0, u32 flag) { + return g_dComIfG_gameInfo.play.checkPlayerStatus(param_0, 1, flag); +} + /* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMidnaUseAbility() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMidnaUseAbility__9daAlink_cCFv.s" +BOOL daAlink_c::checkMidnaUseAbility() const { + return i_dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check(); } -#pragma pop /* 801299A8-80129A80 1242E8 00D8+00 1/1 0/0 0/0 .text checkWolfUseAbility__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfUseAbility() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfUseAbility__9daAlink_cFv.s" +void daAlink_c::checkWolfUseAbility() { + if (mActionID == 0x137) { + return; + } + + if (checkMidnaLockJumpPoint() != NULL && !i_checkMidnaRide()) { + offWolfEyeUp(); + } else { + if (i_dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && + mWolfEyeUp < daAlinkHIO_wolf_c0::m.mSensesLingerTime && wolfSenseTrigger()) { + if (mWolfEyeUp == 0) { + onWolfEyeUp(); + } else { + offWolfEyeUp(); + } + } + } } -#pragma pop /* 80129A80-80129B44 1243C0 00C4+00 13/13 0/0 0/0 .text checkWolfGroundSpecialMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfGroundSpecialMode() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfGroundSpecialMode__9daAlink_cFv.s" +bool daAlink_c::checkWolfGroundSpecialMode() { + if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && + i_checkEndResetFlg0(ERFLG0_UNK_1)) { + return procCoMetamorphoseInit(); + } else if (mSpecialMode == SMODE_WOLF_PUZZLE || mSpecialMode == 0x28) { + return procWolfGiantPuzzleInit(); + } else if (checkCargoCarry()) { + return procWolfCargoCarryInit(); + } else if (checkSlideAction()) { + return true; + } else if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { + return procWolfScreamWaitInit(); + } + return false; } -#pragma pop /* 80129B44-8012A02C 124484 04E8+00 46/46 0/0 0/0 .text checkNextActionWolf__9daAlink_cFi */ @@ -32749,6 +32783,22 @@ asm void daObj_Sekizoa_c::setWolfHowling() { #pragma pop /* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text checkWolfRope__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::checkWolfRope() { + bool ret = false; + bool bvar1 = false; + + if (i_checkModeFlg(MODE_UNK_20000) && field_0x280c.getActor() != NULL) { + bvar1 = true; + } + + // actor is Crope + if (bvar1 && fopAcM_GetName(field_0x280c.getActor()) == 0x2BE) { + ret = true; + } + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -32757,6 +32807,7 @@ asm bool daAlink_c::checkWolfRope() { #include "asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s" } #pragma pop +#endif /* 80131450-80131628 12BD90 01D8+00 2/2 0/0 0/0 .text * checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi */ @@ -32963,7 +33014,7 @@ asm void daAlink_c::getWolfTagJumpTime() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkMidnaLockJumpPoint() const { +asm cXyz* daAlink_c::checkMidnaLockJumpPoint() const { nofralloc #include "asm/d/a/d_a_alink/checkMidnaLockJumpPoint__9daAlink_cCFv.s" } @@ -33036,7 +33087,7 @@ static asm void daAlink_searchGiantTalk(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfGiantPuzzleInit() { +asm bool daAlink_c::procWolfGiantPuzzleInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s" } @@ -33225,7 +33276,7 @@ asm void daAlink_c::setWolfScreamWaitAnime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfScreamWaitInit() { +asm bool daAlink_c::procWolfScreamWaitInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s" } @@ -33565,35 +33616,35 @@ asm void daAlink_c::checkWolfLockData() { #pragma pop /* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfLock(fopAc_ac_c* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLock__9daAlink_cCFP10fopAc_ac_c.s" +bool daAlink_c::checkWolfLock(fopAc_ac_c* p_actor) const { + u32 id = fopAcM_GetID(p_actor); + + for (int i = 0; i < mWolfLockNum; i++) { + if (id == mWolfLockAcKeep[i].getID()) { + return true; + } + } + return false; } -#pragma pop /* 8013916C-801391DC 133AAC 0070+00 1/0 0/0 0/0 .text cancelWolfLock__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::cancelWolfLock(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/cancelWolfLock__9daAlink_cFP10fopAc_ac_c.s" +bool daAlink_c::cancelWolfLock(fopAc_ac_c* p_actor) { + u32 id = fopAcM_GetID(p_actor); + + for (int i = 0; i < mWolfLockNum; i++) { + if (id == mWolfLockAcKeep[i].getID()) { + mWolfLockAcKeep[i].clearData(); + return true; + } + } + return false; } -#pragma pop /* 801391DC-801391E4 133B1C 0008+00 0/0 0/0 1/1 .text getWolfLockActorEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfLockActorEnd() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfLockActorEnd__9daAlink_cFv.s" +fopAc_ac_c* daAlink_c::getWolfLockActorEnd() { + return mWolfLockAcKeep[0].getActor(); } -#pragma pop /* 801391E4-801392A8 133B24 00C4+00 1/1 0/0 0/0 .text * searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv */ @@ -34116,7 +34167,7 @@ static asm void daAlink_searchEnemyCargo(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::procWolfCargoCarryInit() { +asm bool daAlink_c::procWolfCargoCarryInit() { nofralloc #include "asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s" } @@ -34704,14 +34755,9 @@ asm void dEvt_info_c::offCondition(u16 param_0) { #pragma pop /* 80141210-80141230 13BB50 0020+00 1/1 0/0 0/0 .text checkShieldGet__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkShieldGet() { - nofralloc -#include "asm/d/a/d_a_alink/checkShieldGet__9daPy_py_cFv.s" +BOOL daPy_py_c::checkShieldGet() { + return dComIfGs_getSelectEquipShield() != NO_ITEM; } -#pragma pop /* 80141230-80141264 13BB70 0034+00 1/1 0/0 0/0 .text fopAcM_onSwitch__FPC10fopAc_ac_ci */ @@ -34753,7 +34799,7 @@ static asm void dComIfGp_getStage() { /* 801412B0-801412BC 13BBF0 000C+00 1/1 0/0 0/0 .text checkEquipHeavyBoots__9daPy_py_cCFv */ BOOL daPy_py_c::checkEquipHeavyBoots() const { - return i_checkNoResetFlg0(EquipHeavyBoots); + return i_checkNoResetFlg0(EQUIP_HEAVY_BOOTS); } /* 801412BC-801412C4 13BBFC 0008+00 1/1 4/4 0/0 .text fopAcM_GetName__FPv */ @@ -34872,29 +34918,19 @@ asm bool dEvt_info_c::checkCommandCatch() { #pragma pop /* 8014139C-801413CC 13BCDC 0030+00 1/1 1/1 0/0 .text dComIfGs_isEventBit__FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL dComIfGs_isEventBit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGs_isEventBit__FUs.s" +BOOL dComIfGs_isEventBit(u16 id) { + return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); } -#pragma pop /* 801413CC-801413D8 13BD0C 000C+00 1/1 0/0 0/0 .text checkWolf__9daPy_py_cCFv */ int daPy_py_c::checkWolf() const { - return i_checkNoResetFlg1(Wolf); + return i_checkNoResetFlg1(IS_WOLF); } /* 801413D8-801413F8 13BD18 0020+00 1/1 0/0 0/0 .text checkSwordGet__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::checkSwordGet() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwordGet__9daPy_py_cFv.s" +BOOL daPy_py_c::checkSwordGet() { + return dComIfGs_getSelectEquipSword() != 0xFF; } -#pragma pop /* 801413F8-80141404 13BD38 000C+00 1/1 0/0 0/0 .text * checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 */ @@ -34914,6 +34950,11 @@ int daPy_py_c::checkNoResetFlg0(daPy_FLG0 pFlag) const { } /* 8014141C-80141438 13BD5C 001C+00 1/1 0/0 0/0 .text dComIfGp_getPlayerCameraID__Fi */ +#ifdef NONMATCHING +static s32 dComIfGp_getPlayerCameraID(int i) { + return g_dComIfG_gameInfo.play.getPlayerCameraID(i); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -34922,48 +34963,29 @@ static asm void dComIfGp_getPlayerCameraID(int param_0) { #include "asm/d/a/d_a_alink/dComIfGp_getPlayerCameraID__Fi.s" } #pragma pop +#endif /* 80141438-80141450 13BD78 0018+00 1/1 0/0 0/0 .text dComIfGp_event_chkEventFlag__FUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_event_chkEventFlag(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_event_chkEventFlag__FUs.s" +static u16 dComIfGp_event_chkEventFlag(u16 flag) { + return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag); } -#pragma pop /* 80141450-80141464 13BD90 0014+00 1/1 0/0 0/0 .text checkCommandDoor__11dEvt_info_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dEvt_info_c::checkCommandDoor() { - nofralloc -#include "asm/d/a/d_a_alink/checkCommandDoor__11dEvt_info_cFv.s" +BOOL dEvt_info_c::checkCommandDoor() { + return mCommand == 3; } -#pragma pop /* 80141464-801414A4 13BDA4 0040+00 1/1 0/0 0/0 .text * dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_evmng_getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci.s" +static s32 dComIfGp_evmng_getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { + return dComIfGp_getPEvtManager()->getMyStaffId(param_0, param_1, param_2); } -#pragma pop /* 801414A4-801414C0 13BDE4 001C+00 1/1 0/0 0/0 .text dComIfGp_event_runCheck__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_event_runCheck() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_event_runCheck__Fv.s" +static BOOL dComIfGp_event_runCheck() { + return g_dComIfG_gameInfo.play.getEvent().runCheck(); } -#pragma pop /* 801414C0-801414CC 13BE00 000C+00 1/1 0/0 0/0 .text * checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 */ @@ -34973,22 +34995,17 @@ int daPy_py_c::checkNoResetFlg2(daPy_FLG2 pFlag) const { /* 801414CC-801414D8 13BE0C 000C+00 1/1 2/2 0/0 .text checkMagneBootsOn__9daPy_py_cCFv */ int daPy_py_c::checkMagneBootsOn() const { - return i_checkNoResetFlg0(MagneBootsOn); + return i_checkNoResetFlg0(MAGNE_BOOTS_ON); } /* 801414D8-801414E8 13BE18 0010+00 1/1 2/2 0/0 .text dComIfGp_getHorseActor__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dComIfGp_getHorseActor() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_getHorseActor__Fv.s" +daHorse_c* dComIfGp_getHorseActor() { + return (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1); } -#pragma pop /* 801414E8-801414F4 13BE28 000C+00 1/1 0/0 0/0 .text checkBoarSingleBattle__9daPy_py_cCFv */ int daPy_py_c::checkBoarSingleBattle() const { - return i_checkNoResetFlg2(BoarSingleBattle); + return i_checkNoResetFlg2(BOAR_SINGLE_BATTLE); } /* 801414F4-80141500 13BE34 000C+00 1/1 0/0 0/0 .text @@ -35010,12 +35027,12 @@ void daPy_py_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 param_1) { } /* 8014150C-80141514 13BE4C 0008+00 1/0 0/0 0/0 .text getModelMtx__9daPy_py_cFv */ -Mtx* daPy_py_c::getModelMtx() { +MtxP daPy_py_c::getModelMtx() { return mCullMtx; } /* 80141514-8014151C 13BE54 0008+00 1/0 0/0 0/0 .text getInvMtx__9daPy_py_cFv */ -Mtx* daPy_py_c::getInvMtx() { +MtxP daPy_py_c::getInvMtx() { return mCullMtx; } @@ -35026,52 +35043,52 @@ cXyz* daPy_py_c::getShadowTalkAtnPos() { } /* 80141524-8014152C 13BE64 0008+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getLeftItemMatrix() { +MtxP daPy_py_c::getLeftItemMatrix() { return mCullMtx; } /* 8014152C-80141534 13BE6C 0008+00 1/0 0/0 0/0 .text getRightItemMatrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getRightItemMatrix() { +MtxP daPy_py_c::getRightItemMatrix() { return mCullMtx; } /* 80141534-8014153C 13BE74 0008+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getLeftHandMatrix() { +MtxP daPy_py_c::getLeftHandMatrix() { return mCullMtx; } /* 8014153C-80141544 13BE7C 0008+00 1/0 0/0 0/0 .text getRightHandMatrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getRightHandMatrix() { +MtxP daPy_py_c::getRightHandMatrix() { return mCullMtx; } /* 80141544-8014154C 13BE84 0008+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getLinkBackBone1Matrix() { +MtxP daPy_py_c::getLinkBackBone1Matrix() { return mCullMtx; } /* 8014154C-80141554 13BE8C 0008+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getWolfMouthMatrix() { +MtxP daPy_py_c::getWolfMouthMatrix() { return mCullMtx; } /* 80141554-8014155C 13BE94 0008+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daPy_py_cFv */ -Mtx* daPy_py_c::getWolfBackbone2Matrix() { +MtxP daPy_py_c::getWolfBackbone2Matrix() { return mCullMtx; } /* 8014155C-80141564 13BE9C 0008+00 1/0 0/0 0/0 .text getBottleMtx__9daPy_py_cFv */ -bool daPy_py_c::getBottleMtx() { - return false; +MtxP daPy_py_c::getBottleMtx() { + return NULL; } /* 80141564-8014156C 13BEA4 0008+00 1/0 0/0 0/0 .text checkPlayerGuard__9daPy_py_cCFv */ -bool daPy_py_c::checkPlayerGuard() const { +BOOL daPy_py_c::checkPlayerGuard() const { return false; } /* 8014156C-80141574 13BEAC 0008+00 1/0 0/0 0/0 .text checkAutoJump__9daPy_py_cCFv */ -bool daPy_py_c::checkAutoJump() const { +BOOL daPy_py_c::checkAutoJump() const { return false; } @@ -35088,7 +35105,7 @@ bool daPy_py_c::checkWolfTriggerJump() const { /* 80141584-8014158C 13BEC4 0008+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daPy_py_cCFv */ -bool daPy_py_c::checkGuardBreakMode() const { +BOOL daPy_py_c::checkGuardBreakMode() const { return false; } @@ -35108,45 +35125,45 @@ bool daPy_py_c::checkChainBlockPushPull() { } /* 801415A4-801415AC 13BEE4 0008+00 1/0 0/0 0/0 .text checkElecDamage__9daPy_py_cCFv */ -bool daPy_py_c::checkElecDamage() const { +BOOL daPy_py_c::checkElecDamage() const { return false; } /* 801415AC-801415B4 13BEEC 0008+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daPy_py_cCFv */ -bool daPy_py_c::checkEmptyBottleSwing() const { +BOOL daPy_py_c::checkEmptyBottleSwing() const { return false; } /* 801415B4-801415BC 13BEF4 0008+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daPy_py_cCFv */ -bool daPy_py_c::checkBottleSwingMode() const { +BOOL daPy_py_c::checkBottleSwingMode() const { return false; } /* 801415BC-801415C4 13BEFC 0008+00 1/0 0/0 0/0 .text checkHawkWait__9daPy_py_cCFv */ -bool daPy_py_c::checkHawkWait() const { +BOOL daPy_py_c::checkHawkWait() const { return false; } /* 801415C4-801415CC 13BF04 0008+00 1/0 0/0 0/0 .text checkGoatThrow__9daPy_py_cCFv */ -bool daPy_py_c::checkGoatThrow() const { +BOOL daPy_py_c::checkGoatThrow() const { return false; } /* 801415CC-801415D4 13BF0C 0008+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daPy_py_cCFv */ -bool daPy_py_c::checkGoatThrowAfter() const { +BOOL daPy_py_c::checkGoatThrowAfter() const { return false; } /* 801415D4-801415DC 13BF14 0008+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfTagLockJump() const { +BOOL daPy_py_c::checkWolfTagLockJump() const { return false; } /* 801415DC-801415E4 13BF1C 0008+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfTagLockJumpLand() const { +BOOL daPy_py_c::checkWolfTagLockJumpLand() const { return false; } @@ -35156,39 +35173,39 @@ bool daPy_py_c::checkWolfRope() { } /* 801415EC-801415F4 13BF2C 0008+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfRopeHang() const { +BOOL daPy_py_c::checkWolfRopeHang() const { return false; } /* 801415F4-801415FC 13BF34 0008+00 1/0 0/0 0/0 .text checkRollJump__9daPy_py_cCFv */ -bool daPy_py_c::checkRollJump() const { +BOOL daPy_py_c::checkRollJump() const { return false; } /* 801415FC-80141604 13BF3C 0008+00 1/0 0/0 0/0 .text checkGoronRideWait__9daPy_py_cCFv */ -bool daPy_py_c::checkGoronRideWait() const { +BOOL daPy_py_c::checkGoronRideWait() const { return false; } /* 80141604-8014160C 13BF44 0008+00 1/0 0/0 0/0 .text checkWolfChain__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfChain() const { +BOOL daPy_py_c::checkWolfChain() const { return false; } /* 8014160C-80141614 13BF4C 0008+00 1/0 0/0 0/0 .text checkWolfWait__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfWait() const { +BOOL daPy_py_c::checkWolfWait() const { return false; } /* 80141614-8014161C 13BF54 0008+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfJumpAttack() const { +BOOL daPy_py_c::checkWolfJumpAttack() const { return false; } /* 8014161C-80141624 13BF5C 0008+00 1/0 0/0 0/0 .text checkWolfRSit__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfRSit() const { +BOOL daPy_py_c::checkWolfRSit() const { return false; } @@ -35199,28 +35216,28 @@ bool daPy_py_c::checkBubbleFly() const { /* 8014162C-80141634 13BF6C 0008+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daPy_py_cCFv */ -bool daPy_py_c::checkBottleDrinkEnd() const { +BOOL daPy_py_c::checkBottleDrinkEnd() const { return false; } /* 80141634-8014163C 13BF74 0008+00 1/0 0/0 0/0 .text checkWolfDig__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfDig() const { +BOOL daPy_py_c::checkWolfDig() const { return false; } /* 8014163C-80141644 13BF7C 0008+00 1/0 0/0 0/0 .text checkCutCharge__9daPy_py_cCFv */ -bool daPy_py_c::checkCutCharge() const { +BOOL daPy_py_c::checkCutCharge() const { return false; } /* 80141644-8014164C 13BF84 0008+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daPy_py_cCFv */ -bool daPy_py_c::checkCutTurnCharge() const { +BOOL daPy_py_c::checkCutTurnCharge() const { return false; } /* 8014164C-80141654 13BF8C 0008+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daPy_py_cCFv */ -bool daPy_py_c::checkCutLargeJumpCharge() const { +BOOL daPy_py_c::checkCutLargeJumpCharge() const { return false; } @@ -35231,22 +35248,22 @@ bool daPy_py_c::getBokoFlamePos(cXyz* param_0) { } /* 8014165C-80141664 13BF9C 0008+00 1/0 0/0 0/0 .text checkComboCutTurn__9daPy_py_cCFv */ -bool daPy_py_c::checkComboCutTurn() const { +BOOL daPy_py_c::checkComboCutTurn() const { return false; } /* 80141664-8014166C 13BFA4 0008+00 1/0 0/0 0/0 .text checkClimbMove__9daPy_py_cCFv */ -bool daPy_py_c::checkClimbMove() const { +BOOL daPy_py_c::checkClimbMove() const { return false; } /* 8014166C-80141674 13BFAC 0008+00 1/0 0/0 0/0 .text checkGrassWhistle__9daPy_py_cCFv */ -bool daPy_py_c::checkGrassWhistle() const { +BOOL daPy_py_c::checkGrassWhistle() const { return false; } /* 80141674-8014167C 13BFB4 0008+00 1/0 0/0 0/0 .text checkBoarRun__9daPy_py_cCFv */ -bool daPy_py_c::checkBoarRun() const { +BOOL daPy_py_c::checkBoarRun() const { return false; } @@ -35267,14 +35284,9 @@ float daPy_py_c::getBaseAnimeFrameRate() const { } /* 80141694-8014169C 13BFD4 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrame__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm float daPy_py_c::getBaseAnimeFrame() const { - nofralloc -#include "asm/d/a/d_a_alink/getBaseAnimeFrame__9daPy_py_cCFv.s" +f32 daPy_py_c::getBaseAnimeFrame() const { + return FLOAT_LABEL(lit_6108); } -#pragma pop /* 8014169C-801416A0 13BFDC 0004+00 1/0 0/0 0/0 .text setAnimeFrame__9daPy_py_cFf */ void daPy_py_c::setAnimeFrame(f32 param_0) { @@ -35355,13 +35367,13 @@ void daPy_py_c::onMagneGrab(f32 param_0, f32 param_1) { } /* 801416F4-801416FC 13C034 0008+00 1/0 0/0 0/0 .text getModelJointMtx__9daPy_py_cFUs */ -bool daPy_py_c::getModelJointMtx(u16 param_0) { - return false; +MtxP daPy_py_c::getModelJointMtx(u16 param_0) { + return NULL; } /* 801416FC-80141704 13C03C 0008+00 1/0 0/0 0/0 .text getHeadMtx__9daPy_py_cFv */ -bool daPy_py_c::getHeadMtx() { - return false; +MtxP daPy_py_c::getHeadMtx() { + return NULL; } /* 80141704-8014170C 13C044 0008+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz @@ -35383,7 +35395,7 @@ bool daPy_py_c::checkIronBallGroundStop() const { /* 8014171C-80141724 13C05C 0008+00 1/0 0/0 0/0 .text * checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv */ -bool daPy_py_c::checkSingleBoarBattleSecondBowReady() const { +BOOL daPy_py_c::checkSingleBoarBattleSecondBowReady() const { return false; } @@ -35471,12 +35483,12 @@ void daPy_py_c::onSceneChangeDead(u8 param_0, int param_1) { } /* 80141770-80141778 13C0B0 0008+00 1/0 0/0 0/0 .text getSpinnerActor__9daPy_py_cFv */ -bool daPy_py_c::getSpinnerActor() { - return false; +fopAc_ac_c* daPy_py_c::getSpinnerActor() { + return NULL; } /* 80141778-80141780 13C0B8 0008+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daPy_py_cCFv */ -bool daPy_py_c::checkHorseRideNotReady() const { +BOOL daPy_py_c::checkHorseRideNotReady() const { return false; } @@ -35488,18 +35500,13 @@ bool daPy_py_c::checkArrowChargeEnd() const { /* 80141788-80141790 13C0C8 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getSearchBallScale() const { - nofralloc -#include "asm/d/a/d_a_alink/getSearchBallScale__9daPy_py_cCFv.s" +f32 daPy_py_c::getSearchBallScale() const { + return FLOAT_LABEL(lit_6108); } -#pragma pop /* 80141790-80141798 13C0D0 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daPy_py_cFv */ -bool daPy_py_c::checkFastShotTime() { - return false; +s16 daPy_py_c::checkFastShotTime() { + return 0; } /* 80141798-801417A0 13C0D8 0008+00 1/0 0/0 0/0 .text checkNoEquipItem__9daPy_py_cCFv */ @@ -35520,8 +35527,8 @@ bool daPy_py_c::checkKandelaarSwing(int param_0) const { /* 801417B0-801417B8 13C0F0 0008+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daPy_py_cCFv */ -bool daPy_py_c::getBoardCutTurnOffsetAngleY() const { - return false; +s16 daPy_py_c::getBoardCutTurnOffsetAngleY() const { + return 0; } /* 801417B8-801417C0 13C0F8 0008+00 2/0 0/0 0/0 .text getMagneHitPos__9daPy_py_cFv */ @@ -35624,7 +35631,7 @@ bool daPy_py_c::checkCanoeFishingGetRight() const { /* 80141834-8014183C 13C174 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daPy_py_cCFv */ -bool daPy_py_c::checkBeeChildDrink() const { +u8 daPy_py_c::checkBeeChildDrink() const { return false; } @@ -35649,14 +35656,14 @@ bool daPy_py_c::checkAcceptDungeonWarpAlink(int param_0) { } /* 80141854-8014185C 13C194 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daPy_py_cCFv */ -bool daPy_py_c::getSumouCounter() const { - return false; +s16 daPy_py_c::getSumouCounter() const { + return 0; } /* 8014185C-80141864 13C19C 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daPy_py_cCFv */ -bool daPy_py_c::checkSumouWithstand() const { - return false; +s16 daPy_py_c::checkSumouWithstand() const { + return 0; } /* 80141864-80141868 13C1A4 0004+00 1/0 0/0 0/0 .text cancelGoronThrowEvent__9daPy_py_cFv @@ -35751,32 +35758,32 @@ void daPy_py_c::changeDragonActor(fopAc_ac_c* param_0) { } /* 801418C4-801418CC 13C204 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daPy_py_cCFv */ -bool daPy_py_c::getClothesChangeWaitTimer() const { - return false; +u8 daPy_py_c::getClothesChangeWaitTimer() const { + return 0; } /* 801418CC-801418D4 13C20C 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daPy_py_cCFv */ -bool daPy_py_c::getShieldChangeWaitTimer() const { - return false; +u8 daPy_py_c::getShieldChangeWaitTimer() const { + return 0; } /* 801418D4-801418DC 13C214 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daPy_py_cCFv */ -bool daPy_py_c::getSwordChangeWaitTimer() const { - return false; +u8 daPy_py_c::getSwordChangeWaitTimer() const { + return 0; } /* 801418DC-801418E4 13C21C 0008+00 1/0 0/0 0/0 .text checkMetamorphose__9daPy_py_cCFv */ -bool daPy_py_c::checkMetamorphose() const { +BOOL daPy_py_c::checkMetamorphose() const { return false; } /* 801418E4-801418EC 13C224 0008+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfDownAttackPullOut() const { +BOOL daPy_py_c::checkWolfDownAttackPullOut() const { return false; } /* 801418EC-801418F4 13C22C 0008+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daPy_py_cCFv */ -bool daPy_py_c::checkBootsOrArmorHeavy() const { +BOOL daPy_py_c::checkBootsOrArmorHeavy() const { return false; } @@ -35793,37 +35800,32 @@ bool daPy_py_c::checkItemSwordEquip() const { /* 80141904-8014190C 13C244 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daPy_py_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm float daPy_py_c::getSinkShapeOffset() const { - nofralloc -#include "asm/d/a/d_a_alink/getSinkShapeOffset__9daPy_py_cCFv.s" +f32 daPy_py_c::getSinkShapeOffset() const { + return FLOAT_LABEL(lit_6108); } -#pragma pop /* 8014190C-80141914 13C24C 0008+00 1/0 0/0 0/0 .text checkSinkDead__9daPy_py_cCFv */ -bool daPy_py_c::checkSinkDead() const { +BOOL daPy_py_c::checkSinkDead() const { return false; } /* 80141914-8014191C 13C254 0008+00 1/0 0/0 0/0 .text checkHorseStart__9daPy_py_cFv */ -bool daPy_py_c::checkHorseStart() { +BOOL daPy_py_c::checkHorseStart() { return false; } /* 8014191C-80141924 13C25C 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daPy_py_cFv */ -bool daPy_py_c::getWolfHowlMgrP() { - return false; +Z2WolfHowlMgr* daPy_py_c::getWolfHowlMgrP() { + return NULL; } /* 80141924-8014192C 13C264 0008+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daPy_py_cCFv */ -bool daPy_py_c::checkWolfHowlSuccessAnime() const { +BOOL daPy_py_c::checkWolfHowlSuccessAnime() const { return false; } /* 8014192C-80141934 13C26C 0008+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daPy_py_cFv */ -bool daPy_py_c::checkCopyRodTopUse() { +BOOL daPy_py_c::checkCopyRodTopUse() { return false; } @@ -35833,7 +35835,7 @@ bool daPy_py_c::checkCopyRodEquip() const { } /* 8014193C-80141944 13C27C 0008+00 1/0 0/0 0/0 .text checkCutJumpMode__9daPy_py_cCFv */ -bool daPy_py_c::checkCutJumpMode() const { +BOOL daPy_py_c::checkCutJumpMode() const { return false; } @@ -35900,18 +35902,18 @@ static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bo /* 801419F4-80141A04 13C334 0010+00 1/1 0/0 0/0 .text onForcePanic__9daMidna_cFv */ void daMidna_c::onForcePanic() { - onEndResetStateFlg0(ForcePanic); + onEndResetStateFlg0(FORCE_PANIC); } /* 80141A04-80141A10 13C344 000C+00 1/1 0/0 0/0 .text checkForceNormalColor__9daMidna_cCFv */ u32 daMidna_c::checkForceNormalColor() const { - return checkStateFlg1(ForceNormalColor); + return checkStateFlg1(FORCE_NORMAL_COLOR); } /* 80141A10-80141A1C 13C350 000C+00 1/1 0/0 0/0 .text checkForceTiredColor__9daMidna_cCFv */ u32 daMidna_c::checkForceTiredColor() const { - return checkStateFlg1(ForceTiredColor); + return checkStateFlg1(FORCE_TIRED_COLOR); } /* 80141A1C-80141A84 13C35C 0068+00 1/1 0/0 0/0 .text checkMidnaTired__9daMidna_cFv */ @@ -35926,7 +35928,7 @@ asm bool daMidna_c::checkMidnaTired() { /* 80141A84-80141A94 13C3C4 0010+00 1/1 0/0 0/0 .text onNoServiceWait__9daMidna_cFv */ void daMidna_c::onNoServiceWait() { - onEndResetStateFlg0(NoServiceWait); + onEndResetStateFlg0(NO_SERVICE_WAIT); } /* 80141A94-80141ACC 13C3D4 0038+00 1/1 0/0 0/0 .text setControllActorData__8daCrod_cFv diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index 9249f54536..9641162398 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -4,12 +4,14 @@ // #include "d/a/d_a_player.h" +#include "SSystem/SComponent/c_math.h" #include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/mtx/mtx.h" #include "dolphin/types.h" #include "f_op/f_op_actor_iter.h" #include "f_op/f_op_actor_mng.h" +#include "rel/d/a/d_a_boomerang/d_a_boomerang.h" // // Types: @@ -21,10 +23,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct JMath { - static u8 sincosTable_[65536]; -}; - struct J3DAnmLoaderDataBaseFlag {}; struct J3DAnmLoaderDataBase { @@ -219,18 +217,22 @@ SECTION_SDATA2 static f32 lit_4250 = 65536.0f; /* 8015E5B0-8015E654 158EF0 00A4+00 0/0 1/1 18/18 .text initOffset__20daPy_boomerangMove_cFPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) { - nofralloc -#include "asm/d/a/d_a_player/initOffset__20daPy_boomerangMove_cFPC4cXyz.s" +void daPy_boomerangMove_c::initOffset(cXyz const* param_0) { + daBoomerang_c* boomerang = daPy_py_c::getThrowBoomerangActor(); + if (boomerang != NULL) { + bgCheckAfterOffset(param_0); + boomerang->onWindCatch(); + } else { + field_0x4 = cM_rndF(lit_4248) + lit_4247; + field_0x8 = cM_rndF(lit_4249) + lit_4249; + field_0x2 = cM_rndF(lit_4250); + } + field_0x0 = 0; } -#pragma pop /* ############################################################################################## */ /* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss m_midnaActor__9daPy_py_c */ -u8 daPy_py_c::m_midnaActor[4]; +daMidna_c* daPy_py_c::m_midnaActor; /* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss None */ /* 8045101C 0002+00 data_8045101C m_dropAngleY__20daPy_boomerangMove_c */ @@ -277,6 +279,18 @@ SECTION_SDATA2 static u8 lit_4381[8] = { /* 8015E87C-8015EA0C 1591BC 0190+00 1/1 1/1 17/17 .text * bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz */ +// matches with literals (used in inlines) +#ifdef NONMATCHING +void daPy_boomerangMove_c::bgCheckAfterOffset(cXyz const* param_0) { + daBoomerang_c* boomerang = daPy_py_c::getThrowBoomerangActor(); + if (boomerang != NULL) { + field_0x4 = param_0->y - boomerang->mCurrent.mPosition.y; + field_0x8 = boomerang->mCurrent.mPosition.absXZ(*param_0); + field_0x2 = cM_atan2s(param_0->x - boomerang->mCurrent.mPosition.x, + param_0->z - boomerang->mCurrent.mPosition.z); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -285,12 +299,13 @@ asm void daPy_boomerangMove_c::bgCheckAfterOffset(cXyz const* param_0) { #include "asm/d/a/d_a_player/bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz.s" } #pragma pop +#endif /* 8015EA0C-8015EA20 15934C 0014+00 0/0 3/3 0/0 .text setParamData__9daPy_py_cFiiii */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::setParamData(int param_0, int param_1, int param_2, int param_3) { +asm u32 daPy_py_c::setParamData(int param_0, int param_1, int param_2, int param_3) { nofralloc #include "asm/d/a/d_a_player/setParamData__9daPy_py_cFiiii.s" } @@ -323,7 +338,7 @@ asm BOOL daPy_py_c::checkFishingRodItem(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkBombItem(int param_0) { +asm BOOL daPy_py_c::checkBombItem(int param_0) { nofralloc #include "asm/d/a/d_a_player/checkBombItem__9daPy_py_cFi.s" } @@ -333,7 +348,7 @@ asm void daPy_py_c::checkBombItem(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkBottleItem(int param_0) { +asm BOOL daPy_py_c::checkBottleItem(int param_0) { nofralloc #include "asm/d/a/d_a_player/checkBottleItem__9daPy_py_cFi.s" } @@ -352,40 +367,24 @@ asm void daPy_py_c::checkDrinkBottleItem(int param_0) { /* 8015EB40-8015EB68 159480 0028+00 0/0 4/4 0/0 .text checkOilBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) { - bool isOilBottleItem = false; - if (i_itemNo == CHUCHU_YELLOW || i_itemNo == OIL_BOTTLE_2 || i_itemNo == OIL_BOTTLE) { - isOilBottleItem = true; - } - return isOilBottleItem; + return i_itemNo == CHUCHU_YELLOW || i_itemNo == OIL_BOTTLE_2 || i_itemNo == OIL_BOTTLE; } /* 8015EB68-8015EB90 1594A8 0028+00 0/0 2/2 0/0 .text checkOpenBottleItem__9daPy_py_cFi */ BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) { - bool isOpenBottleItem = false; - if (i_itemNo == WATER_BOTTLE || i_itemNo == WORM || i_itemNo == FAIRY) { - isOpenBottleItem = true; - } - return isOpenBottleItem; + return i_itemNo == WATER_BOTTLE || i_itemNo == WORM || i_itemNo == FAIRY; } /* 8015EB90-8015EBB8 1594D0 0028+00 0/0 11/11 0/0 .text checkBowItem__9daPy_py_cFi */ BOOL daPy_py_c::checkBowItem(int i_itemNo) { - bool isBowItem = false; - if (i_itemNo == BOW || i_itemNo == BOMB_ARROW || i_itemNo == HAWK_ARROW) { - isBowItem = true; - } - return isBowItem; + return i_itemNo == BOW || i_itemNo == BOMB_ARROW || i_itemNo == HAWK_ARROW; } /* 8015EBB8-8015EBD8 1594F8 0020+00 0/0 23/23 0/0 .text checkHookshotItem__9daPy_py_cFi */ BOOL daPy_py_c::checkHookshotItem(int i_itemNo) { - bool isHookshotItem = false; - if (i_itemNo == HOOKSHOT || i_itemNo == W_HOOKSHOT) { - isHookshotItem = true; - } - return isHookshotItem; + return i_itemNo == HOOKSHOT || i_itemNo == W_HOOKSHOT; } /* 8015EBD8-8015EC28 159518 0050+00 0/0 3/3 0/0 .text checkTradeItem__9daPy_py_cFi */ @@ -401,11 +400,7 @@ asm BOOL daPy_py_c::checkTradeItem(int param_0) { /* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text checkDungeonWarpItem__9daPy_py_cFi */ BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) { - bool isDungeonWarpItem = false; - if (i_itemNo == DUNGEON_EXIT || i_itemNo == DUNGEON_BACK) { - isDungeonWarpItem = true; - } - return isDungeonWarpItem; + return i_itemNo == DUNGEON_EXIT || i_itemNo == DUNGEON_BACK; } /* 8015EC48-8015ECB8 159588 0070+00 0/0 10/10 3/3 .text setActor__16daPy_actorKeep_cFv */ @@ -580,9 +575,9 @@ J3DAnmBase* daPy_anmHeap_c::loadDataDemoRID(u16 pID, u16 pArcNo) { } /* 8015F168-8015F1A0 159AA8 0038+00 1/1 4/4 0/0 .text setAnimeHeap__14daPy_anmHeap_cFv */ -void daPy_anmHeap_c::setAnimeHeap() { +JKRHeap* daPy_anmHeap_c::setAnimeHeap() { mAnimeHeap->freeAll(); - mDoExt_setCurrentHeap(mAnimeHeap); + return mDoExt_setCurrentHeap(mAnimeHeap); } /* ############################################################################################## */ @@ -909,7 +904,7 @@ asm void daPy_py_c::checkRoomRestartStart() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkCarryStartLightBallA() { +asm u32 daPy_py_c::checkCarryStartLightBallA() { nofralloc #include "asm/d/a/d_a_player/checkCarryStartLightBallA__9daPy_py_cFv.s" } @@ -919,7 +914,7 @@ asm void daPy_py_c::checkCarryStartLightBallA() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daPy_py_c::checkCarryStartLightBallB() { +asm u32 daPy_py_c::checkCarryStartLightBallB() { nofralloc #include "asm/d/a/d_a_player/checkCarryStartLightBallB__9daPy_py_cFv.s" } @@ -962,14 +957,10 @@ bool daPy_py_c::checkBoomerangChargeTime() { } /* 8015F8D0-8015F8E4 15A210 0014+00 3/3 1/1 5/5 .text getThrowBoomerangActor__9daPy_py_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daPy_py_c::getThrowBoomerangActor() { - nofralloc -#include "asm/d/a/d_a_player/getThrowBoomerangActor__9daPy_py_cFv.s" +daBoomerang_c* daPy_py_c::getThrowBoomerangActor() { + return static_cast( + daAlink_getAlinkActorClass()->getThrowBoomerangAcKeep()->getActor()); } -#pragma pop /* 8015F8E4-8015F914 15A224 0030+00 0/0 0/0 2/2 .text * cancelBoomerangLockActor__9daPy_py_cFP10fopAc_ac_c */ diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index 5c1fedf3e1..8dd0d7bb34 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -813,6 +813,6 @@ static asm void func_8007748C() { #pragma pop /* 80077494-8007749C 071DD4 0008+00 0/0 1/0 0/0 .text checkPlayerFly__9daPy_py_cCFv */ -bool daPy_py_c::checkPlayerFly() const { - return false; +u32 daPy_py_c::checkPlayerFly() const { + return 0; } diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 7376015fb6..d5cf762663 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -28,10 +28,6 @@ struct dSmplMdl_draw_c { /* 80049058 */ void removeModel(J3DModelData*, int); }; -struct dPa_control_c { - /* 8004BACC */ dPa_control_c(); -}; - struct dMapInfo_n { /* 8003EE5C */ void getMapPlayerPos(); }; @@ -401,7 +397,7 @@ inline u8 dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { } inline BOOL dComIfGs_isEventBit(u16 id) { - return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(id); + return g_dComIfG_gameInfo.info.getEvent().isEventBit(id); } inline int dComIfGs_isItemFirstBit(u8 i_no) { @@ -978,9 +974,9 @@ int dComIfG_play_c::getLayerNo_common_common(const char* stageName, int roomId, else if (dComIfGs_isTmpBit(0x0601)) { if (dComIfGs_isTmpBit(0x0602)) { layer = 2; + } else { + layer = 3; } - } else { - layer = 3; } } @@ -1150,22 +1146,22 @@ int dComIfG_play_c::getLayerNo_common_common(const char* stageName, int roomId, layer = 13; } } + } - // Stage is Hyrule Castle Sewers and room is Prison Cell - if (!strcmp(stageName, "R_SP107") && roomId == 0) { - // Haven't been to Hyrule Castle Sewers - if (!dComIfGs_isEventBit(0x4D08)) { - layer = 11; - } + // Stage is Hyrule Castle Sewers and room is Prison Cell + if (!strcmp(stageName, "R_SP107") && roomId == 0) { + // Haven't been to Hyrule Castle Sewers + if (!dComIfGs_isEventBit(0x4D08)) { + layer = 11; } - // Stage and room is Zant Throne Room - else if (!strcmp(stageName, "D_MN08A") && roomId == 10) { - // Defeated Zant - if (dComIfGs_isEventBit(0x5410)) { - layer = 1; - } else { - layer = 0; - } + } + // Stage and room is Zant Throne Room + else if (!strcmp(stageName, "D_MN08A") && roomId == 10) { + // Defeated Zant + if (dComIfGs_isEventBit(0x5410)) { + layer = 1; + } else { + layer = 0; } } } @@ -1728,7 +1724,7 @@ asm void dComIfGs_offOneZoneSwitch(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isOneZoneSwitch(int param_0, int param_1) { +asm BOOL dComIfGs_isOneZoneSwitch(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isOneZoneSwitch__Fii.s" } @@ -2276,7 +2272,7 @@ cXyz dComIfGs_getWarpPlayerPos() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_getWarpPlayerPos() { +asm cXyz& dComIfGs_getWarpPlayerPos() { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_getWarpPlayerPos__Fv.s" } @@ -2287,7 +2283,7 @@ s16 dComIfGs_getWarpPlayerAngleY() { return dComIfGs_getLastWarpMarkPlayerAngleY(); } -int dComIfGs_getWarpRoomNo() { +s8 dComIfGs_getWarpRoomNo() { return dComIfGs_getLastWarpMarkRoomNo(); } diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp index 80dd6e347d..2dd152e72f 100644 --- a/src/d/d_att_dist.cpp +++ b/src/d/d_att_dist.cpp @@ -1,445 +1,243 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_att_dist -// - #include "d/d_att_dist.h" +#include "d/d_attention.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dAttention_c { - static u8 dist_table[6552]; -}; - -// -// Forward References: -// - -extern "C" u8 dist_table__12dAttention_c[6552]; - -// -// External References: -// - -// -// Declarations: -// - /* ############################################################################################## */ /* 803A9C70-803AB608 006D90 1998+00 0/0 5/5 13/13 .data dist_table__12dAttention_c */ -SECTION_DATA u8 dAttention_c::dist_table[6552] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3C, 0x23, 0xD7, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, - 0x43, 0xBB, 0x80, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3B, 0x80, 0x00, 0x43, 0x7A, 0x00, 0x00, - 0x43, 0x9C, 0x40, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xBB, 0x80, 0x00, 0x44, 0x1C, 0x40, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x44, 0xBB, 0x80, 0x00, 0x44, 0xFA, 0x00, 0x00, - 0xC4, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3B, 0x80, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x43, 0x9C, 0x40, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x42, 0x48, 0x00, 0x00, 0xC2, 0xF0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, - 0xC2, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xC8, 0x00, 0x00, - 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC2, 0xDC, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x42, 0xA0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x43, 0x48, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0xC2, 0xF0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xC8, 0x00, 0x00, - 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0xC3, 0x70, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x43, 0x48, 0x00, 0x00, 0x43, 0x5C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, - 0xC2, 0xF0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0xC2, 0xF0, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0xC4, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x48, 0x00, 0x00, 0xC4, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x7A, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, - 0x45, 0x8C, 0xA0, 0x00, 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x45, 0x1C, 0x40, 0x00, 0x45, 0x22, 0x80, 0x00, 0x45, 0x1C, 0x40, 0x00, 0x45, 0x1C, 0x40, 0x00, - 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, - 0x45, 0xAB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x9C, 0x40, 0x00, 0x45, 0xAB, 0xE0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, - 0xC2, 0xF0, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0xC3, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0x16, 0x00, 0x00, - 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x7A, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, - 0x44, 0xE1, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xBB, 0x80, 0x00, 0x44, 0x1C, 0x40, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x44, 0x3B, 0x80, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0xC4, 0x89, 0x80, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3C, 0x23, 0xD7, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x5C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x44, 0xED, 0x80, 0x00, 0x44, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0xFA, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0xED, 0x80, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xA0, 0x00, 0x00, - 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xDC, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0xC2, 0xF0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x43, 0x02, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x42, 0x34, 0x00, 0x00, 0xC2, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, - 0x43, 0x20, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x43, 0x3E, 0x00, 0x00, - 0x43, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC2, 0xDC, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x43, 0xBB, 0x80, 0x00, 0x44, 0x1C, 0x40, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0xC3, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, 0x46, 0x1F, 0x60, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, 0xC6, 0x1C, 0x40, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, 0x46, 0x1F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x46, 0x1C, 0x40, 0x00, 0xC6, 0x1C, 0x40, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0xBB, 0x80, 0x00, 0x44, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x46, 0x1C, 0x40, 0x00, 0x46, 0x1F, 0x60, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, 0xC6, 0x1C, 0x40, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0x42, 0xC8, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x42, 0x34, 0x00, 0x00, 0xC2, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x47, 0xC3, 0x50, 0x00, 0x47, 0xC3, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xC3, 0x50, 0x00, - 0xC7, 0xC3, 0x50, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, - 0x46, 0x1D, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0xC4, 0xFA, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0xC4, 0x2F, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, - 0x46, 0x1F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x1C, 0x40, 0x00, 0xC6, 0x1C, 0x40, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x43, 0xE1, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x16, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x44, 0xFA, 0x00, 0x00, 0x45, 0x09, 0x80, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x44, 0x16, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x16, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x44, 0x96, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x44, 0x96, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, - 0xC3, 0xFA, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x0C, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0xC2, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x44, 0x3B, 0x80, 0x00, - 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00, 0x44, 0x3B, 0x80, 0x00, 0x43, 0x48, 0x00, 0x00, - 0xC3, 0x48, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC4, 0x7A, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC4, 0x7A, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x44, 0x7A, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0x7A, 0x00, 0x00, 0xC4, 0x7A, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0x96, 0x00, 0x00, - 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x45, 0x3B, 0x80, 0x00, 0x45, 0x41, 0xC0, 0x00, - 0x43, 0x96, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0xC5, 0x3B, 0x80, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x45, 0x03, 0x40, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x44, 0xFA, 0x00, 0x00, 0xC4, 0xFA, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0xC2, 0xC8, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x45, 0x5A, 0xC0, 0x00, - 0x45, 0x5A, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x45, 0x3B, 0x80, 0x00, 0xC5, 0x3B, 0x80, 0x00, - 0x42, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0xBB, 0x80, 0x00, 0x44, 0x1C, 0x40, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC4, 0x7A, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC4, 0x7A, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x43, 0x16, 0x00, 0x00, - 0x43, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0xC3, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0xBB, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x44, 0xFA, 0x00, 0x00, 0x44, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0xC4, 0x7A, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x04, 0x42, 0xC8, 0x00, 0x00, - 0x43, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x20, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0C, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0C, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0C, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x44, 0x22, 0x80, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0C, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0C, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x44, 0x22, 0x80, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x24, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x24, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x24, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x44, 0x22, 0x80, 0x00, 0x44, 0x2F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x24, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x24, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x22, 0x80, 0x00, 0x44, 0x3B, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x44, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x84, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x84, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x84, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x22, 0x80, 0x00, 0x44, 0x3B, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x84, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x84, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x04, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x04, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x04, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x44, 0x22, 0x80, 0x00, 0x44, 0x3B, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x04, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x54, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x04, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x42, 0x48, 0x00, 0x00, 0x42, 0x8C, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x42, 0xC8, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x43, 0x16, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0x48, 0x00, 0x00, - 0x43, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x43, 0x96, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x43, 0xAF, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0xC8, 0x00, 0x00, - 0x43, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x43, 0xE1, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x43, 0xFA, 0x00, 0x00, 0x44, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x44, 0x09, 0x80, 0x00, 0x44, 0x22, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x16, 0x00, 0x00, - 0x44, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x22, 0x80, 0x00, 0x44, 0x3B, 0x80, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x44, 0x2F, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x44, 0x3B, 0x80, 0x00, 0x44, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x48, 0x00, 0x00, - 0x44, 0x6D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x54, 0x80, 0x00, 0x44, 0x7A, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x04, 0x44, 0x61, 0x00, 0x00, 0x44, 0x89, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, - 0x44, 0x6D, 0x80, 0x00, 0x44, 0x8F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, - 0xC3, 0x96, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x7A, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, +dist_entry dAttention_c::dist_table[234] = { + {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0}, + {250.0f, 375.0f, 500.0f, 400.0f, -400.0f, 0.5f, 0}, + {187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0}, + {375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0}, + {500.0f, 600.0f, 1500.0f, 2000.0f, -2000.0f, 10.0f, 0}, + {187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0}, + {80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1}, + {100.0f, 120.0f, 0.0f, 50.0f, -120.0f, 1.0f, 1}, + {100.0f, 120.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1}, + {100.0f, 120.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1}, + {80.0f, 100.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1}, + {80.0f, 100.0f, 0.0f, 10.0f, -130.0f, 1.0f, 1}, + {200.0f, 240.0f, 0.0f, 100.0f, -120.0f, 1.0f, 1}, + {100.0f, 120.0f, 0.0f, 30.0f, -240.0f, 1.0f, 1}, + {200.0f, 220.0f, 0.0f, 200.0f, -200.0f, 10.0f, 4}, + {100.0f, 120.0f, 300.0f, 300.0f, -200.0f, 1.0f, 4}, + {100.0f, 120.0f, 0.0f, 20.0f, -120.0f, 1.0f, 0}, + {200.0f, 200.0f, 0.0f, 400.0f, -120.0f, 1.0f, 1}, + {500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0}, + {500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0}, + {1000.0f, 1100.0f, 0.0f, 700.0f, -300.0f, 1.0f, 0}, + {150.0f, 200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0}, + {500.0f, 600.0f, 4500.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {400.0f, 450.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0}, + {2500.0f, 2600.0f, 2500.0f, 2500.0f, -2000.0f, 1.0f, 0}, + {5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {180.0f, 180.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0}, + {500.0f, 600.0f, 0.0f, 600.0f, -120.0f, 100.0f, 0}, + {1000.0f, 1000.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0}, + {-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0}, + {120.0f, 120.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0}, + {150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4}, + {150.0f, 160.0f, 0.0f, 150.0f, -150.0f, 1.0f, 132}, + {1000.0f, 1200.0f, 1800.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {375.0f, 625.0f, 500.0f, 750.0f, -500.0f, 1.0f, 0}, + {1200.0f, 1800.0f, 1200.0f, 500.0f, -1100.0f, 1.0f, 0}, + {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0}, + {200.0f, 220.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {1900.0f, 1900.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 0}, + {1900.0f, 2000.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 1}, + {80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1}, + {100.0f, 110.0f, 0.0f, 50.0f, -120.0f, 1.0f, 4}, + {130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1}, + {160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1}, + {190.0f, 210.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1}, + {375.0f, 625.0f, 500.0f, 800.0f, -500.0f, 10.0f, 0}, + {100.0f, 400.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0}, + {150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4}, + {1000.0f, 1100.0f, 0.0f, 200.0f, -200.0f, 1.0f, 0}, + {10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 100.0f, 0}, + {10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0}, + {1500.0f, 1800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {1000.0f, 1200.0f, 0.0f, 400.0f, -400.0f, 1.0f, 4}, + {10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0}, + {200.0f, 240.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0}, + {600.0f, 700.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0}, + {700.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0}, + {130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 0}, + {100000.0f, 100100.0f, 0.0f, 100000.0f, -100000.0f, 1.0f, 0}, + {10000.0f, 10100.0f, 0.0f, 3000.0f, -2000.0f, 300.0f, 0}, + {700.0f, 1000.0f, 500.0f, 1000.0f, -500.0f, 10.0f, 0}, + {500.0f, 600.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0}, + {700.0f, 800.0f, 0.0f, 700.0f, -700.0f, 1.0f, 0}, + {10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0}, + {400.0f, 450.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4}, + {500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4}, + {2000.0f, 2200.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0}, + {500.0f, 600.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0}, + {300.0f, 350.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4}, + {500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4}, + {1200.0f, 2000.0f, 1200.0f, 800.0f, -500.0f, 2.0f, 0}, + {160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0}, + {140.0f, 150.0f, 0.0f, 250.0f, -50.0f, 1.0f, 1}, + {500.0f, 600.0f, 750.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {500.0f, 600.0f, 750.0f, 200.0f, -200.0f, 1.0f, 0}, + {200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4}, + {300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4}, + {1000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 0}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4}, + {3000.0f, 3100.0f, 300.0f, 3000.0f, -3000.0f, 1.0f, 0}, + {2000.0f, 2100.0f, 300.0f, 2000.0f, -2000.0f, 1.0f, 0}, + {150.0f, 200.0f, 0.0f, 100.0f, -100.0f, 1.0f, 17}, + {3500.0f, 3500.0f, 0.0f, 3000.0f, -3000.0f, 100.0f, 0}, + {375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 40.0f, 0}, + {200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68}, + {300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68}, + {150.0f, 150.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1}, + {100.0f, 100.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0}, + {375.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0}, + {2000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 4}, + {100.0f, 200.0f, 0.0f, 160.0f, -150.0f, 10.0f, 4}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260}, + {50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {750.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {800.0f, 950.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, + {1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4}, }; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 9344018554..e38167ef3e 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -933,7 +933,7 @@ asm void dAttention_c::CheckObjectTarget(s32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dAttention_c::LockonTruth() { +asm bool dAttention_c::LockonTruth() { nofralloc #include "asm/d/d_attention/LockonTruth__12dAttention_cFv.s" } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index c30bb716b9..a6fc85fd47 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -628,7 +628,7 @@ bool dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) { +asm BOOL dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) { nofralloc #include "asm/d/event/d_event/compulsory__14dEvt_control_cFPvPCcUs.s" } diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 7c3b85a839..98c0831c87 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -4,6 +4,7 @@ // #include "d/event/d_event_data.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -18,45 +19,6 @@ struct mDoGph_gInf_c { static f32 mFadeRate; }; -struct dVibration_c { - /* 8006FA24 */ void StartShock(int, int, cXyz); - /* 8006FB10 */ void StartQuake(int, int, cXyz); - /* 8006FC0C */ void StartQuake(u8 const*, int, int, cXyz); - /* 8006FD94 */ void StopQuake(int); -}; - -struct dMsgObject_c { - /* 8023806C */ void demoMessageGroup(); -}; - -struct dEvt_control_c { - /* 80042914 */ void setSkipProc(void*, int (*)(void*, int), int); - /* 80042958 */ void setSkipZev(void*, char*); - /* 80043278 */ void getStageEventDt(); - /* 800432EC */ void convPId(unsigned int); - /* 8004331C */ void getStbDemoData(char*); - /* 800434D8 */ void searchMapEventData(u8); - /* 8004365C */ void setPt2(void*); - /* 8004368C */ void setPtT(void*); - /* 800436BC */ void setPtI(void*); - /* 800436F4 */ void setPtD(void*); -}; - -struct dEvent_manager_c { - /* 80047B1C */ void getMyStaffId(char const*, fopAc_ac_c*, int); - /* 80047D4C */ void getIsAddvance(int); - /* 80047F5C */ void getMyNowCutName(int); - /* 800480EC */ void getMySubstanceP(int, char const*, int); - /* 80048144 */ void getMySubstanceNum(int, char const*); - /* 8004817C */ void cutEnd(int); -}; - -struct dDlst_list_c { - /* 800568D8 */ void wipeIn(f32); - - static f32 mWipeRate; -}; - struct dDemo_c { /* 80039B6C */ void start(u8 const*, cXyz*, f32); /* 80039CF8 */ void end(); @@ -75,8 +37,6 @@ struct Z2SeqMgr { /* 802AFE18 */ void bgmStreamPlay(); }; -struct JAISoundID {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -189,7 +149,6 @@ extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 mFadeRate__13mDoGph_gInf_c; extern "C" extern u8 struct_80450BE4[4]; extern "C" u8 m_control__7dDemo_c[4]; @@ -316,14 +275,117 @@ SECTION_SDATA2 static f32 lit_4265 = 15.0f; SECTION_SDATA2 static f64 lit_4267 = 4503601774854144.0 /* cast s32 to float */; /* 80043A14-80043D60 03E354 034C+00 1/1 0/0 0/0 .text dEvDt_Next_Stage__Fii */ +// bunch of issues with sclsInfo section. regalloc for the rest +#ifdef NONMATCHING +static int dEvDt_Next_Stage(int index, int wipe_type) { + char* stage; + s16 point; + s8 roomNo; + s8 layer; + u32 mode = 0; // uvar8 - retail + s8 wipe = wipe_type; // ivar10 + int noVisit = true; + int wipe_time = 0; // bvar9 + f32 speed = FLOAT_LABEL(lit_4264); // dvar12 + bool setHour = false; // bvar2 + f32 hour = speed; // set to 0.0f dvar13 + + int* p_id = dComIfGp_evmng_getMyIntegerP(index, "ID"); + if (p_id != NULL) { + int id = *p_id; + s8 room_no = dComIfGp_roomControl_getStayNo(); + stage_scls_info_dummy_class* info; + if (room_no == -1) { + info = dComIfGp_getStageSclsInfo(); + } else { + info = dComIfGp_roomControl_getStatusRoomDt(room_no)->mRoomDt.getSclsInfo(); + } + + if (info != NULL && id >= 0 && id < info->numEntries) { + stage = info->mEntries[id].mStage; + point = info->mEntries[id].mStart; + roomNo = info->mEntries[id].mRoom; + layer = dStage_sclsInfo_getSceneLayer(&info->mEntries[id]); + wipe = dStage_sclsInfo_getWipe(&info->mEntries[id]); + wipe_time = dStage_sclsInfo_getWipeTime(&info->mEntries[id]); + + if (wipe == 15) { + wipe = 0; + } + + s8 timeH = dStage_sclsInfo_getTimeH(&info->mEntries[id]); + if (timeH >= 0 && timeH <= 23) { + setHour = true; + hour = timeH; + } + } + } + + char* stageP = dComIfGp_evmng_getMyStringP(index, "Stage"); + if (stageP != NULL) { + stage = stageP; + } + + int* pointP = dComIfGp_evmng_getMyIntegerP(index, "StartCode"); + if (pointP != NULL) { + point = *pointP; + } + + int* roomP = dComIfGp_evmng_getMyIntegerP(index, "RoomNo"); + if (roomP != NULL) { + roomNo = *roomP; + } + + int* layerP = dComIfGp_evmng_getMyIntegerP(index, "Layer"); + if (layerP != NULL) { + layer = *layerP; + } + + int* wipeP = dComIfGp_evmng_getMyIntegerP(index, "Wipe"); + if (wipeP != NULL) { + wipe = *wipeP; + } + + int* modeP = dComIfGp_evmng_getMyIntegerP(index, "Mode"); + if (modeP != NULL) { + mode = *modeP; + } + + f32* speedP = dComIfGp_evmng_getMyFloatP(index, "Speed"); + if (speedP != NULL) { + speed = *speedP; + } + + f32* hourP = dComIfGp_evmng_getMyFloatP(index, "Hour"); + if (hourP != NULL) { + hour = *hourP; + setHour = true; + } + + int* noVisitP = dComIfGp_evmng_getMyIntegerP(index, "NoVisit"); + if (noVisitP != NULL) { + noVisit = false; + } + + if (stage != NULL && point != -1) { + if (setHour) { + dKy_set_nexttime(15.0f * hour); + } + dComIfGp_setNextStage(stage, point, roomNo, layer, speed, mode, 1, wipe, 0, noVisit, + wipe_time); + } + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dEvDt_Next_Stage(int param_0, int param_1) { +static asm int dEvDt_Next_Stage(int param_0, int param_1) { nofralloc #include "asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s" } #pragma pop +#endif /* 80043D60-80043DC8 03E6A0 0068+00 3/3 0/0 0/0 .text flagCheck__11dEvDtFlag_cFi */ #pragma push @@ -447,25 +509,28 @@ asm void dEvDtStaff_c::specialProc() { } #pragma pop -/* 80044134-80044170 03EA74 003C+00 0/0 1/1 0/0 .text init__12dEvDtStaff_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtStaff_c::init() { - nofralloc -#include "asm/d/event/d_event_data/init__12dEvDtStaff_cFv.s" +inline dEvent_manager_c& dComIfGp_getEventManager() { + return g_dComIfG_gameInfo.play.getEvtManager(); +} + +/* 80044134-80044170 03EA74 003C+00 0/0 1/1 0/0 .text init__12dEvDtStaff_cFv */ +void dEvDtStaff_c::init() { + mCurrentCut = mStartCut; + field_0x40 = true; + field_0x41 = false; + field_0x3c = -1; + if (mType == TYPE_CAMERA) { + dComIfGp_getEventManager().setCameraPlay(1); + } } -#pragma pop /* 80044170-80044190 03EAB0 0020+00 1/1 0/0 0/0 .text advanceCut__12dEvDtStaff_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtStaff_c::advanceCut(int param_0) { - nofralloc -#include "asm/d/event/d_event_data/advanceCut__12dEvDtStaff_cFi.s" +void dEvDtStaff_c::advanceCut(int cut) { + mCurrentCut = cut; + field_0x40 = true; + field_0x41 = false; + field_0x3c = -1; } -#pragma pop /* ############################################################################################## */ /* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -676,34 +741,66 @@ asm void dEvDtCut_c::startCheck() { #pragma pop /* 80046138-8004616C 040A78 0034+00 1/1 7/7 0/0 .text init__11dEvDtBase_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtBase_c::init() { - nofralloc -#include "asm/d/event/d_event_data/init__11dEvDtBase_cFv.s" +int dEvDtBase_c::init() { + mHeaderP = NULL; + mEventP = NULL; + mStaffP = NULL; + mCutP = NULL; + mDataP = NULL; + mFDataP = NULL; + mIDataP = NULL; + mSDataP = NULL; + mRoomNo = -1; + return 0; } -#pragma pop /* 8004616C-8004628C 040AAC 0120+00 0/0 6/6 0/0 .text init__11dEvDtBase_cFPci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtBase_c::init(char* param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_data/init__11dEvDtBase_cFPci.s" +int dEvDtBase_c::init(char* p_data, int roomNo) { + init(); + if (p_data == NULL) { + return 0; + } else { + setHeaderP((event_binary_data_header*)p_data); + + if (getEventNum() > 0) { + setEventP((dEvDtEvent_c*)(p_data + getEventTop())); + } + + if (getStaffNum() > 0) { + setStaffP((dEvDtStaff_c*)(p_data + getStaffTop())); + } + + if (getCutNum() > 0) { + setCutP((dEvDtCut_c*)(p_data + getCutTop())); + } + + if (getDataNum() > 0) { + setDataP((dEvDtData_c*)(p_data + getDataTop())); + } + + if (getFDataNum() > 0) { + setFDataP((f32*)(p_data + getFDataTop())); + } + + if (getIDataNum() > 0) { + setIDataP((int*)(p_data + getIDataTop())); + } + + if (getSDataNum() > 0) { + setSDataP((char*)(p_data + getSDataTop())); + } + + mRoomNo = roomNo; + return getEventNum(); + } } -#pragma pop /* 8004628C-800462FC 040BCC 0070+00 0/0 1/1 0/0 .text advanceCut__11dEvDtBase_cFP12dEvDtEvent_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvDtBase_c::advanceCut(dEvDtEvent_c* param_0) { - nofralloc -#include "asm/d/event/d_event_data/advanceCut__11dEvDtBase_cFP12dEvDtEvent_c.s" +void dEvDtBase_c::advanceCut(dEvDtEvent_c* p_event) { + for (int i = 0; i < p_event->getNStaff(); i++) { + advanceCutLocal(mStaffP + p_event->getStaff(i)); + } } -#pragma pop /* 800462FC-800463DC 040C3C 00E0+00 1/1 0/0 0/0 .text * advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c */ diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index abcc88e10d..e8e0db6958 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -199,21 +199,11 @@ SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)"; #pragma pop /* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */ -SECTION_DATA static void* soecial_names[14] = { - (void*)&d_event_d_event_manager__stringBase0, - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x10), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x1E), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x2C), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x3F), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x50), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x63), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x6E), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x7B), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x89), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0x94), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0xA3), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0xB2), - (void*)(((char*)&d_event_d_event_manager__stringBase0) + 0xC3), +SECTION_DATA static char* soecial_names[14] = { + "NORMAL_COMEBACK", "DEFAULT_START", "SHUTTER_START", "SHUTTER_START_STOP", + "BS_SHUTTER_START", "BS_SHUTTER_START_B", "KNOB_START", "KNOB_START_B", + "FMASTER_START", "FALL_START", "CRAWLOUT_START", "BOSSWARP_START", + "PORTALWARP_START", "PORTALWARP_START_B", }; /* 80046480-800465E8 040DC0 0168+00 1/1 0/0 0/0 .text getEventName__18dEvent_exception_cFv */ @@ -228,14 +218,23 @@ asm void dEvent_exception_c::getEventName() { /* 800465E8-80046688 040F28 00A0+00 1/1 0/0 0/0 .text * getSubstance__16dEvent_manager_cFP11dEvDtData_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getSubstance(dEvDtData_c* param_0, int param_1) { - nofralloc -#include "asm/d/event/d_event_manager/getSubstance__16dEvent_manager_cFP11dEvDtData_ci.s" +void* dEvent_manager_c::getSubstance(dEvDtData_c* p_data, int type) { + if (p_data->getIndex() < 0 || p_data->getNumber() <= 0) { + return NULL; + } else { + switch (p_data->getType()) { + case dEvDtData_c::TYPE_FLOAT: + case dEvDtData_c::TYPE_VEC: + case 2: + return getBase().getFDataP(p_data->getIndex()); + case dEvDtData_c::TYPE_INT: + return getBase().getIDataP(p_data->getIndex()); + case dEvDtData_c::TYPE_STRING: + return getBase().getSDataP(p_data->getIndex()); + } + return NULL; + } } -#pragma pop dEvent_manager_c::dEvent_manager_c() { mDataLoaded = false; @@ -264,18 +263,16 @@ int dEvent_manager_c::create() { field_0x1b4 = 0; field_0x1aa = -1; field_0x1b8 = 0; - field_0x1b0 = -1; + mRoomNo = -1; mDataLoaded = 0; for (int i = 4; i <= 9; i++) { mEventList[i].init(); } - char* res = (char*)dComIfG_getStageRes(data_80379F50); - mEventList[3].init(res, -1); - mEventList[10].init(); - res = (char*)dComIfG_getObjectRes("Event", data_80379F50); - mEventList[1].init(res, -1); + mEventList[3].init((char*)dComIfG_getStageRes(data_80379F50), -1); + mEventList[10].init(); + mEventList[1].init((char*)dComIfG_getObjectRes("Event", data_80379F50), -1); mEventList[2].init(); return 1; } @@ -305,6 +302,35 @@ asm void dEvent_manager_c::demoInit() { #pragma pop /* 80046904-800469EC 041244 00E8+00 0/0 1/1 0/0 .text roomInit__16dEvent_manager_cFi */ +// reversed reg alloc +#ifdef NONMATCHING +void dEvent_manager_c::roomInit(int roomNo) { + if (roomNo == -1) { + roomNo = dComIfGp_roomControl_getStayNo(); + } + char arc_name[8]; + strcpy(arc_name, dComIfG_getRoomArcName(roomNo)); + char* data = (char*)dComIfG_getStageRes(arc_name, data_80379F50); + + int tmp = -1; + for (int i = 4; i <= 9; i++) { + if (mEventList[i].getHeaderP() == NULL) { + tmp = i; + continue; + } + + if (mEventList[i].roomNo() == roomNo) { + tmp = i; + break; + } + } + + if (tmp != -1) { + mEventList[tmp].init(data, roomNo); + } + mRoomNo = roomNo; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -313,6 +339,7 @@ asm void dEvent_manager_c::roomInit(int param_0) { #include "asm/d/event/d_event_manager/roomInit__16dEvent_manager_cFi.s" } #pragma pop +#endif void dEvent_manager_c::roomFinish(int param_0) { for (int i = 4; i <= 9; i++) { @@ -369,19 +396,31 @@ static int allOffObjectCallBack(fopAc_ac_c* pActor, void* param_1) { /* 80046CB8-80046DA0 0415F8 00E8+00 1/1 0/0 0/0 .text * startProc__16dEvent_manager_cFP12dEvDtEvent_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::startProc(dEvDtEvent_c* param_0) { - nofralloc -#include "asm/d/event/d_event_manager/startProc__16dEvent_manager_cFP12dEvDtEvent_c.s" +void dEvent_manager_c::startProc(dEvDtEvent_c* p_evnt) { + for (int i = 0; i < p_evnt->getNStaff(); i++) { + dEvDtStaff_c* staff = getBase().getStaffP(p_evnt->getStaff(i)); + if (staff->getType() == dEvDtStaff_c::TYPE_DEFAULT) { + fopAc_ac_c* ac = specialCast(staff->getName(), 1); + if (ac == NULL) { + ac = fopAcM_searchFromName4Event(staff->getName(), -1); + } + if (ac != NULL) { + fopAcM_OnStatus(ac, 0x8000); + } + } + if (staff->getType() == dEvDtStaff_c::TYPE_ALL) { + issueStaff(staff->getName()); + } + staff->init(); + } + p_evnt->mEventState = 1; + mFlags.init(); } -#pragma pop /* 80046DA0-80046DAC 0416E0 000C+00 2/2 0/0 0/0 .text * closeProc__16dEvent_manager_cFP12dEvDtEvent_c */ -void dEvent_manager_c::closeProc(dEvDtEvent_c* param_0) { - param_0->field_0xa4 = 2; +void dEvent_manager_c::closeProc(dEvDtEvent_c* p_evnt) { + p_evnt->mEventState = 2; } /* ############################################################################################## */ @@ -452,23 +491,21 @@ 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; +dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int idx) { + if (idx <= 0 || idx > 11) { + return 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; + dEvDtBase_c* base = &mEventList[idx]; + + if (base == NULL || base->getHeaderP() == NULL) { + return NULL; + } else if (param_0 < 0 || param_0 >= base->getEventNum()) { + return NULL; } else { - eventptr = baseptr->getEventP(param_1); + return base->getEventP(idx); } } - return eventptr; + return NULL; } #else #pragma push @@ -616,7 +653,7 @@ SECTION_DEAD static char const* const stringBase_8037A0C5 = "Link"; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvent_manager_c::getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { +asm s32 dEvent_manager_c::getMyStaffId(char const* param_0, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/event/d_event_manager/getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci.s" } @@ -664,26 +701,60 @@ asm void dEvent_manager_c::getMyNowCutName(int param_0) { } #pragma pop +inline dEvt_control_c& dComIfGp_getEvent() { + return g_dComIfG_gameInfo.play.getEvent(); +} + /* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */ +// instruction in wrong place +#ifdef NONMATCHING +dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) { + if (dComIfGp_getEvent().getMode() == 0) { + return NULL; + } else if (index == -1) { + return NULL; + } else if (field_0x1aa == -1) { + return NULL; + } else { + dEvDtCut_c* cut; + if (type != 0) { + cut = getBase().getCutStaffStartCutP(index); + } else { + cut = getBase().getCutStaffCurrentCutP(index); + } + + int top = cut->getDataTop(); + while (top != -1) { + dEvDtData_c* data = getBase().getDataP(index); + if (!strcmp(name, data->getName())) { + return data; + } + top = data->getNext(); + } + + return NULL; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvent_manager_c::getMyDataP(int param_0, char const* param_1, int param_2) { +asm dEvDtData_c* dEvent_manager_c::getMyDataP(int param_0, char const* param_1, int param_2) { nofralloc #include "asm/d/event/d_event_manager/getMyDataP__16dEvent_manager_cFiPCci.s" } #pragma pop +#endif /* 800480EC-80048144 042A2C 0058+00 0/0 22/22 355/355 .text * getMySubstanceP__16dEvent_manager_cFiPCci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dEvent_manager_c::getMySubstanceP(int param_0, char const* param_1, int param_2) { - nofralloc -#include "asm/d/event/d_event_manager/getMySubstanceP__16dEvent_manager_cFiPCci.s" +void* dEvent_manager_c::getMySubstanceP(int index, char const* name, int type) { + dEvDtData_c* data = getMyDataP(index, name, 0); + if (data == NULL) { + return NULL; + } + return getSubstance(data, type); } -#pragma pop /* 80048144-8004817C 042A84 0038+00 0/0 12/12 0/0 .text getMySubstanceNum__16dEvent_manager_cFiPCc */ @@ -821,7 +892,7 @@ SECTION_DEAD static char const* const stringBase_8037A0DE = "SHUTTER_DOOR"; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dEvent_manager_c::specialCast(char const* param_0, int param_1) { +asm fopAc_ac_c* dEvent_manager_c::specialCast(char const* param_0, int param_1) { nofralloc #include "asm/d/event/d_event_manager/specialCast__16dEvent_manager_cFPCci.s" } diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 4ef49f0584..ade576a67a 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -27,12 +27,6 @@ struct mDoGph_gInf_c { static u8 m_bloom[20]; }; -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); -}; - struct color_RGB_class {}; struct Z2SeMgr { @@ -3159,7 +3153,7 @@ static asm void dKy_Indoor_check() { #pragma pop /* 801AC2E0-801AC2E8 1A6C20 0008+00 0/0 1/1 0/0 .text dKy_withwarp_capture_check__Fv */ -bool dKy_withwarp_capture_check() { +BOOL dKy_withwarp_capture_check() { return false; } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index ea1be62740..9d509772ea 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -11,8 +11,6 @@ // Types: // -struct msg_class {}; - struct mDoGph_gInf_c { static u8 mFader[4]; static u8 mFrameBufferTimg[4]; @@ -122,19 +120,11 @@ struct dMenu_Collect2D_c { /* 801B5FAC */ bool isOutCheck(); }; -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct dDlst_MENU_CAPTURE_c { /* 801FDFCC */ void draw(); /* 801FE2E8 */ ~dDlst_MENU_CAPTURE_c(); }; -struct JAISoundID {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -387,7 +377,6 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__10CSTControl[4]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -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]; diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index b310d96b93..5af6b8a96e 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -6,49 +6,12 @@ #include "d/meter/d_meter2.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_msg_mng.h" // // Types: // -struct msg_class {}; - -struct dSv_player_status_a_c { - /* 80032A5C */ void getSelectItemIndex(int) const; - /* 80032AA8 */ void getRupeeMax() const; -}; - -struct dSv_player_item_record_c { - /* 80033F6C */ void setBombNum(u8, u8); - /* 80033F7C */ void getBombNum(u8) const; - /* 80034030 */ void getBottleNum(u8) const; -}; - -struct dSv_player_item_max_c { - /* 800340F8 */ void getBombNum(u8) const; -}; - -struct dSv_player_item_c { - /* 80032FB8 */ void setItem(int, u8); - /* 80033030 */ void getItem(int, bool) const; -}; - -struct dSv_player_collect_c { - /* 8003422C */ void onCollectCrystal(u8); - /* 8003424C */ void isCollectCrystal(u8) const; - /* 80034270 */ void onCollectMirror(u8); - /* 80034290 */ void isCollectMirror(u8) const; -}; - -struct dSv_light_drop_c { - /* 80034340 */ void getLightDropNum(u8) const; - /* 8003439C */ void isLightDropGetFlag(u8) const; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - struct dScope_c { /* 80193690 */ dScope_c(u8); }; @@ -59,27 +22,11 @@ struct dMw_HIO_c { /* 801F9E24 */ bool getPachinkoFlag(); }; -struct dMsgObject_c { - /* 802371E4 */ void isPlaceMessage(); - /* 8023822C */ void getStatus(); -}; - struct dMeterString_c { /* 8020ED60 */ dMeterString_c(int); /* 8020F5A4 */ void createString(int); }; -struct J2DScreen {}; - -struct dMeterMap_c { - /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); - /* 8020D75C */ void getMapDispEdgeTop(); - /* 8020D948 */ dMeterMap_c(J2DScreen*); - /* 8020DCE4 */ void _move(u32); - /* 8020DF1C */ void _draw(); - /* 8020E754 */ void meter_map_move(u32); -}; - struct dMeterHakusha_c { /* 8020C320 */ dMeterHakusha_c(void*); }; @@ -98,143 +45,10 @@ struct dMeterButton_c { /* 80209CEC */ void hideAll(); }; -struct dMeter2_c { - /* 8021EA14 */ void _create(); - /* 8021F128 */ void _execute(); - /* 8021F370 */ void _draw(); - /* 8021F49C */ void _delete(); - /* 8021F6EC */ void emphasisButtonDelete(); - /* 8021F780 */ void setLifeZero(); - /* 8021F7B0 */ void checkStatus(); - /* 8021FD60 */ void moveLife(); - /* 80220180 */ void moveKantera(); - /* 8022051C */ void moveOxygen(); - /* 80220888 */ void moveLightDrop(); - /* 80220C30 */ void moveRupee(); - /* 802210AC */ void moveKey(); - /* 80221244 */ void moveButtonA(); - /* 802217F4 */ void moveButtonB(); - /* 80221EC8 */ void moveButtonR(); - /* 80222000 */ void moveButtonZ(); - /* 802222A0 */ void moveButton3D(); - /* 80222364 */ void moveButtonC(); - /* 80222494 */ void moveButtonS(); - /* 80222518 */ void moveButtonXY(); - /* 80222E88 */ void moveButtonCross(); - /* 802230F8 */ void moveTouchSubMenu(); - /* 802230FC */ void moveSubContents(); - /* 802231C8 */ void move2DContents(); - /* 802237D4 */ void checkSubContents(); - /* 80223BC4 */ void check2DContents(); - /* 80223E00 */ void moveBombNum(); - /* 80224258 */ void moveBottleNum(); - /* 80224354 */ void moveArrowNum(); - /* 80224680 */ void movePachinkoNum(); - /* 802248E4 */ void alphaAnimeLife(); - /* 80224A04 */ void alphaAnimeKantera(); - /* 80224BAC */ void alphaAnimeOxygen(); - /* 80224D6C */ void alphaAnimeLightDrop(); - /* 80224DC0 */ void alphaAnimeRupee(); - /* 80224F70 */ void alphaAnimeKey(); - /* 802250F4 */ void alphaAnimeButton(); - /* 802254C0 */ void alphaAnimeButtonCross(); - /* 802256DC */ void isShowLightDrop(); - /* 802258A0 */ void killSubContents(u8); - /* 80225960 */ void isKeyVisible(); - /* 802259F8 */ void isArrowEquip(); - /* 80225A64 */ void isPachinkoEquip(); -}; - -struct dMeter2Info_c { - /* 8021C1DC */ void isFloatingMessageVisible(); - /* 8021C950 */ void isDirectUseItem(int); - /* 8021DCE0 */ void decHotSpringTimer(); -}; - -struct JKRExpHeap {}; - -struct dMeter2Draw_c { - /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); - /* 8021135C */ void exec(u32); - /* 802149F4 */ void drawLife(s16, s16, f32, f32); - /* 80214C20 */ void setAlphaLifeChange(bool); - /* 80214DF4 */ void setAlphaLifeAnimeMin(); - /* 80214E54 */ void setAlphaLifeAnimeMax(); - /* 802154A8 */ void drawKantera(s32, s32, f32, f32); - /* 802155B8 */ void setAlphaKanteraChange(bool); - /* 802156E0 */ void setAlphaKanteraAnimeMin(); - /* 8021575C */ void setAlphaKanteraAnimeMax(); - /* 802157E0 */ void drawOxygen(s32, s32, f32, f32); - /* 802158F0 */ void setAlphaOxygenChange(bool); - /* 80215A18 */ void setAlphaOxygenAnimeMin(); - /* 80215A94 */ void setAlphaOxygenAnimeMax(); - /* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8); - /* 80215DA4 */ void setAlphaLightDropChange(bool); - /* 80215DA8 */ void getNowLightDropRateCalc(); - /* 80215E40 */ void setAlphaLightDropAnimeMin(); - /* 80215F88 */ void setAlphaLightDropAnimeMax(); - /* 8021632C */ void drawRupee(s16); - /* 80216684 */ void setAlphaRupeeChange(bool); - /* 802168D0 */ void setAlphaRupeeAnimeMin(); - /* 80216990 */ void setAlphaRupeeAnimeMax(); - /* 80216A40 */ void drawKey(s16); - /* 80216B28 */ void setAlphaKeyChange(bool); - /* 80216CA8 */ void setAlphaKeyAnimeMin(); - /* 80216D2C */ void setAlphaKeyAnimeMax(); - /* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool); - /* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool); - /* 8021764C */ void drawButtonR(u8, u8, bool, bool); - /* 802176EC */ void drawButtonZ(u8); - /* 80217904 */ void drawButton3D(u8); - /* 80217954 */ void drawButtonC(u8, bool); - /* 802179C0 */ void drawButtonS(u8); - /* 80217A10 */ void drawButtonBin(u8); - /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool); - /* 80218238 */ void getButtonCrossParentInitTransY(); - /* 80218254 */ void drawButtonCross(f32, f32); - /* 80218338 */ void setAlphaButtonCrossAnimeMin(); - /* 802183A8 */ void setAlphaButtonCrossAnimeMax(); - /* 80218788 */ void setAlphaButtonChange(bool); - /* 8021901C */ void setAlphaButtonAnimeMin(); - /* 802190A8 */ void setAlphaButtonAnimeMax(); - /* 80219174 */ void setAlphaButtonAAnimeMin(); - /* 80219258 */ void setAlphaButtonAAnimeMax(); - /* 80219324 */ void setAlphaButtonBAnimeMin(); - /* 80219474 */ void setAlphaButtonBAnimeMax(); - /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool); - /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool); - /* 80219A84 */ void setButtonIconMidonaAlpha(u32); - /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool); - /* 8021A2F4 */ void getActionString(u8, u8, u8*); - /* 8021AB84 */ void setItemNum(u8, u8, u8); - /* 8021AEC8 */ void drawItemNum(u8, f32); - /* 8021AF78 */ void drawKanteraMeter(u8, f32); - /* 8021B0C8 */ void isButtonVisible(); - /* 8021BC24 */ void getCameraSubject(); - /* 8021BC54 */ void getItemSubject(); - /* 8021BCAC */ void getPlayerSubject(); - /* 8021BCC0 */ void isBButtonShow(bool); - /* 8021BDD0 */ void getButtonTimer(); -}; - -struct dDlst_base_c {}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct dDemo_c { static u8 m_mode[4]; }; -struct dComIfG_play_c { - /* 8002B36C */ void setItemBombNumCount(u8, s16); - /* 8002B384 */ void getItemBombNumCount(u8); - /* 8002B394 */ void clearItemBombNumCount(u8); - /* 8002C97C */ void getLayerNo(int); - /* 8002CBBC */ void getTimerMode(); -}; - struct dCamera_c { /* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*); }; @@ -243,10 +57,6 @@ struct Z2StatusMgr { /* 802B5F70 */ void heartGaugeOn(); }; -struct JAISoundID {}; - -struct Vec {}; - struct Z2SeMgr { /* 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); @@ -256,11 +66,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRHeap { - /* 802CE5CC */ void freeAll(); - /* 802CE784 */ void getTotalFreeSize(); -}; - // // Forward References: // @@ -471,16 +276,13 @@ extern "C" void _restgpr_23(); extern "C" void _restgpr_25(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_mwHIO[304]; extern "C" extern u8 g_drawHIO[3880]; extern "C" extern u8 g_ringHIO[344]; extern "C" extern u8 g_fmapHIO[1188]; extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 g_meter2_info[248]; extern "C" u8 m_mode__7dDemo_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 7568bf17b9..4c6cfff35b 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -29,22 +29,6 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct ResTIMG {}; - -struct ResTLUT {}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct J2DPicture { - /* 802FC708 */ J2DPicture(ResTIMG const*); - /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); -}; - struct JMSMesgEntry_c {}; struct dMeter2Info_c { @@ -56,157 +40,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JUtility { - struct TColor {}; -}; - -struct JKRExpHeap {}; - -struct J2DGrafContext {}; - -struct JKRArchive { - /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); -}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - -struct CPaneMgrAlpha { - /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); - /* 802555C8 */ void show(); - /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); - /* 802557D0 */ void setAlphaRate(f32); - /* 80255828 */ void getAlphaRate(); -}; - -struct J2DBasePosition {}; - -struct J2DRotateAxis {}; - -struct J2DPane { - /* 802F666C */ void appendChild(J2DPane*); - /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32); - /* 802F76F8 */ void setBasePosition(J2DBasePosition); - /* 802F79A8 */ void getGlbVtx(u8) const; - /* 802F7FCC */ void animationTransform(); -}; - -struct CPaneMgr { - /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 802545B0 */ void paneTrans(f32, f32); - /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); -}; - -struct J2DAnmColor {}; - -struct dMeter2Draw_c { - /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); - /* 802102F8 */ ~dMeter2Draw_c(); - /* 80210FB0 */ void init(); - /* 8021135C */ void exec(u32); - /* 8021151C */ void draw(); - /* 80211BEC */ void initLife(); - /* 80211E64 */ void initMagic(); - /* 80212190 */ void initLightDrop(); - /* 80212404 */ void initRupeeKey(); - /* 802126E4 */ void initButton(); - /* 8021350C */ void initButtonCross(); - /* 80213CEC */ void playPikariBckAnimation(f32); - /* 80213D6C */ void setPikariBpkAnimation(J2DAnmColor*); - /* 80213E3C */ void playPikariBpkAnimation(f32); - /* 80213E94 */ void playOxygenBpkAnimation(J2DAnmColor*); - /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, - JUtility::TColor, JUtility::TColor, f32, u8); - /* 80213FF0 */ void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor, - JUtility::TColor, JUtility::TColor, f32, u8); - /* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor, - JUtility::TColor, JUtility::TColor); - /* 802147CC */ void changeTextureLife(int, bool, u8); - /* 802149F4 */ void drawLife(s16, s16, f32, f32); - /* 80214C20 */ void setAlphaLifeChange(bool); - /* 80214DF4 */ void setAlphaLifeAnimeMin(); - /* 80214E54 */ void setAlphaLifeAnimeMax(); - /* 80214EB4 */ void drawKanteraScreen(u8); - /* 80215290 */ void drawMagic(s16, s16, f32, f32); - /* 80215380 */ void setAlphaMagicChange(bool); - /* 802154A8 */ void drawKantera(s32, s32, f32, f32); - /* 802155B8 */ void setAlphaKanteraChange(bool); - /* 802156E0 */ void setAlphaKanteraAnimeMin(); - /* 8021575C */ void setAlphaKanteraAnimeMax(); - /* 802157E0 */ void drawOxygen(s32, s32, f32, f32); - /* 802158F0 */ void setAlphaOxygenChange(bool); - /* 80215A18 */ void setAlphaOxygenAnimeMin(); - /* 80215A94 */ void setAlphaOxygenAnimeMax(); - /* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8); - /* 80215DA4 */ void setAlphaLightDropChange(bool); - /* 80215DA8 */ void getNowLightDropRateCalc(); - /* 80215E40 */ void setAlphaLightDropAnimeMin(); - /* 80215F88 */ void setAlphaLightDropAnimeMax(); - /* 8021632C */ void drawRupee(s16); - /* 80216684 */ void setAlphaRupeeChange(bool); - /* 802168D0 */ void setAlphaRupeeAnimeMin(); - /* 80216990 */ void setAlphaRupeeAnimeMax(); - /* 80216A40 */ void drawKey(s16); - /* 80216B28 */ void setAlphaKeyChange(bool); - /* 80216CA8 */ void setAlphaKeyAnimeMin(); - /* 80216D2C */ void setAlphaKeyAnimeMax(); - /* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool); - /* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool); - /* 8021764C */ void drawButtonR(u8, u8, bool, bool); - /* 802176EC */ void drawButtonZ(u8); - /* 80217904 */ void drawButton3D(u8); - /* 80217954 */ void drawButtonC(u8, bool); - /* 802179C0 */ void drawButtonS(u8); - /* 80217A10 */ void drawButtonBin(u8); - /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool); - /* 80218238 */ void getButtonCrossParentInitTransY(); - /* 80218254 */ void drawButtonCross(f32, f32); - /* 80218338 */ void setAlphaButtonCrossAnimeMin(); - /* 802183A8 */ void setAlphaButtonCrossAnimeMax(); - /* 80218448 */ void setAlphaButtonCrossItemAnimeMin(); - /* 80218524 */ void setAlphaButtonCrossItemAnimeMax(); - /* 802185E8 */ void setAlphaButtonCrossMapAnimeMin(); - /* 802186C4 */ void setAlphaButtonCrossMapAnimeMax(); - /* 80218788 */ void setAlphaButtonChange(bool); - /* 8021901C */ void setAlphaButtonAnimeMin(); - /* 802190A8 */ void setAlphaButtonAnimeMax(); - /* 80219174 */ void setAlphaButtonAAnimeMin(); - /* 80219258 */ void setAlphaButtonAAnimeMax(); - /* 80219324 */ void setAlphaButtonBAnimeMin(); - /* 80219474 */ void setAlphaButtonBAnimeMax(); - /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool); - /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool); - /* 80219A84 */ void setButtonIconMidonaAlpha(u32); - /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool); - /* 8021A29C */ void getNumberTexture(int); - /* 8021A2F4 */ void getActionString(u8, u8, u8*); - /* 8021A468 */ void changeTextureItemB(u8); - /* 8021A71C */ void changeTextureItemXY(int, u8); - /* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16); - /* 8021AAA4 */ void setAlphaAnimeMax(CPaneMgrAlpha*, s16); - /* 8021AB84 */ void setItemNum(u8, u8, u8); - /* 8021AEC8 */ void drawItemNum(u8, f32); - /* 8021AF78 */ void drawKanteraMeter(u8, f32); - /* 8021B0C8 */ void isButtonVisible(); - /* 8021B104 */ void setItemParamX(u8); - /* 8021B364 */ void setItemParamY(u8); - /* 8021B5B0 */ void setItemParamZ(u8); - /* 8021B810 */ void setItemParamB(u8); - /* 8021BB6C */ void getFishingType(); - /* 8021BBB4 */ void getCanoeFishing(); - /* 8021BC24 */ void getCameraSubject(); - /* 8021BC54 */ void getItemSubject(); - /* 8021BCAC */ void getPlayerSubject(); - /* 8021BCC0 */ void isBButtonShow(bool); - /* 8021BDD0 */ void getButtonTimer(); -}; - struct dKantera_icon_c { /* 801AE938 */ dKantera_icon_c(); /* 801AEB7C */ void setAlphaRate(f32); @@ -221,8 +54,6 @@ struct dItem_data { struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 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); @@ -232,20 +63,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE548 */ void free(void*); -}; - -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct J2DTextBox { - /* 80300658 */ void getStringPtr() const; - /* 8030074C */ void setString(s16, char const*, ...); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index ab01a90614..f19625aff0 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -36,38 +36,6 @@ struct dMsgObject_c { /* 8023822C */ void getStatus(); }; -struct J2DScreen {}; - -struct dMeterMap_c { - /* 8020D49C */ void isEnableDispMap(); - /* 8020D528 */ void getMapDispSizeTypeNo(); - /* 8020D650 */ void isEnableDispMapAndMapDispSizeTypeNo(); - /* 8020D690 */ void getMapDispEdgeBottomY_Layout(); - /* 8020D698 */ void isEventRunCheck(); - /* 8020D72C */ void getMapDispEdgeLeftX_Layout(); - /* 8020D75C */ void getMapDispEdgeTop(); - /* 8020D7E4 */ bool getDispPosInside_OffsetX(); - /* 8020D7EC */ void getDispPosOutSide_OffsetX(); - /* 8020D874 */ void setDispPosInsideFlg_SE_On(); - /* 8020D8BC */ void setDispPosOutsideFlg_SE_On(); - /* 8020D8F8 */ void setMapAlpha(u8); - /* 8020D900 */ void isMapOpenCheck(); - /* 8020D948 */ dMeterMap_c(J2DScreen*); - /* 8020D990 */ ~dMeterMap_c(); - /* 8020D9EC */ void _create(J2DScreen*); - /* 8020DC50 */ void _delete(); - /* 8020DCE4 */ void _move(u32); - /* 8020DF1C */ void _draw(); - /* 8020DF68 */ void draw(); - /* 8020E070 */ void ctrlShowMap(); - /* 8020E45C */ void checkMoveStatus(); - /* 8020E4C8 */ void isShow(u32); - /* 8020E620 */ void isFmapScreen(); - /* 8020E70C */ void isDmapScreen(); - /* 8020E754 */ void meter_map_move(u32); - /* 8020E9CC */ void keyCheck(); -}; - struct dMap_c { /* 80029874 */ dMap_c(int, int, int, int); /* 8002A32C */ void _move(f32, f32, int, f32); @@ -86,8 +54,6 @@ struct dDlst_list_c { struct JAISoundID {}; -struct Vec {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -96,8 +62,6 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct ResTIMG {}; - struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); }; @@ -333,7 +297,7 @@ void dMeterMap_c::setMapAlpha(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMeterMap_c::isMapOpenCheck() { +asm bool dMeterMap_c::isMapOpenCheck() { nofralloc #include "asm/d/meter/d_meter_map/isMapOpenCheck__11dMeterMap_cFv.s" } diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index c677279916..d968dc9a1d 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -50,13 +50,6 @@ struct dPa_wbPcallBack_c { struct JPADrawInfo {}; -struct JPAResourceManager { - /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*); - /* 80273EA8 */ void checkUserIndexDuplication(u16) const; - /* 80273EEC */ void swapTexture(ResTIMG const*, char const*); - /* 80273FCC */ void getResUserWork(u16) const; -}; - struct JGeometry { template struct TVec3 {}; @@ -75,17 +68,6 @@ struct JPAEmitterManager { /* 8027E354 */ void clearResourceManager(u8); }; -struct dPa_simpleEcallBack { - /* 8004ADF4 */ dPa_simpleEcallBack(); - /* 8004AE1C */ void executeAfter(JPABaseEmitter*); - /* 8004AF94 */ void draw(JPABaseEmitter*); - /* 8004AF98 */ void create(JPAEmitterManager*, u16, u8); - /* 8004B064 */ void createEmitter(JPAEmitterManager*); - /* 8004B168 */ void set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, - int, f32); - /* 8004FC08 */ ~dPa_simpleEcallBack(); -}; - struct dPa_simpleData_c { /* 8004B024 */ ~dPa_simpleData_c(); /* 8004B060 */ dPa_simpleData_c(); @@ -205,82 +187,6 @@ struct dPa_followEcallBack { struct cBgS_PolyInfo {}; -struct dPa_control_c { - struct level_c { - struct emitter_c { - /* 8004B504 */ void onActive(); - /* 8004B544 */ void entry(u32, u16, JPABaseEmitter*, dPa_levelEcallBack*); - /* 8004B5AC */ void cleanup(); - /* 8004FBFC */ emitter_c(); - }; - - /* 8004B688 */ level_c(); - /* 8004B7A8 */ void execute(); - /* 8004B6F8 */ void execute(dPa_control_c::level_c::emitter_c*); - /* 8004B808 */ void cleanup(); - /* 8004B874 */ void get(u32); - /* 8004B8B4 */ void forceOnEventMove(u32); - /* 8004B8E8 */ void allForceOnEventMove(); - /* 8004B918 */ void getEmitter(u32); - /* 8004B94C */ void entry(u16, JPABaseEmitter*, dPa_levelEcallBack*); - /* 8004BA40 */ void addTable(dPa_control_c::level_c::emitter_c*); - /* 8004BA74 */ void cutTable(dPa_control_c::level_c::emitter_c*); - }; - - /* 8004BACC */ dPa_control_c(); - /* 8004BB70 */ void getRM_ID(u16); - /* 8004BB78 */ void createCommon(void const*); - /* 8004BCDC */ void createRoomScene(); - /* 8004BDFC */ void readScene(u8, mDoDvdThd_toMainRam_c**); - /* 8004BEB0 */ void createScene(void const*); - /* 8004BF3C */ void removeRoomScene(bool); - /* 8004BFD4 */ void removeScene(bool); - /* 8004C054 */ void cleanup(); - /* 8004C078 */ void calc3D(); - /* 8004C0EC */ void calc2D(); - /* 8004C134 */ void calcMenu(); - /* 8004C188 */ void draw(JPADrawInfo*, u8); - /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); - /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*, - cXyz const*, s8); - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - /* 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); - /* 8004CF90 */ void getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*); - /* 8004D6A4 */ void setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, - csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8, - cXyz const*); - /* 8004D068 */ void setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*, - cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); - /* 8004D128 */ void newSimple(u16, u8, u32*); - /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, - _GXColor const&, int, f32); - /* 8004D23C */ void getSimple(u16); - /* 8004D770 */ void setStopContinue(u32); - /* 8004D7C4 */ void setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, - int, csXyz const*, cXyz const*, dPa_levelEcallBack*, s8, - cXyz const*); - /* 8004D988 */ void setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*, - dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8); - - static u8 mTsubo[64]; - static u8 mLifeBall[24]; - static u8 mWindViewMatrix[48]; - static u8 mEmitterMng[4]; - static u8 mWaterBubblePcallBack[4]; - static u8 mFsenthPcallBack[4]; - static u8 mLight8EcallBack[4]; - static u8 mLight8PcallBack[4]; - static u8 m_b_Light8EcallBack[4]; - static u8 m_b_Light8PcallBack[4]; - static u8 m_d_Light8EcallBack[4]; - static u8 m_d_Light8PcallBack[4]; - static u8 mParticleTracePCB[4 + 4 /* padding */]; -}; - struct dJntCol_c { /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; }; @@ -1628,7 +1534,7 @@ asm void dPa_control_c::level_c::allForceOnEventMove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_control_c::level_c::getEmitter(u32 param_0) { +asm dPa_control_c::level_c::emitter_c* dPa_control_c::level_c::getEmitter(u32 param_0) { nofralloc #include "asm/d/particle/d_particle/getEmitter__Q213dPa_control_c7level_cFUl.s" } @@ -2144,11 +2050,11 @@ static asm void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* param_3, - dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6, - u8 param_7, dPa_levelEcallBack* param_8, s8 param_9, - _GXColor const* param_10, _GXColor const* param_11, - cXyz const* param_12, f32 param_13) { +asm u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* param_3, + dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6, + u8 param_7, dPa_levelEcallBack* param_8, s8 param_9, + _GXColor const* param_10, _GXColor const* param_11, cXyz const* param_12, + f32 param_13) { nofralloc #include "asm/d/particle/d_particle/func_8004D4CC.s" } @@ -2160,10 +2066,10 @@ asm void dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pa #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, - cXyz const* param_3, dKy_tevstr_c const* param_4, - csXyz const* param_5, cXyz const* param_6, int param_7, - dPa_levelEcallBack* param_8, s8 param_9, cXyz const* param_10) { +asm u32 dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, + cXyz const* param_3, dKy_tevstr_c const* param_4, + csXyz const* param_5, cXyz const* param_6, int param_7, + dPa_levelEcallBack* param_8, s8 param_9, cXyz const* param_10) { nofralloc #include "asm/d/particle/d_particle/func_8004D6A4.s" } @@ -2379,7 +2285,8 @@ asm void dPa_particleTracePcallBack_c::execute(JPABaseEmitter* param_0, JPABaseP #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_levelEcallBack::~dPa_levelEcallBack() { +// asm dPa_levelEcallBack::~dPa_levelEcallBack() { +extern "C" asm void __dt__18dPa_levelEcallBackFv() { nofralloc #include "asm/d/particle/d_particle/__dt__18dPa_levelEcallBackFv.s" } @@ -2415,7 +2322,8 @@ asm dPa_control_c::level_c::emitter_c::emitter_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_simpleEcallBack::~dPa_simpleEcallBack() { +// asm dPa_simpleEcallBack::~dPa_simpleEcallBack() { +extern "C" asm void __dt__19dPa_simpleEcallBackFv() { nofralloc #include "asm/d/particle/d_particle/__dt__19dPa_simpleEcallBackFv.s" } @@ -2435,7 +2343,8 @@ asm dPa_particleTracePcallBack_c::~dPa_particleTracePcallBack_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dPa_hermiteEcallBack_c::~dPa_hermiteEcallBack_c() { +// asm dPa_hermiteEcallBack_c::~dPa_hermiteEcallBack_c() { +extern "C" asm void __dt__22dPa_hermiteEcallBack_cFv() { nofralloc #include "asm/d/particle/d_particle/__dt__22dPa_hermiteEcallBack_cFv.s" } @@ -2666,7 +2575,7 @@ asm dPa_setColorEcallBack::~dPa_setColorEcallBack() { /* 80050368-8005036C 04ACA8 0004+00 10/0 0/0 0/0 .text * execute__18JPAEmitterCallBackFP14JPABaseEmitter */ -void JPAEmitterCallBack::execute(JPABaseEmitter* param_0) { +extern "C" void execute__18JPAEmitterCallBackFP14JPABaseEmitter() { /* empty function */ } diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 20ed84ed21..43a7a57c25 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -9,15 +9,7 @@ #include "d/meter/d_meter2_info.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct daObjCarry_c { - /* 80031CF8 */ void clrSaveFlag(); - /* 80031D04 */ void setSaveFlag(); -}; +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" // // Forward References: @@ -1456,11 +1448,11 @@ bool dSv_danBit_c::init(s8 i_stage) { unk28[i] = 0xFFFF; } - clrSaveFlag__12daObjCarry_cFv(); + daObjCarry_c::clrSaveFlag(); return true; } else { - setSaveFlag__12daObjCarry_cFv(); + daObjCarry_c::setSaveFlag(); return false; } } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index adcfc1be3a..866b1d5dd8 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1948,7 +1948,7 @@ asm s32 fopAcM_findObject4EventCB(fopAc_ac_c* param_0, void* param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm s32 fopAcM_searchFromName4Event(char const* param_0, s16 param_1) { +asm fopAc_ac_c* fopAcM_searchFromName4Event(char const* param_0, s16 param_1) { nofralloc #include "asm/f_op/f_op_actor_mng/fopAcM_searchFromName4Event__FPCcs.s" } diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index ec8875c295..9cf71a65d8 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -373,7 +373,7 @@ asm void J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void fopMsgM_createExpHeap(u32 param_0, JKRHeap* param_1) { +asm JKRExpHeap* fopMsgM_createExpHeap(u32 param_0, JKRHeap* param_1) { nofralloc #include "asm/f_op/f_op_msg_mng/fopMsgM_createExpHeap__FUlP7JKRHeap.s" } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 0e6f5a4dde..e850d25c3e 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -18,25 +18,6 @@ // Types: // -struct mDoExt_morf_c { - /* 8000F950 */ mDoExt_morf_c(); - /* 8000FAE8 */ ~mDoExt_morf_c(); - /* 8000FB7C */ void setMorf(f32); - /* 8000FBC0 */ void frameUpdate(); -}; - -struct mDoExt_invisibleModel { - /* 8000E53C */ void create(J3DModel*, u8); - /* 8000E6C8 */ void entryJoint(cXyz*); - /* 8000E7C0 */ void entryDL(cXyz*); -}; - -struct mDoExt_invJntPacket { - /* 8000E5F8 */ ~mDoExt_invJntPacket(); - /* 8000E654 */ mDoExt_invJntPacket(); - /* 80012220 */ void draw(); -}; - struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -46,11 +27,6 @@ struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; -struct mDoExt_MtxCalcOldFrame { - /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); - /* 8000F8CC */ void decOldFrameMorfCounter(); -}; - struct mDoExt_MtxCalcAnmBlendTblOld { /* 8000F4B0 */ void calc(); /* 80014EB0 */ ~mDoExt_MtxCalcAnmBlendTblOld(); @@ -203,12 +179,6 @@ struct JUTCacheFont { /* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*); }; -struct J3DMtxCalcNoAnmBase { - /* 8000FA8C */ ~J3DMtxCalcNoAnmBase(); -}; - -template -struct J3DMtxCalcNoAnm {}; /* J3DMtxCalcNoAnm */ struct J3DMtxCalcNoAnm__template0 { /* 8000FA20 */ void func_8000FA20(void* _this); @@ -2518,7 +2488,8 @@ extern "C" asm void func_8000FA20(void* _this) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DMtxCalcNoAnmBase::~J3DMtxCalcNoAnmBase() { +// asm J3DMtxCalcNoAnmBase::~J3DMtxCalcNoAnmBase() { +extern "C" asm void __dt__19J3DMtxCalcNoAnmBaseFv() { nofralloc #include "asm/m_Do/m_Do_ext/__dt__19J3DMtxCalcNoAnmBaseFv.s" } @@ -2528,7 +2499,8 @@ asm J3DMtxCalcNoAnmBase::~J3DMtxCalcNoAnmBase() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm mDoExt_morf_c::~mDoExt_morf_c() { +// asm mDoExt_morf_c::~mDoExt_morf_c() { +extern "C" asm void __dt__13mDoExt_morf_cFv() { nofralloc #include "asm/m_Do/m_Do_ext/__dt__13mDoExt_morf_cFv.s" } @@ -2920,7 +2892,8 @@ asm void mDoExt_McaMorf2::stopZelAnime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_invJntPacket::draw() { +// asm void mDoExt_invJntPacket::draw() { +extern "C" asm void draw__19mDoExt_invJntPacketFv() { nofralloc #include "asm/m_Do/m_Do_ext/draw__19mDoExt_invJntPacketFv.s" }