diff --git a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s index a95e65359bd..42ecc3e0d70 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s @@ -77,7 +77,7 @@ lbl_800A5DE4: /* 800A5DE4 000A2D24 2C 1A 00 00 */ cmpwi r26, 0 /* 800A5DE8 000A2D28 41 82 00 1C */ beq lbl_800A5E04 /* 800A5DEC 000A2D2C 7F E3 FB 78 */ mr r3, r31 -/* 800A5DF0 000A2D30 48 01 56 19 */ bl daAlink_c_NS_checkMagicArmorHeavy +/* 800A5DF0 000A2D30 48 01 56 19 */ bl checkMagicArmorHeavy__9daAlink_cCFv /* 800A5DF4 000A2D34 2C 03 00 00 */ cmpwi r3, 0 /* 800A5DF8 000A2D38 41 82 00 0C */ beq lbl_800A5E04 /* 800A5DFC 000A2D3C 38 60 00 2F */ li r3, 0x2f diff --git a/include/d/d_a/d_a_alink/asm/func_800B5284.s b/include/d/d_a/d_a_alink/asm/func_800B5284.s index 411b61863bc..c3d42f1403c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5284.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5284.s @@ -283,7 +283,7 @@ lbl_800B568C: /* 800B568C 000B25CC 28 03 00 07 */ cmplwi r3, 7 /* 800B5690 000B25D0 40 82 00 E4 */ bne lbl_800B5774 /* 800B5694 000B25D4 7F C3 F3 78 */ mr r3, r30 -/* 800B5698 000B25D8 48 00 5D 71 */ bl daAlink_c_NS_checkMagicArmorHeavy +/* 800B5698 000B25D8 48 00 5D 71 */ bl checkMagicArmorHeavy__9daAlink_cCFv /* 800B569C 000B25DC 2C 03 00 00 */ cmpwi r3, 0 /* 800B56A0 000B25E0 40 82 00 24 */ bne lbl_800B56C4 /* 800B56A4 000B25E4 2C 1F 00 EE */ cmpwi r31, 0xee diff --git a/include/d/d_a/d_a_alink/asm/func_800BB408.s b/include/d/d_a/d_a_alink/asm/func_800BB408.s deleted file mode 100644 index 78f2b57598e..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800BB408.s +++ /dev/null @@ -1,21 +0,0 @@ -/* 800BB408 000B8348 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BB40C 000B834C 7C 08 02 A6 */ mflr r0 -/* 800BB410 000B8350 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BB414 000B8354 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB418 000B8358 3B E0 00 00 */ li r31, 0 -/* 800BB41C 000B835C 48 00 49 E1 */ bl daAlink_c_NS_checkMagicArmorWearAbility -/* 800BB420 000B8360 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB424 000B8364 41 82 00 1C */ beq lbl_800BB440 -/* 800BB428 000B8368 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800BB42C 000B836C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800BB430 000B8370 A0 03 00 04 */ lhz r0, 4(r3) -/* 800BB434 000B8374 28 00 00 00 */ cmplwi r0, 0 -/* 800BB438 000B8378 40 82 00 08 */ bne lbl_800BB440 -/* 800BB43C 000B837C 3B E0 00 01 */ li r31, 1 -lbl_800BB440: -/* 800BB440 000B8380 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BB444 000B8384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB448 000B8388 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB44C 000B838C 7C 08 03 A6 */ mtlr r0 -/* 800BB450 000B8390 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB454 000B8394 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_800BB458.s b/include/d/d_a/d_a_alink/asm/func_800BB458.s deleted file mode 100644 index 15783bd1378..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800BB458.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 800BB458 000B8398 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800BB45C 000B839C 7C 08 02 A6 */ mflr r0 -/* 800BB460 000B83A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800BB464 000B83A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800BB468 000B83A8 93 C1 00 08 */ stw r30, 8(r1) -/* 800BB46C 000B83AC 7C 7E 1B 78 */ mr r30, r3 -/* 800BB470 000B83B0 3B E0 00 00 */ li r31, 0 -/* 800BB474 000B83B4 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800BB478 000B83B8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 800BB47C 000B83BC 40 82 00 1C */ bne lbl_800BB498 -/* 800BB480 000B83C0 4B FF FF 89 */ bl daAlink_c_NS_checkMagicArmorHeavy -/* 800BB484 000B83C4 2C 03 00 00 */ cmpwi r3, 0 -/* 800BB488 000B83C8 40 82 00 10 */ bne lbl_800BB498 -/* 800BB48C 000B83CC A0 1E 1F BC */ lhz r0, 0x1fbc(r30) -/* 800BB490 000B83D0 28 00 01 9C */ cmplwi r0, 0x19c -/* 800BB494 000B83D4 40 82 00 08 */ bne lbl_800BB49C -lbl_800BB498: -/* 800BB498 000B83D8 3B E0 00 01 */ li r31, 1 -lbl_800BB49C: -/* 800BB49C 000B83DC 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800BB4A0 000B83E0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800BB4A4 000B83E4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800BB4A8 000B83E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800BB4AC 000B83EC 7C 08 03 A6 */ mtlr r0 -/* 800BB4B0 000B83F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800BB4B4 000B83F4 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800BB4B8.s b/include/d/d_a/d_a_alink/asm/func_800BB4B8.s index 04974619f75..20f292b93fb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB4B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB4B8.s @@ -27,7 +27,7 @@ lbl_800BB510: /* 800BB518 000B8458 2C 03 00 00 */ cmpwi r3, 0 /* 800BB51C 000B845C 40 82 00 20 */ bne lbl_800BB53C /* 800BB520 000B8460 7F A3 EB 78 */ mr r3, r29 -/* 800BB524 000B8464 4B FF FE E5 */ bl daAlink_c_NS_checkMagicArmorHeavy +/* 800BB524 000B8464 4B FF FE E5 */ bl checkMagicArmorHeavy__9daAlink_cCFv /* 800BB528 000B8468 2C 03 00 00 */ cmpwi r3, 0 /* 800BB52C 000B846C 40 82 00 10 */ bne lbl_800BB53C /* 800BB530 000B8470 80 1D 05 70 */ lwz r0, 0x570(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB644.s b/include/d/d_a/d_a_alink/asm/func_800BB644.s index c00ee06980c..b0b55002519 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB644.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB644.s @@ -71,7 +71,7 @@ lbl_800BB740: /* 800BB740 000B8680 7F C3 F3 78 */ mr r3, r30 /* 800BB744 000B8684 FC 40 F8 90 */ fmr f2, f31 /* 800BB748 000B8688 38 80 00 01 */ li r4, 1 -/* 800BB74C 000B868C 48 00 00 25 */ bl daAlink_c_NS_setSpecialGravity +/* 800BB74C 000B868C 48 00 00 25 */ bl setSpecialGravity__9daAlink_cFffi /* 800BB750 000B8690 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 800BB754 000B8694 CB E1 00 10 */ lfd f31, 0x10(r1) /* 800BB758 000B8698 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB770.s b/include/d/d_a/d_a_alink/asm/func_800BB770.s deleted file mode 100644 index afa76f2f5bc..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800BB770.s +++ /dev/null @@ -1,14 +0,0 @@ -/* 800BB770 000B86B0 2C 04 00 00 */ cmpwi r4, 0 -/* 800BB774 000B86B4 41 82 00 14 */ beq lbl_800BB788 -/* 800BB778 000B86B8 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800BB77C 000B86BC 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 -/* 800BB780 000B86C0 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800BB784 000B86C4 48 00 00 10 */ b lbl_800BB794 -lbl_800BB788: -/* 800BB788 000B86C8 80 03 05 7C */ lwz r0, 0x57c(r3) -/* 800BB78C 000B86CC 60 00 40 00 */ ori r0, r0, 0x4000 -/* 800BB790 000B86D0 90 03 05 7C */ stw r0, 0x57c(r3) -lbl_800BB794: -/* 800BB794 000B86D4 D0 23 05 30 */ stfs f1, 0x530(r3) -/* 800BB798 000B86D8 D0 43 05 34 */ stfs f2, 0x534(r3) -/* 800BB79C 000B86DC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800C1DE0.s b/include/d/d_a/d_a_alink/asm/func_800C1DE0.s deleted file mode 100644 index 1a22c02d381..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800C1DE0.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 800C1DE0 000BED20 2C 05 00 00 */ cmpwi r5, 0 -/* 800C1DE4 000BED24 41 82 00 14 */ beq lbl_800C1DF8 -/* 800C1DE8 000BED28 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800C1DEC 000BED2C 60 00 00 10 */ ori r0, r0, 0x10 -/* 800C1DF0 000BED30 90 03 05 70 */ stw r0, 0x570(r3) -/* 800C1DF4 000BED34 48 00 00 10 */ b lbl_800C1E04 -lbl_800C1DF8: -/* 800C1DF8 000BED38 80 03 05 70 */ lwz r0, 0x570(r3) -/* 800C1DFC 000BED3C 60 00 00 08 */ ori r0, r0, 8 -/* 800C1E00 000BED40 90 03 05 70 */ stw r0, 0x570(r3) -lbl_800C1E04: -/* 800C1E04 000BED44 98 83 2F A4 */ stb r4, 0x2fa4(r3) -/* 800C1E08 000BED48 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800C61EC.s b/include/d/d_a/d_a_alink/asm/func_800C61EC.s index 8fd9dbc1b6c..fe07f4b6b00 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C61EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C61EC.s @@ -157,7 +157,7 @@ lbl_800C6404: /* 800C6420 000C3360 C0 24 00 74 */ lfs f1, 0x74(r4) /* 800C6424 000C3364 C0 44 00 78 */ lfs f2, 0x78(r4) /* 800C6428 000C3368 38 80 00 01 */ li r4, 1 -/* 800C642C 000C336C 4B FF 53 45 */ bl daAlink_c_NS_setSpecialGravity +/* 800C642C 000C336C 4B FF 53 45 */ bl setSpecialGravity__9daAlink_cFffi /* 800C6430 000C3370 38 00 00 00 */ li r0, 0 /* 800C6434 000C3374 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800C6438 000C3378 7F C3 F3 78 */ mr r3, r30 @@ -186,7 +186,7 @@ lbl_800C6460: /* 800C6490 000C33D0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 800C6494 000C33D4 C0 5E 34 78 */ lfs f2, 0x3478(r30) /* 800C6498 000C33D8 38 80 00 00 */ li r4, 0 -/* 800C649C 000C33DC 4B FF 52 D5 */ bl daAlink_c_NS_setSpecialGravity +/* 800C649C 000C33DC 4B FF 52 D5 */ bl setSpecialGravity__9daAlink_cFffi /* 800C64A0 000C33E0 48 00 00 28 */ b lbl_800C64C8 lbl_800C64A4: /* 800C64A4 000C33E4 7F C3 F3 78 */ mr r3, r30 @@ -197,7 +197,7 @@ lbl_800C64A4: /* 800C64B8 000C33F8 C0 04 00 78 */ lfs f0, 0x78(r4) /* 800C64BC 000C33FC EC 42 00 32 */ fmuls f2, f2, f0 /* 800C64C0 000C3400 38 80 00 00 */ li r4, 0 -/* 800C64C4 000C3404 4B FF 52 AD */ bl daAlink_c_NS_setSpecialGravity +/* 800C64C4 000C3404 4B FF 52 AD */ bl setSpecialGravity__9daAlink_cFffi lbl_800C64C8: /* 800C64C8 000C3408 C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 800C64CC 000C340C C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -277,7 +277,7 @@ lbl_800C65B0: /* 800C65E4 000C3524 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 800C65E8 000C3528 C0 5E 34 78 */ lfs f2, 0x3478(r30) /* 800C65EC 000C352C 38 80 00 00 */ li r4, 0 -/* 800C65F0 000C3530 4B FF 51 81 */ bl daAlink_c_NS_setSpecialGravity +/* 800C65F0 000C3530 4B FF 51 81 */ bl setSpecialGravity__9daAlink_cFffi /* 800C65F4 000C3534 38 00 00 01 */ li r0, 1 /* 800C65F8 000C3538 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_800C65FC: diff --git a/include/d/d_a/d_a_alink/asm/func_800C82E8.s b/include/d/d_a/d_a_alink/asm/func_800C82E8.s index 451b578e7d9..fb21afa57d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C82E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C82E8.s @@ -42,7 +42,7 @@ lbl_800C836C: /* 800C8378 000C52B8 7F E3 FB 78 */ mr r3, r31 /* 800C837C 000C52BC C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800C8380 000C52C0 38 80 00 00 */ li r4, 0 -/* 800C8384 000C52C4 4B FF 33 ED */ bl daAlink_c_NS_setSpecialGravity +/* 800C8384 000C52C4 4B FF 33 ED */ bl setSpecialGravity__9daAlink_cFffi /* 800C8388 000C52C8 38 60 00 01 */ li r3, 1 lbl_800C838C: /* 800C838C 000C52CC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C8700.s b/include/d/d_a/d_a_alink/asm/func_800C8700.s index ce558495c65..f3642bd0218 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800C8700.s @@ -348,7 +348,7 @@ lbl_800C8BF8: /* 800C8C24 000C5B64 48 00 75 41 */ bl daAlink_c_NS_set3DStatus /* 800C8C28 000C5B68 7F E3 FB 78 */ mr r3, r31 /* 800C8C2C 000C5B6C 38 80 00 00 */ li r4, 0 -/* 800C8C30 000C5B70 48 00 75 1D */ bl daAlink_c_NS_setMidnaTalkStatus +/* 800C8C30 000C5B70 48 00 75 1D */ bl setMidnaTalkStatus__9daAlink_cFUc /* 800C8C34 000C5B74 7F E3 FB 78 */ mr r3, r31 /* 800C8C38 000C5B78 48 07 87 95 */ bl daPy_py_c_NS_checkWolf /* 800C8C3C 000C5B7C 28 03 00 00 */ cmplwi r3, 0 @@ -2212,7 +2212,7 @@ lbl_800CA6C0: /* 800CA6D8 000C7618 38 00 00 00 */ li r0, 0 /* 800CA6DC 000C761C 98 1F 2F B8 */ stb r0, 0x2fb8(r31) /* 800CA6E0 000C7620 7F E3 FB 78 */ mr r3, r31 -/* 800CA6E4 000C7624 4B FF 57 19 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800CA6E4 000C7624 4B FF 57 19 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800CA6E8 000C7628 2C 03 00 00 */ cmpwi r3, 0 /* 800CA6EC 000C762C 41 82 00 F4 */ beq lbl_800CA7E0 /* 800CA6F0 000C7630 88 1F 2F BF */ lbz r0, 0x2fbf(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800CC364.s b/include/d/d_a/d_a_alink/asm/func_800CC364.s index dd28949feb3..68a240e73d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC364.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC364.s @@ -15,7 +15,7 @@ /* 800CC39C 000C92DC 2C 03 00 00 */ cmpwi r3, 0 /* 800CC3A0 000C92E0 40 82 00 14 */ bne lbl_800CC3B4 /* 800CC3A4 000C92E4 7F A3 EB 78 */ mr r3, r29 -/* 800CC3A8 000C92E8 4B FF 3A 55 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800CC3A8 000C92E8 4B FF 3A 55 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800CC3AC 000C92EC 2C 03 00 00 */ cmpwi r3, 0 /* 800CC3B0 000C92F0 41 82 00 10 */ beq lbl_800CC3C0 lbl_800CC3B4: @@ -79,7 +79,7 @@ lbl_800CC3CC: /* 800CC48C 000C93CC 48 00 03 38 */ b lbl_800CC7C4 lbl_800CC490: /* 800CC490 000C93D0 7F A3 EB 78 */ mr r3, r29 -/* 800CC494 000C93D4 4B FF 39 69 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800CC494 000C93D4 4B FF 39 69 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800CC498 000C93D8 2C 03 00 00 */ cmpwi r3, 0 /* 800CC49C 000C93DC 41 82 01 28 */ beq lbl_800CC5C4 /* 800CC4A0 000C93E0 80 7D 06 4C */ lwz r3, 0x64c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s index 31166d3fcb9..fe4b09de000 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s @@ -362,7 +362,7 @@ lbl_800CCD40: /* 800CCD4C 000C9C8C 2C 1F 00 00 */ cmpwi r31, 0 /* 800CCD50 000C9C90 41 82 00 78 */ beq lbl_800CCDC8 /* 800CCD54 000C9C94 7F 83 E3 78 */ mr r3, r28 -/* 800CCD58 000C9C98 4B FF 30 A5 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800CCD58 000C9C98 4B FF 30 A5 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800CCD5C 000C9C9C 2C 03 00 00 */ cmpwi r3, 0 /* 800CCD60 000C9CA0 41 82 00 38 */ beq lbl_800CCD98 /* 800CCD64 000C9CA4 88 1C 2F BF */ lbz r0, 0x2fbf(r28) @@ -394,7 +394,7 @@ lbl_800CCDB0: /* 800CCDC4 000C9D04 48 00 00 64 */ b lbl_800CCE28 lbl_800CCDC8: /* 800CCDC8 000C9D08 7F 83 E3 78 */ mr r3, r28 -/* 800CCDCC 000C9D0C 4B FF 30 31 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800CCDCC 000C9D0C 4B FF 30 31 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800CCDD0 000C9D10 2C 03 00 00 */ cmpwi r3, 0 /* 800CCDD4 000C9D14 41 82 00 2C */ beq lbl_800CCE00 /* 800CCDD8 000C9D18 80 7C 06 50 */ lwz r3, 0x650(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800CF100.s b/include/d/d_a/d_a_alink/asm/func_800CF100.s index 7e32c99f9f4..9431ab5e789 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF100.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF100.s @@ -28,7 +28,7 @@ lbl_800CF154: /* 800CF164 000CC0A4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CF168 000CC0A8 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800CF16C 000CC0AC 38 80 00 00 */ li r4, 0 -/* 800CF170 000CC0B0 4B FE C6 01 */ bl daAlink_c_NS_setSpecialGravity +/* 800CF170 000CC0B0 4B FE C6 01 */ bl setSpecialGravity__9daAlink_cFffi /* 800CF174 000CC0B4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CF178 000CC0B8 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800CF17C 000CC0BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800D014C.s b/include/d/d_a/d_a_alink/asm/func_800D014C.s deleted file mode 100644 index d83c292c502..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800D014C.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800D014C 000CD08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800D0150 000CD090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800D0154 000CD094 98 83 5E 33 */ stb r4, 0x5e33(r3) -/* 800D0158 000CD098 38 00 00 00 */ li r0, 0 -/* 800D015C 000CD09C 98 03 5E 4E */ stb r0, 0x5e4e(r3) -/* 800D0160 000CD0A0 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800D5C88.s b/include/d/d_a/d_a_alink/asm/func_800D5C88.s index 46bdde7c769..7a636f26b2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5C88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5C88.s @@ -36,7 +36,7 @@ lbl_800D5CD4: /* 800D5D0C 000D2C4C C0 24 00 3C */ lfs f1, 0x3c(r4) /* 800D5D10 000D2C50 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800D5D14 000D2C54 38 80 00 00 */ li r4, 0 -/* 800D5D18 000D2C58 4B FE 5A 59 */ bl daAlink_c_NS_setSpecialGravity +/* 800D5D18 000D2C58 4B FE 5A 59 */ bl setSpecialGravity__9daAlink_cFffi /* 800D5D1C 000D2C5C 28 1E 00 00 */ cmplwi r30, 0 /* 800D5D20 000D2C60 41 82 00 3C */ beq lbl_800D5D5C /* 800D5D24 000D2C64 38 61 00 18 */ addi r3, r1, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s index 3102ca90ed3..f399ae58614 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s @@ -28,7 +28,7 @@ /* 800D6034 000D2F74 7F C3 F3 78 */ mr r3, r30 /* 800D6038 000D2F78 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800D603C 000D2F7C 38 80 00 00 */ li r4, 0 -/* 800D6040 000D2F80 4B FE 57 31 */ bl daAlink_c_NS_setSpecialGravity +/* 800D6040 000D2F80 4B FE 57 31 */ bl setSpecialGravity__9daAlink_cFffi /* 800D6044 000D2F84 38 00 00 01 */ li r0, 1 /* 800D6048 000D2F88 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800D604C 000D2F8C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800D77C8.s b/include/d/d_a/d_a_alink/asm/func_800D77C8.s index dfaa3875acb..f1ac4645f9b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D77C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D77C8.s @@ -5,11 +5,11 @@ /* 800D77D8 000D4718 93 C1 00 08 */ stw r30, 8(r1) /* 800D77DC 000D471C 7C 7E 1B 78 */ mr r30, r3 /* 800D77E0 000D4720 3B E0 00 00 */ li r31, 0 -/* 800D77E4 000D4724 4B FE 86 19 */ bl daAlink_c_NS_checkMagicArmorWearAbility +/* 800D77E4 000D4724 4B FE 86 19 */ bl checkMagicArmorWearAbility__9daAlink_cCFv /* 800D77E8 000D4728 2C 03 00 00 */ cmpwi r3, 0 /* 800D77EC 000D472C 41 82 00 18 */ beq lbl_800D7804 /* 800D77F0 000D4730 7F C3 F3 78 */ mr r3, r30 -/* 800D77F4 000D4734 4B FE 3C 15 */ bl daAlink_c_NS_checkMagicArmorHeavy +/* 800D77F4 000D4734 4B FE 3C 15 */ bl checkMagicArmorHeavy__9daAlink_cCFv /* 800D77F8 000D4738 2C 03 00 00 */ cmpwi r3, 0 /* 800D77FC 000D473C 40 82 00 08 */ bne lbl_800D7804 /* 800D7800 000D4740 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D96DC.s b/include/d/d_a/d_a_alink/asm/func_800D96DC.s index e4716d87e77..03718d4189c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D96DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D96DC.s @@ -324,7 +324,7 @@ lbl_800D9B4C: /* 800D9B54 000D6A94 C0 38 00 54 */ lfs f1, 0x54(r24) /* 800D9B58 000D6A98 C0 55 05 34 */ lfs f2, 0x534(r21) /* 800D9B5C 000D6A9C 38 80 00 00 */ li r4, 0 -/* 800D9B60 000D6AA0 4B FE 1C 11 */ bl daAlink_c_NS_setSpecialGravity +/* 800D9B60 000D6AA0 4B FE 1C 11 */ bl setSpecialGravity__9daAlink_cFffi /* 800D9B64 000D6AA4 A8 18 00 50 */ lha r0, 0x50(r24) /* 800D9B68 000D6AA8 B0 15 30 10 */ sth r0, 0x3010(r21) /* 800D9B6C 000D6AAC C0 18 00 64 */ lfs f0, 0x64(r24) @@ -350,7 +350,7 @@ lbl_800D9BAC: /* 800D9BB4 000D6AF4 C0 38 00 A4 */ lfs f1, 0xa4(r24) /* 800D9BB8 000D6AF8 C0 55 05 34 */ lfs f2, 0x534(r21) /* 800D9BBC 000D6AFC 38 80 00 00 */ li r4, 0 -/* 800D9BC0 000D6B00 4B FE 1B B1 */ bl daAlink_c_NS_setSpecialGravity +/* 800D9BC0 000D6B00 4B FE 1B B1 */ bl setSpecialGravity__9daAlink_cFffi /* 800D9BC4 000D6B04 A8 18 00 A0 */ lha r0, 0xa0(r24) /* 800D9BC8 000D6B08 B0 15 30 10 */ sth r0, 0x3010(r21) /* 800D9BCC 000D6B0C C0 18 00 B4 */ lfs f0, 0xb4(r24) diff --git a/include/d/d_a/d_a_alink/asm/func_800DA82C.s b/include/d/d_a/d_a_alink/asm/func_800DA82C.s index 94f534c548b..13f89834d5d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA82C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA82C.s @@ -254,7 +254,7 @@ lbl_800DABB8: /* 800DABC4 000D7B04 7F 03 C3 78 */ mr r3, r24 /* 800DABC8 000D7B08 C0 58 05 34 */ lfs f2, 0x534(r24) /* 800DABCC 000D7B0C 38 80 00 00 */ li r4, 0 -/* 800DABD0 000D7B10 4B FE 0B A1 */ bl daAlink_c_NS_setSpecialGravity +/* 800DABD0 000D7B10 4B FE 0B A1 */ bl setSpecialGravity__9daAlink_cFffi /* 800DABD4 000D7B14 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DABD8 000D7B18 D0 21 00 18 */ stfs f1, 0x18(r1) /* 800DABDC 000D7B1C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB140.s b/include/d/d_a/d_a_alink/asm/func_800DB140.s index f58dd1dbe18..d7aa23cfda3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB140.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB140.s @@ -72,7 +72,7 @@ lbl_800DB234: /* 800DB240 000D8180 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DB244 000D8184 C0 5B 05 34 */ lfs f2, 0x534(r27) /* 800DB248 000D8188 38 80 00 00 */ li r4, 0 -/* 800DB24C 000D818C 4B FE 05 25 */ bl daAlink_c_NS_setSpecialGravity +/* 800DB24C 000D818C 4B FE 05 25 */ bl setSpecialGravity__9daAlink_cFffi /* 800DB250 000D8190 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DB254 000D8194 D0 1B 04 FC */ stfs f0, 0x4fc(r27) /* 800DB258 000D8198 80 1B 31 A0 */ lwz r0, 0x31a0(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3218.s b/include/d/d_a/d_a_alink/asm/func_800E3218.s index 2834d9579c9..04f9e2c71d0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3218.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3218.s @@ -100,7 +100,7 @@ lbl_800E334C: /* 800E3398 000E02D8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E339C 000E02DC C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800E33A0 000E02E0 38 80 00 00 */ li r4, 0 -/* 800E33A4 000E02E4 4B FD 83 CD */ bl daAlink_c_NS_setSpecialGravity +/* 800E33A4 000E02E4 4B FD 83 CD */ bl setSpecialGravity__9daAlink_cFffi /* 800E33A8 000E02E8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E33AC 000E02EC D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800E33B0 000E02F0 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800EC20C.s b/include/d/d_a/d_a_alink/asm/func_800EC20C.s index 48e6c8d2fc7..6eb22e39beb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC20C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC20C.s @@ -102,7 +102,7 @@ lbl_800EC374: /* 800EC380 000E92C0 7F E3 FB 78 */ mr r3, r31 /* 800EC384 000E92C4 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800EC388 000E92C8 38 80 00 00 */ li r4, 0 -/* 800EC38C 000E92CC 4B FC F3 E5 */ bl daAlink_c_NS_setSpecialGravity +/* 800EC38C 000E92CC 4B FC F3 E5 */ bl setSpecialGravity__9daAlink_cFffi /* 800EC390 000E92D0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EC394 000E92D4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800EC398 000E92D8 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800F4A50.s b/include/d/d_a/d_a_alink/asm/func_800F4A50.s index f71d5cadc91..87e92e25b4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4A50.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4A50.s @@ -30,7 +30,7 @@ /* 800F4AC4 000F1A04 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4AC8 000F1A08 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800F4ACC 000F1A0C 38 80 00 00 */ li r4, 0 -/* 800F4AD0 000F1A10 4B FC 6C A1 */ bl daAlink_c_NS_setSpecialGravity +/* 800F4AD0 000F1A10 4B FC 6C A1 */ bl setSpecialGravity__9daAlink_cFffi /* 800F4AD4 000F1A14 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4AD8 000F1A18 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800F4ADC 000F1A1C D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4C78.s b/include/d/d_a/d_a_alink/asm/func_800F4C78.s index d0ac7197a5b..a392d01aee4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4C78.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4C78.s @@ -41,7 +41,7 @@ lbl_800F4CC4: /* 800F4D08 000F1C48 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4D0C 000F1C4C C0 5D 05 34 */ lfs f2, 0x534(r29) /* 800F4D10 000F1C50 38 80 00 00 */ li r4, 0 -/* 800F4D14 000F1C54 4B FC 6A 5D */ bl daAlink_c_NS_setSpecialGravity +/* 800F4D14 000F1C54 4B FC 6A 5D */ bl setSpecialGravity__9daAlink_cFffi /* 800F4D18 000F1C58 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4D1C 000F1C5C D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 800F4D20 000F1C60 D0 1D 04 FC */ stfs f0, 0x4fc(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s index 52d1b52c2b0..0d6b24a5b65 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s @@ -22,7 +22,7 @@ /* 800F4E4C 000F1D8C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4E50 000F1D90 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800F4E54 000F1D94 38 80 00 00 */ li r4, 0 -/* 800F4E58 000F1D98 4B FC 69 19 */ bl daAlink_c_NS_setSpecialGravity +/* 800F4E58 000F1D98 4B FC 69 19 */ bl setSpecialGravity__9daAlink_cFffi /* 800F4E5C 000F1D9C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4E60 000F1DA0 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800F4E64 000F1DA4 D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F5048.s b/include/d/d_a/d_a_alink/asm/func_800F5048.s index d64b174b1df..434be7506b4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5048.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5048.s @@ -96,7 +96,7 @@ lbl_800F5170: /* 800F51AC 000F20EC C0 24 00 74 */ lfs f1, 0x74(r4) /* 800F51B0 000F20F0 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800F51B4 000F20F4 38 80 00 00 */ li r4, 0 -/* 800F51B8 000F20F8 4B FC 65 B9 */ bl daAlink_c_NS_setSpecialGravity +/* 800F51B8 000F20F8 4B FC 65 B9 */ bl setSpecialGravity__9daAlink_cFffi /* 800F51BC 000F20FC C0 02 94 64 */ lfs f0, lbl_80452E64-_SDA2_BASE_(r2) /* 800F51C0 000F2100 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800F51C4 000F2104 C0 02 93 78 */ lfs f0, lbl_80452D78-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F51E4.s b/include/d/d_a/d_a_alink/asm/func_800F51E4.s index 43755e62ff9..c00a821efd5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F51E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F51E4.s @@ -144,7 +144,7 @@ lbl_800F53E8: /* 800F53F8 000F2338 7F 83 E3 78 */ mr r3, r28 /* 800F53FC 000F233C C0 5C 05 34 */ lfs f2, 0x534(r28) /* 800F5400 000F2340 38 80 00 00 */ li r4, 0 -/* 800F5404 000F2344 4B FC 63 6D */ bl daAlink_c_NS_setSpecialGravity +/* 800F5404 000F2344 4B FC 63 6D */ bl setSpecialGravity__9daAlink_cFffi /* 800F5408 000F2348 38 60 00 01 */ li r3, 1 lbl_800F540C: /* 800F540C 000F234C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC77C.s b/include/d/d_a/d_a_alink/asm/func_800FC77C.s index e144f4b213b..1f857bf146a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC77C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC77C.s @@ -36,7 +36,7 @@ lbl_800FC7E0: /* 800FC800 000F9740 7F C3 F3 78 */ mr r3, r30 /* 800FC804 000F9744 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FC808 000F9748 38 80 00 00 */ li r4, 0 -/* 800FC80C 000F974C 4B FB EF 65 */ bl daAlink_c_NS_setSpecialGravity +/* 800FC80C 000F974C 4B FB EF 65 */ bl setSpecialGravity__9daAlink_cFffi /* 800FC810 000F9750 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FC814 000F9754 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FC818 000F9758 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FD648.s b/include/d/d_a/d_a_alink/asm/func_800FD648.s index 387827c9db8..fe3c5e19eb3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD648.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD648.s @@ -17,7 +17,7 @@ lbl_800FD678: /* 800FD684 000FA5C4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FD688 000FA5C8 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800FD68C 000FA5CC 38 80 00 00 */ li r4, 0 -/* 800FD690 000FA5D0 4B FB E0 E1 */ bl daAlink_c_NS_setSpecialGravity +/* 800FD690 000FA5D0 4B FB E0 E1 */ bl setSpecialGravity__9daAlink_cFffi /* 800FD694 000FA5D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FD698 000FA5D8 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800FD69C 000FA5DC D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800FD824.s b/include/d/d_a/d_a_alink/asm/func_800FD824.s index 9d245b5a6e4..b270afb3c4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD824.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD824.s @@ -24,7 +24,7 @@ lbl_800FD85C: /* 800FD87C 000FA7BC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FD880 000FA7C0 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FD884 000FA7C4 38 80 00 00 */ li r4, 0 -/* 800FD888 000FA7C8 4B FB DE E9 */ bl daAlink_c_NS_setSpecialGravity +/* 800FD888 000FA7C8 4B FB DE E9 */ bl setSpecialGravity__9daAlink_cFffi /* 800FD88C 000FA7CC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FD890 000FA7D0 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FD894 000FA7D4 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FD9CC.s b/include/d/d_a/d_a_alink/asm/func_800FD9CC.s index ec417542ef8..2a64705161c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD9CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD9CC.s @@ -20,7 +20,7 @@ lbl_800FDA08: /* 800FDA14 000FA954 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDA18 000FA958 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 800FDA1C 000FA95C 38 80 00 00 */ li r4, 0 -/* 800FDA20 000FA960 4B FB DD 51 */ bl daAlink_c_NS_setSpecialGravity +/* 800FDA20 000FA960 4B FB DD 51 */ bl setSpecialGravity__9daAlink_cFffi /* 800FDA24 000FA964 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDA28 000FA968 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800FDA2C 000FA96C D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800FDC18.s b/include/d/d_a/d_a_alink/asm/func_800FDC18.s index 45f4e8000e8..4edcdbe6b15 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDC18.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDC18.s @@ -24,7 +24,7 @@ lbl_800FDC50: /* 800FDC70 000FABB0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDC74 000FABB4 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FDC78 000FABB8 38 80 00 00 */ li r4, 0 -/* 800FDC7C 000FABBC 4B FB DA F5 */ bl daAlink_c_NS_setSpecialGravity +/* 800FDC7C 000FABBC 4B FB DA F5 */ bl setSpecialGravity__9daAlink_cFffi /* 800FDC80 000FABC0 38 00 28 00 */ li r0, 0x2800 /* 800FDC84 000FABC4 B0 1E 30 A0 */ sth r0, 0x30a0(r30) /* 800FDC88 000FABC8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800FDD90.s b/include/d/d_a/d_a_alink/asm/func_800FDD90.s index d39b52f4ffd..d20d310a7fd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDD90.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDD90.s @@ -99,7 +99,7 @@ lbl_800FDEE0: /* 800FDEEC 000FAE2C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDEF0 000FAE30 C0 5B 05 34 */ lfs f2, 0x534(r27) /* 800FDEF4 000FAE34 38 80 00 00 */ li r4, 0 -/* 800FDEF8 000FAE38 4B FB D8 79 */ bl daAlink_c_NS_setSpecialGravity +/* 800FDEF8 000FAE38 4B FB D8 79 */ bl setSpecialGravity__9daAlink_cFffi /* 800FDEFC 000FAE3C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDF00 000FAE40 D0 1B 04 FC */ stfs f0, 0x4fc(r27) /* 800FDF04 000FAE44 D0 1B 33 98 */ stfs f0, 0x3398(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_800FF450.s b/include/d/d_a/d_a_alink/asm/func_800FF450.s index 29ff6003818..77f468aa03e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF450.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF450.s @@ -21,7 +21,7 @@ lbl_800FF484: /* 800FF49C 000FC3DC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF4A0 000FC3E0 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FF4A4 000FC3E4 38 80 00 00 */ li r4, 0 -/* 800FF4A8 000FC3E8 4B FB C2 C9 */ bl daAlink_c_NS_setSpecialGravity +/* 800FF4A8 000FC3E8 4B FB C2 C9 */ bl setSpecialGravity__9daAlink_cFffi /* 800FF4AC 000FC3EC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF4B0 000FC3F0 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FF4B4 000FC3F4 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FF818.s b/include/d/d_a/d_a_alink/asm/func_800FF818.s index 4f5db0db207..413c2460b8e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF818.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF818.s @@ -14,7 +14,7 @@ /* 800FF84C 000FC78C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF850 000FC790 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FF854 000FC794 38 80 00 00 */ li r4, 0 -/* 800FF858 000FC798 4B FB BF 19 */ bl daAlink_c_NS_setSpecialGravity +/* 800FF858 000FC798 4B FB BF 19 */ bl setSpecialGravity__9daAlink_cFffi /* 800FF85C 000FC79C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF860 000FC7A0 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FF864 000FC7A4 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FFAB0.s b/include/d/d_a/d_a_alink/asm/func_800FFAB0.s index ab93119de7c..a3517ed5440 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFAB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFAB0.s @@ -86,7 +86,7 @@ lbl_800FFBD4: /* 800FFBE0 000FCB20 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FFBE4 000FCB24 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FFBE8 000FCB28 38 80 00 00 */ li r4, 0 -/* 800FFBEC 000FCB2C 4B FB BB 85 */ bl daAlink_c_NS_setSpecialGravity +/* 800FFBEC 000FCB2C 4B FB BB 85 */ bl setSpecialGravity__9daAlink_cFffi /* 800FFBF0 000FCB30 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FFBF4 000FCB34 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FFBF8 000FCB38 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FFDB0.s b/include/d/d_a/d_a_alink/asm/func_800FFDB0.s index 1524919d7e6..b9e9364c8b0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFDB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFDB0.s @@ -63,7 +63,7 @@ lbl_800FFE90: /* 800FFE94 000FCDD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FFE98 000FCDD8 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 800FFE9C 000FCDDC 38 80 00 00 */ li r4, 0 -/* 800FFEA0 000FCDE0 4B FB B8 D1 */ bl daAlink_c_NS_setSpecialGravity +/* 800FFEA0 000FCDE0 4B FB B8 D1 */ bl setSpecialGravity__9daAlink_cFffi /* 800FFEA4 000FCDE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FFEA8 000FCDE8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800FFEAC 000FCDEC D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801000F8.s b/include/d/d_a/d_a_alink/asm/func_801000F8.s index 53721211e14..a6f138597f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_801000F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801000F8.s @@ -38,7 +38,7 @@ lbl_80100174: /* 80100180 000FD0C0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100184 000FD0C4 C0 5D 05 34 */ lfs f2, 0x534(r29) /* 80100188 000FD0C8 38 80 00 00 */ li r4, 0 -/* 8010018C 000FD0CC 4B FB B5 E5 */ bl daAlink_c_NS_setSpecialGravity +/* 8010018C 000FD0CC 4B FB B5 E5 */ bl setSpecialGravity__9daAlink_cFffi /* 80100190 000FD0D0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100194 000FD0D4 D0 1D 04 FC */ stfs f0, 0x4fc(r29) /* 80100198 000FD0D8 D0 1D 33 98 */ stfs f0, 0x3398(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_801003E4.s b/include/d/d_a/d_a_alink/asm/func_801003E4.s index b84adc992fc..012f23bff2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801003E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801003E4.s @@ -12,7 +12,7 @@ /* 80100410 000FD350 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100414 000FD354 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 80100418 000FD358 38 80 00 00 */ li r4, 0 -/* 8010041C 000FD35C 4B FB B3 55 */ bl daAlink_c_NS_setSpecialGravity +/* 8010041C 000FD35C 4B FB B3 55 */ bl setSpecialGravity__9daAlink_cFffi /* 80100420 000FD360 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100424 000FD364 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80100428 000FD368 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80100A10.s b/include/d/d_a/d_a_alink/asm/func_80100A10.s index f2ca6020586..da85c9e5820 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100A10.s +++ b/include/d/d_a/d_a_alink/asm/func_80100A10.s @@ -37,7 +37,7 @@ /* 80100AA0 000FD9E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100AA4 000FD9E4 C0 5C 05 34 */ lfs f2, 0x534(r28) /* 80100AA8 000FD9E8 38 80 00 00 */ li r4, 0 -/* 80100AAC 000FD9EC 4B FB AC C5 */ bl daAlink_c_NS_setSpecialGravity +/* 80100AAC 000FD9EC 4B FB AC C5 */ bl setSpecialGravity__9daAlink_cFffi /* 80100AB0 000FD9F0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100AB4 000FD9F4 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 80100AB8 000FD9F8 D0 1C 04 FC */ stfs f0, 0x4fc(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_80100BB4.s b/include/d/d_a/d_a_alink/asm/func_80100BB4.s index 2736e77ae32..acc7f226b4a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_80100BB4.s @@ -82,7 +82,7 @@ lbl_80100CC0: /* 80100CE8 000FDC28 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100CEC 000FDC2C C0 5E 05 34 */ lfs f2, 0x534(r30) /* 80100CF0 000FDC30 38 80 00 00 */ li r4, 0 -/* 80100CF4 000FDC34 4B FB AA 7D */ bl daAlink_c_NS_setSpecialGravity +/* 80100CF4 000FDC34 4B FB AA 7D */ bl setSpecialGravity__9daAlink_cFffi /* 80100CF8 000FDC38 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100CFC 000FDC3C D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80100D00 000FDC40 D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80100DA4.s b/include/d/d_a/d_a_alink/asm/func_80100DA4.s index 7a930248e55..41b63f3d6c2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100DA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80100DA4.s @@ -65,7 +65,7 @@ lbl_80100E90: /* 80100E94 000FDDD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100E98 000FDDD8 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 80100E9C 000FDDDC 38 80 00 00 */ li r4, 0 -/* 80100EA0 000FDDE0 4B FB A8 D1 */ bl daAlink_c_NS_setSpecialGravity +/* 80100EA0 000FDDE0 4B FB A8 D1 */ bl setSpecialGravity__9daAlink_cFffi /* 80100EA4 000FDDE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100EA8 000FDDE8 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80100EAC 000FDDEC D0 1F 04 FC */ stfs f0, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010121C.s b/include/d/d_a/d_a_alink/asm/func_8010121C.s index 4d8fee4ec32..3c7e7116df6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010121C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010121C.s @@ -32,7 +32,7 @@ lbl_8010126C: /* 80101290 000FE1D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80101294 000FE1D4 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 80101298 000FE1D8 38 80 00 00 */ li r4, 0 -/* 8010129C 000FE1DC 4B FB A4 D5 */ bl daAlink_c_NS_setSpecialGravity +/* 8010129C 000FE1DC 4B FB A4 D5 */ bl setSpecialGravity__9daAlink_cFffi /* 801012A0 000FE1E0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801012A4 000FE1E4 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 801012A8 000FE1E8 D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801013B8.s b/include/d/d_a/d_a_alink/asm/func_801013B8.s index 30f8e3bda23..1fcc7574cd8 100644 --- a/include/d/d_a/d_a_alink/asm/func_801013B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801013B8.s @@ -80,7 +80,7 @@ lbl_801014D8: /* 801014E4 000FE424 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801014E8 000FE428 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 801014EC 000FE42C 38 80 00 00 */ li r4, 0 -/* 801014F0 000FE430 4B FB A2 81 */ bl daAlink_c_NS_setSpecialGravity +/* 801014F0 000FE430 4B FB A2 81 */ bl setSpecialGravity__9daAlink_cFffi /* 801014F4 000FE434 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801014F8 000FE438 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801014FC 000FE43C D0 1F 04 FC */ stfs f0, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801016AC.s b/include/d/d_a/d_a_alink/asm/func_801016AC.s index 6a6495ac6f9..38b7ec9bd25 100644 --- a/include/d/d_a/d_a_alink/asm/func_801016AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801016AC.s @@ -20,7 +20,7 @@ /* 801016F8 000FE638 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801016FC 000FE63C C0 5E 05 34 */ lfs f2, 0x534(r30) /* 80101700 000FE640 38 80 00 00 */ li r4, 0 -/* 80101704 000FE644 4B FB A0 6D */ bl daAlink_c_NS_setSpecialGravity +/* 80101704 000FE644 4B FB A0 6D */ bl setSpecialGravity__9daAlink_cFffi /* 80101708 000FE648 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010170C 000FE64C D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 80101710 000FE650 D0 1E 33 98 */ stfs f0, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801033CC.s b/include/d/d_a/d_a_alink/asm/func_801033CC.s index 4a301b98d80..cf8d39a08cb 100644 --- a/include/d/d_a/d_a_alink/asm/func_801033CC.s +++ b/include/d/d_a/d_a_alink/asm/func_801033CC.s @@ -172,7 +172,7 @@ lbl_80103618: /* 80103638 00100578 48 00 00 40 */ b lbl_80103678 lbl_8010363C: /* 8010363C 0010057C 7F C3 F3 78 */ mr r3, r30 -/* 80103640 00100580 4B FB 7D C9 */ bl daAlink_c_NS_checkMagicArmorHeavy +/* 80103640 00100580 4B FB 7D C9 */ bl checkMagicArmorHeavy__9daAlink_cCFv /* 80103644 00100584 2C 03 00 00 */ cmpwi r3, 0 /* 80103648 00100588 41 82 00 2C */ beq lbl_80103674 /* 8010364C 0010058C 80 1E 05 70 */ lwz r0, 0x570(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80104958.s b/include/d/d_a/d_a_alink/asm/func_80104958.s index a1497479656..fc526ae90cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104958.s +++ b/include/d/d_a/d_a_alink/asm/func_80104958.s @@ -9,7 +9,7 @@ /* 80104978 001018B8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010497C 001018BC C0 5F 05 34 */ lfs f2, 0x534(r31) /* 80104980 001018C0 38 80 00 00 */ li r4, 0 -/* 80104984 001018C4 4B FB 6D ED */ bl daAlink_c_NS_setSpecialGravity +/* 80104984 001018C4 4B FB 6D ED */ bl setSpecialGravity__9daAlink_cFffi /* 80104988 001018C8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010498C 001018CC D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80104990 001018D0 80 1F 05 70 */ lwz r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BD90.s b/include/d/d_a/d_a_alink/asm/func_8010BD90.s index b02f4241ecb..a6204a2b514 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BD90.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BD90.s @@ -26,7 +26,7 @@ lbl_8010BDDC: /* 8010BDEC 00108D2C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010BDF0 00108D30 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8010BDF4 00108D34 38 80 00 00 */ li r4, 0 -/* 8010BDF8 00108D38 4B FA F9 79 */ bl daAlink_c_NS_setSpecialGravity +/* 8010BDF8 00108D38 4B FA F9 79 */ bl setSpecialGravity__9daAlink_cFffi /* 8010BDFC 00108D3C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010BE00 00108D40 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010BE04 00108D44 D0 1F 04 FC */ stfs f0, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010C830.s b/include/d/d_a/d_a_alink/asm/func_8010C830.s index a22044960c6..29d6ad49a7e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010C830.s +++ b/include/d/d_a/d_a_alink/asm/func_8010C830.s @@ -85,7 +85,7 @@ lbl_8010C95C: /* 8010C970 001098B0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010C974 001098B4 C0 5C 05 34 */ lfs f2, 0x534(r28) /* 8010C978 001098B8 38 80 00 00 */ li r4, 0 -/* 8010C97C 001098BC 4B FA ED F5 */ bl daAlink_c_NS_setSpecialGravity +/* 8010C97C 001098BC 4B FA ED F5 */ bl setSpecialGravity__9daAlink_cFffi /* 8010C980 001098C0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010C984 001098C4 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 8010C988 001098C8 D0 1C 04 FC */ stfs f0, 0x4fc(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_8010CC80.s b/include/d/d_a/d_a_alink/asm/func_8010CC80.s index 1803a309671..4cd4dbce9cf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CC80.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CC80.s @@ -23,7 +23,7 @@ lbl_8010CCBC: /* 8010CCD4 00109C14 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010CCD8 00109C18 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 8010CCDC 00109C1C 38 80 00 00 */ li r4, 0 -/* 8010CCE0 00109C20 4B FA EA 91 */ bl daAlink_c_NS_setSpecialGravity +/* 8010CCE0 00109C20 4B FA EA 91 */ bl setSpecialGravity__9daAlink_cFffi /* 8010CCE4 00109C24 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010CCE8 00109C28 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8010CCEC 00109C2C D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8010CF6C.s b/include/d/d_a/d_a_alink/asm/func_8010CF6C.s index 7eca9d4905c..7c6f1a8870a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CF6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CF6C.s @@ -24,7 +24,7 @@ lbl_8010CFA8: /* 8010CFC4 00109F04 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010CFC8 00109F08 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 8010CFCC 00109F0C 38 80 00 00 */ li r4, 0 -/* 8010CFD0 00109F10 4B FA E7 A1 */ bl daAlink_c_NS_setSpecialGravity +/* 8010CFD0 00109F10 4B FA E7 A1 */ bl setSpecialGravity__9daAlink_cFffi /* 8010CFD4 00109F14 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010CFD8 00109F18 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8010CFDC 00109F1C D0 1E 04 FC */ stfs f0, 0x4fc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D174.s b/include/d/d_a/d_a_alink/asm/func_8010D174.s index 843e6fb672a..838726c7794 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D174.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D174.s @@ -118,7 +118,7 @@ lbl_8010D310: /* 8010D338 0010A278 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D33C 0010A27C C0 5D 05 34 */ lfs f2, 0x534(r29) /* 8010D340 0010A280 38 80 00 00 */ li r4, 0 -/* 8010D344 0010A284 4B FA E4 2D */ bl daAlink_c_NS_setSpecialGravity +/* 8010D344 0010A284 4B FA E4 2D */ bl setSpecialGravity__9daAlink_cFffi /* 8010D348 0010A288 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D34C 0010A28C D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 8010D350 0010A290 D0 1D 04 FC */ stfs f0, 0x4fc(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D5F4.s b/include/d/d_a/d_a_alink/asm/func_8010D5F4.s index a4dc0f90610..aac2e75eb56 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D5F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D5F4.s @@ -21,7 +21,7 @@ lbl_8010D628: /* 8010D640 0010A580 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D644 0010A584 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8010D648 0010A588 38 80 00 00 */ li r4, 0 -/* 8010D64C 0010A58C 4B FA E1 25 */ bl daAlink_c_NS_setSpecialGravity +/* 8010D64C 0010A58C 4B FA E1 25 */ bl setSpecialGravity__9daAlink_cFffi /* 8010D650 0010A590 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D654 0010A594 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010D658 0010A598 D0 1F 04 FC */ stfs f0, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010DE78.s b/include/d/d_a/d_a_alink/asm/func_8010DE78.s index 3f17aa25e37..6340800ac07 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DE78.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DE78.s @@ -26,7 +26,7 @@ lbl_8010DEA4: /* 8010DED8 0010AE18 7F E3 FB 78 */ mr r3, r31 /* 8010DEDC 0010AE1C C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8010DEE0 0010AE20 38 80 00 00 */ li r4, 0 -/* 8010DEE4 0010AE24 4B FA D8 8D */ bl daAlink_c_NS_setSpecialGravity +/* 8010DEE4 0010AE24 4B FA D8 8D */ bl setSpecialGravity__9daAlink_cFffi /* 8010DEE8 0010AE28 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010DEEC 0010AE2C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010DEF0 0010AE30 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011BC74.s b/include/d/d_a/d_a_alink/asm/func_8011BC74.s index e343b4d0cb8..31707b96ff4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BC74.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BC74.s @@ -16,7 +16,7 @@ lbl_8011BCA0: /* 8011BCAC 00118BEC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BCB0 00118BF0 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8011BCB4 00118BF4 38 80 00 00 */ li r4, 0 -/* 8011BCB8 00118BF8 4B F9 FA B9 */ bl daAlink_c_NS_setSpecialGravity +/* 8011BCB8 00118BF8 4B F9 FA B9 */ bl setSpecialGravity__9daAlink_cFffi /* 8011BCBC 00118BFC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BCC0 00118C00 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 8011BCC4 00118C04 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011C904.s b/include/d/d_a/d_a_alink/asm/func_8011C904.s index d946f0153e7..1270bb6a9c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C904.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C904.s @@ -43,7 +43,7 @@ lbl_8011C990: /* 8011C99C 001198DC 7F C3 F3 78 */ mr r3, r30 /* 8011C9A0 001198E0 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 8011C9A4 001198E4 38 80 00 00 */ li r4, 0 -/* 8011C9A8 001198E8 4B F9 ED C9 */ bl daAlink_c_NS_setSpecialGravity +/* 8011C9A8 001198E8 4B F9 ED C9 */ bl setSpecialGravity__9daAlink_cFffi /* 8011C9AC 001198EC 38 00 00 00 */ li r0, 0 /* 8011C9B0 001198F0 B0 1E 05 A0 */ sth r0, 0x5a0(r30) /* 8011C9B4 001198F4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011D6D0.s b/include/d/d_a/d_a_alink/asm/func_8011D6D0.s index 17ca555e967..d518ab63fd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D6D0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D6D0.s @@ -57,7 +57,7 @@ lbl_8011D794: /* 8011D7A4 0011A6E4 7F E3 FB 78 */ mr r3, r31 /* 8011D7A8 0011A6E8 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8011D7AC 0011A6EC 38 80 00 00 */ li r4, 0 -/* 8011D7B0 0011A6F0 4B F9 DF C1 */ bl daAlink_c_NS_setSpecialGravity +/* 8011D7B0 0011A6F0 4B F9 DF C1 */ bl setSpecialGravity__9daAlink_cFffi /* 8011D7B4 0011A6F4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011D7B8 0011A6F8 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 8011D7BC 0011A6FC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011DB04.s b/include/d/d_a/d_a_alink/asm/func_8011DB04.s index bff16f41367..b1fc5ca0e4a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DB04.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DB04.s @@ -19,7 +19,7 @@ lbl_8011DB30: /* 8011DB48 0011AA88 7F E3 FB 78 */ mr r3, r31 /* 8011DB4C 0011AA8C C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8011DB50 0011AA90 38 80 00 00 */ li r4, 0 -/* 8011DB54 0011AA94 4B F9 DC 1D */ bl daAlink_c_NS_setSpecialGravity +/* 8011DB54 0011AA94 4B F9 DC 1D */ bl setSpecialGravity__9daAlink_cFffi /* 8011DB58 0011AA98 7F E3 FB 78 */ mr r3, r31 /* 8011DB5C 0011AA9C 38 80 00 00 */ li r4, 0 /* 8011DB60 0011AAA0 38 A0 00 01 */ li r5, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F084.s b/include/d/d_a/d_a_alink/asm/func_8011F084.s index 34fd46df767..2c81e93636b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F084.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F084.s @@ -17,7 +17,7 @@ lbl_8011F0B0: /* 8011F0C0 0011C000 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011F0C4 0011C004 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8011F0C8 0011C008 38 80 00 00 */ li r4, 0 -/* 8011F0CC 0011C00C 4B F9 C6 A5 */ bl daAlink_c_NS_setSpecialGravity +/* 8011F0CC 0011C00C 4B F9 C6 A5 */ bl setSpecialGravity__9daAlink_cFffi /* 8011F0D0 0011C010 38 00 00 00 */ li r0, 0 /* 8011F0D4 0011C014 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8011F0D8 0011C018 B0 1F 30 10 */ sth r0, 0x3010(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F360.s b/include/d/d_a/d_a_alink/asm/func_8011F360.s index 3106d0c58f4..b4664b72dfe 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F360.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F360.s @@ -9,7 +9,7 @@ /* 8011F380 0011C2C0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011F384 0011C2C4 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8011F388 0011C2C8 38 80 00 00 */ li r4, 0 -/* 8011F38C 0011C2CC 4B F9 C3 E5 */ bl daAlink_c_NS_setSpecialGravity +/* 8011F38C 0011C2CC 4B F9 C3 E5 */ bl setSpecialGravity__9daAlink_cFffi /* 8011F390 0011C2D0 7F E3 FB 78 */ mr r3, r31 /* 8011F394 0011C2D4 38 80 00 19 */ li r4, 0x19 /* 8011F398 0011C2D8 3C A0 80 39 */ lis r5, lbl_8038D6BC@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8011FD4C.s b/include/d/d_a/d_a_alink/asm/func_8011FD4C.s index d2ca5f21a38..5b27f96188a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011FD4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011FD4C.s @@ -232,7 +232,7 @@ lbl_80120088: /* 8012009C 0011CFDC 7F 83 E3 78 */ mr r3, r28 /* 801200A0 0011CFE0 C0 5C 05 34 */ lfs f2, 0x534(r28) /* 801200A4 0011CFE4 38 80 00 00 */ li r4, 0 -/* 801200A8 0011CFE8 4B F9 B6 C9 */ bl daAlink_c_NS_setSpecialGravity +/* 801200A8 0011CFE8 4B F9 B6 C9 */ bl setSpecialGravity__9daAlink_cFffi /* 801200AC 0011CFEC 38 00 00 01 */ li r0, 1 /* 801200B0 0011CFF0 B0 1C 30 0A */ sth r0, 0x300a(r28) lbl_801200B4: diff --git a/include/d/d_a/d_a_alink/asm/func_80120124.s b/include/d/d_a/d_a_alink/asm/func_80120124.s index afdd6259315..da422e23401 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120124.s +++ b/include/d/d_a/d_a_alink/asm/func_80120124.s @@ -26,7 +26,7 @@ lbl_8012017C: lbl_80120184: /* 80120184 0011D0C4 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 80120188 0011D0C8 38 80 00 01 */ li r4, 1 -/* 8012018C 0011D0CC 4B F9 B5 E5 */ bl daAlink_c_NS_setSpecialGravity +/* 8012018C 0011D0CC 4B F9 B5 E5 */ bl setSpecialGravity__9daAlink_cFffi lbl_80120190: /* 80120190 0011D0D0 80 1E 06 14 */ lwz r0, 0x614(r30) /* 80120194 0011D0D4 28 00 00 2D */ cmplwi r0, 0x2d diff --git a/include/d/d_a/d_a_alink/asm/func_80131C74.s b/include/d/d_a/d_a_alink/asm/func_80131C74.s index 2c718d068aa..34f267b7bde 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131C74.s +++ b/include/d/d_a/d_a_alink/asm/func_80131C74.s @@ -32,7 +32,7 @@ lbl_80131CE8: /* 80131CEC 0012EC2C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80131CF0 0012EC30 C0 5C 05 34 */ lfs f2, 0x534(r28) /* 80131CF4 0012EC34 38 80 00 00 */ li r4, 0 -/* 80131CF8 0012EC38 4B F8 9A 79 */ bl daAlink_c_NS_setSpecialGravity +/* 80131CF8 0012EC38 4B F8 9A 79 */ bl setSpecialGravity__9daAlink_cFffi /* 80131CFC 0012EC3C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80131D00 0012EC40 D0 3C 04 FC */ stfs f1, 0x4fc(r28) /* 80131D04 0012EC44 2C 1E 00 00 */ cmpwi r30, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80132738.s b/include/d/d_a/d_a_alink/asm/func_80132738.s index c54d8144916..562ddfdf1f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132738.s +++ b/include/d/d_a/d_a_alink/asm/func_80132738.s @@ -112,7 +112,7 @@ lbl_801328A8: /* 801328D4 0012F814 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801328D8 0012F818 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 801328DC 0012F81C 38 80 00 00 */ li r4, 0 -/* 801328E0 0012F820 4B F8 8E 91 */ bl daAlink_c_NS_setSpecialGravity +/* 801328E0 0012F820 4B F8 8E 91 */ bl setSpecialGravity__9daAlink_cFffi /* 801328E4 0012F824 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801328E8 0012F828 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 801328EC 0012F82C D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80132D68.s b/include/d/d_a/d_a_alink/asm/func_80132D68.s index 2c01345f0aa..2c17c7c608a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132D68.s +++ b/include/d/d_a/d_a_alink/asm/func_80132D68.s @@ -21,7 +21,7 @@ /* 80132DB8 0012FCF8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80132DBC 0012FCFC C0 5F 05 34 */ lfs f2, 0x534(r31) /* 80132DC0 0012FD00 38 80 00 00 */ li r4, 0 -/* 80132DC4 0012FD04 4B F8 89 AD */ bl daAlink_c_NS_setSpecialGravity +/* 80132DC4 0012FD04 4B F8 89 AD */ bl setSpecialGravity__9daAlink_cFffi /* 80132DC8 0012FD08 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80132DCC 0012FD0C D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80132DD0 0012FD10 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80133054.s b/include/d/d_a/d_a_alink/asm/func_80133054.s index f525c35cbc5..df0064befcd 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133054.s +++ b/include/d/d_a/d_a_alink/asm/func_80133054.s @@ -39,7 +39,7 @@ lbl_801330D0: /* 801330E4 00130024 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801330E8 00130028 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 801330EC 0013002C 38 80 00 00 */ li r4, 0 -/* 801330F0 00130030 4B F8 86 81 */ bl daAlink_c_NS_setSpecialGravity +/* 801330F0 00130030 4B F8 86 81 */ bl setSpecialGravity__9daAlink_cFffi /* 801330F4 00130034 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801330F8 00130038 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 801330FC 0013003C A8 1E 04 E6 */ lha r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013384C.s b/include/d/d_a/d_a_alink/asm/func_8013384C.s index bcd4a637f24..8dba45f0968 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013384C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013384C.s @@ -27,7 +27,7 @@ lbl_80133898: /* 801338B0 001307F0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801338B4 001307F4 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 801338B8 001307F8 38 80 00 00 */ li r4, 0 -/* 801338BC 001307FC 4B F8 7E B5 */ bl daAlink_c_NS_setSpecialGravity +/* 801338BC 001307FC 4B F8 7E B5 */ bl setSpecialGravity__9daAlink_cFffi /* 801338C0 00130800 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801338C4 00130804 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 801338C8 00130808 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80134000.s b/include/d/d_a/d_a_alink/asm/func_80134000.s index c97956d5ffd..81d662cc94f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134000.s +++ b/include/d/d_a/d_a_alink/asm/func_80134000.s @@ -467,7 +467,7 @@ lbl_80134658: /* 801346A0 001315E0 EC 22 00 24 */ fdivs f1, f2, f0 /* 801346A4 001315E4 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 801346A8 001315E8 38 80 00 00 */ li r4, 0 -/* 801346AC 001315EC 4B F8 70 C5 */ bl daAlink_c_NS_setSpecialGravity +/* 801346AC 001315EC 4B F8 70 C5 */ bl setSpecialGravity__9daAlink_cFffi /* 801346B0 001315F0 C0 22 97 3C */ lfs f1, lbl_8045313C-_SDA2_BASE_(r2) /* 801346B4 001315F4 C0 1E 05 30 */ lfs f0, 0x530(r30) /* 801346B8 001315F8 EC 21 00 32 */ fmuls f1, f1, f0 @@ -500,7 +500,7 @@ lbl_801346E0: /* 8013471C 0013165C EC 22 00 24 */ fdivs f1, f2, f0 /* 80134720 00131660 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 80134724 00131664 38 80 00 00 */ li r4, 0 -/* 80134728 00131668 4B F8 70 49 */ bl daAlink_c_NS_setSpecialGravity +/* 80134728 00131668 4B F8 70 49 */ bl setSpecialGravity__9daAlink_cFffi /* 8013472C 0013166C C0 1E 05 30 */ lfs f0, 0x530(r30) /* 80134730 00131670 FC 40 00 50 */ fneg f2, f0 /* 80134734 00131674 A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -534,7 +534,7 @@ lbl_80134768: /* 801347A0 001316E0 EC 22 00 24 */ fdivs f1, f2, f0 /* 801347A4 001316E4 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 801347A8 001316E8 38 80 00 00 */ li r4, 0 -/* 801347AC 001316EC 4B F8 6F C5 */ bl daAlink_c_NS_setSpecialGravity +/* 801347AC 001316EC 4B F8 6F C5 */ bl setSpecialGravity__9daAlink_cFffi /* 801347B0 001316F0 38 00 00 01 */ li r0, 1 /* 801347B4 001316F4 B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_801347B8: diff --git a/include/d/d_a/d_a_alink/asm/func_80134838.s b/include/d/d_a/d_a_alink/asm/func_80134838.s index 8eaa3329f44..5f221a6a772 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134838.s +++ b/include/d/d_a/d_a_alink/asm/func_80134838.s @@ -306,7 +306,7 @@ lbl_80134C24: /* 80134C8C 00131BCC 7F A3 EB 78 */ mr r3, r29 /* 80134C90 00131BD0 C0 5D 05 34 */ lfs f2, 0x534(r29) /* 80134C94 00131BD4 38 80 00 00 */ li r4, 0 -/* 80134C98 00131BD8 4B F8 6A D9 */ bl daAlink_c_NS_setSpecialGravity +/* 80134C98 00131BD8 4B F8 6A D9 */ bl setSpecialGravity__9daAlink_cFffi /* 80134C9C 00131BDC 38 00 00 04 */ li r0, 4 /* 80134CA0 00131BE0 98 1D 2F 9D */ stb r0, 0x2f9d(r29) /* 80134CA4 00131BE4 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_8013A7EC.s b/include/d/d_a/d_a_alink/asm/func_8013A7EC.s index 11d05a8737f..ab933021517 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A7EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A7EC.s @@ -17,7 +17,7 @@ /* 8013A82C 0013776C 7F E3 FB 78 */ mr r3, r31 /* 8013A830 00137770 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8013A834 00137774 38 80 00 00 */ li r4, 0 -/* 8013A838 00137778 4B F8 0F 39 */ bl daAlink_c_NS_setSpecialGravity +/* 8013A838 00137778 4B F8 0F 39 */ bl setSpecialGravity__9daAlink_cFffi /* 8013A83C 0013777C 7F E3 FB 78 */ mr r3, r31 /* 8013A840 00137780 3C 80 00 01 */ lis r4, 0x00010038@ha /* 8013A844 00137784 38 84 00 38 */ addi r4, r4, 0x00010038@l diff --git a/include/d/d_a/d_a_alink/asm/func_8013BE24.s b/include/d/d_a/d_a_alink/asm/func_8013BE24.s index d319e640dcd..556cdb1980d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BE24.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BE24.s @@ -333,7 +333,7 @@ lbl_8013C2B0: /* 8013C2CC 0013920C EC 21 00 24 */ fdivs f1, f1, f0 /* 8013C2D0 00139210 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8013C2D4 00139214 38 80 00 00 */ li r4, 0 -/* 8013C2D8 00139218 4B F7 F4 99 */ bl daAlink_c_NS_setSpecialGravity +/* 8013C2D8 00139218 4B F7 F4 99 */ bl setSpecialGravity__9daAlink_cFffi /* 8013C2DC 0013921C C0 1F 05 30 */ lfs f0, 0x530(r31) /* 8013C2E0 00139220 FC 00 00 50 */ fneg f0, f0 /* 8013C2E4 00139224 EC 00 07 F2 */ fmuls f0, f0, f31 diff --git a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s index 9d5000fe81c..f7e498ac73c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s @@ -72,7 +72,7 @@ lbl_8013C4BC: /* 8013C4E8 00139428 C0 24 00 48 */ lfs f1, 0x48(r4) /* 8013C4EC 0013942C C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8013C4F0 00139430 38 80 00 00 */ li r4, 0 -/* 8013C4F4 00139434 4B F7 F2 7D */ bl daAlink_c_NS_setSpecialGravity +/* 8013C4F4 00139434 4B F7 F2 7D */ bl setSpecialGravity__9daAlink_cFffi /* 8013C4F8 00139438 48 00 00 28 */ b lbl_8013C520 lbl_8013C4FC: /* 8013C4FC 0013943C C0 1F 33 98 */ lfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013CCF4.s b/include/d/d_a/d_a_alink/asm/func_8013CCF4.s index 2fd5c389489..6b5b8fa2a46 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CCF4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CCF4.s @@ -17,7 +17,7 @@ /* 8013CD34 00139C74 7F E3 FB 78 */ mr r3, r31 /* 8013CD38 00139C78 C0 5F 05 34 */ lfs f2, 0x534(r31) /* 8013CD3C 00139C7C 38 80 00 00 */ li r4, 0 -/* 8013CD40 00139C80 4B F7 EA 31 */ bl daAlink_c_NS_setSpecialGravity +/* 8013CD40 00139C80 4B F7 EA 31 */ bl setSpecialGravity__9daAlink_cFffi /* 8013CD44 00139C84 7F E3 FB 78 */ mr r3, r31 /* 8013CD48 00139C88 80 9F 28 20 */ lwz r4, 0x2820(r31) /* 8013CD4C 00139C8C 4B FF C8 B5 */ bl daAlink_c_NS_setWolfEnemyHangBitePos diff --git a/include/d/d_a/d_a_alink/asm/func_8013DB6C.s b/include/d/d_a/d_a_alink/asm/func_8013DB6C.s index d4a13007e93..0b3cc0fc024 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DB6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DB6C.s @@ -17,7 +17,7 @@ lbl_8013DB9C: /* 8013DBA8 0013AAE8 7F C3 F3 78 */ mr r3, r30 /* 8013DBAC 0013AAEC C0 5E 05 34 */ lfs f2, 0x534(r30) /* 8013DBB0 0013AAF0 38 80 00 00 */ li r4, 0 -/* 8013DBB4 0013AAF4 4B F7 DB BD */ bl daAlink_c_NS_setSpecialGravity +/* 8013DBB4 0013AAF4 4B F7 DB BD */ bl setSpecialGravity__9daAlink_cFffi /* 8013DBB8 0013AAF8 88 1E 05 6A */ lbz r0, 0x56a(r30) /* 8013DBBC 0013AAFC 28 00 00 2C */ cmplwi r0, 0x2c /* 8013DBC0 0013AB00 40 82 00 14 */ bne lbl_8013DBD4 diff --git a/include/d/d_a/d_a_alink/asm/func_8013E6C0.s b/include/d/d_a/d_a_alink/asm/func_8013E6C0.s index 1ce20764b28..a8d0ad822ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E6C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E6C0.s @@ -28,7 +28,7 @@ /* 8013E72C 0013B66C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013E730 0013B670 C0 5E 05 34 */ lfs f2, 0x534(r30) /* 8013E734 0013B674 38 80 00 00 */ li r4, 0 -/* 8013E738 0013B678 4B F7 D0 39 */ bl daAlink_c_NS_setSpecialGravity +/* 8013E738 0013B678 4B F7 D0 39 */ bl setSpecialGravity__9daAlink_cFffi /* 8013E73C 0013B67C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013E740 0013B680 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 8013E744 0013B684 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013F4A8.s b/include/d/d_a/d_a_alink/asm/func_8013F4A8.s index bb986f0bc3a..0deed382aa7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F4A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F4A8.s @@ -185,7 +185,7 @@ lbl_8013F6C0: /* 8013F754 0013C694 7F A3 EB 78 */ mr r3, r29 /* 8013F758 0013C698 C0 5D 05 34 */ lfs f2, 0x534(r29) /* 8013F75C 0013C69C 38 80 00 00 */ li r4, 0 -/* 8013F760 0013C6A0 4B F7 C0 11 */ bl daAlink_c_NS_setSpecialGravity +/* 8013F760 0013C6A0 4B F7 C0 11 */ bl setSpecialGravity__9daAlink_cFffi /* 8013F764 0013C6A4 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 8013F768 0013C6A8 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 8013F76C 0013C6AC D0 1D 35 88 */ stfs f0, 0x3588(r29) diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h index 20f3a10d21e..a338412e4f8 100644 --- a/include/d/d_a/d_a_alink/d_a_alink.h +++ b/include/d/d_a/d_a_alink/d_a_alink.h @@ -44,6 +44,12 @@ struct csXyz { // move later class daAlink_c { public: + // inlines + void dComIfGp_setZStatus(u8 status, u8 unk) { + g_dComIfG_gameInfo.getPlay().setZStatus(status, unk); + } + + // member functions u32 getE3Zhint(void); const char* getAlinkArcName(void); u32 checkStageName(const char*); @@ -196,9 +202,28 @@ public: void setPlayerPosAndAngle(float (*)[4]); u32 itemTriggerCheck(u8); u32 itemButtonCheck(u8); + /*---*/ + BOOL checkMagicArmorHeavy(void) const; + BOOL checkBootsOrArmorHeavy(void) const; + void setSpecialGravity(float, float, int); + int checkMagicArmorWearAbility(void) const; + void onFrollCrashFlg(u8, int); + void setMidnaTalkStatus(u8); private: - u8 unk[14268]; + u8 unk[1328]; + float unk1328; + float unk1332; + u8 unk1336[56]; + u32 unk1392; + u32 unk1396; + u32 unk1400; + u32 unk1404; + u8 unk1408[6716]; + u16 unk8124; + u8 unk8126[4070]; + u8 unk12196; + u8 unk12197[2071]; }; class daMidna_c { diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index e26f1357d07..b96e176e677 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -68,6 +68,10 @@ public: u8& getUnkHeart() { return unk_heart; } void setUnkWarashibe1(u8 num) { field_0x4ec0[0x85] = num; } void setUnkWarashibe2(u8 num) { field_0x4ec0[0x86] = num; } + void setZStatus(u8 status, u8 unk) { + field_0x4ec0[0x3B] = status; + field_0x4ec0[0x56] = unk; + } private: /* 0x00000 */ dBgS dbgs; diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 300f4e4d649..a6555f9aadf 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -327,6 +327,7 @@ public: int isMagicFlag(u8) const; u16& getCurrentHealth() { return mCurrentHealth; } + u16& getCurrentRupees() { return mCurrentRupees; } u16& getCurrentLanternOil() { return mCurrentLanternOil; } u8& getScent() { return mEquipment[3]; } void setWalletLV(u8 lv) { mCurrentWallet = lv; } diff --git a/include/functions.h b/include/functions.h index 501ab1bf90e..4f4655bc082 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1878,7 +1878,7 @@ void daAlink_c_NS_midnaTalkTrigger(void); void daAlink_c_NS_checkForceSwordSwing(void); void daPy_py_c_NS_checkBoarSingleBattle(void); void func_800F6E44(void); -void daAlink_c_NS_checkMagicArmorWearAbility(void); +int checkMagicArmorWearAbility__9daAlink_cCFv(void); void mDoExt_bckAnm_NS_entry(void); void func_8011D8F8(void); void func_80120DB0(void); @@ -1901,7 +1901,7 @@ void daAlink_c_NS_setAttentionPos(void); void daAlink_c_NS_procHangReadyInit(void); void daAlink_c_NS_checkClimbMoveUpDownProc(void); void func_8012E684(void); -void daAlink_c_NS_setSpecialGravity(void); +void setSpecialGravity__9daAlink_cFffi(float, float, int); void daAlink_c_NS_procFallInit(void); void daAlink_c_NS_getBoomerangActor(void); void func_800DE770(void); @@ -2481,7 +2481,7 @@ void dComIfGp_TargetWarpPt_get(void); void daAlink_c_NS_stopHalfMoveAnime(void); void daAlink_c_NS_checkCutJumpInFly(void); void daAlink_c_NS_checkReadyItem(void); -void daAlink_c_NS_setMidnaTalkStatus(void); +void setMidnaTalkStatus__9daAlink_cFUc(u8); void daAlink_c_NS_notTalk(void); void func_800FAE14(void); void func_800E3A14(void); @@ -2879,7 +2879,7 @@ void func_800C397C(void); void daAlink_c_NS_setCrawlMoveAngle(void); void func_8011D82C(void); void daAlink_c_NS_procCoElecDamageInit(void); -void daAlink_c_NS_checkMagicArmorHeavy(void); +BOOL checkMagicArmorHeavy__9daAlink_cCFv(void); void fopKyM_create(void); void daAlink_c_NS_commonMagneLineCheck(void); void func_800F22A8(void); @@ -2956,7 +2956,6 @@ void daAlink_c_NS_posMove(void); void dBgS_NS_GetHorseNoEntry(void); void func_800EC170(void); void dRes_info_c_NS_onWarpMaterial(void); -void func_800C1DE0(void); void daAlink_c_NS_setHookshotPos(void); void func_800D0AC8(void); void daAlink_c_NS_modelDraw(void); @@ -3506,7 +3505,6 @@ void daAlink_c_NS_stickArrowIncrement(void); void daAlink_c_NS_backJumpSpeedDec(void); void func_801418E4(void); void daAlink_c_NS_setSingleAnimeBaseSpeed(void); -void func_800BB458(void); void daAlink_c_NS_getDemoLookActor(void); void dScnKy_env_light_c_NS_setLightTevColorType_MAJI(void); void daAlink_c_NS_commonGrabPutInit(void); diff --git a/ldscript.lcf b/ldscript.lcf index 2b045ae4987..bf73e58582a 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -2126,13 +2126,13 @@ func_800C3504 func_800C3338 func_800C30F0 func_800C2EAC -func_800C1DE0 +onFrollCrashFlg__9daAlink_cFUci func_800C1DAC func_800BF15C func_800BF124 func_800BF084 func_800BB560 -func_800BB458 +checkBootsOrArmorHeavy__9daAlink_cCFv func_800B4928 func_800B4918 func_800B4908 diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index 1c71ed79426..f389ef33d11 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -1751,23 +1751,29 @@ asm void daAlink_c_NS_setBodyAngleXReadyAnime(void) { // setMagicArmorBrk__9daAlink_cFi // daAlink_c::setMagicArmorBrk(int) -asm void daAlink_c_NS_setMagicArmorBrk(void) { - nofralloc +asm void daAlink_c_NS_setMagicArmorBrk(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800BB324.s" } -// checkMagicArmorHeavy__9daAlink_cCFv -// daAlink_c::checkMagicArmorHeavy(const void) -asm void daAlink_c_NS_checkMagicArmorHeavy(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800BB408.s" +BOOL daAlink_c::checkMagicArmorHeavy(void) const { + BOOL check = FALSE; + + if (checkMagicArmorWearAbility() != 0 && + g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getCurrentRupees() == 0) { + check = TRUE; + } + + return (u8)check; } -// checkBootsOrArmorHeavy__9daAlink_cCFv -// daAlink_c::checkBootsOrArmorHeavy(const void) -asm void func_800BB458(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800BB458.s" +BOOL daAlink_c::checkBootsOrArmorHeavy(void) const { + BOOL check = FALSE; + + if ((unk1392 & 0x2000000) != 0 || checkMagicArmorHeavy() != FALSE || unk8124 == 0x19C) { + check = TRUE; + } + + return (u8)check; } // checkHeavyStateOn__9daAlink_cFii @@ -1791,11 +1797,14 @@ asm void daAlink_c_NS_initGravity(void) { #include "d/d_a/d_a_alink/asm/func_800BB644.s" } -// setSpecialGravity__9daAlink_cFffi -// daAlink_c::setSpecialGravity(float, float, int) -asm void daAlink_c_NS_setSpecialGravity(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800BB770.s" +void daAlink_c::setSpecialGravity(float param1, float param2, int param3) { + if (param3 != 0) { + unk1404 &= ~0x4000; + } else { + unk1404 |= 0x4000; + } + unk1328 = param1; + unk1332 = param2; } // transAnimeProc__9daAlink_cFP4cXyzff @@ -2016,10 +2025,29 @@ asm void daAlink_c_NS_checkZoraWearAbility(void) { // checkMagicArmorWearAbility__9daAlink_cCFv // daAlink_c::checkMagicArmorWearAbility(const void) -asm void daAlink_c_NS_checkMagicArmorWearAbility(void) { +// close +#ifdef NONMATCHING +int daAlink_c::checkMagicArmorWearAbility(void) const { + bool uvar = false; + bool bvar = false; + + if ((unk1396 & 0x2000000) == 0) { + if (g_dComIfG_gameInfo.info.getSaveFile().getPlayer().getPlayerStatusA().getEquipment(0) == + 48) { + bvar = true; + } + } + if (bvar && (unk1400 & 0x80000) == 0) { + uvar = true; + } + return uvar; +} +#else +asm int daAlink_c::checkMagicArmorWearAbility(void) const { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFDFC.s" } +#endif // loadAramBmd__9daAlink_cFUsUl // daAlink_c::loadAramBmd(unsigned short, unsigned long) @@ -2217,13 +2245,15 @@ asm void func_800C1DAC(void) { #include "d/d_a/d_a_alink/asm/func_800C1DAC.s" } -// onFrollCrashFlg__9daAlink_cFUci -// daAlink_c::onFrollCrashFlg(unsigned char, int) -asm void func_800C1DE0(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800C1DE0.s" +void daAlink_c::onFrollCrashFlg(u8 param1, int param2) { + if (param2 != 0) { + unk1392 |= 16; + } else { + unk1392 |= 8; + } + unk12196 = param1; } - +// // changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE asm void daAlink_c_NS_changeWarpMaterial(void) { nofralloc @@ -3232,11 +3262,8 @@ asm void daAlink_c_NS_checkSpecialDemoMode(void) { #include "d/d_a/d_a_alink/asm/func_800D0138.s" } -// setMidnaTalkStatus__9daAlink_cFUc -// daAlink_c::setMidnaTalkStatus(unsigned char) -asm void daAlink_c_NS_setMidnaTalkStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800D014C.s" +void daAlink_c::setMidnaTalkStatus(u8 status) { + dComIfGp_setZStatus(status, 0); } // set3DStatus__9daAlink_cFUcUc