diff --git a/Progress.md b/Progress.md index e572d9cb90..5141c89194 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 25.184399% | 905768 | 3596544 +.text | 25.561317% | 919324 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 33.071686% | 1329704 | 4020672 +Total | 33.408843% | 1343260 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 33.071686% | 1329704 | 4020672 +main.dol | 33.408843% | 1343260 | 4020672 RELs | 33.385425% | 3839432 | 11500324 -Total | 33.304151% | 5169136 | 15520996 +Total | 33.391491% | 5182692 | 15520996 ## RELs diff --git a/asm/d/a/d_a_alink/cancelItemUseQuake__9daAlink_cFi.s b/asm/d/a/d_a_alink/cancelItemUseQuake__9daAlink_cFi.s deleted file mode 100644 index 5b5c5ecc40..0000000000 --- a/asm/d/a/d_a_alink/cancelItemUseQuake__9daAlink_cFi.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800B7190: -/* 800B7190 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B7194 7C 08 02 A6 */ mflr r0 -/* 800B7198 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B719C 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800B71A0 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 800B71A4 41 82 00 38 */ beq lbl_800B71DC -/* 800B71A8 2C 04 00 00 */ cmpwi r4, 0 -/* 800B71AC 40 82 00 10 */ bne lbl_800B71BC -/* 800B71B0 A0 03 2F E8 */ lhz r0, 0x2fe8(r3) -/* 800B71B4 28 00 00 C6 */ cmplwi r0, 0xc6 -/* 800B71B8 41 82 00 24 */ beq lbl_800B71DC -lbl_800B71BC: -/* 800B71BC 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800B71C0 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 800B71C4 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800B71C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B71CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B71D0 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800B71D4 38 80 00 1F */ li r4, 0x1f -/* 800B71D8 4B FB 8B BD */ bl StopQuake__12dVibration_cFi -lbl_800B71DC: -/* 800B71DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B71E0 7C 08 03 A6 */ mtlr r0 -/* 800B71E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B71E8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkAtnWaitAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkAtnWaitAnime__9daAlink_cFv.s deleted file mode 100644 index e746c3d40d..0000000000 --- a/asm/d/a/d_a_alink/checkAtnWaitAnime__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800B32B0: -/* 800B32B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B32B4 7C 08 02 A6 */ mflr r0 -/* 800B32B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B32BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B32C0 7C 7F 1B 78 */ mr r31, r3 -/* 800B32C4 80 63 27 EC */ lwz r3, 0x27ec(r3) -/* 800B32C8 28 03 00 00 */ cmplwi r3, 0 -/* 800B32CC 41 82 00 3C */ beq lbl_800B3308 -/* 800B32D0 48 02 92 79 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c -/* 800B32D4 2C 03 00 00 */ cmpwi r3, 0 -/* 800B32D8 40 82 00 60 */ bne lbl_800B3338 -/* 800B32DC 7F E3 FB 78 */ mr r3, r31 -/* 800B32E0 80 9F 27 EC */ lwz r4, 0x27ec(r31) -/* 800B32E4 48 03 4F CD */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c -/* 800B32E8 2C 03 00 00 */ cmpwi r3, 0 -/* 800B32EC 40 82 00 4C */ bne lbl_800B3338 -/* 800B32F0 80 7F 27 EC */ lwz r3, 0x27ec(r31) -/* 800B32F4 A8 03 00 08 */ lha r0, 8(r3) -/* 800B32F8 2C 00 02 F4 */ cmpwi r0, 0x2f4 -/* 800B32FC 41 82 00 3C */ beq lbl_800B3338 -/* 800B3300 2C 00 00 FE */ cmpwi r0, 0xfe -/* 800B3304 41 82 00 34 */ beq lbl_800B3338 -lbl_800B3308: -/* 800B3308 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800B330C 28 00 01 6C */ cmplwi r0, 0x16c -/* 800B3310 41 82 00 28 */ beq lbl_800B3338 -/* 800B3314 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 800B3318 28 00 00 50 */ cmplwi r0, 0x50 -/* 800B331C 41 82 00 1C */ beq lbl_800B3338 -/* 800B3320 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800B3324 28 00 00 17 */ cmplwi r0, 0x17 -/* 800B3328 41 82 00 10 */ beq lbl_800B3338 -/* 800B332C 88 1F 05 6A */ lbz r0, 0x56a(r31) -/* 800B3330 28 00 00 2A */ cmplwi r0, 0x2a -/* 800B3334 40 82 00 0C */ bne lbl_800B3340 -lbl_800B3338: -/* 800B3338 38 60 00 01 */ li r3, 1 -/* 800B333C 48 00 00 08 */ b lbl_800B3344 -lbl_800B3340: -/* 800B3340 38 60 00 00 */ li r3, 0 -lbl_800B3344: -/* 800B3344 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B3348 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B334C 7C 08 03 A6 */ mtlr r0 -/* 800B3350 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B3354 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s b/asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s deleted file mode 100644 index df043239df..0000000000 --- a/asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800D7A98: -/* 800D7A98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800D7A9C 7C 08 02 A6 */ mflr r0 -/* 800D7AA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D7AA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800D7AA8 93 C1 00 08 */ stw r30, 8(r1) -/* 800D7AAC 7C 9E 23 78 */ mr r30, r4 -/* 800D7AB0 7C BF 2B 78 */ mr r31, r5 -/* 800D7AB4 7F C3 F3 78 */ mr r3, r30 -/* 800D7AB8 4B FA C8 09 */ bl ChkAtHit__12dCcD_GObjInfFv -/* 800D7ABC 28 03 00 00 */ cmplwi r3, 0 -/* 800D7AC0 41 82 00 3C */ beq lbl_800D7AFC -/* 800D7AC4 7F C3 F3 78 */ mr r3, r30 -/* 800D7AC8 4B FA C8 E1 */ bl GetAtHitGObj__12dCcD_GObjInfFv -/* 800D7ACC 28 03 00 00 */ cmplwi r3, 0 -/* 800D7AD0 41 82 00 2C */ beq lbl_800D7AFC -/* 800D7AD4 7F C3 F3 78 */ mr r3, r30 -/* 800D7AD8 4B FA C8 D1 */ bl GetAtHitGObj__12dCcD_GObjInfFv -/* 800D7ADC 88 03 00 BB */ lbz r0, 0xbb(r3) -/* 800D7AE0 2C 00 00 01 */ cmpwi r0, 1 -/* 800D7AE4 40 82 00 18 */ bne lbl_800D7AFC -/* 800D7AE8 38 7E 00 58 */ addi r3, r30, 0x58 -/* 800D7AEC 4B FA BB 9D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv -/* 800D7AF0 90 7F 00 00 */ stw r3, 0(r31) -/* 800D7AF4 38 60 00 01 */ li r3, 1 -/* 800D7AF8 48 00 00 08 */ b lbl_800D7B00 -lbl_800D7AFC: -/* 800D7AFC 38 60 00 00 */ li r3, 0 -lbl_800D7B00: -/* 800D7B00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800D7B04 83 C1 00 08 */ lwz r30, 8(r1) -/* 800D7B08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800D7B0C 7C 08 03 A6 */ mtlr r0 -/* 800D7B10 38 21 00 10 */ addi r1, r1, 0x10 -/* 800D7B14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s b/asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s deleted file mode 100644 index 1c28d79cd3..0000000000 --- a/asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8011E3D8: -/* 8011E3D8 38 A0 00 01 */ li r5, 1 -/* 8011E3DC 7C A6 2B 78 */ mr r6, r5 -/* 8011E3E0 7C A7 2B 78 */ mr r7, r5 -/* 8011E3E4 7C A8 2B 78 */ mr r8, r5 -/* 8011E3E8 38 03 FF 80 */ addi r0, r3, -128 -/* 8011E3EC 38 80 FF FF */ li r4, -1 -/* 8011E3F0 7C 00 28 10 */ subfc r0, r0, r5 -/* 8011E3F4 7C 04 01 90 */ subfze r0, r4 -/* 8011E3F8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8011E3FC 40 82 00 08 */ bne lbl_8011E404 -/* 8011E400 39 00 00 00 */ li r8, 0 -lbl_8011E404: -/* 8011E404 55 00 06 3F */ clrlwi. r0, r8, 0x18 -/* 8011E408 40 82 00 10 */ bne lbl_8011E418 -/* 8011E40C 2C 03 00 90 */ cmpwi r3, 0x90 -/* 8011E410 41 82 00 08 */ beq lbl_8011E418 -/* 8011E414 38 E0 00 00 */ li r7, 0 -lbl_8011E418: -/* 8011E418 54 E0 06 3F */ clrlwi. r0, r7, 0x18 -/* 8011E41C 40 82 00 10 */ bne lbl_8011E42C -/* 8011E420 2C 03 00 2D */ cmpwi r3, 0x2d -/* 8011E424 41 82 00 08 */ beq lbl_8011E42C -/* 8011E428 38 C0 00 00 */ li r6, 0 -lbl_8011E42C: -/* 8011E42C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 -/* 8011E430 40 82 00 10 */ bne lbl_8011E440 -/* 8011E434 2C 03 00 91 */ cmpwi r3, 0x91 -/* 8011E438 41 82 00 08 */ beq lbl_8011E440 -/* 8011E43C 38 A0 00 00 */ li r5, 0 -lbl_8011E440: -/* 8011E440 54 A3 06 3E */ clrlwi r3, r5, 0x18 -/* 8011E444 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s b/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s deleted file mode 100644 index 3bbf435584..0000000000 --- a/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_800F89E0: -/* 800F89E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F89E4 7C 08 02 A6 */ mflr r0 -/* 800F89E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F89EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F89F0 7C 7F 1B 78 */ mr r31, r3 -/* 800F89F4 C0 04 00 00 */ lfs f0, 0(r4) -/* 800F89F8 D0 03 1D 98 */ stfs f0, 0x1d98(r3) -/* 800F89FC C0 04 00 04 */ lfs f0, 4(r4) -/* 800F8A00 D0 03 1D 9C */ stfs f0, 0x1d9c(r3) -/* 800F8A04 C0 04 00 08 */ lfs f0, 8(r4) -/* 800F8A08 D0 03 1D A0 */ stfs f0, 0x1da0(r3) -/* 800F8A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F8A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F8A14 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800F8A18 38 9F 1D 5C */ addi r4, r31, 0x1d5c -/* 800F8A1C 4B F7 CA 81 */ bl RoofChk__4dBgSFP12dBgS_RoofChk -/* 800F8A20 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 800F8A24 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800F8A28 C0 1F 05 98 */ lfs f0, 0x598(r31) -/* 800F8A2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F8A30 4C 40 13 82 */ cror 2, 0, 2 -/* 800F8A34 7C 00 00 26 */ mfcr r0 -/* 800F8A38 54 03 1F FE */ rlwinm r3, r0, 3, 0x1f, 0x1f -/* 800F8A3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F8A40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F8A44 7C 08 03 A6 */ mtlr r0 -/* 800F8A48 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F8A4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s b/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s deleted file mode 100644 index 1b778b0880..0000000000 --- a/asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_800F8A50: -/* 800F8A50 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800F8A54 7C 08 02 A6 */ mflr r0 -/* 800F8A58 90 01 00 44 */ stw r0, 0x44(r1) -/* 800F8A5C 39 61 00 40 */ addi r11, r1, 0x40 -/* 800F8A60 48 26 97 7D */ bl _savegpr_29 -/* 800F8A64 7C 7D 1B 78 */ mr r29, r3 -/* 800F8A68 7C 9E 23 78 */ mr r30, r4 -/* 800F8A6C 7C BF 2B 78 */ mr r31, r5 -/* 800F8A70 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F8A74 48 16 E0 71 */ bl __pl__4cXyzCFRC3Vec -/* 800F8A78 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800F8A7C D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800F8A80 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 800F8A84 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800F8A88 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 800F8A8C D0 01 00 28 */ stfs f0, 0x28(r1) -/* 800F8A90 7F A3 EB 78 */ mr r3, r29 -/* 800F8A94 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8A98 4B FF FF 49 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz -/* 800F8A9C 2C 03 00 00 */ cmpwi r3, 0 -/* 800F8AA0 41 82 00 0C */ beq lbl_800F8AAC -/* 800F8AA4 38 60 00 01 */ li r3, 1 -/* 800F8AA8 48 00 00 40 */ b lbl_800F8AE8 -lbl_800F8AAC: -/* 800F8AAC 38 61 00 08 */ addi r3, r1, 8 -/* 800F8AB0 7F C4 F3 78 */ mr r4, r30 -/* 800F8AB4 7F E5 FB 78 */ mr r5, r31 -/* 800F8AB8 48 16 E0 7D */ bl __mi__4cXyzCFRC3Vec -/* 800F8ABC C0 01 00 08 */ lfs f0, 8(r1) -/* 800F8AC0 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800F8AC4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800F8AC8 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800F8ACC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800F8AD0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 800F8AD4 7F A3 EB 78 */ mr r3, r29 -/* 800F8AD8 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8ADC 4B FF FF 05 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz -/* 800F8AE0 30 03 FF FF */ addic r0, r3, -1 -/* 800F8AE4 7C 60 19 10 */ subfe r3, r0, r3 -lbl_800F8AE8: -/* 800F8AE8 39 61 00 40 */ addi r11, r1, 0x40 -/* 800F8AEC 48 26 97 3D */ bl _restgpr_29 -/* 800F8AF0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800F8AF4 7C 08 03 A6 */ mtlr r0 -/* 800F8AF8 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F8AFC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkRestHPAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkRestHPAnime__9daAlink_cFv.s deleted file mode 100644 index 0918a5c484..0000000000 --- a/asm/d/a/d_a_alink/checkRestHPAnime__9daAlink_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_800B33E4: -/* 800B33E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B33E8 7C 08 02 A6 */ mflr r0 -/* 800B33EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B33F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B33F4 7C 7F 1B 78 */ mr r31, r3 -/* 800B33F8 81 83 06 28 */ lwz r12, 0x628(r3) -/* 800B33FC 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 800B3400 7D 89 03 A6 */ mtctr r12 -/* 800B3404 4E 80 04 21 */ bctrl -/* 800B3408 2C 03 00 00 */ cmpwi r3, 0 -/* 800B340C 40 82 00 70 */ bne lbl_800B347C -/* 800B3410 7F E3 FB 78 */ mr r3, r31 -/* 800B3414 48 00 5E 41 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 800B3418 2C 03 00 00 */ cmpwi r3, 0 -/* 800B341C 40 82 00 10 */ bne lbl_800B342C -/* 800B3420 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) -/* 800B3424 28 00 02 63 */ cmplwi r0, 0x263 -/* 800B3428 40 82 00 54 */ bne lbl_800B347C -lbl_800B342C: -/* 800B342C 80 1F 27 EC */ lwz r0, 0x27ec(r31) -/* 800B3430 28 00 00 00 */ cmplwi r0, 0 -/* 800B3434 40 82 00 48 */ bne lbl_800B347C -/* 800B3438 7F E3 FB 78 */ mr r3, r31 -/* 800B343C 4B FF 45 15 */ bl checkWindSpeedOnAngle__9daAlink_cCFv -/* 800B3440 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800B3444 40 82 00 38 */ bne lbl_800B347C -/* 800B3448 A0 1F 06 04 */ lhz r0, 0x604(r31) -/* 800B344C 2C 00 00 00 */ cmpwi r0, 0 -/* 800B3450 40 82 00 18 */ bne lbl_800B3468 -/* 800B3454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800B3458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800B345C A0 03 00 02 */ lhz r0, 2(r3) -/* 800B3460 28 00 00 04 */ cmplwi r0, 4 -/* 800B3464 40 81 00 10 */ ble lbl_800B3474 -lbl_800B3468: -/* 800B3468 80 1F 06 14 */ lwz r0, 0x614(r31) -/* 800B346C 28 00 00 12 */ cmplwi r0, 0x12 -/* 800B3470 40 82 00 0C */ bne lbl_800B347C -lbl_800B3474: -/* 800B3474 38 60 00 01 */ li r3, 1 -/* 800B3478 48 00 00 08 */ b lbl_800B3480 -lbl_800B347C: -/* 800B347C 38 60 00 00 */ li r3, 0 -lbl_800B3480: -/* 800B3480 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B3484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B3488 7C 08 03 A6 */ mtlr r0 -/* 800B348C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B3490 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s b/asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s deleted file mode 100644 index 92fb9d97b8..0000000000 --- a/asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8011A6FC: -/* 8011A6FC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011A700 7C 08 02 A6 */ mflr r0 -/* 8011A704 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011A708 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011A70C 93 C1 00 08 */ stw r30, 8(r1) -/* 8011A710 7C 9E 23 78 */ mr r30, r4 -/* 8011A714 2C 1E 00 ED */ cmpwi r30, 0xed -/* 8011A718 40 82 00 08 */ bne lbl_8011A720 -/* 8011A71C 3B C0 00 05 */ li r30, 5 -lbl_8011A720: -/* 8011A720 34 1E FF FC */ addic. r0, r30, -4 -/* 8011A724 41 80 00 10 */ blt lbl_8011A734 -/* 8011A728 38 1E FF FC */ addi r0, r30, -4 -/* 8011A72C 2C 00 00 04 */ cmpwi r0, 4 -/* 8011A730 41 80 00 0C */ blt lbl_8011A73C -lbl_8011A734: -/* 8011A734 38 60 00 00 */ li r3, 0 -/* 8011A738 48 00 00 48 */ b lbl_8011A780 -lbl_8011A73C: -/* 8011A73C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011A740 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011A744 A3 E3 00 04 */ lhz r31, 4(r3) -/* 8011A748 4B F1 83 61 */ bl getRupeeMax__21dSv_player_status_a_cCFv -/* 8011A74C 54 65 04 3E */ clrlwi r5, r3, 0x10 -/* 8011A750 38 1E FF FC */ addi r0, r30, -4 -/* 8011A754 54 00 10 3A */ slwi r0, r0, 2 -/* 8011A758 3C 60 80 39 */ lis r3, rupeeCount@ha /* 0x80391B7C@ha */ -/* 8011A75C 38 63 1B 7C */ addi r3, r3, rupeeCount@l /* 0x80391B7C@l */ -/* 8011A760 7C 63 00 2E */ lwzx r3, r3, r0 -/* 8011A764 57 E0 04 3E */ clrlwi r0, r31, 0x10 -/* 8011A768 7C 83 02 14 */ add r4, r3, r0 -/* 8011A76C 7C 80 2A 78 */ xor r0, r4, r5 -/* 8011A770 7C 03 0E 70 */ srawi r3, r0, 1 -/* 8011A774 7C 00 20 38 */ and r0, r0, r4 -/* 8011A778 7C 00 18 50 */ subf r0, r0, r3 -/* 8011A77C 54 03 0F FE */ srwi r3, r0, 0x1f -lbl_8011A780: -/* 8011A780 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011A784 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011A788 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011A78C 7C 08 03 A6 */ mtlr r0 -/* 8011A790 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A794 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkWindSpeedOnAngleAnime__9daAlink_cCFi.s b/asm/d/a/d_a_alink/checkWindSpeedOnAngleAnime__9daAlink_cCFi.s deleted file mode 100644 index 8c5ce249de..0000000000 --- a/asm/d/a/d_a_alink/checkWindSpeedOnAngleAnime__9daAlink_cCFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800A79EC: -/* 800A79EC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800A79F0 7C 08 02 A6 */ mflr r0 -/* 800A79F4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800A79F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A79FC 48 2B A7 E1 */ bl _savegpr_29 -/* 800A7A00 7C 7D 1B 78 */ mr r29, r3 -/* 800A7A04 7C 9E 23 78 */ mr r30, r4 -/* 800A7A08 3B E0 00 00 */ li r31, 0 -/* 800A7A0C 4B FF FF 45 */ bl checkWindSpeedOnAngle__9daAlink_cCFv -/* 800A7A10 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800A7A14 41 82 00 2C */ beq lbl_800A7A40 -/* 800A7A18 88 1D 2F 8C */ lbz r0, 0x2f8c(r29) -/* 800A7A1C 28 00 00 01 */ cmplwi r0, 1 -/* 800A7A20 41 82 00 1C */ beq lbl_800A7A3C -/* 800A7A24 28 00 00 03 */ cmplwi r0, 3 -/* 800A7A28 41 82 00 14 */ beq lbl_800A7A3C -/* 800A7A2C 2C 1E 00 00 */ cmpwi r30, 0 -/* 800A7A30 41 82 00 10 */ beq lbl_800A7A40 -/* 800A7A34 28 00 00 02 */ cmplwi r0, 2 -/* 800A7A38 40 82 00 08 */ bne lbl_800A7A40 -lbl_800A7A3C: -/* 800A7A3C 3B E0 00 01 */ li r31, 1 -lbl_800A7A40: -/* 800A7A40 7F E3 FB 78 */ mr r3, r31 -/* 800A7A44 39 61 00 20 */ addi r11, r1, 0x20 -/* 800A7A48 48 2B A7 E1 */ bl _restgpr_29 -/* 800A7A4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800A7A50 7C 08 03 A6 */ mtlr r0 -/* 800A7A54 38 21 00 20 */ addi r1, r1, 0x20 -/* 800A7A58 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s b/asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s deleted file mode 100644 index 6fcc826181..0000000000 --- a/asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s +++ /dev/null @@ -1,85 +0,0 @@ -lbl_800F85C0: -/* 800F85C0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 800F85C4 7C 08 02 A6 */ mflr r0 -/* 800F85C8 90 01 00 54 */ stw r0, 0x54(r1) -/* 800F85CC DB E1 00 48 */ stfd f31, 0x48(r1) -/* 800F85D0 39 61 00 48 */ addi r11, r1, 0x48 -/* 800F85D4 48 26 9C 05 */ bl _savegpr_28 -/* 800F85D8 7C 7C 1B 78 */ mr r28, r3 -/* 800F85DC 7C 9F 23 78 */ mr r31, r4 -/* 800F85E0 7C BD 2B 78 */ mr r29, r5 -/* 800F85E4 7C DE 33 78 */ mr r30, r6 -/* 800F85E8 80 63 06 50 */ lwz r3, 0x650(r3) -/* 800F85EC 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F85F0 3C 80 80 39 */ lis r4, l_crawlTopOffset@ha /* 0x8038FA6C@ha */ -/* 800F85F4 38 84 FA 6C */ addi r4, r4, l_crawlTopOffset@l /* 0x8038FA6C@l */ -/* 800F85F8 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F85FC 48 24 E7 71 */ bl PSMTXMultVec -/* 800F8600 7F 83 E3 78 */ mr r3, r28 -/* 800F8604 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8608 7F E5 FB 78 */ mr r5, r31 -/* 800F860C 38 C1 00 14 */ addi r6, r1, 0x14 -/* 800F8610 38 E0 00 01 */ li r7, 1 -/* 800F8614 7F C8 F3 78 */ mr r8, r30 -/* 800F8618 39 20 00 00 */ li r9, 0 -/* 800F861C 4B FF FB A5 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc -/* 800F8620 7C 7F 1B 78 */ mr r31, r3 -/* 800F8624 80 7C 06 50 */ lwz r3, 0x650(r28) -/* 800F8628 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F862C 3C 80 80 39 */ lis r4, l_crawlTopUpOffset@ha /* 0x8038FAC0@ha */ -/* 800F8630 38 84 FA C0 */ addi r4, r4, l_crawlTopUpOffset@l /* 0x8038FAC0@l */ -/* 800F8634 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F8638 48 24 E7 35 */ bl PSMTXMultVec -/* 800F863C 7F 83 E3 78 */ mr r3, r28 -/* 800F8640 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8644 7F A5 EB 78 */ mr r5, r29 -/* 800F8648 38 C1 00 08 */ addi r6, r1, 8 -/* 800F864C 38 E0 00 01 */ li r7, 1 -/* 800F8650 7F C8 F3 78 */ mr r8, r30 -/* 800F8654 39 20 00 00 */ li r9, 0 -/* 800F8658 4B FF FB 69 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc -/* 800F865C 2C 1F 00 00 */ cmpwi r31, 0 -/* 800F8660 41 82 00 50 */ beq lbl_800F86B0 -/* 800F8664 2C 03 00 00 */ cmpwi r3, 0 -/* 800F8668 41 82 00 48 */ beq lbl_800F86B0 -/* 800F866C 38 61 00 08 */ addi r3, r1, 8 -/* 800F8670 48 24 EA C9 */ bl PSVECSquareMag -/* 800F8674 FF E0 08 90 */ fmr f31, f1 -/* 800F8678 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F867C 48 24 EA BD */ bl PSVECSquareMag -/* 800F8680 FC 01 F8 40 */ fcmpo cr0, f1, f31 -/* 800F8684 40 81 00 18 */ ble lbl_800F869C -/* 800F8688 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 800F868C 38 81 00 14 */ addi r4, r1, 0x14 -/* 800F8690 7C 65 1B 78 */ mr r5, r3 -/* 800F8694 48 24 EA 21 */ bl PSVECSubtract -/* 800F8698 48 00 00 4C */ b lbl_800F86E4 -lbl_800F869C: -/* 800F869C 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 800F86A0 38 81 00 08 */ addi r4, r1, 8 -/* 800F86A4 7C 65 1B 78 */ mr r5, r3 -/* 800F86A8 48 24 EA 0D */ bl PSVECSubtract -/* 800F86AC 48 00 00 38 */ b lbl_800F86E4 -lbl_800F86B0: -/* 800F86B0 2C 1F 00 00 */ cmpwi r31, 0 -/* 800F86B4 41 82 00 18 */ beq lbl_800F86CC -/* 800F86B8 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 800F86BC 38 81 00 14 */ addi r4, r1, 0x14 -/* 800F86C0 7C 65 1B 78 */ mr r5, r3 -/* 800F86C4 48 24 E9 F1 */ bl PSVECSubtract -/* 800F86C8 48 00 00 1C */ b lbl_800F86E4 -lbl_800F86CC: -/* 800F86CC 2C 03 00 00 */ cmpwi r3, 0 -/* 800F86D0 41 82 00 14 */ beq lbl_800F86E4 -/* 800F86D4 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 800F86D8 38 81 00 08 */ addi r4, r1, 8 -/* 800F86DC 7C 65 1B 78 */ mr r5, r3 -/* 800F86E0 48 24 E9 D5 */ bl PSVECSubtract -lbl_800F86E4: -/* 800F86E4 CB E1 00 48 */ lfd f31, 0x48(r1) -/* 800F86E8 39 61 00 48 */ addi r11, r1, 0x48 -/* 800F86EC 48 26 9B 39 */ bl _restgpr_28 -/* 800F86F0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 800F86F4 7C 08 03 A6 */ mtlr r0 -/* 800F86F8 38 21 00 50 */ addi r1, r1, 0x50 -/* 800F86FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s deleted file mode 100644 index fd0350821a..0000000000 --- a/asm/d/a/d_a_alink/daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8009D8B8: -/* 8009D8B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009D8BC 7C 08 02 A6 */ mflr r0 -/* 8009D8C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009D8C4 7C 80 23 78 */ mr r0, r4 -/* 8009D8C8 7C A4 2B 78 */ mr r4, r5 -/* 8009D8CC 7C 05 03 78 */ mr r5, r0 -/* 8009D8D0 48 00 02 95 */ bl coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf -/* 8009D8D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009D8D8 7C 08 03 A6 */ mtlr r0 -/* 8009D8DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009D8E0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_headModelCallBack__FP8J3DJointi.s b/asm/d/a/d_a_alink/daAlink_headModelCallBack__FP8J3DJointi.s deleted file mode 100644 index c03f7cc5d4..0000000000 --- a/asm/d/a/d_a_alink/daAlink_headModelCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8009EF38: -/* 8009EF38 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009EF3C 7C 08 02 A6 */ mflr r0 -/* 8009EF40 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009EF44 A0 03 00 14 */ lhz r0, 0x14(r3) -/* 8009EF48 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8009EF4C 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8009EF50 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8009EF54 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8009EF58 2C 04 00 00 */ cmpwi r4, 0 -/* 8009EF5C 40 82 00 0C */ bne lbl_8009EF68 -/* 8009EF60 7C 04 03 78 */ mr r4, r0 -/* 8009EF64 4B FF FD 3D */ bl headModelCallBack__9daAlink_cFi -lbl_8009EF68: -/* 8009EF68 38 60 00 01 */ li r3, 1 -/* 8009EF6C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009EF70 7C 08 03 A6 */ mtlr r0 -/* 8009EF74 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009EF78 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s b/asm/d/a/d_a_alink/daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s deleted file mode 100644 index 52a07cce2d..0000000000 --- a/asm/d/a/d_a_alink/daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8009D88C: -/* 8009D88C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009D890 7C 08 02 A6 */ mflr r0 -/* 8009D894 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009D898 7C 80 23 78 */ mr r0, r4 -/* 8009D89C 7C A4 2B 78 */ mr r4, r5 -/* 8009D8A0 7C 05 03 78 */ mr r5, r0 -/* 8009D8A4 48 00 01 F5 */ bl tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf -/* 8009D8A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009D8AC 7C 08 03 A6 */ mtlr r0 -/* 8009D8B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009D8B4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/daAlink_wolfModelCallBack__FP8J3DJointi.s b/asm/d/a/d_a_alink/daAlink_wolfModelCallBack__FP8J3DJointi.s deleted file mode 100644 index f8f278d00b..0000000000 --- a/asm/d/a/d_a_alink/daAlink_wolfModelCallBack__FP8J3DJointi.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8009EFF0: -/* 8009EFF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009EFF4 7C 08 02 A6 */ mflr r0 -/* 8009EFF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009EFFC A0 03 00 14 */ lhz r0, 0x14(r3) -/* 8009F000 3C 60 80 43 */ lis r3, j3dSys@ha /* 0x80434AC8@ha */ -/* 8009F004 38 63 4A C8 */ addi r3, r3, j3dSys@l /* 0x80434AC8@l */ -/* 8009F008 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8009F00C 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8009F010 2C 04 00 00 */ cmpwi r4, 0 -/* 8009F014 40 82 00 0C */ bne lbl_8009F020 -/* 8009F018 7C 04 03 78 */ mr r4, r0 -/* 8009F01C 4B FF FF 61 */ bl wolfModelCallBack__9daAlink_cFi -lbl_8009F020: -/* 8009F020 38 60 00 01 */ li r3, 1 -/* 8009F024 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009F028 7C 08 03 A6 */ mtlr r0 -/* 8009F02C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009F030 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s b/asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s deleted file mode 100644 index 5bb0d22d87..0000000000 --- a/asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800F88F8: -/* 800F88F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F88FC 7C 08 02 A6 */ mflr r0 -/* 800F8900 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F8904 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F8908 93 C1 00 08 */ stw r30, 8(r1) -/* 800F890C 7C 7E 1B 78 */ mr r30, r3 -/* 800F8910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F8914 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F8918 3B E4 5D 7C */ addi r31, r4, 0x5d7c -/* 800F891C 80 03 31 7C */ lwz r0, 0x317c(r3) -/* 800F8920 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 800F8924 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 800F8928 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 800F892C 41 82 00 3C */ beq lbl_800F8968 -/* 800F8930 38 80 00 01 */ li r4, 1 -/* 800F8934 4B FD 62 A5 */ bl checkSubjectEnd__9daAlink_cFi -/* 800F8938 2C 03 00 00 */ cmpwi r3, 0 -/* 800F893C 40 82 00 14 */ bne lbl_800F8950 -/* 800F8940 C0 3E 33 B4 */ lfs f1, 0x33b4(r30) -/* 800F8944 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800F8948 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F894C 40 81 00 7C */ ble lbl_800F89C8 -lbl_800F8950: -/* 800F8950 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F8954 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F8958 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 800F895C 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 -/* 800F8960 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 800F8964 48 00 00 64 */ b lbl_800F89C8 -lbl_800F8968: -/* 800F8968 48 08 8C D9 */ bl dCam_getBody__Fv -/* 800F896C 38 80 00 04 */ li r4, 4 -/* 800F8970 48 06 8B 85 */ bl ChangeModeOK__9dCamera_cFl -/* 800F8974 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F8978 41 82 00 50 */ beq lbl_800F89C8 -/* 800F897C C0 3E 33 B4 */ lfs f1, 0x33b4(r30) -/* 800F8980 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800F8984 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F8988 4C 40 13 82 */ cror 2, 0, 2 -/* 800F898C 40 82 00 3C */ bne lbl_800F89C8 -/* 800F8990 80 1E 05 80 */ lwz r0, 0x580(r30) -/* 800F8994 64 00 04 00 */ oris r0, r0, 0x400 -/* 800F8998 90 1E 05 80 */ stw r0, 0x580(r30) -/* 800F899C 80 1E 31 7C */ lwz r0, 0x317c(r30) -/* 800F89A0 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 800F89A4 7C 1F 00 2E */ lwzx r0, r31, r0 -/* 800F89A8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 -/* 800F89AC 41 82 00 1C */ beq lbl_800F89C8 -/* 800F89B0 7F C3 F3 78 */ mr r3, r30 -/* 800F89B4 48 01 D2 6D */ bl checkEventRun__9daAlink_cCFv -/* 800F89B8 2C 03 00 00 */ cmpwi r3, 0 -/* 800F89BC 40 82 00 0C */ bne lbl_800F89C8 -/* 800F89C0 7F C3 F3 78 */ mr r3, r30 -/* 800F89C4 4B FD 61 31 */ bl setSubjectMode__9daAlink_cFv -lbl_800F89C8: -/* 800F89C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F89CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F89D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F89D4 7C 08 03 A6 */ mtlr r0 -/* 800F89D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F89DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s deleted file mode 100644 index 4603d3802c..0000000000 --- a/asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_800F7C50: -/* 800F7C50 3C 80 80 39 */ lis r4, m__20daAlinkHIO_crouch_c0@ha /* 0x8038E01C@ha */ -/* 800F7C54 38 84 E0 1C */ addi r4, r4, m__20daAlinkHIO_crouch_c0@l /* 0x8038E01C@l */ -/* 800F7C58 C0 44 00 44 */ lfs f2, 0x44(r4) -/* 800F7C5C C0 23 33 A8 */ lfs f1, 0x33a8(r3) -/* 800F7C60 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 800F7C64 EC 00 10 28 */ fsubs f0, f0, f2 -/* 800F7C68 EC 01 00 32 */ fmuls f0, f1, f0 -/* 800F7C6C EC 22 00 2A */ fadds f1, f2, f0 -/* 800F7C70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s b/asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s deleted file mode 100644 index 4307a09a21..0000000000 --- a/asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800F7C74: -/* 800F7C74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F7C78 7C 08 02 A6 */ mflr r0 -/* 800F7C7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F7C80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F7C84 7C 7F 1B 78 */ mr r31, r3 -/* 800F7C88 C0 23 1F E0 */ lfs f1, 0x1fe0(r3) -/* 800F7C8C C0 02 94 94 */ lfs f0, lit_16210(r2) -/* 800F7C90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F7C94 4C 41 13 82 */ cror 2, 1, 2 -/* 800F7C98 40 82 00 08 */ bne lbl_800F7CA0 -/* 800F7C9C EC 21 00 28 */ fsubs f1, f1, f0 -lbl_800F7CA0: -/* 800F7CA0 C0 02 95 34 */ lfs f0, lit_22146(r2) -/* 800F7CA4 EC 20 00 72 */ fmuls f1, f0, f1 -/* 800F7CA8 48 16 F9 3D */ bl cM_rad2s__Ff -/* 800F7CAC 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c -/* 800F7CB0 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800F7CB4 38 63 9A 20 */ addi r3, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800F7CB8 7C 43 04 2E */ lfsx f2, r3, r0 -/* 800F7CBC 3C 60 80 39 */ lis r3, m__20daAlinkHIO_crouch_c0@ha /* 0x8038E01C@ha */ -/* 800F7CC0 38 63 E0 1C */ addi r3, r3, m__20daAlinkHIO_crouch_c0@l /* 0x8038E01C@l */ -/* 800F7CC4 C0 23 00 3C */ lfs f1, 0x3c(r3) -/* 800F7CC8 C0 1F 1F DC */ lfs f0, 0x1fdc(r31) -/* 800F7CCC EC 01 00 32 */ fmuls f0, f1, f0 -/* 800F7CD0 EC 20 00 B2 */ fmuls f1, f0, f2 -/* 800F7CD4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F7CD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F7CDC 7C 08 03 A6 */ mtlr r0 -/* 800F7CE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F7CE4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getStickAngleDistanceRate__9daAlink_cFv.s b/asm/d/a/d_a_alink/getStickAngleDistanceRate__9daAlink_cFv.s deleted file mode 100644 index 5459f5df58..0000000000 --- a/asm/d/a/d_a_alink/getStickAngleDistanceRate__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800B3F2C: -/* 800B3F2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B3F30 7C 08 02 A6 */ mflr r0 -/* 800B3F34 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B3F38 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B3F3C 7C 7F 1B 78 */ mr r31, r3 -/* 800B3F40 A8 63 2F E0 */ lha r3, 0x2fe0(r3) -/* 800B3F44 A8 1F 30 7C */ lha r0, 0x307c(r31) -/* 800B3F48 7C 03 00 50 */ subf r0, r3, r0 -/* 800B3F4C 7C 03 07 34 */ extsh r3, r0 -/* 800B3F50 48 2B 11 81 */ bl abs -/* 800B3F54 2C 03 10 00 */ cmpwi r3, 0x1000 -/* 800B3F58 40 81 00 64 */ ble lbl_800B3FBC -/* 800B3F5C 3C 60 80 44 */ lis r3, sincosTable___5JMath@ha /* 0x80439A20@ha */ -/* 800B3F60 38 83 9A 20 */ addi r4, r3, sincosTable___5JMath@l /* 0x80439A20@l */ -/* 800B3F64 A8 7F 04 DE */ lha r3, 0x4de(r31) -/* 800B3F68 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) -/* 800B3F6C 7C 03 00 50 */ subf r0, r3, r0 -/* 800B3F70 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c -/* 800B3F74 7C 64 02 14 */ add r3, r4, r0 -/* 800B3F78 C0 23 00 04 */ lfs f1, 4(r3) -/* 800B3F7C C0 7F 33 98 */ lfs f3, 0x3398(r31) -/* 800B3F80 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800B3F84 C0 1F 05 94 */ lfs f0, 0x594(r31) -/* 800B3F88 EC 02 00 32 */ fmuls f0, f2, f0 -/* 800B3F8C FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 800B3F90 40 81 00 18 */ ble lbl_800B3FA8 -/* 800B3F94 C0 02 93 A8 */ lfs f0, lit_9652(r2) -/* 800B3F98 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B3F9C 40 80 00 24 */ bge lbl_800B3FC0 -/* 800B3FA0 FC 20 00 90 */ fmr f1, f0 -/* 800B3FA4 48 00 00 1C */ b lbl_800B3FC0 -lbl_800B3FA8: -/* 800B3FA8 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800B3FAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800B3FB0 40 80 00 10 */ bge lbl_800B3FC0 -/* 800B3FB4 FC 20 00 90 */ fmr f1, f0 -/* 800B3FB8 48 00 00 08 */ b lbl_800B3FC0 -lbl_800B3FBC: -/* 800B3FBC C0 22 92 B8 */ lfs f1, lit_6040(r2) -lbl_800B3FC0: -/* 800B3FC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B3FC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B3FC8 7C 08 03 A6 */ mtlr r0 -/* 800B3FCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B3FD0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/modelCallBack__9daAlink_cFi.s b/asm/d/a/d_a_alink/modelCallBack__9daAlink_cFi.s deleted file mode 100644 index 392a2d78cf..0000000000 --- a/asm/d/a/d_a_alink/modelCallBack__9daAlink_cFi.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_8009EB58: -/* 8009EB58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009EB5C 7C 08 02 A6 */ mflr r0 -/* 8009EB60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009EB64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009EB68 93 C1 00 08 */ stw r30, 8(r1) -/* 8009EB6C 7C 7E 1B 78 */ mr r30, r3 -/* 8009EB70 7C 9F 23 78 */ mr r31, r4 -/* 8009EB74 4B FF F2 1D */ bl jointControll__9daAlink_cFi -/* 8009EB78 2C 1F 00 00 */ cmpwi r31, 0 -/* 8009EB7C 40 82 00 10 */ bne lbl_8009EB8C -/* 8009EB80 7F C3 F3 78 */ mr r3, r30 -/* 8009EB84 4B FF FC 35 */ bl setUpperFront__9daAlink_cFv -/* 8009EB88 48 00 00 40 */ b lbl_8009EBC8 -lbl_8009EB8C: -/* 8009EB8C 2C 1F 00 1A */ cmpwi r31, 0x1a -/* 8009EB90 40 82 00 38 */ bne lbl_8009EBC8 -/* 8009EB94 38 00 00 00 */ li r0, 0 -/* 8009EB98 88 7E 05 6A */ lbz r3, 0x56a(r30) -/* 8009EB9C 28 03 00 00 */ cmplwi r3, 0 -/* 8009EBA0 41 82 00 10 */ beq lbl_8009EBB0 -/* 8009EBA4 28 03 00 26 */ cmplwi r3, 0x26 -/* 8009EBA8 40 80 00 08 */ bge lbl_8009EBB0 -/* 8009EBAC 38 00 00 01 */ li r0, 1 -lbl_8009EBB0: -/* 8009EBB0 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 8009EBB4 40 82 00 0C */ bne lbl_8009EBC0 -/* 8009EBB8 7F C3 F3 78 */ mr r3, r30 -/* 8009EBBC 48 00 3E 21 */ bl setFootMatrix__9daAlink_cFv -lbl_8009EBC0: -/* 8009EBC0 7F C3 F3 78 */ mr r3, r30 -/* 8009EBC4 48 00 3B 4D */ bl setArmMatrix__9daAlink_cFv -lbl_8009EBC8: -/* 8009EBC8 88 1E 2F B6 */ lbz r0, 0x2fb6(r30) -/* 8009EBCC 28 00 00 00 */ cmplwi r0, 0 -/* 8009EBD0 41 82 00 3C */ beq lbl_8009EC0C -/* 8009EBD4 2C 1F 00 00 */ cmpwi r31, 0 -/* 8009EBD8 41 82 00 28 */ beq lbl_8009EC00 -/* 8009EBDC 2C 1F 00 0A */ cmpwi r31, 0xa -/* 8009EBE0 41 82 00 20 */ beq lbl_8009EC00 -/* 8009EBE4 38 1F FF FC */ addi r0, r31, -4 -/* 8009EBE8 28 00 00 01 */ cmplwi r0, 1 -/* 8009EBEC 40 81 00 14 */ ble lbl_8009EC00 -/* 8009EBF0 2C 1F 00 0D */ cmpwi r31, 0xd -/* 8009EBF4 41 82 00 0C */ beq lbl_8009EC00 -/* 8009EBF8 2C 1F 00 0F */ cmpwi r31, 0xf -/* 8009EBFC 40 82 00 10 */ bne lbl_8009EC0C -lbl_8009EC00: -/* 8009EC00 7F C3 F3 78 */ mr r3, r30 -/* 8009EC04 7F E4 FB 78 */ mr r4, r31 -/* 8009EC08 4B FF FD 15 */ bl changeBlendRate__9daAlink_cFi -lbl_8009EC0C: -/* 8009EC0C 38 60 00 01 */ li r3, 1 -/* 8009EC10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009EC14 83 C1 00 08 */ lwz r30, 8(r1) -/* 8009EC18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009EC1C 7C 08 03 A6 */ mtlr r0 -/* 8009EC20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009EC24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s deleted file mode 100644 index 35b415f4dd..0000000000 --- a/asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8011C81C: -/* 8011C81C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011C820 7C 08 02 A6 */ mflr r0 -/* 8011C824 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011C828 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011C82C 7C 7F 1B 78 */ mr r31, r3 -/* 8011C830 38 80 00 C3 */ li r4, 0xc3 -/* 8011C834 4B FA 65 71 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011C838 2C 03 00 00 */ cmpwi r3, 0 -/* 8011C83C 40 82 00 0C */ bne lbl_8011C848 -/* 8011C840 38 60 00 00 */ li r3, 0 -/* 8011C844 48 00 00 38 */ b lbl_8011C87C -lbl_8011C848: -/* 8011C848 7F E3 FB 78 */ mr r3, r31 -/* 8011C84C 38 80 01 26 */ li r4, 0x126 -/* 8011C850 4B F9 07 31 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011C854 7F E3 FB 78 */ mr r3, r31 -/* 8011C858 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100A0@ha */ -/* 8011C85C 38 84 00 A0 */ addi r4, r4, 0x00A0 /* 0x000100A0@l */ -/* 8011C860 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8011C864 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011C868 7D 89 03 A6 */ mtctr r12 -/* 8011C86C 4E 80 04 21 */ bctrl -/* 8011C870 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011C874 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011C878 38 60 00 01 */ li r3, 1 -lbl_8011C87C: -/* 8011C87C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011C880 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011C884 7C 08 03 A6 */ mtlr r0 -/* 8011C888 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011C88C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s deleted file mode 100644 index 480b77d13f..0000000000 --- a/asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_8011C904: -/* 8011C904 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011C908 7C 08 02 A6 */ mflr r0 -/* 8011C90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011C910 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011C914 93 C1 00 08 */ stw r30, 8(r1) -/* 8011C918 7C 7E 1B 78 */ mr r30, r3 -/* 8011C91C 80 03 31 A0 */ lwz r0, 0x31a0(r3) -/* 8011C920 54 1F 03 5A */ rlwinm r31, r0, 0, 0xd, 0xd -/* 8011C924 38 80 01 53 */ li r4, 0x153 -/* 8011C928 4B FA 64 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011C92C 2C 03 00 00 */ cmpwi r3, 0 -/* 8011C930 40 82 00 0C */ bne lbl_8011C93C -/* 8011C934 38 60 00 00 */ li r3, 0 -/* 8011C938 48 00 00 80 */ b lbl_8011C9B8 -lbl_8011C93C: -/* 8011C93C 80 1E 05 74 */ lwz r0, 0x574(r30) -/* 8011C940 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011C944 41 82 00 20 */ beq lbl_8011C964 -/* 8011C948 7F C3 F3 78 */ mr r3, r30 -/* 8011C94C 38 80 00 3B */ li r4, 0x3b -/* 8011C950 3C A0 80 39 */ lis r5, m__25daAlinkHIO_wlDamCaught_c0@ha /* 0x8038F3B4@ha */ -/* 8011C954 38 A5 F3 B4 */ addi r5, r5, m__25daAlinkHIO_wlDamCaught_c0@l /* 0x8038F3B4@l */ -/* 8011C958 C0 25 00 08 */ lfs f1, 8(r5) -/* 8011C95C 48 00 CD 4D */ bl setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf -/* 8011C960 48 00 00 1C */ b lbl_8011C97C -lbl_8011C964: -/* 8011C964 7F C3 F3 78 */ mr r3, r30 -/* 8011C968 38 80 00 B9 */ li r4, 0xb9 -/* 8011C96C 3C A0 80 39 */ lis r5, m__23daAlinkHIO_damCaught_c0@ha /* 0x8038E49C@ha */ -/* 8011C970 38 A5 E4 9C */ addi r5, r5, m__23daAlinkHIO_damCaught_c0@l /* 0x8038E49C@l */ -/* 8011C974 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 8011C978 4B F9 06 39 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf -lbl_8011C97C: -/* 8011C97C 28 1F 00 00 */ cmplwi r31, 0 -/* 8011C980 41 82 00 10 */ beq lbl_8011C990 -/* 8011C984 80 1E 31 A0 */ lwz r0, 0x31a0(r30) -/* 8011C988 64 00 00 04 */ oris r0, r0, 4 -/* 8011C98C 90 1E 31 A0 */ stw r0, 0x31a0(r30) -lbl_8011C990: -/* 8011C990 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011C994 D0 3E 33 98 */ stfs f1, 0x3398(r30) -/* 8011C998 D0 3E 04 FC */ stfs f1, 0x4fc(r30) -/* 8011C99C 7F C3 F3 78 */ mr r3, r30 -/* 8011C9A0 C0 5E 05 34 */ lfs f2, 0x534(r30) -/* 8011C9A4 38 80 00 00 */ li r4, 0 -/* 8011C9A8 4B F9 ED C9 */ bl setSpecialGravity__9daAlink_cFffi -/* 8011C9AC 38 00 00 00 */ li r0, 0 -/* 8011C9B0 B0 1E 05 A0 */ sth r0, 0x5a0(r30) -/* 8011C9B4 38 60 00 01 */ li r3, 1 -lbl_8011C9B8: -/* 8011C9B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011C9BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011C9C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011C9C4 7C 08 03 A6 */ mtlr r0 -/* 8011C9C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011C9CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s deleted file mode 100644 index 8056c360be..0000000000 --- a/asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_8011BB40: -/* 8011BB40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BB44 7C 08 02 A6 */ mflr r0 -/* 8011BB48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BB4C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BB50 7C 7F 1B 78 */ mr r31, r3 -/* 8011BB54 38 80 01 4C */ li r4, 0x14c -/* 8011BB58 4B FA 72 4D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011BB5C 2C 03 00 00 */ cmpwi r3, 0 -/* 8011BB60 40 82 00 0C */ bne lbl_8011BB6C -/* 8011BB64 38 60 00 00 */ li r3, 0 -/* 8011BB68 48 00 00 98 */ b lbl_8011BC00 -lbl_8011BB6C: -/* 8011BB6C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011BB70 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011BB74 41 82 00 48 */ beq lbl_8011BBBC -/* 8011BB78 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 8011BB7C 2C 00 00 00 */ cmpwi r0, 0 -/* 8011BB80 41 82 00 14 */ beq lbl_8011BB94 -/* 8011BB84 7F E3 FB 78 */ mr r3, r31 -/* 8011BB88 38 80 00 0A */ li r4, 0xa -/* 8011BB8C 48 00 DA ED */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8011BB90 48 00 00 64 */ b lbl_8011BBF4 -lbl_8011BB94: -/* 8011BB94 7F E3 FB 78 */ mr r3, r31 -/* 8011BB98 38 80 00 08 */ li r4, 8 -/* 8011BB9C 3C A0 80 39 */ lis r5, m__20daAlinkHIO_wlPush_c0@ha /* 0x8038F124@ha */ -/* 8011BBA0 38 C5 F1 24 */ addi r6, r5, m__20daAlinkHIO_wlPush_c0@l /* 0x8038F124@l */ -/* 8011BBA4 C0 26 00 08 */ lfs f1, 8(r6) -/* 8011BBA8 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 8011BBAC 38 A0 00 18 */ li r5, 0x18 -/* 8011BBB0 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8011BBB4 48 00 DB 51 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 8011BBB8 48 00 00 3C */ b lbl_8011BBF4 -lbl_8011BBBC: -/* 8011BBBC 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 8011BBC0 2C 00 00 00 */ cmpwi r0, 0 -/* 8011BBC4 41 82 00 14 */ beq lbl_8011BBD8 -/* 8011BBC8 7F E3 FB 78 */ mr r3, r31 -/* 8011BBCC 38 80 00 39 */ li r4, 0x39 -/* 8011BBD0 4B F9 13 B1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011BBD4 48 00 00 20 */ b lbl_8011BBF4 -lbl_8011BBD8: -/* 8011BBD8 7F E3 FB 78 */ mr r3, r31 -/* 8011BBDC 38 80 00 37 */ li r4, 0x37 -/* 8011BBE0 3C A0 80 39 */ lis r5, m__22daAlinkHIO_pushpull_c0@ha /* 0x8038E210@ha */ -/* 8011BBE4 38 A5 E2 10 */ addi r5, r5, m__22daAlinkHIO_pushpull_c0@l /* 0x8038E210@l */ -/* 8011BBE8 C0 25 00 18 */ lfs f1, 0x18(r5) -/* 8011BBEC C0 45 00 1C */ lfs f2, 0x1c(r5) -/* 8011BBF0 4B F9 13 F1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_8011BBF4: -/* 8011BBF4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011BBF8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011BBFC 38 60 00 01 */ li r3, 1 -lbl_8011BC00: -/* 8011BC00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BC04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BC08 7C 08 03 A6 */ mtlr r0 -/* 8011BC0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BC10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s deleted file mode 100644 index 1eebfab220..0000000000 --- a/asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_8011BABC: -/* 8011BABC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BAC0 7C 08 02 A6 */ mflr r0 -/* 8011BAC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BAC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BACC 7C 7F 1B 78 */ mr r31, r3 -/* 8011BAD0 38 80 01 4B */ li r4, 0x14b -/* 8011BAD4 4B FA 72 D1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011BAD8 2C 03 00 00 */ cmpwi r3, 0 -/* 8011BADC 40 82 00 0C */ bne lbl_8011BAE8 -/* 8011BAE0 38 60 00 00 */ li r3, 0 -/* 8011BAE4 48 00 00 48 */ b lbl_8011BB2C -lbl_8011BAE8: -/* 8011BAE8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011BAEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011BAF0 41 82 00 14 */ beq lbl_8011BB04 -/* 8011BAF4 7F E3 FB 78 */ mr r3, r31 -/* 8011BAF8 38 80 00 07 */ li r4, 7 -/* 8011BAFC 48 00 DB 7D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8011BB00 48 00 00 20 */ b lbl_8011BB20 -lbl_8011BB04: -/* 8011BB04 7F E3 FB 78 */ mr r3, r31 -/* 8011BB08 38 80 00 36 */ li r4, 0x36 -/* 8011BB0C 3C A0 80 39 */ lis r5, m__22daAlinkHIO_pushpull_c0@ha /* 0x8038E210@ha */ -/* 8011BB10 38 A5 E2 10 */ addi r5, r5, m__22daAlinkHIO_pushpull_c0@l /* 0x8038E210@l */ -/* 8011BB14 C0 25 00 10 */ lfs f1, 0x10(r5) -/* 8011BB18 C0 45 00 14 */ lfs f2, 0x14(r5) -/* 8011BB1C 4B F9 14 C5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -lbl_8011BB20: -/* 8011BB20 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011BB24 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011BB28 38 60 00 01 */ li r3, 1 -lbl_8011BB2C: -/* 8011BB2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BB30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BB34 7C 08 03 A6 */ mtlr r0 -/* 8011BB38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BB3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s deleted file mode 100644 index ae5dc8e3f2..0000000000 --- a/asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8011D268: -/* 8011D268 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D26C 7C 08 02 A6 */ mflr r0 -/* 8011D270 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D274 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D278 7C 7F 1B 78 */ mr r31, r3 -/* 8011D27C 38 80 01 5C */ li r4, 0x15c -/* 8011D280 4B FA 5B 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D284 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D288 40 82 00 0C */ bne lbl_8011D294 -/* 8011D28C 38 60 00 01 */ li r3, 1 -/* 8011D290 48 00 00 60 */ b lbl_8011D2F0 -lbl_8011D294: -/* 8011D294 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D298 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D29C 40 82 00 50 */ bne lbl_8011D2EC -/* 8011D2A0 7F E3 FB 78 */ mr r3, r31 -/* 8011D2A4 38 80 00 D3 */ li r4, 0xd3 -/* 8011D2A8 4B F9 00 99 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 8011D2AC 7F E3 FB 78 */ mr r3, r31 -/* 8011D2B0 38 80 00 77 */ li r4, 0x77 -/* 8011D2B4 4B F9 27 F5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 8011D2B8 7F E3 FB 78 */ mr r3, r31 -/* 8011D2BC 38 80 01 29 */ li r4, 0x129 -/* 8011D2C0 38 A0 00 01 */ li r5, 1 -/* 8011D2C4 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8011D2C8 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011D2CC 4B F9 21 E5 */ bl setFaceBck__9daAlink_cFUsiUs -/* 8011D2D0 38 00 00 04 */ li r0, 4 -/* 8011D2D4 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 8011D2D8 38 00 00 0A */ li r0, 0xa -/* 8011D2DC 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 8011D2E0 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D2E4 64 00 10 10 */ oris r0, r0, 0x1010 -/* 8011D2E8 90 1F 05 74 */ stw r0, 0x574(r31) -lbl_8011D2EC: -/* 8011D2EC 38 60 00 01 */ li r3, 1 -lbl_8011D2F0: -/* 8011D2F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D2F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D2F8 7C 08 03 A6 */ mtlr r0 -/* 8011D2FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D300 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s deleted file mode 100644 index 50e99283ec..0000000000 --- a/asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8011D64C: -/* 8011D64C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D650 7C 08 02 A6 */ mflr r0 -/* 8011D654 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D658 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D65C 7C 7F 1B 78 */ mr r31, r3 -/* 8011D660 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011D664 48 04 0E 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011D668 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011D66C 41 82 00 0C */ beq lbl_8011D678 -/* 8011D670 38 00 00 01 */ li r0, 1 -/* 8011D674 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_8011D678: -/* 8011D678 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D67C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D680 40 82 00 18 */ bne lbl_8011D698 -/* 8011D684 88 1F 2F 99 */ lbz r0, 0x2f99(r31) -/* 8011D688 28 00 00 0C */ cmplwi r0, 0xc -/* 8011D68C 41 82 00 0C */ beq lbl_8011D698 -/* 8011D690 38 00 00 04 */ li r0, 4 -/* 8011D694 98 1F 2F 99 */ stb r0, 0x2f99(r31) -lbl_8011D698: -/* 8011D698 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011D69C 2C 00 00 00 */ cmpwi r0, 0 -/* 8011D6A0 41 82 00 18 */ beq lbl_8011D6B8 -/* 8011D6A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011D6A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011D6AC 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011D6B0 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D6B4 4B F2 AA C9 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011D6B8: -/* 8011D6B8 38 60 00 01 */ li r3, 1 -/* 8011D6BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D6C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D6C4 7C 08 03 A6 */ mtlr r0 -/* 8011D6C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D6CC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s deleted file mode 100644 index f3a01a07d5..0000000000 --- a/asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_8011D304: -/* 8011D304 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D308 7C 08 02 A6 */ mflr r0 -/* 8011D30C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D310 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D314 7C 7F 1B 78 */ mr r31, r3 -/* 8011D318 38 80 01 5D */ li r4, 0x15d -/* 8011D31C 4B FA 5A 89 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D320 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D324 40 82 00 0C */ bne lbl_8011D330 -/* 8011D328 38 60 00 01 */ li r3, 1 -/* 8011D32C 48 00 00 8C */ b lbl_8011D3B8 -lbl_8011D330: -/* 8011D330 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D334 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D338 41 82 00 10 */ beq lbl_8011D348 -/* 8011D33C 38 00 00 01 */ li r0, 1 -/* 8011D340 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D344 48 00 00 70 */ b lbl_8011D3B4 -lbl_8011D348: -/* 8011D348 7F E3 FB 78 */ mr r3, r31 -/* 8011D34C 38 80 00 D2 */ li r4, 0xd2 -/* 8011D350 4B F8 FF F1 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 8011D354 38 00 00 02 */ li r0, 2 -/* 8011D358 98 1F 20 4C */ stb r0, 0x204c(r31) -/* 8011D35C 38 00 00 2D */ li r0, 0x2d -/* 8011D360 B0 1F 20 52 */ sth r0, 0x2052(r31) -/* 8011D364 7F E3 FB 78 */ mr r3, r31 -/* 8011D368 38 80 00 76 */ li r4, 0x76 -/* 8011D36C 4B F9 27 3D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 8011D370 7F E3 FB 78 */ mr r3, r31 -/* 8011D374 38 80 01 28 */ li r4, 0x128 -/* 8011D378 38 A0 00 01 */ li r5, 1 -/* 8011D37C 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8011D380 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011D384 4B F9 21 2D */ bl setFaceBck__9daAlink_cFUsiUs -/* 8011D388 38 00 00 00 */ li r0, 0 -/* 8011D38C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D390 C0 02 92 BC */ lfs f0, lit_6041(r2) -/* 8011D394 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 8011D398 38 00 00 04 */ li r0, 4 -/* 8011D39C 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 8011D3A0 38 00 00 0A */ li r0, 0xa -/* 8011D3A4 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 8011D3A8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D3AC 64 00 10 10 */ oris r0, r0, 0x1010 -/* 8011D3B0 90 1F 05 74 */ stw r0, 0x574(r31) -lbl_8011D3B4: -/* 8011D3B4 38 60 00 01 */ li r3, 1 -lbl_8011D3B8: -/* 8011D3B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D3BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D3C0 7C 08 03 A6 */ mtlr r0 -/* 8011D3C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D3C8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s deleted file mode 100644 index 4abe5711d7..0000000000 --- a/asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8011D3CC: -/* 8011D3CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D3D0 7C 08 02 A6 */ mflr r0 -/* 8011D3D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D3D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D3DC 7C 7F 1B 78 */ mr r31, r3 -/* 8011D3E0 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8011D3E4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D3E8 40 82 00 24 */ bne lbl_8011D40C -/* 8011D3EC C0 1F 34 78 */ lfs f0, 0x3478(r31) -/* 8011D3F0 C0 3F 20 58 */ lfs f1, 0x2058(r31) -/* 8011D3F4 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8011D3F8 40 81 00 10 */ ble lbl_8011D408 -/* 8011D3FC 38 00 00 01 */ li r0, 1 -/* 8011D400 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D404 48 00 00 08 */ b lbl_8011D40C -lbl_8011D408: -/* 8011D408 D0 3F 34 78 */ stfs f1, 0x3478(r31) -lbl_8011D40C: -/* 8011D40C A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011D410 2C 00 00 00 */ cmpwi r0, 0 -/* 8011D414 41 82 00 18 */ beq lbl_8011D42C -/* 8011D418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011D41C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011D420 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011D424 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D428 4B F2 AD 55 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011D42C: -/* 8011D42C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D430 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D434 40 82 00 28 */ bne lbl_8011D45C -/* 8011D438 C0 3F 20 58 */ lfs f1, 0x2058(r31) -/* 8011D43C C0 02 93 20 */ lfs f0, lit_7449(r2) -/* 8011D440 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8011D444 4C 41 13 82 */ cror 2, 1, 2 -/* 8011D448 40 82 00 14 */ bne lbl_8011D45C -/* 8011D44C 38 00 00 00 */ li r0, 0 -/* 8011D450 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 8011D454 38 00 00 05 */ li r0, 5 -/* 8011D458 98 1F 2F 97 */ stb r0, 0x2f97(r31) -lbl_8011D45C: -/* 8011D45C 38 60 00 01 */ li r3, 1 -/* 8011D460 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D464 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D468 7C 08 03 A6 */ mtlr r0 -/* 8011D46C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D470 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s deleted file mode 100644 index 9ed0b19a5a..0000000000 --- a/asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_8011C760: -/* 8011C760 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011C764 7C 08 02 A6 */ mflr r0 -/* 8011C768 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011C76C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011C770 93 C1 00 08 */ stw r30, 8(r1) -/* 8011C774 7C 7E 1B 78 */ mr r30, r3 -/* 8011C778 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8011C77C A8 03 30 0C */ lha r0, 0x300c(r3) -/* 8011C780 2C 00 00 00 */ cmpwi r0, 0 -/* 8011C784 40 82 00 10 */ bne lbl_8011C794 -/* 8011C788 38 00 00 01 */ li r0, 1 -/* 8011C78C B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8011C790 48 00 00 0C */ b lbl_8011C79C -lbl_8011C794: -/* 8011C794 38 00 00 04 */ li r0, 4 -/* 8011C798 98 1E 2F 99 */ stb r0, 0x2f99(r30) -lbl_8011C79C: -/* 8011C79C 7F E3 FB 78 */ mr r3, r31 -/* 8011C7A0 48 04 1D 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011C7A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011C7A8 41 82 00 1C */ beq lbl_8011C7C4 -/* 8011C7AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011C7B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011C7B4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011C7B8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011C7BC 4B F2 B9 C1 */ bl cutEnd__16dEvent_manager_cFi -/* 8011C7C0 48 00 00 40 */ b lbl_8011C800 -lbl_8011C7C4: -/* 8011C7C4 A8 1E 30 0E */ lha r0, 0x300e(r30) -/* 8011C7C8 2C 00 00 00 */ cmpwi r0, 0 -/* 8011C7CC 41 82 00 34 */ beq lbl_8011C800 -/* 8011C7D0 7F E3 FB 78 */ mr r3, r31 -/* 8011C7D4 C0 22 93 3C */ lfs f1, lit_7808(r2) -/* 8011C7D8 48 20 BC 55 */ bl checkPass__12J3DFrameCtrlFf -/* 8011C7DC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011C7E0 41 82 00 20 */ beq lbl_8011C800 -/* 8011C7E4 7F C3 F3 78 */ mr r3, r30 -/* 8011C7E8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001009F@ha */ -/* 8011C7EC 38 84 00 9F */ addi r4, r4, 0x009F /* 0x0001009F@l */ -/* 8011C7F0 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8011C7F4 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011C7F8 7D 89 03 A6 */ mtctr r12 -/* 8011C7FC 4E 80 04 21 */ bctrl -lbl_8011C800: -/* 8011C800 38 60 00 01 */ li r3, 1 -/* 8011C804 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011C808 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011C80C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011C810 7C 08 03 A6 */ mtlr r0 -/* 8011C814 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011C818 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s deleted file mode 100644 index 950d17e829..0000000000 --- a/asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_8011BA20: -/* 8011BA20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BA24 7C 08 02 A6 */ mflr r0 -/* 8011BA28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BA2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BA30 7C 7F 1B 78 */ mr r31, r3 -/* 8011BA34 4B FF C6 B9 */ bl getDemoLookActor__9daAlink_cFv -/* 8011BA38 7C 64 1B 79 */ or. r4, r3, r3 -/* 8011BA3C 41 82 00 54 */ beq lbl_8011BA90 -/* 8011BA40 38 7F 34 E0 */ addi r3, r31, 0x34e0 -/* 8011BA44 38 84 05 38 */ addi r4, r4, 0x538 -/* 8011BA48 48 15 51 BD */ bl cLib_targetAngleY__FPC3VecPC3Vec -/* 8011BA4C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8011BA50 7C 04 18 50 */ subf r0, r4, r3 -/* 8011BA54 7C 00 07 34 */ extsh r0, r0 -/* 8011BA58 2C 00 60 00 */ cmpwi r0, 0x6000 -/* 8011BA5C 40 81 00 10 */ ble lbl_8011BA6C -/* 8011BA60 38 04 60 00 */ addi r0, r4, 0x6000 -/* 8011BA64 7C 04 07 34 */ extsh r4, r0 -/* 8011BA68 48 00 00 14 */ b lbl_8011BA7C -lbl_8011BA6C: -/* 8011BA6C 2C 00 A0 00 */ cmpwi r0, -24576 -/* 8011BA70 40 80 00 0C */ bge lbl_8011BA7C -/* 8011BA74 38 04 A0 00 */ addi r0, r4, -24576 -/* 8011BA78 7C 04 07 34 */ extsh r4, r0 -lbl_8011BA7C: -/* 8011BA7C 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 8011BA80 38 A0 00 02 */ li r5, 2 -/* 8011BA84 38 C0 08 00 */ li r6, 0x800 -/* 8011BA88 38 E0 01 00 */ li r7, 0x100 -/* 8011BA8C 48 15 4A B5 */ bl cLib_addCalcAngleS__FPsssss -lbl_8011BA90: -/* 8011BA90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011BA94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011BA98 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011BA9C 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BAA0 4B F2 C6 DD */ bl cutEnd__16dEvent_manager_cFi -/* 8011BAA4 38 60 00 01 */ li r3, 1 -/* 8011BAA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BAAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BAB0 7C 08 03 A6 */ mtlr r0 -/* 8011BAB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BAB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s deleted file mode 100644 index c013ce5d84..0000000000 --- a/asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8011D110: -/* 8011D110 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D114 7C 08 02 A6 */ mflr r0 -/* 8011D118 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D11C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D120 7C 7F 1B 78 */ mr r31, r3 -/* 8011D124 38 80 01 5B */ li r4, 0x15b -/* 8011D128 4B FA 5C 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D12C 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D130 40 82 00 0C */ bne lbl_8011D13C -/* 8011D134 38 60 00 01 */ li r3, 1 -/* 8011D138 48 00 00 A8 */ b lbl_8011D1E0 -lbl_8011D13C: -/* 8011D13C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D140 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011D144 41 82 00 10 */ beq lbl_8011D154 -/* 8011D148 38 00 00 01 */ li r0, 1 -/* 8011D14C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D150 48 00 00 8C */ b lbl_8011D1DC -lbl_8011D154: -/* 8011D154 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 8011D158 2C 00 00 01 */ cmpwi r0, 1 -/* 8011D15C 40 82 00 38 */ bne lbl_8011D194 -/* 8011D160 7F E3 FB 78 */ mr r3, r31 -/* 8011D164 38 80 02 4E */ li r4, 0x24e -/* 8011D168 4B F9 01 D9 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 8011D16C 7F E3 FB 78 */ mr r3, r31 -/* 8011D170 38 80 01 5B */ li r4, 0x15b -/* 8011D174 38 A0 00 01 */ li r5, 1 -/* 8011D178 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8011D17C 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011D180 4B F9 23 31 */ bl setFaceBck__9daAlink_cFUsiUs -/* 8011D184 7F E3 FB 78 */ mr r3, r31 -/* 8011D188 38 80 00 8A */ li r4, 0x8a -/* 8011D18C 4B F9 29 1D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 8011D190 48 00 00 28 */ b lbl_8011D1B8 -lbl_8011D194: -/* 8011D194 7F E3 FB 78 */ mr r3, r31 -/* 8011D198 38 80 00 D1 */ li r4, 0xd1 -/* 8011D19C 4B F9 01 A5 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 8011D1A0 7F E3 FB 78 */ mr r3, r31 -/* 8011D1A4 38 80 00 D1 */ li r4, 0xd1 -/* 8011D1A8 4B F9 01 99 */ bl setUpperAnimeBase__9daAlink_cFUs -/* 8011D1AC 7F E3 FB 78 */ mr r3, r31 -/* 8011D1B0 38 80 00 75 */ li r4, 0x75 -/* 8011D1B4 4B F9 28 F5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -lbl_8011D1B8: -/* 8011D1B8 38 00 00 04 */ li r0, 4 -/* 8011D1BC 98 1F 2F 96 */ stb r0, 0x2f96(r31) -/* 8011D1C0 38 00 00 0A */ li r0, 0xa -/* 8011D1C4 98 1F 2F 97 */ stb r0, 0x2f97(r31) -/* 8011D1C8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011D1CC 64 00 10 10 */ oris r0, r0, 0x1010 -/* 8011D1D0 90 1F 05 74 */ stw r0, 0x574(r31) -/* 8011D1D4 38 00 00 00 */ li r0, 0 -/* 8011D1D8 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_8011D1DC: -/* 8011D1DC 38 60 00 01 */ li r3, 1 -lbl_8011D1E0: -/* 8011D1E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D1E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D1E8 7C 08 03 A6 */ mtlr r0 -/* 8011D1EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D1F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s deleted file mode 100644 index 54bbcba718..0000000000 --- a/asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8011D1F4: -/* 8011D1F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D1F8 7C 08 02 A6 */ mflr r0 -/* 8011D1FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D200 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D204 7C 7F 1B 78 */ mr r31, r3 -/* 8011D208 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 8011D20C 48 04 12 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011D210 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011D214 41 82 00 1C */ beq lbl_8011D230 -/* 8011D218 38 00 00 01 */ li r0, 1 -/* 8011D21C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D220 7F E3 FB 78 */ mr r3, r31 -/* 8011D224 38 80 00 02 */ li r4, 2 -/* 8011D228 C0 22 92 C4 */ lfs f1, lit_6109(r2) -/* 8011D22C 4B F9 04 F9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -lbl_8011D230: -/* 8011D230 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011D234 2C 00 00 00 */ cmpwi r0, 0 -/* 8011D238 41 82 00 18 */ beq lbl_8011D250 -/* 8011D23C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011D240 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011D244 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011D248 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D24C 4B F2 AF 31 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011D250: -/* 8011D250 38 60 00 01 */ li r3, 1 -/* 8011D254 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D258 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D25C 7C 08 03 A6 */ mtlr r0 -/* 8011D260 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D264 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s deleted file mode 100644 index 327eb152ff..0000000000 --- a/asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8011A42C: -/* 8011A42C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011A430 7C 08 02 A6 */ mflr r0 -/* 8011A434 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011A438 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011A43C 7C 7F 1B 78 */ mr r31, r3 -/* 8011A440 80 03 05 8C */ lwz r0, 0x58c(r3) -/* 8011A444 60 00 00 08 */ ori r0, r0, 8 -/* 8011A448 90 03 05 8C */ stw r0, 0x58c(r3) -/* 8011A44C A8 03 30 0C */ lha r0, 0x300c(r3) -/* 8011A450 2C 00 00 00 */ cmpwi r0, 0 -/* 8011A454 40 82 00 10 */ bne lbl_8011A464 -/* 8011A458 38 00 00 01 */ li r0, 1 -/* 8011A45C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011A460 48 00 00 0C */ b lbl_8011A46C -lbl_8011A464: -/* 8011A464 38 00 00 04 */ li r0, 4 -/* 8011A468 98 1F 2F 99 */ stb r0, 0x2f99(r31) -lbl_8011A46C: -/* 8011A46C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011A470 48 04 40 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011A474 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011A478 41 82 00 30 */ beq lbl_8011A4A8 -/* 8011A47C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011A480 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011A484 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011A488 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011A48C 4B F2 DC F1 */ bl cutEnd__16dEvent_manager_cFi -/* 8011A490 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 8011A494 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c -/* 8011A498 90 1F 19 9C */ stw r0, 0x199c(r31) -/* 8011A49C 80 1F 19 9C */ lwz r0, 0x199c(r31) -/* 8011A4A0 60 00 20 00 */ ori r0, r0, 0x2000 -/* 8011A4A4 90 1F 19 9C */ stw r0, 0x199c(r31) -lbl_8011A4A8: -/* 8011A4A8 38 60 00 01 */ li r3, 1 -/* 8011A4AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011A4B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011A4B4 7C 08 03 A6 */ mtlr r0 -/* 8011A4B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A4BC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s deleted file mode 100644 index a26011b0fb..0000000000 --- a/asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8011C890: -/* 8011C890 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011C894 7C 08 02 A6 */ mflr r0 -/* 8011C898 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011C89C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011C8A0 7C 7F 1B 78 */ mr r31, r3 -/* 8011C8A4 38 80 01 5F */ li r4, 0x15f -/* 8011C8A8 4B FA 64 FD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011C8AC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011C8B0 40 82 00 0C */ bne lbl_8011C8BC -/* 8011C8B4 38 60 00 00 */ li r3, 0 -/* 8011C8B8 48 00 00 38 */ b lbl_8011C8F0 -lbl_8011C8BC: -/* 8011C8BC 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011C8C0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011C8C4 41 82 00 14 */ beq lbl_8011C8D8 -/* 8011C8C8 7F E3 FB 78 */ mr r3, r31 -/* 8011C8CC 38 80 00 71 */ li r4, 0x71 -/* 8011C8D0 48 00 CD A9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8011C8D4 48 00 00 10 */ b lbl_8011C8E4 -lbl_8011C8D8: -/* 8011C8D8 7F E3 FB 78 */ mr r3, r31 -/* 8011C8DC 38 80 00 FF */ li r4, 0xff -/* 8011C8E0 4B F9 06 A1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_8011C8E4: -/* 8011C8E4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011C8E8 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011C8EC 38 60 00 01 */ li r3, 1 -lbl_8011C8F0: -/* 8011C8F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011C8F4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011C8F8 7C 08 03 A6 */ mtlr r0 -/* 8011C8FC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011C900 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s deleted file mode 100644 index 073fd3efda..0000000000 --- a/asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s +++ /dev/null @@ -1,59 +0,0 @@ -lbl_801195F8: -/* 801195F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801195FC 7C 08 02 A6 */ mflr r0 -/* 80119600 90 01 00 14 */ stw r0, 0x14(r1) -/* 80119604 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80119608 7C 7F 1B 78 */ mr r31, r3 -/* 8011960C 38 80 01 3D */ li r4, 0x13d -/* 80119610 4B FA 97 95 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 80119614 2C 03 00 00 */ cmpwi r3, 0 -/* 80119618 40 82 00 0C */ bne lbl_80119624 -/* 8011961C 38 60 00 01 */ li r3, 1 -/* 80119620 48 00 00 A4 */ b lbl_801196C4 -lbl_80119624: -/* 80119624 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 80119628 D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 8011962C D0 3F 05 2C */ stfs f1, 0x52c(r31) -/* 80119630 D0 3F 04 FC */ stfs f1, 0x4fc(r31) -/* 80119634 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 80119638 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 8011963C B0 1F 1F 5C */ sth r0, 0x1f5c(r31) -/* 80119640 B0 1F 1F 58 */ sth r0, 0x1f58(r31) -/* 80119644 B0 1F 1F 94 */ sth r0, 0x1f94(r31) -/* 80119648 B0 1F 1F 6C */ sth r0, 0x1f6c(r31) -/* 8011964C B0 1F 1F A8 */ sth r0, 0x1fa8(r31) -/* 80119650 7F E3 FB 78 */ mr r3, r31 -/* 80119654 4B F9 30 E5 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf -/* 80119658 38 00 00 00 */ li r0, 0 -/* 8011965C 90 1F 1F 34 */ stw r0, 0x1f34(r31) -/* 80119660 90 1F 1F 4C */ stw r0, 0x1f4c(r31) -/* 80119664 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 80119668 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8011966C 98 1F 2F AB */ stb r0, 0x2fab(r31) -/* 80119670 7F E3 FB 78 */ mr r3, r31 -/* 80119674 38 80 00 00 */ li r4, 0 -/* 80119678 38 A0 00 01 */ li r5, 1 -/* 8011967C 4B FA 7C 61 */ bl deleteEquipItem__9daAlink_cFii -/* 80119680 3C 60 00 01 */ lis r3, 0x0001 /* 0x00010800@ha */ -/* 80119684 38 03 08 00 */ addi r0, r3, 0x0800 /* 0x00010800@l */ -/* 80119688 90 1F 1F 60 */ stw r0, 0x1f60(r31) -/* 8011968C 38 00 00 00 */ li r0, 0 -/* 80119690 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80119694 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 80119698 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 8011969C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 801196A0 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) -/* 801196A4 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 801196A8 D0 1F 37 CC */ stfs f0, 0x37cc(r31) -/* 801196AC C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 801196B0 D0 1F 37 D0 */ stfs f0, 0x37d0(r31) -/* 801196B4 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 801196B8 64 00 80 00 */ oris r0, r0, 0x8000 -/* 801196BC 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 801196C0 38 60 00 01 */ li r3, 1 -lbl_801196C4: -/* 801196C4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801196C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801196CC 7C 08 03 A6 */ mtlr r0 -/* 801196D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801196D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s deleted file mode 100644 index a32b7132ca..0000000000 --- a/asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8011B3F0: -/* 8011B3F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011B3F4 7C 08 02 A6 */ mflr r0 -/* 8011B3F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011B3FC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011B400 7C 7F 1B 78 */ mr r31, r3 -/* 8011B404 38 80 01 49 */ li r4, 0x149 -/* 8011B408 4B FA 79 9D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011B40C 2C 03 00 00 */ cmpwi r3, 0 -/* 8011B410 40 82 00 0C */ bne lbl_8011B41C -/* 8011B414 38 60 00 00 */ li r3, 0 -/* 8011B418 48 00 00 40 */ b lbl_8011B458 -lbl_8011B41C: -/* 8011B41C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011B420 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011B424 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011B428 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011B42C 41 82 00 14 */ beq lbl_8011B440 -/* 8011B430 7F E3 FB 78 */ mr r3, r31 -/* 8011B434 38 80 00 15 */ li r4, 0x15 -/* 8011B438 48 00 E2 41 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -/* 8011B43C 48 00 00 10 */ b lbl_8011B44C -lbl_8011B440: -/* 8011B440 7F E3 FB 78 */ mr r3, r31 -/* 8011B444 38 80 00 D6 */ li r4, 0xd6 -/* 8011B448 4B F9 1B 39 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_8011B44C: -/* 8011B44C 38 00 00 00 */ li r0, 0 -/* 8011B450 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011B454 38 60 00 01 */ li r3, 1 -lbl_8011B458: -/* 8011B458 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011B45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011B460 7C 08 03 A6 */ mtlr r0 -/* 8011B464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011B468 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s deleted file mode 100644 index 22554e1102..0000000000 --- a/asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8011A5CC: -/* 8011A5CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011A5D0 7C 08 02 A6 */ mflr r0 -/* 8011A5D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011A5D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011A5DC 7C 7F 1B 78 */ mr r31, r3 -/* 8011A5E0 A8 03 30 0C */ lha r0, 0x300c(r3) -/* 8011A5E4 2C 00 00 00 */ cmpwi r0, 0 -/* 8011A5E8 41 82 00 50 */ beq lbl_8011A638 -/* 8011A5EC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011A5F0 48 04 3E DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011A5F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011A5F8 41 82 00 78 */ beq lbl_8011A670 -/* 8011A5FC 7F E3 FB 78 */ mr r3, r31 -/* 8011A600 C0 22 92 C4 */ lfs f1, lit_6109(r2) -/* 8011A604 4B F9 38 11 */ bl setBlendMoveAnime__9daAlink_cFf -/* 8011A608 7F E3 FB 78 */ mr r3, r31 -/* 8011A60C 38 80 00 46 */ li r4, 0x46 -/* 8011A610 4B F9 F0 31 */ bl itemEquip__9daAlink_cFUs -/* 8011A614 C0 02 93 44 */ lfs f0, lit_7977(r2) -/* 8011A618 D0 1F 20 58 */ stfs f0, 0x2058(r31) -/* 8011A61C 80 7F 1F 54 */ lwz r3, 0x1f54(r31) -/* 8011A620 D0 03 00 08 */ stfs f0, 8(r3) -/* 8011A624 7F E3 FB 78 */ mr r3, r31 -/* 8011A628 4B FA 00 79 */ bl commonChangeItem__9daAlink_cFv -/* 8011A62C 38 00 00 00 */ li r0, 0 -/* 8011A630 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011A634 48 00 00 3C */ b lbl_8011A670 -lbl_8011A638: -/* 8011A638 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011A63C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011A640 40 82 00 0C */ bne lbl_8011A64C -/* 8011A644 C0 22 92 BC */ lfs f1, lit_6041(r2) -/* 8011A648 4B F9 37 CD */ bl setBlendMoveAnime__9daAlink_cFf -lbl_8011A64C: -/* 8011A64C 7F E3 FB 78 */ mr r3, r31 -/* 8011A650 4B F9 EC 05 */ bl checkNoUpperAnime__9daAlink_cCFv -/* 8011A654 2C 03 00 00 */ cmpwi r3, 0 -/* 8011A658 41 82 00 18 */ beq lbl_8011A670 -/* 8011A65C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011A660 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011A664 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011A668 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011A66C 4B F2 DB 11 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011A670: -/* 8011A670 38 60 00 01 */ li r3, 1 -/* 8011A674 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011A678 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011A67C 7C 08 03 A6 */ mtlr r0 -/* 8011A680 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011A684 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s deleted file mode 100644 index 3bdf99974d..0000000000 --- a/asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_800F9F30: -/* 800F9F30 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F9F34 7C 08 02 A6 */ mflr r0 -/* 800F9F38 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F9F3C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F9F40 93 C1 00 08 */ stw r30, 8(r1) -/* 800F9F44 7C 7E 1B 78 */ mr r30, r3 -/* 800F9F48 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F9F4C C0 43 34 78 */ lfs f2, 0x3478(r3) -/* 800F9F50 C0 23 1F E0 */ lfs f1, 0x1fe0(r3) -/* 800F9F54 C0 03 34 7C */ lfs f0, 0x347c(r3) -/* 800F9F58 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800F9F5C EC 02 00 32 */ fmuls f0, f2, f0 -/* 800F9F60 D0 03 33 CC */ stfs f0, 0x33cc(r3) -/* 800F9F64 38 00 00 04 */ li r0, 4 -/* 800F9F68 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800F9F6C 7F E3 FB 78 */ mr r3, r31 -/* 800F9F70 48 06 45 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800F9F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F9F78 41 82 00 24 */ beq lbl_800F9F9C -/* 800F9F7C 7F C3 F3 78 */ mr r3, r30 -/* 800F9F80 38 80 00 00 */ li r4, 0 -/* 800F9F84 4B FC 0F 85 */ bl checkNextActionFromCrouch__9daAlink_cFi -/* 800F9F88 2C 03 00 00 */ cmpwi r3, 0 -/* 800F9F8C 40 82 00 34 */ bne lbl_800F9FC0 -/* 800F9F90 7F C3 F3 78 */ mr r3, r30 -/* 800F9F94 4B FC 94 25 */ bl procWaitInit__9daAlink_cFv -/* 800F9F98 48 00 00 28 */ b lbl_800F9FC0 -lbl_800F9F9C: -/* 800F9F9C C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 800F9FA0 3C 60 80 39 */ lis r3, m__20daAlinkHIO_crouch_c0@ha /* 0x8038E01C@ha */ -/* 800F9FA4 38 63 E0 1C */ addi r3, r3, m__20daAlinkHIO_crouch_c0@l /* 0x8038E01C@l */ -/* 800F9FA8 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 800F9FAC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800F9FB0 40 80 00 10 */ bge lbl_800F9FC0 -/* 800F9FB4 7F C3 F3 78 */ mr r3, r30 -/* 800F9FB8 38 80 00 01 */ li r4, 1 -/* 800F9FBC 4B FC 0F 4D */ bl checkNextActionFromCrouch__9daAlink_cFi -lbl_800F9FC0: -/* 800F9FC0 38 60 00 01 */ li r3, 1 -/* 800F9FC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F9FC8 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F9FCC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F9FD0 7C 08 03 A6 */ mtlr r0 -/* 800F9FD4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F9FD8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s deleted file mode 100644 index 0b26cc3728..0000000000 --- a/asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800F9384: -/* 800F9384 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 800F9388 7C 08 02 A6 */ mflr r0 -/* 800F938C 90 01 00 44 */ stw r0, 0x44(r1) -/* 800F9390 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 800F9394 93 C1 00 38 */ stw r30, 0x38(r1) -/* 800F9398 7C 7E 1B 78 */ mr r30, r3 -/* 800F939C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F93A0 4B FF F5 59 */ bl decideCrawlDoStatus__9daAlink_cFv -/* 800F93A4 C0 62 92 B8 */ lfs f3, lit_6040(r2) -/* 800F93A8 C0 5E 34 78 */ lfs f2, 0x3478(r30) -/* 800F93AC C0 3E 34 7C */ lfs f1, 0x347c(r30) -/* 800F93B0 C0 1F 00 10 */ lfs f0, 0x10(r31) -/* 800F93B4 EC 01 00 28 */ fsubs f0, f1, f0 -/* 800F93B8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 800F93BC EC 03 00 28 */ fsubs f0, f3, f0 -/* 800F93C0 D0 1E 33 CC */ stfs f0, 0x33cc(r30) -/* 800F93C4 3C 60 80 39 */ lis r3, l_crawlFrontOffset@ha /* 0x8038FA54@ha */ -/* 800F93C8 38 63 FA 54 */ addi r3, r3, l_crawlFrontOffset@l /* 0x8038FA54@l */ -/* 800F93CC C0 23 00 08 */ lfs f1, 8(r3) -/* 800F93D0 C0 1E 33 CC */ lfs f0, 0x33cc(r30) -/* 800F93D4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 800F93D8 C0 03 00 00 */ lfs f0, 0(r3) -/* 800F93DC D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800F93E0 C0 03 00 04 */ lfs f0, 4(r3) -/* 800F93E4 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800F93E8 D0 21 00 28 */ stfs f1, 0x28(r1) -/* 800F93EC 80 7E 06 50 */ lwz r3, 0x650(r30) -/* 800F93F0 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F93F4 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F93F8 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800F93FC 48 24 D9 71 */ bl PSMTXMultVec -/* 800F9400 C0 02 93 B0 */ lfs f0, lit_10039(r2) -/* 800F9404 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800F9408 80 7E 06 50 */ lwz r3, 0x650(r30) -/* 800F940C 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F9410 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F9414 38 A1 00 08 */ addi r5, r1, 8 -/* 800F9418 48 24 D9 55 */ bl PSMTXMultVec -/* 800F941C 7F C3 F3 78 */ mr r3, r30 -/* 800F9420 38 81 00 14 */ addi r4, r1, 0x14 -/* 800F9424 38 A1 00 08 */ addi r5, r1, 8 -/* 800F9428 38 C0 00 00 */ li r6, 0 -/* 800F942C 4B FF F1 95 */ bl crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi -/* 800F9430 38 00 00 04 */ li r0, 4 -/* 800F9434 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 800F9438 7F E3 FB 78 */ mr r3, r31 -/* 800F943C 48 06 50 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 800F9440 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800F9444 41 82 00 14 */ beq lbl_800F9458 -/* 800F9448 7F C3 F3 78 */ mr r3, r30 -/* 800F944C A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 800F9450 A8 BE 04 E8 */ lha r5, 0x4e8(r30) -/* 800F9454 48 00 00 21 */ bl procCrawlMoveInit__9daAlink_cFss -lbl_800F9458: -/* 800F9458 38 60 00 01 */ li r3, 1 -/* 800F945C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 800F9460 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 800F9464 80 01 00 44 */ lwz r0, 0x44(r1) -/* 800F9468 7C 08 03 A6 */ mtlr r0 -/* 800F946C 38 21 00 40 */ addi r1, r1, 0x40 -/* 800F9470 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s deleted file mode 100644 index ffa8000809..0000000000 --- a/asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8011EAE8: -/* 8011EAE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011EAEC 7C 08 02 A6 */ mflr r0 -/* 8011EAF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011EAF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011EAF8 7C 7F 1B 78 */ mr r31, r3 -/* 8011EAFC 38 80 00 E7 */ li r4, 0xe7 -/* 8011EB00 4B FA 42 A5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011EB04 2C 03 00 00 */ cmpwi r3, 0 -/* 8011EB08 40 82 00 0C */ bne lbl_8011EB14 -/* 8011EB0C 38 60 00 00 */ li r3, 0 -/* 8011EB10 48 00 00 68 */ b lbl_8011EB78 -lbl_8011EB14: -/* 8011EB14 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011EB18 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011EB1C A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8011EB20 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011EB24 7F E3 FB 78 */ mr r3, r31 -/* 8011EB28 38 80 00 19 */ li r4, 0x19 -/* 8011EB2C 3C A0 80 39 */ lis r5, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 8011EB30 38 A5 D6 BC */ addi r5, r5, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 8011EB34 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 8011EB38 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 8011EB3C 4B F8 E4 A5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 8011EB40 7F E3 FB 78 */ mr r3, r31 -/* 8011EB44 38 80 02 55 */ li r4, 0x255 -/* 8011EB48 38 A0 00 02 */ li r5, 2 -/* 8011EB4C 3C C0 80 39 */ lis r6, m__17daAlinkHIO_cut_c0@ha /* 0x8038DE8C@ha */ -/* 8011EB50 38 E6 DE 8C */ addi r7, r6, m__17daAlinkHIO_cut_c0@l /* 0x8038DE8C@l */ -/* 8011EB54 C0 27 00 04 */ lfs f1, 4(r7) -/* 8011EB58 C0 42 93 1C */ lfs f2, lit_7448(r2) -/* 8011EB5C A8 C7 00 00 */ lha r6, 0(r7) -/* 8011EB60 C0 67 00 0C */ lfs f3, 0xc(r7) -/* 8011EB64 4B F8 E8 75 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 8011EB68 80 1F 05 70 */ lwz r0, 0x570(r31) -/* 8011EB6C 64 00 01 00 */ oris r0, r0, 0x100 -/* 8011EB70 90 1F 05 70 */ stw r0, 0x570(r31) -/* 8011EB74 38 60 00 01 */ li r3, 1 -lbl_8011EB78: -/* 8011EB78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011EB7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011EB80 7C 08 03 A6 */ mtlr r0 -/* 8011EB84 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011EB88 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s deleted file mode 100644 index ebd11b43dd..0000000000 --- a/asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_8011BD6C: -/* 8011BD6C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BD70 7C 08 02 A6 */ mflr r0 -/* 8011BD74 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BD78 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BD7C 7C 7F 1B 78 */ mr r31, r3 -/* 8011BD80 38 80 00 B2 */ li r4, 0xb2 -/* 8011BD84 4B FA 70 21 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011BD88 2C 03 00 00 */ cmpwi r3, 0 -/* 8011BD8C 40 82 00 0C */ bne lbl_8011BD98 -/* 8011BD90 38 60 00 00 */ li r3, 0 -/* 8011BD94 48 00 00 48 */ b lbl_8011BDDC -lbl_8011BD98: -/* 8011BD98 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011BD9C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011BDA0 7F E3 FB 78 */ mr r3, r31 -/* 8011BDA4 38 80 00 00 */ li r4, 0 -/* 8011BDA8 38 A0 00 00 */ li r5, 0 -/* 8011BDAC 4B FA 55 31 */ bl deleteEquipItem__9daAlink_cFii -/* 8011BDB0 38 00 00 40 */ li r0, 0x40 -/* 8011BDB4 B0 1F 2F DC */ sth r0, 0x2fdc(r31) -/* 8011BDB8 7F E3 FB 78 */ mr r3, r31 -/* 8011BDBC 4B FA 3C 35 */ bl setItemActor__9daAlink_cFv -/* 8011BDC0 7F E3 FB 78 */ mr r3, r31 -/* 8011BDC4 38 80 00 BB */ li r4, 0xbb -/* 8011BDC8 3C A0 80 39 */ lis r5, m__18daAlinkHIO_boom_c0@ha /* 0x8038E6C8@ha */ -/* 8011BDCC 38 A5 E6 C8 */ addi r5, r5, m__18daAlinkHIO_boom_c0@l /* 0x8038E6C8@l */ -/* 8011BDD0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8011BDD4 4B F9 13 21 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -/* 8011BDD8 38 60 00 01 */ li r3, 1 -lbl_8011BDDC: -/* 8011BDDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BDE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BDE4 7C 08 03 A6 */ mtlr r0 -/* 8011BDE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BDEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s b/asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s deleted file mode 100644 index cade20c79c..0000000000 --- a/asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8011BDF0: -/* 8011BDF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BDF4 7C 08 02 A6 */ mflr r0 -/* 8011BDF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BDFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BE00 7C 7F 1B 78 */ mr r31, r3 -/* 8011BE04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011BE08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011BE0C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011BE10 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BE14 4B F2 C3 69 */ bl cutEnd__16dEvent_manager_cFi -/* 8011BE18 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011BE1C 48 04 26 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011BE20 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011BE24 41 82 00 18 */ beq lbl_8011BE3C -/* 8011BE28 7F E3 FB 78 */ mr r3, r31 -/* 8011BE2C 3C 80 80 39 */ lis r4, m__19daAlinkHIO_basic_c0@ha /* 0x8038D664@ha */ -/* 8011BE30 38 84 D6 64 */ addi r4, r4, m__19daAlinkHIO_basic_c0@l /* 0x8038D664@l */ -/* 8011BE34 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8011BE38 4B F9 1F DD */ bl setBlendMoveAnime__9daAlink_cFf -lbl_8011BE3C: -/* 8011BE3C 38 60 00 01 */ li r3, 1 -/* 8011BE40 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BE44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BE48 7C 08 03 A6 */ mtlr r0 -/* 8011BE4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BE50 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s deleted file mode 100644 index 68a1e30389..0000000000 --- a/asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8011F084: -/* 8011F084 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011F088 7C 08 02 A6 */ mflr r0 -/* 8011F08C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011F090 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011F094 7C 7F 1B 78 */ mr r31, r3 -/* 8011F098 38 80 00 EB */ li r4, 0xeb -/* 8011F09C 4B FA 3D 09 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011F0A0 2C 03 00 00 */ cmpwi r3, 0 -/* 8011F0A4 40 82 00 0C */ bne lbl_8011F0B0 -/* 8011F0A8 38 60 00 00 */ li r3, 0 -/* 8011F0AC 48 00 00 34 */ b lbl_8011F0E0 -lbl_8011F0B0: -/* 8011F0B0 38 00 00 00 */ li r0, 0 -/* 8011F0B4 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011F0B8 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 8011F0BC 7F E3 FB 78 */ mr r3, r31 -/* 8011F0C0 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011F0C4 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 8011F0C8 38 80 00 00 */ li r4, 0 -/* 8011F0CC 4B F9 C6 A5 */ bl setSpecialGravity__9daAlink_cFffi -/* 8011F0D0 38 00 00 00 */ li r0, 0 -/* 8011F0D4 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8011F0D8 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8011F0DC 38 60 00 01 */ li r3, 1 -lbl_8011F0E0: -/* 8011F0E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011F0E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011F0E8 7C 08 03 A6 */ mtlr r0 -/* 8011F0EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011F0F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s deleted file mode 100644 index 27036c372f..0000000000 --- a/asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8011E9F8: -/* 8011E9F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E9FC 7C 08 02 A6 */ mflr r0 -/* 8011EA00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011EA04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011EA08 7C 7F 1B 78 */ mr r31, r3 -/* 8011EA0C 38 80 00 E6 */ li r4, 0xe6 -/* 8011EA10 4B FA 43 95 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011EA14 2C 03 00 00 */ cmpwi r3, 0 -/* 8011EA18 40 82 00 0C */ bne lbl_8011EA24 -/* 8011EA1C 38 60 00 01 */ li r3, 1 -/* 8011EA20 48 00 00 44 */ b lbl_8011EA64 -lbl_8011EA24: -/* 8011EA24 7F E3 FB 78 */ mr r3, r31 -/* 8011EA28 38 80 01 97 */ li r4, 0x197 -/* 8011EA2C 4B F8 E5 55 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011EA30 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011EA34 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011EA38 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8011EA3C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8011EA40 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) -/* 8011EA44 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8011EA48 D0 1F 37 CC */ stfs f0, 0x37cc(r31) -/* 8011EA4C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8011EA50 D0 1F 37 D0 */ stfs f0, 0x37d0(r31) -/* 8011EA54 80 1F 05 8C */ lwz r0, 0x58c(r31) -/* 8011EA58 64 00 80 00 */ oris r0, r0, 0x8000 -/* 8011EA5C 90 1F 05 8C */ stw r0, 0x58c(r31) -/* 8011EA60 38 60 00 01 */ li r3, 1 -lbl_8011EA64: -/* 8011EA64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011EA68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011EA6C 7C 08 03 A6 */ mtlr r0 -/* 8011EA70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011EA74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoatMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGoatMoveInit__9daAlink_cFv.s deleted file mode 100644 index 4c2b4b3e38..0000000000 --- a/asm/d/a/d_a_alink/procGoatMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_800E9344: -/* 800E9344 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800E9348 7C 08 02 A6 */ mflr r0 -/* 800E934C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E9350 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800E9354 7C 7F 1B 78 */ mr r31, r3 -/* 800E9358 38 80 00 BF */ li r4, 0xbf -/* 800E935C 4B FD 9A 49 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 800E9360 2C 03 00 00 */ cmpwi r3, 0 -/* 800E9364 40 82 00 0C */ bne lbl_800E9370 -/* 800E9368 38 60 00 00 */ li r3, 0 -/* 800E936C 48 00 00 B4 */ b lbl_800E9420 -lbl_800E9370: -/* 800E9370 7F E3 FB 78 */ mr r3, r31 -/* 800E9374 4B FC A5 91 */ bl checkZeroSpeedF__9daAlink_cCFv -/* 800E9378 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800E937C 41 82 00 10 */ beq lbl_800E938C -/* 800E9380 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 800E9384 60 00 00 01 */ ori r0, r0, 1 -/* 800E9388 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_800E938C: -/* 800E938C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800E9390 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 800E9394 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 800E9398 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) -/* 800E939C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 800E93A0 D0 1F 37 CC */ stfs f0, 0x37cc(r31) -/* 800E93A4 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 800E93A8 D0 1F 37 D0 */ stfs f0, 0x37d0(r31) -/* 800E93AC 38 00 00 03 */ li r0, 3 -/* 800E93B0 98 1F 2F 98 */ stb r0, 0x2f98(r31) -/* 800E93B4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800E93B8 38 03 C0 00 */ addi r0, r3, -16384 -/* 800E93BC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 800E93C0 3C 60 80 39 */ lis r3, m__21daAlinkHIO_atnMove_c0@ha /* 0x8038D714@ha */ -/* 800E93C4 38 63 D7 14 */ addi r3, r3, m__21daAlinkHIO_atnMove_c0@l /* 0x8038D714@l */ -/* 800E93C8 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800E93CC D0 1F 05 94 */ stfs f0, 0x594(r31) -/* 800E93D0 7F E3 FB 78 */ mr r3, r31 -/* 800E93D4 38 80 01 1A */ li r4, 0x11a -/* 800E93D8 4B FC 3B A9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 800E93DC 38 00 00 00 */ li r0, 0 -/* 800E93E0 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 800E93E4 3C 60 80 0F */ lis r3, daAlink_searchGoat__FP10fopAc_ac_cPv@ha /* 0x800E91B0@ha */ -/* 800E93E8 38 63 91 B0 */ addi r3, r3, daAlink_searchGoat__FP10fopAc_ac_cPv@l /* 0x800E91B0@l */ -/* 800E93EC 38 80 00 00 */ li r4, 0 -/* 800E93F0 4B F3 04 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv -/* 800E93F4 7C 64 1B 79 */ or. r4, r3, r3 -/* 800E93F8 41 82 00 0C */ beq lbl_800E9404 -/* 800E93FC 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800E9400 48 07 58 B9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c -lbl_800E9404: -/* 800E9404 38 00 00 00 */ li r0, 0 -/* 800E9408 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 800E940C 7F E3 FB 78 */ mr r3, r31 -/* 800E9410 38 80 00 00 */ li r4, 0 -/* 800E9414 38 A0 00 00 */ li r5, 0 -/* 800E9418 4B FD 7E C5 */ bl deleteEquipItem__9daAlink_cFii -/* 800E941C 38 60 00 01 */ li r3, 1 -lbl_800E9420: -/* 800E9420 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800E9424 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800E9428 7C 08 03 A6 */ mtlr r0 -/* 800E942C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800E9430 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s deleted file mode 100644 index c41d148658..0000000000 --- a/asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8011D474: -/* 8011D474 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D478 7C 08 02 A6 */ mflr r0 -/* 8011D47C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D480 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D484 7C 7F 1B 78 */ mr r31, r3 -/* 8011D488 38 80 00 DF */ li r4, 0xdf -/* 8011D48C 4B FA 59 19 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D490 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D494 40 82 00 0C */ bne lbl_8011D4A0 -/* 8011D498 38 60 00 01 */ li r3, 1 -/* 8011D49C 48 00 00 24 */ b lbl_8011D4C0 -lbl_8011D4A0: -/* 8011D4A0 7F E3 FB 78 */ mr r3, r31 -/* 8011D4A4 38 80 01 1A */ li r4, 0x11a -/* 8011D4A8 4B F8 FA D9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011D4AC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011D4B0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011D4B4 38 00 00 00 */ li r0, 0 -/* 8011D4B8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D4BC 38 60 00 01 */ li r3, 1 -lbl_8011D4C0: -/* 8011D4C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D4C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D4C8 7C 08 03 A6 */ mtlr r0 -/* 8011D4CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D4D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s b/asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s deleted file mode 100644 index 668a2021d6..0000000000 --- a/asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8011D4D4: -/* 8011D4D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D4D8 7C 08 02 A6 */ mflr r0 -/* 8011D4DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D4E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D4E4 7C 7F 1B 78 */ mr r31, r3 -/* 8011D4E8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011D4EC 48 04 0F E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011D4F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011D4F4 41 82 00 18 */ beq lbl_8011D50C -/* 8011D4F8 7F E3 FB 78 */ mr r3, r31 -/* 8011D4FC 38 80 01 22 */ li r4, 0x122 -/* 8011D500 4B F8 FA 81 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011D504 38 00 00 01 */ li r0, 1 -/* 8011D508 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_8011D50C: -/* 8011D50C A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011D510 2C 00 00 00 */ cmpwi r0, 0 -/* 8011D514 41 82 00 18 */ beq lbl_8011D52C -/* 8011D518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011D51C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011D520 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011D524 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D528 4B F2 AC 55 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011D52C: -/* 8011D52C 38 60 00 01 */ li r3, 1 -/* 8011D530 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D534 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D538 7C 08 03 A6 */ mtlr r0 -/* 8011D53C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D540 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s deleted file mode 100644 index 1d392d6f67..0000000000 --- a/asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_8011CBD4: -/* 8011CBD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011CBD8 7C 08 02 A6 */ mflr r0 -/* 8011CBDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011CBE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011CBE4 7C 7F 1B 78 */ mr r31, r3 -/* 8011CBE8 38 80 00 D7 */ li r4, 0xd7 -/* 8011CBEC 4B FA 61 B9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011CBF0 2C 03 00 00 */ cmpwi r3, 0 -/* 8011CBF4 40 82 00 0C */ bne lbl_8011CC00 -/* 8011CBF8 38 60 00 00 */ li r3, 0 -/* 8011CBFC 48 00 00 98 */ b lbl_8011CC94 -lbl_8011CC00: -/* 8011CC00 7F E3 FB 78 */ mr r3, r31 -/* 8011CC04 38 80 01 1F */ li r4, 0x11f -/* 8011CC08 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 8011CC0C C0 42 93 00 */ lfs f2, lit_6895(r2) -/* 8011CC10 38 A0 FF FF */ li r5, -1 -/* 8011CC14 C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 8011CC18 4B F9 03 F5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -/* 8011CC1C 38 00 00 FE */ li r0, 0xfe -/* 8011CC20 98 1F 2F 92 */ stb r0, 0x2f92(r31) -/* 8011CC24 98 1F 2F 93 */ stb r0, 0x2f93(r31) -/* 8011CC28 38 00 00 0D */ li r0, 0xd -/* 8011CC2C 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8011CC30 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 8011CC34 38 63 55 44 */ addi r3, r3, l_halfAtnWaitBaseAnime@l /* 0x80425544@l */ -/* 8011CC38 C0 03 00 08 */ lfs f0, 8(r3) -/* 8011CC3C FC 40 00 50 */ fneg f2, f0 -/* 8011CC40 C0 23 00 04 */ lfs f1, 4(r3) -/* 8011CC44 C0 03 00 00 */ lfs f0, 0(r3) -/* 8011CC48 FC 00 00 50 */ fneg f0, f0 -/* 8011CC4C D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8011CC50 D0 3F 35 8C */ stfs f1, 0x358c(r31) -/* 8011CC54 D0 5F 35 90 */ stfs f2, 0x3590(r31) -/* 8011CC58 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011CC5C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011CC60 7F E3 FB 78 */ mr r3, r31 -/* 8011CC64 38 80 00 00 */ li r4, 0 -/* 8011CC68 38 A0 80 00 */ li r5, -32768 -/* 8011CC6C 38 C0 00 00 */ li r6, 0 -/* 8011CC70 4B F9 0F 09 */ bl setOldRootQuaternion__9daAlink_cFsss -/* 8011CC74 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8011CC78 3C 63 00 01 */ addis r3, r3, 1 -/* 8011CC7C 38 03 80 00 */ addi r0, r3, -32768 -/* 8011CC80 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 8011CC84 38 00 00 00 */ li r0, 0 -/* 8011CC88 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011CC8C B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8011CC90 38 60 00 01 */ li r3, 1 -lbl_8011CC94: -/* 8011CC94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011CC98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011CC9C 7C 08 03 A6 */ mtlr r0 -/* 8011CCA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011CCA4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s deleted file mode 100644 index e3f3ba9d53..0000000000 --- a/asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8011DED8: -/* 8011DED8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011DEDC 7C 08 02 A6 */ mflr r0 -/* 8011DEE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011DEE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011DEE8 93 C1 00 08 */ stw r30, 8(r1) -/* 8011DEEC 7C 7E 1B 78 */ mr r30, r3 -/* 8011DEF0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8011DEF4 7F E3 FB 78 */ mr r3, r31 -/* 8011DEF8 48 04 05 D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011DEFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011DF00 41 82 00 1C */ beq lbl_8011DF1C -/* 8011DF04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011DF08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011DF0C 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011DF10 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011DF14 4B F2 A2 69 */ bl cutEnd__16dEvent_manager_cFi -/* 8011DF18 48 00 00 34 */ b lbl_8011DF4C -lbl_8011DF1C: -/* 8011DF1C 7F E3 FB 78 */ mr r3, r31 -/* 8011DF20 C0 22 93 54 */ lfs f1, lit_8248(r2) -/* 8011DF24 48 20 A5 09 */ bl checkPass__12J3DFrameCtrlFf -/* 8011DF28 2C 03 00 00 */ cmpwi r3, 0 -/* 8011DF2C 41 82 00 20 */ beq lbl_8011DF4C -/* 8011DF30 7F C3 F3 78 */ mr r3, r30 -/* 8011DF34 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100A2@ha */ -/* 8011DF38 38 84 00 A2 */ addi r4, r4, 0x00A2 /* 0x000100A2@l */ -/* 8011DF3C 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8011DF40 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011DF44 7D 89 03 A6 */ mtctr r12 -/* 8011DF48 4E 80 04 21 */ bctrl -lbl_8011DF4C: -/* 8011DF4C 38 60 00 01 */ li r3, 1 -/* 8011DF50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011DF54 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011DF58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011DF5C 7C 08 03 A6 */ mtlr r0 -/* 8011DF60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DF64 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s deleted file mode 100644 index 3803db9b28..0000000000 --- a/asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_8011C9D0: -/* 8011C9D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011C9D4 7C 08 02 A6 */ mflr r0 -/* 8011C9D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011C9DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011C9E0 7C 7F 1B 78 */ mr r31, r3 -/* 8011C9E4 38 80 00 D5 */ li r4, 0xd5 -/* 8011C9E8 4B FA 63 BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011C9EC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011C9F0 40 82 00 0C */ bne lbl_8011C9FC -/* 8011C9F4 38 60 00 00 */ li r3, 0 -/* 8011C9F8 48 00 00 40 */ b lbl_8011CA38 -lbl_8011C9FC: -/* 8011C9FC 7F E3 FB 78 */ mr r3, r31 -/* 8011CA00 38 80 00 D4 */ li r4, 0xd4 -/* 8011CA04 4B F9 05 7D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011CA08 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011CA0C D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011CA10 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 8011CA14 C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 8011CA18 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8011CA1C C0 03 00 04 */ lfs f0, 4(r3) -/* 8011CA20 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 8011CA24 C0 03 00 08 */ lfs f0, 8(r3) -/* 8011CA28 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 8011CA2C 38 00 00 0C */ li r0, 0xc -/* 8011CA30 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8011CA34 38 60 00 01 */ li r3, 1 -lbl_8011CA38: -/* 8011CA38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011CA3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011CA40 7C 08 03 A6 */ mtlr r0 -/* 8011CA44 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011CA48 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s deleted file mode 100644 index b42e24fb81..0000000000 --- a/asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8011CA98: -/* 8011CA98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011CA9C 7C 08 02 A6 */ mflr r0 -/* 8011CAA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011CAA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011CAA8 7C 7F 1B 78 */ mr r31, r3 -/* 8011CAAC 38 80 00 D6 */ li r4, 0xd6 -/* 8011CAB0 4B FA 62 F5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011CAB4 2C 03 00 00 */ cmpwi r3, 0 -/* 8011CAB8 40 82 00 0C */ bne lbl_8011CAC4 -/* 8011CABC 38 60 00 00 */ li r3, 0 -/* 8011CAC0 48 00 00 4C */ b lbl_8011CB0C -lbl_8011CAC4: -/* 8011CAC4 7F E3 FB 78 */ mr r3, r31 -/* 8011CAC8 38 80 00 D5 */ li r4, 0xd5 -/* 8011CACC C0 22 93 14 */ lfs f1, lit_7307(r2) -/* 8011CAD0 4B F9 04 E1 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf -/* 8011CAD4 38 00 00 00 */ li r0, 0 -/* 8011CAD8 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011CADC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011CAE0 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011CAE4 3C 60 80 42 */ lis r3, l_waitBaseAnime@ha /* 0x80425514@ha */ -/* 8011CAE8 C4 03 55 14 */ lfsu f0, l_waitBaseAnime@l(r3) /* 0x80425514@l */ -/* 8011CAEC D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8011CAF0 C0 03 00 04 */ lfs f0, 4(r3) -/* 8011CAF4 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 8011CAF8 C0 03 00 08 */ lfs f0, 8(r3) -/* 8011CAFC D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 8011CB00 38 00 00 0C */ li r0, 0xc -/* 8011CB04 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8011CB08 38 60 00 01 */ li r3, 1 -lbl_8011CB0C: -/* 8011CB0C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011CB10 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011CB14 7C 08 03 A6 */ mtlr r0 -/* 8011CB18 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011CB1C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s deleted file mode 100644 index 3473811451..0000000000 --- a/asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_8011CB20: -/* 8011CB20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011CB24 7C 08 02 A6 */ mflr r0 -/* 8011CB28 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011CB2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011CB30 7C 7F 1B 78 */ mr r31, r3 -/* 8011CB34 88 03 2F 99 */ lbz r0, 0x2f99(r3) -/* 8011CB38 28 00 00 0C */ cmplwi r0, 0xc -/* 8011CB3C 41 82 00 0C */ beq lbl_8011CB48 -/* 8011CB40 38 00 00 04 */ li r0, 4 -/* 8011CB44 98 1F 2F 99 */ stb r0, 0x2f99(r31) -lbl_8011CB48: -/* 8011CB48 A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011CB4C 2C 00 00 00 */ cmpwi r0, 0 -/* 8011CB50 40 82 00 4C */ bne lbl_8011CB9C -/* 8011CB54 38 7F 20 18 */ addi r3, r31, 0x2018 -/* 8011CB58 48 04 19 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011CB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011CB60 41 82 00 3C */ beq lbl_8011CB9C -/* 8011CB64 38 00 00 01 */ li r0, 1 -/* 8011CB68 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011CB6C 7F E3 FB 78 */ mr r3, r31 -/* 8011CB70 38 80 00 D3 */ li r4, 0xd3 -/* 8011CB74 4B F9 04 0D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011CB78 7F E3 FB 78 */ mr r3, r31 -/* 8011CB7C 38 80 01 33 */ li r4, 0x133 -/* 8011CB80 38 A0 00 00 */ li r5, 0 -/* 8011CB84 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 8011CB88 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 8011CB8C 4B F9 29 25 */ bl setFaceBck__9daAlink_cFUsiUs -/* 8011CB90 38 00 00 0C */ li r0, 0xc -/* 8011CB94 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8011CB98 48 00 00 24 */ b lbl_8011CBBC -lbl_8011CB9C: -/* 8011CB9C A8 1F 30 0C */ lha r0, 0x300c(r31) -/* 8011CBA0 2C 00 00 00 */ cmpwi r0, 0 -/* 8011CBA4 41 82 00 18 */ beq lbl_8011CBBC -/* 8011CBA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011CBAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011CBB0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011CBB4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011CBB8 4B F2 B5 C5 */ bl cutEnd__16dEvent_manager_cFi -lbl_8011CBBC: -/* 8011CBBC 38 60 00 01 */ li r3, 1 -/* 8011CBC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011CBC4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011CBC8 7C 08 03 A6 */ mtlr r0 -/* 8011CBCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011CBD0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s b/asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s deleted file mode 100644 index 12c428945f..0000000000 --- a/asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_8011CA4C: -/* 8011CA4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011CA50 7C 08 02 A6 */ mflr r0 -/* 8011CA54 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011CA58 7C 64 1B 78 */ mr r4, r3 -/* 8011CA5C 88 03 2F 99 */ lbz r0, 0x2f99(r3) -/* 8011CA60 28 00 00 0C */ cmplwi r0, 0xc -/* 8011CA64 41 82 00 0C */ beq lbl_8011CA70 -/* 8011CA68 38 00 00 04 */ li r0, 4 -/* 8011CA6C 98 04 2F 99 */ stb r0, 0x2f99(r4) -lbl_8011CA70: -/* 8011CA70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011CA74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011CA78 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011CA7C 80 84 31 84 */ lwz r4, 0x3184(r4) -/* 8011CA80 4B F2 B6 FD */ bl cutEnd__16dEvent_manager_cFi -/* 8011CA84 38 60 00 01 */ li r3, 1 -/* 8011CA88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011CA8C 7C 08 03 A6 */ mtlr r0 -/* 8011CA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011CA94 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s deleted file mode 100644 index 01d0293463..0000000000 --- a/asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_8011ED8C: -/* 8011ED8C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011ED90 7C 08 02 A6 */ mflr r0 -/* 8011ED94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011ED98 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011ED9C 93 C1 00 08 */ stw r30, 8(r1) -/* 8011EDA0 7C 7E 1B 78 */ mr r30, r3 -/* 8011EDA4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8011EDA8 7F E3 FB 78 */ mr r3, r31 -/* 8011EDAC 48 03 F7 21 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011EDB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011EDB4 41 82 00 1C */ beq lbl_8011EDD0 -/* 8011EDB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011EDBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011EDC0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011EDC4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011EDC8 4B F2 93 B5 */ bl cutEnd__16dEvent_manager_cFi -/* 8011EDCC 48 00 00 58 */ b lbl_8011EE24 -lbl_8011EDD0: -/* 8011EDD0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8011EDD4 C0 02 93 80 */ lfs f0, lit_8780(r2) -/* 8011EDD8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8011EDDC 4C 41 13 82 */ cror 2, 1, 2 -/* 8011EDE0 40 82 00 10 */ bne lbl_8011EDF0 -/* 8011EDE4 38 00 00 0A */ li r0, 0xa -/* 8011EDE8 98 1E 2F 93 */ stb r0, 0x2f93(r30) -/* 8011EDEC 48 00 00 38 */ b lbl_8011EE24 -lbl_8011EDF0: -/* 8011EDF0 C0 02 93 34 */ lfs f0, lit_7710(r2) -/* 8011EDF4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8011EDF8 4C 41 13 82 */ cror 2, 1, 2 -/* 8011EDFC 40 82 00 10 */ bne lbl_8011EE0C -/* 8011EE00 38 00 00 00 */ li r0, 0 -/* 8011EE04 B0 1E 30 10 */ sth r0, 0x3010(r30) -/* 8011EE08 48 00 00 1C */ b lbl_8011EE24 -lbl_8011EE0C: -/* 8011EE0C C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 8011EE10 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8011EE14 4C 41 13 82 */ cror 2, 1, 2 -/* 8011EE18 40 82 00 0C */ bne lbl_8011EE24 -/* 8011EE1C 38 00 00 04 */ li r0, 4 -/* 8011EE20 B0 1E 30 10 */ sth r0, 0x3010(r30) -lbl_8011EE24: -/* 8011EE24 38 60 00 01 */ li r3, 1 -/* 8011EE28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011EE2C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011EE30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011EE34 7C 08 03 A6 */ mtlr r0 -/* 8011EE38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011EE3C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s deleted file mode 100644 index d0a80762e7..0000000000 --- a/asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8011BC74: -/* 8011BC74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BC78 7C 08 02 A6 */ mflr r0 -/* 8011BC7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BC80 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BC84 7C 7F 1B 78 */ mr r31, r3 -/* 8011BC88 38 80 00 B1 */ li r4, 0xb1 -/* 8011BC8C 4B FA 71 19 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011BC90 2C 03 00 00 */ cmpwi r3, 0 -/* 8011BC94 40 82 00 0C */ bne lbl_8011BCA0 -/* 8011BC98 38 60 00 00 */ li r3, 0 -/* 8011BC9C 48 00 00 68 */ b lbl_8011BD04 -lbl_8011BCA0: -/* 8011BCA0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8011BCA4 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011BCA8 7F E3 FB 78 */ mr r3, r31 -/* 8011BCAC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011BCB0 C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 8011BCB4 38 80 00 00 */ li r4, 0 -/* 8011BCB8 4B F9 FA B9 */ bl setSpecialGravity__9daAlink_cFffi -/* 8011BCBC C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011BCC0 D0 1F 04 FC */ stfs f0, 0x4fc(r31) -/* 8011BCC4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011BCC8 7F E3 FB 78 */ mr r3, r31 -/* 8011BCCC 38 80 00 00 */ li r4, 0 -/* 8011BCD0 38 A0 00 00 */ li r5, 0 -/* 8011BCD4 4B FA 56 09 */ bl deleteEquipItem__9daAlink_cFii -/* 8011BCD8 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011BCDC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011BCE0 40 82 00 20 */ bne lbl_8011BD00 -/* 8011BCE4 7F E3 FB 78 */ mr r3, r31 -/* 8011BCE8 38 80 00 FC */ li r4, 0xfc -/* 8011BCEC C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011BCF0 C0 42 92 C4 */ lfs f2, lit_6109(r2) -/* 8011BCF4 4B F9 12 ED */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -/* 8011BCF8 7F E3 FB 78 */ mr r3, r31 -/* 8011BCFC 4B FF FF 19 */ bl setMonkeyMoveAnime__9daAlink_cFv -lbl_8011BD00: -/* 8011BD00 38 60 00 01 */ li r3, 1 -lbl_8011BD04: -/* 8011BD04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BD08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BD0C 7C 08 03 A6 */ mtlr r0 -/* 8011BD10 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BD14 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s deleted file mode 100644 index 2c57294821..0000000000 --- a/asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8011BD18: -/* 8011BD18 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011BD1C 7C 08 02 A6 */ mflr r0 -/* 8011BD20 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011BD24 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011BD28 7C 7F 1B 78 */ mr r31, r3 -/* 8011BD2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011BD30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011BD34 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011BD38 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BD3C 4B F2 C4 41 */ bl cutEnd__16dEvent_manager_cFi -/* 8011BD40 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8011BD44 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 8011BD48 40 82 00 0C */ bne lbl_8011BD54 -/* 8011BD4C 7F E3 FB 78 */ mr r3, r31 -/* 8011BD50 4B FF FE C5 */ bl setMonkeyMoveAnime__9daAlink_cFv -lbl_8011BD54: -/* 8011BD54 38 60 00 01 */ li r3, 1 -/* 8011BD58 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011BD5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011BD60 7C 08 03 A6 */ mtlr r0 -/* 8011BD64 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011BD68 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s deleted file mode 100644 index 1243a3f980..0000000000 --- a/asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8011E8E0: -/* 8011E8E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E8E4 7C 08 02 A6 */ mflr r0 -/* 8011E8E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011E8EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011E8F0 7C 7F 1B 78 */ mr r31, r3 -/* 8011E8F4 38 80 00 E5 */ li r4, 0xe5 -/* 8011E8F8 4B FA 44 AD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011E8FC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011E900 40 82 00 0C */ bne lbl_8011E90C -/* 8011E904 38 60 00 01 */ li r3, 1 -/* 8011E908 48 00 00 44 */ b lbl_8011E94C -lbl_8011E90C: -/* 8011E90C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011E910 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011E914 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8011E918 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011E91C 38 00 00 00 */ li r0, 0 -/* 8011E920 90 1F 31 98 */ stw r0, 0x3198(r31) -/* 8011E924 7F E3 FB 78 */ mr r3, r31 -/* 8011E928 4B FF FF 15 */ bl setSwordPushAnime__9daAlink_cFv -/* 8011E92C 3C 60 80 42 */ lis r3, l_halfAtnWaitBaseAnime@ha /* 0x80425544@ha */ -/* 8011E930 C4 03 55 44 */ lfsu f0, l_halfAtnWaitBaseAnime@l(r3) /* 0x80425544@l */ -/* 8011E934 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8011E938 C0 03 00 04 */ lfs f0, 4(r3) -/* 8011E93C D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 8011E940 C0 03 00 08 */ lfs f0, 8(r3) -/* 8011E944 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 8011E948 38 60 00 01 */ li r3, 1 -lbl_8011E94C: -/* 8011E94C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E950 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E954 7C 08 03 A6 */ mtlr r0 -/* 8011E958 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E95C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s deleted file mode 100644 index 9401df8edc..0000000000 --- a/asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_8011E960: -/* 8011E960 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E964 7C 08 02 A6 */ mflr r0 -/* 8011E968 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011E96C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011E970 7C 7F 1B 78 */ mr r31, r3 -/* 8011E974 38 00 00 04 */ li r0, 4 -/* 8011E978 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 8011E97C 80 03 05 88 */ lwz r0, 0x588(r3) -/* 8011E980 64 00 08 00 */ oris r0, r0, 0x800 -/* 8011E984 90 03 05 88 */ stw r0, 0x588(r3) -/* 8011E988 4B FF FE B5 */ bl setSwordPushAnime__9daAlink_cFv -/* 8011E98C 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 8011E990 2C 00 01 93 */ cmpwi r0, 0x193 -/* 8011E994 40 82 00 18 */ bne lbl_8011E9AC -/* 8011E998 7F E3 FB 78 */ mr r3, r31 -/* 8011E99C 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100C2@ha */ -/* 8011E9A0 38 84 00 C2 */ addi r4, r4, 0x00C2 /* 0x000100C2@l */ -/* 8011E9A4 4B FA 07 15 */ bl voiceStartLevel__9daAlink_cFUl -/* 8011E9A8 48 00 00 38 */ b lbl_8011E9E0 -lbl_8011E9AC: -/* 8011E9AC 2C 00 01 94 */ cmpwi r0, 0x194 -/* 8011E9B0 40 82 00 18 */ bne lbl_8011E9C8 -/* 8011E9B4 7F E3 FB 78 */ mr r3, r31 -/* 8011E9B8 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100C4@ha */ -/* 8011E9BC 38 84 00 C4 */ addi r4, r4, 0x00C4 /* 0x000100C4@l */ -/* 8011E9C0 4B FA 06 F9 */ bl voiceStartLevel__9daAlink_cFUl -/* 8011E9C4 48 00 00 1C */ b lbl_8011E9E0 -lbl_8011E9C8: -/* 8011E9C8 2C 00 01 92 */ cmpwi r0, 0x192 -/* 8011E9CC 40 82 00 14 */ bne lbl_8011E9E0 -/* 8011E9D0 7F E3 FB 78 */ mr r3, r31 -/* 8011E9D4 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100C3@ha */ -/* 8011E9D8 38 84 00 C3 */ addi r4, r4, 0x00C3 /* 0x000100C3@l */ -/* 8011E9DC 4B FA 06 DD */ bl voiceStartLevel__9daAlink_cFUl -lbl_8011E9E0: -/* 8011E9E0 38 60 00 01 */ li r3, 1 -/* 8011E9E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E9E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E9EC 7C 08 03 A6 */ mtlr r0 -/* 8011E9F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E9F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s deleted file mode 100644 index cb70de8a40..0000000000 --- a/asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8011E6E0: -/* 8011E6E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E6E4 7C 08 02 A6 */ mflr r0 -/* 8011E6E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011E6EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011E6F0 7C 7F 1B 78 */ mr r31, r3 -/* 8011E6F4 38 80 00 E4 */ li r4, 0xe4 -/* 8011E6F8 4B FA 46 AD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011E6FC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011E700 40 82 00 0C */ bne lbl_8011E70C -/* 8011E704 38 60 00 00 */ li r3, 0 -/* 8011E708 48 00 00 2C */ b lbl_8011E734 -lbl_8011E70C: -/* 8011E70C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011E710 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011E714 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8011E718 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011E71C 7F E3 FB 78 */ mr r3, r31 -/* 8011E720 38 80 01 8A */ li r4, 0x18a -/* 8011E724 4B F8 E8 5D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011E728 38 00 00 00 */ li r0, 0 -/* 8011E72C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011E730 38 60 00 01 */ li r3, 1 -lbl_8011E734: -/* 8011E734 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E738 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E73C 7C 08 03 A6 */ mtlr r0 -/* 8011E740 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E744 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s deleted file mode 100644 index 26f1a57e9f..0000000000 --- a/asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_8011E748: -/* 8011E748 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E74C 7C 08 02 A6 */ mflr r0 -/* 8011E750 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011E754 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011E758 93 C1 00 08 */ stw r30, 8(r1) -/* 8011E75C 7C 7E 1B 78 */ mr r30, r3 -/* 8011E760 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8011E764 7F E3 FB 78 */ mr r3, r31 -/* 8011E768 48 03 FD 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv -/* 8011E76C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8011E770 41 82 00 5C */ beq lbl_8011E7CC -/* 8011E774 A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 8011E778 2C 00 00 00 */ cmpwi r0, 0 -/* 8011E77C 40 82 00 30 */ bne lbl_8011E7AC -/* 8011E780 3C 60 80 39 */ lis r3, m__26daAlinkHIO_noActAtnMove_c0@ha /* 0x8038D768@ha */ -/* 8011E784 38 63 D7 68 */ addi r3, r3, m__26daAlinkHIO_noActAtnMove_c0@l /* 0x8038D768@l */ -/* 8011E788 C0 43 00 08 */ lfs f2, 8(r3) -/* 8011E78C 7F C3 F3 78 */ mr r3, r30 -/* 8011E790 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011E794 FC 60 10 90 */ fmr f3, f2 -/* 8011E798 38 80 00 1A */ li r4, 0x1a -/* 8011E79C 38 A0 00 1A */ li r5, 0x1a -/* 8011E7A0 38 C0 00 02 */ li r6, 2 -/* 8011E7A4 C0 82 92 C4 */ lfs f4, lit_6109(r2) -/* 8011E7A8 4B F8 E2 6D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif -lbl_8011E7AC: -/* 8011E7AC 38 00 00 01 */ li r0, 1 -/* 8011E7B0 B0 1E 30 0C */ sth r0, 0x300c(r30) -/* 8011E7B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011E7B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011E7BC 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011E7C0 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011E7C4 4B F2 99 B9 */ bl cutEnd__16dEvent_manager_cFi -/* 8011E7C8 48 00 00 58 */ b lbl_8011E820 -lbl_8011E7CC: -/* 8011E7CC A8 1E 30 0C */ lha r0, 0x300c(r30) -/* 8011E7D0 2C 00 00 00 */ cmpwi r0, 0 -/* 8011E7D4 41 82 00 1C */ beq lbl_8011E7F0 -/* 8011E7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011E7DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011E7E0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8011E7E4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011E7E8 4B F2 99 95 */ bl cutEnd__16dEvent_manager_cFi -/* 8011E7EC 48 00 00 34 */ b lbl_8011E820 -lbl_8011E7F0: -/* 8011E7F0 7F E3 FB 78 */ mr r3, r31 -/* 8011E7F4 C0 22 93 30 */ lfs f1, lit_7625(r2) -/* 8011E7F8 48 20 9C 35 */ bl checkPass__12J3DFrameCtrlFf -/* 8011E7FC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011E800 41 82 00 20 */ beq lbl_8011E820 -/* 8011E804 7F C3 F3 78 */ mr r3, r30 -/* 8011E808 3C 80 00 01 */ lis r4, 0x0001 /* 0x0001009E@ha */ -/* 8011E80C 38 84 00 9E */ addi r4, r4, 0x009E /* 0x0001009E@l */ -/* 8011E810 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8011E814 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011E818 7D 89 03 A6 */ mtctr r12 -/* 8011E81C 4E 80 04 21 */ bctrl -lbl_8011E820: -/* 8011E820 38 60 00 01 */ li r3, 1 -/* 8011E824 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E828 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011E82C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E830 7C 08 03 A6 */ mtlr r0 -/* 8011E834 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E838 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s deleted file mode 100644 index 2b23a75f3c..0000000000 --- a/asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_8011DF68: -/* 8011DF68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011DF6C 7C 08 02 A6 */ mflr r0 -/* 8011DF70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011DF74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011DF78 7C 7F 1B 78 */ mr r31, r3 -/* 8011DF7C 38 80 00 E2 */ li r4, 0xe2 -/* 8011DF80 4B FA 4E 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011DF84 2C 03 00 00 */ cmpwi r3, 0 -/* 8011DF88 40 82 00 0C */ bne lbl_8011DF94 -/* 8011DF8C 38 60 00 00 */ li r3, 0 -/* 8011DF90 48 00 00 BC */ b lbl_8011E04C -lbl_8011DF94: -/* 8011DF94 7F E3 FB 78 */ mr r3, r31 -/* 8011DF98 38 9F 37 C8 */ addi r4, r31, 0x37c8 -/* 8011DF9C 4B FF A3 6D */ bl setTalkStartBack__9daAlink_cFP4cXyz -/* 8011DFA0 90 7F 31 98 */ stw r3, 0x3198(r31) -/* 8011DFA4 80 1F 31 98 */ lwz r0, 0x3198(r31) -/* 8011DFA8 2C 00 00 00 */ cmpwi r0, 0 -/* 8011DFAC 40 82 00 20 */ bne lbl_8011DFCC -/* 8011DFB0 7F E3 FB 78 */ mr r3, r31 -/* 8011DFB4 4B FF A7 21 */ bl setTradeItemAnime__9daAlink_cFv -/* 8011DFB8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 8011DFBC B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011DFC0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011DFC4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011DFC8 48 00 00 0C */ b lbl_8011DFD4 -lbl_8011DFCC: -/* 8011DFCC 38 00 00 00 */ li r0, 0 -/* 8011DFD0 B0 1F 30 0C */ sth r0, 0x300c(r31) -lbl_8011DFD4: -/* 8011DFD4 38 00 00 00 */ li r0, 0 -/* 8011DFD8 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8011DFDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011DFE0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011DFE4 80 03 5F 18 */ lwz r0, 0x5f18(r3) -/* 8011DFE8 60 00 00 10 */ ori r0, r0, 0x10 -/* 8011DFEC 90 03 5F 18 */ stw r0, 0x5f18(r3) -/* 8011DFF0 38 00 00 01 */ li r0, 1 -/* 8011DFF4 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8011DFF8 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 8011DFFC 2C 00 00 01 */ cmpwi r0, 1 -/* 8011E000 41 82 00 40 */ beq lbl_8011E040 -/* 8011E004 2C 00 00 02 */ cmpwi r0, 2 -/* 8011E008 40 82 00 20 */ bne lbl_8011E028 -/* 8011E00C 80 7F 06 10 */ lwz r3, 0x610(r31) -/* 8011E010 48 00 03 C9 */ bl checkLetterItem__9daAlink_cFi -/* 8011E014 2C 03 00 00 */ cmpwi r3, 0 -/* 8011E018 41 82 00 28 */ beq lbl_8011E040 -/* 8011E01C 38 00 00 00 */ li r0, 0 -/* 8011E020 B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8011E024 48 00 00 1C */ b lbl_8011E040 -lbl_8011E028: -/* 8011E028 88 63 4F B6 */ lbz r3, 0x4fb6(r3) -/* 8011E02C 48 00 03 AD */ bl checkLetterItem__9daAlink_cFi -/* 8011E030 2C 03 00 00 */ cmpwi r3, 0 -/* 8011E034 41 82 00 0C */ beq lbl_8011E040 -/* 8011E038 38 00 00 00 */ li r0, 0 -/* 8011E03C B0 1F 30 10 */ sth r0, 0x3010(r31) -lbl_8011E040: -/* 8011E040 38 00 00 1E */ li r0, 0x1e -/* 8011E044 B0 1F 30 08 */ sth r0, 0x3008(r31) -/* 8011E048 38 60 00 01 */ li r3, 1 -lbl_8011E04C: -/* 8011E04C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E050 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E054 7C 08 03 A6 */ mtlr r0 -/* 8011E058 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E05C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s deleted file mode 100644 index 67c352a38d..0000000000 --- a/asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8011D0A0: -/* 8011D0A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D0A4 7C 08 02 A6 */ mflr r0 -/* 8011D0A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D0AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D0B0 7C 7F 1B 78 */ mr r31, r3 -/* 8011D0B4 38 80 01 3A */ li r4, 0x13a -/* 8011D0B8 4B FA 5C ED */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D0BC 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D0C0 40 82 00 0C */ bne lbl_8011D0CC -/* 8011D0C4 38 60 00 01 */ li r3, 1 -/* 8011D0C8 48 00 00 34 */ b lbl_8011D0FC -lbl_8011D0CC: -/* 8011D0CC 7F E3 FB 78 */ mr r3, r31 -/* 8011D0D0 38 80 00 72 */ li r4, 0x72 -/* 8011D0D4 3C A0 80 39 */ lis r5, m__21daAlinkHIO_wlChain_c0@ha /* 0x8038F858@ha */ -/* 8011D0D8 38 A5 F8 58 */ addi r5, r5, m__21daAlinkHIO_wlChain_c0@l /* 0x8038F858@l */ -/* 8011D0DC C0 25 00 54 */ lfs f1, 0x54(r5) -/* 8011D0E0 C0 45 00 58 */ lfs f2, 0x58(r5) -/* 8011D0E4 48 00 C5 F5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -/* 8011D0E8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 8011D0EC B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011D0F0 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011D0F4 D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011D0F8 38 60 00 01 */ li r3, 1 -lbl_8011D0FC: -/* 8011D0FC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D100 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D104 7C 08 03 A6 */ mtlr r0 -/* 8011D108 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D10C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s deleted file mode 100644 index c29010d300..0000000000 --- a/asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s +++ /dev/null @@ -1,54 +0,0 @@ -lbl_8011D82C: -/* 8011D82C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011D830 7C 08 02 A6 */ mflr r0 -/* 8011D834 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011D838 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011D83C 7C 7F 1B 78 */ mr r31, r3 -/* 8011D840 38 80 01 3B */ li r4, 0x13b -/* 8011D844 4B FA 55 61 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011D848 2C 03 00 00 */ cmpwi r3, 0 -/* 8011D84C 40 82 00 0C */ bne lbl_8011D858 -/* 8011D850 38 60 00 01 */ li r3, 1 -/* 8011D854 48 00 00 90 */ b lbl_8011D8E4 -lbl_8011D858: -/* 8011D858 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 8011D85C 3C 63 00 01 */ addis r3, r3, 1 -/* 8011D860 38 03 80 00 */ addi r0, r3, -32768 -/* 8011D864 B0 1F 04 DE */ sth r0, 0x4de(r31) -/* 8011D868 7F E3 FB 78 */ mr r3, r31 -/* 8011D86C 38 80 00 1B */ li r4, 0x1b -/* 8011D870 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 8011D874 C0 42 93 3C */ lfs f2, lit_7808(r2) -/* 8011D878 38 A0 00 0B */ li r5, 0xb -/* 8011D87C C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 8011D880 48 00 BE 85 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -/* 8011D884 7F E3 FB 78 */ mr r3, r31 -/* 8011D888 3C 80 00 01 */ lis r4, 0x0001 /* 0x00010033@ha */ -/* 8011D88C 38 84 00 33 */ addi r4, r4, 0x0033 /* 0x00010033@l */ -/* 8011D890 81 9F 06 28 */ lwz r12, 0x628(r31) -/* 8011D894 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011D898 7D 89 03 A6 */ mtctr r12 -/* 8011D89C 4E 80 04 21 */ bctrl -/* 8011D8A0 38 00 00 0D */ li r0, 0xd -/* 8011D8A4 98 1F 2F 99 */ stb r0, 0x2f99(r31) -/* 8011D8A8 3C 60 80 42 */ lis r3, l_wolfBaseAnime@ha /* 0x8042561C@ha */ -/* 8011D8AC C4 03 56 1C */ lfsu f0, l_wolfBaseAnime@l(r3) /* 0x8042561C@l */ -/* 8011D8B0 D0 1F 35 88 */ stfs f0, 0x3588(r31) -/* 8011D8B4 C0 03 00 04 */ lfs f0, 4(r3) -/* 8011D8B8 D0 1F 35 8C */ stfs f0, 0x358c(r31) -/* 8011D8BC C0 03 00 08 */ lfs f0, 8(r3) -/* 8011D8C0 D0 1F 35 90 */ stfs f0, 0x3590(r31) -/* 8011D8C4 C0 02 96 68 */ lfs f0, lit_37528(r2) -/* 8011D8C8 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 8011D8CC 38 00 00 00 */ li r0, 0 -/* 8011D8D0 B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 8011D8D4 B0 1F 30 0E */ sth r0, 0x300e(r31) -/* 8011D8D8 C0 02 92 E0 */ lfs f0, lit_6845(r2) -/* 8011D8DC D0 1F 33 98 */ stfs f0, 0x3398(r31) -/* 8011D8E0 38 60 00 01 */ li r3, 1 -lbl_8011D8E4: -/* 8011D8E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011D8E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011D8EC 7C 08 03 A6 */ mtlr r0 -/* 8011D8F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011D8F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s b/asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s deleted file mode 100644 index 1ff0322515..0000000000 --- a/asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8011DB04: -/* 8011DB04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011DB08 7C 08 02 A6 */ mflr r0 -/* 8011DB0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011DB10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011DB14 7C 7F 1B 78 */ mr r31, r3 -/* 8011DB18 38 80 00 E0 */ li r4, 0xe0 -/* 8011DB1C 4B FA 52 89 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -/* 8011DB20 2C 03 00 00 */ cmpwi r3, 0 -/* 8011DB24 40 82 00 0C */ bne lbl_8011DB30 -/* 8011DB28 38 60 00 01 */ li r3, 1 -/* 8011DB2C 48 00 00 5C */ b lbl_8011DB88 -lbl_8011DB30: -/* 8011DB30 7F E3 FB 78 */ mr r3, r31 -/* 8011DB34 38 80 00 60 */ li r4, 0x60 -/* 8011DB38 4B F8 F4 49 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011DB3C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 8011DB40 D0 3F 04 FC */ stfs f1, 0x4fc(r31) -/* 8011DB44 D0 3F 33 98 */ stfs f1, 0x3398(r31) -/* 8011DB48 7F E3 FB 78 */ mr r3, r31 -/* 8011DB4C C0 5F 05 34 */ lfs f2, 0x534(r31) -/* 8011DB50 38 80 00 00 */ li r4, 0 -/* 8011DB54 4B F9 DC 1D */ bl setSpecialGravity__9daAlink_cFffi -/* 8011DB58 7F E3 FB 78 */ mr r3, r31 -/* 8011DB5C 38 80 00 00 */ li r4, 0 -/* 8011DB60 38 A0 00 01 */ li r5, 1 -/* 8011DB64 4B FA 37 79 */ bl deleteEquipItem__9daAlink_cFii -/* 8011DB68 38 00 13 88 */ li r0, 0x1388 -/* 8011DB6C B0 1F 30 10 */ sth r0, 0x3010(r31) -/* 8011DB70 38 00 00 00 */ li r0, 0 -/* 8011DB74 B0 1F 30 12 */ sth r0, 0x3012(r31) -/* 8011DB78 3C 60 80 42 */ lis r3, l_boarBaseAnime@ha /* 0x804255A4@ha */ -/* 8011DB7C 38 03 55 A4 */ addi r0, r3, l_boarBaseAnime@l /* 0x804255A4@l */ -/* 8011DB80 90 1F 38 4C */ stw r0, 0x384c(r31) -/* 8011DB84 38 60 00 01 */ li r3, 1 -lbl_8011DB88: -/* 8011DB88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011DB8C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011DB90 7C 08 03 A6 */ mtlr r0 -/* 8011DB94 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011DB98 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFacePriAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFacePriAnime__9daAlink_cFv.s deleted file mode 100644 index eede40332b..0000000000 --- a/asm/d/a/d_a_alink/resetFacePriAnime__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800AFCBC: -/* 800AFCBC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFCC0 7C 08 02 A6 */ mflr r0 -/* 800AFCC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFCC8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AFCCC 7C 7F 1B 78 */ mr r31, r3 -/* 800AFCD0 4B FF FF B9 */ bl resetFacePriTexture__9daAlink_cFv -/* 800AFCD4 7F E3 FB 78 */ mr r3, r31 -/* 800AFCD8 4B FF FE 9D */ bl resetFacePriBck__9daAlink_cFv -/* 800AFCDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AFCE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFCE4 7C 08 03 A6 */ mtlr r0 -/* 800AFCE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFCEC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFacePriBck__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFacePriBck__9daAlink_cFv.s deleted file mode 100644 index ae3dcbfe41..0000000000 --- a/asm/d/a/d_a_alink/resetFacePriBck__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800AFB74: -/* 800AFB74 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFB78 7C 08 02 A6 */ mflr r0 -/* 800AFB7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFB80 A0 03 21 42 */ lhz r0, 0x2142(r3) -/* 800AFB84 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFB88 41 82 00 38 */ beq lbl_800AFBC0 -/* 800AFB8C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFB90 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFB94 B0 03 21 42 */ sth r0, 0x2142(r3) -/* 800AFB98 A0 03 21 40 */ lhz r0, 0x2140(r3) -/* 800AFB9C 7C 04 03 78 */ mr r4, r0 -/* 800AFBA0 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFBA4 40 82 00 08 */ bne lbl_800AFBAC -/* 800AFBA8 38 80 00 DF */ li r4, 0xdf -lbl_800AFBAC: -/* 800AFBAC 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFBB0 38 C5 FF FF */ addi r6, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFBB4 B0 C3 21 40 */ sth r6, 0x2140(r3) -/* 800AFBB8 38 A0 00 00 */ li r5, 0 -/* 800AFBBC 4B FF F8 F5 */ bl setFaceBck__9daAlink_cFUsiUs -lbl_800AFBC0: -/* 800AFBC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFBC4 7C 08 03 A6 */ mtlr r0 -/* 800AFBC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFBCC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFacePriBtk__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFacePriBtk__9daAlink_cFv.s deleted file mode 100644 index e040141dca..0000000000 --- a/asm/d/a/d_a_alink/resetFacePriBtk__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800AFC2C: -/* 800AFC2C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFC30 7C 08 02 A6 */ mflr r0 -/* 800AFC34 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFC38 A0 03 21 2E */ lhz r0, 0x212e(r3) -/* 800AFC3C 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFC40 41 82 00 38 */ beq lbl_800AFC78 -/* 800AFC44 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFC48 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFC4C B0 03 21 2E */ sth r0, 0x212e(r3) -/* 800AFC50 A0 03 21 2C */ lhz r0, 0x212c(r3) -/* 800AFC54 7C 04 03 78 */ mr r4, r0 -/* 800AFC58 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFC5C 40 82 00 08 */ bne lbl_800AFC64 -/* 800AFC60 38 80 03 79 */ li r4, 0x379 -lbl_800AFC64: -/* 800AFC64 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFC68 38 C5 FF FF */ addi r6, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFC6C B0 C3 21 2C */ sth r6, 0x212c(r3) -/* 800AFC70 38 A0 00 00 */ li r5, 0 -/* 800AFC74 4B FF FB 5D */ bl setFaceBtk__9daAlink_cFUsiUs -lbl_800AFC78: -/* 800AFC78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFC7C 7C 08 03 A6 */ mtlr r0 -/* 800AFC80 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFC84 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFacePriBtp__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFacePriBtp__9daAlink_cFv.s deleted file mode 100644 index c9d150ef62..0000000000 --- a/asm/d/a/d_a_alink/resetFacePriBtp__9daAlink_cFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_800AFBD0: -/* 800AFBD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFBD4 7C 08 02 A6 */ mflr r0 -/* 800AFBD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFBDC A0 03 21 1A */ lhz r0, 0x211a(r3) -/* 800AFBE0 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFBE4 41 82 00 38 */ beq lbl_800AFC1C -/* 800AFBE8 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFBEC 38 04 FF FF */ addi r0, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFBF0 B0 03 21 1A */ sth r0, 0x211a(r3) -/* 800AFBF4 A0 03 21 18 */ lhz r0, 0x2118(r3) -/* 800AFBF8 7C 04 03 78 */ mr r4, r0 -/* 800AFBFC 28 00 FF FF */ cmplwi r0, 0xffff -/* 800AFC00 40 82 00 08 */ bne lbl_800AFC08 -/* 800AFC04 38 80 03 DF */ li r4, 0x3df -lbl_800AFC08: -/* 800AFC08 3C A0 00 01 */ lis r5, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFC0C 38 C5 FF FF */ addi r6, r5, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFC10 B0 C3 21 18 */ sth r6, 0x2118(r3) -/* 800AFC14 38 A0 00 00 */ li r5, 0 -/* 800AFC18 4B FF FA 05 */ bl setFaceBtp__9daAlink_cFUsiUs -lbl_800AFC1C: -/* 800AFC1C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFC20 7C 08 03 A6 */ mtlr r0 -/* 800AFC24 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFC28 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetFacePriTexture__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetFacePriTexture__9daAlink_cFv.s deleted file mode 100644 index 037000e8a0..0000000000 --- a/asm/d/a/d_a_alink/resetFacePriTexture__9daAlink_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800AFC88: -/* 800AFC88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFC8C 7C 08 02 A6 */ mflr r0 -/* 800AFC90 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFC94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AFC98 7C 7F 1B 78 */ mr r31, r3 -/* 800AFC9C 4B FF FF 35 */ bl resetFacePriBtp__9daAlink_cFv -/* 800AFCA0 7F E3 FB 78 */ mr r3, r31 -/* 800AFCA4 4B FF FF 89 */ bl resetFacePriBtk__9daAlink_cFv -/* 800AFCA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AFCAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFCB0 7C 08 03 A6 */ mtlr r0 -/* 800AFCB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFCB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf.s b/asm/d/a/d_a_alink/resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf.s deleted file mode 100644 index 0206a1b63c..0000000000 --- a/asm/d/a/d_a_alink/resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_800ADAEC: -/* 800ADAEC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800ADAF0 7C 08 02 A6 */ mflr r0 -/* 800ADAF4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800ADAF8 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800ADAFC F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800ADB00 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800ADB04 7C 7F 1B 78 */ mr r31, r3 -/* 800ADB08 FF E0 08 90 */ fmr f31, f1 -/* 800ADB0C 38 00 00 00 */ li r0, 0 -/* 800ADB10 54 83 18 38 */ slwi r3, r4, 3 -/* 800ADB14 7C 7F 1A 14 */ add r3, r31, r3 -/* 800ADB18 90 03 1F 2C */ stw r0, 0x1f2c(r3) -/* 800ADB1C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800ADB20 D0 03 1F 28 */ stfs f0, 0x1f28(r3) -/* 800ADB24 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 800ADB28 38 A3 FF FF */ addi r5, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 800ADB2C 1C 04 00 14 */ mulli r0, r4, 0x14 -/* 800ADB30 7C 7F 02 14 */ add r3, r31, r0 -/* 800ADB34 B0 A3 1F 58 */ sth r5, 0x1f58(r3) -/* 800ADB38 1C 64 00 18 */ mulli r3, r4, 0x18 -/* 800ADB3C 38 63 1F D0 */ addi r3, r3, 0x1fd0 -/* 800ADB40 7C 7F 1A 14 */ add r3, r31, r3 -/* 800ADB44 38 80 00 00 */ li r4, 0 -/* 800ADB48 48 27 A8 B5 */ bl init__12J3DFrameCtrlFs -/* 800ADB4C 7F E3 FB 78 */ mr r3, r31 -/* 800ADB50 FC 20 F8 90 */ fmr f1, f31 -/* 800ADB54 4B FF FD A1 */ bl setUnderAnimeMorf__9daAlink_cFf -/* 800ADB58 38 60 00 01 */ li r3, 1 -/* 800ADB5C E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800ADB60 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800ADB64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800ADB68 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800ADB6C 7C 08 03 A6 */ mtlr r0 -/* 800ADB70 38 21 00 20 */ addi r1, r1, 0x20 -/* 800ADB74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s deleted file mode 100644 index 1cd773b822..0000000000 --- a/asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s +++ /dev/null @@ -1,88 +0,0 @@ -lbl_800F8DBC: -/* 800F8DBC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 800F8DC0 7C 08 02 A6 */ mflr r0 -/* 800F8DC4 90 01 00 54 */ stw r0, 0x54(r1) -/* 800F8DC8 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 800F8DCC F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 800F8DD0 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 800F8DD4 93 C1 00 38 */ stw r30, 0x38(r1) -/* 800F8DD8 7C 7F 1B 78 */ mr r31, r3 -/* 800F8DDC 3C 60 80 39 */ lis r3, lit_3757@ha /* 0x8038D658@ha */ -/* 800F8DE0 3B C3 D6 58 */ addi r30, r3, lit_3757@l /* 0x8038D658@l */ -/* 800F8DE4 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 800F8DE8 A8 9F 2F E2 */ lha r4, 0x2fe2(r31) -/* 800F8DEC 38 FE 09 C4 */ addi r7, r30, 0x9c4 -/* 800F8DF0 A8 A7 00 28 */ lha r5, 0x28(r7) -/* 800F8DF4 A8 C7 00 2A */ lha r6, 0x2a(r7) -/* 800F8DF8 A8 E7 00 2C */ lha r7, 0x2c(r7) -/* 800F8DFC 48 17 77 45 */ bl cLib_addCalcAngleS__FPsssss -/* 800F8E00 A8 7F 04 E6 */ lha r3, 0x4e6(r31) -/* 800F8E04 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 800F8E08 7C 03 00 00 */ cmpw r3, r0 -/* 800F8E0C 41 82 00 DC */ beq lbl_800F8EE8 -/* 800F8E10 7C 00 18 50 */ subf r0, r0, r3 -/* 800F8E14 7C 00 07 35 */ extsh. r0, r0 -/* 800F8E18 40 81 00 30 */ ble lbl_800F8E48 -/* 800F8E1C 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 800F8E20 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F8E24 38 9E 24 B0 */ addi r4, r30, 0x24b0 -/* 800F8E28 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F8E2C 48 24 DF 41 */ bl PSMTXMultVec -/* 800F8E30 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 800F8E34 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F8E38 38 9E 24 98 */ addi r4, r30, 0x2498 -/* 800F8E3C 38 A1 00 08 */ addi r5, r1, 8 -/* 800F8E40 48 24 DF 2D */ bl PSMTXMultVec -/* 800F8E44 48 00 00 2C */ b lbl_800F8E70 -lbl_800F8E48: -/* 800F8E48 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 800F8E4C 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F8E50 38 9E 24 BC */ addi r4, r30, 0x24bc -/* 800F8E54 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F8E58 48 24 DF 15 */ bl PSMTXMultVec -/* 800F8E5C 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 800F8E60 38 63 00 24 */ addi r3, r3, 0x24 -/* 800F8E64 38 9E 24 A4 */ addi r4, r30, 0x24a4 -/* 800F8E68 38 A1 00 08 */ addi r5, r1, 8 -/* 800F8E6C 48 24 DF 01 */ bl PSMTXMultVec -lbl_800F8E70: -/* 800F8E70 38 7F 1D 08 */ addi r3, r31, 0x1d08 -/* 800F8E74 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8E78 48 16 EE B1 */ bl SetPos__11cBgS_GndChkFPC4cXyz -/* 800F8E7C C0 21 00 28 */ lfs f1, 0x28(r1) -/* 800F8E80 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800F8E84 EF E1 00 28 */ fsubs f31, f1, f0 -/* 800F8E88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F8E8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F8E90 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 800F8E94 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800F8E98 4B F7 B6 09 */ bl GroundCross__4cBgSFP11cBgS_GndChk -/* 800F8E9C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800F8EA0 EC 41 00 28 */ fsubs f2, f1, f0 -/* 800F8EA4 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 800F8EA8 C0 01 00 08 */ lfs f0, 8(r1) -/* 800F8EAC EC 01 00 28 */ fsubs f0, f1, f0 -/* 800F8EB0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800F8EB4 D0 41 00 18 */ stfs f2, 0x18(r1) -/* 800F8EB8 D3 E1 00 1C */ stfs f31, 0x1c(r1) -/* 800F8EBC 38 61 00 14 */ addi r3, r1, 0x14 -/* 800F8EC0 48 16 E2 91 */ bl atan2sY_XZ__4cXyzCFv -/* 800F8EC4 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 800F8EC8 48 17 7F 5D */ bl cLib_distanceAngleS__Fss -/* 800F8ECC 2C 03 08 00 */ cmpwi r3, 0x800 -/* 800F8ED0 40 81 00 10 */ ble lbl_800F8EE0 -/* 800F8ED4 A8 1F 04 DE */ lha r0, 0x4de(r31) -/* 800F8ED8 B0 1F 04 E6 */ sth r0, 0x4e6(r31) -/* 800F8EDC 48 00 00 0C */ b lbl_800F8EE8 -lbl_800F8EE0: -/* 800F8EE0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800F8EE4 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_800F8EE8: -/* 800F8EE8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 800F8EEC CB E1 00 40 */ lfd f31, 0x40(r1) -/* 800F8EF0 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 800F8EF4 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 800F8EF8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 800F8EFC 7C 08 03 A6 */ mtlr r0 -/* 800F8F00 38 21 00 50 */ addi r1, r1, 0x50 -/* 800F8F04 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s deleted file mode 100644 index 7c1878a9fa..0000000000 --- a/asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s +++ /dev/null @@ -1,101 +0,0 @@ -lbl_800F7CE8: -/* 800F7CE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F7CEC 7C 08 02 A6 */ mflr r0 -/* 800F7CF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F7CF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F7CF8 93 C1 00 08 */ stw r30, 8(r1) -/* 800F7CFC 7C 7E 1B 78 */ mr r30, r3 -/* 800F7D00 3B E0 00 00 */ li r31, 0 -/* 800F7D04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F7D08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F7D0C 80 1E 31 7C */ lwz r0, 0x317c(r30) -/* 800F7D10 1C 00 00 38 */ mulli r0, r0, 0x38 -/* 800F7D14 7C 63 02 14 */ add r3, r3, r0 -/* 800F7D18 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 800F7D1C A8 63 02 32 */ lha r3, 0x232(r3) -/* 800F7D20 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800F7D24 48 17 91 01 */ bl cLib_distanceAngleS__Fss -/* 800F7D28 38 00 40 00 */ li r0, 0x4000 -/* 800F7D2C 7C 60 02 78 */ xor r0, r3, r0 -/* 800F7D30 7C 04 0E 70 */ srawi r4, r0, 1 -/* 800F7D34 7C 00 18 38 */ and r0, r0, r3 -/* 800F7D38 7C 00 20 50 */ subf r0, r0, r4 -/* 800F7D3C 54 04 0F FE */ srwi r4, r0, 0x1f -/* 800F7D40 80 7E 31 98 */ lwz r3, 0x3198(r30) -/* 800F7D44 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d -/* 800F7D48 41 82 00 18 */ beq lbl_800F7D60 -/* 800F7D4C 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7D50 40 82 00 0C */ bne lbl_800F7D5C -/* 800F7D54 8B E2 95 38 */ lbz r31, struct_80452F38+0x0(r2) -/* 800F7D58 48 00 00 08 */ b lbl_800F7D60 -lbl_800F7D5C: -/* 800F7D5C 8B E2 95 39 */ lbz r31, struct_80452F38+0x1(r2) -lbl_800F7D60: -/* 800F7D60 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c -/* 800F7D64 41 82 00 20 */ beq lbl_800F7D84 -/* 800F7D68 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7D6C 40 82 00 10 */ bne lbl_800F7D7C -/* 800F7D70 88 02 95 39 */ lbz r0, struct_80452F38+0x1(r2) -/* 800F7D74 7F FF 03 78 */ or r31, r31, r0 -/* 800F7D78 48 00 00 0C */ b lbl_800F7D84 -lbl_800F7D7C: -/* 800F7D7C 88 02 95 38 */ lbz r0, struct_80452F38+0x0(r2) -/* 800F7D80 7F FF 03 78 */ or r31, r31, r0 -lbl_800F7D84: -/* 800F7D84 54 60 07 FF */ clrlwi. r0, r3, 0x1f -/* 800F7D88 41 82 00 50 */ beq lbl_800F7DD8 -/* 800F7D8C A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800F7D90 A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 800F7D94 7C 03 00 00 */ cmpw r3, r0 -/* 800F7D98 40 82 00 24 */ bne lbl_800F7DBC -/* 800F7D9C 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7DA0 40 82 00 10 */ bne lbl_800F7DB0 -/* 800F7DA4 63 E0 00 08 */ ori r0, r31, 8 -/* 800F7DA8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7DAC 48 00 00 2C */ b lbl_800F7DD8 -lbl_800F7DB0: -/* 800F7DB0 63 E0 00 02 */ ori r0, r31, 2 -/* 800F7DB4 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7DB8 48 00 00 20 */ b lbl_800F7DD8 -lbl_800F7DBC: -/* 800F7DBC 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7DC0 40 82 00 10 */ bne lbl_800F7DD0 -/* 800F7DC4 63 E0 00 02 */ ori r0, r31, 2 -/* 800F7DC8 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7DCC 48 00 00 0C */ b lbl_800F7DD8 -lbl_800F7DD0: -/* 800F7DD0 63 E0 00 08 */ ori r0, r31, 8 -/* 800F7DD4 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_800F7DD8: -/* 800F7DD8 A8 7E 04 E6 */ lha r3, 0x4e6(r30) -/* 800F7DDC A8 1E 04 DE */ lha r0, 0x4de(r30) -/* 800F7DE0 7C 03 00 00 */ cmpw r3, r0 -/* 800F7DE4 40 82 00 24 */ bne lbl_800F7E08 -/* 800F7DE8 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7DEC 40 82 00 10 */ bne lbl_800F7DFC -/* 800F7DF0 63 E0 00 02 */ ori r0, r31, 2 -/* 800F7DF4 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7DF8 48 00 00 2C */ b lbl_800F7E24 -lbl_800F7DFC: -/* 800F7DFC 63 E0 00 08 */ ori r0, r31, 8 -/* 800F7E00 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7E04 48 00 00 20 */ b lbl_800F7E24 -lbl_800F7E08: -/* 800F7E08 2C 04 00 00 */ cmpwi r4, 0 -/* 800F7E0C 40 82 00 10 */ bne lbl_800F7E1C -/* 800F7E10 63 E0 00 08 */ ori r0, r31, 8 -/* 800F7E14 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800F7E18 48 00 00 0C */ b lbl_800F7E24 -lbl_800F7E1C: -/* 800F7E1C 63 E0 00 02 */ ori r0, r31, 2 -/* 800F7E20 54 1F 06 3E */ clrlwi r31, r0, 0x18 -lbl_800F7E24: -/* 800F7E24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800F7E28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800F7E2C 9B E3 5E 81 */ stb r31, 0x5e81(r3) -/* 800F7E30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F7E34 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F7E38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F7E3C 7C 08 03 A6 */ mtlr r0 -/* 800F7E40 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F7E44 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s b/asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s deleted file mode 100644 index 37d2ba2f04..0000000000 --- a/asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_800F8D04: -/* 800F8D04 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800F8D08 7C 08 02 A6 */ mflr r0 -/* 800F8D0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800F8D10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F8D14 7C 7F 1B 78 */ mr r31, r3 -/* 800F8D18 C0 23 1F DC */ lfs f1, 0x1fdc(r3) -/* 800F8D1C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F8D20 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 800F8D24 41 82 00 24 */ beq lbl_800F8D48 -/* 800F8D28 38 7F 04 E6 */ addi r3, r31, 0x4e6 -/* 800F8D2C A8 9F 30 0C */ lha r4, 0x300c(r31) -/* 800F8D30 38 A0 00 05 */ li r5, 5 -/* 800F8D34 38 C0 10 00 */ li r6, 0x1000 -/* 800F8D38 38 E0 08 00 */ li r7, 0x800 -/* 800F8D3C 48 17 78 05 */ bl cLib_addCalcAngleS__FPsssss -/* 800F8D40 A8 1F 04 E6 */ lha r0, 0x4e6(r31) -/* 800F8D44 B0 1F 04 DE */ sth r0, 0x4de(r31) -lbl_800F8D48: -/* 800F8D48 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 800F8D4C C0 3F 37 C8 */ lfs f1, 0x37c8(r31) -/* 800F8D50 EC 00 08 28 */ fsubs f0, f0, f1 -/* 800F8D54 FC 00 02 10 */ fabs f0, f0 -/* 800F8D58 FC 00 00 18 */ frsp f0, f0 -/* 800F8D5C C0 82 92 B8 */ lfs f4, lit_6040(r2) -/* 800F8D60 FC 00 20 40 */ fcmpo cr0, f0, f4 -/* 800F8D64 40 81 00 14 */ ble lbl_800F8D78 -/* 800F8D68 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 800F8D6C C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800F8D70 C0 62 93 30 */ lfs f3, lit_7625(r2) -/* 800F8D74 48 17 6C 09 */ bl cLib_addCalc__FPfffff -lbl_800F8D78: -/* 800F8D78 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 800F8D7C C0 3F 37 D0 */ lfs f1, 0x37d0(r31) -/* 800F8D80 EC 00 08 28 */ fsubs f0, f0, f1 -/* 800F8D84 FC 00 02 10 */ fabs f0, f0 -/* 800F8D88 FC 00 00 18 */ frsp f0, f0 -/* 800F8D8C C0 82 92 B8 */ lfs f4, lit_6040(r2) -/* 800F8D90 FC 00 20 40 */ fcmpo cr0, f0, f4 -/* 800F8D94 40 81 00 14 */ ble lbl_800F8DA8 -/* 800F8D98 38 7F 04 D8 */ addi r3, r31, 0x4d8 -/* 800F8D9C C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800F8DA0 C0 62 93 30 */ lfs f3, lit_7625(r2) -/* 800F8DA4 48 17 6B D9 */ bl cLib_addCalc__FPfffff -lbl_800F8DA8: -/* 800F8DA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F8DAC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800F8DB0 7C 08 03 A6 */ mtlr r0 -/* 800F8DB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800F8DB8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s b/asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s deleted file mode 100644 index 67b25a38b8..0000000000 --- a/asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801188B0: -/* 801188B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801188B4 7C 08 02 A6 */ mflr r0 -/* 801188B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801188BC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801188C0 7C 7F 1B 78 */ mr r31, r3 -/* 801188C4 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 801188C8 28 00 00 FD */ cmplwi r0, 0xfd -/* 801188CC 40 82 00 2C */ bne lbl_801188F8 -/* 801188D0 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) -/* 801188D4 28 00 01 03 */ cmplwi r0, 0x103 -/* 801188D8 41 82 00 18 */ beq lbl_801188F0 -/* 801188DC 38 80 00 00 */ li r4, 0 -/* 801188E0 38 A0 00 01 */ li r5, 1 -/* 801188E4 4B FA 89 F9 */ bl deleteEquipItem__9daAlink_cFii -/* 801188E8 7F E3 FB 78 */ mr r3, r31 -/* 801188EC 4B FB 89 7D */ bl setSwordModel__9daAlink_cFv -lbl_801188F0: -/* 801188F0 38 60 00 00 */ li r3, 0 -/* 801188F4 48 00 00 44 */ b lbl_80118938 -lbl_801188F8: -/* 801188F8 28 00 00 FC */ cmplwi r0, 0xfc -/* 801188FC 40 82 00 18 */ bne lbl_80118914 -/* 80118900 88 1F 2F AB */ lbz r0, 0x2fab(r31) -/* 80118904 60 00 00 08 */ ori r0, r0, 8 -/* 80118908 98 1F 2F AB */ stb r0, 0x2fab(r31) -/* 8011890C 38 60 00 00 */ li r3, 0 -/* 80118910 48 00 00 28 */ b lbl_80118938 -lbl_80118914: -/* 80118914 28 00 00 FB */ cmplwi r0, 0xfb -/* 80118918 40 82 00 1C */ bne lbl_80118934 -/* 8011891C 80 1F 06 A0 */ lwz r0, 0x6a0(r31) -/* 80118920 28 00 00 00 */ cmplwi r0, 0 -/* 80118924 38 60 00 FE */ li r3, 0xfe -/* 80118928 41 82 00 10 */ beq lbl_80118938 -/* 8011892C 38 60 00 FB */ li r3, 0xfb -/* 80118930 48 00 00 08 */ b lbl_80118938 -lbl_80118934: -/* 80118934 54 83 06 3E */ clrlwi r3, r4, 0x18 -lbl_80118938: -/* 80118938 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011893C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80118940 7C 08 03 A6 */ mtlr r0 -/* 80118944 38 21 00 10 */ addi r1, r1, 0x10 -/* 80118948 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s b/asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s deleted file mode 100644 index 50a9024db4..0000000000 --- a/asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_8011894C: -/* 8011894C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80118950 7C 08 02 A6 */ mflr r0 -/* 80118954 90 01 00 14 */ stw r0, 0x14(r1) -/* 80118958 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011895C 7C 7F 1B 78 */ mr r31, r3 -/* 80118960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80118964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80118968 80 63 5D B8 */ lwz r3, 0x5db8(r3) -/* 8011896C 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80118970 28 00 00 01 */ cmplwi r0, 1 -/* 80118974 40 82 00 48 */ bne lbl_801189BC -/* 80118978 28 03 00 00 */ cmplwi r3, 0 -/* 8011897C 41 82 00 68 */ beq lbl_801189E4 -/* 80118980 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80118984 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 -/* 80118988 40 82 00 5C */ bne lbl_801189E4 -/* 8011898C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 80118990 60 00 04 00 */ ori r0, r0, 0x400 -/* 80118994 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 80118998 39 83 18 EC */ addi r12, r3, 0x18ec -/* 8011899C 48 24 96 E9 */ bl __ptmf_scall -/* 801189A0 60 00 00 00 */ nop -/* 801189A4 3C 60 80 42 */ lis r3, l_horseBaseAnime@ha /* 0x8042558C@ha */ -/* 801189A8 38 03 55 8C */ addi r0, r3, l_horseBaseAnime@l /* 0x8042558C@l */ -/* 801189AC 90 1F 38 4C */ stw r0, 0x384c(r31) -/* 801189B0 38 00 00 01 */ li r0, 1 -/* 801189B4 98 1F 2F AA */ stb r0, 0x2faa(r31) -/* 801189B8 48 00 00 2C */ b lbl_801189E4 -lbl_801189BC: -/* 801189BC 28 03 00 00 */ cmplwi r3, 0 -/* 801189C0 41 82 00 10 */ beq lbl_801189D0 -/* 801189C4 39 83 18 F8 */ addi r12, r3, 0x18f8 -/* 801189C8 48 24 96 BD */ bl __ptmf_scall -/* 801189CC 60 00 00 00 */ nop -lbl_801189D0: -/* 801189D0 38 00 00 00 */ li r0, 0 -/* 801189D4 98 1F 2F AA */ stb r0, 0x2faa(r31) -/* 801189D8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 801189DC 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 -/* 801189E0 90 1F 31 A0 */ stw r0, 0x31a0(r31) -lbl_801189E4: -/* 801189E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801189E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801189EC 7C 08 03 A6 */ mtlr r0 -/* 801189F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801189F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s b/asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s deleted file mode 100644 index fedf542620..0000000000 --- a/asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80118840: -/* 80118840 54 80 04 3E */ clrlwi r0, r4, 0x10 -/* 80118844 28 00 00 FD */ cmplwi r0, 0xfd -/* 80118848 40 82 00 14 */ bne lbl_8011885C -/* 8011884C 38 00 00 01 */ li r0, 1 -/* 80118850 B0 03 30 10 */ sth r0, 0x3010(r3) -/* 80118854 38 60 00 06 */ li r3, 6 -/* 80118858 4E 80 00 20 */ blr -lbl_8011885C: -/* 8011885C 28 00 00 FC */ cmplwi r0, 0xfc -/* 80118860 40 82 00 18 */ bne lbl_80118878 -/* 80118864 88 03 2F AB */ lbz r0, 0x2fab(r3) -/* 80118868 60 00 00 10 */ ori r0, r0, 0x10 -/* 8011886C 98 03 2F AB */ stb r0, 0x2fab(r3) -/* 80118870 38 60 00 05 */ li r3, 5 -/* 80118874 4E 80 00 20 */ blr -lbl_80118878: -/* 80118878 28 00 00 FB */ cmplwi r0, 0xfb -/* 8011887C 40 82 00 1C */ bne lbl_80118898 -/* 80118880 80 03 06 A8 */ lwz r0, 0x6a8(r3) -/* 80118884 28 00 00 00 */ cmplwi r0, 0 -/* 80118888 38 60 00 FE */ li r3, 0xfe -/* 8011888C 4D 82 00 20 */ beqlr -/* 80118890 38 60 00 FB */ li r3, 0xfb -/* 80118894 4E 80 00 20 */ blr -lbl_80118898: -/* 80118898 28 00 00 FE */ cmplwi r0, 0xfe -/* 8011889C 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 801188A0 4D 82 00 20 */ beqlr -/* 801188A4 38 04 00 05 */ addi r0, r4, 5 -/* 801188A8 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 801188AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM.s b/asm/d/a/d_a_alink/setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM.s deleted file mode 100644 index 836fcb7464..0000000000 --- a/asm/d/a/d_a_alink/setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM.s +++ /dev/null @@ -1,25 +0,0 @@ -lbl_800AFB14: -/* 800AFB14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFB18 7C 08 02 A6 */ mflr r0 -/* 800AFB1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFB20 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AFB24 93 C1 00 08 */ stw r30, 8(r1) -/* 800AFB28 7C 7E 1B 78 */ mr r30, r3 -/* 800AFB2C 1C A4 00 0C */ mulli r5, r4, 0xc -/* 800AFB30 3C 80 80 39 */ lis r4, m_anmDataTable__9daAlink_c@ha /* 0x8038FCA8@ha */ -/* 800AFB34 38 04 FC A8 */ addi r0, r4, m_anmDataTable__9daAlink_c@l /* 0x8038FCA8@l */ -/* 800AFB38 7F E0 2A 14 */ add r31, r0, r5 -/* 800AFB3C A0 9F 00 06 */ lhz r4, 6(r31) -/* 800AFB40 4B FF FF 69 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -/* 800AFB44 7F C3 F3 78 */ mr r3, r30 -/* 800AFB48 A0 9F 00 08 */ lhz r4, 8(r31) -/* 800AFB4C 38 A0 00 01 */ li r5, 1 -/* 800AFB50 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFB54 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFB58 4B FF F9 59 */ bl setFaceBck__9daAlink_cFUsiUs -/* 800AFB5C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AFB60 83 C1 00 08 */ lwz r30, 8(r1) -/* 800AFB64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFB68 7C 08 03 A6 */ mtlr r0 -/* 800AFB6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFB70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM.s b/asm/d/a/d_a_alink/setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM.s deleted file mode 100644 index ff0d725eb6..0000000000 --- a/asm/d/a/d_a_alink/setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_800AFAA8: -/* 800AFAA8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AFAAC 7C 08 02 A6 */ mflr r0 -/* 800AFAB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AFAB4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800AFAB8 93 C1 00 08 */ stw r30, 8(r1) -/* 800AFABC 7C 7E 1B 78 */ mr r30, r3 -/* 800AFAC0 54 85 10 3A */ slwi r5, r4, 2 -/* 800AFAC4 3C 80 80 39 */ lis r4, m_faceTexDataTable__9daAlink_c@ha /* 0x803914A8@ha */ -/* 800AFAC8 38 04 14 A8 */ addi r0, r4, m_faceTexDataTable__9daAlink_c@l /* 0x803914A8@l */ -/* 800AFACC 7F E0 2A 14 */ add r31, r0, r5 -/* 800AFAD0 A0 9F 00 00 */ lhz r4, 0(r31) -/* 800AFAD4 38 A0 00 01 */ li r5, 1 -/* 800AFAD8 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFADC 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFAE0 4B FF FB 3D */ bl setFaceBtp__9daAlink_cFUsiUs -/* 800AFAE4 7F C3 F3 78 */ mr r3, r30 -/* 800AFAE8 A0 9F 00 02 */ lhz r4, 2(r31) -/* 800AFAEC 38 A0 00 01 */ li r5, 1 -/* 800AFAF0 3C C0 00 01 */ lis r6, 0x0001 /* 0x0000FFFF@ha */ -/* 800AFAF4 38 C6 FF FF */ addi r6, r6, 0xFFFF /* 0x0000FFFF@l */ -/* 800AFAF8 4B FF FC D9 */ bl setFaceBtk__9daAlink_cFUsiUs -/* 800AFAFC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800AFB00 83 C1 00 08 */ lwz r30, 8(r1) -/* 800AFB04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AFB08 7C 08 03 A6 */ mtlr r0 -/* 800AFB0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AFB10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setFrontRollCrashShock__9daAlink_cFUc.s b/asm/d/a/d_a_alink/setFrontRollCrashShock__9daAlink_cFUc.s deleted file mode 100644 index 46686808e7..0000000000 --- a/asm/d/a/d_a_alink/setFrontRollCrashShock__9daAlink_cFUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800C1CEC: -/* 800C1CEC 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800C1CF0 7C 08 02 A6 */ mflr r0 -/* 800C1CF4 90 01 00 34 */ stw r0, 0x34(r1) -/* 800C1CF8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 800C1CFC 93 C1 00 28 */ stw r30, 0x28(r1) -/* 800C1D00 7C 7E 1B 78 */ mr r30, r3 -/* 800C1D04 7C 9F 23 78 */ mr r31, r4 -/* 800C1D08 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800C1D0C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 800C1D10 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 800C1D14 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800C1D18 D0 21 00 20 */ stfs f1, 0x20(r1) -/* 800C1D1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800C1D20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800C1D24 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 800C1D28 38 80 00 05 */ li r4, 5 -/* 800C1D2C 38 A0 00 0F */ li r5, 0xf -/* 800C1D30 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800C1D34 4B FA DC F1 */ bl StartShock__12dVibration_cFii4cXyz -/* 800C1D38 3C 60 00 02 */ lis r3, 0x0002 /* 0x00020016@ha */ -/* 800C1D3C 38 03 00 16 */ addi r0, r3, 0x0016 /* 0x00020016@l */ -/* 800C1D40 90 01 00 08 */ stw r0, 8(r1) -/* 800C1D44 38 7E 2C A8 */ addi r3, r30, 0x2ca8 -/* 800C1D48 38 81 00 08 */ addi r4, r1, 8 -/* 800C1D4C 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 800C1D50 88 DE 2F 9A */ lbz r6, 0x2f9a(r30) -/* 800C1D54 48 20 1E 81 */ bl startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc -/* 800C1D58 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) -/* 800C1D5C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800C1D60 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) -/* 800C1D64 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800C1D68 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) -/* 800C1D6C D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800C1D70 38 61 00 0C */ addi r3, r1, 0xc -/* 800C1D74 38 80 00 64 */ li r4, 0x64 -/* 800C1D78 28 1E 00 00 */ cmplwi r30, 0 -/* 800C1D7C 41 82 00 0C */ beq lbl_800C1D88 -/* 800C1D80 80 BE 00 04 */ lwz r5, 4(r30) -/* 800C1D84 48 00 00 08 */ b lbl_800C1D8C -lbl_800C1D88: -/* 800C1D88 38 A0 FF FF */ li r5, -1 -lbl_800C1D8C: -/* 800C1D8C 38 C0 00 05 */ li r6, 5 -/* 800C1D90 48 0E 64 31 */ bl dKy_Sound_set__F4cXyziUii -/* 800C1D94 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800C1D98 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 800C1D9C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800C1DA0 7C 08 03 A6 */ mtlr r0 -/* 800C1DA4 38 21 00 30 */ addi r1, r1, 0x30 -/* 800C1DA8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s b/asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s deleted file mode 100644 index 46074d9f55..0000000000 --- a/asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80118FF8: -/* 80118FF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80118FFC 7C 08 02 A6 */ mflr r0 -/* 80119000 90 01 00 14 */ stw r0, 0x14(r1) -/* 80119004 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80119008 93 C1 00 08 */ stw r30, 8(r1) -/* 8011900C 7C 7E 1B 78 */ mr r30, r3 -/* 80119010 7C 9F 23 79 */ or. r31, r4, r4 -/* 80119014 41 82 00 78 */ beq lbl_8011908C -/* 80119018 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 8011901C 38 63 61 94 */ addi r3, r3, mDemoArcName__20dStage_roomControl_c@l /* 0x80406194@l */ -/* 80119020 7C A4 2B 78 */ mr r4, r5 -/* 80119024 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80119028 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8011902C 3C A5 00 02 */ addis r5, r5, 2 -/* 80119030 38 C0 00 80 */ li r6, 0x80 -/* 80119034 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80119038 4B F2 33 C9 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci -/* 8011903C 7C 64 1B 79 */ or. r4, r3, r3 -/* 80119040 41 82 00 4C */ beq lbl_8011908C -/* 80119044 80 1F 00 14 */ lwz r0, 0x14(r31) -/* 80119048 7C 00 20 40 */ cmplw r0, r4 -/* 8011904C 41 82 00 40 */ beq lbl_8011908C -/* 80119050 80 1E 06 B4 */ lwz r0, 0x6b4(r30) -/* 80119054 7C 00 20 40 */ cmplw r0, r4 -/* 80119058 40 82 00 14 */ bne lbl_8011906C -/* 8011905C 80 7E 06 B0 */ lwz r3, 0x6b0(r30) -/* 80119060 38 80 00 00 */ li r4, 0 -/* 80119064 4B EF 49 2D */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform -/* 80119068 48 00 00 24 */ b lbl_8011908C -lbl_8011906C: -/* 8011906C 7F E3 FB 78 */ mr r3, r31 -/* 80119070 38 A0 00 01 */ li r5, 1 -/* 80119074 38 C0 FF FF */ li r6, -1 -/* 80119078 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 8011907C 38 E0 00 00 */ li r7, 0 -/* 80119080 39 00 FF FF */ li r8, -1 -/* 80119084 39 20 00 01 */ li r9, 1 -/* 80119088 4B EF 47 55 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb -lbl_8011908C: -/* 8011908C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80119090 83 C1 00 08 */ lwz r30, 8(r1) -/* 80119094 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80119098 7C 08 03 A6 */ mtlr r0 -/* 8011909C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801190A0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMatrixOffset__9daAlink_cFPff.s b/asm/d/a/d_a_alink/setMatrixOffset__9daAlink_cFPff.s deleted file mode 100644 index faa3dc6b76..0000000000 --- a/asm/d/a/d_a_alink/setMatrixOffset__9daAlink_cFPff.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_800A2C24: -/* 800A2C24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800A2C28 7C 08 02 A6 */ mflr r0 -/* 800A2C2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A2C30 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800A2C34 93 C1 00 08 */ stw r30, 8(r1) -/* 800A2C38 7C 7E 1B 78 */ mr r30, r3 -/* 800A2C3C 7C 9F 23 78 */ mr r31, r4 -/* 800A2C40 38 1E 2B A8 */ addi r0, r30, 0x2ba8 -/* 800A2C44 7C 1F 00 40 */ cmplw r31, r0 -/* 800A2C48 41 82 00 1C */ beq lbl_800A2C64 -/* 800A2C4C 7F E3 FB 78 */ mr r3, r31 -/* 800A2C50 C0 42 92 98 */ lfs f2, lit_5943(r2) -/* 800A2C54 C0 62 97 B4 */ lfs f3, lit_52234(r2) -/* 800A2C58 C0 82 93 D8 */ lfs f4, lit_11470(r2) -/* 800A2C5C 48 1C CD 21 */ bl cLib_addCalc__FPfffff -/* 800A2C60 48 00 00 10 */ b lbl_800A2C70 -lbl_800A2C64: -/* 800A2C64 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) -/* 800A2C68 28 00 01 3D */ cmplwi r0, 0x13d -/* 800A2C6C 41 82 00 5C */ beq lbl_800A2CC8 -lbl_800A2C70: -/* 800A2C70 80 7E 06 50 */ lwz r3, 0x650(r30) -/* 800A2C74 C0 23 00 40 */ lfs f1, 0x40(r3) -/* 800A2C78 C0 1F 00 00 */ lfs f0, 0(r31) -/* 800A2C7C EC 01 00 2A */ fadds f0, f1, f0 -/* 800A2C80 D0 03 00 40 */ stfs f0, 0x40(r3) -/* 800A2C84 C0 3E 2B D4 */ lfs f1, 0x2bd4(r30) -/* 800A2C88 C0 1F 00 00 */ lfs f0, 0(r31) -/* 800A2C8C EC 01 00 28 */ fsubs f0, f1, f0 -/* 800A2C90 D0 1E 2B D4 */ stfs f0, 0x2bd4(r30) -/* 800A2C94 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800A2C98 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800A2C9C A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 800A2CA0 4B F6 96 A5 */ bl mDoMtx_XrotS__FPA4_fs -/* 800A2CA4 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800A2CA8 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800A2CAC 38 9E 2B B8 */ addi r4, r30, 0x2bb8 -/* 800A2CB0 7C 65 1B 78 */ mr r5, r3 -/* 800A2CB4 48 2A 38 31 */ bl PSMTXConcat -/* 800A2CB8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 800A2CBC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 800A2CC0 38 9E 2B E8 */ addi r4, r30, 0x2be8 -/* 800A2CC4 48 2A 37 ED */ bl PSMTXCopy -lbl_800A2CC8: -/* 800A2CC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800A2CCC 83 C1 00 08 */ lwz r30, 8(r1) -/* 800A2CD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800A2CD4 7C 08 03 A6 */ mtlr r0 -/* 800A2CD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800A2CDC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s deleted file mode 100644 index cd75966af5..0000000000 --- a/asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_8011BC14: -/* 8011BC14 80 03 06 0C */ lwz r0, 0x60c(r3) -/* 8011BC18 2C 00 00 00 */ cmpwi r0, 0 -/* 8011BC1C 40 82 00 1C */ bne lbl_8011BC38 -/* 8011BC20 38 00 00 FE */ li r0, 0xfe -/* 8011BC24 98 03 2F 92 */ stb r0, 0x2f92(r3) -/* 8011BC28 98 03 2F 93 */ stb r0, 0x2f93(r3) -/* 8011BC2C C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 8011BC30 D0 03 1F E0 */ stfs f0, 0x1fe0(r3) -/* 8011BC34 48 00 00 1C */ b lbl_8011BC50 -lbl_8011BC38: -/* 8011BC38 38 00 00 02 */ li r0, 2 -/* 8011BC3C 98 03 2F 92 */ stb r0, 0x2f92(r3) -/* 8011BC40 38 00 00 05 */ li r0, 5 -/* 8011BC44 98 03 2F 93 */ stb r0, 0x2f93(r3) -/* 8011BC48 C0 02 92 B8 */ lfs f0, lit_6040(r2) -/* 8011BC4C D0 03 1F E0 */ stfs f0, 0x1fe0(r3) -lbl_8011BC50: -/* 8011BC50 C0 03 1F E0 */ lfs f0, 0x1fe0(r3) -/* 8011BC54 80 83 1F 2C */ lwz r4, 0x1f2c(r3) -/* 8011BC58 D0 04 00 08 */ stfs f0, 8(r4) -/* 8011BC5C 80 03 06 10 */ lwz r0, 0x610(r3) -/* 8011BC60 B0 03 30 88 */ sth r0, 0x3088(r3) -/* 8011BC64 A8 03 30 88 */ lha r0, 0x3088(r3) -/* 8011BC68 7C 00 0E 70 */ srawi r0, r0, 1 -/* 8011BC6C B0 03 04 E4 */ sth r0, 0x4e4(r3) -/* 8011BC70 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setOldRootQuaternion__9daAlink_cFsss.s b/asm/d/a/d_a_alink/setOldRootQuaternion__9daAlink_cFsss.s deleted file mode 100644 index 4a266feb22..0000000000 --- a/asm/d/a/d_a_alink/setOldRootQuaternion__9daAlink_cFsss.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_800ADB78: -/* 800ADB78 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 800ADB7C 7C 08 02 A6 */ mflr r0 -/* 800ADB80 90 01 00 34 */ stw r0, 0x34(r1) -/* 800ADB84 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 800ADB88 93 C1 00 28 */ stw r30, 0x28(r1) -/* 800ADB8C 7C DE 33 78 */ mr r30, r6 -/* 800ADB90 80 63 20 60 */ lwz r3, 0x2060(r3) -/* 800ADB94 83 E3 00 20 */ lwz r31, 0x20(r3) -/* 800ADB98 7C 80 07 35 */ extsh. r0, r4 -/* 800ADB9C 40 82 00 0C */ bne lbl_800ADBA8 -/* 800ADBA0 7C A0 07 35 */ extsh. r0, r5 -/* 800ADBA4 41 82 00 48 */ beq lbl_800ADBEC -lbl_800ADBA8: -/* 800ADBA8 7C 83 23 78 */ mr r3, r4 -/* 800ADBAC 7C A4 2B 78 */ mr r4, r5 -/* 800ADBB0 38 A0 00 00 */ li r5, 0 -/* 800ADBB4 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800ADBB8 48 28 BC C1 */ bl JMAEulerToQuat__FsssP10Quaternion -/* 800ADBBC C0 1F 00 00 */ lfs f0, 0(r31) -/* 800ADBC0 D0 01 00 08 */ stfs f0, 8(r1) -/* 800ADBC4 C0 1F 00 04 */ lfs f0, 4(r31) -/* 800ADBC8 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800ADBCC C0 1F 00 08 */ lfs f0, 8(r31) -/* 800ADBD0 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800ADBD4 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 800ADBD8 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800ADBDC 38 61 00 18 */ addi r3, r1, 0x18 -/* 800ADBE0 38 81 00 08 */ addi r4, r1, 8 -/* 800ADBE4 7F E5 FB 78 */ mr r5, r31 -/* 800ADBE8 4B F5 EF 75 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion -lbl_800ADBEC: -/* 800ADBEC 7F C0 07 35 */ extsh. r0, r30 -/* 800ADBF0 41 82 00 48 */ beq lbl_800ADC38 -/* 800ADBF4 38 60 00 00 */ li r3, 0 -/* 800ADBF8 38 80 00 00 */ li r4, 0 -/* 800ADBFC 7F C5 F3 78 */ mr r5, r30 -/* 800ADC00 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800ADC04 48 28 BC 75 */ bl JMAEulerToQuat__FsssP10Quaternion -/* 800ADC08 C0 1F 00 00 */ lfs f0, 0(r31) -/* 800ADC0C D0 01 00 08 */ stfs f0, 8(r1) -/* 800ADC10 C0 1F 00 04 */ lfs f0, 4(r31) -/* 800ADC14 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800ADC18 C0 1F 00 08 */ lfs f0, 8(r31) -/* 800ADC1C D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800ADC20 C0 1F 00 0C */ lfs f0, 0xc(r31) -/* 800ADC24 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800ADC28 38 61 00 18 */ addi r3, r1, 0x18 -/* 800ADC2C 38 81 00 08 */ addi r4, r1, 8 -/* 800ADC30 7F E5 FB 78 */ mr r5, r31 -/* 800ADC34 4B F5 EF 29 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion -lbl_800ADC38: -/* 800ADC38 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800ADC3C 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 800ADC40 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800ADC44 7C 08 03 A6 */ mtlr r0 -/* 800ADC48 38 21 00 30 */ addi r1, r1, 0x30 -/* 800ADC4C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s deleted file mode 100644 index 51f9cac00e..0000000000 --- a/asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8011E83C: -/* 8011E83C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8011E840 7C 08 02 A6 */ mflr r0 -/* 8011E844 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011E848 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8011E84C 93 C1 00 08 */ stw r30, 8(r1) -/* 8011E850 7C 7E 1B 78 */ mr r30, r3 -/* 8011E854 80 83 06 0C */ lwz r4, 0x60c(r3) -/* 8011E858 3B E4 01 92 */ addi r31, r4, 0x192 -/* 8011E85C 80 03 31 98 */ lwz r0, 0x3198(r3) -/* 8011E860 7C 00 F8 00 */ cmpw r0, r31 -/* 8011E864 41 82 00 64 */ beq lbl_8011E8C8 -/* 8011E868 7F E4 FB 78 */ mr r4, r31 -/* 8011E86C 4B F8 E7 15 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 8011E870 38 00 00 0D */ li r0, 0xd -/* 8011E874 98 1E 2F 99 */ stb r0, 0x2f99(r30) -/* 8011E878 93 FE 31 98 */ stw r31, 0x3198(r30) -/* 8011E87C 2C 1F 01 95 */ cmpwi r31, 0x195 -/* 8011E880 40 82 00 24 */ bne lbl_8011E8A4 -/* 8011E884 7F C3 F3 78 */ mr r3, r30 -/* 8011E888 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100C5@ha */ -/* 8011E88C 38 84 00 C5 */ addi r4, r4, 0x00C5 /* 0x000100C5@l */ -/* 8011E890 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8011E894 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011E898 7D 89 03 A6 */ mtctr r12 -/* 8011E89C 4E 80 04 21 */ bctrl -/* 8011E8A0 48 00 00 28 */ b lbl_8011E8C8 -lbl_8011E8A4: -/* 8011E8A4 2C 1F 01 96 */ cmpwi r31, 0x196 -/* 8011E8A8 40 82 00 20 */ bne lbl_8011E8C8 -/* 8011E8AC 7F C3 F3 78 */ mr r3, r30 -/* 8011E8B0 3C 80 00 01 */ lis r4, 0x0001 /* 0x000100C6@ha */ -/* 8011E8B4 38 84 00 C6 */ addi r4, r4, 0x00C6 /* 0x000100C6@l */ -/* 8011E8B8 81 9E 06 28 */ lwz r12, 0x628(r30) -/* 8011E8BC 81 8C 01 14 */ lwz r12, 0x114(r12) -/* 8011E8C0 7D 89 03 A6 */ mtctr r12 -/* 8011E8C4 4E 80 04 21 */ bctrl -lbl_8011E8C8: -/* 8011E8C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8011E8CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8011E8D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011E8D4 7C 08 03 A6 */ mtlr r0 -/* 8011E8D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8011E8DC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s deleted file mode 100644 index c24c45bb1f..0000000000 --- a/asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80118654: -/* 80118654 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80118658 7C 08 02 A6 */ mflr r0 -/* 8011865C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80118660 80 03 06 14 */ lwz r0, 0x614(r3) -/* 80118664 28 00 00 08 */ cmplwi r0, 8 -/* 80118668 41 82 00 28 */ beq lbl_80118690 -/* 8011866C A0 03 2F DC */ lhz r0, 0x2fdc(r3) -/* 80118670 28 00 00 48 */ cmplwi r0, 0x48 -/* 80118674 41 82 00 1C */ beq lbl_80118690 -/* 80118678 80 03 05 78 */ lwz r0, 0x578(r3) -/* 8011867C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80118680 41 82 00 3C */ beq lbl_801186BC -/* 80118684 A0 03 2F DE */ lhz r0, 0x2fde(r3) -/* 80118688 28 00 00 48 */ cmplwi r0, 0x48 -/* 8011868C 40 82 00 30 */ bne lbl_801186BC -lbl_80118690: -/* 80118690 3C 80 80 39 */ lis r4, m__18daAlinkHIO_move_c0@ha /* 0x8038D6BC@ha */ -/* 80118694 38 84 D6 BC */ addi r4, r4, m__18daAlinkHIO_move_c0@l /* 0x8038D6BC@l */ -/* 80118698 C0 44 00 1C */ lfs f2, 0x1c(r4) -/* 8011869C C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 801186A0 FC 60 10 90 */ fmr f3, f2 -/* 801186A4 38 80 00 19 */ li r4, 0x19 -/* 801186A8 38 A0 00 19 */ li r5, 0x19 -/* 801186AC 38 C0 00 02 */ li r6, 2 -/* 801186B0 C0 82 92 C4 */ lfs f4, lit_6109(r2) -/* 801186B4 4B F9 43 61 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif -/* 801186B8 48 00 00 0C */ b lbl_801186C4 -lbl_801186BC: -/* 801186BC 38 80 00 B8 */ li r4, 0xb8 -/* 801186C0 4B F9 48 C1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -lbl_801186C4: -/* 801186C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801186C8 7C 08 03 A6 */ mtlr r0 -/* 801186CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801186D0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s b/asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s deleted file mode 100644 index 144579ccff..0000000000 --- a/asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_801186D4: -/* 801186D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801186D8 7C 08 02 A6 */ mflr r0 -/* 801186DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801186E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801186E4 7C 7F 1B 78 */ mr r31, r3 -/* 801186E8 38 80 01 88 */ li r4, 0x188 -/* 801186EC 4B F9 48 95 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -/* 801186F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) -/* 801186F4 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 -/* 801186F8 90 1F 31 A0 */ stw r0, 0x31a0(r31) -/* 801186FC 80 1F 06 0C */ lwz r0, 0x60c(r31) -/* 80118700 2C 00 00 01 */ cmpwi r0, 1 -/* 80118704 41 82 00 54 */ beq lbl_80118758 -/* 80118708 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8011870C 2C 00 00 02 */ cmpwi r0, 2 -/* 80118710 40 82 00 0C */ bne lbl_8011871C -/* 80118714 80 9F 06 10 */ lwz r4, 0x610(r31) -/* 80118718 48 00 00 10 */ b lbl_80118728 -lbl_8011871C: -/* 8011871C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80118720 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80118724 88 84 4F B6 */ lbz r4, 0x4fb6(r4) -lbl_80118728: -/* 80118728 38 A0 00 03 */ li r5, 3 -/* 8011872C 38 C0 FF FF */ li r6, -1 -/* 80118730 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80118734 7C 07 07 74 */ extsb r7, r0 -/* 80118738 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 8011873C 39 3F 04 EC */ addi r9, r31, 0x4ec -/* 80118740 4B F0 34 A9 */ bl fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz -/* 80118744 7C 64 1B 78 */ mr r4, r3 -/* 80118748 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8011874C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80118750 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80118754 4B F2 AF 99 */ bl setPtI_Id__14dEvt_control_cFUi -lbl_80118758: -/* 80118758 7F E3 FB 78 */ mr r3, r31 -/* 8011875C 4B FA 70 F9 */ bl keepItemData__9daAlink_cFv -/* 80118760 38 60 00 01 */ li r3, 1 -/* 80118764 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80118768 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8011876C 7C 08 03 A6 */ mtlr r0 -/* 80118770 38 21 00 10 */ addi r1, r1, 0x10 -/* 80118774 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s b/asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s deleted file mode 100644 index bc437100e7..0000000000 --- a/asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80118778: -/* 80118778 C0 23 1F E0 */ lfs f1, 0x1fe0(r3) -/* 8011877C C0 02 95 68 */ lfs f0, lit_24590(r2) -/* 80118780 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80118784 4C 41 13 82 */ cror 2, 1, 2 -/* 80118788 40 82 00 10 */ bne lbl_80118798 -/* 8011878C 38 00 00 04 */ li r0, 4 -/* 80118790 98 03 2F 92 */ stb r0, 0x2f92(r3) -/* 80118794 4E 80 00 20 */ blr -lbl_80118798: -/* 80118798 C0 02 93 78 */ lfs f0, lit_8676(r2) -/* 8011879C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801187A0 4C 41 13 82 */ cror 2, 1, 2 -/* 801187A4 4C 82 00 20 */ bnelr -/* 801187A8 38 00 00 00 */ li r0, 0 -/* 801187AC 98 03 2F 92 */ stb r0, 0x2f92(r3) -/* 801187B0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUnderAnimeMorf__9daAlink_cFf.s b/asm/d/a/d_a_alink/setUnderAnimeMorf__9daAlink_cFf.s deleted file mode 100644 index f14ffc6a29..0000000000 --- a/asm/d/a/d_a_alink/setUnderAnimeMorf__9daAlink_cFf.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_800AD8F4: -/* 800AD8F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD8F8 7C 08 02 A6 */ mflr r0 -/* 800AD8FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD900 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800AD904 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800AD908 4C 41 13 82 */ cror 2, 1, 2 -/* 800AD90C 40 82 00 48 */ bne lbl_800AD954 -/* 800AD910 80 63 20 60 */ lwz r3, 0x2060(r3) -/* 800AD914 C0 43 00 0C */ lfs f2, 0xc(r3) -/* 800AD918 C0 02 93 A0 */ lfs f0, lit_9054(r2) -/* 800AD91C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800AD920 40 81 00 28 */ ble lbl_800AD948 -/* 800AD924 A0 03 00 18 */ lhz r0, 0x18(r3) -/* 800AD928 28 00 00 00 */ cmplwi r0, 0 -/* 800AD92C 41 82 00 0C */ beq lbl_800AD938 -/* 800AD930 28 00 00 01 */ cmplwi r0, 1 -/* 800AD934 40 82 00 14 */ bne lbl_800AD948 -lbl_800AD938: -/* 800AD938 38 80 00 00 */ li r4, 0 -/* 800AD93C 38 A0 00 23 */ li r5, 0x23 -/* 800AD940 4B F6 1F 09 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -/* 800AD944 48 00 00 10 */ b lbl_800AD954 -lbl_800AD948: -/* 800AD948 38 80 00 10 */ li r4, 0x10 -/* 800AD94C 38 A0 00 23 */ li r5, 0x23 -/* 800AD950 4B F6 1E F9 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800AD954: -/* 800AD954 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD958 7C 08 03 A6 */ mtlr r0 -/* 800AD95C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD960 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperAnimeBaseMorf__9daAlink_cFUsf.s b/asm/d/a/d_a_alink/setUpperAnimeBaseMorf__9daAlink_cFUsf.s deleted file mode 100644 index 823af5fbab..0000000000 --- a/asm/d/a/d_a_alink/setUpperAnimeBaseMorf__9daAlink_cFUsf.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800AD374: -/* 800AD374 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD378 7C 08 02 A6 */ mflr r0 -/* 800AD37C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD380 FC 60 08 90 */ fmr f3, f1 -/* 800AD384 38 A0 00 02 */ li r5, 2 -/* 800AD388 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800AD38C C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800AD390 38 C0 FF FF */ li r6, -1 -/* 800AD394 48 00 00 45 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 800AD398 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD39C 7C 08 03 A6 */ mtlr r0 -/* 800AD3A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD3A4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperAnimeBaseSpeed__9daAlink_cFUsff.s b/asm/d/a/d_a_alink/setUpperAnimeBaseSpeed__9daAlink_cFUsff.s deleted file mode 100644 index c26aef1caf..0000000000 --- a/asm/d/a/d_a_alink/setUpperAnimeBaseSpeed__9daAlink_cFUsff.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_800AD3A8: -/* 800AD3A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD3AC 7C 08 02 A6 */ mflr r0 -/* 800AD3B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD3B4 FC 60 10 90 */ fmr f3, f2 -/* 800AD3B8 38 A0 00 02 */ li r5, 2 -/* 800AD3BC C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800AD3C0 38 C0 FF FF */ li r6, -1 -/* 800AD3C4 48 00 00 15 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 800AD3C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD3CC 7C 08 03 A6 */ mtlr r0 -/* 800AD3D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD3D4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperAnimeBase__9daAlink_cFUs.s b/asm/d/a/d_a_alink/setUpperAnimeBase__9daAlink_cFUs.s deleted file mode 100644 index b4dda543c9..0000000000 --- a/asm/d/a/d_a_alink/setUpperAnimeBase__9daAlink_cFUs.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800AD340: -/* 800AD340 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD344 7C 08 02 A6 */ mflr r0 -/* 800AD348 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD34C 38 A0 00 02 */ li r5, 2 -/* 800AD350 C0 22 92 B8 */ lfs f1, lit_6040(r2) -/* 800AD354 C0 42 92 C0 */ lfs f2, lit_6108(r2) -/* 800AD358 38 C0 FF FF */ li r6, -1 -/* 800AD35C C0 62 92 C4 */ lfs f3, lit_6109(r2) -/* 800AD360 48 00 00 79 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 800AD364 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD368 7C 08 03 A6 */ mtlr r0 -/* 800AD36C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD370 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperAnimeMorf__9daAlink_cFf.s b/asm/d/a/d_a_alink/setUpperAnimeMorf__9daAlink_cFf.s deleted file mode 100644 index 8a4941c8d8..0000000000 --- a/asm/d/a/d_a_alink/setUpperAnimeMorf__9daAlink_cFf.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_800AD2D8: -/* 800AD2D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD2DC 7C 08 02 A6 */ mflr r0 -/* 800AD2E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD2E4 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800AD2E8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 800AD2EC 4C 41 13 82 */ cror 2, 1, 2 -/* 800AD2F0 40 82 00 40 */ bne lbl_800AD330 -/* 800AD2F4 80 C3 20 60 */ lwz r6, 0x2060(r3) -/* 800AD2F8 C0 46 00 0C */ lfs f2, 0xc(r6) -/* 800AD2FC C0 02 93 A0 */ lfs f0, lit_9054(r2) -/* 800AD300 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 800AD304 40 81 00 1C */ ble lbl_800AD320 -/* 800AD308 A0 06 00 18 */ lhz r0, 0x18(r6) -/* 800AD30C 28 00 00 00 */ cmplwi r0, 0 -/* 800AD310 40 82 00 10 */ bne lbl_800AD320 -/* 800AD314 38 80 00 00 */ li r4, 0 -/* 800AD318 A0 A3 30 C6 */ lhz r5, 0x30c6(r3) -/* 800AD31C 48 00 00 0C */ b lbl_800AD328 -lbl_800AD320: -/* 800AD320 A0 83 30 A8 */ lhz r4, 0x30a8(r3) -/* 800AD324 A0 A3 30 AA */ lhz r5, 0x30aa(r3) -lbl_800AD328: -/* 800AD328 7C C3 33 78 */ mr r3, r6 -/* 800AD32C 4B F6 25 1D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs -lbl_800AD330: -/* 800AD330 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD334 7C 08 03 A6 */ mtlr r0 -/* 800AD338 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD33C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c.s b/asm/d/a/d_a_alink/setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c.s deleted file mode 100644 index d76ea0abca..0000000000 --- a/asm/d/a/d_a_alink/setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_800AD6F0: -/* 800AD6F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800AD6F4 7C 08 02 A6 */ mflr r0 -/* 800AD6F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 800AD6FC 7C C7 33 78 */ mr r7, r6 -/* 800AD700 C0 26 00 04 */ lfs f1, 4(r6) -/* 800AD704 C0 46 00 08 */ lfs f2, 8(r6) -/* 800AD708 A8 C6 00 00 */ lha r6, 0(r6) -/* 800AD70C C0 67 00 0C */ lfs f3, 0xc(r7) -/* 800AD710 4B FF FC C9 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -/* 800AD714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800AD718 7C 08 03 A6 */ mtlr r0 -/* 800AD71C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800AD720 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s b/asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s deleted file mode 100644 index b6f2905de0..0000000000 --- a/asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_800F8F08: -/* 800F8F08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800F8F0C 7C 08 02 A6 */ mflr r0 -/* 800F8F10 90 01 00 24 */ stw r0, 0x24(r1) -/* 800F8F14 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 800F8F18 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* qr0 */ -/* 800F8F1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800F8F20 93 C1 00 08 */ stw r30, 8(r1) -/* 800F8F24 7C 7E 1B 78 */ mr r30, r3 -/* 800F8F28 FF E0 08 90 */ fmr f31, f1 -/* 800F8F2C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F8F30 7F E3 FB 78 */ mr r3, r31 -/* 800F8F34 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800F8F38 48 22 F4 F5 */ bl checkPass__12J3DFrameCtrlFf -/* 800F8F3C 2C 03 00 00 */ cmpwi r3, 0 -/* 800F8F40 41 82 00 0C */ beq lbl_800F8F4C -/* 800F8F44 C0 22 92 C0 */ lfs f1, lit_6108(r2) -/* 800F8F48 48 00 00 08 */ b lbl_800F8F50 -lbl_800F8F4C: -/* 800F8F4C FC 20 F8 90 */ fmr f1, f31 -lbl_800F8F50: -/* 800F8F50 C0 02 92 C0 */ lfs f0, lit_6108(r2) -/* 800F8F54 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 800F8F58 D0 3F 00 10 */ stfs f1, 0x10(r31) -/* 800F8F5C 80 7E 1F 2C */ lwz r3, 0x1f2c(r30) -/* 800F8F60 D0 23 00 08 */ stfs f1, 8(r3) -/* 800F8F64 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* qr0 */ -/* 800F8F68 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 800F8F6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800F8F70 83 C1 00 08 */ lwz r30, 8(r1) -/* 800F8F74 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800F8F78 7C 08 03 A6 */ mtlr r0 -/* 800F8F7C 38 21 00 20 */ addi r1, r1, 0x20 -/* 800F8F80 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/wolfModelCallBack__9daAlink_cFi.s b/asm/d/a/d_a_alink/wolfModelCallBack__9daAlink_cFi.s deleted file mode 100644 index b68d437c91..0000000000 --- a/asm/d/a/d_a_alink/wolfModelCallBack__9daAlink_cFi.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_8009EF7C: -/* 8009EF7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8009EF80 7C 08 02 A6 */ mflr r0 -/* 8009EF84 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009EF88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8009EF8C 93 C1 00 08 */ stw r30, 8(r1) -/* 8009EF90 7C 7E 1B 78 */ mr r30, r3 -/* 8009EF94 7C 9F 23 78 */ mr r31, r4 -/* 8009EF98 4B FF ED F9 */ bl jointControll__9daAlink_cFi -/* 8009EF9C 2C 1F 00 24 */ cmpwi r31, 0x24 -/* 8009EFA0 40 82 00 10 */ bne lbl_8009EFB0 -/* 8009EFA4 7F C3 F3 78 */ mr r3, r30 -/* 8009EFA8 48 08 BD 75 */ bl setWolfFootMatrix__9daAlink_cFv -/* 8009EFAC 48 00 00 28 */ b lbl_8009EFD4 -lbl_8009EFB0: -/* 8009EFB0 2C 1F 00 07 */ cmpwi r31, 7 -/* 8009EFB4 41 82 00 14 */ beq lbl_8009EFC8 -/* 8009EFB8 2C 1F 00 02 */ cmpwi r31, 2 -/* 8009EFBC 41 82 00 0C */ beq lbl_8009EFC8 -/* 8009EFC0 2C 1F 00 03 */ cmpwi r31, 3 -/* 8009EFC4 40 82 00 10 */ bne lbl_8009EFD4 -lbl_8009EFC8: -/* 8009EFC8 7F C3 F3 78 */ mr r3, r30 -/* 8009EFCC 7F E4 FB 78 */ mr r4, r31 -/* 8009EFD0 48 08 BC FD */ bl changeWolfBlendRate__9daAlink_cFi -lbl_8009EFD4: -/* 8009EFD4 38 60 00 01 */ li r3, 1 -/* 8009EFD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8009EFDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8009EFE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8009EFE4 7C 08 03 A6 */ mtlr r0 -/* 8009EFE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8009EFEC 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index bec8d8f2ad..1199671694 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -153,6 +153,9 @@ public: /* 8009D90C */ virtual void calc(J3DMaterial*) const; static void decMorfFrame() {} + static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; } + + static u8 m_morf_frame; private: /* 0x0F4 */ f32 field_0xf4; @@ -164,15 +167,20 @@ private: struct daAlink_BckData { /* 0x0 */ u16 m_underID; - /* 0x0 */ u16 m_upperID; + /* 0x2 */ u16 m_upperID; +}; + +struct daAlink_FaceTexData { + /* 0x0 */ u16 m_btpID; + /* 0x2 */ u16 m_btkID; }; struct daAlink_AnmData { /* 0x0 */ daAlink_BckData field_0x0; /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; - /* 0x6 */ u16 field_0x6; - /* 0x8 */ u16 field_0x8; + /* 0x6 */ u16 m_faceTexID; + /* 0x8 */ u16 m_faceBckID; /* 0xA */ u16 field_0xa; }; // Size: 0xC @@ -649,9 +657,13 @@ public: FTANM_UNK_27 = 0x27, FTANM_UNK_2D = 0x2D, FTANM_UNK_48 = 0x48, + FTANM_UNK_75 = 0x75, + FTANM_UNK_76 = 0x76, + FTANM_UNK_77 = 0x77, FTANM_UNK_7A = 0x7A, FTANM_UNK_7B = 0x7B, FTANM_UNK_7C = 0x7C, + FTANM_UNK_8A = 0x8A, FTANM_UNK_90 = 0x90, FTANM_UNK_96 = 0x96, FTANM_UNK_9F = 0x9F, @@ -1247,7 +1259,7 @@ public: /* 8009EB18 */ void resetRootMtx(); /* 8009EB58 */ bool modelCallBack(int); /* 8009ECA0 */ void headModelCallBack(int); - /* 8009EF7C */ void wolfModelCallBack(int); + /* 8009EF7C */ int wolfModelCallBack(int); /* 8009F034 */ void setHatAngle(); /* 8009FFF8 */ void calcHairAngle(s16*); /* 800A002C */ void setHairAngle(cXyz*, f32, f32); @@ -1290,8 +1302,8 @@ public: /* 800A6DCC */ void iceSlipBgCheck(); /* 800A7050 */ void setIceSlipSpeed(); /* 800A7358 */ void setPolygonSpeed(); - /* 800A7950 */ void checkWindSpeedOnAngle() const; - /* 800A79EC */ void checkWindSpeedOnAngleAnime(int) const; + /* 800A7950 */ bool checkWindSpeedOnAngle() const; + /* 800A79EC */ bool checkWindSpeedOnAngleAnime(int) const; /* 800A7A5C */ bool checkDashAnime() const; /* 800A7ABC */ void checkWindWallRate(cXyz const&); /* 800A7CB0 */ void setWindSpeed(); @@ -1346,7 +1358,7 @@ public: /* 800AD8F4 */ void setUnderAnimeMorf(f32); /* 800AD964 */ int setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32); /* 800ADAB8 */ int setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*); - /* 800ADAEC */ void resetUnderAnime(daAlink_c::daAlink_UNDER, f32); + /* 800ADAEC */ int resetUnderAnime(daAlink_c::daAlink_UNDER, f32); /* 800ADB78 */ void setOldRootQuaternion(s16, s16, s16); /* 800ADC50 */ BOOL checkAtnLeftAnime(); /* 800ADCEC */ BOOL checkAtnRightAnime(); @@ -1368,7 +1380,7 @@ public: /* 800AFCBC */ void resetFacePriAnime(); /* 800AFCF0 */ void playFaceTextureAnime(); /* 800B0098 */ s16 getGroundAngle(cBgS_PolyInfo*, s16); - /* 800B0150 */ void getRoofAngle(cBgS_PolyInfo*, s16); + /* 800B0150 */ s16 getRoofAngle(cBgS_PolyInfo*, s16); /* 800B01FC */ void getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int); /* 800B02BC */ void setFrontWallType(); /* 800B1488 */ BOOL checkWaterPolygonUnder(); @@ -1402,7 +1414,7 @@ public: /* 800B3298 */ void setBStatus(u8); /* 800B32B0 */ BOOL checkAtnWaitAnime(); /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*); - /* 800B33E4 */ void checkRestHPAnime(); + /* 800B33E4 */ BOOL checkRestHPAnime(); /* 800B3494 */ static int getDirectionFromAngle(s16 angle); /* 800B3500 */ bool checkAttentionState(); /* 800B3630 */ s16 getShapeAngleYAtnActor(); @@ -1410,7 +1422,7 @@ public: /* 800B3844 */ void initServiceWaitTime(); /* 800B3904 */ bool checkZeroSpeedF() const; /* 800B3924 */ void setNormalSpeedF(f32, f32); - /* 800B3F2C */ void getStickAngleDistanceRate(); + /* 800B3F2C */ f32 getStickAngleDistanceRate(); /* 800B3FD4 */ void setSpeedAndAngleNormal(); /* 800B444C */ void setSpeedAndAngleAtn(); /* 800B477C */ int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*); @@ -1472,7 +1484,7 @@ public: /* 800BA0D0 */ int checkNextAction(int); /* 800BA6A0 */ void commonChangeItem(); /* 800BA914 */ void setItemAction(); - /* 800BAF08 */ bool checkNextActionFromCrouch(int); + /* 800BAF08 */ BOOL checkNextActionFromCrouch(int); /* 800BAF80 */ int checkUpperReadyThrowAnime() const; /* 800BB020 */ void getBodyAngleXBasePos(cXyz*); /* 800BB084 */ s16 getBodyAngleXAtnActor(int); @@ -1749,7 +1761,7 @@ public: /* 800D7768 */ static bool checkIcePolygonDamage(cBgS_PolyInfo*); /* 800D77C8 */ BOOL checkMagicArmorNoDamage(); /* 800D7820 */ void checkPolyDamage(); - /* 800D7A98 */ void checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**); + /* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**); /* 800D7B18 */ void damageTimerCount(); /* 800D7BE8 */ bool checkHugeAttack(int) const; /* 800D7C14 */ bool checkLargeAttack(int) const; @@ -2191,16 +2203,16 @@ public: /* 800F7814 */ int procFishingCast(); /* 800F7988 */ int procFishingFoodInit(); /* 800F7AA8 */ int procFishingFood(); - /* 800F7C50 */ void getCrawlMoveAnmSpeed(); - /* 800F7C74 */ void getCrawlMoveSpeed(); + /* 800F7C50 */ f32 getCrawlMoveAnmSpeed(); + /* 800F7C74 */ f32 getCrawlMoveSpeed(); /* 800F7CE8 */ void setCrawlMoveDirectionArrow(); /* 800F7E48 */ void changeCrawlAutoMoveProc(cXyz*); - /* 800F81C0 */ void getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*); + /* 800F81C0 */ int getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*); /* 800F85C0 */ void crawlBgCheck(cXyz*, cXyz*, int); /* 800F8700 */ void checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*); /* 800F88F8 */ void decideCrawlDoStatus(); - /* 800F89E0 */ void checkNotCrawlStand(cXyz*); - /* 800F8A50 */ void checkNotCrawlStand(cXyz*, cXyz*); + /* 800F89E0 */ BOOL checkNotCrawlStand(cXyz*); + /* 800F8A50 */ BOOL checkNotCrawlStand(cXyz*, cXyz*); /* 800F8B00 */ void checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int); /* 800F8D04 */ void setCrawlMoveHoll(); /* 800F8DBC */ void setCrawlMoveAngle(); @@ -2524,14 +2536,14 @@ public: /* 80118170 */ BOOL checkFlyAtnWait(); /* 801181A0 */ void setGetItemFace(u16); /* 801182D4 */ BOOL checkGrabTalkActor(fopAc_ac_c*); - /* 80118308 */ void setTalkStartBack(cXyz*); + /* 80118308 */ int setTalkStartBack(cXyz*); /* 8011856C */ void setShapeAngleToTalkActor(); /* 80118654 */ void setTalkAnime(); - /* 801186D4 */ void setTradeItemAnime(); + /* 801186D4 */ u8 setTradeItemAnime(); /* 80118778 */ void setTradeItemOutHand(); /* 801187B4 */ BOOL checkEndMessage(u32); - /* 80118840 */ void setDemoRightHandIndex(u16); - /* 801188B0 */ void setDemoLeftHandIndex(u16); + /* 80118840 */ u8 setDemoRightHandIndex(u16); + /* 801188B0 */ u8 setDemoLeftHandIndex(u16); /* 8011894C */ void setDemoRide(u16); /* 801189F8 */ void setDemoBodyBck(dDemo_actor_c*, u16); /* 80118AD0 */ static BOOL checkFinalBattle(); @@ -2603,7 +2615,7 @@ public: /* 8011DED8 */ int procLookAroundTurn(); /* 8011DF68 */ int procTradeItemOutInit(); /* 8011E060 */ int procTradeItemOut(); - /* 8011E3D8 */ void checkLetterItem(int); + /* 8011E3D8 */ static BOOL checkLetterItem(int); /* 8011E448 */ int procNotUseItemInit(int); /* 8011E57C */ int procNotUseItem(); /* 8011E6E0 */ int procSwordReadyInit(); @@ -2612,7 +2624,7 @@ public: /* 8011E8E0 */ int procSwordPushInit(); /* 8011E960 */ int procSwordPush(); /* 8011E9F8 */ int procGanonFinishInit(); - /* 8011EA78 */ bool procGanonFinish(); + /* 8011EA78 */ int procGanonFinish(); /* 8011EAE8 */ int procCutFastReadyInit(); /* 8011EB8C */ int procCutFastReady(); /* 8011EBDC */ int procMasterSwordStickInit(); @@ -3183,8 +3195,11 @@ public: return mNowAnmPackUpper[param_0].getAnmTransform(); } void setFacePriBck(u16 param_0) { setFaceBck(param_0, 1, 0xFFFF); } + void setFacePriBtp(u16 param_0) { setFaceBtp(param_0, 1, 0xFFFF); } + void setFacePriBtk(u16 param_0) { setFaceBtk(param_0, 1, 0xFFFF); } void setFaceBasicBck(u16 param_0) { setFaceBck(param_0, 0, 0xFFFF); } void setFaceBasicBtp(u16 param_0) { setFaceBtp(param_0, 0, 0xFFFF); } + void setFaceBasicBtk(u16 param_0) { setFaceBtk(param_0, 0, 0xFFFF); } void cancelFmChainGrabFromOut() { field_0x2fa3 = 0; field_0x2844.clearData(); @@ -3193,6 +3208,7 @@ public: u16 getMidnaMsgNum() const { return mMidnaMsgNum; } u32 getStartEvent() { return fopAcM_GetParam(this) >> 0x18; } const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; } + const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; } BOOL i_checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } int getGrassHowlEventActor() const { return field_0x3198; } @@ -3316,7 +3332,7 @@ public: static daAlink_BckData const m_mainBckFishing[28]; static daAlink_AnmData const m_anmDataTable[414]; static daAlink_WlAnmData const m_wlAnmDataTable[147]; - static u8 const m_faceTexDataTable[652]; + static daAlink_FaceTexData const m_faceTexDataTable[]; static u8 const m_handLeftOutSidePos[12]; static u8 const m_handRightOutSidePos[12]; static u8 const m_handLeftInSidePos[12]; @@ -3449,11 +3465,11 @@ private: /* 0x02064 */ daAlink_sight_c mSight; /* 0x020F0 */ daPy_anmHeap_c mAnmHeap3; /* 0x02104 */ daPy_anmHeap_c mAnmHeap4; - /* 0x02118 */ daPy_anmHeap_c mAnmHeap5; - /* 0x0212C */ daPy_anmHeap_c mAnmHeap6; - /* 0x02140 */ daPy_anmHeap_c mAnmHeap7; + /* 0x02118 */ daPy_anmHeap_c mFaceBtpHeap; + /* 0x0212C */ daPy_anmHeap_c mFaceBtkHeap; + /* 0x02140 */ daPy_anmHeap_c mFaceBckHeap; /* 0x02154 */ J3DAnmTexPattern* field_0x2154; - /* 0x02158 */ J3DAnmTextureSRTKey* field_0x2158; + /* 0x02158 */ J3DAnmTextureSRTKey* mpFaceBtk; /* 0x0215C */ daPy_frameCtrl_c* field_0x215c; /* 0x02160 */ s8* field_0x2160; /* 0x02164 */ mDoExt_bckAnm field_0x2164; @@ -3952,7 +3968,7 @@ private: /* 0x03848 */ void* field_0x3848; /* 0x0384C */ cXyz* field_0x384c; /* 0x03850 */ daAlink_procFunc mpProcFunc; -}; // Size: 0x38BC +}; // Size: 0x385C static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor); static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor); diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index b0c0d56308..3cafc4240c 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -85,6 +85,7 @@ public: void setBuffer(u8* buf) { mBuffer = buf; } u8* getBuffer() { return mBuffer; } bool checkNoSetIdx() const { return mIdx == 0xFFFF; } + bool checkNoSetPriIdx() const { return mPriIdx == 0xFFFF; } private: /* 0x00 */ u16 mIdx; @@ -244,6 +245,7 @@ public: FLG1_UNK_10000 = 0x10000, FLG1_UNK_8000 = 0x8000, FLG1_THROW_DAMAGE = 0x4000, + FLG1_UNK_2000 = 0x2000, FLG1_UNK_80 = 0x80, FLG1_UNK_40 = 0x40, FLG1_UNK_20 = 0x20, @@ -331,6 +333,7 @@ public: enum daPy_ERFLG1 { ERFLG1_GANON_FINISH = 0x80000000, ERFLG1_UNK_40000000 = 0x40000000, + ERFLG1_UNK_20000000 = 0x20000000, ERFLG1_UNK_10000000 = 0x10000000, ERFLG1_UNK_4000000 = 0x4000000, ERFLG1_UNK_40000 = 0x40000, diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index 5b7f637866..2f474c8f67 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -156,6 +156,7 @@ public: void ClrGrndNone() { m_flags &= ~GRND_NONE; } bool ChkMoveBGOnly() const { return m_flags & MOVE_BG_ONLY; } void SetWallHit() { m_flags |= WALL_HIT; } + void ClrWallNone() { m_flags &= ~WALL_NONE; } // inline dupe void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index a15ae3fc4a..52f2870120 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2528,6 +2528,10 @@ inline BOOL dComIfGp_evmng_endCheck(s16 eventID) { return g_dComIfG_gameInfo.play.getEvtManager().endCheck(eventID); } +inline u8 dComIfGp_event_getPreItemNo() { + return g_dComIfG_gameInfo.play.getEvent().getPreItemNo(); +} + inline void dComIfGp_event_setItemPartnerId(unsigned int id) { g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id); } diff --git a/include/d/d_camera.h b/include/d/d_camera.h index a00394045d..f4e909853a 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -216,7 +216,7 @@ public: /* 801614C4 */ void QuickStart(); /* 801614D0 */ void Stop(); /* 801614E8 */ void Stay(); - /* 801614F4 */ void ChangeModeOK(s32); + /* 801614F4 */ u8 ChangeModeOK(s32); /* 80161550 */ void initPad(); /* 801617B0 */ void updatePad(); /* 80161D84 */ void initMonitor(); diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index 3b2eb2e9bb..b41de22e21 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -125,6 +125,7 @@ public: void* getPt2() { return convPId(mPt2); } void* getPtT() { return convPId(mPtT); } bool isChangeOK(void* param_0) { return mChangeOK == param_0; } + u8 getPreItemNo() { return mPreItemNo; } public: /* 0x000 */ u8 field_0x0[4]; diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 20eec32213..c16bf9728e 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -58,6 +58,10 @@ void fopCamM_SetBank(camera_class* cam, s16 bank) { cam->mBank = bank; } */ +inline s16 fopCamM_GetAngleY(camera_class* i_camera) { + return i_camera->mAngle.y; +} + u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); void fopCamM_Management(void); u32 fopCamM_GetParam(camera_class* pCamera); diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index b68840f1d5..fe8cff9386 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -378,6 +378,8 @@ public: f32 getOldFrameRate() { return mOldFrameRate; } J3DTransformInfo* getOldFrameTransInfo(int i) { return &mOldFrameTransInfo[i]; } + u16 getOldFrameStartJoint() { return mOldFrameStartJoint; } + Quaternion* getOldFrameQuaternion(int i_no) { return &mOldFrameQuaternion[i_no]; } private: /* 0x00 */ bool mOldFrameFlg; diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index dff4b20c56..ac0f4b29e9 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -25,6 +25,7 @@ void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Ve void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]); void mDoMtx_ZrotM(Mtx mtx, s16 z); void mDoMtx_inverseTranspose(f32 const (*param_0)[4], f32 (*param_1)[4]); +void mDoMtx_QuatConcat(Quaternion const* param_0, Quaternion const* param_1, Quaternion* param_2); inline void mDoMtx_multVecSR(Mtx m, const Vec* src, Vec* dst) { PSMTXMultVecSR(m, src, dst); @@ -96,6 +97,7 @@ public: static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); } static void YrotM(s16 y) { mDoMtx_YrotM(now, y); } static void YrotS(s16 y) { mDoMtx_YrotS(now, y); } + static void XrotS(s16 x) { mDoMtx_XrotS(now, x); } static void XrotM(s16 x) { mDoMtx_XrotM(now, x); } static void ZrotM(s16 z) { mDoMtx_ZrotM(now, z); } static void inverse() { PSMTXInverse(now, now); } diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h index 76016519a9..7e07e05ac1 100644 --- a/include/rel/d/a/d_a_horse/d_a_horse.h +++ b/include/rel/d/a/d_a_horse/d_a_horse.h @@ -160,6 +160,7 @@ public: void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; } void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); } void onRideFlg() { (this->*mpOnRideFlgFn)(); } + void offRideFlg() { (this->*mpOffRideFlgFn)(); } void onStateFlg0(daHorse_FLG0 flag) { mStateFlg0 |= flag; } void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; } void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); } diff --git a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h index 7d602f033c..90604ff928 100644 --- a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h +++ b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h @@ -2,8 +2,6 @@ #define D_A_TAG_SPRING_H #include "d/com/d_com_inf_game.h" -#include "d/d_procname.h" -#include "f_op/f_op_actor_mng.h" class daTagSpring_c : public fopAc_ac_c { public: @@ -14,9 +12,10 @@ public: /* 805A6B5C */ int execute(); /* 805A6C84 */ u8 checkArea(); /* 805A6DFC */ int _delete(); - u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } - /* 0x568 */ u8 mTimer; + u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + + /* 0x568 */ u8 mTimer; }; // Size: 0x56C #endif /* D_A_TAG_SPRING_H */ diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index 55ed36f04b..5389b0e4e6 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -4,7 +4,7 @@ */ #include "rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h" -#include "dol2asm.h" +#include "d/d_procname.h" /* 805A6A58-805A6A78 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__13daTagSpring_cFv */ void daTagSpring_c::initBaseMtx() { @@ -13,8 +13,8 @@ void daTagSpring_c::initBaseMtx() { /* 805A6A78-805A6AD0 000098 0058+00 1/1 0/0 0/0 .text setBaseMtx__13daTagSpring_cFv */ void daTagSpring_c::setBaseMtx() { - PSMTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z); - mDoMtx_ZXYrotM(mDoMtx_stack_c::now, shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); } /* 805A6AD0-805A6AF4 0000F0 0024+00 1/1 0/0 0/0 .text Create__13daTagSpring_cFv */ @@ -30,50 +30,50 @@ int daTagSpring_c::create() { fopAcM_OnCondition(this, 8); } - if (Create() == NULL) { + if (!Create()) { return cPhs_ERROR_e; - } else { - fopAcM_GetParam(this); - return cPhs_COMPLEATE_e; } + + fopAcM_GetParam(this); + return cPhs_COMPLEATE_e; } /* 805A6B5C-805A6C84 00017C 0128+00 1/1 0/0 0/0 .text execute__13daTagSpring_cFv */ int daTagSpring_c::execute() { - if (getSwbit() != 0xff) { + if (getSwbit() != 0xFF) { if (!i_fopAcM_isSwitch(this, getSwbit())) { return 1; } } + if (i_dComIfGp_event_runCheck()) { return 1; - - } else { - fopAc_ac_c& link = *daPy_getPlayerActorClass(); - if ((checkArea()) && ((fopAcM_wt_c::waterCheck(&link.current.pos) & 0xff) != NULL) && - (!(i_dComIfGp_checkPlayerStatus0(0, daPy_py_c::FLG0_UNK_100000)) && - (fopAcM_wt_c::mWaterY[0] > link.current.pos.y) || - (i_dComIfGp_checkPlayerStatus0(0, daPy_py_c::FLG0_UNK_100000)) != NULL)) - { - if (mTimer != NULL) { - mTimer--; - - } else { - mTimer = 0x1e; - g_dComIfG_gameInfo.play.mItemLifeCount++; - g_dComIfG_gameInfo.play.mItemLifeCountType = 1; - } - } else { - mTimer = 0x1e; - } } + + fopAc_ac_c* player_p = daPy_getPlayerActorClass(); + + if (checkArea() && fopAcM_wt_c::waterCheck(&player_p->current.pos) && + (!i_dComIfGp_checkPlayerStatus0(0, 0x100000) && + fopAcM_wt_c::mWaterY[0] > player_p->current.pos.y || + i_dComIfGp_checkPlayerStatus0(0, 0x100000))) + { + if (mTimer != 0) { + mTimer--; + } else { + mTimer = 30; + i_dComIfGp_setItemLifeCount(1.0f, 1); + } + } else { + mTimer = 30; + } + return 1; } /* 805A6C84-805A6DFC 0002A4 0178+00 1/1 0/0 0/0 .text checkArea__13daTagSpring_cFv */ u8 daTagSpring_c::checkArea() { - fopAc_ac_c& player = *daPy_getPlayerActorClass(); - return player.current.pos.absXZ(current.pos) < (mScale.x * 1000); + fopAc_ac_c* player_p = daPy_getPlayerActorClass(); + return player_p->current.pos.absXZ(current.pos) < (mScale.x * 1000); } /* 805A6DFC-805A6E04 00041C 0008+00 1/1 0/0 0/0 .text _delete__13daTagSpring_cFv */ diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 57231ab88c..88a6e69d0e 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d/a/d_a_alink -// +/** + * d_a_alink.cpp + * Player (Link) Actor + */ #include "d/a/d_a_alink.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -9,25 +9,19 @@ #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 "d/d_demo.h" #include "d/d_item.h" #include "d/d_path.h" #include "d/d_procname.h" -#include "d/d_demo.h" #include "d/msg/d_msg_object.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/d_a_horse/d_a_horse.h" -#include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" +#include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" #include "rel/d/a/d_a_spinner/d_a_spinner.h" #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" @@ -76,10 +70,6 @@ struct dPaPoF_c { static u8 m_emitterFourData[60 + 28 /* padding */]; }; -struct dInsect_c { - /* 80110648 */ void Insect_Release(); -}; - struct JASKernel { /* 80290B08 */ void getAramHeap(); }; @@ -3124,27 +3114,17 @@ char* daAlink_c::getAlinkArcName() { /* 8009D88C-8009D8B8 0981CC 002C+00 1/1 0/0 0/0 .text * daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, - fopAc_ac_c* param_2, dCcD_GObjInf* param_3) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s" +static void daAlink_tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, + dCcD_GObjInf* param_3) { + static_cast(param_0)->tgHitCallback(param_2, param_1, param_3); } -#pragma pop /* 8009D8B8-8009D8E4 0981F8 002C+00 1/1 0/0 0/0 .text * daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, - fopAc_ac_c* param_2, dCcD_GObjInf* param_3) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s" +static void daAlink_coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, + dCcD_GObjInf* param_3) { + static_cast(param_0)->coHitCallback(param_2, param_1); } -#pragma pop /* ############################################################################################## */ /* 80450FC0-80450FC4 0004C0 0004+00 1/1 0/0 0/0 .sbss it$36766 */ @@ -3162,7 +3142,10 @@ static u8 struct_80450FC4[4]; static bool m_eye_move_flg; /* 80450FC9 0003+00 data_80450FC9 None */ -static u8 m_morf_frame; +#pragma push +#pragma force_active on +u8 daAlink_matAnm_c::m_morf_frame; +#pragma pop /* 80452C98-80452C9C 001298 0004+00 102/102 0/0 0/0 .sdata2 @5943 */ SECTION_SDATA2 static f32 lit_5943 = 0.5f; @@ -3200,8 +3183,12 @@ SECTION_SDATA2 static u8 lit_6108[4] = { }; // temporary for literal matching -bool daAlink_c::checkInputOnR() const { return field_0x33ac > /* 0.05f */ lit_6021; } -bool daAlink_c::checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > lit_6040 /* 1.0f */; } +bool daAlink_c::checkInputOnR() const { + return field_0x33ac > /* 0.05f */ lit_6021; +} +bool daAlink_c::checkWindSpeedOnXZ() const { + return field_0x35b8.abs2XZ() > lit_6040 /* 1.0f */; +} /* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text init__16daAlink_matAnm_cFv */ void daAlink_matAnm_c::init() { @@ -3356,44 +3343,32 @@ void daAlink_c::resetRootMtx() { } /* 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) { +bool daAlink_c::modelCallBack(int i_jointNo) { + jointControll(i_jointNo); + + if (i_jointNo == 0) { setUpperFront(); - } else if (param_0 == 0x1A) { - bool check = false; - if (mSpecialMode == 0 || mSpecialMode < 0x26) { - check = true; - } - if (!check) { + } else if (i_jointNo == 26) { + if (!i_getSumouMode()) { 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); + + if (field_0x2fb6 != 0 && (i_jointNo == 0 || i_jointNo == 5 || i_jointNo == 10 || + i_jointNo == 4 || i_jointNo == 13 || i_jointNo == 15)) + { + changeBlendRate(i_jointNo); } return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -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 */ static int daAlink_modelCallBack(J3DJoint* p_joint, int param_1) { int jntNo = p_joint->getJntNo(); daAlink_c* alink = (daAlink_c*)j3dSys.getModel()->getUserArea(); - + if (param_1 == 0) { alink->modelCallBack(jntNo); } else if (param_1 == 1 && alink->checkResetRootMtx(jntNo)) { @@ -3426,11 +3401,7 @@ SECTION_SDATA2 static f32 lit_6399 = 202500.0f; SECTION_SDATA2 static f32 lit_6400 = 350.0f; /* 80452CE0-80452CE8 0012E0 0004+04 59/59 0/0 0/0 .sdata2 @6845 */ -SECTION_SDATA2 static f32 lit_6845[1 + 1 /* padding */] = { - 30.0f, - /* padding */ - 0.0f, -}; +SECTION_SDATA2 static f32 lit_6845 = 30.0f; /* 80452CE8-80452CF0 0012E8 0008+00 84/84 0/0 0/0 .sdata2 @6846 */ SECTION_SDATA2 static f64 lit_6846 = 0.5; @@ -3814,34 +3785,41 @@ asm void daAlink_c::headModelCallBack(int param_0) { #pragma pop /* 8009EF38-8009EF7C 099878 0044+00 1/1 0/0 0/0 .text daAlink_headModelCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_headModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_headModelCallBack__FP8J3DJointi.s" +static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1) { + int joint_no = i_joint->getJntNo(); + daAlink_c* this_ = (daAlink_c*)j3dSys.getModel()->getUserArea(); + + if (param_1 == 0) { + this_->headModelCallBack(joint_no); + } + + return 1; } -#pragma pop /* 8009EF7C-8009EFF0 0998BC 0074+00 1/1 0/0 0/0 .text wolfModelCallBack__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfModelCallBack(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/wolfModelCallBack__9daAlink_cFi.s" +int daAlink_c::wolfModelCallBack(int i_jointNo) { + jointControll(i_jointNo); + + if (i_jointNo == 36) { + setWolfFootMatrix(); + } else if (i_jointNo == 7 || i_jointNo == 2 || i_jointNo == 3) { + changeWolfBlendRate(i_jointNo); + } + + return 1; } -#pragma pop /* 8009EFF0-8009F034 099930 0044+00 1/1 0/0 0/0 .text daAlink_wolfModelCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_wolfModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_wolfModelCallBack__FP8J3DJointi.s" +static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1) { + int joint_no = i_joint->getJntNo(); + daAlink_c* this_ = (daAlink_c*)j3dSys.getModel()->getUserArea(); + + if (param_1 == 0) { + this_->wolfModelCallBack(joint_no); + } + + return 1; } -#pragma pop /* ############################################################################################## */ /* 80452EE0-80452EE4 0014E0 0004+00 6/6 0/0 0/0 .sdata2 @19379 */ @@ -3911,14 +3889,9 @@ SECTION_SDATA2 static f32 lit_21736 = 45.0f; SECTION_SDATA2 static f32 lit_22146 = 0.18479956686496735f; /* 80452F38-80452F3C -00001 0004+00 1/1 0/0 0/0 .sdata2 None */ -SECTION_SDATA2 static u8 struct_80452F38[4] = { - /* 80452F38 0001+00 data_80452F38 None */ - 0x01, - /* 80452F39 0003+00 data_80452F39 None */ - 0x04, - 0x00, - 0x00, -}; +SECTION_SDATA2 static u8 data_80452F38 = 1; + +SECTION_SDATA2 static u8 data_80452F39 = 4; /* 80452F3C-80452F40 00153C 0004+00 1/1 0/0 0/0 .sdata2 @22608 */ SECTION_SDATA2 static f32 lit_22608 = 9025.0f; @@ -4601,9 +4574,9 @@ bool daAlink_c::checkAttentionPosAngle(cXyz* param_0) { int tmp; if (i_checkModeFlg(MODE_RIDING) || i_checkEndResetFlg0(ERFLG0_UNK_400)) { - tmp = daAlinkHIO_horse_c0::m.mSearchRangeAngle; + tmp = daAlinkHIO_horse_c0::m.mSearchRangeAngle; } else { - tmp = 0x6000; + tmp = 0x6000; } s16 targetY = cLib_targetAngleY(&field_0x34e0, param_0); @@ -4700,7 +4673,8 @@ bool daAlink_c::commonLineCheck(cXyz* i_startPos, cXyz* i_endPos) { * getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi */ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& param_0, int param_1) { if ((param_1 != 0 || dComIfG_Bgsp().ChkPolySafe(param_0)) && - dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0) && dComIfG_Bgsp().GetActorPointer(param_0)) { + dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0) && dComIfG_Bgsp().GetActorPointer(param_0)) + { return fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(param_0)); } @@ -4760,9 +4734,7 @@ COMPILER_STRIP_GATE(0x8038FA48, &l_crawlStartFrontOffset); #pragma pop /* 8038FA54-8038FA60 01C0B4 000C+00 1/2 0/0 0/0 .rodata l_crawlFrontOffset */ -SECTION_RODATA static u8 const l_crawlFrontOffset[12] = { - 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlFrontOffset = {0.0f, 30.0f, 80.0f}; COMPILER_STRIP_GATE(0x8038FA54, &l_crawlFrontOffset); /* 8038FA60-8038FA6C 01C0C0 000C+00 0/1 0/0 0/0 .rodata l_crawlBackOffset */ @@ -4775,9 +4747,7 @@ COMPILER_STRIP_GATE(0x8038FA60, &l_crawlBackOffset); #pragma pop /* 8038FA6C-8038FA78 01C0CC 000C+00 1/1 0/0 0/0 .rodata l_crawlTopOffset */ -SECTION_RODATA static u8 const l_crawlTopOffset[12] = { - 0x00, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlTopOffset = {0.0f, 30.0f, 0.0f}; COMPILER_STRIP_GATE(0x8038FA6C, &l_crawlTopOffset); /* 8038FA78-8038FA84 01C0D8 000C+00 1/2 0/0 0/0 .rodata l_crawlFrontUpOffset */ @@ -4829,9 +4799,7 @@ COMPILER_STRIP_GATE(0x8038FAB4, &l_wolfLieStandUpOffset); #pragma pop /* 8038FAC0-8038FACC 01C120 000C+00 1/2 0/0 0/0 .rodata l_crawlTopUpOffset */ -SECTION_RODATA static u8 const l_crawlTopUpOffset[12] = { - 0x00, 0x00, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlTopUpOffset = {0.0f, 80.0f, 0.0f}; COMPILER_STRIP_GATE(0x8038FAC0, &l_crawlTopUpOffset); /* 8038FACC-8038FAD8 01C12C 000C+00 0/1 0/0 0/0 .rodata l_wolfLieTopUpOffset */ @@ -4864,36 +4832,28 @@ COMPILER_STRIP_GATE(0x8038FAE4, &l_wolfLieSideOffset); /* 8038FAF0-8038FAFC 01C150 000C+00 0/1 0/0 0/0 .rodata l_crawlLSideOffset */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_crawlLSideOffset[12] = { - 0x42, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlLSideOffset = {55.0f, 0.0f, 0.0f}; COMPILER_STRIP_GATE(0x8038FAF0, &l_crawlLSideOffset); #pragma pop /* 8038FAFC-8038FB08 01C15C 000C+00 0/1 0/0 0/0 .rodata l_crawlRSideOffset */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_crawlRSideOffset[12] = { - 0xC2, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlRSideOffset = {-55.0f, 0.0f, 0.0f}; COMPILER_STRIP_GATE(0x8038FAFC, &l_crawlRSideOffset); #pragma pop /* 8038FB08-8038FB14 01C168 000C+00 0/1 0/0 0/0 .rodata l_crawlLSideFrontOffset */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_crawlLSideFrontOffset[12] = { - 0x42, 0x5C, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlLSideFrontOffset = {55.0f, 5.0f, 80.0f}; COMPILER_STRIP_GATE(0x8038FB08, &l_crawlLSideFrontOffset); #pragma pop /* 8038FB14-8038FB20 01C174 000C+00 0/1 0/0 0/0 .rodata l_crawlRSideFrontOffset */ #pragma push #pragma force_active on -SECTION_RODATA static u8 const l_crawlRSideFrontOffset[12] = { - 0xC2, 0x5C, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, -}; +SECTION_RODATA static Vec const l_crawlRSideFrontOffset = {-55.0f, 5.0f, 80.0f}; COMPILER_STRIP_GATE(0x8038FB14, &l_crawlRSideFrontOffset); #pragma pop @@ -4932,7 +4892,9 @@ COMPILER_STRIP_GATE(0x8038FB44, &l_ironBallChainVec); /* 8038FB50-8038FB5C 01C1B0 000C+00 1/2 0/0 0/0 .rodata l_ironBallCenterVec */ SECTION_RODATA static Vec const l_ironBallCenterVec = { - 0.0f, 0.0f, 42.0f, + 0.0f, + 0.0f, + 42.0f, }; COMPILER_STRIP_GATE(0x8038FB50, &l_ironBallCenterVec); @@ -4949,10 +4911,8 @@ COMPILER_STRIP_GATE(0x8038FB5C, &l_wolfFootOnFrame); /* 8038FBBC-8038FBD4 01C21C 0018+00 1/1 0/0 0/0 .rodata l_insectNameList */ SECTION_RODATA static s16 const l_insectNameList[12] = { - PROC_Obj_Kabuto, PROC_Obj_Cho, PROC_Obj_Kuw, - PROC_Obj_Batta, PROC_Obj_Nan, PROC_Obj_Dan, - PROC_Obj_Kam, PROC_Obj_Ten, PROC_Obj_Kat, - PROC_Obj_Tombo, PROC_Obj_Ari, PROC_Obj_Kag, + PROC_Obj_Kabuto, PROC_Obj_Cho, PROC_Obj_Kuw, PROC_Obj_Batta, PROC_Obj_Nan, PROC_Obj_Dan, + PROC_Obj_Kam, PROC_Obj_Ten, PROC_Obj_Kat, PROC_Obj_Tombo, PROC_Obj_Ari, PROC_Obj_Kag, }; COMPILER_STRIP_GATE(0x8038FBBC, &l_insectNameList); @@ -4960,11 +4920,10 @@ COMPILER_STRIP_GATE(0x8038FBBC, &l_insectNameList); #pragma push #pragma force_active on SECTION_RODATA daAlink_BckData const daAlink_c::m_mainBckShield[20] = { - {0x0025, 0x0025}, {0x0023, 0x0023}, {0x0012, 0x001B}, {0x0010, 0x001B}, - {0x0021, 0x0021}, {0x001E, 0x001E}, {0x003C, 0x003C}, {0x002C, 0x002C}, - {0x003E, 0x003E}, {0x002E, 0x002E}, {0x0030, 0x0030}, {0x0028, 0x0028}, - {0x0032, 0x0032}, {0x002A, 0x002A}, {0x0274, 0x001B}, {0x0020, 0x001B}, - {0x001B, 0x001B}, {0x0026, 0x0026}, {0x0277, 0x001B}, {0x00CD, 0x001B}, + {0x0025, 0x0025}, {0x0023, 0x0023}, {0x0012, 0x001B}, {0x0010, 0x001B}, {0x0021, 0x0021}, + {0x001E, 0x001E}, {0x003C, 0x003C}, {0x002C, 0x002C}, {0x003E, 0x003E}, {0x002E, 0x002E}, + {0x0030, 0x0030}, {0x0028, 0x0028}, {0x0032, 0x0032}, {0x002A, 0x002A}, {0x0274, 0x001B}, + {0x0020, 0x001B}, {0x001B, 0x001B}, {0x0026, 0x0026}, {0x0277, 0x001B}, {0x00CD, 0x001B}, }; COMPILER_STRIP_GATE(0x8038FBD4, &daAlink_c::m_mainBckShield); #pragma pop @@ -4973,8 +4932,7 @@ COMPILER_STRIP_GATE(0x8038FBD4, &daAlink_c::m_mainBckShield); #pragma push #pragma force_active on SECTION_RODATA daAlink_BckData const daAlink_c::m_mainBckSword[5] = { - {0x001A, 0x001A}, {0x001C, 0x001C}, - {0x0277, 0x0277}, {0x00CD, 0x00CD}, {0x0243, 0x0244}, + {0x001A, 0x001A}, {0x001C, 0x001C}, {0x0277, 0x0277}, {0x00CD, 0x00CD}, {0x0243, 0x0244}, }; COMPILER_STRIP_GATE(0x8038FC24, &daAlink_c::m_mainBckSword); #pragma pop @@ -4983,13 +4941,12 @@ COMPILER_STRIP_GATE(0x8038FC24, &daAlink_c::m_mainBckSword); #pragma push #pragma force_active on SECTION_RODATA daAlink_BckData const daAlink_c::m_mainBckFishing[28] = { - {0x0025, 0x0273}, {0x0023, 0x00C8}, {0x0012, 0x0273}, {0x0010, 0x00C8}, - {0x0021, 0x0273}, {0x001E, 0x00C8}, {0x003C, 0x0273}, {0x002C, 0x0273}, - {0x003E, 0x0273}, {0x002E, 0x0273}, {0x0030, 0x00C8}, {0x0028, 0x00C8}, - {0x0032, 0x00C8}, {0x002A, 0x00C8}, {0x0274, 0x0273}, {0x0020, 0x0273}, - {0x001A, 0x0273}, {0x001C, 0x0273}, {0x0277, 0x0273}, {0x00CD, 0x00C8}, - {0x0243, 0x0244}, {0x0233, 0x0273}, {0x0234, 0x0273}, {0x0233, 0x0273}, - {0x0234, 0x0273}, {0x026A, 0x0273}, {0x0256, 0x0273}, {0x0257, 0x0273}, + {0x0025, 0x0273}, {0x0023, 0x00C8}, {0x0012, 0x0273}, {0x0010, 0x00C8}, {0x0021, 0x0273}, + {0x001E, 0x00C8}, {0x003C, 0x0273}, {0x002C, 0x0273}, {0x003E, 0x0273}, {0x002E, 0x0273}, + {0x0030, 0x00C8}, {0x0028, 0x00C8}, {0x0032, 0x00C8}, {0x002A, 0x00C8}, {0x0274, 0x0273}, + {0x0020, 0x0273}, {0x001A, 0x0273}, {0x001C, 0x0273}, {0x0277, 0x0273}, {0x00CD, 0x00C8}, + {0x0243, 0x0244}, {0x0233, 0x0273}, {0x0234, 0x0273}, {0x0233, 0x0273}, {0x0234, 0x0273}, + {0x026A, 0x0273}, {0x0256, 0x0273}, {0x0257, 0x0273}, }; COMPILER_STRIP_GATE(0x8038FC38, &daAlink_c::m_mainBckFishing); #pragma pop @@ -5491,48 +5448,35 @@ daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[147] = { }; /* 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] = { - 0x03, 0xDF, 0x03, 0x79, 0x03, 0xE0, 0x03, 0x7A, 0x03, 0xE1, 0x03, 0x7B, 0x03, 0xDF, 0x03, 0x78, - 0x03, 0xDF, 0x03, 0x83, 0x03, 0xE2, 0x03, 0x2C, 0x03, 0xC6, 0x03, 0x6A, 0x03, 0xD5, 0x03, 0x6B, - 0x03, 0xB0, 0x03, 0x2D, 0x03, 0xB1, 0x03, 0x2E, 0x03, 0xE6, 0x03, 0x82, 0x03, 0xE5, 0x03, 0x81, - 0x03, 0xF2, 0x03, 0x98, 0x03, 0xC3, 0x03, 0x53, 0x03, 0xAF, 0x03, 0x98, 0x03, 0xF0, 0x03, 0x96, - 0x03, 0xF4, 0x03, 0x2C, 0x03, 0xF3, 0x03, 0x2C, 0x03, 0xC5, 0x03, 0x5C, 0x03, 0xAF, 0x03, 0x42, - 0x03, 0xAF, 0x03, 0x43, 0x03, 0xEE, 0x03, 0x8E, 0x03, 0xEF, 0x03, 0x8F, 0x03, 0xED, 0x03, 0x8D, - 0x03, 0xD8, 0x03, 0x6E, 0x03, 0xD9, 0x03, 0x6F, 0x03, 0xDB, 0x03, 0x73, 0x03, 0xD7, 0x03, 0x6D, - 0x03, 0xE9, 0x03, 0x88, 0x03, 0xE4, 0x03, 0x7D, 0x03, 0xD1, 0x03, 0x67, 0x03, 0xD2, 0x03, 0x68, - 0x03, 0xAF, 0x03, 0x4A, 0x03, 0xAF, 0x03, 0x4B, 0x03, 0xAF, 0x03, 0x4C, 0x03, 0xAF, 0x03, 0x4D, - 0x03, 0xAF, 0x03, 0x4E, 0x03, 0xAF, 0x03, 0x91, 0x03, 0xE7, 0x03, 0x86, 0x03, 0xB4, 0x03, 0x2C, - 0x03, 0xBC, 0x03, 0x2C, 0x03, 0xAF, 0x03, 0x90, 0x03, 0xC9, 0x03, 0x5E, 0x03, 0xC7, 0x03, 0x5D, - 0x03, 0xCA, 0x03, 0x5F, 0x03, 0xAF, 0x03, 0x95, 0x03, 0xAF, 0x03, 0x41, 0x03, 0xAF, 0x03, 0x51, - 0x03, 0xAF, 0x03, 0x52, 0x03, 0xAF, 0x03, 0x49, 0x03, 0xAF, 0x03, 0x44, 0x03, 0xAF, 0x03, 0x45, - 0x03, 0xAF, 0x03, 0x46, 0x03, 0xBD, 0x03, 0x2C, 0x03, 0xBE, 0x03, 0x2C, 0x03, 0xEA, 0x03, 0x89, - 0x03, 0xAF, 0x03, 0x8A, 0x03, 0xCB, 0x03, 0x2C, 0x03, 0xAF, 0x03, 0x55, 0x03, 0xAF, 0x03, 0x54, - 0x03, 0xAF, 0x03, 0x50, 0x03, 0xAF, 0x03, 0x4F, 0x03, 0xB8, 0x03, 0x34, 0x03, 0xB6, 0x03, 0x32, - 0x03, 0xB7, 0x03, 0x33, 0x03, 0xB5, 0x03, 0x31, 0x03, 0xAF, 0x03, 0x36, 0x03, 0xAF, 0x03, 0x37, - 0x03, 0xB9, 0x03, 0x2C, 0x03, 0xAF, 0x03, 0x38, 0x03, 0xAF, 0x03, 0x39, 0x03, 0xAF, 0x03, 0x35, - 0x03, 0xDC, 0x03, 0x35, 0x03, 0xDE, 0x03, 0x35, 0x03, 0xDA, 0x03, 0x70, 0x03, 0xAF, 0x03, 0x3E, - 0x03, 0xD3, 0x03, 0x2C, 0x03, 0xBB, 0x03, 0x3C, 0x03, 0xAF, 0x03, 0x3B, 0x03, 0xBA, 0x03, 0x3A, - 0x03, 0xCE, 0x03, 0x64, 0x03, 0xCF, 0x03, 0x65, 0x03, 0xEB, 0x03, 0x8B, 0x03, 0xEC, 0x03, 0x8C, - 0x03, 0xD4, 0x03, 0x69, 0x03, 0xC0, 0x03, 0x2C, 0x03, 0xC1, 0x03, 0x3F, 0x03, 0xC1, 0x03, 0x40, - 0x03, 0xD0, 0x03, 0x66, 0x03, 0xC2, 0x03, 0x2C, 0x03, 0xAF, 0x03, 0x5A, 0x03, 0xC4, 0x03, 0x5B, - 0x03, 0xBF, 0x03, 0x2C, 0x03, 0xC8, 0x03, 0x2C, 0x10, 0x45, 0x10, 0x3B, 0x10, 0x46, 0x03, 0x2C, - 0x10, 0x41, 0x10, 0x37, 0x10, 0x42, 0x10, 0x38, 0x10, 0x43, 0x10, 0x39, 0x10, 0x47, 0x10, 0x3C, - 0x10, 0x40, 0x10, 0x36, 0x10, 0x44, 0x10, 0x3A, 0x10, 0x3F, 0x03, 0x2C, 0x03, 0xAF, 0x20, 0x32, - 0x03, 0xAF, 0x20, 0x33, 0x20, 0x39, 0x20, 0x34, 0x03, 0xAF, 0x50, 0x54, 0x03, 0xAF, 0x50, 0x55, - 0x50, 0x59, 0x50, 0x56, 0x03, 0xE8, 0x03, 0x87, 0x03, 0xAF, 0x03, 0x72, 0x03, 0xAF, 0x03, 0x84, - 0x03, 0xAF, 0x03, 0x85, 0x03, 0xD6, 0x03, 0x6C, 0x03, 0xAF, 0x03, 0x92, 0x03, 0xAF, 0x03, 0x93, - 0x03, 0xAF, 0x03, 0x77, 0x03, 0xAF, 0x03, 0x61, 0x03, 0xAF, 0x03, 0x62, 0x03, 0xCD, 0x03, 0x63, - 0x03, 0xAF, 0x03, 0x3D, 0x03, 0xF1, 0x03, 0x97, 0x03, 0xDC, 0x03, 0x2C, 0x03, 0xDD, 0x03, 0x2C, - 0x03, 0xDE, 0x03, 0x2C, 0x03, 0xB3, 0x03, 0x30, 0x03, 0xCC, 0x03, 0x60, 0x03, 0xAF, 0x03, 0x48, - 0x03, 0xAF, 0x03, 0x47, 0x03, 0xAF, 0x03, 0x58, 0x03, 0xAF, 0x03, 0x59, 0x03, 0xAF, 0x03, 0x56, - 0x03, 0xAF, 0x03, 0x57, 0x60, 0x18, 0x60, 0x15, 0x03, 0xAF, 0x70, 0x70, 0x03, 0xAF, 0x70, 0x71, - 0x03, 0xE3, 0x03, 0x7C, 0x03, 0xB2, 0x03, 0x2F, 0x03, 0xAF, 0x03, 0x94, 0x04, 0x17, 0x03, 0xA9, - 0x04, 0x18, 0x03, 0xAA, 0x04, 0x1A, 0x03, 0xA7, 0x04, 0x1E, 0x03, 0xA7, 0x04, 0x1B, 0x03, 0xA7, - 0x04, 0x0E, 0x03, 0xA7, 0x04, 0x0C, 0x03, 0xA7, 0x04, 0x0F, 0x03, 0xA7, 0x04, 0x10, 0x03, 0xA7, - 0x04, 0x20, 0x03, 0xA7, 0x04, 0x15, 0x03, 0xA7, 0x04, 0x16, 0x03, 0xA7, 0x04, 0x0B, 0x03, 0xA7, - 0x04, 0x11, 0x03, 0xA7, 0x04, 0x1F, 0x03, 0xA7, 0x04, 0x0A, 0x03, 0xA7, 0x04, 0x09, 0x03, 0xA7, - 0x04, 0x12, 0x03, 0xA7, 0x04, 0x1C, 0x03, 0xA7, 0x04, 0x1D, 0x03, 0xA7, 0x04, 0x19, 0x03, 0xAB, - 0x04, 0x13, 0x03, 0xA8, 0x04, 0x14, 0x03, 0xA7, 0x04, 0x0D, 0x03, 0xA7, +SECTION_RODATA daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = { + 0x03DF, 0x0379, 0x03E0, 0x037A, 0x03E1, 0x037B, 0x03DF, 0x0378, 0x03DF, 0x0383, 0x03E2, 0x032C, + 0x03C6, 0x036A, 0x03D5, 0x036B, 0x03B0, 0x032D, 0x03B1, 0x032E, 0x03E6, 0x0382, 0x03E5, 0x0381, + 0x03F2, 0x0398, 0x03C3, 0x0353, 0x03AF, 0x0398, 0x03F0, 0x0396, 0x03F4, 0x032C, 0x03F3, 0x032C, + 0x03C5, 0x035C, 0x03AF, 0x0342, 0x03AF, 0x0343, 0x03EE, 0x038E, 0x03EF, 0x038F, 0x03ED, 0x038D, + 0x03D8, 0x036E, 0x03D9, 0x036F, 0x03DB, 0x0373, 0x03D7, 0x036D, 0x03E9, 0x0388, 0x03E4, 0x037D, + 0x03D1, 0x0367, 0x03D2, 0x0368, 0x03AF, 0x034A, 0x03AF, 0x034B, 0x03AF, 0x034C, 0x03AF, 0x034D, + 0x03AF, 0x034E, 0x03AF, 0x0391, 0x03E7, 0x0386, 0x03B4, 0x032C, 0x03BC, 0x032C, 0x03AF, 0x0390, + 0x03C9, 0x035E, 0x03C7, 0x035D, 0x03CA, 0x035F, 0x03AF, 0x0395, 0x03AF, 0x0341, 0x03AF, 0x0351, + 0x03AF, 0x0352, 0x03AF, 0x0349, 0x03AF, 0x0344, 0x03AF, 0x0345, 0x03AF, 0x0346, 0x03BD, 0x032C, + 0x03BE, 0x032C, 0x03EA, 0x0389, 0x03AF, 0x038A, 0x03CB, 0x032C, 0x03AF, 0x0355, 0x03AF, 0x0354, + 0x03AF, 0x0350, 0x03AF, 0x034F, 0x03B8, 0x0334, 0x03B6, 0x0332, 0x03B7, 0x0333, 0x03B5, 0x0331, + 0x03AF, 0x0336, 0x03AF, 0x0337, 0x03B9, 0x032C, 0x03AF, 0x0338, 0x03AF, 0x0339, 0x03AF, 0x0335, + 0x03DC, 0x0335, 0x03DE, 0x0335, 0x03DA, 0x0370, 0x03AF, 0x033E, 0x03D3, 0x032C, 0x03BB, 0x033C, + 0x03AF, 0x033B, 0x03BA, 0x033A, 0x03CE, 0x0364, 0x03CF, 0x0365, 0x03EB, 0x038B, 0x03EC, 0x038C, + 0x03D4, 0x0369, 0x03C0, 0x032C, 0x03C1, 0x033F, 0x03C1, 0x0340, 0x03D0, 0x0366, 0x03C2, 0x032C, + 0x03AF, 0x035A, 0x03C4, 0x035B, 0x03BF, 0x032C, 0x03C8, 0x032C, 0x1045, 0x103B, 0x1046, 0x032C, + 0x1041, 0x1037, 0x1042, 0x1038, 0x1043, 0x1039, 0x1047, 0x103C, 0x1040, 0x1036, 0x1044, 0x103A, + 0x103F, 0x032C, 0x03AF, 0x2032, 0x03AF, 0x2033, 0x2039, 0x2034, 0x03AF, 0x5054, 0x03AF, 0x5055, + 0x5059, 0x5056, 0x03E8, 0x0387, 0x03AF, 0x0372, 0x03AF, 0x0384, 0x03AF, 0x0385, 0x03D6, 0x036C, + 0x03AF, 0x0392, 0x03AF, 0x0393, 0x03AF, 0x0377, 0x03AF, 0x0361, 0x03AF, 0x0362, 0x03CD, 0x0363, + 0x03AF, 0x033D, 0x03F1, 0x0397, 0x03DC, 0x032C, 0x03DD, 0x032C, 0x03DE, 0x032C, 0x03B3, 0x0330, + 0x03CC, 0x0360, 0x03AF, 0x0348, 0x03AF, 0x0347, 0x03AF, 0x0358, 0x03AF, 0x0359, 0x03AF, 0x0356, + 0x03AF, 0x0357, 0x6018, 0x6015, 0x03AF, 0x7070, 0x03AF, 0x7071, 0x03E3, 0x037C, 0x03B2, 0x032F, + 0x03AF, 0x0394, 0x0417, 0x03A9, 0x0418, 0x03AA, 0x041A, 0x03A7, 0x041E, 0x03A7, 0x041B, 0x03A7, + 0x040E, 0x03A7, 0x040C, 0x03A7, 0x040F, 0x03A7, 0x0410, 0x03A7, 0x0420, 0x03A7, 0x0415, 0x03A7, + 0x0416, 0x03A7, 0x040B, 0x03A7, 0x0411, 0x03A7, 0x041F, 0x03A7, 0x040A, 0x03A7, 0x0409, 0x03A7, + 0x0412, 0x03A7, 0x041C, 0x03A7, 0x041D, 0x03A7, 0x0419, 0x03AB, 0x0413, 0x03A8, 0x0414, 0x03A7, + 0x040D, 0x03A7, }; COMPILER_STRIP_GATE(0x803914A8, &daAlink_c::m_faceTexDataTable); @@ -5888,7 +5832,9 @@ COMPILER_STRIP_GATE(0x803919D8, &anmIdx); /* 803919E4-803919F0 01E044 000C+00 1/1 0/0 0/0 .rodata localPaddleTop$20605 */ SECTION_RODATA static Vec const localPaddleTop = { - 0.0f, 0.0f, -158.0f, + 0.0f, + 0.0f, + -158.0f, }; COMPILER_STRIP_GATE(0x803919E4, &localPaddleTop); @@ -6317,18 +6263,9 @@ COMPILER_STRIP_GATE(0x80391E3C, &wolfChainVec); /* 80391E48-80391E78 01E4A8 0030+00 1/1 0/0 0/0 .rodata label$45760 */ SECTION_RODATA static u32 const label[12] = { - Z2SE_WL_V_BREATH_SIT, - Z2SE_WL_V_BREATH_WAIT, - Z2SE_WL_V_BREATH_WALK, - Z2SE_WL_V_BREATH_TIRED, - Z2SE_WL_V_DASH, - Z2SE_WL_V_BREATH_JUMP, - Z2SE_WL_V_SLIP_CLIMB, - Z2SE_WL_V_PUSH_ROCK, - Z2SE_WL_V_TURN_BACK, - Z2SE_WL_V_HOLD_THROW, - Z2SE_WL_V_FAILED, - Z2SE_WL_V_NOSE, + Z2SE_WL_V_BREATH_SIT, Z2SE_WL_V_BREATH_WAIT, Z2SE_WL_V_BREATH_WALK, Z2SE_WL_V_BREATH_TIRED, + Z2SE_WL_V_DASH, Z2SE_WL_V_BREATH_JUMP, Z2SE_WL_V_SLIP_CLIMB, Z2SE_WL_V_PUSH_ROCK, + Z2SE_WL_V_TURN_BACK, Z2SE_WL_V_HOLD_THROW, Z2SE_WL_V_FAILED, Z2SE_WL_V_NOSE, }; COMPILER_STRIP_GATE(0x80391E48, &label); @@ -6433,14 +6370,20 @@ asm void daAlink_c::setFootMatrix() { #pragma pop /* 800A2C24-800A2CE0 09D564 00BC+00 3/3 0/0 0/0 .text setMatrixOffset__9daAlink_cFPff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMatrixOffset(f32* param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setMatrixOffset__9daAlink_cFPff.s" +void daAlink_c::setMatrixOffset(f32* param_0, f32 param_1) { + if (param_0 != &mSinkShapeOffset) { + cLib_addCalc(param_0, param_1, lit_5943, lit_52234, lit_11470); + } else if (mProcID == PROC_TOOL_DEMO) { + return; + } + + mpLinkModel->getBaseTRMtx()[1][3] += *param_0; + mInvMtx[1][3] -= *param_0; + + mDoMtx_stack_c::XrotS(shape_angle.x); + mDoMtx_stack_c::concat(mInvMtx); + mDoMtx_copy(mDoMtx_stack_c::get(), field_0x2be8); } -#pragma pop /* 800A2CE0-800A3430 09D620 0750+00 3/3 0/0 0/0 .text * setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi */ @@ -6566,7 +6509,7 @@ void* daAlink_c::getAnimeResource(daPy_anmHeap_c* p_anmHeap, u16 i_anmID, u32 bu if (arcNo == 0xFFFF) { return p_anmHeap->loadDataIdx(resID); } - + return p_anmHeap->loadDataDemoRID(resID, arcNo); } @@ -6614,15 +6557,16 @@ J3DModel* daAlink_c::initModelEnv(u16 param_0, u32 param_1) { int daAlink_c::initDemoModel(J3DModel** p_model, char const* resName, u32 param_2) { *p_model = NULL; - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName); + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName); if (modelData != NULL) { *p_model = initModel(modelData, param_2); - + if (*p_model == NULL) { return 0; } } - + return 1; } @@ -6631,11 +6575,12 @@ int daAlink_c::initDemoModel(J3DModel** p_model, char const* resName, u32 param_ // matches with literals #ifdef NONMATCHING int daAlink_c::initDemoBck(mDoExt_bckAnm** p_bck, char const* resName) { - J3DAnmTransform* res = (J3DAnmTransform*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName); + J3DAnmTransform* res = + (J3DAnmTransform*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName); if (res != NULL) { *p_bck = new mDoExt_bckAnm(); - + if (*p_bck == NULL) { return 0; } @@ -6644,7 +6589,7 @@ int daAlink_c::initDemoBck(mDoExt_bckAnm** p_bck, char const* resName) { return 0; } } - + return 1; } #else @@ -11312,48 +11257,63 @@ SECTION_DATA u8 daAlink_c::m_demoInitTable[1140] = { }; /* 803B2754-803B2798 00F874 0044+00 0/1 0/0 0/0 .data l_cylSrc */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_cylSrc[68] = { - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1A, 0xD8, 0xFF, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x73, - 0x04, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, +static dCcD_SrcCyl l_cylSrc = { + { + {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}}, + {dCcD_SE_WOLF_BITE, 3, 1, 0, {1}}, + {dCcD_SE_NONE, 6, 0, 0, {0}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 35.0f, + 180.0f, + }, }; -#pragma pop /* 803B2798-803B27D8 00F8B8 0040+00 1/2 0/0 0/0 .data l_sphSrc */ -SECTION_DATA static u8 l_sphSrc[64] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, - 0xD8, 0xFB, 0xFD, 0xFF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x73, 0x01, 0x03, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, +static dCcD_SrcSph l_sphSrc = { + { + {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {0xD8FBFDFF, 5}, 0x73}}, + {dCcD_SE_SWORD, 3, 1, 0, {1}}, + {dCcD_SE_NONE, 6, 0, 0, {0}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + }, }; /* 803B27D8-803B281C 00F8F8 0044+00 0/1 0/0 0/0 .data l_atCylSrc */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_atCylSrc[68] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, +static dCcD_SrcCyl l_atCylSrc = { + { + {0, {{AT_TYPE_NORMAL_SWORD, 2, 0x1B}, {0, 0}, 0}}, + {dCcD_SE_SWORD, 3, 1, 0, {1}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + 180.0f, + 130.0f, + }, }; -#pragma pop /* 803B281C-803B2868 00F93C 004C+00 0/1 0/0 0/0 .data l_atCpsSrc */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_atCpsSrc[76] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x01, 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, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, +static dCcD_SrcCps l_atCpsSrc = { + { + {0, {{AT_TYPE_NORMAL_SWORD, 1, 0x1B}, {0, 0}, 0}}, + {dCcD_SE_SWORD, 1, 0, 0, {1}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {0}, + }, + { + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + 20.0f, + }, }; -#pragma pop /* 803B2868-803B2880 00F988 0018+00 1/0 0/0 0/0 .data l_jntColPos0 */ SECTION_DATA static u8 l_jntColPos0[24] = { @@ -11694,44 +11654,48 @@ SECTION_DATA static char* headBrkName[3] = { "ml_head_power_up_b.brk", }; +// move these later +static int daAlink_Create(fopAc_ac_c* i_this); +static int daAlink_Delete(daAlink_c* i_this); +static int daAlink_Execute(daAlink_c* i_this); +static int daAlink_Draw(daAlink_c* i_this); + /* 803B2DAC-803B2DCC -00001 0020+00 1/0 0/0 0/0 .data l_daAlink_Method */ -SECTION_DATA static void* l_daAlink_Method[8] = { - (void*)daAlink_Create__FP10fopAc_ac_c, - (void*)daAlink_Delete__FP9daAlink_c, - (void*)daAlink_Execute__FP9daAlink_c, - (void*)NULL, - (void*)daAlink_Draw__FP9daAlink_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, +static actor_method_class l_daAlink_Method = { + (process_method_func)daAlink_Create, (process_method_func)daAlink_Delete, + (process_method_func)daAlink_Execute, (process_method_func)NULL, + (process_method_func)daAlink_Draw, }; /* 803B2DCC-803B2E20 -00001 0030+24 0/0 0/0 1/0 .data g_profile_ALINK */ -SECTION_DATA extern void* g_profile_ALINK[12 + 9 /* padding */] = { - (void*)0xFFFFFFFD, - (void*)0x0005FFFD, - (void*)0x00FD0000, - (void*)&g_fpcLf_Method, - (void*)0x0000385C, - (void*)NULL, - (void*)NULL, - (void*)&g_fopAc_Method, - (void*)0x005B0000, - (void*)&l_daAlink_Method, - (void*)0x00060400, - (void*)0x01000000, - /* padding */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, +extern actor_process_profile_definition g_profile_ALINK = { + -3, + 5, + -3, + PROC_ALINK, + 0, + &g_fpcLf_Method.mBase, + sizeof(daAlink_c), + 0, + 0, + &g_fopAc_Method.base, + 0x5B, + 0, + 0, + &l_daAlink_Method, + 0x00060400, + 1, + 0, + 0, + 0, }; +// tons of extra padding? not sure what this is +#pragma push +#pragma force_active on +SECTION_DATA static u8 data_803B2DFC[0x24] = {0}; +#pragma pop + /* 803B2E20-803B2E80 00FF40 000C+54 2/2 0/0 0/0 .data __vt__16daPy_frameCtrl_c */ SECTION_DATA extern void* __vt__16daPy_frameCtrl_c[3 + 21 /* padding */] = { (void*)NULL /* RTTI */, @@ -12314,7 +12278,8 @@ void daAlink_c::setSelectEquipItem(int param_0) { } if (mClothesChangeWaitTimer == 0 && - (temp != mSwordModel || i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW))) { + (temp != mSwordModel || i_checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW))) + { if (temp != mSwordModel) { mSwordChangeWaitTimer = 5; } @@ -12385,14 +12350,14 @@ void daAlink_c::playerInit() { dCcD_Cyl* cyl1 = field_0x850; dCcD_Cyl* cyl2 = field_0xC04; for (i = 0; i < 3; i++, cyl1++, cyl2++) { - cyl1->Set(*(dCcD_SrcCyl*)l_cylSrc); + cyl1->Set(l_cylSrc); cyl1->SetStts(&field_0x814); cyl1->OnTgNoConHit(); cyl1->SetTgShieldFrontRangeYAngle(&field_0x306c); cyl1->SetTgHitCallback(daAlink_tgHitCallback); cyl1->SetCoHitCallback(daAlink_coHitCallback); - cyl2->Set(*(dCcD_SrcCyl*)l_cylSrc); + cyl2->Set(l_cylSrc); cyl2->SetStts(&field_0x814); cyl2->OffCoSetBit(); cyl2->SetTgMtrl(3); @@ -12402,7 +12367,7 @@ void daAlink_c::playerInit() { } field_0x850[2].SetH(lit_14955); field_0x850[1].SetH(lit_14955); - field_0xFB8.Set(*(dCcD_SrcSph*)l_sphSrc); + field_0xFB8.Set(l_sphSrc); field_0xFB8.SetStts(&field_0x814); field_0xFB8.StartCAt(current.pos); @@ -12426,16 +12391,16 @@ void daAlink_c::playerInit() { field_0x306c = shape_angle.y + mBodyAngle.y; for (u16 i = 0; i < 3; i++) { - mAtCps[i].Set(*(dCcD_SrcCps*)l_atCpsSrc); + mAtCps[i].Set(l_atCpsSrc); mAtCps[i].SetStts(&field_0x814); } - mGuardAtCps.Set(*(dCcD_SrcCps*)l_atCpsSrc); + mGuardAtCps.Set(l_atCpsSrc); mGuardAtCps.SetStts(&field_0x814); mGuardAtCps.SetAtType(AT_TYPE_SHIELD_ATTACK); mGuardAtCps.OnAtNoHitMark(); mGuardAtCps.SetAtHitMark(0); mGuardAtCps.SetAtAtp(0); - mAtCyl.Set(*(dCcD_SrcCyl*)l_atCylSrc); + mAtCyl.Set(l_atCylSrc); mAtCyl.SetStts(&field_0x814); mLinkAcch.Set(this, 3, field_0x18B0); @@ -12465,9 +12430,9 @@ void daAlink_c::playerInit() { mUpperAnmHeap[i].createHeap(daPy_anmHeap_c::HEAP_TYPE_3); } - mAnmHeap5.createHeap(daPy_anmHeap_c::HEAP_TYPE_1); - mAnmHeap6.createHeap(daPy_anmHeap_c::HEAP_TYPE_2); - mAnmHeap7.createHeap(daPy_anmHeap_c::HEAP_TYPE_3); + mFaceBtpHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_1); + mFaceBtkHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_2); + mFaceBckHeap.createHeap(daPy_anmHeap_c::HEAP_TYPE_3); for (u16 i = 0; i < 2; i++) { mItemHeap[i].setBufferSize(0x13200); @@ -12612,7 +12577,7 @@ static s32 bgWaitFlg; /* 80450FD0-80450FD8 -00001 0008+00 2/2 0/0 0/0 .sbss None */ /* 80450FD0 0001+00 data_80450FD0 None */ /* 80450FD1 0007+00 data_80450FD1 None */ -static s8 struct_80450FD0; // init$ +static s8 struct_80450FD0; // init$ #pragma push #pragma force_active on @@ -12658,7 +12623,8 @@ int daAlink_c::create() { BOOL enteringCity = false; // Stage: City Room: Entrance Layer: 0 if (checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 0 && - dComIfG_play_c::getLayerNo(0) == 0 && current.pos.y > 7500.0f) { + dComIfG_play_c::getLayerNo(0) == 0 && current.pos.y > 7500.0f) + { enteringCity = true; } @@ -12683,7 +12649,8 @@ int daAlink_c::create() { } if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 || - sceneMode == 9) { + sceneMode == 9) + { mAttentionInfo.mPosition.set(current.pos.x + cM_ssin(shape_angle.y) * 70.0f, current.pos.y + 80.0f, current.pos.z + cM_scos(shape_angle.y) * 70.0f); @@ -12746,7 +12713,8 @@ int daAlink_c::create() { (!mLinkAcch.ChkWaterHit() || mLinkAcch.m_wtr.GetHeight() < current.pos.y)) || ((checkCarryStartLightBallA() || checkCarryStartLightBallB()) && !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL)) || - (horseStart && i_dComIfGp_getHorseActor() == NULL)) { + (horseStart && i_dComIfGp_getHorseActor() == NULL)) + { return cPhs_ZERO_e; } @@ -12764,10 +12732,12 @@ int daAlink_c::create() { setWaterY(); if (checkStageName("F_SP102") && fopAcM_GetRoomNo(this) == 0 && - dComIfG_play_c::getLayerNo(0) == 4) { + dComIfG_play_c::getLayerNo(0) == 4) + { i_onNoResetFlg2(FLG2_UNK_800000); } else if (checkStageName("F_SP123") && fopAcM_GetRoomNo(this) == 13 && - dComIfG_play_c::getLayerNo(0) == 0) { + dComIfG_play_c::getLayerNo(0) == 0) + { i_onNoResetFlg2(FLG2_UNK_1000000); } @@ -12804,7 +12774,8 @@ int daAlink_c::create() { setItemActor(); if (dComIfGs_getLastSceneMode() & 0x400000 && !i_checkWolf() && !checkNotHeavyBootsStage() && - !horseStart && !enteringCity) { + !horseStart && !enteringCity) + { setHeavyBoots(1); } @@ -12818,8 +12789,7 @@ int daAlink_c::create() { 1, 1); } - fopAcM_create(PROC_MIDNA, prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, - NULL, -1); + fopAcM_create(PROC_MIDNA, prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); checkSetNpcTks(¤t.pos, fopAcM_GetRoomNo(this), 1); if (startPoint == -4 && dComIfGp_TargetWarpPt_get() != -1 && !dComIfGp_TransportWarp_check()) { @@ -12828,7 +12798,8 @@ int daAlink_c::create() { if (i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) == 0x11) { if (!i_dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !i_dComIfGs_isItemFirstBit(SHIELD) && - !i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) { + !i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) + { i_fopAcM_onSwitch(this, 0x6F); } else { i_fopAcM_offSwitch(this, 0x6F); @@ -12889,7 +12860,9 @@ s32 daAlink_c::setRoomInfo() { field_0x2fbd = 0; } - if (!checkEventRun() && (field_0x2fbd == 1 || field_0x2fbd == 3) && (checkBootsOrArmorHeavy() || mSinkShapeOffset < lit_6040 + field_0x3458)) { + if (!checkEventRun() && (field_0x2fbd == 1 || field_0x2fbd == 3) && + (checkBootsOrArmorHeavy() || mSinkShapeOffset < lit_6040 + field_0x3458)) + { field_0x2fbd = 2; } } else { @@ -12962,24 +12935,32 @@ asm void daAlink_c::setPolygonSpeed() { #pragma pop /* 800A7950-800A79EC 0A2290 009C+00 4/4 0/0 0/0 .text checkWindSpeedOnAngle__9daAlink_cCFv */ +// matches with literals +#ifdef NONMATCHING +bool daAlink_c::checkWindSpeedOnAngle() const { + if (!checkWindSpeedOnXZ()) { + return false; + } + + int tmp = cLib_distanceAngleS(field_0x30cc, shape_angle.y); + return tmp >= 0x6000 || (tmp >= 0x4000 && checkWindDashAnime()); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkWindSpeedOnAngle() const { +asm bool daAlink_c::checkWindSpeedOnAngle() const { nofralloc #include "asm/d/a/d_a_alink/checkWindSpeedOnAngle__9daAlink_cCFv.s" } #pragma pop +#endif /* 800A79EC-800A7A5C 0A232C 0070+00 2/2 0/0 0/0 .text checkWindSpeedOnAngleAnime__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWindSpeedOnAngleAnime(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkWindSpeedOnAngleAnime__9daAlink_cCFi.s" +bool daAlink_c::checkWindSpeedOnAngleAnime(int param_0) const { + return checkWindSpeedOnAngle() && + ((field_0x2f8c == 1 || field_0x2f8c == 3) || (param_0 != 0 && field_0x2f8c == 2)); } -#pragma pop /* 800A7A5C-800A7ABC 0A239C 0060+00 7/7 0/0 0/0 .text checkDashAnime__9daAlink_cCFv */ bool daAlink_c::checkDashAnime() const { @@ -13223,7 +13204,7 @@ static u8 lit_4415[12]; #pragma pop /* 804255A4-804255B0 0522C4 000C+00 3/5 0/0 0/0 .bss l_boarBaseAnime */ -static u8 l_boarBaseAnime[12]; +static Vec l_boarBaseAnime; /* 804255B0-804255BC 0522D0 000C+00 0/1 0/0 0/0 .bss @4416 */ #pragma push @@ -13425,7 +13406,9 @@ void daAlink_c::setHandIndex(daAlink_c::daAlink_ANM i_anmID) { void daAlink_c::setSwordAtCollision(int param_0) { cXyz sp74; - if (checkCutDashAnime() && (checkCutDashEnemyHit(mAtCps[0]) || checkCutDashEnemyHit(mAtCps[1]) || checkCutDashEnemyHit(mAtCps[2]))) { + if (checkCutDashAnime() && (checkCutDashEnemyHit(mAtCps[0]) || + checkCutDashEnemyHit(mAtCps[1]) || checkCutDashEnemyHit(mAtCps[2]))) + { i_onNoResetFlg1(FLG1_UNK_4000000); } @@ -13482,9 +13465,12 @@ void daAlink_c::setSwordAtCollision(int param_0) { /* 800AA5E8-800AA6B4 0A4F28 00CC+00 4/4 0/0 0/0 .text checkNoCollisionCorret__9daAlink_cFv */ BOOL daAlink_c::checkNoCollisionCorret() { if (i_checkModeFlg(0x12800) || mDemo.getDemoType() == 1 || mProcID == PROC_DOOR_OPEN || - (checkEventRun() && (!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || - (fopAcM_getTalkEventPartner(this) && fopAcM_getTalkEventPartner(this) == getMidnaActor()))) || - mEvtInfo.i_checkCommandDoor()) { + (checkEventRun() && + (!strcmp(i_dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") || + (fopAcM_getTalkEventPartner(this) && + fopAcM_getTalkEventPartner(this) == getMidnaActor()))) || + mEvtInfo.i_checkCommandDoor()) + { return true; } @@ -13505,7 +13491,9 @@ void daAlink_c::decSwordBlur() { */ void daAlink_c::resetWolfAtCollision() { if (i_checkNoResetFlg0(FLG0_UNK_40)) { - if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { + if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && + !setSwordHitVibration(&field_0x850[1])) + { setSwordHitVibration(&field_0x850[2]); } @@ -13528,7 +13516,9 @@ void daAlink_c::setWolfAtCollision() { cXyz sp8; if (i_checkResetFlg0(RFLG0_UNK_2)) { - if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && !setSwordHitVibration(&field_0x850[1])) { + if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) && + !setSwordHitVibration(&field_0x850[1])) + { setSwordHitVibration(&field_0x850[2]); } @@ -13538,10 +13528,9 @@ void daAlink_c::setWolfAtCollision() { g_dComIfG_gameInfo.play.mCcs.Set(&mAtCyl); g_dComIfG_gameInfo.play.mCcs.SetMass(&mAtCyl, 1); } else { - sp8.set(current.pos.x + field_0x3438 * cM_ssin(shape_angle.y), - current.pos.y, - current.pos.z + field_0x3438 * cM_scos(shape_angle.y)); - + sp8.set(current.pos.x + field_0x3438 * cM_ssin(shape_angle.y), current.pos.y, + current.pos.z + field_0x3438 * cM_scos(shape_angle.y)); + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { mAtCyl.StartCAt(sp8); @@ -13576,7 +13565,8 @@ void daAlink_c::setWolfAtCollision() { void daAlink_c::resetAtCollision(int param_0) { if (i_checkNoResetFlg0(FLG0_UNK_40)) { if (param_0 && !setSwordHitVibration(&mAtCps[0]) && !setSwordHitVibration(&mAtCps[1]) && - !setSwordHitVibration(&mAtCps[2]) && !setSwordHitVibration(&mAtCyl)) { + !setSwordHitVibration(&mAtCps[2]) && !setSwordHitVibration(&mAtCyl)) + { setSwordHitVibration(&field_0xFB8); } @@ -13659,7 +13649,7 @@ void daAlink_c::setCollisionPos() { } else { sp68.y = sp74.y; var_f31 = mHeadTopPos.y - sp74.y; - } + } if (var_f31 < lit_10040) { sp68.y -= lit_5943 * (lit_10040 - var_f31); @@ -13718,7 +13708,9 @@ void daAlink_c::setCollision() { } dCcD_Cyl* var_r31 = field_0x850; - if (checkIronBallWaitAnime() || (checkPlayerGuardAndAttack() && !i_checkEndResetFlg1(ERFLG1_UNK_20))) { + if (checkIronBallWaitAnime() || + (checkPlayerGuardAndAttack() && !i_checkEndResetFlg1(ERFLG1_UNK_20))) + { BOOL var_r27; if (field_0x3114 >= 0x3000 && field_0x3114 <= 0x5000) { var_r27 = 1; @@ -13734,7 +13726,7 @@ void daAlink_c::setCollision() { var_r31->OffTgSpShield(); var_r31->OnTgShield(); } - + if (checkHorseRide()) { var_r31->OffTgShieldFrontRange(); } else { @@ -13747,7 +13739,7 @@ void daAlink_c::setCollision() { for (int i = 0; i < 3; i++) { var_r31->OffTgShield(); var_r31->OffTgSpShield(); - + if (i_checkWolf()) { var_r31->OffTgShieldFrontRange(); } else { @@ -13825,7 +13817,6 @@ void daAlink_c::setCollision() { setAtCollision(); } - dCcD_Cyl* var_r27_2 = field_0x850; dCcD_Cyl* var_r26_6 = field_0xC04; for (int i = 0; i < 3; i++) { @@ -13883,8 +13874,8 @@ void daAlink_c::setAnimeFrame(f32 frame) { /* 800AC394-800AC450 0A6CD4 00BC+00 6/6 0/0 0/0 .text * setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff */ -void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, f32 i_rate, - f32 i_frame) { +void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end, + f32 i_rate, f32 i_frame) { if (i_checkNoResetFlg0(FLG0_UNDERWATER)) { if (checkZoraWearAbility()) { i_rate *= daAlinkHIO_magneBoots_c0::m.mZoraWaterAnmSpeed; @@ -13920,7 +13911,9 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) return &m_mainBckShield[i_anmID]; } - if ((mEquipItem == 0x103 && i_anmID < 0x15 && i_anmID >= 0x10) || (i_anmID == ANM_SWIM_WAIT && mEquipItem != NO_ITEM)) { + if ((mEquipItem == 0x103 && i_anmID < 0x15 && i_anmID >= 0x10) || + (i_anmID == ANM_SWIM_WAIT && mEquipItem != NO_ITEM)) + { return &m_mainBckSword[i_anmID - 0x10]; } @@ -13931,17 +13924,18 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) return &m_anmDataTable[i_anmID].field_0x0; } - /* 800AC558-800AC5B4 0A6E98 005C+00 51/51 0/0 2/2 .text * checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM */ BOOL daAlink_c::checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM i_anmID) const { - return mUnderAnmHeap[0].checkNoSetArcNo() && mUnderAnmHeap[0].getIdx() == getMainBckData(i_anmID)->m_underID; + return mUnderAnmHeap[0].checkNoSetArcNo() && + mUnderAnmHeap[0].getIdx() == getMainBckData(i_anmID)->m_underID; } /* 800AC5B4-800AC610 0A6EF4 005C+00 4/4 0/0 0/0 .text * checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM */ BOOL daAlink_c::checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM i_anmID) const { - return mUnderAnmHeap[1].checkNoSetArcNo() && mUnderAnmHeap[1].getIdx() == getMainBckData(i_anmID)->m_underID; + return mUnderAnmHeap[1].checkNoSetArcNo() && + mUnderAnmHeap[1].getIdx() == getMainBckData(i_anmID)->m_underID; } /* 800AC610-800AC738 0A6F50 0128+00 3/3 0/0 0/0 .text @@ -13954,7 +13948,8 @@ int daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransfor const daAlink_BckData* bck_data = getMainBckData(i_anmID); i_offNoResetFlg0(FLG0_UNK_2); - *i_underBck = (J3DAnmTransform*)getAnimeResource(&mUnderAnmHeap[i_anmPackID], bck_data->m_underID, i_bufSize); + *i_underBck = (J3DAnmTransform*)getAnimeResource(&mUnderAnmHeap[i_anmPackID], + bck_data->m_underID, i_bufSize); if (*i_underBck != NULL) { var_r31 = 1; @@ -13968,7 +13963,8 @@ int daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransfor i_bufSize = (3 - i_anmPackID) * 0x2C00; } - *i_upperBck = (J3DAnmTransform*)getAnimeResource(&mUpperAnmHeap[i_anmPackID], bck_data->m_upperID, i_bufSize); + *i_upperBck = (J3DAnmTransform*)getAnimeResource(&mUpperAnmHeap[i_anmPackID], + bck_data->m_upperID, i_bufSize); if (*i_upperBck != NULL) { var_r31 |= 1; } else { @@ -14054,8 +14050,8 @@ void daAlink_c::setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM i_anmID, f32 para /* 800AD00C-800AD0F4 0A794C 00E8+00 58/58 0/0 0/0 .text * setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf */ -int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_start, - s16 i_end, f32 i_morf) { +int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_start, s16 i_end, + f32 i_morf) { J3DAnmTransform* under_bck; J3DAnmTransform* upper_bck; @@ -14076,7 +14072,8 @@ int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_ * setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c */ int daAlink_c::setSingleAnimeParam(daAlink_c::daAlink_ANM i_anmID, daAlinkHIO_anm_c const* i_anmData) { - return setSingleAnime(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, i_anmData->mInterpolation); + return setSingleAnime(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, + i_anmData->mInterpolation); } /* 800AD128-800AD170 0A7A68 0048+00 1/1 0/0 0/0 .text @@ -14144,53 +14141,48 @@ void daAlink_c::allAnimePlay() { } /* 800AD2D8-800AD340 0A7C18 0068+00 2/2 0/0 0/0 .text setUpperAnimeMorf__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperAnimeMorf(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperAnimeMorf__9daAlink_cFf.s" +void daAlink_c::setUpperAnimeMorf(f32 param_0) { + if (param_0 >= FLOAT_LABEL(lit_6108)) { + u16 temp_r29; + u16 temp_r28; + + if (field_0x2060->getOldFrameRate() > lit_9054 && + field_0x2060->getOldFrameStartJoint() == 0) + { + temp_r29 = 0; + temp_r28 = field_0x30c6; + } else { + temp_r29 = field_0x30a8; + temp_r28 = field_0x30aa; + } + + field_0x2060->initOldFrameMorf(param_0, temp_r29, temp_r28); + } } -#pragma pop /* 800AD340-800AD374 0A7C80 0034+00 15/15 0/0 0/0 .text setUpperAnimeBase__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperAnimeBase(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperAnimeBase__9daAlink_cFUs.s" +void daAlink_c::setUpperAnimeBase(u16 i_anmResID) { + setUpperAnime(i_anmResID, UPPER_2, lit_6040, FLOAT_LABEL(lit_6108), -1, lit_6109); } -#pragma pop /* 800AD374-800AD3A8 0A7CB4 0034+00 7/7 0/0 0/0 .text setUpperAnimeBaseMorf__9daAlink_cFUsf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperAnimeBaseMorf(u16 param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperAnimeBaseMorf__9daAlink_cFUsf.s" +void daAlink_c::setUpperAnimeBaseMorf(u16 i_anmResID, f32 i_morf) { + setUpperAnime(i_anmResID, UPPER_2, lit_6040, FLOAT_LABEL(lit_6108), -1, i_morf); } -#pragma pop /* 800AD3A8-800AD3D8 0A7CE8 0030+00 18/18 0/0 0/0 .text setUpperAnimeBaseSpeed__9daAlink_cFUsff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperAnimeBaseSpeed(u16 param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperAnimeBaseSpeed__9daAlink_cFUsff.s" +void daAlink_c::setUpperAnimeBaseSpeed(u16 i_anmResID, f32 i_speed, f32 i_morf) { + setUpperAnime(i_anmResID, UPPER_2, i_speed, FLOAT_LABEL(lit_6108), -1, i_morf); } -#pragma pop /* 800AD3D8-800AD6F0 0A7D18 0318+00 13/13 0/0 0/0 .text * setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setUpperAnime(u16 param_0, daAlink_c::daAlink_UPPER param_1, f32 param_2, - f32 param_3, s16 param_4, f32 param_5) { +asm void daAlink_c::setUpperAnime(u16 i_anmResID, daAlink_c::daAlink_UPPER param_1, f32 i_speed, + f32 i_startFrame, s16 i_endFrame, f32 i_morf) { nofralloc #include "asm/d/a/d_a_alink/setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf.s" } @@ -14198,15 +14190,11 @@ asm void daAlink_c::setUpperAnime(u16 param_0, daAlink_c::daAlink_UPPER param_1, /* 800AD6F0-800AD724 0A8030 0034+00 21/21 0/0 0/0 .text * setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperAnimeParam(u16 param_0, daAlink_c::daAlink_UPPER param_1, - daAlinkHIO_anm_c const* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c.s" +void daAlink_c::setUpperAnimeParam(u16 i_anmResID, daAlink_c::daAlink_UPPER param_1, + daAlinkHIO_anm_c const* i_anmParam) { + setUpperAnime(i_anmResID, param_1, i_anmParam->mSpeed, i_anmParam->mStartFrame, + i_anmParam->mEndFrame, i_anmParam->mInterpolation); } -#pragma pop /* 800AD724-800AD8F4 0A8064 01D0+00 65/65 0/0 0/0 .text * resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf */ @@ -14220,14 +14208,18 @@ asm void daAlink_c::resetUpperAnime(daAlink_c::daAlink_UPPER param_0, f32 param_ #pragma pop /* 800AD8F4-800AD964 0A8234 0070+00 2/2 0/0 0/0 .text setUnderAnimeMorf__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUnderAnimeMorf(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setUnderAnimeMorf__9daAlink_cFf.s" +void daAlink_c::setUnderAnimeMorf(f32 param_0) { + if (param_0 >= FLOAT_LABEL(lit_6108)) { + if (field_0x2060->getOldFrameRate() > lit_9054 && + (field_0x2060->getOldFrameStartJoint() == 0 || + field_0x2060->getOldFrameStartJoint() == 1)) + { + field_0x2060->initOldFrameMorf(param_0, 0, 35); + } else { + field_0x2060->initOldFrameMorf(param_0, 16, 35); + } + } } -#pragma pop /* 800AD964-800ADAB8 0A82A4 0154+00 5/5 0/0 0/0 .text * setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf */ @@ -14235,7 +14227,7 @@ asm void daAlink_c::setUnderAnimeMorf(f32 param_0) { #pragma optimization_level 0 #pragma optimizewithasm off asm int daAlink_c::setUnderAnime(u16 param_0, daAlink_c::daAlink_UNDER param_1, f32 param_2, - f32 param_3, s16 param_4, f32 param_5) { + f32 param_3, s16 param_4, f32 param_5) { nofralloc #include "asm/d/a/d_a_alink/setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf.s" } @@ -14245,29 +14237,39 @@ asm int daAlink_c::setUnderAnime(u16 param_0, daAlink_c::daAlink_UNDER param_1, * setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c */ int daAlink_c::setUnderAnimeParam(u16 i_resID, daAlink_c::daAlink_UNDER i_packIdx, daAlinkHIO_anm_c const* i_anmData) { - return setUnderAnime(i_resID, i_packIdx, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame, i_anmData->mInterpolation); + return setUnderAnime(i_resID, i_packIdx, i_anmData->mSpeed, i_anmData->mStartFrame, + i_anmData->mEndFrame, i_anmData->mInterpolation); } /* 800ADAEC-800ADB78 0A842C 008C+00 17/17 0/0 0/0 .text * resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetUnderAnime(daAlink_c::daAlink_UNDER param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf.s" +int daAlink_c::resetUnderAnime(daAlink_c::daAlink_UNDER param_0, f32 i_morf) { + mNowAnmPackUnder[param_0].setAnmTransform(NULL); + mNowAnmPackUnder[param_0].setRatio(FLOAT_LABEL(lit_6108)); + mUnderAnmHeap[param_0].resetIdx(); + mUnderFrameCtrl[param_0].init(0); + setUnderAnimeMorf(i_morf); + return 1; } -#pragma pop /* 800ADB78-800ADC50 0A84B8 00D8+00 34/34 0/0 0/0 .text setOldRootQuaternion__9daAlink_cFsss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setOldRootQuaternion(s16 param_0, s16 param_1, s16 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setOldRootQuaternion__9daAlink_cFsss.s" +void daAlink_c::setOldRootQuaternion(s16 param_0, s16 param_1, s16 param_2) { + Quaternion quat; + Quaternion quat2; + Quaternion* old_frame_quat = field_0x2060->getOldFrameQuaternion(0); + + if (param_0 != 0 || param_1 != 0) { + JMAEulerToQuat(param_0, param_1, 0, &quat); + quat2 = *old_frame_quat; + mDoMtx_QuatConcat(&quat, &quat2, old_frame_quat); + } + + if (param_2 != 0) { + JMAEulerToQuat(0, 0, param_2, &quat); + quat2 = *old_frame_quat; + mDoMtx_QuatConcat(&quat, &quat2, old_frame_quat); + } } -#pragma pop /* 800ADC50-800ADCEC 0A8590 009C+00 2/2 0/0 0/0 .text checkAtnLeftAnime__9daAlink_cFv */ BOOL daAlink_c::checkAtnLeftAnime() { @@ -14366,6 +14368,38 @@ asm void daAlink_c::setFaceBtp(u16 param_0, int param_1, u16 param_2) { #pragma pop /* 800AF7D0-800AF8A0 0AA110 00D0+00 6/6 0/0 0/0 .text setFaceBtk__9daAlink_cFUsiUs */ +// swapped instructions +#ifdef NONMATCHING +void daAlink_c::setFaceBtk(u16 i_resID, int param_1, u16 i_arcNo) { + int var_r4; + u16 arc_no; + u16 res_id; + + res_id = i_resID; + var_r4 = param_1; + arc_no = i_arcNo; + + setIdxMask(&arc_no, &res_id); + + J3DAnmTextureSRTKey* btk; + if (arc_no != 0xFFFF) { + btk = (J3DAnmTextureSRTKey*)mFaceBtkHeap.loadDataDemoRID(res_id, arc_no); + i_offNoResetFlg1(FLG1_UNK_2000); + } else if (var_r4 != 0) { + btk = (J3DAnmTextureSRTKey*)mFaceBtkHeap.loadDataPriIdx(res_id); + } else { + btk = (J3DAnmTextureSRTKey*)mFaceBtkHeap.loadDataIdx(res_id); + } + + if (btk != NULL) { + mpFaceBtk = btk; + mpFaceBtk->searchUpdateMaterialID(field_0x06c0); + field_0x06c0->entryTexMtxAnimator(mpFaceBtk); + daAlink_matAnm_c::setMorfFrame(3); + mpFaceBtk->setFrame(FLOAT_LABEL(lit_6108)); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -14374,6 +14408,7 @@ asm void daAlink_c::setFaceBtk(u16 param_0, int param_1, u16 param_2) { #include "asm/d/a/d_a_alink/setFaceBtk__9daAlink_cFUsiUs.s" } #pragma pop +#endif /* 800AF8A0-800AF9A8 0AA1E0 0108+00 31/31 0/0 0/0 .text * setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM */ @@ -14399,76 +14434,77 @@ asm void daAlink_c::setFaceBasicAnime(daAlink_c::daAlink_ANM param_0) { /* 800AFAA8-800AFB14 0AA3E8 006C+00 16/16 0/0 0/0 .text * setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFacePriTexture(daAlink_c::daAlink_FTANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM.s" +void daAlink_c::setFacePriTexture(daAlink_c::daAlink_FTANM i_anmID) { + setFacePriBtp(getFaceTexData(i_anmID)->m_btpID); + setFacePriBtk(getFaceTexData(i_anmID)->m_btkID); } -#pragma pop /* 800AFB14-800AFB74 0AA454 0060+00 6/6 0/0 0/0 .text * setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFacePriAnime(daAlink_c::daAlink_ANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" +void daAlink_c::setFacePriAnime(daAlink_c::daAlink_ANM i_anmID) { + const daAlink_AnmData* anm_data = getAnmData(i_anmID); + + setFacePriTexture((daAlink_FTANM)anm_data->m_faceTexID); + setFacePriBck(anm_data->m_faceBckID); } -#pragma pop /* 800AFB74-800AFBD0 0AA4B4 005C+00 1/1 0/0 0/0 .text resetFacePriBck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFacePriBck() { - nofralloc -#include "asm/d/a/d_a_alink/resetFacePriBck__9daAlink_cFv.s" +void daAlink_c::resetFacePriBck() { + if (!mFaceBckHeap.checkNoSetPriIdx()) { + mFaceBckHeap.resetPriIdx(); + u16 bck_idx = mFaceBckHeap.getIdx(); + + if (bck_idx == 0xFFFF) { + bck_idx = 0xDF; + } + + mFaceBckHeap.resetIdx(); + setFaceBasicBck(bck_idx); + } } -#pragma pop /* 800AFBD0-800AFC2C 0AA510 005C+00 1/1 0/0 0/0 .text resetFacePriBtp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFacePriBtp() { - nofralloc -#include "asm/d/a/d_a_alink/resetFacePriBtp__9daAlink_cFv.s" +void daAlink_c::resetFacePriBtp() { + if (!mFaceBtpHeap.checkNoSetPriIdx()) { + mFaceBtpHeap.resetPriIdx(); + u16 btp_idx = mFaceBtpHeap.getIdx(); + + if (btp_idx == 0xFFFF) { + btp_idx = 0x3DF; + } + + mFaceBtpHeap.resetIdx(); + setFaceBasicBtp(btp_idx); + } } -#pragma pop /* 800AFC2C-800AFC88 0AA56C 005C+00 1/1 0/0 0/0 .text resetFacePriBtk__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFacePriBtk() { - nofralloc -#include "asm/d/a/d_a_alink/resetFacePriBtk__9daAlink_cFv.s" +void daAlink_c::resetFacePriBtk() { + if (!mFaceBtkHeap.checkNoSetPriIdx()) { + mFaceBtkHeap.resetPriIdx(); + u16 btk_idx = mFaceBtkHeap.getIdx(); + + if (btk_idx == 0xFFFF) { + btk_idx = 0x379; + } + + mFaceBtkHeap.resetIdx(); + setFaceBasicBtk(btk_idx); + } } -#pragma pop /* 800AFC88-800AFCBC 0AA5C8 0034+00 1/1 0/0 0/0 .text resetFacePriTexture__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFacePriTexture() { - nofralloc -#include "asm/d/a/d_a_alink/resetFacePriTexture__9daAlink_cFv.s" +void daAlink_c::resetFacePriTexture() { + resetFacePriBtp(); + resetFacePriBtk(); } -#pragma pop /* 800AFCBC-800AFCF0 0AA5FC 0034+00 7/7 0/0 0/0 .text resetFacePriAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetFacePriAnime() { - nofralloc -#include "asm/d/a/d_a_alink/resetFacePriAnime__9daAlink_cFv.s" +void daAlink_c::resetFacePriAnime() { + resetFacePriTexture(); + resetFacePriBck(); } -#pragma pop /* 800AFCF0-800B0098 0AA630 03A8+00 2/2 0/0 0/0 .text playFaceTextureAnime__9daAlink_cFv */ @@ -14510,14 +14546,27 @@ asm s16 daAlink_c::getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) { /* 800B0150-800B01FC 0AAA90 00AC+00 1/1 0/0 0/0 .text getRoofAngle__9daAlink_cFP13cBgS_PolyInfos */ +// matches with cM3dGPla vtable data +#ifdef NONMATCHING +s16 daAlink_c::getRoofAngle(cBgS_PolyInfo* param_0, s16 param_1) { + cM3dGPla plane; + + if (!dComIfG_Bgsp().GetTriPla(*param_0, &plane) || !dComIfG_Bgsp().ChkPolySafe(*param_0)) { + return 0; + } + + return fopAcM_getPolygonAngle(&plane, param_1) + 0x8000; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getRoofAngle(cBgS_PolyInfo* param_0, s16 param_1) { +asm s16 daAlink_c::getRoofAngle(cBgS_PolyInfo* param_0, s16 param_1) { nofralloc #include "asm/d/a/d_a_alink/getRoofAngle__9daAlink_cFP13cBgS_PolyInfos.s" } #pragma pop +#endif /* 800B01FC-800B02BC 0AAB3C 00C0+00 2/2 0/0 0/0 .text * getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi */ @@ -14810,7 +14859,8 @@ void daAlink_c::setStickData() { if (checkEventRun() && mProcID != PROC_GRASS_WHISTLE_WAIT && mProcID != PROC_WOLF_DIG_THROUGH && mProcID != PROC_GOAT_CATCH && mProcID != PROC_WOLF_GANON_CATCH && - mProcID != PROC_TOOL_DEMO && (mProcID != PROC_METAMORPHOSE || mFallVoiceInit == 0)) { + mProcID != PROC_TOOL_DEMO && (mProcID != PROC_METAMORPHOSE || mFallVoiceInit == 0)) + { u32 demoMode = mDemo.getDemoMode(); if (checkDemoMoveMode(demoMode)) { @@ -14857,7 +14907,8 @@ void daAlink_c::setStickData() { bool usingFishRod = false; if (checkFishingRodAndLureItem() && mItemAcKeep.getActor() != NULL && - (checkCanoeRide() || mProcID == PROC_FISHING_CAST)) { + (checkCanoeRide() || mProcID == PROC_FISHING_CAST)) + { usingFishRod = true; } @@ -14877,16 +14928,16 @@ void daAlink_c::setStickData() { if (i_checkMagneBootsOn()) { if (field_0x2fb9 == 1 || - (field_0x2fb9 == 0 && field_0x3114 != -0x8000 && field_0x3114 <= 0x6000)) { + (field_0x2fb9 == 0 && field_0x3114 != -0x8000 && field_0x3114 <= 0x6000)) + { field_0x2fb9 = 1; } else { field_0x2fb9 = 2; } - if ((field_0x2fb9 == 1 && - (field_0x3114 > 0x6000 || field_0x3114 == -0x8000)) || - (field_0x2fb9 == 2 && field_0x3114 != -0x8000 && - field_0x3114 < 0x4000)) { + if ((field_0x2fb9 == 1 && (field_0x3114 > 0x6000 || field_0x3114 == -0x8000)) || + (field_0x2fb9 == 2 && field_0x3114 != -0x8000 && field_0x3114 < 0x4000)) + { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, 0) + 0x8000; } else { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, field_0x2fb9); @@ -14939,7 +14990,9 @@ void daAlink_c::setStickData() { mItemButton |= BTN_R; } - if (checkHeavyStateOn(1, 1) && (!checkBootsOrArmorHeavy() || !i_checkNoResetFlg0(FLG0_UNDERWATER))) { + if (checkHeavyStateOn(1, 1) && + (!checkBootsOrArmorHeavy() || !i_checkNoResetFlg0(FLG0_UNDERWATER))) + { if (i_checkWolf() && checkHeavyStateOn(1, 0) && mSinkShapeOffset < -30.0f) { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mInputFactor * 0.4f; } else { @@ -14953,8 +15006,9 @@ void daAlink_c::setStickData() { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mWaterInputFactor; } field_0x33a8 *= mHeavySpeedMultiplier; - } else if ((i_checkWolf() && - field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11) { + } else if ((i_checkWolf() && field_0x2fbc == 11 && checkWaterPolygonUnder()) || + field_0x2fbb == 11) + { i_onNoResetFlg0(FLG0_UNK_40000000); field_0x33a8 *= daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; mHeavySpeedMultiplier = daAlinkHIO_wolf_c0::m.mUnderwaterInputRate; @@ -15038,14 +15092,19 @@ void daAlink_c::setBStatus(u8 status) { } /* 800B32B0-800B3358 0ADBF0 00A8+00 2/2 0/0 0/0 .text checkAtnWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkAtnWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/checkAtnWaitAnime__9daAlink_cFv.s" +BOOL daAlink_c::checkAtnWaitAnime() { + if ((mTargetedActor != NULL && + (checkEnemyGroup(mTargetedActor) || checkGoatCatchActor(mTargetedActor) || + fopAcM_GetName(mTargetedActor) == PROC_CROD || + fopAcM_GetName(mTargetedActor) == PROC_BOOMERANG)) || + (checkGrabAnimeUp() || checkGrabAnimeSide() || mDemo.getDemoMode() == 0x17 || + checkGoatStopGame())) + { + return true; + } + + return false; } -#pragma pop /* 800B3358-800B33E4 0ADC98 008C+00 2/2 0/0 0/0 .text * setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c */ @@ -15060,14 +15119,16 @@ void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) { } /* 800B33E4-800B3494 0ADD24 00B0+00 4/4 0/0 0/0 .text checkRestHPAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkRestHPAnime() { - nofralloc -#include "asm/d/a/d_a_alink/checkRestHPAnime__9daAlink_cFv.s" +BOOL daAlink_c::checkRestHPAnime() { + if (!checkPlayerGuard() && (checkNoUpperAnime() || checkHorseTiredAnime()) && + mTargetedActor == NULL && !checkWindSpeedOnAngle() && + ((!checkPlayerDemoMode() && i_dComIfGs_getLife() <= 4) || mDemo.getDemoMode() == 0x12)) + { + return true; + } + + return false; } -#pragma pop /* 800B3494-800B3500 0ADDD4 006C+00 44/44 0/0 0/0 .text getDirectionFromAngle__9daAlink_cFs */ int daAlink_c::getDirectionFromAngle(s16 angle) { @@ -15119,6 +15180,18 @@ asm bool daAlink_c::setShapeAngleToAtnActor(int param_0) { /* 800B3844-800B3904 0AE184 00C0+00 9/9 0/0 0/0 .text initServiceWaitTime__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::initServiceWaitTime() { + field_0x30ca = cM_rndF(150.0f) + 300.0f; + + if (i_checkWolf()) { + field_0x30ca >>= 2; // divide by 4 + } else if (i_checkReinRide()) { + field_0x30ca *= 0.75f; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -15127,6 +15200,7 @@ asm void daAlink_c::initServiceWaitTime() { #include "asm/d/a/d_a_alink/initServiceWaitTime__9daAlink_cFv.s" } #pragma pop +#endif /* 800B3904-800B3924 0AE244 0020+00 50/50 0/0 0/0 .text checkZeroSpeedF__9daAlink_cCFv */ bool daAlink_c::checkZeroSpeedF() const { @@ -15144,14 +15218,25 @@ asm void daAlink_c::setNormalSpeedF(f32 param_0, f32 param_1) { #pragma pop /* 800B3F2C-800B3FD4 0AE86C 00A8+00 2/2 0/0 0/0 .text getStickAngleDistanceRate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getStickAngleDistanceRate() { - nofralloc -#include "asm/d/a/d_a_alink/getStickAngleDistanceRate__9daAlink_cFv.s" +f32 daAlink_c::getStickAngleDistanceRate() { + f32 rate; + + if (abs((s16)(mPrevStickAngle - mStickAngle)) > 0x1000) { + rate = cM_scos(field_0x2fe2 - current.angle.y); + + if (mNormalSpeed > lit_5943 * field_0x594) { + if (rate < lit_9652) { + rate = lit_9652; + } + } else if (rate < FLOAT_LABEL(lit_6108)) { + rate = FLOAT_LABEL(lit_6108); + } + } else { + rate = lit_6040; + } + + return rate; } -#pragma pop /* 800B3FD4-800B444C 0AE914 0478+00 3/3 0/0 0/0 .text setSpeedAndAngleNormal__9daAlink_cFv */ #pragma push @@ -15177,7 +15262,9 @@ asm void daAlink_c::setSpeedAndAngleAtn() { /* 800B477C-800B47B4 0AF0BC 0038+00 2/2 0/0 0/0 .text * checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c */ int daAlink_c::checkRequestTalkActor(dAttList_c* param_0, fopAc_ac_c* param_1) { - if (param_0 != NULL && (param_0->mType == 3 || (param_0->mType == 1 && mTargetedActor == param_1))) { + if (param_0 != NULL && + (param_0->mType == 3 || (param_0->mType == 1 && mTargetedActor == param_1))) + { return true; } @@ -15238,7 +15325,8 @@ BOOL daAlink_c::notTalk() { (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) && - !safe_poly) { + !safe_poly) + { return true; } return false; @@ -15257,7 +15345,7 @@ BOOL daAlink_c::setTalkStatus() { if (field_0x27f4->mAttentionInfo.mFlags & 0x2000000) { return 0; } - + if (field_0x27f4->mAttentionInfo.mFlags & 0x800000) { setDoStatus(0x3B); } else if (field_0x27f4->mAttentionInfo.mFlags & 0x20000000) { @@ -15370,15 +15458,20 @@ BOOL daAlink_c::checkLandAction(int param_0) { f32 temp_f31 = lit_8782 * (mFallHeight - current.pos.y); int temp_r3 = getDirectionFromCurrentAngle(); int temp_r27 = getDirectionFromAngle(current.angle.y - shape_angle.y); - BOOL var_r29 = field_0x33a8 > lit_14064 && temp_r27 != 1 && !checkGrabAnime() && mProcID != PROC_CUT_HEAD && temp_r3 == DIR_FORWARD; + BOOL var_r29 = field_0x33a8 > lit_14064 && temp_r27 != 1 && !checkGrabAnime() && + mProcID != PROC_CUT_HEAD && temp_r3 == DIR_FORWARD; - if ((param_0 || temp_f31 >= daAlinkHIO_damFall_c0::m.mMinRollHeight) && temp_f31 < daAlinkHIO_damFall_c0::m.mMaxRollHeight && var_r29) { + if ((param_0 || temp_f31 >= daAlinkHIO_damFall_c0::m.mMinRollHeight) && + temp_f31 < daAlinkHIO_damFall_c0::m.mMaxRollHeight && var_r29) + { if (temp_r27 == DIR_FORWARD) { procFrontRollInit(); } else { procSideRollInit(temp_r27); } - } else if (checkNoLandDamageSlidePolygon() || temp_f31 < daAlinkHIO_damFall_c0::m.mSmallDmgHeight) { + } else if (checkNoLandDamageSlidePolygon() || + temp_f31 < daAlinkHIO_damFall_c0::m.mSmallDmgHeight) + { if (param_0) { procLandDamageInit(0); } else if (var_r29 && field_0x30f0 > 0x32) { @@ -15387,7 +15480,9 @@ BOOL daAlink_c::checkLandAction(int param_0) { } else { procSideRollInit(temp_r27); } - } else if (checkInputOnR() && temp_r27 == DIR_FORWARD && temp_r3 == DIR_FORWARD && mNormalSpeed > lit_7808) { + } else if (checkInputOnR() && temp_r27 == DIR_FORWARD && temp_r3 == DIR_FORWARD && + mNormalSpeed > lit_7808) + { if (mNormalSpeed > daAlinkHIO_move_c0::m.mMaxSpeed) { mNormalSpeed = daAlinkHIO_move_c0::m.mMaxSpeed; } @@ -15398,7 +15493,7 @@ BOOL daAlink_c::checkLandAction(int param_0) { field_0x2f9d = 4; resetBasAnime(); seStartMapInfo(0x30001); - + f32 tmp_0 = FLOAT_LABEL(lit_6108); dComIfGp_getVibration().StartShock(1, 15, cXyz(tmp_0, lit_6040, tmp_0)); } else { @@ -15507,16 +15602,38 @@ void daAlink_c::setFastShotTimer() { } /* 800B7190-800B71EC 0B1AD0 005C+00 9/9 0/0 0/0 .text cancelItemUseQuake__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelItemUseQuake(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/cancelItemUseQuake__9daAlink_cFi.s" +void daAlink_c::cancelItemUseQuake(int param_0) { + if (i_checkNoResetFlg3(FLG3_UNK_4) && (param_0 != 0 || mProcID != PROC_HOOKSHOT_FLY)) { + i_offNoResetFlg3(FLG3_UNK_4); + dComIfGp_getVibration().StopQuake(31); + } } -#pragma pop /* 800B71EC-800B72E4 0B1B2C 00F8+00 6/6 0/0 0/0 .text cancelUpperItemReadyAnime__9daAlink_cFi */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::cancelUpperItemReadyAnime(int param_0) { + if ((i_dComIfGp_getDoStatus() == 0x12 || param_0 != 0) && + ((param_0 == 0 && doTrigger()) || + (checkCanoeSlider() && + (subjectCancelTrigger() || i_checkEndResetFlg1(ERFLG1_UNK_20000000))))) + { + seStartSystem(0x6F); + + if (mEquipItem == IRONBALL) { + field_0x3018 = 8; + procIronBallReturnInit(); + } else { + resetUpperAnime(UPPER_2, 3.0f); + checkWaitAction(); + } + + return 1; + } + + return 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -15525,6 +15642,7 @@ asm int daAlink_c::cancelUpperItemReadyAnime(int param_0) { #include "asm/d/a/d_a_alink/cancelUpperItemReadyAnime__9daAlink_cFi.s" } #pragma pop +#endif /* 800B72E4-800B7390 0B1C24 00AC+00 8/8 0/0 0/0 .text checkItemActorPointer__9daAlink_cFv */ @@ -15581,7 +15699,9 @@ void daAlink_c::checkItemButtonChange() { u8 temp_r0; for (u8 i = 0; i < 2; i++) { temp_r0 = (i + 1) % 2; - if (mEquipItem == dComIfGp_getSelectItem(i) && (mEquipItem != dComIfGp_getSelectItem(temp_r0) || mSelectItemId != temp_r0)) { + if (mEquipItem == dComIfGp_getSelectItem(i) && + (mEquipItem != dComIfGp_getSelectItem(temp_r0) || mSelectItemId != temp_r0)) + { mSelectItemId = i; } } @@ -15621,9 +15741,11 @@ int daAlink_c::orderTalk(int i_checkZTalk) { return 0; } - if ((i_dComIfGp_getDoStatus() == 0x1C || i_dComIfGp_getDoStatus() == 0x1B || i_dComIfGp_getDoStatus() == 0x80 || - i_dComIfGp_getDoStatus() == 0x3B || i_dComIfGp_getDoStatus() == 0x3C || i_dComIfGp_getDoStatus() == 0x8) && - talkTrigger()) { + if ((i_dComIfGp_getDoStatus() == 0x1C || i_dComIfGp_getDoStatus() == 0x1B || + i_dComIfGp_getDoStatus() == 0x80 || i_dComIfGp_getDoStatus() == 0x3B || + i_dComIfGp_getDoStatus() == 0x3C || i_dComIfGp_getDoStatus() == 0x8) && + talkTrigger()) + { fopAcM_orderTalkEvent(this, field_0x27f4, 0, 0); return 1; } @@ -15685,8 +15807,7 @@ asm int daAlink_c::orderZTalk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int daAlink_c::checkNormalAction(){ - nofralloc +asm int daAlink_c::checkNormalAction(){nofralloc #include "asm/d/a/d_a_alink/checkNormalAction__9daAlink_cFv.s" } #pragma pop @@ -15734,12 +15855,14 @@ asm BOOL daAlink_c::checkMoveDoAction() { #ifdef NONMATCHING BOOL daAlink_c::checkSideRollAction(int param_0) { if (checkNotJumpSinkLimit() || checkHeavyStateOn(1, 1) || checkInputOnR() || - checkCutBackState()) { + checkCutBackState()) + { return false; } else { if (mTargetedActor != NULL) { if (checkEnemyGroup(mTargetedActor) && - mTargetedActor->current.pos.abs2XZ(current.pos) <= lit_6237) { + mTargetedActor->current.pos.abs2XZ(current.pos) <= lit_6237) + { return procSideRollInit(param_0); } else { return procTurnMoveInit(param_0); @@ -15764,7 +15887,8 @@ asm BOOL daAlink_c::checkSideRollAction(int param_0) { /* 800B9254-800B92D0 0B3B94 007C+00 35/35 0/0 0/0 .text checkNoUpperAnime__9daAlink_cCFv */ BOOL daAlink_c::checkNoUpperAnime() const { - return checkNoSetUpperAnime() || checkSwimMoveHandAnime() || checkWindDashAnime() || checkSwordTwirlAnime() || checkKandelaarEquipAnime(); + return checkNoSetUpperAnime() || checkSwimMoveHandAnime() || checkWindDashAnime() || + checkSwordTwirlAnime() || checkKandelaarEquipAnime(); } /* 800B92D0-800B92F8 0B3C10 0028+00 1/1 0/0 0/0 .text checkOneHandItemEquipAnime__9daAlink_cCFv */ @@ -15820,8 +15944,8 @@ void daAlink_c::swordUnequip() { u16 anm_id = i_checkReinRide() ? (u16)0x261 : (u16)0x255; - setUpperAnime(anm_id, UPPER_2, anm_speed, - daAlinkHIO_cut_c0::m.mUnequipAnm.mStartFrame, daAlinkHIO_cut_c0::m.mUnequipAnm.mEndFrame, + setUpperAnime(anm_id, UPPER_2, anm_speed, daAlinkHIO_cut_c0::m.mUnequipAnm.mStartFrame, + daAlinkHIO_cut_c0::m.mUnequipAnm.mEndFrame, daAlinkHIO_cut_c0::m.mUnequipAnm.mInterpolation); setFacePriTexture(FTANM_UNK_2D); setFaceBck(0x15E, 1, 0xFFFF); @@ -15842,7 +15966,7 @@ void daAlink_c::itemEquip(u16 i_itemID) { * This handles setting the animation for both equipping and unequipping items * When `param_1` is positive, it will play the unequip animation * When `param_1` is negative, it will play the equip animation - * + * */ // matches with literals #ifdef NONMATCHING @@ -15851,7 +15975,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { const daAlinkHIO_anm_c* anm_data; if (i_itemID == BOOMERANG || i_itemID == COPY_ROD || i_itemID == KANTERA || - i_itemID == HOOKSHOT || checkBottleItem(i_itemID)) { + i_itemID == HOOKSHOT || checkBottleItem(i_itemID)) + { anm_id = 0x247; anm_data = &daAlinkHIO_item_c0::m.mOneHandEquipAnm; } else if (checkBowAndSlingItem(i_itemID)) { @@ -15873,7 +15998,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { anm_speed = anm_data->mSpeed * i_playSpeed; } - setUpperAnime(anm_id, UPPER_2, anm_speed, anm_data->mStartFrame, anm_data->mEndFrame, anm_data->mInterpolation); + setUpperAnime(anm_id, UPPER_2, anm_speed, anm_data->mStartFrame, anm_data->mEndFrame, + anm_data->mInterpolation); } #else #pragma push @@ -15893,7 +16019,9 @@ bool daAlink_c::checkFastUnequip() { /* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text allUnequip__9daAlink_cFi */ void daAlink_c::allUnequip(int param_0) { - if (i_checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && mEquipItem != KANTERA) { + if (i_checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() && + mEquipItem != KANTERA) + { for (u8 i = 0; i < 2; i++) { if (dComIfGp_getSelectItem(i) == KANTERA) { mSelectItemId = i; @@ -15917,17 +16045,20 @@ void daAlink_c::allUnequip(int param_0) { /* 800B994C-800B9D2C 0B428C 03E0+00 8/8 0/0 0/0 .text checkItemChangeFromButton__9daAlink_cFv */ BOOL daAlink_c::checkItemChangeFromButton() { if (i_checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() && - !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime()) { - - if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() && !checkCanoeRide() && - (!i_checkModeFlg(0x40000) || i_checkEquipHeavyBoots()) && mEquipItem != 0x103 && swordTrigger()) { + !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime()) + { + if (dComIfGs_getSelectEquipSword() != NO_ITEM && !checkNotBattleStage() && + !checkCanoeRide() && (!i_checkModeFlg(0x40000) || i_checkEquipHeavyBoots()) && + mEquipItem != 0x103 && swordTrigger()) + { if (i_checkEndResetFlg1(ERFLG1_UNK_40000000)) { return 0; } swordEquip(1); } else if (checkCanoeRide() && !checkStageName("F_SP103") && !checkCanoeSlider() && - !checkFisingRodLure() && swordTrigger()) { + !checkFisingRodLure() && swordTrigger()) + { itemEquip(0x105); } else { u8 i; @@ -15941,13 +16072,16 @@ BOOL daAlink_c::checkItemChangeFromButton() { if (doTrigger() && i_dComIfGp_getDoStatus() == 4) { if (mEquipItem != KANTERA && i_checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); - } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && !checkWoodSwordEquip() && !i_checkModeFlg(0x402)) { + } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && + !checkWoodSwordEquip() && !i_checkModeFlg(0x402)) + { return procSwordUnequipSpInit(); } else { allUnequip(1); } } else if (mEquipItem == NO_ITEM && mThrowBoomerangAcKeep.getActor() == NULL && - !checkCanoeRide() && checkNoUpperAnime() && i_checkNoResetFlg2(FLG2_UNK_1)) { + !checkCanoeRide() && checkNoUpperAnime() && i_checkNoResetFlg2(FLG2_UNK_1)) + { for (i = 0; i < 2; i++) { if (dComIfGp_getSelectItem(i) == KANTERA) { mSelectItemId = i; @@ -15957,9 +16091,14 @@ BOOL daAlink_c::checkItemChangeFromButton() { itemEquip(KANTERA); i_onNoResetFlg1(FLG1_UNK_40); } else if (mEquipItem != 0x103 && mEquipItem != NO_ITEM && mEquipItem != 0x10B && - mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { - if (!checkEventRun() || strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER")) { - if (strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER2") && checkItemSetButton(mEquipItem) == 2) { + mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) + { + if (!checkEventRun() || + strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER")) + { + if (strcmp(i_dComIfGp_getEventManager().getRunEventName(), "ANGER2") && + checkItemSetButton(mEquipItem) == 2) + { allUnequip(1); } } @@ -15990,9 +16129,10 @@ BOOL daAlink_c::checkNextActionFromButton() { } } else if (!i_checkModeFlg(0x40000)) { if ((i_checkWolf() && !checkWolfGrabAnime()) || - (!i_checkWolf() && getCopyRodControllActor() == NULL && (checkEquipAnime() || - i_checkNoResetFlg0(FLG0_UNK_1000000) || checkUpperGuardAnime() || - checkIronBallWaitAnime() || checkNoUpperAnime()))) { + (!i_checkWolf() && getCopyRodControllActor() == NULL && + (checkEquipAnime() || i_checkNoResetFlg0(FLG0_UNK_1000000) || checkUpperGuardAnime() || + checkIronBallWaitAnime() || checkNoUpperAnime()))) + { decideDoStatus(); if (checkNormalAction()) { @@ -16030,7 +16170,9 @@ BOOL daAlink_c::checkNextActionFromButton() { /* 800B9F50-800BA09C 0B4890 014C+00 14/14 0/0 0/0 .text checkGroundSpecialMode__9daAlink_cFv */ BOOL daAlink_c::checkGroundSpecialMode() { - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && !i_checkMagneBootsOn() && i_checkEndResetFlg0(ERFLG0_UNK_2)) { + if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && !i_checkMagneBootsOn() && + i_checkEndResetFlg0(ERFLG0_UNK_2)) + { return procCoMetamorphoseInit(); } @@ -16097,12 +16239,18 @@ int daAlink_c::checkNextAction(int param_0) { } u32 procID = mProcID; - if (procID != PROC_MOVE_TURN && (param_0 == 0 || checkInputOnR()) && (procID != PROC_HOOKSHOT_MOVE || checkHookshotWait())) { + if (procID != PROC_MOVE_TURN && (param_0 == 0 || checkInputOnR()) && + (procID != PROC_HOOKSHOT_MOVE || checkHookshotWait())) + { if (mTargetedActor != NULL || i_checkAttentionLock()) { setSpeedAndAngleAtn(); } else if (((!checkUpperReadyThrowAnime() || mFastShotTime != 0) || - (checkBoomerangThrowAnime() && (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == 0x102 || i_checkNoResetFlg1(FLG1_UNK_2)))) || - (checkCopyRodThrowAnime() && (mCopyRodAcKeep.getActor() != NULL || i_checkNoResetFlg1(FLG1_UNK_10000)))) { + (checkBoomerangThrowAnime() && + (mThrowBoomerangAcKeep.getActor() != NULL || mEquipItem == 0x102 || + i_checkNoResetFlg1(FLG1_UNK_2)))) || + (checkCopyRodThrowAnime() && + (mCopyRodAcKeep.getActor() != NULL || i_checkNoResetFlg1(FLG1_UNK_10000)))) + { setSpeedAndAngleNormal(); } } @@ -16124,7 +16272,9 @@ int daAlink_c::checkNextAction(int param_0) { field_0x594 = daAlinkHIO_move_c0::m.mMaxSpeed; } - if (i_checkEndResetFlg0(ERFLG0_UNK_100000) && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY)) { + if (i_checkEndResetFlg0(ERFLG0_UNK_100000) && mLinkAcch.ChkGroundHit() && + !i_checkModeFlg(MODE_PLAYER_FLY)) + { return procFloorDownReboundInit(); } @@ -16166,7 +16316,7 @@ int daAlink_c::checkNextAction(int param_0) { } } else { field_0x2f98 = 4; - + if (checkZeroSpeedF()) { if (cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7800 && checkInputOnR()) { ret = procWaitTurnInit(); @@ -16179,13 +16329,17 @@ int daAlink_c::checkNextAction(int param_0) { } else if (mProcID == PROC_MOVE_TURN && current.angle.y != shape_angle.y) { ret = procMoveTurnInit(0); } else if (checkInputOnR() && cLib_distanceAngleS(field_0x2fe2, current.angle.y) > 0x7800) { - if (speedF / field_0x594 > daAlinkHIO_move_c0::m.mSlideThresholdSpeed && field_0x2fa8 != 8 && - !checkGrabAnime() && getDirectionFromAngle(mPrevStickAngle - mStickAngle) == DIR_BACKWARD) { + if (speedF / field_0x594 > daAlinkHIO_move_c0::m.mSlideThresholdSpeed && + field_0x2fa8 != 8 && !checkGrabAnime() && + getDirectionFromAngle(mPrevStickAngle - mStickAngle) == DIR_BACKWARD) + { ret = procSlipInit(); } else { ret = procMoveTurnInit(1); } - } else if (checkInputOnR() && getDirectionFromAngle(field_0x2fe2 - current.angle.y) == DIR_BACKWARD) { + } else if (checkInputOnR() && + getDirectionFromAngle(field_0x2fe2 - current.angle.y) == DIR_BACKWARD) + { ret = procMoveTurnInit(1); } else { ret = procMoveInit(); @@ -16231,7 +16385,7 @@ asm void daAlink_c::setItemAction() { #pragma pop /* 800BAF08-800BAF80 0B5848 0078+00 2/2 0/0 0/0 .text checkNextActionFromCrouch__9daAlink_cFi */ -bool daAlink_c::checkNextActionFromCrouch(int param_0) { +BOOL daAlink_c::checkNextActionFromCrouch(int param_0) { if (checkNextAction(param_0)) { if (field_0x2f8c == 1 || field_0x2f8c == 2 || field_0x2f8c == 3) { field_0x2060->initOldFrameMorf(daAlinkHIO_crouch_c0::m.mStandInterpolation, 0, 0x23); @@ -16246,7 +16400,8 @@ bool daAlink_c::checkNextActionFromCrouch(int param_0) { /* 800BAF80-800BB020 0B58C0 00A0+00 18/18 0/0 0/0 .text checkUpperReadyThrowAnime__9daAlink_cCFv */ int daAlink_c::checkUpperReadyThrowAnime() const { - return checkBoomerangAnime() || checkCopyRodAnime() || checkHookshotAnime() || checkIronBallAnime() || checkBowAnime(); + return checkBoomerangAnime() || checkCopyRodAnime() || checkHookshotAnime() || + checkIronBallAnime() || checkBowAnime(); } /* 800BB020-800BB084 0B5960 0064+00 2/2 0/0 0/0 .text getBodyAngleXBasePos__9daAlink_cFP4cXyz */ @@ -16302,7 +16457,7 @@ void daAlink_c::setMagicArmorBrk(int param_0) { mMagicArmorHeadBrk->searchUpdateMaterialID(head_model_data); head_model_data->entryTevRegAnimator(mMagicArmorHeadBrk); mMagicArmorHeadBrk->setFrame(FLOAT_LABEL(lit_6108)); - + field_0x2fd7 = param_0; } @@ -16324,7 +16479,8 @@ 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()) { + checkMagicArmorHeavy() || getHeavyStateAndBoots()) + { return true; } } @@ -16333,7 +16489,9 @@ BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) { /* 800BB560-800BB644 0B5EA0 00E4+00 1/0 0/0 0/0 .text setOutPower__9daAlink_cFfsi */ void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) { - if (!i_checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 || !i_checkEquipHeavyBoots()) { + if (!i_checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 || + !i_checkEquipHeavyBoots()) + { field_0x3400 += param_0 * cM_ssin(param_1); field_0x3404 += param_0 * cM_scos(param_1); @@ -16443,7 +16601,7 @@ SECTION_SDATA2 static f32 lit_70084 = 2.25f; #ifdef NONMATCHING void daAlink_c::posMove() { cXyz sp108; - + f32 temp_f30 = cM_ssin(shape_angle.y); f32 temp_f29 = cM_scos(shape_angle.y); @@ -16456,8 +16614,9 @@ void daAlink_c::posMove() { s16 var_r26; if (i_checkModeFlg(MODE_SWIMMING)) { var_r26 = field_0x3080; - } else if (!mLinkAcch.ChkGroundHit() || i_checkMagneBootsOn() || (i_checkModeFlg(MODE_PLAYER_FLY) && - !checkBoardRide()) || field_0x3174 == 8) { + } else if (!mLinkAcch.ChkGroundHit() || i_checkMagneBootsOn() || + (i_checkModeFlg(MODE_PLAYER_FLY) && !checkBoardRide()) || field_0x3174 == 8) + { var_r26 = 0; } else { var_r26 = getGroundAngle(&mLinkAcch.m_gnd, current.angle.y); @@ -16490,7 +16649,8 @@ void daAlink_c::posMove() { } if (mProcID == PROC_AUTO_JUMP && checkGrabGlide() && - (field_0xC04[0].ChkTgHit() || field_0xC04[1].ChkTgHit() || field_0xC04[2].ChkTgHit())) { + (field_0xC04[0].ChkTgHit() || field_0xC04[1].ChkTgHit() || field_0xC04[2].ChkTgHit())) + { speedF *= 0.5f; } @@ -16503,16 +16663,22 @@ void daAlink_c::posMove() { } BOOL eventRunning = checkEventRun(); - if (!i_checkEquipHeavyBoots() && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x40) && !eventRunning) { + if (!i_checkEquipHeavyBoots() && mLinkAcch.ChkGroundHit() && !i_checkModeFlg(0x40) && + !eventRunning) + { if (checkLv2MiddleBossBgRide(getMoveBGActorName(mLinkAcch.m_gnd, 0))) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &plane); f32 temp_f0 = cM_sht2d(cM_atan2s(plane.mNormal.absXZ(), plane.mNormal.y)); - if (temp_f0 >= daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle && temp_f0 <= daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle) { - temp_f0 = ((temp_f0 - daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle) * daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideSpeed) / - (daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle - daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle); + if (temp_f0 >= daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle && + temp_f0 <= daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle) + { + temp_f0 = ((temp_f0 - daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle) * + daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideSpeed) / + (daAlinkHIO_slide_c0::m.mLV2MinibossFloorSlideAngle - + daAlinkHIO_slide_c0::m.mLV2MinibossFloorWeakSlideAngle); plane.mNormal.y = 0.0f; plane.mNormal.normalizeZP(); @@ -16528,7 +16694,9 @@ void daAlink_c::posMove() { if (i_checkNoResetFlg0(FLG0_UNK_100) && mProcID != PROC_SWIM_DIVE) { current.pos.y = mWaterY; - } else if (mDemo.getDemoType() == 4 || mProcID == PROC_ELEC_DAMAGE || i_dComIfGp_checkPlayerStatus0(0, 0x10)) { + } else if (mDemo.getDemoType() == 4 || mProcID == PROC_ELEC_DAMAGE || + i_dComIfGp_checkPlayerStatus0(0, 0x10)) + { speed.y = 0.0f; } else if (i_checkWolf()) { if (checkHeavyStateOn(1, 1)) { @@ -16546,7 +16714,8 @@ void daAlink_c::posMove() { } } else if (!i_checkEquipHeavyBoots() && getZoraSwim()) { speed.y = -var_f31 * cM_ssin(var_r26); - } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) { + } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) + { speed.y += mGravity; if (speed.y < mMaxFallSpeed) { @@ -16557,7 +16726,9 @@ void daAlink_c::posMove() { } else if (speed.y < mMaxFallSpeed) { speed.y += 1.0f; } else { - if (checkZoraWearAbility() && mWaterY > current.pos.y + daAlinkHIO_swim_c0::m.mNormalFloatDepth) { + if (checkZoraWearAbility() && + mWaterY > current.pos.y + daAlinkHIO_swim_c0::m.mNormalFloatDepth) + { speed.y += daAlinkHIO_swim_c0::m.mZoraFloatDepth; if (speed.y < 0.0f) { @@ -16572,7 +16743,9 @@ void daAlink_c::posMove() { } } } else if (!i_checkModeFlg(0x400)) { - if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (checkHeavyStateOn(1, 1) && mProcID != PROC_SPINNER_READY && + !i_checkNoResetFlg0(FLG0_UNDERWATER)) + { speed.y += mGravity * 2.25f; if (speed.y < mMaxFallSpeed * 1.5f) { @@ -16679,7 +16852,9 @@ void daAlink_c::posMove() { current.pos.y += temp_f31 - temp_f1; } } else if (!eventRunning && (mProcID == PROC_HANG_MOVE || mProcID == PROC_CLIMB_MOVE_SIDE || - mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_CLIMB_WAIT || mProcID == PROC_HANG_WAIT)) { + mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_CLIMB_WAIT || + mProcID == PROC_HANG_WAIT)) + { f32 temp_f31 = field_0x814.GetCCMoveP()->absXZ(); var_r27 = TRUE; @@ -16696,7 +16871,7 @@ void daAlink_c::posMove() { if (i_checkModeFlg(MODE_SWIMMING) && i_checkNoResetFlg0(FLG0_UNK_100)) { cXyz sp84 = current.pos - field_0x3798; - + f32 temp_f3 = sp84.absXZ(); s16 gnd_angle = getGroundAngle(&mLinkAcch.m_wtr, sp84.atan2sX_Z()); temp_f3 *= cM_ssin(gnd_angle); @@ -16800,7 +16975,9 @@ void daAlink_c::posMove() { } else if (var_r27) { cXyz sp9C = cXyz::Zero; - if (hangMoveBgCheck(shape_angle.y + 0x4000, &sp9C) || hangMoveBgCheck(shape_angle.y - 0x4000, &sp9C)) { + if (hangMoveBgCheck(shape_angle.y + 0x4000, &sp9C) || + hangMoveBgCheck(shape_angle.y - 0x4000, &sp9C)) + { current.pos.x += sp9C.x; current.pos.z += sp9C.z; } @@ -16846,7 +17023,8 @@ bool daAlink_c::startPeepChange() { dComIfGs_setTurnRestart(current.pos, shape_angle.y, roomNo, param); } - dStage_changeScene(mPeepExitID, FLOAT_LABEL(lit_6108), mode, fopAcM_GetRoomNo(this), shape_angle.y, -1); + dStage_changeScene(mPeepExitID, FLOAT_LABEL(lit_6108), mode, fopAcM_GetRoomNo(this), + shape_angle.y, -1); return 1; } @@ -16907,7 +17085,9 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { // matches with literals #ifdef NONMATCHING int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_eventRun) { - if (!i_checkNoResetFlg0(FLG0_UNK_4000) && (i_eventRun != 0 || dComIfGp_event_compulsory(this, NULL, 0xFFFF))) { + if (!i_checkNoResetFlg0(FLG0_UNK_4000) && + (i_eventRun != 0 || dComIfGp_event_compulsory(this, NULL, 0xFFFF))) + { if (!checkRestartDead(i_dmgAmount, i_mode == 4)) { i_onNoResetFlg0(FLG0_UNK_4000); @@ -16918,21 +17098,25 @@ int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_ u32 tmp = getStartMode(); int start_mode = tmp; - if ((start_mode != 13 && start_mode != 2 && start_mode != 14) || checkFinalBattle() || field_0x3780.abs(dComIfGs_getRestartRoomPos()) > 0.1f) { + if ((start_mode != 13 && start_mode != 2 && start_mode != 14) || checkFinalBattle() || + field_0x3780.abs(dComIfGs_getRestartRoomPos()) > 0.1f) + { start_mode = 0; } // event flag 0x2008 = cleared snowpeak ruins if (!i_dComIfGs_isEventBit(0x2008) && (checkBoardRide() || checkBoardRestart())) { i_mode = 11; - } else if (i_checkBoarSingleBattle() || (start_mode == 2 && !checkFinalBattle() && i_mode == 5)) { + } else if (i_checkBoarSingleBattle() || + (start_mode == 2 && !checkFinalBattle() && i_mode == 5)) + { i_mode = 8; } setLastSceneDamage(i_dmgAmount, &i_mode); u32 params = setParamData(dComIfGs_getRestartRoomNo(), start_mode, param_1, 0); dStage_restartRoom(params, i_mode, 0); - + if (mProcID != PROC_DEAD) { seStartSystem(Z2SE_FORCE_BACK); } @@ -16957,7 +17141,8 @@ asm int daAlink_c::startRestartRoom(u32 param_0, int param_1, int param_2, int p /* 800BE26C-800BE2C0 0B8BAC 0054+00 2/2 0/0 0/0 .text checkCoachGuardGame__9daAlink_cFv */ BOOL daAlink_c::checkCoachGuardGame() { - return !i_checkBoarSingleBattle() && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCoach, NULL); + return !i_checkBoarSingleBattle() && + fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCoach, NULL); } /* 800BE2C0-800BE3E4 0B8C00 0124+00 1/1 0/0 0/0 .text checkRoofRestart__9daAlink_cFv */ @@ -16972,9 +17157,12 @@ void daAlink_c::checkRoofRestart() { spinner = NULL; } - if (mLinkAcch.ChkRoofHit() && (mLinkAcch.ChkGroundHit() || - (spinner != NULL && spinner->checkGroundHit() && spinner->getJumpFlg() == 0)) && - !i_checkMagneBootsOn() && (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) { + if (mLinkAcch.ChkRoofHit() && + (mLinkAcch.ChkGroundHit() || + (spinner != NULL && spinner->checkGroundHit() && spinner->getJumpFlg() == 0)) && + !i_checkMagneBootsOn() && + (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) + { s16 ac_name = getMoveBGActorName(mLinkAcch.m_roof, 1); if (ac_name == PROC_OBJ_SO || ac_name == PROC_Obj_SCannon) { return; @@ -17053,7 +17241,8 @@ int daAlink_c::checkSceneChange(int exitID) { (i_checkModeFlg(0x40000) || i_checkModeFlg(0x400) || mLinkAcch.ChkGroundHit() || mProcID == PROC_DOOR_OPEN || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG_THROUGH || (field_0x3174 == 5 && field_0x33c8 - current.pos.y > 500.0f))) || - (mExitID & 0x8000 && i_checkModeFlg(2))) { + (mExitID & 0x8000 && i_checkModeFlg(2))) + { if (field_0x3174 == 5 || (mExitID & 0x8000 && mExitDirection == 0xFF)) { mLinkAcch.i_ClrGroundHit(); } @@ -17073,7 +17262,8 @@ int daAlink_c::checkSceneChange(int exitID) { fpoAcM_relativePos(hStop, ¤t.pos, &sp8); if (sp8.y >= -200.0f && sp8.y <= hStop->mScale.y + 600.0f && - fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z) { + fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z) + { return 0; } } @@ -17130,7 +17320,8 @@ int daAlink_c::checkSceneChange(int exitID) { if (mEvtInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG || mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 || - dComIfGp_event_compulsory(this, NULL, -1)) { + dComIfGp_event_compulsory(this, NULL, -1)) + { s32 sceneChanged = 0; if (var_r3) { @@ -17151,9 +17342,8 @@ int daAlink_c::checkSceneChange(int exitID) { field_0x2f58 = dPath_GetRoomPath(mExitDirection, fopAcM_GetRoomNo(this)); } } else { - sceneChanged = - dStage_changeSceneExitId(mLinkAcch.m_gnd, exitSpeed, exitMode, - fopAcM_GetRoomNo(this), shape_angle.y); + sceneChanged = dStage_changeSceneExitId(mLinkAcch.m_gnd, exitSpeed, exitMode, + fopAcM_GetRoomNo(this), shape_angle.y); field_0x2f58 = dPath_GetRoomPath(dComIfG_Bgsp().GetRoomPathId(mLinkAcch.m_gnd), fopAcM_GetRoomNo(this)); } @@ -17282,13 +17472,14 @@ asm BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) { /* 800BF79C-800BF854 0BA0DC 00B8+00 2/2 0/0 0/0 .text setMetamorphoseModel__9daAlink_cFi */ void daAlink_c::setMetamorphoseModel(int param_0) { - J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(param_0 != 0 ? (u16)0x27C : (u16)0x27D); + J3DAnmTransform* bck = + (J3DAnmTransform*)mAnmHeap9.loadDataIdx(param_0 != 0 ? (u16)0x27C : (u16)0x27D); JKRHeap* heap = setItemHeap(); J3DModelData* model_data = loadAramBmd(0x31B, 0x6000); mHeldItemModel = initModel(model_data, 0); field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false); - + mDoExt_setCurrentHeap(heap); mEquipItem = 0x106; field_0x33dc = mUnderFrameCtrl[0].getFrame(); @@ -17359,8 +17550,8 @@ BOOL daAlink_c::setItemModel() { #ifdef NONMATCHING BOOL daAlink_c::setItemActor() { if (mEquipItem == BOOMERANG) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos, - -1, NULL, NULL, -1, NULL, NULL); + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos, -1, + NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); return 0; @@ -17372,8 +17563,8 @@ BOOL daAlink_c::setItemActor() { } if (mEquipItem == COPY_ROD) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, ¤t.pos, -1, - NULL, NULL, -1, NULL, NULL); + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, ¤t.pos, -1, NULL, + NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); return 0; @@ -17415,7 +17606,8 @@ BOOL daAlink_c::setItemActor() { if (checkBombItem(mEquipItem)) { if (checkHorseRide()) { if (!i_dComIfGp_getHorseActor()->checkNoBombProc() && - (mProcID != PROC_HORSE_TURN || !i_checkModeFlg(MODE_DISABLE_ITEMS))) { + (mProcID != PROC_HORSE_TURN || !i_checkModeFlg(MODE_DISABLE_ITEMS))) + { mEquipItem = NO_ITEM; return 1; } @@ -17484,13 +17676,14 @@ BOOL daAlink_c::checkMagicArmorWearAbility() const { J3DModelData* daAlink_c::loadAramBmd(u16 i_resID, u32 i_bufSize) { JKRArchive* anm_arc = dComIfGp_getAnmArchive(); u8* tmpBuffer = new (0x20) u8[i_bufSize]; - + anm_arc->readIdxResource(tmpBuffer, i_bufSize, i_resID); u32 type = 'BMWR'; JKRArchive::SDIDirEntry* dir = anm_arc->mNodes; for (int i = 0; i < anm_arc->countDirectory(); i++) { - if (i_resID >= dir->first_file_index && i_resID < dir->first_file_index + dir->num_entries) { + if (i_resID >= dir->first_file_index && i_resID < dir->first_file_index + dir->num_entries) + { type = dir->type; break; } @@ -17511,7 +17704,7 @@ void* daAlink_c::loadAram(u16 i_resID, u32 i_bufSize) { J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 i_resID, J3DModel* i_model) { J3DModelData* model_data = i_model->getModelData(); J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)loadAram(i_resID, 0x400); - + brk->setFrame(FLOAT_LABEL(lit_6108)); brk->searchUpdateMaterialID(model_data); model_data->entryTevRegAnimator(brk); @@ -17523,7 +17716,7 @@ J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 i_resID, J3DModel* i_model) { J3DAnmTextureSRTKey* daAlink_c::loadAramItemBtk(u16 i_resID, J3DModel* i_model) { J3DModelData* model_data = i_model->getModelData(); J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)loadAram(i_resID, 0x400); - + btk->setFrame(FLOAT_LABEL(lit_6108)); btk->searchUpdateMaterialID(model_data); model_data->entryTexMtxAnimator(btk); @@ -17535,7 +17728,7 @@ J3DAnmTextureSRTKey* daAlink_c::loadAramItemBtk(u16 i_resID, J3DModel* i_model) J3DAnmTexPattern* daAlink_c::loadAramItemBtp(u16 i_resID, J3DModel* i_model) { J3DModelData* model_data = i_model->getModelData(); J3DAnmTexPattern* btp = (J3DAnmTexPattern*)loadAram(i_resID, 0x400); - + btp->setFrame(FLOAT_LABEL(lit_6108)); btp->searchUpdateMaterialID(model_data); model_data->entryTexNoAnimator(btp); @@ -17682,7 +17875,8 @@ bool daAlink_c::checkCastleTownUseItem(u16 item_id) { (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)) { + (checkBottleItem(item_id) && item_id != EMPTY_BOTTLE)) + { return true; } else { return false; @@ -17764,14 +17958,13 @@ asm void daAlink_c::setLight() { #pragma pop /* 800C1CEC-800C1DAC 0BC62C 00C0+00 3/3 0/0 0/0 .text setFrontRollCrashShock__9daAlink_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFrontRollCrashShock(u8 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setFrontRollCrashShock__9daAlink_cFUc.s" +void daAlink_c::setFrontRollCrashShock(u8 param_0) { + f32 tmp_0 = FLOAT_LABEL(lit_6108); + dComIfGp_getVibration().StartShock(5, 15, cXyz(tmp_0, lit_6040, tmp_0)); + + mZ2Link.startLinkSound(Z2SE_AL_BODYATTACK, param_0, mVoiceReverbIntensity); + dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); } -#pragma pop /* 800C1DAC-800C1DE0 0BC6EC 0034+00 1/0 0/0 0/0 .text getModelJointMtx__9daAlink_cFUs */ MtxP daAlink_c::getModelJointMtx(u16 param_0) { @@ -17881,7 +18074,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { resetWolfBallGrab(); } else if (mProcID == PROC_CHAIN_STRONG_PULL) { mNowAnmPackUpper[2].setRatio(0.0f); - } else if (mProcID == PROC_SCREAM_WAIT || mProcID == PROC_WOLF_SCREAM_WAIT || mProcID == PROC_ELEC_DAMAGE) { + } else if (mProcID == PROC_SCREAM_WAIT || mProcID == PROC_WOLF_SCREAM_WAIT || + mProcID == PROC_ELEC_DAMAGE) + { dComIfGp_getVibration().StopQuake(0x1F); } else if (mProcID == PROC_GUARD_BREAK) { field_0x814.SetTgApid(-1); @@ -17898,7 +18093,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { bool flg_400_set = checkModeFlag(0x400); if (flg_400_set && !checkBoardRide() && !checkSpinnerRide()) { field_0x2f99 = 0xA0; - } else if (checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG || mProcID == PROC_WOLF_CHAIN_WAIT) { + } else if (checkModeFlg(0x40840) || mProcID == PROC_BOSS_BODY_HANG || + mProcID == PROC_WOLF_CHAIN_WAIT) + { field_0x2f99 = 0x70; } @@ -17940,7 +18137,11 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } } - if (temp_r31 && (mItemAcKeep.getActor() == NULL || mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt()) && !i_checkEndResetFlg0(ERFLG0_UNK_1000)) { + if (temp_r31 && + (mItemAcKeep.getActor() == NULL || + mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt()) && + !i_checkEndResetFlg0(ERFLG0_UNK_1000)) + { deleteEquipItem(0, 0); resetUpperAnime(UPPER_2, -1.0f); } @@ -18134,7 +18335,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } if (flg_20000_set && !i_checkModeFlg(MODE_SWIMMING)) { - if (mProcID != PROC_CAUGHT && mProcID != PROC_HOOKSHOT_FLY && !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + if (mProcID != PROC_CAUGHT && mProcID != PROC_HOOKSHOT_FLY && + !i_checkNoResetFlg0(FLG0_UNDERWATER)) + { swimOutAfter(0); } } @@ -18229,14 +18432,33 @@ asm void daAlink_c::setGoatStopGameFail(fopAc_ac_c* param_0) { #pragma pop /* 800E9344-800E9434 0E3C84 00F0+00 1/1 0/0 0/0 .text procGoatMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procGoatMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatMoveInit__9daAlink_cFv.s" +int daAlink_c::procGoatMoveInit() { + if (!commonProcInitNotSameProc(PROC_GOAT_MOVE)) { + return 0; + } + + if (checkZeroSpeedF()) { + onModeFlg(1); + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x37c8 = current.pos; + field_0x2f98 = 3; + current.angle.y = shape_angle.y + -0x4000; + field_0x594 = daAlinkHIO_atnMove_c0::m.mMaxSpeed; + + setSingleAnimeBase(ANM_ATN_COW); + field_0x300c = 0; + + fopAc_ac_c* goat_p = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchGoat, NULL); + if (goat_p != NULL) { + field_0x280c.setData(goat_p); + } + + field_0x300e = 0; + deleteEquipItem(FALSE, FALSE); + return 1; } -#pragma pop /* 800E9434-800E9894 0E3D74 0460+00 1/0 0/0 0/0 .text procGoatMove__9daAlink_cFv */ #pragma push @@ -18284,7 +18506,7 @@ int daAlink_c::procGoatStroke() { if (mUnderFrameCtrl[0].checkAnmEnd()) { checkNextAction(0); } - + return 1; } @@ -18365,7 +18587,9 @@ void daAlink_c::commonWaitTurnInit() { /* 80120474-80120500 11ADB4 008C+00 2/1 0/0 0/0 .text commonGrabPutInit__9daAlink_cFv */ int daAlink_c::commonGrabPutInit() { if (mGrabItemAcKeep.getActor() == NULL) { - if (mProcID != PROC_GRAB_STAND && (mProcID != PROC_WOLF_GRAB_PUT || !(mUnderFrameCtrl[0].getFrame() < field_0x3478))) { + if (mProcID != PROC_GRAB_STAND && + (mProcID != PROC_WOLF_GRAB_PUT || !(mUnderFrameCtrl[0].getFrame() < field_0x3478))) + { dComIfGp_evmng_cutEnd(field_0x3184); return 1; } @@ -18550,7 +18774,8 @@ int daAlink_c::loadShieldModelDVD() { field_0x0648->freeAll(); setShieldArcName(); } else if (mShieldChangeWaitTimer == 1) { - if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, field_0x0648) == cPhs_COMPLEATE_e) { + if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, field_0x0648) == cPhs_COMPLEATE_e) + { mShieldChangeWaitTimer = 0; setShieldModel(); } else { diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc index bc0d22c6f7..05393eb67f 100644 --- a/src/d/a/d_a_alink_bottle.inc +++ b/src/d/a/d_a_alink_bottle.inc @@ -1,3 +1,5 @@ +#include "d/d_insect.h" + /* 8010E48C-8010E52C 108DCC 00A0+00 1/1 0/0 0/0 .text bottleModelCallBack__9daAlink_cFv */ int daAlink_c::bottleModelCallBack() { @@ -322,7 +324,8 @@ int daAlink_c::procBottleGet() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dInsect_c::Insect_Release() { +// asm void dInsect_c::Insect_Release() { +extern "C" asm void Insect_Release__9dInsect_cFv() { nofralloc #include "asm/d/a/d_a_alink/Insect_Release__9dInsect_cFv.s" } diff --git a/src/d/a/d_a_alink_bow.inc b/src/d/a/d_a_alink_bow.inc index aa5c3b0b36..6d57df109c 100644 --- a/src/d/a/d_a_alink_bow.inc +++ b/src/d/a/d_a_alink_bow.inc @@ -129,7 +129,8 @@ void daAlink_c::deleteArrow() { if (arrow != NULL && fopAcM_GetName(arrow) == PROC_ARROW) { if (arrow->checkBombArrow() && - (mDamageTimer == daAlinkHIO_damage_c0::m.mInvincibleTime || i_checkModeFlg(8))) { + (mDamageTimer == daAlinkHIO_damage_c0::m.mInvincibleTime || i_checkModeFlg(8))) + { arrow->setBombArrowExplode(); dComIfGp_addSelectItemNum(mSelectItemId, -1); dComIfGp_setItemArrowNumCount(-1); @@ -173,7 +174,8 @@ BOOL daAlink_c::cancelBowMoveRideNotAtn() { #pragma optimization_level 2 BOOL daAlink_c::cancelBowMove() { if (mTargetedActor == NULL && !i_checkAttentionLock() && mFastShotTime == 0 && - !checkBowReadyAnime() && (!checkBowShootAnime() || mUpperFrameCtrl[2].checkAnmEnd())) { + !checkBowReadyAnime() && (!checkBowShootAnime() || mUpperFrameCtrl[2].checkAnmEnd())) + { resetUpperAnime(UPPER_2, lit_6041); return true; } @@ -266,6 +268,21 @@ asm int daAlink_c::checkNextActionBow() { #pragma pop /* 800DFAE8-800DFBC8 0DA428 00E0+00 1/1 0/0 0/0 .text setBowModel__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setBowModel() { + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x59); + JKRHeap* old_heap = setItemHeap(); + + mHeldItemModel = initModel(loadAramBmd(0x314, 0x4C00), 0); + field_0x730.init(bck, FALSE, 2, 1.0f, 0, -1, false); + + mDoExt_setCurrentHeap(old_heap); + field_0x33dc = field_0x730.getBckAnm()->getFrameMax() - 0.001f; + field_0x2f95 = 5; + field_0x2f94 = 0x67; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -274,6 +291,7 @@ asm void daAlink_c::setBowModel() { #include "asm/d/a/d_a_alink/setBowModel__9daAlink_cFv.s" } #pragma pop +#endif /* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text checkBowGrabLeftHand__9daAlink_cCFv */ diff --git a/src/d/a/d_a_alink_crawl.inc b/src/d/a/d_a_alink_crawl.inc index fa8986da38..4b5d3b5841 100644 --- a/src/d/a/d_a_alink_crawl.inc +++ b/src/d/a/d_a_alink_crawl.inc @@ -1,33 +1,75 @@ /* 800F7C50-800F7C74 0F2590 0024+00 2/2 0/0 0/0 .text getCrawlMoveAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s" +f32 daAlink_c::getCrawlMoveAnmSpeed() { + return getAnmSpeedStickRate(daAlinkHIO_crouch_c0::m.mCrawlAnmSpeedMin, + daAlinkHIO_crouch_c0::m.mCrawlAnmSpeedMax); } -#pragma pop /* 800F7C74-800F7CE8 0F25B4 0074+00 2/2 0/0 0/0 .text getCrawlMoveSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s" +f32 daAlink_c::getCrawlMoveSpeed() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + f32 frame = frame_ctrl->getFrame(); + if (frame >= lit_16210) { + frame = frame_ctrl->getFrame() - lit_16210; + } else { + frame = frame_ctrl->getFrame(); + } + + return frame_ctrl->getRate() * daAlinkHIO_crouch_c0::m.mCrawlMoveRate * + cM_fsin(lit_22146 * frame); } -#pragma pop /* 800F7CE8-800F7E48 0F2628 0160+00 4/4 0/0 0/0 .text setCrawlMoveDirectionArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveDirectionArrow() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s" +void daAlink_c::setCrawlMoveDirectionArrow() { + u8 direction = 0; + camera_class* camera = dComIfGp_getCamera(field_0x317c); + BOOL bvar = cLib_distanceAngleS(fopCamM_GetAngleY(camera), shape_angle.y) > 0x4000; + + if (field_0x3198 & 4) { + if (!bvar) { + direction = data_80452F38; + } else { + direction = data_80452F39; + } + } + + if (field_0x3198 & 8) { + if (!bvar) { + direction |= data_80452F39; + } else { + direction |= data_80452F38; + } + } + + if (field_0x3198 & 1) { + if (shape_angle.y == current.angle.y) { + if (!bvar) { + direction |= 8; + } else { + direction |= 2; + } + } else if (!bvar) { + direction |= 2; + } else { + direction |= 8; + } + } + + if (shape_angle.y == current.angle.y) { + if (!bvar) { + direction |= 2; + } else { + direction |= 8; + } + } else if (!bvar) { + direction |= 8; + } else { + direction |= 2; + } + + dComIfGp_setAdvanceDirection(direction); } -#pragma pop /* 800F7E48-800F81C0 0F2788 0378+00 2/2 0/0 0/0 .text changeCrawlAutoMoveProc__9daAlink_cFP4cXyz */ @@ -45,22 +87,37 @@ asm void daAlink_c::changeCrawlAutoMoveProc(cXyz* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3, - int param_4, u8* param_5) { +asm int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3, + int param_4, u8* param_5) { nofralloc #include "asm/d/a/d_a_alink/getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc.s" } #pragma pop /* 800F85C0-800F8700 0F2F00 0140+00 2/2 0/0 0/0 .text crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s" +void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) { + cXyz sp28; + cXyz sp34; + cXyz sp40; + + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlTopOffset, &sp28); + int temp_r30 = getCrawlMoveVec(&sp28, param_0, &sp34, 1, param_2, NULL); + + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlTopUpOffset, &sp28); + int temp_r29 = getCrawlMoveVec(&sp28, param_1, &sp40, 1, param_2, NULL); + + if (temp_r30 != 0 && temp_r29 != 0) { + if (sp34.abs2() > sp40.abs2()) { + current.pos -= sp34; + } else { + current.pos -= sp40; + } + } else if (temp_r30 != 0) { + current.pos -= sp34; + } else if (temp_r29 != 0) { + current.pos -= sp40; + } } -#pragma pop /* 800F8700-800F88F8 0F3040 01F8+00 2/2 0/0 0/0 .text * checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */ @@ -76,35 +133,47 @@ asm void daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param /* 800F88F8-800F89E0 0F3238 00E8+00 6/6 0/0 0/0 .text decideCrawlDoStatus__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::decideCrawlDoStatus() { - nofralloc -#include "asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s" +void daAlink_c::decideCrawlDoStatus() { + if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x80)) { + if (checkSubjectEnd(1) || mWaterY > current.pos.y) { + dComIfGp_clearPlayerStatus0(0, 0x2000); + } + } else { + dCamera_c* camera = dCam_getBody(); + + if (camera->ChangeModeOK(4) && mWaterY <= current.pos.y) { + i_onResetFlg0(RFLG0_UNK_4000000); + + if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x1000) && !checkEventRun()) { + setSubjectMode(); + } + } + } } -#pragma pop /* 800F89E0-800F8A50 0F3320 0070+00 3/3 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotCrawlStand(cXyz* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s" +BOOL daAlink_c::checkNotCrawlStand(cXyz* param_0) { + mLinkRoofChk.i_SetPos(*param_0); + return dComIfG_Bgsp().RoofChk(&mLinkRoofChk) - current.pos.y <= field_0x598; } -#pragma pop /* 800F8A50-800F8B00 0F3390 00B0+00 2/2 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s" +BOOL daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) { + cXyz sp20; + + sp20 = *param_0 + *param_1; + if (checkNotCrawlStand(&sp20)) { + return true; + } + + sp20 = *param_0 - *param_1; + if (checkNotCrawlStand(&sp20)) { + return true; + } + + return false; } -#pragma pop /* 800F8B00-800F8D04 0F3440 0204+00 2/2 0/0 0/0 .text * checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi */ @@ -118,34 +187,69 @@ asm void daAlink_c::checkCrawlInHoll(cXyz* param_0, cXyz* param_1, cXyz* param_2 #pragma pop /* 800F8D04-800F8DBC 0F3644 00B8+00 2/2 0/0 0/0 .text setCrawlMoveHoll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveHoll() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s" +void daAlink_c::setCrawlMoveHoll() { + f32 frame_ctrl_rate = mUnderFrameCtrl[0].getRate(); + + if (frame_ctrl_rate != FLOAT_LABEL(lit_6108)) { + cLib_addCalcAngleS(&shape_angle.y, field_0x300c, 5, 0x1000, 0x800); + current.angle.y = shape_angle.y; + } + + if (fabsf(current.pos.x - field_0x37c8.x) > lit_6040) { + cLib_addCalc(¤t.pos.x, field_0x37c8.x, lit_5943, lit_7625, lit_6040); + } + + if (fabsf(current.pos.z - field_0x37c8.z) > lit_6040) { + cLib_addCalc(¤t.pos.z, field_0x37c8.z, lit_5943, lit_7625, lit_6040); + } } -#pragma pop /* 800F8DBC-800F8F08 0F36FC 014C+00 1/1 0/0 0/0 .text setCrawlMoveAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveAngle() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s" +void daAlink_c::setCrawlMoveAngle() { + cXyz sp20; + cXyz sp2C; + cXyz sp38; + + cLib_addCalcAngleS(&shape_angle.y, field_0x2fe2, daAlinkHIO_crouch_c0::m.mCrawlTurnRate, + daAlinkHIO_crouch_c0::m.mCrawlTurnMax, + daAlinkHIO_crouch_c0::m.mCrawlTurnMin); + + if (shape_angle.y != current.angle.y) { + if ((s16)(shape_angle.y - current.angle.y) > 0) { + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlLSideFrontOffset, &sp20); + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlLSideOffset, &sp38); + } else { + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlRSideFrontOffset, &sp20); + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &l_crawlRSideOffset, &sp38); + } + + mLinkGndChk.SetPos(&sp20); + sp2C.set(sp20.x - sp38.x, dComIfG_Bgsp().GroundCross(&mLinkGndChk) - sp38.y, + sp20.z - sp38.z); + + if (cLib_distanceAngleS(sp2C.atan2sY_XZ(), shape_angle.x) > 0x800) { + shape_angle.y = current.angle.y; + } else { + current.angle.y = shape_angle.y; + } + } } -#pragma pop /* 800F8F08-800F8F84 0F3848 007C+00 6/6 0/0 0/0 .text stopHalfMoveAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::stopHalfMoveAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s" +void daAlink_c::stopHalfMoveAnime(f32 param_0) { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + f32 frame; + if (frame_ctrl->checkPass(FLOAT_LABEL(lit_6108))) { + frame = FLOAT_LABEL(lit_6108); + } else { + frame = param_0; + } + + frame_ctrl->setRate(FLOAT_LABEL(lit_6108)); + frame_ctrl->setFrame(frame); + getNowAnmPackUnder(UNDER_0)->setFrame(frame); } -#pragma pop /* 800F8F84-800F9210 0F38C4 028C+00 2/2 0/0 0/0 .text setCrawlAutoMoveAimPos__9daAlink_cFv */ #pragma push @@ -168,14 +272,29 @@ asm int daAlink_c::procCrawlStartInit() { #pragma pop /* 800F9384-800F9474 0F3CC4 00F0+00 1/0 0/0 0/0 .text procCrawlStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCrawlStart() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s" +int daAlink_c::procCrawlStart() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + decideCrawlDoStatus(); + field_0x33cc = lit_6040 - field_0x3478 * (field_0x347c - frame_ctrl->getFrame()); + + cXyz sp20(l_crawlFrontOffset.x, l_crawlFrontOffset.y, l_crawlFrontOffset.z * field_0x33cc); + cXyz sp2C; + cXyz sp38; + + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &sp20, &sp2C); + sp20.y = lit_10039; + + cMtx_multVec(mpLinkModel->getBaseTRMtx(), &sp20, &sp38); + crawlBgCheck(&sp2C, &sp38, 0); + + field_0x2f99 = 4; + if (checkAnmEnd(frame_ctrl)) { + procCrawlMoveInit(shape_angle.x, shape_angle.z); + } + + return 1; } -#pragma pop /* 800F9474-800F95B8 0F3DB4 0144+00 3/3 0/0 0/0 .text procCrawlMoveInit__9daAlink_cFss */ #pragma push @@ -198,6 +317,29 @@ asm int daAlink_c::procCrawlMove() { #pragma pop /* 800F99FC-800F9ABC 0F433C 00C0+00 1/1 0/0 0/0 .text procCrawlAutoMoveInit__9daAlink_cFiP4cXyz */ +// r30 / r31 swap +#ifdef NONMATCHING +int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { + BOOL var_r30 = i_dComIfGp_checkPlayerStatus0(0, 0x2000); + commonProcInit(PROC_CRAWL_AUTO_MOVE); + field_0x37c8 = *param_1; + field_0x33cc = lit_6040; + field_0x3198 = param_0; + field_0x3008 = 20; + field_0x300a = 300; + + dComIfGp_setPlayerStatus0(0, 0x8000000); + setCrawlMoveDirectionArrow(); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f99 = 12; + + if (var_r30) { + dComIfGp_setPlayerStatus0(0, 0x2000); + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -206,6 +348,7 @@ asm int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { #include "asm/d/a/d_a_alink/procCrawlAutoMoveInit__9daAlink_cFiP4cXyz.s" } #pragma pop +#endif /* 800F9ABC-800F9D7C 0F43FC 02C0+00 1/0 0/0 0/0 .text procCrawlAutoMove__9daAlink_cFv */ #pragma push @@ -228,11 +371,19 @@ asm int daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { #pragma pop /* 800F9F30-800F9FDC 0F4870 00AC+00 1/0 0/0 0/0 .text procCrawlEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCrawlEnd() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s" +int daAlink_c::procCrawlEnd() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + field_0x33cc = field_0x3478 * (frame_ctrl->getFrame() - field_0x347c); + field_0x2f99 = 4; + + if (checkAnmEnd(frame_ctrl)) { + if (!checkNextActionFromCrouch(0)) { + procWaitInit(); + } + } else if (frame_ctrl->getFrame() < daAlinkHIO_crouch_c0::m.mCrawlEndAnm.mCheckFrame) { + checkNextActionFromCrouch(1); + } + + return 1; } -#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_damage.inc b/src/d/a/d_a_alink_damage.inc index d621033fe6..f76027058c 100644 --- a/src/d/a/d_a_alink_damage.inc +++ b/src/d/a/d_a_alink_damage.inc @@ -57,6 +57,25 @@ void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { /* 800D6F2C-800D6FE0 0D186C 00B4+00 3/3 0/0 0/0 .text checkNoLandDamageSlidePolygon__9daAlink_cFv */ +// matches with cM3dGPla vtable +#ifdef NONMATCHING +BOOL daAlink_c::checkNoLandDamageSlidePolygon() { + if (field_0x2fbb == 3) { + return true; + } + + if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { + cM3dGPla poly; + dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &poly); + + if (poly.mNormal.y < field_0x3470) { + return true; + } + } + + return false; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -65,13 +84,15 @@ asm BOOL daAlink_c::checkNoLandDamageSlidePolygon() { #include "asm/d/a/d_a_alink/checkNoLandDamageSlidePolygon__9daAlink_cFv.s" } #pragma pop +#endif /* 800D6FE0-800D70A0 0D1920 00C0+00 6/6 0/0 0/0 .text checkCutLandDamage__9daAlink_cFv */ void daAlink_c::checkCutLandDamage() { if (!checkEventRun()) { f32 var_f31 = (mFallHeight - current.pos.y) * lit_8782; - if (var_f31 >= daAlinkHIO_damFall_c0::m.mSmallDmgHeight && !checkNoLandDamageSlidePolygon()) { + if (var_f31 >= daAlinkHIO_damFall_c0::m.mSmallDmgHeight && !checkNoLandDamageSlidePolygon()) + { if (var_f31 >= daAlinkHIO_damFall_c0::m.mBigDmgHeight) { setLandDamagePoint(8); } else { @@ -85,7 +106,9 @@ void daAlink_c::checkCutLandDamage() { /* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */ BOOL daAlink_c::checkCaughtEscapeCutTurn() { - if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || i_checkWolf()) && checkCutTurnInputTrigger()) { + if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || i_checkWolf()) && + checkCutTurnInputTrigger()) + { if (i_checkWolf()) { return procWolfRollAttackInit(2, 0); } @@ -104,7 +127,7 @@ BOOL daAlink_c::checkCaughtEscapeCutTurn() { /* 800D7160-800D7208 0D1AA0 00A8+00 1/0 0/0 0/0 .text setThrowDamage__9daAlink_cFsffiii */ bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, - int param_5) { + int param_5) { field_0x3408 = param_1; field_0x340c = param_2; field_0x318c = param_3; @@ -134,10 +157,12 @@ bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_ f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) { f32 base_mag; - if (param_1 == 0 && i_checkNoResetFlg3(FLG3_UNK_40000000) && !i_checkEndResetFlg2(ERFLG2_UNK_40)) { - base_mag = lit_7624; /* 1.5 */ + if (param_1 == 0 && i_checkNoResetFlg3(FLG3_UNK_40000000) && + !i_checkEndResetFlg2(ERFLG2_UNK_40)) + { + base_mag = lit_7624; /* 1.5 */ } else { - base_mag = lit_6040; /* 1.0 */ + base_mag = lit_6040; /* 1.0 */ } if (i_checkWolf() && !checkCargoCarry() && param_1 == 0) { @@ -260,14 +285,18 @@ asm void daAlink_c::checkPolyDamage() { /* 800D7A98-800D7B18 0D23D8 0080+00 1/1 0/0 0/0 .text * checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s" +bool daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) { + if (param_0.ChkAtHit() && param_0.GetAtHitGObj() != NULL) { + dCcD_GObjInf* gobj_p = (dCcD_GObjInf*)param_0.GetAtHitGObj(); + + if (gobj_p->GetTgSpl() == dCcG_Tg_Spl_UNK_1) { + *param_1 = param_0.GetAtHitAc(); + return true; + } + } + + return false; } -#pragma pop /* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text damageTimerCount__9daAlink_cFv */ void daAlink_c::damageTimerCount() { @@ -340,7 +369,7 @@ asm int daAlink_c::procDamage() { #pragma optimization_level 0 #pragma optimizewithasm off asm int daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3, - dCcD_GObjInf* param_4, int param_5) { + dCcD_GObjInf* param_4, int param_5) { nofralloc #include "asm/d/a/d_a_alink/procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi.s" } @@ -453,15 +482,15 @@ asm int daAlink_c::procLandDamageInit(int param_0) { /* 800DB060-800DB140 0D59A0 00E0+00 1/0 0/0 0/0 .text procLandDamage__9daAlink_cFv */ int daAlink_c::procLandDamage() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - + if (field_0x3198 != 0) { if (frameCtrl->checkAnmEnd()) { checkNextAction(0); } else if (frameCtrl->getFrame() > daAlinkHIO_damFall_c0::m.mStandAnm.mCheckFrame) { onModeFlg(4); checkNextAction(1); - } - } else { + } + } else { if (frameCtrl->checkAnmEnd()) { if (field_0x3008 > 0) { field_0x3008--; @@ -561,7 +590,8 @@ int daAlink_c::procScreamWaitInit() { if (i_checkEndResetFlg1(ERFLG1_UNK_2)) { setScreamWaitAnime(); } else { - setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, + daAlinkHIO_basic_c0::m.mAnmBlendFactor); field_0x300c = 0; } @@ -655,14 +685,16 @@ int daAlink_c::procCoSwimFreezeReturnInit() { f32 var_f31; if (i_checkWolf()) { - setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlDamNormal_c0::m.field_0x5C, lit_7625); + setSingleAnimeWolfBaseSpeed(WANM_SWIM_WAIT, daAlinkHIO_wlDamNormal_c0::m.field_0x5C, + lit_7625); mUnderFrameCtrl[0].setEnd(3); mUnderFrameCtrl[0].setAttribute(0); setFaceBasicTexture(FTANM_UNK_90); field_0x2f9b = 1; var_f31 = daAlinkHIO_wlSwim_c0::m.field_0x48; } else { - setSingleAnime(ANM_SWIM_DMG_FREEZE, daAlinkHIO_damNormal_c0::m.field_0x60, FLOAT_LABEL(lit_6108), 5, lit_7625); + setSingleAnime(ANM_SWIM_DMG_FREEZE, daAlinkHIO_damNormal_c0::m.field_0x60, + FLOAT_LABEL(lit_6108), 5, lit_7625); voiceStart(Z2SE_AL_V_DAMAGE_FREEZE); var_f31 = daAlinkHIO_swim_c0::m.mInitHeight; } @@ -687,6 +719,25 @@ int daAlink_c::procCoSwimFreezeReturnInit() { } /* 800DC474-800DC548 0D6DB4 00D4+00 1/0 0/0 0/0 .text procCoSwimFreezeReturn__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procCoSwimFreezeReturn() { + if (field_0x300c == 0) { + if (checkRestartDead(4, 1)) { + i_onNoResetFlg1(FLG1_UNK_40000000); + } else { + u32 mode = 4; + setLastSceneDamage(4, &mode); + seStartSystem(Z2SE_FORCE_BACK); + dStage_changeScene(3, 0.0f, mode, fopAcM_GetRoomNo(this), shape_angle.y, -1); + } + } else { + field_0x300c--; + } + + return 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -694,4 +745,5 @@ asm int daAlink_c::procCoSwimFreezeReturn() { nofralloc #include "asm/d/a/d_a_alink/procCoSwimFreezeReturn__9daAlink_cFv.s" } -#pragma pop \ No newline at end of file +#pragma pop +#endif diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc index 18c62666bb..6be8821b59 100644 --- a/src/d/a/d_a_alink_demo.inc +++ b/src/d/a/d_a_alink_demo.inc @@ -75,20 +75,22 @@ asm void daAlink_c::setDemoData() { /* 80117B90-80117C34 1124D0 00A4+00 1/1 0/0 0/0 .text resetDemoBck__9daAlink_cFv */ void daAlink_c::resetDemoBck() { - mAnmHeap7.resetArcNo(); - mAnmHeap5.resetArcNo(); - mAnmHeap6.resetArcNo(); + mFaceBckHeap.resetArcNo(); + mFaceBtpHeap.resetArcNo(); + mFaceBtkHeap.resetArcNo(); mUnderAnmHeap[0].resetArcNo(); mUnderAnmHeap[0].resetIdx(); - mAnmHeap7.resetIdx(); - mAnmHeap5.resetIdx(); - mAnmHeap6.resetIdx(); + mFaceBckHeap.resetIdx(); + mFaceBtpHeap.resetIdx(); + mFaceBtkHeap.resetIdx(); if (i_checkWolf()) { - setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, daAlinkHIO_wlMove_c0::m.field_0x94); + setSingleAnimeWolfBaseSpeed(WANM_WAIT, daAlinkHIO_wlMoveNoP_c0::m.field_0x14, + daAlinkHIO_wlMove_c0::m.field_0x94); setFaceBasicAnime(ANM_WAIT); } else { - setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, daAlinkHIO_basic_c0::m.mAnmBlendFactor); + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, + daAlinkHIO_basic_c0::m.mAnmBlendFactor); } } @@ -167,7 +169,8 @@ asm void daAlink_c::setGetItemFace(u16 param_0) { */ BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) { s16 name = fopAcM_GetName(i_actor); - return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM || name == PROC_TAG_MSG; + return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM || + name == PROC_TAG_MSG; } /* 80118308-8011856C 112C48 0264+00 2/2 0/0 0/0 .text setTalkStartBack__9daAlink_cFP4cXyz @@ -175,7 +178,7 @@ BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::setTalkStartBack(cXyz* param_0) { +asm int daAlink_c::setTalkStartBack(cXyz* param_0) { nofralloc #include "asm/d/a/d_a_alink/setTalkStartBack__9daAlink_cFP4cXyz.s" } @@ -192,35 +195,50 @@ asm void daAlink_c::setShapeAngleToTalkActor() { #pragma pop /* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTalkAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s" +void daAlink_c::setTalkAnime() { + if (mDemo.getDemoMode() == 8 || mEquipItem == KANTERA || + (i_checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48)) + { + setDoubleAnime(FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mWaitAnmSpeed, + daAlinkHIO_move_c0::m.mWaitAnmSpeed, ANM_WAIT, ANM_WAIT, 2, lit_6109); + } else { + setSingleAnimeBase(ANM_TALK); + } } -#pragma pop /* 801186D4-80118778 113014 00A4+00 2/2 0/0 0/0 .text setTradeItemAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTradeItemAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s" +u8 daAlink_c::setTradeItemAnime() { + setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); + offModeFlg(0x100); + + if (mDemo.getParam0() != 1) { + int item_no; + if (mDemo.getParam0() == 2) { + item_no = mDemo.getParam1(); + } else { + item_no = dComIfGp_event_getPreItemNo(); + } + + u32 partner_id = fopAcM_createItemForPresentDemo( + ¤t.pos, item_no, 3, -1, fopAcM_GetRoomNo(this), &shape_angle, &mScale); + dComIfGp_event_setItemPartnerId(partner_id); + } + + keepItemData(); + return 1; } -#pragma pop /* 80118778-801187B4 1130B8 003C+00 3/3 0/0 0/0 .text setTradeItemOutHand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTradeItemOutHand() { - nofralloc -#include "asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s" +void daAlink_c::setTradeItemOutHand() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (frame_ctrl->getFrame() >= lit_24590) { + field_0x2f92 = 4; + } else if (frame_ctrl->getFrame() >= lit_8676) { + field_0x2f92 = 0; + } } -#pragma pop /* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */ BOOL daAlink_c::checkEndMessage(u32 param_0) { @@ -243,38 +261,92 @@ BOOL daAlink_c::checkEndMessage(u32 param_0) { } /* 80118840-801188B0 113180 0070+00 1/1 0/0 0/0 .text setDemoRightHandIndex__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoRightHandIndex(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s" +u8 daAlink_c::setDemoRightHandIndex(u16 param_0) { + if (param_0 == 0xFD) { + field_0x3010 = 1; + return 6; + } else if (param_0 == 0xFC) { + field_0x2fab |= 0x10; + return 5; + } else if (param_0 == 0xFB) { + if (mpDemoHRTmpModel != NULL) { + return 0xFB; + } else { + return 0xFE; + } + } else if (param_0 != 0xFE) { + return param_0 + 5; + } else { + return param_0 & 0xFF; + } } -#pragma pop /* 801188B0-8011894C 1131F0 009C+00 1/1 0/0 0/0 .text setDemoLeftHandIndex__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoLeftHandIndex(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s" +u8 daAlink_c::setDemoLeftHandIndex(u16 param_0) { + if (param_0 == 0xFD) { + if (mEquipItem != 0x103) { + deleteEquipItem(FALSE, TRUE); + setSwordModel(); + } + return 0; + } else if (param_0 == 0xFC) { + field_0x2fab |= 0x8; + return 0; + } else if (param_0 == 0xFB) { + if (mpDemoHLTmpModel != NULL) { + return 0xFB; + } else { + return 0xFE; + } + } else { + return param_0 & 0xFF; + } } -#pragma pop /* 8011894C-801189F8 11328C 00AC+00 1/1 0/0 0/0 .text setDemoRide__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoRide(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s" +void daAlink_c::setDemoRide(u16 param_0) { + daHorse_c* horse_p = i_dComIfGp_getHorseActor(); + + if (param_0 == 1) { + if (horse_p != NULL && !i_checkModeFlg(0x400)) { + onModeFlg(0x400); + horse_p->onRideFlg(); + field_0x384c = (cXyz*)&l_horseBaseAnime; + mRideStatus = 1; + } + } else { + if (horse_p != NULL) { + horse_p->offRideFlg(); + } + + mRideStatus = 0; + offModeFlg(0x400); + } } -#pragma pop /* 801189F8-80118AD0 113338 00D8+00 1/1 0/0 0/0 .text * setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) { + J3DAnmTransform* bck = (J3DAnmTransform*)mUnderAnmHeap[0].loadDataDemoRID(param_1, 0); + if (bck != NULL) { + setFrameCtrl(mUnderFrameCtrl, bck->getAttribute(), 0, bck->getFrameMax(), 1.0f, 0.0f); + mNowAnmPackUnder[0].setAnmTransform(bck); + mNowAnmPackUpper[0].setAnmTransform(bck); + + dDemo_actor_c* demo_actor_p = dDemo_c::getActor(mDemoActorId); + if (demo_actor_p->checkEnable(0x80)) { + field_0x2060->initOldFrameMorf(demo_actor_p->getPrm_Morf(), 0, field_0x30c6); + } + + field_0x2f8c = 0; + param_0->setAnmFrameMax(bck->getFrameMax()); + setBasAnime(UNDER_0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -283,6 +355,7 @@ asm void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) { #include "asm/d/a/d_a_alink/setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs.s" } #pragma pop +#endif /* 80118AD0-80118B34 113410 0064+00 1/1 0/0 0/0 .text checkFinalBattle__9daAlink_cFv */ BOOL daAlink_c::checkFinalBattle() { @@ -294,7 +367,8 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) { i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1); if (mProcID != PROC_DEAD && i_dmgAmount >= i_dComIfGs_getLife() && !checkMagicArmorNoDamage() && - !dComIfGs_checkBottle(FAIRY)) { + !dComIfGs_checkBottle(FAIRY)) + { i_onNoResetFlg2(FLG2_UNK_40000); procCoDeadInit(0); return 1; @@ -336,17 +410,38 @@ asm BOOL daAlink_c::checkDeadAction(int param_0) { /* 80118FF8-801190A4 113938 00AC+00 1/1 0/0 0/0 .text * setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHighModelBck(mDoExt_bckAnm* param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s" +void daAlink_c::setHighModelBck(mDoExt_bckAnm* i_bck, u16 param_1) { + if (i_bck != NULL) { + J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectIDRes( + dStage_roomControl_c::getDemoArcName(), param_1); + + if (bck != NULL && i_bck->getBckAnm() != bck) { + if (field_0x06b4 == bck) { + mpDemoHDTmpBck->changeBckOnly(NULL); + } else { + i_bck->init(bck, TRUE, -1, lit_6040, 0, -1, true); + } + } + } } -#pragma pop /* 801190A4-80119134 1139E4 0090+00 1/1 0/0 0/0 .text setHighModelFaceBtk__9daAlink_cFUs */ +// extra mr +#ifdef NONMATCHING +void daAlink_c::setHighModelFaceBtk(u16 param_0) { + J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectIDRes( + dStage_roomControl_c::getDemoArcName(), param_0); + + if (btk != NULL && field_0x068c != btk) { + btk->searchUpdateMaterialID(mpDemoFCTongueModel->getModelData()); + mpDemoFCTongueModel->getModelData()->entryTexMtxAnimator(btk); + + btk->setFrame(FLOAT_LABEL(lit_6108)); + field_0x068c = btk; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -355,9 +450,25 @@ asm void daAlink_c::setHighModelFaceBtk(u16 param_0) { #include "asm/d/a/d_a_alink/setHighModelFaceBtk__9daAlink_cFUs.s" } #pragma pop +#endif /* 80119134-801191C4 113A74 0090+00 1/1 0/0 0/0 .text * setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs */ +// extra mr +#ifdef NONMATCHING +void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 param_2) { + J3DAnmTevRegKey* brk = + (J3DAnmTevRegKey*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), param_2); + + if (brk != NULL && *param_0 != brk) { + brk->searchUpdateMaterialID(param_1->getModelData()); + param_1->getModelData()->entryTevRegAnimator(brk); + + brk->setFrame(FLOAT_LABEL(lit_6108)); + *param_0 = brk; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -366,6 +477,7 @@ asm void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 #include "asm/d/a/d_a_alink/setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs.s" } #pragma pop +#endif /* 801191C4-80119464 113B04 02A0+00 1/1 0/0 0/0 .text * setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi */ @@ -402,14 +514,38 @@ int daAlink_c::procDemoCommon() { } /* 801195F8-801196D8 113F38 00E0+00 1/1 0/0 0/0 .text procCoToolDemoInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoToolDemoInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s" +int daAlink_c::procCoToolDemoInit() { + if (!commonProcInitNotSameProc(PROC_TOOL_DEMO)) { + return 1; + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + speedF = tmp_0; + speed.y = tmp_0; + + mUnderAnmHeap[0].resetArcNo(); + mUnderAnmHeap[0].resetIdx(); + mUpperAnmHeap[0].resetIdx(); + mUnderAnmHeap[1].resetIdx(); + mUpperAnmHeap[1].resetIdx(); + + setDoubleAnimeBlendRatio(tmp_0); + mNowAnmPackUnder[1].setAnmTransform(NULL); + mNowAnmPackUpper[1].setAnmTransform(NULL); + + field_0x3198 = 0; + field_0x3010 = 0; + field_0x2fab = 0; + deleteEquipItem(FALSE, TRUE); + mUnderAnmHeap[0].setBufferSize(0x10800); + field_0x300c = 0; + field_0x3478 = FLOAT_LABEL(lit_6108); + field_0x37c8 = current.pos; + + i_onEndResetFlg1(ERFLG1_GANON_FINISH); + return 1; } -#pragma pop /* 801196D8-80119D98 114018 06C0+00 1/0 0/0 0/0 .text procCoToolDemo__9daAlink_cFv */ #pragma push @@ -452,14 +588,23 @@ asm int daAlink_c::procCoOpenTreasureInit() { #pragma pop /* 8011A42C-8011A4C0 114D6C 0094+00 1/0 0/0 0/0 .text procCoOpenTreasure__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoOpenTreasure() { - nofralloc -#include "asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s" +int daAlink_c::procCoOpenTreasure() { + i_onEndResetFlg1(ERFLG1_UNK_8); + + if (field_0x300c == 0) { + field_0x300c = 1; + } else { + field_0x2f99 = 4; + } + + if (checkAnmEnd(mUnderFrameCtrl)) { + dComIfGp_evmng_cutEnd(field_0x3184); + mLinkAcch.ClrWallNone(); + mLinkAcch.OnLineCheck(); + } + + return 1; } -#pragma pop /* 8011A4C0-8011A5CC 114E00 010C+00 1/0 0/0 0/0 .text procCoUnequipInit__9daAlink_cFv */ #pragma push @@ -472,14 +617,30 @@ asm int daAlink_c::procCoUnequipInit() { #pragma pop /* 8011A5CC-8011A688 114F0C 00BC+00 1/0 0/0 0/0 .text procCoUnequip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoUnequip() { - nofralloc -#include "asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s" +int daAlink_c::procCoUnequip() { + if (field_0x300c != 0) { + if (checkAnmEnd(mUnderFrameCtrl)) { + setBlendMoveAnime(lit_6109); + itemEquip(COPY_ROD); + + f32 tmp_6 = lit_7977; + mUpperFrameCtrl[2].setFrame(tmp_6); + getNowAnmPackUpper(UPPER_2)->setFrame(tmp_6); + commonChangeItem(); + field_0x300c = 0; + } + } else { + if (!i_checkWolf()) { + setBlendMoveAnime(lit_6041); + } + + if (checkNoUpperAnime()) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + } + + return 1; } -#pragma pop /* 8011A688-8011A6FC 114FC8 0074+00 4/4 0/0 0/0 .text setGetSubBgm__9daAlink_cFi */ void daAlink_c::setGetSubBgm(int param_0) { @@ -496,32 +657,18 @@ void daAlink_c::setGetSubBgm(int param_0) { } /* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */ -// register issues. probably wrong order of operations -#ifdef NONMATCHING bool daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { - int itemNo = i_itemNo; - if (itemNo == LINKS_SAVINGS) { - itemNo = PURPLE_RUPEE; + if (i_itemNo == LINKS_SAVINGS) { + i_itemNo = PURPLE_RUPEE; } - if (itemNo - 4 < 0 || itemNo - 4 >= 4) { + i_itemNo -= 4; + if (i_itemNo < 0 || i_itemNo >= 4) { return false; } - u16 curRupees = i_dComIfGs_getRupee(); - int tmp = itemNo - 4; - return dComIfGs_getRupeeMax() > (u16)rupeeCount[tmp] + curRupees; + return dComIfGs_getRupeeMax() < rupeeCount[i_itemNo] + i_dComIfGs_getRupee(); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkTreasureRupeeReturn(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s" -} -#pragma pop -#endif /* 8011A798-8011AC28 1150D8 0490+00 2/1 0/0 0/0 .text procCoGetItemInit__9daAlink_cFv */ #pragma push @@ -544,14 +691,21 @@ asm int daAlink_c::procCoGetItem() { #pragma pop /* 8011B3F0-8011B46C 115D30 007C+00 1/0 0/0 0/0 .text procCoTurnBackInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoTurnBackInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s" +int daAlink_c::procCoTurnBackInit() { + if (!commonProcInitNotSameProc(PROC_TURN_BACK)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + if (i_checkWolf()) { + setSingleAnimeWolfBase(WANM_TURN_BACK); + } else { + setSingleAnimeBase(ANM_TURN_BACK); + } + + field_0x300c = 0; + return 1; } -#pragma pop /* 8011B46C-8011B57C 115DAC 0110+00 1/0 0/0 0/0 .text procCoTurnBack__9daAlink_cFv */ #pragma push @@ -594,84 +748,145 @@ asm int daAlink_c::procCoLookWaitInit() { #pragma pop /* 8011BA20-8011BABC 116360 009C+00 1/0 0/0 0/0 .text procCoLookWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoLookWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s" +int daAlink_c::procCoLookWait() { + fopAc_ac_c* look_actor_p = getDemoLookActor(); + + if (look_actor_p != NULL) { + s16 target_angle; + s16 svar1 = cLib_targetAngleY(&field_0x34e0, &look_actor_p->mEyePos) - shape_angle.y; + + if (svar1 > 0x6000) { + target_angle = shape_angle.y + 0x6000; + } else if (svar1 < -0x6000) { + target_angle = shape_angle.y + -0x6000; + } else { + target_angle = shape_angle.y; + } + + cLib_addCalcAngleS(&shape_angle.y, target_angle, 2, 0x800, 0x100); + } + + dComIfGp_evmng_cutEnd(field_0x3184); + return 1; } -#pragma pop /* 8011BABC-8011BB40 1163FC 0084+00 1/0 0/0 0/0 .text procCoDemoPushPullWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoDemoPushPullWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s" +int daAlink_c::procCoDemoPushPullWaitInit() { + if (!commonProcInitNotSameProc(PROC_DEMO_PUSH_PULL_WAIT)) { + return 0; + } + + if (i_checkWolf()) { + setSingleAnimeWolfBase(WANM_WAIT_PP); + } else { + setSingleAnimeBaseSpeed(ANM_WAIT_PUSH_PULL, daAlinkHIO_pushpull_c0::m.field_0x10, + daAlinkHIO_pushpull_c0::m.field_0x14); + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8011BB40-8011BC14 116480 00D4+00 1/0 0/0 0/0 .text procCoDemoPushMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoDemoPushMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s" +int daAlink_c::procCoDemoPushMoveInit() { + if (!commonProcInitNotSameProc(PROC_DEMO_PUSH_MOVE)) { + return 0; + } + + if (i_checkWolf()) { + if (mDemo.getParam0() != 0) { + setSingleAnimeWolfBase(WANM_PUSH); + } else { + setSingleAnimeWolf(WANM_PUSH_LIGHT, daAlinkHIO_wlPush_c0::m.field_0x8, + FLOAT_LABEL(lit_6108), 24, daAlinkHIO_wlPush_c0::m.field_0xC); + } + } else { + if (mDemo.getParam0() != 0) { + setSingleAnimeBase(ANM_PUSH); + } else { + setSingleAnimeBaseSpeed(ANM_PUSH_LIGHT, daAlinkHIO_pushpull_c0::m.field_0x18, + daAlinkHIO_pushpull_c0::m.field_0x1C); + } + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8011BC14-8011BC74 116554 0060+00 2/2 0/0 0/0 .text setMonkeyMoveAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMonkeyMoveAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s" +void daAlink_c::setMonkeyMoveAnime() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (mDemo.getParam0() == 0) { + field_0x2f92 = 0xFE; + field_0x2f93 = 0xFE; + frame_ctrl->setFrame(FLOAT_LABEL(lit_6108)); + } else { + field_0x2f92 = 2; + field_0x2f93 = 5; + frame_ctrl->setFrame(lit_6040); + } + + getNowAnmPackUnder(UNDER_0)->setFrame(frame_ctrl->getFrame()); + field_0x3088 = mDemo.getParam1(); + shape_angle.x = field_0x3088 >> 1; // divide by 2 } -#pragma pop /* 8011BC74-8011BD18 1165B4 00A4+00 1/0 0/0 0/0 .text procMonkeyMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procMonkeyMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s" +int daAlink_c::procMonkeyMoveInit() { + if (!commonProcInitNotSameProc(PROC_MONKEY_MOVE)) { + return 0; + } + + current.angle.y = shape_angle.y; + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + speed.y = tmp_0; + mNormalSpeed = tmp_0; + deleteEquipItem(FALSE, FALSE); + + if (!i_checkWolf()) { + setSingleAnimeBaseSpeed(ANM_ROPE_SWING, FLOAT_LABEL(lit_6108), lit_6109); + setMonkeyMoveAnime(); + } + + return 1; } -#pragma pop /* 8011BD18-8011BD6C 116658 0054+00 1/0 0/0 0/0 .text procMonkeyMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procMonkeyMove() { - nofralloc -#include "asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s" +int daAlink_c::procMonkeyMove() { + dComIfGp_evmng_cutEnd(field_0x3184); + + if (!i_checkWolf()) { + setMonkeyMoveAnime(); + } + return 1; } -#pragma pop /* 8011BD6C-8011BDF0 1166AC 0084+00 1/0 0/0 0/0 .text procDemoBoomerangCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procDemoBoomerangCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s" +int daAlink_c::procDemoBoomerangCatchInit() { + if (!commonProcInitNotSameProc(PROC_DEMO_BOOMERANG_CATCH)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + deleteEquipItem(FALSE, FALSE); + mEquipItem = BOOMERANG; + setItemActor(); + setSingleAnimeParam(ANM_BOOMERANG_CATCH, &daAlinkHIO_boom_c0::m.mCatchAnm); + return 1; } -#pragma pop /* 8011BDF0-8011BE54 116730 0064+00 1/0 0/0 0/0 .text procDemoBoomerangCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procDemoBoomerangCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s" +int daAlink_c::procDemoBoomerangCatch() { + dComIfGp_evmng_cutEnd(field_0x3184); + + if (checkAnmEnd(mUnderFrameCtrl)) { + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } + return 1; } -#pragma pop /* 8011BE54-8011C1B4 116794 0360+00 2/2 0/0 0/0 .text procCoDeadInit__9daAlink_cFi */ #pragma push @@ -705,97 +920,155 @@ asm int daAlink_c::procCoLookAroundInit() { #pragma pop /* 8011C760-8011C81C 1170A0 00BC+00 1/0 0/0 0/0 .text procCoLookAround__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoLookAround() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s" +int daAlink_c::procCoLookAround() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (field_0x300c == 0) { + field_0x300c = 1; + } else { + field_0x2f99 = 4; + } + + if (checkAnmEnd(frame_ctrl)) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (field_0x300e != 0 && frame_ctrl->checkPass(lit_7808)) { + voiceStart(Z2SE_AL_V_ENTRANCE); + } + + return 1; } -#pragma pop /* 8011C81C-8011C890 11715C 0074+00 1/0 0/0 0/0 .text procBossAtnWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procBossAtnWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s" +int daAlink_c::procBossAtnWaitInit() { + if (!commonProcInitNotSameProc(PROC_BOSS_ATN_WAIT)) { + return 0; + } + + setSingleAnimeBase(ANM_APPEARANCE); + voiceStart(Z2SE_AL_V_APPEARANCE); + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8011C890-8011C904 1171D0 0074+00 1/0 0/0 0/0 .text procCoQuakeWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoQuakeWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s" +int daAlink_c::procCoQuakeWaitInit() { + if (!commonProcInitNotSameProc(PROC_QUAKE_WAIT)) { + return 0; + } + + if (i_checkWolf()) { + setSingleAnimeWolfBase(WANM_WAIT_WIND); + } else { + setSingleAnimeBase(ANM_WAIT_WIND); + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8011C904-8011C9D0 117244 00CC+00 1/0 0/0 0/0 .text procCoCaughtInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoCaughtInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s" +int daAlink_c::procCoCaughtInit() { + u32 chk_40000 = i_checkModeFlg(0x40000); + if (!commonProcInitNotSameProc(PROC_CAUGHT)) { + return 0; + } + + if (i_checkWolf()) { + setSingleAnimeWolfBaseMorf(WANM_WAIT_START, daAlinkHIO_wlDamCaught_c0::m.field_0x8); + } else { + setSingleAnimeBaseMorf(ANM_WAIT_START, daAlinkHIO_damCaught_c0::m.field_0x1C); + } + + if (chk_40000) { + onModeFlg(0x40000); + } + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + speed.y = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + mBodyAngle.z = 0; + return 1; } -#pragma pop /* 8011C9D0-8011CA4C 117310 007C+00 1/0 0/0 0/0 .text procLookUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procLookUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s" +int daAlink_c::procLookUpInit() { + if (!commonProcInitNotSameProc(PROC_LOOK_UP)) { + return 0; + } + + setSingleAnimeBase(ANM_GET_A_WAIT2); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3588 = l_waitBaseAnime; + field_0x2f99 = 12; + return 1; } -#pragma pop /* 8011CA4C-8011CA98 11738C 004C+00 1/0 0/0 0/0 .text procLookUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procLookUp() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s" +int daAlink_c::procLookUp() { + if (field_0x2f99 != 12) { + field_0x2f99 = 4; + } + + dComIfGp_evmng_cutEnd(field_0x3184); + return 1; } -#pragma pop /* 8011CA98-8011CB20 1173D8 0088+00 1/0 0/0 0/0 .text procLookUpToGetItemInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procLookUpToGetItemInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s" +int daAlink_c::procLookUpToGetItemInit() { + if (!commonProcInitNotSameProc(PROC_LOOK_UP_TO_GET_ITEM)) { + return 0; + } + + setSingleAnimeBaseMorf(ANM_GET_HOLDOUT, lit_7307); + field_0x300c = 0; + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x3588 = l_waitBaseAnime; + field_0x2f99 = 12; + return 1; } -#pragma pop /* 8011CB20-8011CBD4 117460 00B4+00 1/0 0/0 0/0 .text procLookUpToGetItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procLookUpToGetItem() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s" +int daAlink_c::procLookUpToGetItem() { + if (field_0x2f99 != 12) { + field_0x2f99 = 4; + } + + if (field_0x300c == 0 && checkAnmEnd(mUpperFrameCtrl)) { + field_0x300c = 1; + setSingleAnimeBase(ANM_GET_A_WAIT); + setFaceBasicBck(0x133); + field_0x2f99 = 12; + } else if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; } -#pragma pop /* 8011CBD4-8011CCA8 117514 00D4+00 1/0 0/0 0/0 .text procHandPatInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procHandPatInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s" +int daAlink_c::procHandPatInit() { + if (!commonProcInitNotSameProc(PROC_HAND_PAT)) { + return 0; + } + + setSingleAnime(ANM_COW_THROW_LEFT, lit_6040, lit_6895, -1, lit_6109); + field_0x2f92 = 0xFE; + field_0x2f93 = 0xFE; + field_0x2f99 = 13; + field_0x3588.set(-l_halfAtnWaitBaseAnime.x, l_halfAtnWaitBaseAnime.y, + -l_halfAtnWaitBaseAnime.z); + mNormalSpeed = FLOAT_LABEL(lit_6108); + + setOldRootQuaternion(0, -0x8000, 0); + shape_angle.y += 0x8000; + field_0x300c = 0; + field_0x300e = 0; + return 1; } -#pragma pop /* 8011CCA8-8011CDE0 1175E8 0138+00 1/0 0/0 0/0 .text procHandPat__9daAlink_cFv */ #pragma push @@ -829,85 +1102,152 @@ asm int daAlink_c::procCoFogDead() { /* 8011D0A0-8011D110 1179E0 0070+00 1/0 0/0 0/0 .text procWolfSmellWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWolfSmellWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s" +int daAlink_c::procWolfSmellWaitInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_SMELL_WAIT)) { + return 1; + } + + setSingleAnimeWolfBaseSpeed(WANM_SMELL, daAlinkHIO_wlChain_c0::m.field_0x54, + daAlinkHIO_wlChain_c0::m.field_0x58); + current.angle.y = shape_angle.y; + mNormalSpeed = FLOAT_LABEL(lit_6108); + return 1; } -#pragma pop /* 8011D110-8011D1F4 117A50 00E4+00 1/0 0/0 0/0 .text procCoNodInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoNodInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s" +int daAlink_c::procCoNodInit() { + if (!commonProcInitNotSameProc(PROC_NOD)) { + return 1; + } + + if (i_checkWolf()) { + field_0x300c = 1; + } else { + if (mDemo.getParam0() == 1) { + setUpperAnimeBase(0x24E); + setFacePriBck(0x15B); + setFacePriTexture(FTANM_UNK_8A); + } else { + setUpperAnimeBase(0xD1); + setUpperAnimeBase(0xD1); + setFacePriTexture(FTANM_UNK_75); + } + + field_0x2f96 = 4; + field_0x2f97 = 10; + i_onNoResetFlg1(0x10100000); + field_0x300c = 0; + } + + return 1; } -#pragma pop /* 8011D1F4-8011D268 117B34 0074+00 1/0 0/0 0/0 .text procCoNod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoNod() { - nofralloc -#include "asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s" +int daAlink_c::procCoNod() { + if (checkAnmEnd(&mUpperFrameCtrl[2])) { + field_0x300c = 1; + resetUpperAnime(UPPER_2, lit_6109); + } + + if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; } -#pragma pop /* 8011D268-8011D304 117BA8 009C+00 1/0 0/0 0/0 .text procCoEyeAwayInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoEyeAwayInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s" +int daAlink_c::procCoEyeAwayInit() { + if (!commonProcInitNotSameProc(PROC_EYE_AWAY)) { + return 1; + } + + if (!i_checkWolf()) { + setUpperAnimeBase(0xD3); + setFacePriTexture(FTANM_UNK_77); + setFacePriBck(0x129); + field_0x2f96 = 4; + field_0x2f97 = 10; + i_onNoResetFlg1(0x10100000); + } + + return 1; } -#pragma pop /* 8011D304-8011D3CC 117C44 00C8+00 1/0 0/0 0/0 .text procCoGlareInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoGlareInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s" +int daAlink_c::procCoGlareInit() { + if (!commonProcInitNotSameProc(PROC_GLARE)) { + return 1; + } + + if (i_checkWolf()) { + field_0x300c = 1; + } else { + setUpperAnimeBase(0xD2); + mUpperFrameCtrl[2].setAttribute(2); + mUpperFrameCtrl[2].setLoop(45); + setFacePriTexture(FTANM_UNK_76); + setFacePriBck(0x128); + field_0x300c = 0; + field_0x3478 = lit_6041; + field_0x2f96 = 4; + field_0x2f97 = 10; + i_onNoResetFlg1(0x10100000); + } + + return 1; } -#pragma pop /* 8011D3CC-8011D474 117D0C 00A8+00 1/0 0/0 0/0 .text procCoGlare__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoGlare() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s" +int daAlink_c::procCoGlare() { + daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2]; + + if (!i_checkWolf()) { + if (field_0x3478 > frame_ctrl->getFrame()) { + field_0x300c = 1; + } else { + field_0x3478 = frame_ctrl->getFrame(); + } + } + + if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + if (!i_checkWolf() && frame_ctrl->getFrame() >= lit_7449) { + field_0x2f96 = 0; + field_0x2f97 = 5; + } + + return 1; } -#pragma pop /* 8011D474-8011D4D4 117DB4 0060+00 1/0 0/0 0/0 .text procGoatStopReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procGoatStopReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s" +int daAlink_c::procGoatStopReadyInit() { + if (!commonProcInitNotSameProc(PROC_GOAT_STOP_READY)) { + return 1; + } + + setSingleAnimeBase(ANM_ATN_COW); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x300c = 0; + return 1; } -#pragma pop /* 8011D4D4-8011D544 117E14 0070+00 1/0 0/0 0/0 .text procGoatStopReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procGoatStopReady() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s" +int daAlink_c::procGoatStopReady() { + if (checkAnmEnd(mUnderFrameCtrl)) { + setSingleAnimeBase(ANM_COW_MOVE_LEFT_RIGHT); + field_0x300c = 1; + } + + if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; } -#pragma pop /* 8011D544-8011D64C 117E84 0108+00 2/1 0/0 0/0 .text procCoGetReadySitInit__9daAlink_cFv */ @@ -921,14 +1261,21 @@ asm int daAlink_c::procCoGetReadySitInit() { #pragma pop /* 8011D64C-8011D6D0 117F8C 0084+00 1/0 0/0 0/0 .text procCoGetReadySit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCoGetReadySit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s" +int daAlink_c::procCoGetReadySit() { + if (checkAnmEnd(mUnderFrameCtrl)) { + field_0x300c = 1; + } + + if (!i_checkWolf() && field_0x2f99 != 12) { + field_0x2f99 = 4; + } + + if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } + + return 1; } -#pragma pop /* 8011D6D0-8011D7D4 118010 0104+00 1/0 0/0 0/0 .text procCoTwGateInit__9daAlink_cFv */ #pragma push @@ -951,14 +1298,22 @@ int daAlink_c::procCoTwGate() { } /* 8011D82C-8011D8F8 11816C 00CC+00 1/0 0/0 0/0 .text procWolfSnowEscapeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procWolfSnowEscapeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s" +int daAlink_c::procWolfSnowEscapeInit() { + if (!commonProcInitNotSameProc(PROC_WOLF_SNOW_ESCAPE)) { + return 1; + } + + current.angle.y = shape_angle.y + 0x8000; + setSingleAnimeWolf(WANM_TURN, lit_6040, lit_7808, 11, lit_6109); + voiceStart(Z2SE_WL_V_BREATH_JUMP); + field_0x2f99 = 13; + field_0x3588 = l_wolfBaseAnime; + field_0x3478 = lit_37528; + field_0x300c = 0; + field_0x300e = 0; + mNormalSpeed = lit_6845; + return 1; } -#pragma pop /* 8011D8F8-8011DB04 118238 020C+00 1/0 0/0 0/0 .text procWolfSnowEscape__9daAlink_cFv */ #pragma push @@ -971,14 +1326,23 @@ asm int daAlink_c::procWolfSnowEscape() { #pragma pop /* 8011DB04-8011DB9C 118444 0098+00 1/0 0/0 0/0 .text procZoraMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procZoraMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s" +int daAlink_c::procZoraMoveInit() { + if (!commonProcInitNotSameProc(PROC_ZORA_MOVE)) { + return 1; + } + + setSingleAnimeBase(ANM_HORSE_TAME_WAIT_B); + f32 tmp_0 = FLOAT_LABEL(lit_6108); + speed.y = tmp_0; + mNormalSpeed = tmp_0; + setSpecialGravity(tmp_0, mMaxFallSpeed, 0); + + deleteEquipItem(FALSE, TRUE); + field_0x3010 = 5000; + field_0x3012 = 0; + field_0x384c = (cXyz*)&l_boarBaseAnime; + return 1; } -#pragma pop /* 8011DB9C-8011DDD4 1184DC 0238+00 1/0 0/0 0/0 .text procZoraMove__9daAlink_cFv */ #pragma push @@ -1001,25 +1365,53 @@ asm int daAlink_c::procLookAroundTurnInit() { #pragma pop /* 8011DED8-8011DF68 118818 0090+00 1/0 0/0 0/0 .text procLookAroundTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procLookAroundTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s" +int daAlink_c::procLookAroundTurn() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (checkAnmEnd(frame_ctrl)) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (frame_ctrl->checkPass(lit_8248)) { + voiceStart(Z2SE_AL_V_D_MHOP); + } + + return 1; } -#pragma pop /* 8011DF68-8011E060 1188A8 00F8+00 1/0 0/0 0/0 .text procTradeItemOutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procTradeItemOutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s" +int daAlink_c::procTradeItemOutInit() { + if (!commonProcInitNotSameProc(PROC_TRADE_ITEM_OUT)) { + return 0; + } + + field_0x3198 = setTalkStartBack(&field_0x37c8); + + if (field_0x3198 == 0) { + field_0x300c = setTradeItemAnime(); + mNormalSpeed = FLOAT_LABEL(lit_6108); + } else { + field_0x300c = 0; + } + + field_0x300e = 0; + dComIfGp_setPlayerStatus0(0, 0x10); + field_0x3010 = 1; + + if (mDemo.getParam0() != 1) { + if (mDemo.getParam0() == 2) { + if (checkLetterItem(mDemo.getParam1())) { + field_0x3010 = 0; + } + } else { + if (checkLetterItem(dComIfGp_event_getPreItemNo())) { + field_0x3010 = 0; + } + } + } + + field_0x3008 = 30; + return 1; } -#pragma pop /* 8011E060-8011E3D8 1189A0 0378+00 1/0 0/0 0/0 .text procTradeItemOut__9daAlink_cFv */ #pragma push @@ -1032,14 +1424,10 @@ asm int daAlink_c::procTradeItemOut() { #pragma pop /* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text checkLetterItem__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLetterItem(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s" +BOOL daAlink_c::checkLetterItem(int i_itemNo) { + return i_itemNo == LETTER || i_itemNo == BILL || i_itemNo == RAFRELS_MEMO || + i_itemNo == TKS_LETTER || i_itemNo == ASHS_SCRIBBLING; } -#pragma pop /* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text procNotUseItemInit__9daAlink_cFi */ #pragma push @@ -1062,90 +1450,137 @@ asm int daAlink_c::procNotUseItem() { #pragma pop /* 8011E6E0-8011E748 119020 0068+00 1/0 0/0 0/0 .text procSwordReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwordReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s" +int daAlink_c::procSwordReadyInit() { + if (!commonProcInitNotSameProc(PROC_SWORD_READY)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + setSingleAnimeBase(ANM_DEMO_KAMAE); + field_0x300c = 0; + return 1; } -#pragma pop /* 8011E748-8011E83C 119088 00F4+00 1/0 0/0 0/0 .text procSwordReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwordReady() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s" +int daAlink_c::procSwordReady() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (checkAnmEnd(frame_ctrl)) { + if (field_0x300c == 0) { + setDoubleAnime(FLOAT_LABEL(lit_6108), daAlinkHIO_noActAtnMove_c0::m.mWaitAnmSpeed, + daAlinkHIO_noActAtnMove_c0::m.mWaitAnmSpeed, ANM_WAIT_B, ANM_WAIT_B, 2, + lit_6109); + } + + field_0x300c = 1; + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (field_0x300c != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (frame_ctrl->checkPass(lit_7625)) { + voiceStart(Z2SE_AL_V_OUGI_KAMAE); + } + + return 1; } -#pragma pop /* 8011E83C-8011E8E0 11917C 00A4+00 2/2 0/0 0/0 .text setSwordPushAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordPushAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s" +void daAlink_c::setSwordPushAnime() { + daAlink_ANM anm_id = (daAlink_ANM)(mDemo.getParam0() + ANM_GANON_CHANCE); + if (field_0x3198 != anm_id) { + setSingleAnimeBase(anm_id); + field_0x2f99 = 13; + field_0x3198 = anm_id; + + if (anm_id == ANM_GANON_CHANCE_WIN) { + voiceStart(Z2SE_AL_V_VS_GND_TUBA_WIN); + } else if (anm_id == ANM_GANON_CHANCE_LOSE) { + voiceStart(Z2SE_AL_V_VS_GND_TUBA_LOSE); + } + } } -#pragma pop /* 8011E8E0-8011E960 119220 0080+00 1/0 0/0 0/0 .text procSwordPushInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwordPushInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s" +int daAlink_c::procSwordPushInit() { + if (!commonProcInitNotSameProc(PROC_SWORD_PUSH)) { + return 1; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + field_0x3198 = 0; + setSwordPushAnime(); + field_0x3588 = l_halfAtnWaitBaseAnime; + return 1; } -#pragma pop /* 8011E960-8011E9F8 1192A0 0098+00 1/0 0/0 0/0 .text procSwordPush__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procSwordPush() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s" +int daAlink_c::procSwordPush() { + field_0x2f99 = 4; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + setSwordPushAnime(); + + if (field_0x3198 == 0x193) { + voiceStartLevel(Z2SE_AL_V_VS_GND_TUBA_A); + } else if (field_0x3198 == 0x194) { + voiceStartLevel(Z2SE_AL_V_VS_GND_TUBA_C); + } else if (field_0x3198 == 0x192) { + voiceStartLevel(Z2SE_AL_V_VS_GND_TUBA_B); + } + + return 1; } -#pragma pop /* 8011E9F8-8011EA78 119338 0080+00 1/0 0/0 0/0 .text procGanonFinishInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procGanonFinishInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s" +int daAlink_c::procGanonFinishInit() { + if (!commonProcInitNotSameProc(PROC_GANON_FINISH)) { + return 1; + } + + setSingleAnimeBase(ANM_GANON_FINISH); + + f32 tmp_0 = FLOAT_LABEL(lit_6108); + mNormalSpeed = tmp_0; + speed.y = tmp_0; + + field_0x37c8 = current.pos; + i_onEndResetFlg1(ERFLG1_GANON_FINISH); + return 1; } -#pragma pop /* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ -bool daAlink_c::procGanonFinish() { +int daAlink_c::procGanonFinish() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); current.pos = field_0x37c8; - if (mUnderFrameCtrl[0].checkAnmEnd()) { + + if (checkAnmEnd(mUnderFrameCtrl)) { setSingleAnimeBaseMorf(ANM_GANON_FINISH_WAIT, lit_6041); } - return true; + + return 1; } /* 8011EAE8-8011EB8C 119428 00A4+00 1/0 0/0 0/0 .text procCutFastReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procCutFastReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s" +int daAlink_c::procCutFastReadyInit() { + if (!commonProcInitNotSameProc(PROC_CUT_FAST_READY)) { + return 0; + } + + mNormalSpeed = FLOAT_LABEL(lit_6108); + current.angle.y = shape_angle.y; + setSingleAnimeBaseSpeed(ANM_WAIT, daAlinkHIO_move_c0::m.mWaitAnmSpeed, lit_6109); + setUpperAnime(0x255, UPPER_2, daAlinkHIO_cut_c0::m.mEquipAnm.mSpeed, lit_7448, + daAlinkHIO_cut_c0::m.mEquipAnm.mEndFrame, + daAlinkHIO_cut_c0::m.mEquipAnm.mInterpolation); + i_onNoResetFlg0(FLG0_UNK_1000000); + return 1; } -#pragma pop /* 8011EB8C-8011EBDC 1194CC 0050+00 1/0 0/0 0/0 .text procCutFastReady__9daAlink_cFv */ int daAlink_c::procCutFastReady() { - if (mUpperFrameCtrl[2].checkAnmEnd()) { + if (checkAnmEnd(&mUpperFrameCtrl[2])) { dComIfGp_evmng_cutEnd(field_0x3184); } @@ -1170,15 +1605,15 @@ int daAlink_c::procMasterSwordStickInit() { /* 8011EC60-8011ED18 1195A0 00B8+00 1/0 0/0 0/0 .text procMasterSwordStick__9daAlink_cFv */ int daAlink_c::procMasterSwordStick() { - daPy_frameCtrl_c* fCtrl = &mUnderFrameCtrl[0]; + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; if (field_0x300c != 0) { dComIfGp_evmng_cutEnd(field_0x3184); - } else if (fCtrl->checkAnmEnd()) { + } else if (checkAnmEnd(frame_ctrl)) { field_0x300c = 1; setSingleAnimeBaseMorf(ANM_DEMO_MASTER_SWORD_WAIT, lit_6041); dComIfGp_evmng_cutEnd(field_0x3184); - } else if (fCtrl->getFrame() >= lit_14621) { + } else if (frame_ctrl->getFrame() >= lit_14621) { field_0x2f93 = 5; } @@ -1200,14 +1635,21 @@ int daAlink_c::procMasterSwordPullInit() { /* 8011ED8C-8011EE40 1196CC 00B4+00 1/0 0/0 0/0 .text procMasterSwordPull__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procMasterSwordPull() { - nofralloc -#include "asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s" +int daAlink_c::procMasterSwordPull() { + daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; + + if (checkAnmEnd(frame_ctrl)) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (frame_ctrl->getFrame() >= lit_8780) { + field_0x2f93 = 10; + } else if (frame_ctrl->getFrame() >= lit_7710) { + field_0x3010 = 0; + } else if (frame_ctrl->getFrame() >= lit_6040) { + field_0x3010 = 4; + } + + return 1; } -#pragma pop /* 8011EE40-8011EE94 119780 0054+00 5/5 0/0 0/0 .text checkLv7DungeonShop__9daAlink_cFv */ @@ -1259,28 +1701,19 @@ asm int daAlink_c::procDungeonWarpReady() { /* 8011F084-8011F0F4 1199C4 0070+00 1/0 0/0 0/0 .text procDungeonWarpInit__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::procDungeonWarpInit() { - if (!commonProcInitNotSameProc(DUNEGON_WARP_START) { - field_0x300c = 0; - field_0x3012 = 0; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); - field_0x300e = 0; - field_0x3010 = 0; +int daAlink_c::procDungeonWarpInit() { + if (!commonProcInitNotSameProc(PROC_DUNGEON_WARP)) { + return 0; } + field_0x300c = 0; + field_0x3012 = 0; + setSpecialGravity(FLOAT_LABEL(lit_6108), mMaxFallSpeed, 0); + field_0x300e = 0; + field_0x3010 = 0; + return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procDungeonWarpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s" -} -#pragma pop -#endif /* 8011F0F4-8011F360 119A34 026C+00 1/0 0/0 0/0 .text procDungeonWarp__9daAlink_cFv */ // matches with literals @@ -1399,15 +1832,17 @@ bool daAlink_c::checkAcceptWarp() { cM3dGPla plane; if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && - !i_checkNoResetFlg0(FLG0_UNDERWATER)) { + !i_checkNoResetFlg0(FLG0_UNDERWATER)) + { if (!getSlidePolygon(&plane) && !checkForestOldCentury()) { if (i_checkMidnaRide() || getMidnaActor()->checkPortalObjRide()) { if ((checkField() || checkCastleTown()) && !checkStageName("R_SP161")) { - if ((i_checkWolf() && - (i_checkModeFlg(MODE_UNK_1000) || i_dComIfGp_checkPlayerStatus0(0, 0x10))) || + if ((i_checkWolf() && (i_checkModeFlg(MODE_UNK_1000) || + i_dComIfGp_checkPlayerStatus0(0, 0x10))) || (!i_checkWolf() && (checkEventRun() || getMidnaActor()->checkMetamorphoseEnable()) && - (i_checkModeFlg(4) || i_dComIfGp_checkPlayerStatus0(0, 0x10)))) { + (i_checkModeFlg(4) || i_dComIfGp_checkPlayerStatus0(0, 0x10)))) + { return true; } } @@ -1450,9 +1885,9 @@ void daAlink_c::skipPortalObjWarp() { } if (i_checkNoResetFlg3(FLG3_UNK_2000000) && - (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { - dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), shape_angle.y, - -1); + (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) + { + dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), shape_angle.y, -1); } else { u32 data = setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0); dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), @@ -1469,7 +1904,9 @@ void daAlink_c::skipPortalObjWarp() { /* 8011F9EC-8011FBC0 11A32C 01D4+00 1/1 0/0 0/0 .text checkWarpStart__9daAlink_cFv */ void daAlink_c::checkWarpStart() { if (dMeter2Info_getWarpStatus() != 0) { - if (dMeter2Info_getWarpStatus() == WARP_DECIDED || dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + if (dMeter2Info_getWarpStatus() == WARP_DECIDED || + dComIfGp_event_compulsory(this, 0, 0xFFFF)) + { i_onNoResetFlg0(FLG0_UNK_4000); if (dMeter2Info_getWarpStatus() == WARP_DECIDED) { const char* portal; diff --git a/src/d/a/d_a_alink_hvyboots.inc b/src/d/a/d_a_alink_hvyboots.inc index 61afe884e9..ab287610eb 100644 --- a/src/d/a/d_a_alink_hvyboots.inc +++ b/src/d/a/d_a_alink_hvyboots.inc @@ -1,24 +1,3 @@ -#include "dolphin/types.h" -#include "d/a/d_a_alink.h" -#include "JSystem/J2DGraph/J2DAnmLoader.h" -#include "JSystem/J3DGraphLoader/J3DAnmLoader.h" -#include "JSystem/JMath/JMath.h" -#include "SSystem/SComponent/c_math.h" -#include "Z2AudioLib/Z2AudioMgr.h" -#include "d/com/d_com_inf_game.h" -#include "d/msg/d_msg_object.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/d_a_horse/d_a_horse.h" -#include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" -#include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h" -#include "rel/d/a/d_a_spinner/d_a_spinner.h" -#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" -#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" - /* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text concatMagneBootMtx__9daAlink_cFv */ void daAlink_c::concatMagneBootMtx() { if (i_checkMagneBootsOn()) { diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc index 36bfbc8cb4..ea2fb7b208 100644 --- a/src/d/a/d_a_alink_link.inc +++ b/src/d/a/d_a_alink_link.inc @@ -3003,23 +3003,23 @@ asm daAlink_c::~daAlink_c() { /* 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; +static int daAlink_Delete(daAlink_c* i_this) { + if (i_this->getClothesChangeWaitTimer() != 0) { + i_this->loadModelDVD(); + return 0; + } else if (i_this->getShieldChangeWaitTimer() != 0) { + i_this->loadShieldModelDVD(); + return 0; } else { - delete p_link; - return true; + delete i_this; + return 1; } } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm bool daAlink_Delete(daAlink_c* param_0) { +static asm int daAlink_Delete(daAlink_c* i_this) { nofralloc #include "asm/d/a/d_a_alink/daAlink_Delete__FP9daAlink_c.s" } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index ff1c6fe29d..b6b987f295 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1711,7 +1711,7 @@ asm void dCamera_c::Stay() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dCamera_c::ChangeModeOK(s32 param_0) { +asm u8 dCamera_c::ChangeModeOK(s32 param_0) { nofralloc #include "asm/d/d_camera/ChangeModeOK__9dCamera_cFl.s" }