From 8bd3d07e23ff7000de063008d73dba4a6d3434d1 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 9 Jan 2021 16:59:35 -0800 Subject: [PATCH] more daalink / d_item improvements (#79) * some daalink funcs * more d_item inlines / setShieldChange * more daalink stuff getlife, getrstatus, setitemlifecount, getrupee, setitemrupeecount * format * format --- asm/d/menu/d_menu_collect.s | 6 +- include/d/d_a/d_a_alink/asm/func_800B02BC.s | 6 +- include/d/d_a/d_a_alink/asm/func_800B25CC.s | 7 - include/d/d_a/d_a_alink/asm/func_800B25E8.s | 7 - include/d/d_a/d_a_alink/asm/func_800B2604.s | 12 - include/d/d_a/d_a_alink/asm/func_800B2634.s | 12 - include/d/d_a/d_a_alink/asm/func_800B2664.s | 9 - include/d/d_a/d_a_alink/asm/func_800B2688.s | 9 - include/d/d_a/d_a_alink/asm/func_800B26AC.s | 3 - include/d/d_a/d_a_alink/asm/func_800B26B8.s | 9 - include/d/d_a/d_a_alink/asm/func_800B26DC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B26FC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B3220.s | 6 - include/d/d_a/d_a_alink/asm/func_800B3238.s | 6 - include/d/d_a/d_a_alink/asm/func_800B3250.s | 6 - include/d/d_a/d_a_alink/asm/func_800B3268.s | 6 - include/d/d_a/d_a_alink/asm/func_800B3280.s | 6 - include/d/d_a/d_a_alink/asm/func_800B3298.s | 6 - include/d/d_a/d_a_alink/asm/func_800B4A08.s | 14 +- include/d/d_a/d_a_alink/asm/func_800B4B7C.s | 58 +-- include/d/d_a/d_a_alink/asm/func_800B5284.s | 48 +-- include/d/d_a/d_a_alink/asm/func_800B75EC.s | 8 +- include/d/d_a/d_a_alink/asm/func_800B7BF8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B80C4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800B8988.s | 12 +- include/d/d_a/d_a_alink/asm/func_800B994C.s | 6 +- include/d/d_a/d_a_alink/asm/func_800B9D2C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800BA914.s | 6 +- include/d/d_a/d_a_alink/asm/func_800C0164.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C61EC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C7C64.s | 2 +- include/d/d_a/d_a_alink/asm/func_800C8700.s | 56 +-- include/d/d_a/d_a_alink/asm/func_800CEB58.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CEBD8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CF1B8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800CF380.s | 4 +- include/d/d_a/d_a_alink/asm/func_800CFF2C.s | 4 - include/d/d_a/d_a_alink/asm/func_800CFF3C.s | 4 - include/d/d_a/d_a_alink/asm/func_800CFFA4.s | 7 - include/d/d_a/d_a_alink/asm/func_800D102C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D20B4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D20FC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D21D0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D2368.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D2684.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D4D04.s | 2 +- include/d/d_a/d_a_alink/asm/func_800D4EFC.s | 8 +- include/d/d_a/d_a_alink/asm/func_800D62A0.s | 6 +- include/d/d_a/d_a_alink/asm/func_800DDBA8.s | 4 +- include/d/d_a/d_a_alink/asm/func_800DF0BC.s | 10 +- include/d/d_a/d_a_alink/asm/func_800DF798.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DFDDC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800DFEC0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E0A9C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E0B58.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E0FA0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E1ADC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E1BB4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E1EB0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E5170.s | 8 +- include/d/d_a/d_a_alink/asm/func_800E7EF4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E7F18.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E9434.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E9894.s | 2 +- include/d/d_a/d_a_alink/asm/func_800E9BD0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EA4CC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EA908.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EA92C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EAA28.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EAD84.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EB208.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EB2BC.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EB624.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EBCE0.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EDB48.s | 6 +- include/d/d_a/d_a_alink/asm/func_800EDEEC.s | 8 +- include/d/d_a/d_a_alink/asm/func_800EE64C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800EF6B0.s | 12 +- include/d/d_a/d_a_alink/asm/func_800F0AA4.s | 4 +- include/d/d_a/d_a_alink/asm/func_800F0CE4.s | 10 +- include/d/d_a/d_a_alink/asm/func_800F1688.s | 10 +- include/d/d_a/d_a_alink/asm/func_800F194C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F21B4.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F22A8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F24C8.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F2628.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F2770.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F2898.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F2F98.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F542C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F6D64.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F6E44.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F7010.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F715C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F7274.s | 2 +- include/d/d_a/d_a_alink/asm/func_800F7388.s | 2 +- include/d/d_a/d_a_alink/asm/func_800FA78C.s | 2 +- include/d/d_a/d_a_alink/asm/func_800FC870.s | 4 +- include/d/d_a/d_a_alink/asm/func_800FD5E4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80100770.s | 2 +- include/d/d_a/d_a_alink/asm/func_801017AC.s | 2 +- include/d/d_a/d_a_alink/asm/func_801023E4.s | 8 +- include/d/d_a/d_a_alink/asm/func_801029C8.s | 2 +- include/d/d_a/d_a_alink/asm/func_80103698.s | 2 +- include/d/d_a/d_a_alink/asm/func_801044B4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80104AA0.s | 2 +- include/d/d_a/d_a_alink/asm/func_80104D7C.s | 2 +- include/d/d_a/d_a_alink/asm/func_80104FC4.s | 2 +- include/d/d_a/d_a_alink/asm/func_80106BCC.s | 6 +- include/d/d_a/d_a_alink/asm/func_80108F64.s | 2 +- include/d/d_a/d_a_alink/asm/func_80109284.s | 6 +- include/d/d_a/d_a_alink/asm/func_8010BB48.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010BEF0.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010C9F4.s | 4 +- include/d/d_a/d_a_alink/asm/func_8010CD60.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010D034.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010D38C.s | 4 +- include/d/d_a/d_a_alink/asm/func_8010D6CC.s | 2 +- include/d/d_a/d_a_alink/asm/func_8010DF4C.s | 6 +- include/d/d_a/d_a_alink/asm/func_80111CA4.s | 10 +- include/d/d_a/d_a_alink/asm/func_80111FF0.s | 2 +- include/d/d_a/d_a_alink/asm/func_801120C8.s | 2 +- include/d/d_a/d_a_alink/asm/func_80112304.s | 6 +- include/d/d_a/d_a_alink/asm/func_80115254.s | 2 +- include/d/d_a/d_a_alink/asm/func_80115564.s | 4 +- include/d/d_a/d_a_alink/asm/func_80115674.s | 2 +- include/d/d_a/d_a_alink/asm/func_80127CF0.s | 2 +- include/d/d_a/d_a_alink/asm/func_80127D2C.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012D590.s | 2 +- include/d/d_a/d_a_alink/asm/func_8012F358.s | 2 +- include/d/d_a/d_a_alink/asm/func_80131DA0.s | 2 +- include/d/d_a/d_a_alink/asm/func_80132914.s | 2 +- include/d/d_a/d_a_alink/asm/func_80134838.s | 2 +- include/d/d_a/d_a_alink/asm/func_80134EBC.s | 2 +- include/d/d_a/d_a_alink/asm/func_801351F8.s | 2 +- include/d/d_a/d_a_alink/asm/func_801354C8.s | 2 +- include/d/d_a/d_a_alink/asm/func_801381F8.s | 4 +- include/d/d_a/d_a_alink/asm/func_80139908.s | 2 +- include/d/d_a/d_a_alink/asm/func_80139A70.s | 2 +- include/d/d_a/d_a_alink/asm/func_8013CDEC.s | 2 +- include/d/d_a/d_a_alink/asm/func_80140064.s | 3 - include/d/d_a/d_a_alink/asm/func_80141944.s | 2 - include/d/d_a/d_a_alink/asm/func_8014194C.s | 4 - include/d/d_a/d_a_alink/asm/func_80141990.s | 4 - include/d/d_a/d_a_alink/asm/func_801419A0.s | 6 - include/d/d_a/d_a_alink/d_a_alink.h | 42 +- include/d/d_a/d_a_player/d_a_player.h | 192 +++++++++ .../d/d_com/d_com_inf_game/d_com_inf_game.h | 46 ++- include/d/d_item/d_item/d_item.h | 8 + include/d/d_save/d_save/d_save.h | 14 +- include/functions.h | 46 +-- src/d/d_a/d_a_alink.cpp | 202 ++++------ src/d/d_file/d_file_sel_info.cpp | 4 +- src/d/d_item/d_item.cpp | 374 +++++++++--------- 154 files changed, 864 insertions(+), 754 deletions(-) delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B25CC.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B25E8.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B2604.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B2634.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B2664.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B2688.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B26AC.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B26B8.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3220.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3238.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3250.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3268.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3280.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800B3298.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800CFF2C.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800CFF3C.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_800CFFA4.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_80140064.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_80141944.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_8014194C.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_80141990.s delete mode 100644 include/d/d_a/d_a_alink/asm/func_801419A0.s diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index c4c306959ac..e92d9cd67dd 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -3325,7 +3325,7 @@ lbl_801B2D34: /* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2D88 001AFCC8 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801B2D8C 001AFCCC 4B F8 D2 D9 */ bl daAlink_c_NS_setShieldChange +/* 801B2D8C 001AFCCC 4B F8 D2 D9 */ bl setShieldChange__9daAlink_cFv /* 801B2D90 001AFCD0 38 00 00 4F */ li r0, 0x4f /* 801B2D94 001AFCD4 90 01 00 10 */ stw r0, 0x10(r1) /* 801B2D98 001AFCD8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3361,7 +3361,7 @@ lbl_801B2DCC: /* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E14 001AFD54 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801B2E18 001AFD58 4B F8 D2 4D */ bl daAlink_c_NS_setShieldChange +/* 801B2E18 001AFD58 4B F8 D2 4D */ bl setShieldChange__9daAlink_cFv /* 801B2E1C 001AFD5C 38 00 00 4F */ li r0, 0x4f /* 801B2E20 001AFD60 90 01 00 0C */ stw r0, 0xc(r1) /* 801B2E24 001AFD64 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3392,7 +3392,7 @@ lbl_801B2E58: /* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E8C 001AFDCC 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 801B2E90 001AFDD0 4B F8 D1 D5 */ bl daAlink_c_NS_setShieldChange +/* 801B2E90 001AFDD0 4B F8 D1 D5 */ bl setShieldChange__9daAlink_cFv /* 801B2E94 001AFDD4 38 00 00 4F */ li r0, 0x4f /* 801B2E98 001AFDD8 90 01 00 08 */ stw r0, 8(r1) /* 801B2E9C 001AFDDC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) diff --git a/include/d/d_a/d_a_alink/asm/func_800B02BC.s b/include/d/d_a/d_a_alink/asm/func_800B02BC.s index a1c66cd19b0..12d62401936 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B02BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B02BC.s @@ -560,7 +560,7 @@ lbl_800B0A94: /* 800B0AC0 000ADA00 40 82 00 34 */ bne lbl_800B0AF4 /* 800B0AC4 000ADA04 7F 03 C3 78 */ mr r3, r24 /* 800B0AC8 000ADA08 38 80 00 07 */ li r4, 7 -/* 800B0ACC 000ADA0C 48 00 27 85 */ bl daAlink_c_NS_setDoStatus +/* 800B0ACC 000ADA0C 48 00 27 85 */ bl setDoStatus__9daAlink_cFUc /* 800B0AD0 000ADA10 7F 03 C3 78 */ mr r3, r24 /* 800B0AD4 000ADA14 48 04 C5 75 */ bl daAlink_c_NS_setLadderPosInit /* 800B0AD8 000ADA18 38 61 00 78 */ addi r3, r1, 0x78 @@ -626,7 +626,7 @@ lbl_800B0B84: /* 800B0BBC 000ADAFC 41 82 00 10 */ beq lbl_800B0BCC /* 800B0BC0 000ADB00 7F 03 C3 78 */ mr r3, r24 /* 800B0BC4 000ADB04 38 80 00 8E */ li r4, 0x8e -/* 800B0BC8 000ADB08 48 00 26 89 */ bl daAlink_c_NS_setDoStatus +/* 800B0BC8 000ADB08 48 00 26 89 */ bl setDoStatus__9daAlink_cFUc lbl_800B0BCC: /* 800B0BCC 000ADB0C 80 18 31 A0 */ lwz r0, 0x31a0(r24) /* 800B0BD0 000ADB10 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd @@ -763,7 +763,7 @@ lbl_800B0DA4: /* 800B0DBC 000ADCFC 41 82 00 1C */ beq lbl_800B0DD8 /* 800B0DC0 000ADD00 7F 03 C3 78 */ mr r3, r24 /* 800B0DC4 000ADD04 38 80 00 8E */ li r4, 0x8e -/* 800B0DC8 000ADD08 48 00 24 89 */ bl daAlink_c_NS_setDoStatus +/* 800B0DC8 000ADD08 48 00 24 89 */ bl setDoStatus__9daAlink_cFUc /* 800B0DCC 000ADD0C 48 00 00 0C */ b lbl_800B0DD8 lbl_800B0DD0: /* 800B0DD0 000ADD10 38 00 00 05 */ li r0, 5 diff --git a/include/d/d_a/d_a_alink/asm/func_800B25CC.s b/include/d/d_a/d_a_alink/asm/func_800B25CC.s deleted file mode 100644 index cb6591d0061..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B25CC.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 800B25CC 000AF50C 88 03 2F AE */ lbz r0, 0x2fae(r3) -/* 800B25D0 000AF510 7C 00 23 78 */ or r0, r0, r4 -/* 800B25D4 000AF514 98 03 2F AE */ stb r0, 0x2fae(r3) -/* 800B25D8 000AF518 88 63 2F 8D */ lbz r3, 0x2f8d(r3) -/* 800B25DC 000AF51C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800B25E0 000AF520 7C 63 00 38 */ and r3, r3, r0 -/* 800B25E4 000AF524 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B25E8.s b/include/d/d_a/d_a_alink/asm/func_800B25E8.s deleted file mode 100644 index 70ba87ce1d8..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B25E8.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 800B25E8 000AF528 88 03 2F AE */ lbz r0, 0x2fae(r3) -/* 800B25EC 000AF52C 7C 00 23 78 */ or r0, r0, r4 -/* 800B25F0 000AF530 98 03 2F AE */ stb r0, 0x2fae(r3) -/* 800B25F4 000AF534 88 63 2F 8E */ lbz r3, 0x2f8e(r3) -/* 800B25F8 000AF538 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800B25FC 000AF53C 7C 63 00 38 */ and r3, r3, r0 -/* 800B2600 000AF540 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B2604.s b/include/d/d_a/d_a_alink/asm/func_800B2604.s deleted file mode 100644 index 843671d0d19..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B2604.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 800B2604 000AF544 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B2608 000AF548 7C 08 02 A6 */ mflr r0 -/* 800B260C 000AF54C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2610 000AF550 38 80 00 01 */ li r4, 1 -/* 800B2614 000AF554 88 03 2F 9C */ lbz r0, 0x2f9c(r3) -/* 800B2618 000AF558 7C 80 00 30 */ slw r0, r4, r0 -/* 800B261C 000AF55C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800B2620 000AF560 4B FF FF C9 */ bl daAlink_c_NS_itemButtonCheck -/* 800B2624 000AF564 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B2628 000AF568 7C 08 03 A6 */ mtlr r0 -/* 800B262C 000AF56C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B2630 000AF570 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B2634.s b/include/d/d_a/d_a_alink/asm/func_800B2634.s deleted file mode 100644 index 140359dff65..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B2634.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 800B2634 000AF574 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B2638 000AF578 7C 08 02 A6 */ mflr r0 -/* 800B263C 000AF57C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2640 000AF580 38 80 00 01 */ li r4, 1 -/* 800B2644 000AF584 88 03 2F 9C */ lbz r0, 0x2f9c(r3) -/* 800B2648 000AF588 7C 80 00 30 */ slw r0, r4, r0 -/* 800B264C 000AF58C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800B2650 000AF590 4B FF FF 7D */ bl daAlink_c_NS_itemTriggerCheck -/* 800B2654 000AF594 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B2658 000AF598 7C 08 03 A6 */ mtlr r0 -/* 800B265C 000AF59C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B2660 000AF5A0 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B2664.s b/include/d/d_a/d_a_alink/asm/func_800B2664.s deleted file mode 100644 index b01c7047cf2..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B2664.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800B2664 000AF5A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B2668 000AF5A8 7C 08 02 A6 */ mflr r0 -/* 800B266C 000AF5AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2670 000AF5B0 38 80 00 40 */ li r4, 0x40 -/* 800B2674 000AF5B4 4B FF FF 75 */ bl daAlink_c_NS_itemButtonCheck -/* 800B2678 000AF5B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B267C 000AF5BC 7C 08 03 A6 */ mtlr r0 -/* 800B2680 000AF5C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B2684 000AF5C4 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B2688.s b/include/d/d_a/d_a_alink/asm/func_800B2688.s deleted file mode 100644 index 4e4ffaa9393..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B2688.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800B2688 000AF5C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B268C 000AF5CC 7C 08 02 A6 */ mflr r0 -/* 800B2690 000AF5D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2694 000AF5D4 38 80 00 40 */ li r4, 0x40 -/* 800B2698 000AF5D8 4B FF FF 35 */ bl daAlink_c_NS_itemTriggerCheck -/* 800B269C 000AF5DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B26A0 000AF5E0 7C 08 03 A6 */ mtlr r0 -/* 800B26A4 000AF5E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B26A8 000AF5E8 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B26AC.s b/include/d/d_a/d_a_alink/asm/func_800B26AC.s deleted file mode 100644 index a969c8a0800..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B26AC.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 800B26AC 000AF5EC 88 03 2F 8D */ lbz r0, 0x2f8d(r3) -/* 800B26B0 000AF5F0 54 03 07 7A */ rlwinm r3, r0, 0, 0x1d, 0x1d -/* 800B26B4 000AF5F4 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B26B8.s b/include/d/d_a/d_a_alink/asm/func_800B26B8.s deleted file mode 100644 index b16e4ec4a5b..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B26B8.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 800B26B8 000AF5F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B26BC 000AF5FC 7C 08 02 A6 */ mflr r0 -/* 800B26C0 000AF600 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B26C4 000AF604 38 80 00 08 */ li r4, 8 -/* 800B26C8 000AF608 4B FF FF 05 */ bl daAlink_c_NS_itemTriggerCheck -/* 800B26CC 000AF60C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B26D0 000AF610 7C 08 03 A6 */ mtlr r0 -/* 800B26D4 000AF614 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B26D8 000AF618 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B26DC.s b/include/d/d_a/d_a_alink/asm/func_800B26DC.s index 14713235e01..0e7e61d8085 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B26DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B26DC.s @@ -1,7 +1,7 @@ /* 800B26DC 000AF61C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800B26E0 000AF620 7C 08 02 A6 */ mflr r0 /* 800B26E4 000AF624 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B26E8 000AF628 48 00 0B 51 */ bl daAlink_c_NS_setRStatusEmphasys +/* 800B26E8 000AF628 48 00 0B 51 */ bl setRStatusEmphasys__9daAlink_cFUc /* 800B26EC 000AF62C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B26F0 000AF630 7C 08 03 A6 */ mtlr r0 /* 800B26F4 000AF634 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800B26FC.s b/include/d/d_a/d_a_alink/asm/func_800B26FC.s index a2d487f35ca..3c90830f19d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B26FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B26FC.s @@ -1,7 +1,7 @@ /* 800B26FC 000AF63C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800B2700 000AF640 7C 08 02 A6 */ mflr r0 /* 800B2704 000AF644 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B2708 000AF648 4B FF FF 81 */ bl daAlink_c_NS_spActionTrigger +/* 800B2708 000AF648 4B FF FF 81 */ bl spActionTrigger__9daAlink_cFv /* 800B270C 000AF64C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B2710 000AF650 7C 08 03 A6 */ mtlr r0 /* 800B2714 000AF654 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3220.s b/include/d/d_a/d_a_alink/asm/func_800B3220.s deleted file mode 100644 index 96e3f21b553..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3220.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3220 000B0160 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B3224 000B0164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B3228 000B0168 98 83 5E 1C */ stb r4, 0x5e1c(r3) -/* 800B322C 000B016C 38 00 00 00 */ li r0, 0 -/* 800B3230 000B0170 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 800B3234 000B0174 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B3238.s b/include/d/d_a/d_a_alink/asm/func_800B3238.s deleted file mode 100644 index 445e1bfa1d2..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3238.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3238 000B0178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B323C 000B017C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B3240 000B0180 98 83 5E 1C */ stb r4, 0x5e1c(r3) -/* 800B3244 000B0184 38 00 00 02 */ li r0, 2 -/* 800B3248 000B0188 98 03 5E 42 */ stb r0, 0x5e42(r3) -/* 800B324C 000B018C 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B3250.s b/include/d/d_a/d_a_alink/asm/func_800B3250.s deleted file mode 100644 index 0f9b3e5d76b..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3250.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3250 000B0190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B3254 000B0194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B3258 000B0198 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B325C 000B019C 38 00 00 00 */ li r0, 0 -/* 800B3260 000B01A0 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B3264 000B01A4 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B3268.s b/include/d/d_a/d_a_alink/asm/func_800B3268.s deleted file mode 100644 index 09b8beb195f..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3268.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3268 000B01A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B326C 000B01AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B3270 000B01B0 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B3274 000B01B4 38 00 00 02 */ li r0, 2 -/* 800B3278 000B01B8 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B327C 000B01BC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B3280.s b/include/d/d_a/d_a_alink/asm/func_800B3280.s deleted file mode 100644 index 488aa1d781e..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3280.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3280 000B01C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B3284 000B01C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B3288 000B01C8 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 800B328C 000B01CC 38 00 00 04 */ li r0, 4 -/* 800B3290 000B01D0 98 03 5E 4A */ stb r0, 0x5e4a(r3) -/* 800B3294 000B01D4 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B3298.s b/include/d/d_a/d_a_alink/asm/func_800B3298.s deleted file mode 100644 index db894f0627f..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800B3298.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 800B3298 000B01D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800B329C 000B01DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800B32A0 000B01E0 98 83 5E 1D */ stb r4, 0x5e1d(r3) -/* 800B32A4 000B01E4 38 00 00 00 */ li r0, 0 -/* 800B32A8 000B01E8 98 03 5E 43 */ stb r0, 0x5e43(r3) -/* 800B32AC 000B01EC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800B4A08.s b/include/d/d_a/d_a_alink/asm/func_800B4A08.s index 636f6ec8cb7..ea03671d1e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4A08.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4A08.s @@ -23,7 +23,7 @@ lbl_800B4A3C: /* 800B4A58 000B1998 41 82 00 14 */ beq lbl_800B4A6C /* 800B4A5C 000B199C 7F E3 FB 78 */ mr r3, r31 /* 800B4A60 000B19A0 38 80 00 90 */ li r4, 0x90 -/* 800B4A64 000B19A4 4B FF E7 ED */ bl daAlink_c_NS_setDoStatus +/* 800B4A64 000B19A4 4B FF E7 ED */ bl setDoStatus__9daAlink_cFUc /* 800B4A68 000B19A8 48 00 00 A4 */ b lbl_800B4B0C lbl_800B4A6C: /* 800B4A6C 000B19AC 80 9F 27 F4 */ lwz r4, 0x27f4(r31) @@ -37,7 +37,7 @@ lbl_800B4A84: /* 800B4A88 000B19C8 41 82 00 14 */ beq lbl_800B4A9C /* 800B4A8C 000B19CC 7F E3 FB 78 */ mr r3, r31 /* 800B4A90 000B19D0 38 80 00 3B */ li r4, 0x3b -/* 800B4A94 000B19D4 4B FF E7 BD */ bl daAlink_c_NS_setDoStatus +/* 800B4A94 000B19D4 4B FF E7 BD */ bl setDoStatus__9daAlink_cFUc /* 800B4A98 000B19D8 48 00 00 74 */ b lbl_800B4B0C lbl_800B4A9C: /* 800B4A9C 000B19DC 54 60 00 85 */ rlwinm. r0, r3, 0, 2, 2 @@ -47,31 +47,31 @@ lbl_800B4A9C: /* 800B4AAC 000B19EC 40 82 00 14 */ bne lbl_800B4AC0 /* 800B4AB0 000B19F0 7F E3 FB 78 */ mr r3, r31 /* 800B4AB4 000B19F4 38 80 00 3C */ li r4, 0x3c -/* 800B4AB8 000B19F8 4B FF E7 99 */ bl daAlink_c_NS_setDoStatus +/* 800B4AB8 000B19F8 4B FF E7 99 */ bl setDoStatus__9daAlink_cFUc /* 800B4ABC 000B19FC 48 00 00 50 */ b lbl_800B4B0C lbl_800B4AC0: /* 800B4AC0 000B1A00 7F E3 FB 78 */ mr r3, r31 /* 800B4AC4 000B1A04 38 80 00 08 */ li r4, 8 -/* 800B4AC8 000B1A08 4B FF E7 89 */ bl daAlink_c_NS_setDoStatus +/* 800B4AC8 000B1A08 4B FF E7 89 */ bl setDoStatus__9daAlink_cFUc /* 800B4ACC 000B1A0C 48 00 00 40 */ b lbl_800B4B0C lbl_800B4AD0: /* 800B4AD0 000B1A10 54 60 00 43 */ rlwinm. r0, r3, 0, 1, 1 /* 800B4AD4 000B1A14 41 82 00 14 */ beq lbl_800B4AE8 /* 800B4AD8 000B1A18 7F E3 FB 78 */ mr r3, r31 /* 800B4ADC 000B1A1C 38 80 00 80 */ li r4, 0x80 -/* 800B4AE0 000B1A20 4B FF E7 71 */ bl daAlink_c_NS_setDoStatus +/* 800B4AE0 000B1A20 4B FF E7 71 */ bl setDoStatus__9daAlink_cFUc /* 800B4AE4 000B1A24 48 00 00 28 */ b lbl_800B4B0C lbl_800B4AE8: /* 800B4AE8 000B1A28 54 60 01 09 */ rlwinm. r0, r3, 0, 4, 4 /* 800B4AEC 000B1A2C 41 82 00 14 */ beq lbl_800B4B00 /* 800B4AF0 000B1A30 7F E3 FB 78 */ mr r3, r31 /* 800B4AF4 000B1A34 38 80 00 1B */ li r4, 0x1b -/* 800B4AF8 000B1A38 4B FF E7 59 */ bl daAlink_c_NS_setDoStatus +/* 800B4AF8 000B1A38 4B FF E7 59 */ bl setDoStatus__9daAlink_cFUc /* 800B4AFC 000B1A3C 48 00 00 10 */ b lbl_800B4B0C lbl_800B4B00: /* 800B4B00 000B1A40 7F E3 FB 78 */ mr r3, r31 /* 800B4B04 000B1A44 38 80 00 1C */ li r4, 0x1c -/* 800B4B08 000B1A48 4B FF E7 49 */ bl daAlink_c_NS_setDoStatus +/* 800B4B08 000B1A48 4B FF E7 49 */ bl setDoStatus__9daAlink_cFUc lbl_800B4B0C: /* 800B4B0C 000B1A4C 38 60 00 01 */ li r3, 1 /* 800B4B10 000B1A50 48 00 00 08 */ b lbl_800B4B18 diff --git a/include/d/d_a/d_a_alink/asm/func_800B4B7C.s b/include/d/d_a/d_a_alink/asm/func_800B4B7C.s index 003d06f676a..6bfe607a6fb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4B7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4B7C.s @@ -57,12 +57,12 @@ lbl_800B4C28: /* 800B4C50 000B1B90 40 82 00 14 */ bne lbl_800B4C64 /* 800B4C54 000B1B94 7F A3 EB 78 */ mr r3, r29 /* 800B4C58 000B1B98 38 80 00 2A */ li r4, 0x2a -/* 800B4C5C 000B1B9C 4B FF E5 F5 */ bl daAlink_c_NS_setDoStatus +/* 800B4C5C 000B1B9C 4B FF E5 F5 */ bl setDoStatus__9daAlink_cFUc /* 800B4C60 000B1BA0 48 00 06 04 */ b lbl_800B5264 lbl_800B4C64: /* 800B4C64 000B1BA4 7F A3 EB 78 */ mr r3, r29 /* 800B4C68 000B1BA8 38 80 00 04 */ li r4, 4 -/* 800B4C6C 000B1BAC 4B FF E5 E5 */ bl daAlink_c_NS_setDoStatus +/* 800B4C6C 000B1BAC 4B FF E5 E5 */ bl setDoStatus__9daAlink_cFUc /* 800B4C70 000B1BB0 48 00 05 F4 */ b lbl_800B5264 lbl_800B4C74: /* 800B4C74 000B1BB4 A8 1D 30 8E */ lha r0, 0x308e(r29) @@ -70,7 +70,7 @@ lbl_800B4C74: /* 800B4C7C 000B1BBC 41 82 05 E8 */ beq lbl_800B5264 /* 800B4C80 000B1BC0 7F A3 EB 78 */ mr r3, r29 /* 800B4C84 000B1BC4 38 80 00 12 */ li r4, 0x12 -/* 800B4C88 000B1BC8 4B FF E5 C9 */ bl daAlink_c_NS_setDoStatus +/* 800B4C88 000B1BC8 4B FF E5 C9 */ bl setDoStatus__9daAlink_cFUc /* 800B4C8C 000B1BCC 48 00 05 D8 */ b lbl_800B5264 lbl_800B4C90: /* 800B4C90 000B1BD0 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -82,7 +82,7 @@ lbl_800B4C90: /* 800B4CA8 000B1BE8 41 82 00 14 */ beq lbl_800B4CBC /* 800B4CAC 000B1BEC 7F A3 EB 78 */ mr r3, r29 /* 800B4CB0 000B1BF0 38 80 00 30 */ li r4, 0x30 -/* 800B4CB4 000B1BF4 4B FF E5 B5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4CB4 000B1BF4 4B FF E5 B5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4CB8 000B1BF8 48 00 01 88 */ b lbl_800B4E40 lbl_800B4CBC: /* 800B4CBC 000B1BFC 7F A3 EB 78 */ mr r3, r29 @@ -91,7 +91,7 @@ lbl_800B4CBC: /* 800B4CC8 000B1C08 41 82 00 14 */ beq lbl_800B4CDC /* 800B4CCC 000B1C0C 7F A3 EB 78 */ mr r3, r29 /* 800B4CD0 000B1C10 38 80 00 77 */ li r4, 0x77 -/* 800B4CD4 000B1C14 4B FF E5 95 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4CD4 000B1C14 4B FF E5 95 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4CD8 000B1C18 48 00 01 68 */ b lbl_800B4E40 lbl_800B4CDC: /* 800B4CDC 000B1C1C 7F A3 EB 78 */ mr r3, r29 @@ -100,7 +100,7 @@ lbl_800B4CDC: /* 800B4CE8 000B1C28 41 82 00 14 */ beq lbl_800B4CFC /* 800B4CEC 000B1C2C 7F A3 EB 78 */ mr r3, r29 /* 800B4CF0 000B1C30 38 80 00 19 */ li r4, 0x19 -/* 800B4CF4 000B1C34 4B FF E5 75 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4CF4 000B1C34 4B FF E5 75 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4CF8 000B1C38 48 00 01 48 */ b lbl_800B4E40 lbl_800B4CFC: /* 800B4CFC 000B1C3C 80 7D 27 EC */ lwz r3, 0x27ec(r29) @@ -125,7 +125,7 @@ lbl_800B4D2C: /* 800B4D40 000B1C80 40 82 00 10 */ bne lbl_800B4D50 /* 800B4D44 000B1C84 7F A3 EB 78 */ mr r3, r29 /* 800B4D48 000B1C88 38 80 00 93 */ li r4, 0x93 -/* 800B4D4C 000B1C8C 4B FF E5 05 */ bl daAlink_c_NS_setDoStatus +/* 800B4D4C 000B1C8C 4B FF E5 05 */ bl setDoStatus__9daAlink_cFUc lbl_800B4D50: /* 800B4D50 000B1C90 80 1D 05 80 */ lwz r0, 0x580(r29) /* 800B4D54 000B1C94 64 00 00 02 */ oris r0, r0, 2 @@ -149,7 +149,7 @@ lbl_800B4D78: lbl_800B4D94: /* 800B4D94 000B1CD4 7F A3 EB 78 */ mr r3, r29 /* 800B4D98 000B1CD8 38 80 00 8B */ li r4, 0x8b -/* 800B4D9C 000B1CDC 4B FF E4 B5 */ bl daAlink_c_NS_setDoStatus +/* 800B4D9C 000B1CDC 4B FF E4 B5 */ bl setDoStatus__9daAlink_cFUc /* 800B4DA0 000B1CE0 48 00 00 A0 */ b lbl_800B4E40 lbl_800B4DA4: /* 800B4DA4 000B1CE4 83 9D 27 E0 */ lwz r28, 0x27e0(r29) @@ -167,7 +167,7 @@ lbl_800B4DCC: /* 800B4DD0 000B1D10 41 82 00 14 */ beq lbl_800B4DE4 /* 800B4DD4 000B1D14 7F A3 EB 78 */ mr r3, r29 /* 800B4DD8 000B1D18 38 80 00 8B */ li r4, 0x8b -/* 800B4DDC 000B1D1C 4B FF E4 75 */ bl daAlink_c_NS_setDoStatus +/* 800B4DDC 000B1D1C 4B FF E4 75 */ bl setDoStatus__9daAlink_cFUc /* 800B4DE0 000B1D20 48 00 00 60 */ b lbl_800B4E40 lbl_800B4DE4: /* 800B4DE4 000B1D24 A8 1D 30 D2 */ lha r0, 0x30d2(r29) @@ -194,7 +194,7 @@ lbl_800B4E2C: lbl_800B4E34: /* 800B4E34 000B1D74 7F A3 EB 78 */ mr r3, r29 /* 800B4E38 000B1D78 38 80 00 09 */ li r4, 9 -/* 800B4E3C 000B1D7C 4B FF E4 15 */ bl daAlink_c_NS_setDoStatus +/* 800B4E3C 000B1D7C 4B FF E4 15 */ bl setDoStatus__9daAlink_cFUc lbl_800B4E40: /* 800B4E40 000B1D80 7F A3 EB 78 */ mr r3, r29 /* 800B4E44 000B1D84 4B FF CC E5 */ bl daAlink_c_NS_checkNotJumpSinkLimit @@ -216,7 +216,7 @@ lbl_800B4E40: lbl_800B4E84: /* 800B4E84 000B1DC4 7F A3 EB 78 */ mr r3, r29 /* 800B4E88 000B1DC8 38 80 00 00 */ li r4, 0 -/* 800B4E8C 000B1DCC 4B FF E3 C5 */ bl daAlink_c_NS_setDoStatus +/* 800B4E8C 000B1DCC 4B FF E3 C5 */ bl setDoStatus__9daAlink_cFUc /* 800B4E90 000B1DD0 48 00 03 D4 */ b lbl_800B5264 lbl_800B4E94: /* 800B4E94 000B1DD4 A8 7D 04 E6 */ lha r3, 0x4e6(r29) @@ -266,7 +266,7 @@ lbl_800B4F0C: /* 800B4F3C 000B1E7C 41 82 00 14 */ beq lbl_800B4F50 /* 800B4F40 000B1E80 7F A3 EB 78 */ mr r3, r29 /* 800B4F44 000B1E84 38 80 00 30 */ li r4, 0x30 -/* 800B4F48 000B1E88 4B FF E3 21 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4F48 000B1E88 4B FF E3 21 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4F4C 000B1E8C 48 00 01 D4 */ b lbl_800B5120 lbl_800B4F50: /* 800B4F50 000B1E90 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -278,12 +278,12 @@ lbl_800B4F50: /* 800B4F68 000B1EA8 41 82 00 14 */ beq lbl_800B4F7C /* 800B4F6C 000B1EAC 7F A3 EB 78 */ mr r3, r29 /* 800B4F70 000B1EB0 38 80 00 77 */ li r4, 0x77 -/* 800B4F74 000B1EB4 4B FF E2 F5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4F74 000B1EB4 4B FF E2 F5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4F78 000B1EB8 48 00 01 A8 */ b lbl_800B5120 lbl_800B4F7C: /* 800B4F7C 000B1EBC 7F A3 EB 78 */ mr r3, r29 /* 800B4F80 000B1EC0 38 80 00 19 */ li r4, 0x19 -/* 800B4F84 000B1EC4 4B FF E2 E5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4F84 000B1EC4 4B FF E2 E5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4F88 000B1EC8 48 00 01 98 */ b lbl_800B5120 lbl_800B4F8C: /* 800B4F8C 000B1ECC A0 1D 1F BC */ lhz r0, 0x1fbc(r29) @@ -299,7 +299,7 @@ lbl_800B4FAC: /* 800B4FB0 000B1EF0 40 82 00 14 */ bne lbl_800B4FC4 /* 800B4FB4 000B1EF4 7F A3 EB 78 */ mr r3, r29 /* 800B4FB8 000B1EF8 38 80 00 13 */ li r4, 0x13 -/* 800B4FBC 000B1EFC 4B FF E2 95 */ bl daAlink_c_NS_setDoStatus +/* 800B4FBC 000B1EFC 4B FF E2 95 */ bl setDoStatus__9daAlink_cFUc /* 800B4FC0 000B1F00 48 00 01 60 */ b lbl_800B5120 lbl_800B4FC4: /* 800B4FC4 000B1F04 28 00 01 03 */ cmplwi r0, 0x103 @@ -310,7 +310,7 @@ lbl_800B4FC4: /* 800B4FD8 000B1F18 41 82 00 14 */ beq lbl_800B4FEC /* 800B4FDC 000B1F1C 7F A3 EB 78 */ mr r3, r29 /* 800B4FE0 000B1F20 38 80 00 30 */ li r4, 0x30 -/* 800B4FE4 000B1F24 4B FF E2 85 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B4FE4 000B1F24 4B FF E2 85 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B4FE8 000B1F28 48 00 01 38 */ b lbl_800B5120 lbl_800B4FEC: /* 800B4FEC 000B1F2C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -322,17 +322,17 @@ lbl_800B4FEC: /* 800B5004 000B1F44 41 82 00 14 */ beq lbl_800B5018 /* 800B5008 000B1F48 7F A3 EB 78 */ mr r3, r29 /* 800B500C 000B1F4C 38 80 00 77 */ li r4, 0x77 -/* 800B5010 000B1F50 4B FF E2 59 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5010 000B1F50 4B FF E2 59 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5014 000B1F54 48 00 01 0C */ b lbl_800B5120 lbl_800B5018: /* 800B5018 000B1F58 7F A3 EB 78 */ mr r3, r29 /* 800B501C 000B1F5C 38 80 00 86 */ li r4, 0x86 -/* 800B5020 000B1F60 4B FF E2 31 */ bl daAlink_c_NS_setDoStatus +/* 800B5020 000B1F60 4B FF E2 31 */ bl setDoStatus__9daAlink_cFUc /* 800B5024 000B1F64 48 00 00 FC */ b lbl_800B5120 lbl_800B5028: /* 800B5028 000B1F68 7F A3 EB 78 */ mr r3, r29 /* 800B502C 000B1F6C 38 80 00 79 */ li r4, 0x79 -/* 800B5030 000B1F70 4B FF E2 21 */ bl daAlink_c_NS_setDoStatus +/* 800B5030 000B1F70 4B FF E2 21 */ bl setDoStatus__9daAlink_cFUc /* 800B5034 000B1F74 48 00 00 EC */ b lbl_800B5120 lbl_800B5038: /* 800B5038 000B1F78 7F A3 EB 78 */ mr r3, r29 @@ -364,17 +364,17 @@ lbl_800B5060: /* 800B509C 000B1FDC 41 82 00 14 */ beq lbl_800B50B0 /* 800B50A0 000B1FE0 7F A3 EB 78 */ mr r3, r29 /* 800B50A4 000B1FE4 38 80 00 13 */ li r4, 0x13 -/* 800B50A8 000B1FE8 4B FF E1 A9 */ bl daAlink_c_NS_setDoStatus +/* 800B50A8 000B1FE8 4B FF E1 A9 */ bl setDoStatus__9daAlink_cFUc /* 800B50AC 000B1FEC 48 00 00 74 */ b lbl_800B5120 lbl_800B50B0: /* 800B50B0 000B1FF0 7F A3 EB 78 */ mr r3, r29 /* 800B50B4 000B1FF4 38 80 00 14 */ li r4, 0x14 -/* 800B50B8 000B1FF8 4B FF E1 99 */ bl daAlink_c_NS_setDoStatus +/* 800B50B8 000B1FF8 4B FF E1 99 */ bl setDoStatus__9daAlink_cFUc /* 800B50BC 000B1FFC 48 00 00 64 */ b lbl_800B5120 lbl_800B50C0: /* 800B50C0 000B2000 7F A3 EB 78 */ mr r3, r29 /* 800B50C4 000B2004 38 80 00 04 */ li r4, 4 -/* 800B50C8 000B2008 4B FF E1 89 */ bl daAlink_c_NS_setDoStatus +/* 800B50C8 000B2008 4B FF E1 89 */ bl setDoStatus__9daAlink_cFUc /* 800B50CC 000B200C 48 00 00 54 */ b lbl_800B5120 lbl_800B50D0: /* 800B50D0 000B2010 C0 1D 33 A8 */ lfs f0, 0x33a8(r29) @@ -385,12 +385,12 @@ lbl_800B50D0: /* 800B50E4 000B2024 40 82 00 14 */ bne lbl_800B50F8 /* 800B50E8 000B2028 7F A3 EB 78 */ mr r3, r29 /* 800B50EC 000B202C 38 80 00 13 */ li r4, 0x13 -/* 800B50F0 000B2030 4B FF E1 61 */ bl daAlink_c_NS_setDoStatus +/* 800B50F0 000B2030 4B FF E1 61 */ bl setDoStatus__9daAlink_cFUc /* 800B50F4 000B2034 48 00 00 2C */ b lbl_800B5120 lbl_800B50F8: /* 800B50F8 000B2038 7F A3 EB 78 */ mr r3, r29 /* 800B50FC 000B203C 38 80 00 79 */ li r4, 0x79 -/* 800B5100 000B2040 4B FF E1 51 */ bl daAlink_c_NS_setDoStatus +/* 800B5100 000B2040 4B FF E1 51 */ bl setDoStatus__9daAlink_cFUc /* 800B5104 000B2044 48 00 00 1C */ b lbl_800B5120 lbl_800B5108: /* 800B5108 000B2048 A8 1D 30 8E */ lha r0, 0x308e(r29) @@ -398,7 +398,7 @@ lbl_800B5108: /* 800B5110 000B2050 41 82 00 10 */ beq lbl_800B5120 /* 800B5114 000B2054 7F A3 EB 78 */ mr r3, r29 /* 800B5118 000B2058 38 80 00 12 */ li r4, 0x12 -/* 800B511C 000B205C 4B FF E1 35 */ bl daAlink_c_NS_setDoStatus +/* 800B511C 000B205C 4B FF E1 35 */ bl setDoStatus__9daAlink_cFUc lbl_800B5120: /* 800B5120 000B2060 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800B5124 000B2064 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 @@ -464,12 +464,12 @@ lbl_800B51EC: /* 800B5200 000B2140 41 82 00 14 */ beq lbl_800B5214 /* 800B5204 000B2144 7F A3 EB 78 */ mr r3, r29 /* 800B5208 000B2148 38 80 00 04 */ li r4, 4 -/* 800B520C 000B214C 4B FF E0 45 */ bl daAlink_c_NS_setDoStatus +/* 800B520C 000B214C 4B FF E0 45 */ bl setDoStatus__9daAlink_cFUc /* 800B5210 000B2150 48 00 00 10 */ b lbl_800B5220 lbl_800B5214: /* 800B5214 000B2154 7F A3 EB 78 */ mr r3, r29 /* 800B5218 000B2158 38 80 00 00 */ li r4, 0 -/* 800B521C 000B215C 4B FF E0 35 */ bl daAlink_c_NS_setDoStatus +/* 800B521C 000B215C 4B FF E0 35 */ bl setDoStatus__9daAlink_cFUc lbl_800B5220: /* 800B5220 000B2160 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800B5224 000B2164 41 82 00 1C */ beq lbl_800B5240 @@ -478,7 +478,7 @@ lbl_800B5220: /* 800B5230 000B2170 40 82 00 10 */ bne lbl_800B5240 /* 800B5234 000B2174 7F A3 EB 78 */ mr r3, r29 /* 800B5238 000B2178 38 80 00 00 */ li r4, 0 -/* 800B523C 000B217C 4B FF E0 15 */ bl daAlink_c_NS_setDoStatus +/* 800B523C 000B217C 4B FF E0 15 */ bl setDoStatus__9daAlink_cFUc lbl_800B5240: /* 800B5240 000B2180 88 1E 5E 24 */ lbz r0, 0x5e24(r30) /* 800B5244 000B2184 28 00 00 04 */ cmplwi r0, 4 @@ -488,7 +488,7 @@ lbl_800B5240: /* 800B5254 000B2194 40 82 00 10 */ bne lbl_800B5264 /* 800B5258 000B2198 7F A3 EB 78 */ mr r3, r29 /* 800B525C 000B219C 38 80 00 2A */ li r4, 0x2a -/* 800B5260 000B21A0 4B FF DF F1 */ bl daAlink_c_NS_setDoStatus +/* 800B5260 000B21A0 4B FF DF F1 */ bl setDoStatus__9daAlink_cFUc lbl_800B5264: /* 800B5264 000B21A4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800B5268 000B21A8 CB E1 00 20 */ lfd f31, 0x20(r1) 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 c3d42f1403c..2240cce53a4 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 @@ -21,7 +21,7 @@ lbl_800B52BC: /* 800B52CC 000B220C 41 82 00 10 */ beq lbl_800B52DC /* 800B52D0 000B2210 7F C3 F3 78 */ mr r3, r30 /* 800B52D4 000B2214 38 80 00 62 */ li r4, 0x62 -/* 800B52D8 000B2218 4B FF DF 91 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B52D8 000B2218 4B FF DF 91 */ bl setDoStatusEmphasys__9daAlink_cFUc lbl_800B52DC: /* 800B52DC 000B221C 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800B52E0 000B2220 28 00 00 00 */ cmplwi r0, 0 @@ -48,7 +48,7 @@ lbl_800B52DC: lbl_800B5334: /* 800B5334 000B2274 7F C3 F3 78 */ mr r3, r30 /* 800B5338 000B2278 38 80 00 20 */ li r4, 0x20 -/* 800B533C 000B227C 4B FF DF 15 */ bl daAlink_c_NS_setDoStatus +/* 800B533C 000B227C 4B FF DF 15 */ bl setDoStatus__9daAlink_cFUc /* 800B5340 000B2280 48 00 05 94 */ b lbl_800B58D4 lbl_800B5344: /* 800B5344 000B2284 7F C3 F3 78 */ mr r3, r30 @@ -83,7 +83,7 @@ lbl_800B5368: lbl_800B53B4: /* 800B53B4 000B22F4 7F C3 F3 78 */ mr r3, r30 /* 800B53B8 000B22F8 38 80 00 06 */ li r4, 6 -/* 800B53BC 000B22FC 4B FF DE 95 */ bl daAlink_c_NS_setDoStatus +/* 800B53BC 000B22FC 4B FF DE 95 */ bl setDoStatus__9daAlink_cFUc /* 800B53C0 000B2300 48 00 05 0C */ b lbl_800B58CC lbl_800B53C4: /* 800B53C4 000B2304 80 7E 27 E4 */ lwz r3, 0x27e4(r30) @@ -94,7 +94,7 @@ lbl_800B53C4: /* 800B53D8 000B2318 40 82 00 14 */ bne lbl_800B53EC /* 800B53DC 000B231C 7F C3 F3 78 */ mr r3, r30 /* 800B53E0 000B2320 38 80 00 89 */ li r4, 0x89 -/* 800B53E4 000B2324 4B FF DE 6D */ bl daAlink_c_NS_setDoStatus +/* 800B53E4 000B2324 4B FF DE 6D */ bl setDoStatus__9daAlink_cFUc /* 800B53E8 000B2328 48 00 04 E4 */ b lbl_800B58CC lbl_800B53EC: /* 800B53EC 000B232C 80 1E 05 74 */ lwz r0, 0x574(r30) @@ -113,21 +113,21 @@ lbl_800B53EC: /* 800B5420 000B2360 40 82 00 14 */ bne lbl_800B5434 /* 800B5424 000B2364 7F C3 F3 78 */ mr r3, r30 /* 800B5428 000B2368 38 80 00 91 */ li r4, 0x91 -/* 800B542C 000B236C 4B FF DE 25 */ bl daAlink_c_NS_setDoStatus +/* 800B542C 000B236C 4B FF DE 25 */ bl setDoStatus__9daAlink_cFUc /* 800B5430 000B2370 48 00 04 9C */ b lbl_800B58CC lbl_800B5434: /* 800B5434 000B2374 2C 1F 01 4D */ cmpwi r31, 0x14d /* 800B5438 000B2378 40 82 00 14 */ bne lbl_800B544C /* 800B543C 000B237C 7F C3 F3 78 */ mr r3, r30 /* 800B5440 000B2380 38 80 00 05 */ li r4, 5 -/* 800B5444 000B2384 4B FF DE 25 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5444 000B2384 4B FF DE 25 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5448 000B2388 48 00 04 84 */ b lbl_800B58CC lbl_800B544C: /* 800B544C 000B238C 2C 1F 02 FD */ cmpwi r31, 0x2fd /* 800B5450 000B2390 40 82 00 14 */ bne lbl_800B5464 /* 800B5454 000B2394 7F C3 F3 78 */ mr r3, r30 /* 800B5458 000B2398 38 80 00 47 */ li r4, 0x47 -/* 800B545C 000B239C 4B FF DD F5 */ bl daAlink_c_NS_setDoStatus +/* 800B545C 000B239C 4B FF DD F5 */ bl setDoStatus__9daAlink_cFUc /* 800B5460 000B23A0 48 00 04 6C */ b lbl_800B58CC lbl_800B5464: /* 800B5464 000B23A4 2C 1F 02 1F */ cmpwi r31, 0x21f @@ -139,7 +139,7 @@ lbl_800B5464: lbl_800B547C: /* 800B547C 000B23BC 7F C3 F3 78 */ mr r3, r30 /* 800B5480 000B23C0 38 80 00 39 */ li r4, 0x39 -/* 800B5484 000B23C4 4B FF DD E5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5484 000B23C4 4B FF DD E5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5488 000B23C8 48 00 04 44 */ b lbl_800B58CC lbl_800B548C: /* 800B548C 000B23CC 7F C3 F3 78 */ mr r3, r30 @@ -152,7 +152,7 @@ lbl_800B548C: /* 800B54A8 000B23E8 40 82 04 24 */ bne lbl_800B58CC /* 800B54AC 000B23EC 7F C3 F3 78 */ mr r3, r30 /* 800B54B0 000B23F0 38 80 00 0C */ li r4, 0xc -/* 800B54B4 000B23F4 4B FF DD B5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B54B4 000B23F4 4B FF DD B5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B54B8 000B23F8 48 00 04 14 */ b lbl_800B58CC lbl_800B54BC: /* 800B54BC 000B23FC 80 7E 27 EC */ lwz r3, 0x27ec(r30) @@ -178,7 +178,7 @@ lbl_800B54BC: /* 800B550C 000B244C 40 82 00 14 */ bne lbl_800B5520 /* 800B5510 000B2450 7F C3 F3 78 */ mr r3, r30 /* 800B5514 000B2454 38 80 00 91 */ li r4, 0x91 -/* 800B5518 000B2458 4B FF DD 39 */ bl daAlink_c_NS_setDoStatus +/* 800B5518 000B2458 4B FF DD 39 */ bl setDoStatus__9daAlink_cFUc /* 800B551C 000B245C 48 00 03 B0 */ b lbl_800B58CC lbl_800B5520: /* 800B5520 000B2460 80 7E 27 EC */ lwz r3, 0x27ec(r30) @@ -253,14 +253,14 @@ lbl_800B5608: lbl_800B5628: /* 800B5628 000B2568 7F C3 F3 78 */ mr r3, r30 /* 800B562C 000B256C 38 80 00 05 */ li r4, 5 -/* 800B5630 000B2570 4B FF DC 39 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5630 000B2570 4B FF DC 39 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5634 000B2574 48 00 02 98 */ b lbl_800B58CC lbl_800B5638: /* 800B5638 000B2578 2C 1F 02 AD */ cmpwi r31, 0x2ad /* 800B563C 000B257C 40 82 02 90 */ bne lbl_800B58CC /* 800B5640 000B2580 7F C3 F3 78 */ mr r3, r30 /* 800B5644 000B2584 38 80 00 45 */ li r4, 0x45 -/* 800B5648 000B2588 4B FF DC 21 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5648 000B2588 4B FF DC 21 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B564C 000B258C 48 00 02 80 */ b lbl_800B58CC lbl_800B5650: /* 800B5650 000B2590 80 7E 27 EC */ lwz r3, 0x27ec(r30) @@ -273,7 +273,7 @@ lbl_800B5650: /* 800B566C 000B25AC 40 82 00 14 */ bne lbl_800B5680 /* 800B5670 000B25B0 7F C3 F3 78 */ mr r3, r30 /* 800B5674 000B25B4 38 80 00 7B */ li r4, 0x7b -/* 800B5678 000B25B8 4B FF DB F1 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5678 000B25B8 4B FF DB F1 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B567C 000B25BC 48 00 02 50 */ b lbl_800B58CC lbl_800B5680: /* 800B5680 000B25C0 7F C3 F3 78 */ mr r3, r30 @@ -303,21 +303,21 @@ lbl_800B56C4: lbl_800B56D4: /* 800B56D4 000B2614 7F C3 F3 78 */ mr r3, r30 /* 800B56D8 000B2618 38 80 00 17 */ li r4, 0x17 -/* 800B56DC 000B261C 4B FF DB 75 */ bl daAlink_c_NS_setDoStatus +/* 800B56DC 000B261C 4B FF DB 75 */ bl setDoStatus__9daAlink_cFUc /* 800B56E0 000B2620 48 00 01 EC */ b lbl_800B58CC lbl_800B56E4: /* 800B56E4 000B2624 2C 1F 01 06 */ cmpwi r31, 0x106 /* 800B56E8 000B2628 40 82 00 14 */ bne lbl_800B56FC /* 800B56EC 000B262C 7F C3 F3 78 */ mr r3, r30 /* 800B56F0 000B2630 38 80 00 38 */ li r4, 0x38 -/* 800B56F4 000B2634 4B FF DB 5D */ bl daAlink_c_NS_setDoStatus +/* 800B56F4 000B2634 4B FF DB 5D */ bl setDoStatus__9daAlink_cFUc /* 800B56F8 000B2638 48 00 01 D4 */ b lbl_800B58CC lbl_800B56FC: /* 800B56FC 000B263C 2C 1F 00 CC */ cmpwi r31, 0xcc /* 800B5700 000B2640 40 82 00 14 */ bne lbl_800B5714 /* 800B5704 000B2644 7F C3 F3 78 */ mr r3, r30 /* 800B5708 000B2648 38 80 00 99 */ li r4, 0x99 -/* 800B570C 000B264C 4B FF DB 5D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B570C 000B264C 4B FF DB 5D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5710 000B2650 48 00 01 BC */ b lbl_800B58CC lbl_800B5714: /* 800B5714 000B2654 2C 1F 02 C9 */ cmpwi r31, 0x2c9 @@ -343,7 +343,7 @@ lbl_800B5748: /* 800B5760 000B26A0 41 82 01 6C */ beq lbl_800B58CC /* 800B5764 000B26A4 7F C3 F3 78 */ mr r3, r30 /* 800B5768 000B26A8 38 80 00 63 */ li r4, 0x63 -/* 800B576C 000B26AC 4B FF DA E5 */ bl daAlink_c_NS_setDoStatus +/* 800B576C 000B26AC 4B FF DA E5 */ bl setDoStatus__9daAlink_cFUc /* 800B5770 000B26B0 48 00 01 5C */ b lbl_800B58CC lbl_800B5774: /* 800B5774 000B26B4 80 9E 27 EC */ lwz r4, 0x27ec(r30) @@ -370,7 +370,7 @@ lbl_800B5774: /* 800B57C8 000B2708 40 82 00 14 */ bne lbl_800B57DC /* 800B57CC 000B270C 7F C3 F3 78 */ mr r3, r30 /* 800B57D0 000B2710 38 80 00 91 */ li r4, 0x91 -/* 800B57D4 000B2714 4B FF DA 7D */ bl daAlink_c_NS_setDoStatus +/* 800B57D4 000B2714 4B FF DA 7D */ bl setDoStatus__9daAlink_cFUc /* 800B57D8 000B2718 48 00 00 F4 */ b lbl_800B58CC lbl_800B57DC: /* 800B57DC 000B271C 80 7E 27 E4 */ lwz r3, 0x27e4(r30) @@ -387,7 +387,7 @@ lbl_800B57DC: /* 800B5808 000B2748 41 82 00 14 */ beq lbl_800B581C /* 800B580C 000B274C 7F C3 F3 78 */ mr r3, r30 /* 800B5810 000B2750 38 80 00 91 */ li r4, 0x91 -/* 800B5814 000B2754 4B FF DA 3D */ bl daAlink_c_NS_setDoStatus +/* 800B5814 000B2754 4B FF DA 3D */ bl setDoStatus__9daAlink_cFUc /* 800B5818 000B2758 48 00 00 B4 */ b lbl_800B58CC lbl_800B581C: /* 800B581C 000B275C 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -400,14 +400,14 @@ lbl_800B581C: /* 800B5838 000B2778 41 82 00 14 */ beq lbl_800B584C /* 800B583C 000B277C 7F C3 F3 78 */ mr r3, r30 /* 800B5840 000B2780 38 80 00 98 */ li r4, 0x98 -/* 800B5844 000B2784 4B FF DA 25 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B5844 000B2784 4B FF DA 25 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5848 000B2788 48 00 00 84 */ b lbl_800B58CC lbl_800B584C: /* 800B584C 000B278C 2C 1F 02 19 */ cmpwi r31, 0x219 /* 800B5850 000B2790 40 82 00 14 */ bne lbl_800B5864 /* 800B5854 000B2794 7F C3 F3 78 */ mr r3, r30 /* 800B5858 000B2798 38 80 00 39 */ li r4, 0x39 -/* 800B585C 000B279C 4B FF DA 0D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B585C 000B279C 4B FF DA 0D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B5860 000B27A0 48 00 00 6C */ b lbl_800B58CC lbl_800B5864: /* 800B5864 000B27A4 7F C3 F3 78 */ mr r3, r30 @@ -418,7 +418,7 @@ lbl_800B5864: /* 800B5878 000B27B8 40 82 00 14 */ bne lbl_800B588C /* 800B587C 000B27BC 7F C3 F3 78 */ mr r3, r30 /* 800B5880 000B27C0 38 80 00 2B */ li r4, 0x2b -/* 800B5884 000B27C4 4B FF D9 CD */ bl daAlink_c_NS_setDoStatus +/* 800B5884 000B27C4 4B FF D9 CD */ bl setDoStatus__9daAlink_cFUc /* 800B5888 000B27C8 48 00 00 44 */ b lbl_800B58CC lbl_800B588C: /* 800B588C 000B27CC 80 7E 27 F4 */ lwz r3, 0x27f4(r30) @@ -427,14 +427,14 @@ lbl_800B588C: /* 800B5898 000B27D8 41 82 00 14 */ beq lbl_800B58AC /* 800B589C 000B27DC 7F C3 F3 78 */ mr r3, r30 /* 800B58A0 000B27E0 38 80 00 34 */ li r4, 0x34 -/* 800B58A4 000B27E4 4B FF D9 C5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B58A4 000B27E4 4B FF D9 C5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B58A8 000B27E8 48 00 00 24 */ b lbl_800B58CC lbl_800B58AC: /* 800B58AC 000B27EC 2C 1F 02 16 */ cmpwi r31, 0x216 /* 800B58B0 000B27F0 41 82 00 1C */ beq lbl_800B58CC /* 800B58B4 000B27F4 7F C3 F3 78 */ mr r3, r30 /* 800B58B8 000B27F8 38 80 00 1F */ li r4, 0x1f -/* 800B58BC 000B27FC 4B FF D9 AD */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800B58BC 000B27FC 4B FF D9 AD */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800B58C0 000B2800 48 00 00 0C */ b lbl_800B58CC lbl_800B58C4: /* 800B58C4 000B2804 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800B75EC.s b/include/d/d_a/d_a_alink/asm/func_800B75EC.s index c56627580b1..2b62a7d43f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B75EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B75EC.s @@ -173,10 +173,10 @@ lbl_800B7848: lbl_800B784C: /* 800B784C 000B478C 7F E3 FB 78 */ mr r3, r31 /* 800B7850 000B4790 7F A4 EB 78 */ mr r4, r29 -/* 800B7854 000B4794 4B FF BA 45 */ bl daAlink_c_NS_setBStatus +/* 800B7854 000B4794 4B FF BA 45 */ bl setBStatus__9daAlink_cFUc /* 800B7858 000B4798 7F E3 FB 78 */ mr r3, r31 /* 800B785C 000B479C 7F A4 EB 78 */ mr r4, r29 -/* 800B7860 000B47A0 4B FF B9 F1 */ bl daAlink_c_NS_setDoStatus +/* 800B7860 000B47A0 4B FF B9 F1 */ bl setDoStatus__9daAlink_cFUc /* 800B7864 000B47A4 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 800B7868 000B47A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800B786C 000B47AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -195,7 +195,7 @@ lbl_800B7888: /* 800B789C 000B47DC 40 82 02 C4 */ bne lbl_800B7B60 /* 800B78A0 000B47E0 7F E3 FB 78 */ mr r3, r31 /* 800B78A4 000B47E4 38 80 00 08 */ li r4, 8 -/* 800B78A8 000B47E8 4B FF AD 25 */ bl daAlink_c_NS_itemTriggerCheck +/* 800B78A8 000B47E8 4B FF AD 25 */ bl itemTriggerCheck__9daAlink_cFUc /* 800B78AC 000B47EC 2C 03 00 00 */ cmpwi r3, 0 /* 800B78B0 000B47F0 41 82 02 B0 */ beq lbl_800B7B60 lbl_800B78B4: @@ -225,7 +225,7 @@ lbl_800B78FC: /* 800B7904 000B4844 B0 1F 30 F6 */ sth r0, 0x30f6(r31) /* 800B7908 000B4848 7F E3 FB 78 */ mr r3, r31 /* 800B790C 000B484C 38 80 00 08 */ li r4, 8 -/* 800B7910 000B4850 4B FF AC BD */ bl daAlink_c_NS_itemTriggerCheck +/* 800B7910 000B4850 4B FF AC BD */ bl itemTriggerCheck__9daAlink_cFUc /* 800B7914 000B4854 2C 03 00 00 */ cmpwi r3, 0 /* 800B7918 000B4858 40 82 00 10 */ bne lbl_800B7928 /* 800B791C 000B485C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800B7BF8.s b/include/d/d_a/d_a_alink/asm/func_800B7BF8.s index 8dc22c36073..8e8b4a5c4dd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7BF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7BF8.s @@ -59,7 +59,7 @@ lbl_800B7CB8: /* 800B7CD0 000B4C10 7F 83 E3 78 */ mr r3, r28 /* 800B7CD4 000B4C14 7F E0 F0 30 */ slw r0, r31, r30 /* 800B7CD8 000B4C18 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800B7CDC 000B4C1C 4B FF A8 F1 */ bl daAlink_c_NS_itemTriggerCheck +/* 800B7CDC 000B4C1C 4B FF A8 F1 */ bl itemTriggerCheck__9daAlink_cFUc /* 800B7CE0 000B4C20 2C 03 00 00 */ cmpwi r3, 0 /* 800B7CE4 000B4C24 41 82 00 2C */ beq lbl_800B7D10 /* 800B7CE8 000B4C28 57 C0 08 3C */ slwi r0, r30, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800B80C4.s b/include/d/d_a/d_a_alink/asm/func_800B80C4.s index 67842981f20..5530655ccb9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B80C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B80C4.s @@ -118,7 +118,7 @@ lbl_800B8268: /* 800B8274 000B51B4 60 00 08 00 */ ori r0, r0, 0x800 /* 800B8278 000B51B8 B0 03 00 AE */ sth r0, 0xae(r3) /* 800B827C 000B51BC 7F E3 FB 78 */ mr r3, r31 -/* 800B8280 000B51C0 4B FF A4 2D */ bl daAlink_c_NS_midnaTalkTrigger +/* 800B8280 000B51C0 4B FF A4 2D */ bl midnaTalkTrigger__9daAlink_cCFv /* 800B8284 000B51C4 2C 03 00 00 */ cmpwi r3, 0 /* 800B8288 000B51C8 41 82 00 D0 */ beq lbl_800B8358 /* 800B828C 000B51CC 28 1E 00 00 */ cmplwi r30, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B8988.s b/include/d/d_a/d_a_alink/asm/func_800B8988.s index 702a5e72271..0873d42d42c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B8988.s +++ b/include/d/d_a/d_a_alink/asm/func_800B8988.s @@ -49,7 +49,7 @@ lbl_800B8A18: /* 800B8A38 000B5978 48 00 05 C0 */ b lbl_800B8FF8 lbl_800B8A3C: /* 800B8A3C 000B597C 7F E3 FB 78 */ mr r3, r31 -/* 800B8A40 000B5980 4B FF 9C 79 */ bl daAlink_c_NS_swordSwingTrigger +/* 800B8A40 000B5980 4B FF 9C 79 */ bl swordSwingTrigger__9daAlink_cFv /* 800B8A44 000B5984 2C 03 00 00 */ cmpwi r3, 0 /* 800B8A48 000B5988 40 82 00 14 */ bne lbl_800B8A5C /* 800B8A4C 000B598C 7F E3 FB 78 */ mr r3, r31 @@ -233,7 +233,7 @@ lbl_800B8CAC: /* 800B8CBC 000B5BFC 48 00 03 3C */ b lbl_800B8FF8 lbl_800B8CC0: /* 800B8CC0 000B5C00 7F E3 FB 78 */ mr r3, r31 -/* 800B8CC4 000B5C04 4B FF 99 F5 */ bl daAlink_c_NS_swordSwingTrigger +/* 800B8CC4 000B5C04 4B FF 99 F5 */ bl swordSwingTrigger__9daAlink_cFv /* 800B8CC8 000B5C08 2C 03 00 00 */ cmpwi r3, 0 /* 800B8CCC 000B5C0C 40 82 00 14 */ bne lbl_800B8CE0 /* 800B8CD0 000B5C10 7F E3 FB 78 */ mr r3, r31 @@ -385,14 +385,14 @@ lbl_800B8EC8: /* 800B8EDC 000B5E1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8EE0 000B5E20 41 82 00 44 */ beq lbl_800B8F24 /* 800B8EE4 000B5E24 7F E3 FB 78 */ mr r3, r31 -/* 800B8EE8 000B5E28 4B FF 97 4D */ bl daAlink_c_NS_itemTrigger +/* 800B8EE8 000B5E28 4B FF 97 4D */ bl itemTrigger__9daAlink_cFv /* 800B8EEC 000B5E2C 2C 03 00 00 */ cmpwi r3, 0 /* 800B8EF0 000B5E30 40 82 00 20 */ bne lbl_800B8F10 /* 800B8EF4 000B5E34 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800B8EF8 000B5E38 28 00 00 52 */ cmplwi r0, 0x52 /* 800B8EFC 000B5E3C 40 82 00 28 */ bne lbl_800B8F24 /* 800B8F00 000B5E40 7F E3 FB 78 */ mr r3, r31 -/* 800B8F04 000B5E44 4B FF 97 01 */ bl daAlink_c_NS_itemButton +/* 800B8F04 000B5E44 4B FF 97 01 */ bl itemButton__9daAlink_cFv /* 800B8F08 000B5E48 2C 03 00 00 */ cmpwi r3, 0 /* 800B8F0C 000B5E4C 41 82 00 18 */ beq lbl_800B8F24 lbl_800B8F10: @@ -448,9 +448,9 @@ lbl_800B8FB8: /* 800B8FC8 000B5F08 40 82 00 2C */ bne lbl_800B8FF4 /* 800B8FCC 000B5F0C 7F E3 FB 78 */ mr r3, r31 /* 800B8FD0 000B5F10 38 80 00 3A */ li r4, 0x3a -/* 800B8FD4 000B5F14 4B FF A2 4D */ bl daAlink_c_NS_setRStatus +/* 800B8FD4 000B5F14 4B FF A2 4D */ bl setRStatus__9daAlink_cFUc /* 800B8FD8 000B5F18 7F E3 FB 78 */ mr r3, r31 -/* 800B8FDC 000B5F1C 4B FF 96 AD */ bl daAlink_c_NS_spActionTrigger +/* 800B8FDC 000B5F1C 4B FF 96 AD */ bl spActionTrigger__9daAlink_cFv /* 800B8FE0 000B5F20 2C 03 00 00 */ cmpwi r3, 0 /* 800B8FE4 000B5F24 41 82 00 10 */ beq lbl_800B8FF4 /* 800B8FE8 000B5F28 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800B994C.s b/include/d/d_a/d_a_alink/asm/func_800B994C.s index 7ff46c2d0cd..0b692bedf1b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B994C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B994C.s @@ -52,7 +52,7 @@ lbl_800B9A08: /* 800B9A10 000B6950 41 82 00 3C */ beq lbl_800B9A4C /* 800B9A14 000B6954 7F C3 F3 78 */ mr r3, r30 /* 800B9A18 000B6958 38 80 00 08 */ li r4, 8 -/* 800B9A1C 000B695C 4B FF 8B B1 */ bl daAlink_c_NS_itemTriggerCheck +/* 800B9A1C 000B695C 4B FF 8B B1 */ bl itemTriggerCheck__9daAlink_cFUc /* 800B9A20 000B6960 2C 03 00 00 */ cmpwi r3, 0 /* 800B9A24 000B6964 41 82 00 28 */ beq lbl_800B9A4C /* 800B9A28 000B6968 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -87,7 +87,7 @@ lbl_800B9A4C: /* 800B9A94 000B69D4 41 82 00 28 */ beq lbl_800B9ABC /* 800B9A98 000B69D8 7F C3 F3 78 */ mr r3, r30 /* 800B9A9C 000B69DC 38 80 00 08 */ li r4, 8 -/* 800B9AA0 000B69E0 4B FF 8B 2D */ bl daAlink_c_NS_itemTriggerCheck +/* 800B9AA0 000B69E0 4B FF 8B 2D */ bl itemTriggerCheck__9daAlink_cFUc /* 800B9AA4 000B69E4 2C 03 00 00 */ cmpwi r3, 0 /* 800B9AA8 000B69E8 41 82 00 14 */ beq lbl_800B9ABC /* 800B9AAC 000B69EC 7F C3 F3 78 */ mr r3, r30 @@ -108,7 +108,7 @@ lbl_800B9AC8: /* 800B9AE0 000B6A20 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 800B9AE4 000B6A24 7F A0 00 30 */ slw r0, r29, r0 /* 800B9AE8 000B6A28 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800B9AEC 000B6A2C 4B FF 8A E1 */ bl daAlink_c_NS_itemTriggerCheck +/* 800B9AEC 000B6A2C 4B FF 8A E1 */ bl itemTriggerCheck__9daAlink_cFUc /* 800B9AF0 000B6A30 2C 03 00 00 */ cmpwi r3, 0 /* 800B9AF4 000B6A34 41 82 00 18 */ beq lbl_800B9B0C /* 800B9AF8 000B6A38 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800B9D2C.s b/include/d/d_a/d_a_alink/asm/func_800B9D2C.s index fda8a1abdbb..52305c14838 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9D2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9D2C.s @@ -42,7 +42,7 @@ lbl_800B9D80: /* 800B9DC4 000B6D04 40 82 00 D4 */ bne lbl_800B9E98 /* 800B9DC8 000B6D08 7F E3 FB 78 */ mr r3, r31 /* 800B9DCC 000B6D0C 38 80 00 04 */ li r4, 4 -/* 800B9DD0 000B6D10 4B FF 94 81 */ bl daAlink_c_NS_setDoStatus +/* 800B9DD0 000B6D10 4B FF 94 81 */ bl setDoStatus__9daAlink_cFUc /* 800B9DD4 000B6D14 48 00 00 C4 */ b lbl_800B9E98 lbl_800B9DD8: /* 800B9DD8 000B6D18 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd diff --git a/include/d/d_a/d_a_alink/asm/func_800BA914.s b/include/d/d_a/d_a_alink/asm/func_800BA914.s index ee27e486d31..d0414c57537 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA914.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA914.s @@ -359,7 +359,7 @@ lbl_800BAE24: /* 800BAE28 000B7D68 28 00 00 00 */ cmplwi r0, 0 /* 800BAE2C 000B7D6C 40 82 00 20 */ bne lbl_800BAE4C /* 800BAE30 000B7D70 7F A3 EB 78 */ mr r3, r29 -/* 800BAE34 000B7D74 4B FF 78 85 */ bl daAlink_c_NS_swordSwingTrigger +/* 800BAE34 000B7D74 4B FF 78 85 */ bl swordSwingTrigger__9daAlink_cFv /* 800BAE38 000B7D78 2C 03 00 00 */ cmpwi r3, 0 /* 800BAE3C 000B7D7C 41 82 00 10 */ beq lbl_800BAE4C /* 800BAE40 000B7D80 80 1D 05 78 */ lwz r0, 0x578(r29) @@ -371,7 +371,7 @@ lbl_800BAE4C: /* 800BAE54 000B7D94 90 1D 05 78 */ stw r0, 0x578(r29) /* 800BAE58 000B7D98 7F A3 EB 78 */ mr r3, r29 /* 800BAE5C 000B7D9C 38 80 00 08 */ li r4, 8 -/* 800BAE60 000B7DA0 4B FF 77 89 */ bl daAlink_c_NS_itemButtonCheck +/* 800BAE60 000B7DA0 4B FF 77 89 */ bl itemButtonCheck__9daAlink_cFUc /* 800BAE64 000B7DA4 2C 03 00 00 */ cmpwi r3, 0 /* 800BAE68 000B7DA8 41 82 00 38 */ beq lbl_800BAEA0 /* 800BAE6C 000B7DAC 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -398,7 +398,7 @@ lbl_800BAEAC: /* 800BAEB4 000B7DF4 40 82 00 34 */ bne lbl_800BAEE8 /* 800BAEB8 000B7DF8 7F A3 EB 78 */ mr r3, r29 /* 800BAEBC 000B7DFC 38 80 00 08 */ li r4, 8 -/* 800BAEC0 000B7E00 4B FF 77 29 */ bl daAlink_c_NS_itemButtonCheck +/* 800BAEC0 000B7E00 4B FF 77 29 */ bl itemButtonCheck__9daAlink_cFUc /* 800BAEC4 000B7E04 2C 03 00 00 */ cmpwi r3, 0 /* 800BAEC8 000B7E08 40 82 00 20 */ bne lbl_800BAEE8 /* 800BAECC 000B7E0C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0164.s b/include/d/d_a/d_a_alink/asm/func_800C0164.s index 24a27cbdbf0..1ea4d1af826 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0164.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0164.s @@ -21,7 +21,7 @@ lbl_800C018C: /* 800C01B0 000BD0F0 7F 63 DB 78 */ mr r3, r27 /* 800C01B4 000BD0F4 7F E0 F0 30 */ slw r0, r31, r30 /* 800C01B8 000BD0F8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800C01BC 000BD0FC 4B FF 24 11 */ bl daAlink_c_NS_itemTriggerCheck +/* 800C01BC 000BD0FC 4B FF 24 11 */ bl itemTriggerCheck__9daAlink_cFUc /* 800C01C0 000BD100 2C 03 00 00 */ cmpwi r3, 0 /* 800C01C4 000BD104 41 82 00 18 */ beq lbl_800C01DC /* 800C01C8 000BD108 2C 1C 00 45 */ cmpwi r28, 0x45 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 2d759bea37d..fb7fbb7ce72 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 @@ -137,7 +137,7 @@ lbl_800C63CC: /* 800C63D4 000C3314 41 82 01 80 */ beq lbl_800C6554 /* 800C63D8 000C3318 7F C3 F3 78 */ mr r3, r30 /* 800C63DC 000C331C 38 80 00 01 */ li r4, 1 -/* 800C63E0 000C3320 4B FE CE 71 */ bl daAlink_c_NS_setDoStatus +/* 800C63E0 000C3320 4B FE CE 71 */ bl setDoStatus__9daAlink_cFUc /* 800C63E4 000C3324 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800C63E8 000C3328 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800C63EC 000C332C 41 82 00 18 */ beq lbl_800C6404 diff --git a/include/d/d_a/d_a_alink/asm/func_800C7C64.s b/include/d/d_a/d_a_alink/asm/func_800C7C64.s index 8aa67d9f132..235946dd000 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C7C64.s +++ b/include/d/d_a/d_a_alink/asm/func_800C7C64.s @@ -191,7 +191,7 @@ lbl_800C7EF4: /* 800C7F28 000C4E68 40 82 00 18 */ bne lbl_800C7F40 /* 800C7F2C 000C4E6C 7F A3 EB 78 */ mr r3, r29 /* 800C7F30 000C4E70 38 80 00 08 */ li r4, 8 -/* 800C7F34 000C4E74 4B FE A6 99 */ bl daAlink_c_NS_itemTriggerCheck +/* 800C7F34 000C4E74 4B FE A6 99 */ bl itemTriggerCheck__9daAlink_cFUc /* 800C7F38 000C4E78 2C 03 00 00 */ cmpwi r3, 0 /* 800C7F3C 000C4E7C 41 82 00 E4 */ beq lbl_800C8020 lbl_800C7F40: 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 33610aef4ab..a9ac8ff9f6e 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 @@ -338,10 +338,10 @@ lbl_800C8BF8: /* 800C8BFC 000C5B3C 98 1F 2F AE */ stb r0, 0x2fae(r31) /* 800C8C00 000C5B40 7F E3 FB 78 */ mr r3, r31 /* 800C8C04 000C5B44 38 80 00 00 */ li r4, 0 -/* 800C8C08 000C5B48 4B FE A6 49 */ bl daAlink_c_NS_setDoStatus +/* 800C8C08 000C5B48 4B FE A6 49 */ bl setDoStatus__9daAlink_cFUc /* 800C8C0C 000C5B4C 7F E3 FB 78 */ mr r3, r31 /* 800C8C10 000C5B50 38 80 00 00 */ li r4, 0 -/* 800C8C14 000C5B54 4B FE A6 0D */ bl daAlink_c_NS_setRStatus +/* 800C8C14 000C5B54 4B FE A6 0D */ bl setRStatus__9daAlink_cFUc /* 800C8C18 000C5B58 7F E3 FB 78 */ mr r3, r31 /* 800C8C1C 000C5B5C 38 80 00 00 */ li r4, 0 /* 800C8C20 000C5B60 38 A0 00 00 */ li r5, 0 @@ -355,7 +355,7 @@ lbl_800C8BF8: /* 800C8C40 000C5B80 41 82 00 4C */ beq lbl_800C8C8C /* 800C8C44 000C5B84 7F E3 FB 78 */ mr r3, r31 /* 800C8C48 000C5B88 38 80 00 03 */ li r4, 3 -/* 800C8C4C 000C5B8C 4B FE A6 4D */ bl daAlink_c_NS_setBStatus +/* 800C8C4C 000C5B8C 4B FE A6 4D */ bl setBStatus__9daAlink_cFUc /* 800C8C50 000C5B90 7F E3 FB 78 */ mr r3, r31 /* 800C8C54 000C5B94 38 80 00 00 */ li r4, 0 /* 800C8C58 000C5B98 48 05 F0 F9 */ bl daAlink_c_NS_setWolfDigStatus @@ -388,7 +388,7 @@ lbl_800C8C8C: /* 800C8CBC 000C5BFC 41 82 00 14 */ beq lbl_800C8CD0 /* 800C8CC0 000C5C00 7F E3 FB 78 */ mr r3, r31 /* 800C8CC4 000C5C04 38 80 00 4F */ li r4, 0x4f -/* 800C8CC8 000C5C08 4B FE A5 D1 */ bl daAlink_c_NS_setBStatus +/* 800C8CC8 000C5C08 4B FE A5 D1 */ bl setBStatus__9daAlink_cFUc /* 800C8CCC 000C5C0C 48 00 00 2C */ b lbl_800C8CF8 lbl_800C8CD0: /* 800C8CD0 000C5C10 48 07 87 09 */ bl daPy_py_c_NS_checkSwordGet @@ -396,12 +396,12 @@ lbl_800C8CD0: /* 800C8CD8 000C5C18 41 82 00 14 */ beq lbl_800C8CEC /* 800C8CDC 000C5C1C 7F E3 FB 78 */ mr r3, r31 /* 800C8CE0 000C5C20 38 80 00 26 */ li r4, 0x26 -/* 800C8CE4 000C5C24 4B FE A5 B5 */ bl daAlink_c_NS_setBStatus +/* 800C8CE4 000C5C24 4B FE A5 B5 */ bl setBStatus__9daAlink_cFUc /* 800C8CE8 000C5C28 48 00 00 10 */ b lbl_800C8CF8 lbl_800C8CEC: /* 800C8CEC 000C5C2C 7F E3 FB 78 */ mr r3, r31 /* 800C8CF0 000C5C30 38 80 00 00 */ li r4, 0 -/* 800C8CF4 000C5C34 4B FE A5 A5 */ bl daAlink_c_NS_setBStatus +/* 800C8CF4 000C5C34 4B FE A5 A5 */ bl setBStatus__9daAlink_cFUc lbl_800C8CF8: /* 800C8CF8 000C5C38 38 00 00 00 */ li r0, 0 /* 800C8CFC 000C5C3C 98 1F 2F 91 */ stb r0, 0x2f91(r31) @@ -2232,7 +2232,7 @@ lbl_800CA6C0: /* 800CA728 000C7668 38 00 00 0A */ li r0, 0xa /* 800CA72C 000C766C 98 1F 2F C3 */ stb r0, 0x2fc3(r31) /* 800CA730 000C7670 38 60 FF FF */ li r3, -1 -/* 800CA734 000C7674 48 07 72 6D */ bl dComIfGp_setItemRupeeCount +/* 800CA734 000C7674 48 07 72 6D */ bl dComIfGp_setItemRupeeCount__Fl /* 800CA738 000C7678 48 00 00 0C */ b lbl_800CA744 lbl_800CA73C: /* 800CA73C 000C767C 38 03 FF FF */ addi r0, r3, -1 @@ -2401,11 +2401,11 @@ lbl_800CA960: /* 800CA994 000C78D4 41 82 00 10 */ beq lbl_800CA9A4 /* 800CA998 000C78D8 7F E3 FB 78 */ mr r3, r31 /* 800CA99C 000C78DC 38 80 00 00 */ li r4, 0 -/* 800CA9A0 000C78E0 4B FE 88 B1 */ bl daAlink_c_NS_setDoStatus +/* 800CA9A0 000C78E0 4B FE 88 B1 */ bl setDoStatus__9daAlink_cFUc lbl_800CA9A4: /* 800CA9A4 000C78E4 7F E3 FB 78 */ mr r3, r31 /* 800CA9A8 000C78E8 38 80 00 00 */ li r4, 0 -/* 800CA9AC 000C78EC 4B FE 88 75 */ bl daAlink_c_NS_setRStatus +/* 800CA9AC 000C78EC 4B FE 88 75 */ bl setRStatus__9daAlink_cFUc /* 800CA9B0 000C78F0 48 00 03 B8 */ b lbl_800CAD68 lbl_800CA9B4: /* 800CA9B4 000C78F4 48 07 6F 99 */ bl dComIfGp_getDoStatus @@ -2419,7 +2419,7 @@ lbl_800CA9B4: lbl_800CA9D4: /* 800CA9D4 000C7914 7F E3 FB 78 */ mr r3, r31 /* 800CA9D8 000C7918 38 80 00 03 */ li r4, 3 -/* 800CA9DC 000C791C 4B FE 88 75 */ bl daAlink_c_NS_setDoStatus +/* 800CA9DC 000C791C 4B FE 88 75 */ bl setDoStatus__9daAlink_cFUc /* 800CA9E0 000C7920 48 00 02 E0 */ b lbl_800CACC0 lbl_800CA9E4: /* 800CA9E4 000C7924 48 07 6F 69 */ bl dComIfGp_getDoStatus @@ -2428,7 +2428,7 @@ lbl_800CA9E4: /* 800CA9F0 000C7930 40 82 00 14 */ bne lbl_800CAA04 /* 800CA9F4 000C7934 7F E3 FB 78 */ mr r3, r31 /* 800CA9F8 000C7938 38 80 00 08 */ li r4, 8 -/* 800CA9FC 000C793C 4B FE 88 55 */ bl daAlink_c_NS_setDoStatus +/* 800CA9FC 000C793C 4B FE 88 55 */ bl setDoStatus__9daAlink_cFUc /* 800CAA00 000C7940 48 00 02 C0 */ b lbl_800CACC0 lbl_800CAA04: /* 800CAA04 000C7944 48 07 6F 49 */ bl dComIfGp_getDoStatus @@ -2437,7 +2437,7 @@ lbl_800CAA04: /* 800CAA10 000C7950 40 82 00 14 */ bne lbl_800CAA24 /* 800CAA14 000C7954 7F E3 FB 78 */ mr r3, r31 /* 800CAA18 000C7958 38 80 00 19 */ li r4, 0x19 -/* 800CAA1C 000C795C 4B FE 88 4D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAA1C 000C795C 4B FE 88 4D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAA20 000C7960 48 00 02 A0 */ b lbl_800CACC0 lbl_800CAA24: /* 800CAA24 000C7964 48 07 6F 29 */ bl dComIfGp_getDoStatus @@ -2446,7 +2446,7 @@ lbl_800CAA24: /* 800CAA30 000C7970 40 82 00 14 */ bne lbl_800CAA44 /* 800CAA34 000C7974 7F E3 FB 78 */ mr r3, r31 /* 800CAA38 000C7978 38 80 00 15 */ li r4, 0x15 -/* 800CAA3C 000C797C 4B FE 88 2D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAA3C 000C797C 4B FE 88 2D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAA40 000C7980 48 00 02 80 */ b lbl_800CACC0 lbl_800CAA44: /* 800CAA44 000C7984 48 07 6F 09 */ bl dComIfGp_getDoStatus @@ -2455,7 +2455,7 @@ lbl_800CAA44: /* 800CAA50 000C7990 40 82 00 14 */ bne lbl_800CAA64 /* 800CAA54 000C7994 7F E3 FB 78 */ mr r3, r31 /* 800CAA58 000C7998 38 80 00 00 */ li r4, 0 -/* 800CAA5C 000C799C 4B FE 87 F5 */ bl daAlink_c_NS_setDoStatus +/* 800CAA5C 000C799C 4B FE 87 F5 */ bl setDoStatus__9daAlink_cFUc /* 800CAA60 000C79A0 48 00 02 60 */ b lbl_800CACC0 lbl_800CAA64: /* 800CAA64 000C79A4 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -2477,7 +2477,7 @@ lbl_800CAA64: /* 800CAAA4 000C79E4 40 82 00 14 */ bne lbl_800CAAB8 /* 800CAAA8 000C79E8 7F E3 FB 78 */ mr r3, r31 /* 800CAAAC 000C79EC 38 80 00 00 */ li r4, 0 -/* 800CAAB0 000C79F0 4B FE 87 A1 */ bl daAlink_c_NS_setDoStatus +/* 800CAAB0 000C79F0 4B FE 87 A1 */ bl setDoStatus__9daAlink_cFUc /* 800CAAB4 000C79F4 48 00 02 0C */ b lbl_800CACC0 lbl_800CAAB8: /* 800CAAB8 000C79F8 48 07 6E 95 */ bl dComIfGp_getDoStatus @@ -2486,7 +2486,7 @@ lbl_800CAAB8: /* 800CAAC4 000C7A04 40 82 00 14 */ bne lbl_800CAAD8 /* 800CAAC8 000C7A08 7F E3 FB 78 */ mr r3, r31 /* 800CAACC 000C7A0C 38 80 00 00 */ li r4, 0 -/* 800CAAD0 000C7A10 4B FE 87 81 */ bl daAlink_c_NS_setDoStatus +/* 800CAAD0 000C7A10 4B FE 87 81 */ bl setDoStatus__9daAlink_cFUc /* 800CAAD4 000C7A14 48 00 01 EC */ b lbl_800CACC0 lbl_800CAAD8: /* 800CAAD8 000C7A18 48 07 6E 75 */ bl dComIfGp_getDoStatus @@ -2495,7 +2495,7 @@ lbl_800CAAD8: /* 800CAAE4 000C7A24 40 82 00 14 */ bne lbl_800CAAF8 /* 800CAAE8 000C7A28 7F E3 FB 78 */ mr r3, r31 /* 800CAAEC 000C7A2C 38 80 00 39 */ li r4, 0x39 -/* 800CAAF0 000C7A30 4B FE 87 79 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAAF0 000C7A30 4B FE 87 79 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAAF4 000C7A34 48 00 01 CC */ b lbl_800CACC0 lbl_800CAAF8: /* 800CAAF8 000C7A38 48 07 6E 55 */ bl dComIfGp_getDoStatus @@ -2504,7 +2504,7 @@ lbl_800CAAF8: /* 800CAB04 000C7A44 40 82 00 14 */ bne lbl_800CAB18 /* 800CAB08 000C7A48 7F E3 FB 78 */ mr r3, r31 /* 800CAB0C 000C7A4C 38 80 00 15 */ li r4, 0x15 -/* 800CAB10 000C7A50 4B FE 87 59 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAB10 000C7A50 4B FE 87 59 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAB14 000C7A54 48 00 01 AC */ b lbl_800CACC0 lbl_800CAB18: /* 800CAB18 000C7A58 48 07 6E 35 */ bl dComIfGp_getDoStatus @@ -2534,12 +2534,12 @@ lbl_800CAB18: lbl_800CAB78: /* 800CAB78 000C7AB8 7F E3 FB 78 */ mr r3, r31 /* 800CAB7C 000C7ABC 38 80 00 15 */ li r4, 0x15 -/* 800CAB80 000C7AC0 4B FE 86 E9 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAB80 000C7AC0 4B FE 86 E9 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAB84 000C7AC4 48 00 01 3C */ b lbl_800CACC0 lbl_800CAB88: /* 800CAB88 000C7AC8 7F E3 FB 78 */ mr r3, r31 /* 800CAB8C 000C7ACC 38 80 00 00 */ li r4, 0 -/* 800CAB90 000C7AD0 4B FE 86 C1 */ bl daAlink_c_NS_setDoStatus +/* 800CAB90 000C7AD0 4B FE 86 C1 */ bl setDoStatus__9daAlink_cFUc /* 800CAB94 000C7AD4 48 00 01 2C */ b lbl_800CACC0 lbl_800CAB98: /* 800CAB98 000C7AD8 48 07 6D B5 */ bl dComIfGp_getDoStatus @@ -2554,12 +2554,12 @@ lbl_800CAB98: /* 800CABBC 000C7AFC 40 80 00 14 */ bge lbl_800CABD0 /* 800CABC0 000C7B00 7F E3 FB 78 */ mr r3, r31 /* 800CABC4 000C7B04 38 80 00 4C */ li r4, 0x4c -/* 800CABC8 000C7B08 4B FE 86 89 */ bl daAlink_c_NS_setDoStatus +/* 800CABC8 000C7B08 4B FE 86 89 */ bl setDoStatus__9daAlink_cFUc /* 800CABCC 000C7B0C 48 00 00 F4 */ b lbl_800CACC0 lbl_800CABD0: /* 800CABD0 000C7B10 7F E3 FB 78 */ mr r3, r31 /* 800CABD4 000C7B14 38 80 00 00 */ li r4, 0 -/* 800CABD8 000C7B18 4B FE 86 79 */ bl daAlink_c_NS_setDoStatus +/* 800CABD8 000C7B18 4B FE 86 79 */ bl setDoStatus__9daAlink_cFUc /* 800CABDC 000C7B1C 48 00 00 E4 */ b lbl_800CACC0 lbl_800CABE0: /* 800CABE0 000C7B20 48 07 6D 6D */ bl dComIfGp_getDoStatus @@ -2570,12 +2570,12 @@ lbl_800CABE0: /* 800CABF4 000C7B34 28 03 00 00 */ cmplwi r3, 0 /* 800CABF8 000C7B38 41 82 00 24 */ beq lbl_800CAC1C /* 800CABFC 000C7B3C 48 07 68 DD */ bl dComIfGp_getHorseActor -/* 800CAC00 000C7B40 48 07 6D 45 */ bl daHorse_c_NS_getZeldaActor +/* 800CAC00 000C7B40 48 07 6D 45 */ bl getZeldaActor__9daHorse_cFv /* 800CAC04 000C7B44 28 03 00 00 */ cmplwi r3, 0 /* 800CAC08 000C7B48 41 82 00 14 */ beq lbl_800CAC1C /* 800CAC0C 000C7B4C 7F E3 FB 78 */ mr r3, r31 /* 800CAC10 000C7B50 38 80 00 19 */ li r4, 0x19 -/* 800CAC14 000C7B54 4B FE 86 3D */ bl daAlink_c_NS_setDoStatus +/* 800CAC14 000C7B54 4B FE 86 3D */ bl setDoStatus__9daAlink_cFUc /* 800CAC18 000C7B58 48 00 00 A8 */ b lbl_800CACC0 lbl_800CAC1C: /* 800CAC1C 000C7B5C 48 07 6D 31 */ bl dComIfGp_getDoStatus @@ -2597,7 +2597,7 @@ lbl_800CAC1C: lbl_800CAC5C: /* 800CAC5C 000C7B9C 7F E3 FB 78 */ mr r3, r31 /* 800CAC60 000C7BA0 38 80 00 3B */ li r4, 0x3b -/* 800CAC64 000C7BA4 4B FE 86 05 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAC64 000C7BA4 4B FE 86 05 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAC68 000C7BA8 48 00 00 58 */ b lbl_800CACC0 lbl_800CAC6C: /* 800CAC6C 000C7BAC 48 07 6C E1 */ bl dComIfGp_getDoStatus @@ -2611,7 +2611,7 @@ lbl_800CAC6C: /* 800CAC8C 000C7BCC 41 82 00 14 */ beq lbl_800CACA0 /* 800CAC90 000C7BD0 7F E3 FB 78 */ mr r3, r31 /* 800CAC94 000C7BD4 38 80 00 61 */ li r4, 0x61 -/* 800CAC98 000C7BD8 4B FE 85 D1 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CAC98 000C7BD8 4B FE 85 D1 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAC9C 000C7BDC 48 00 00 24 */ b lbl_800CACC0 lbl_800CACA0: /* 800CACA0 000C7BE0 7F E3 FB 78 */ mr r3, r31 @@ -2621,7 +2621,7 @@ lbl_800CACA0: /* 800CACB0 000C7BF0 41 82 00 10 */ beq lbl_800CACC0 /* 800CACB4 000C7BF4 7F E3 FB 78 */ mr r3, r31 /* 800CACB8 000C7BF8 38 80 00 14 */ li r4, 0x14 -/* 800CACBC 000C7BFC 4B FE 85 AD */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800CACBC 000C7BFC 4B FE 85 AD */ bl setDoStatusEmphasys__9daAlink_cFUc lbl_800CACC0: /* 800CACC0 000C7C00 7F E3 FB 78 */ mr r3, r31 /* 800CACC4 000C7C04 48 01 D2 21 */ bl daAlink_c_NS_getWallGrabStatus @@ -2667,7 +2667,7 @@ lbl_800CAD3C: /* 800CAD58 000C7C98 40 82 00 10 */ bne lbl_800CAD68 /* 800CAD5C 000C7C9C 7F E3 FB 78 */ mr r3, r31 /* 800CAD60 000C7CA0 38 80 00 00 */ li r4, 0 -/* 800CAD64 000C7CA4 4B FE 84 BD */ bl daAlink_c_NS_setRStatus +/* 800CAD64 000C7CA4 4B FE 84 BD */ bl setRStatus__9daAlink_cFUc lbl_800CAD68: /* 800CAD68 000C7CA8 4B F6 2F 41 */ bl dComIfGs_getMaxLifeGauge /* 800CAD6C 000C7CAC 54 7C 04 3E */ clrlwi r28, r3, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800CEB58.s b/include/d/d_a/d_a_alink/asm/func_800CEB58.s index 2a77100e37e..e1009fc28a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEB58.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEB58.s @@ -23,7 +23,7 @@ lbl_800CEBB0: /* 800CEBB0 000CBAF0 7F E3 FB 78 */ mr r3, r31 /* 800CEBB4 000CBAF4 38 80 00 08 */ li r4, 8 -/* 800CEBB8 000CBAF8 4B FE 3A 15 */ bl daAlink_c_NS_itemTriggerCheck +/* 800CEBB8 000CBAF8 4B FE 3A 15 */ bl itemTriggerCheck__9daAlink_cFUc /* 800CEBBC 000CBAFC 48 00 00 08 */ b lbl_800CEBC4 lbl_800CEBC0: /* 800CEBC0 000CBB00 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CEBD8.s b/include/d/d_a/d_a_alink/asm/func_800CEBD8.s index 77ecd304150..8a902e50457 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEBD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEBD8.s @@ -6,7 +6,7 @@ /* 800CEBEC 000CBB2C 7C 7E 1B 78 */ mr r30, r3 /* 800CEBF0 000CBB30 7C 9F 23 78 */ mr r31, r4 /* 800CEBF4 000CBB34 38 80 00 12 */ li r4, 0x12 -/* 800CEBF8 000CBB38 4B FE 46 59 */ bl daAlink_c_NS_setDoStatus +/* 800CEBF8 000CBB38 4B FE 46 59 */ bl setDoStatus__9daAlink_cFUc /* 800CEBFC 000CBB3C 7F C3 F3 78 */ mr r3, r30 /* 800CEC00 000CBB40 48 04 70 21 */ bl daAlink_c_NS_checkEventRun /* 800CEC04 000CBB44 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CF1B8.s b/include/d/d_a/d_a_alink/asm/func_800CF1B8.s index c71eb357b19..c3babecb92a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF1B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF1B8.s @@ -7,7 +7,7 @@ /* 800CF1D0 000CC110 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800CF1D4 000CC114 40 82 00 14 */ bne lbl_800CF1E8 /* 800CF1D8 000CC118 38 80 00 08 */ li r4, 8 -/* 800CF1DC 000CC11C 4B FE 33 F1 */ bl daAlink_c_NS_itemTriggerCheck +/* 800CF1DC 000CC11C 4B FE 33 F1 */ bl itemTriggerCheck__9daAlink_cFUc /* 800CF1E0 000CC120 2C 03 00 00 */ cmpwi r3, 0 /* 800CF1E4 000CC124 41 82 00 60 */ beq lbl_800CF244 lbl_800CF1E8: diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index 1ea1c7577bf..aaa6bcc93dd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -33,9 +33,9 @@ /* 800CF400 000CC340 90 1A 00 18 */ stw r0, 0x18(r26) /* 800CF404 000CC344 38 7F 07 C4 */ addi r3, r31, 0x7c4 /*.global daPy_actorKeep_c*/ -/* 800CF408 000CC348 3C 80 80 14 */ lis r4, daPy_actorKeep_c@ha +/* 800CF408 000CC348 3C 80 80 14 */ lis r4, __ct__16daPy_actorKeep_cFv@ha /*.global daPy_actorKeep_c*/ -/* 800CF40C 000CC34C 38 84 10 EC */ addi r4, r4, daPy_actorKeep_c@l +/* 800CF40C 000CC34C 38 84 10 EC */ addi r4, r4, __ct__16daPy_actorKeep_cFv@l /* 800CF410 000CC350 38 A0 00 00 */ li r5, 0 /* 800CF414 000CC354 38 C0 00 08 */ li r6, 8 /* 800CF418 000CC358 38 E0 00 0A */ li r7, 0xa diff --git a/include/d/d_a/d_a_alink/asm/func_800CFF2C.s b/include/d/d_a/d_a_alink/asm/func_800CFF2C.s deleted file mode 100644 index 0fa00f3cb72..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800CFF2C.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 800CFF2C 000CCE6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800CFF30 000CCE70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800CFF34 000CCE74 A0 63 00 02 */ lhz r3, 2(r3) -/* 800CFF38 000CCE78 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800CFF3C.s b/include/d/d_a/d_a_alink/asm/func_800CFF3C.s deleted file mode 100644 index 7f792582823..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800CFF3C.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 800CFF3C 000CCE7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 800CFF40 000CCE80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 800CFF44 000CCE84 88 63 5E 1C */ lbz r3, 0x5e1c(r3) -/* 800CFF48 000CCE88 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800CFFA4.s b/include/d/d_a/d_a_alink/asm/func_800CFFA4.s deleted file mode 100644 index ec37f72e664..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_800CFFA4.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 800CFFA4 000CCEE4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha -/* 800CFFA8 000CCEE8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l -/* 800CFFAC 000CCEEC C0 04 5D C0 */ lfs f0, 0x5dc0(r4) -/* 800CFFB0 000CCEF0 EC 00 08 2A */ fadds f0, f0, f1 -/* 800CFFB4 000CCEF4 D0 04 5D C0 */ stfs f0, 0x5dc0(r4) -/* 800CFFB8 000CCEF8 98 64 5E B6 */ stb r3, 0x5eb6(r4) -/* 800CFFBC 000CCEFC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_800D102C.s b/include/d/d_a/d_a_alink/asm/func_800D102C.s index c51460799d2..526f23ede50 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D102C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D102C.s @@ -10,7 +10,7 @@ /* 800D1050 000CDF90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1054 000CDF94 40 82 00 1C */ bne lbl_800D1070 /* 800D1058 000CDF98 7F E3 FB 78 */ mr r3, r31 -/* 800D105C 000CDF9C 4B FE 16 5D */ bl daAlink_c_NS_swordSwingTrigger +/* 800D105C 000CDF9C 4B FE 16 5D */ bl swordSwingTrigger__9daAlink_cFv /* 800D1060 000CDFA0 2C 03 00 00 */ cmpwi r3, 0 /* 800D1064 000CDFA4 41 82 00 0C */ beq lbl_800D1070 /* 800D1068 000CDFA8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D20B4.s b/include/d/d_a/d_a_alink/asm/func_800D20B4.s index 3f1671dec72..021ba7db090 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D20B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D20B4.s @@ -6,7 +6,7 @@ /* 800D20C8 000CF008 A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800D20CC 000CF00C 28 00 01 03 */ cmplwi r0, 0x103 /* 800D20D0 000CF010 40 82 00 14 */ bne lbl_800D20E4 -/* 800D20D4 000CF014 4B FE 05 E5 */ bl daAlink_c_NS_swordSwingTrigger +/* 800D20D4 000CF014 4B FE 05 E5 */ bl swordSwingTrigger__9daAlink_cFv /* 800D20D8 000CF018 2C 03 00 00 */ cmpwi r3, 0 /* 800D20DC 000CF01C 41 82 00 08 */ beq lbl_800D20E4 /* 800D20E0 000CF020 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D20FC.s b/include/d/d_a/d_a_alink/asm/func_800D20FC.s index 4c9a0266d3e..1626801cc70 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D20FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D20FC.s @@ -24,7 +24,7 @@ lbl_800D2140: /* 800D2150 000CF090 28 00 00 00 */ cmplwi r0, 0 /* 800D2154 000CF094 40 82 00 20 */ bne lbl_800D2174 /* 800D2158 000CF098 7F E3 FB 78 */ mr r3, r31 -/* 800D215C 000CF09C 4B FE 05 5D */ bl daAlink_c_NS_swordSwingTrigger +/* 800D215C 000CF09C 4B FE 05 5D */ bl swordSwingTrigger__9daAlink_cFv /* 800D2160 000CF0A0 2C 03 00 00 */ cmpwi r3, 0 /* 800D2164 000CF0A4 41 82 00 10 */ beq lbl_800D2174 /* 800D2168 000CF0A8 80 1F 05 78 */ lwz r0, 0x578(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D21D0.s b/include/d/d_a/d_a_alink/asm/func_800D21D0.s index 71ca390fe29..ef8d7bb2be7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D21D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D21D0.s @@ -16,7 +16,7 @@ lbl_800D21F8: /* 800D2208 000CF148 40 82 00 10 */ bne lbl_800D2218 /* 800D220C 000CF14C 7F E3 FB 78 */ mr r3, r31 /* 800D2210 000CF150 38 80 00 00 */ li r4, 0 -/* 800D2214 000CF154 4B FE 10 3D */ bl daAlink_c_NS_setDoStatus +/* 800D2214 000CF154 4B FE 10 3D */ bl setDoStatus__9daAlink_cFUc lbl_800D2218: /* 800D2218 000CF158 88 7F 05 69 */ lbz r3, 0x569(r31) /* 800D221C 000CF15C 38 03 00 01 */ addi r0, r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2368.s b/include/d/d_a/d_a_alink/asm/func_800D2368.s index 5e6eeb80ab1..fe9feceba09 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2368.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2368.s @@ -5,7 +5,7 @@ /* 800D2378 000CF2B8 93 C1 00 08 */ stw r30, 8(r1) /* 800D237C 000CF2BC 7C 7E 1B 78 */ mr r30, r3 /* 800D2380 000CF2C0 3B E0 00 00 */ li r31, 0 -/* 800D2384 000CF2C4 4B FE 03 35 */ bl daAlink_c_NS_swordSwingTrigger +/* 800D2384 000CF2C4 4B FE 03 35 */ bl swordSwingTrigger__9daAlink_cFv /* 800D2388 000CF2C8 2C 03 00 00 */ cmpwi r3, 0 /* 800D238C 000CF2CC 41 82 00 18 */ beq lbl_800D23A4 /* 800D2390 000CF2D0 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2684.s b/include/d/d_a/d_a_alink/asm/func_800D2684.s index f4879c61eb9..0cd2b22974a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2684.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2684.s @@ -4,7 +4,7 @@ /* 800D2690 000CF5D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D2694 000CF5D4 7C 7F 1B 78 */ mr r31, r3 /* 800D2698 000CF5D8 38 80 00 08 */ li r4, 8 -/* 800D269C 000CF5DC 4B FD FF 4D */ bl daAlink_c_NS_itemButtonCheck +/* 800D269C 000CF5DC 4B FD FF 4D */ bl itemButtonCheck__9daAlink_cFUc /* 800D26A0 000CF5E0 2C 03 00 00 */ cmpwi r3, 0 /* 800D26A4 000CF5E4 41 82 00 2C */ beq lbl_800D26D0 /* 800D26A8 000CF5E8 A8 7F 30 12 */ lha r3, 0x3012(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4D04.s b/include/d/d_a/d_a_alink/asm/func_800D4D04.s index d2396af011f..d70daea7d92 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4D04.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4D04.s @@ -17,7 +17,7 @@ lbl_800D4D2C: /* 800D4D40 000D1C80 B0 1F 30 7E */ sth r0, 0x307e(r31) /* 800D4D44 000D1C84 7F E3 FB 78 */ mr r3, r31 /* 800D4D48 000D1C88 38 80 00 08 */ li r4, 8 -/* 800D4D4C 000D1C8C 4B FD D8 9D */ bl daAlink_c_NS_itemButtonCheck +/* 800D4D4C 000D1C8C 4B FD D8 9D */ bl itemButtonCheck__9daAlink_cFUc /* 800D4D50 000D1C90 2C 03 00 00 */ cmpwi r3, 0 /* 800D4D54 000D1C94 40 82 00 34 */ bne lbl_800D4D88 /* 800D4D58 000D1C98 80 1F 06 14 */ lwz r0, 0x614(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s index 88113495416..03b3cba65a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s @@ -81,7 +81,7 @@ lbl_800D5008: /* 800D502C 000D1F6C 40 82 00 14 */ bne lbl_800D5040 /* 800D5030 000D1F70 7F E3 FB 78 */ mr r3, r31 /* 800D5034 000D1F74 38 80 00 30 */ li r4, 0x30 -/* 800D5038 000D1F78 4B FD E2 31 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800D5038 000D1F78 4B FD E2 31 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800D503C 000D1F7C 48 00 00 4C */ b lbl_800D5088 lbl_800D5040: /* 800D5040 000D1F80 7F E3 FB 78 */ mr r3, r31 @@ -92,12 +92,12 @@ lbl_800D5040: /* 800D5054 000D1F94 40 82 00 14 */ bne lbl_800D5068 /* 800D5058 000D1F98 7F E3 FB 78 */ mr r3, r31 /* 800D505C 000D1F9C 38 80 00 77 */ li r4, 0x77 -/* 800D5060 000D1FA0 4B FD E2 09 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800D5060 000D1FA0 4B FD E2 09 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800D5064 000D1FA4 48 00 00 24 */ b lbl_800D5088 lbl_800D5068: /* 800D5068 000D1FA8 7F E3 FB 78 */ mr r3, r31 /* 800D506C 000D1FAC 38 80 00 86 */ li r4, 0x86 -/* 800D5070 000D1FB0 4B FD E1 E1 */ bl daAlink_c_NS_setDoStatus +/* 800D5070 000D1FB0 4B FD E1 E1 */ bl setDoStatus__9daAlink_cFUc /* 800D5074 000D1FB4 48 00 00 14 */ b lbl_800D5088 lbl_800D5078: /* 800D5078 000D1FB8 3C 60 80 39 */ lis r3, lbl_8038DE8C@ha @@ -125,7 +125,7 @@ lbl_800D50BC: /* 800D50C4 000D2004 40 82 00 18 */ bne lbl_800D50DC /* 800D50C8 000D2008 7F E3 FB 78 */ mr r3, r31 /* 800D50CC 000D200C 38 80 00 08 */ li r4, 8 -/* 800D50D0 000D2010 4B FD D5 19 */ bl daAlink_c_NS_itemButtonCheck +/* 800D50D0 000D2010 4B FD D5 19 */ bl itemButtonCheck__9daAlink_cFUc /* 800D50D4 000D2014 2C 03 00 00 */ cmpwi r3, 0 /* 800D50D8 000D2018 40 82 00 1C */ bne lbl_800D50F4 lbl_800D50DC: diff --git a/include/d/d_a/d_a_alink/asm/func_800D62A0.s b/include/d/d_a/d_a_alink/asm/func_800D62A0.s index 1331d634f68..fc6e44cb86e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D62A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D62A0.s @@ -15,7 +15,7 @@ lbl_800D62C8: /* 800D62D4 000D3214 41 82 00 14 */ beq lbl_800D62E8 /* 800D62D8 000D3218 7F E3 FB 78 */ mr r3, r31 /* 800D62DC 000D321C 38 80 00 30 */ li r4, 0x30 -/* 800D62E0 000D3220 4B FD CF 89 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800D62E0 000D3220 4B FD CF 89 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800D62E4 000D3224 48 00 00 30 */ b lbl_800D6314 lbl_800D62E8: /* 800D62E8 000D3228 7F E3 FB 78 */ mr r3, r31 @@ -24,12 +24,12 @@ lbl_800D62E8: /* 800D62F4 000D3234 41 82 00 14 */ beq lbl_800D6308 /* 800D62F8 000D3238 7F E3 FB 78 */ mr r3, r31 /* 800D62FC 000D323C 38 80 00 77 */ li r4, 0x77 -/* 800D6300 000D3240 4B FD CF 69 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800D6300 000D3240 4B FD CF 69 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800D6304 000D3244 48 00 00 10 */ b lbl_800D6314 lbl_800D6308: /* 800D6308 000D3248 7F E3 FB 78 */ mr r3, r31 /* 800D630C 000D324C 38 80 00 86 */ li r4, 0x86 -/* 800D6310 000D3250 4B FD CF 41 */ bl daAlink_c_NS_setDoStatus +/* 800D6310 000D3250 4B FD CF 41 */ bl setDoStatus__9daAlink_cFUc lbl_800D6314: /* 800D6314 000D3254 7F E3 FB 78 */ mr r3, r31 /* 800D6318 000D3258 4B FF BF A5 */ bl daAlink_c_NS_setSwordChargeVoiceSe diff --git a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s index defb844095b..4e754b67d72 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s @@ -103,12 +103,12 @@ lbl_800DDD18: /* 800DDD2C 000DAC6C 41 82 00 14 */ beq lbl_800DDD40 /* 800DDD30 000DAC70 7F C3 F3 78 */ mr r3, r30 /* 800DDD34 000DAC74 38 80 00 77 */ li r4, 0x77 -/* 800DDD38 000DAC78 4B FD 55 31 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800DDD38 000DAC78 4B FD 55 31 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800DDD3C 000DAC7C 48 00 00 10 */ b lbl_800DDD4C lbl_800DDD40: /* 800DDD40 000DAC80 7F C3 F3 78 */ mr r3, r30 /* 800DDD44 000DAC84 38 80 00 86 */ li r4, 0x86 -/* 800DDD48 000DAC88 4B FD 55 09 */ bl daAlink_c_NS_setDoStatus +/* 800DDD48 000DAC88 4B FD 55 09 */ bl setDoStatus__9daAlink_cFUc lbl_800DDD4C: /* 800DDD4C 000DAC8C 7F E3 FB 78 */ mr r3, r31 /* 800DDD50 000DAC90 48 08 07 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd diff --git a/include/d/d_a/d_a_alink/asm/func_800DF0BC.s b/include/d/d_a/d_a_alink/asm/func_800DF0BC.s index 63d321aa49c..6439b5fe9cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DF0BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DF0BC.s @@ -123,7 +123,7 @@ lbl_800DF284: /* 800DF288 000DC1C8 28 00 00 4B */ cmplwi r0, 0x4b /* 800DF28C 000DC1CC 40 82 00 74 */ bne lbl_800DF300 /* 800DF290 000DC1D0 7F E3 FB 78 */ mr r3, r31 -/* 800DF294 000DC1D4 4B FD 33 71 */ bl daAlink_c_NS_itemButton +/* 800DF294 000DC1D4 4B FD 33 71 */ bl itemButton__9daAlink_cFv /* 800DF298 000DC1D8 2C 03 00 00 */ cmpwi r3, 0 /* 800DF29C 000DC1DC 40 82 04 90 */ bne lbl_800DF72C /* 800DF2A0 000DC1E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -152,7 +152,7 @@ lbl_800DF284: /* 800DF2FC 000DC23C 48 00 04 30 */ b lbl_800DF72C lbl_800DF300: /* 800DF300 000DC240 7F E3 FB 78 */ mr r3, r31 -/* 800DF304 000DC244 4B FD 33 01 */ bl daAlink_c_NS_itemButton +/* 800DF304 000DC244 4B FD 33 01 */ bl itemButton__9daAlink_cFv /* 800DF308 000DC248 2C 03 00 00 */ cmpwi r3, 0 /* 800DF30C 000DC24C 40 82 01 50 */ bne lbl_800DF45C /* 800DF310 000DC250 28 1D 00 00 */ cmplwi r29, 0 @@ -308,7 +308,7 @@ lbl_800DF538: /* 800DF53C 000DC47C 2C 00 00 00 */ cmpwi r0, 0 /* 800DF540 000DC480 40 82 00 60 */ bne lbl_800DF5A0 /* 800DF544 000DC484 7F E3 FB 78 */ mr r3, r31 -/* 800DF548 000DC488 4B FD 30 BD */ bl daAlink_c_NS_itemButton +/* 800DF548 000DC488 4B FD 30 BD */ bl itemButton__9daAlink_cFv /* 800DF54C 000DC48C 2C 03 00 00 */ cmpwi r3, 0 /* 800DF550 000DC490 40 82 00 50 */ bne lbl_800DF5A0 /* 800DF554 000DC494 A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -336,7 +336,7 @@ lbl_800DF5A0: /* 800DF5A4 000DC4E4 2C 00 00 00 */ cmpwi r0, 0 /* 800DF5A8 000DC4E8 40 82 00 74 */ bne lbl_800DF61C /* 800DF5AC 000DC4EC 7F E3 FB 78 */ mr r3, r31 -/* 800DF5B0 000DC4F0 4B FD 30 55 */ bl daAlink_c_NS_itemButton +/* 800DF5B0 000DC4F0 4B FD 30 55 */ bl itemButton__9daAlink_cFv /* 800DF5B4 000DC4F4 2C 03 00 00 */ cmpwi r3, 0 /* 800DF5B8 000DC4F8 40 82 00 10 */ bne lbl_800DF5C8 /* 800DF5BC 000DC4FC A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -430,7 +430,7 @@ lbl_800DF6D8: /* 800DF6F8 000DC638 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800DF6FC 000DC63C 40 81 00 1C */ ble lbl_800DF718 /* 800DF700 000DC640 7F E3 FB 78 */ mr r3, r31 -/* 800DF704 000DC644 4B FD 2F 01 */ bl daAlink_c_NS_itemButton +/* 800DF704 000DC644 4B FD 2F 01 */ bl itemButton__9daAlink_cFv /* 800DF708 000DC648 2C 03 00 00 */ cmpwi r3, 0 /* 800DF70C 000DC64C 41 82 00 0C */ beq lbl_800DF718 lbl_800DF710: diff --git a/include/d/d_a/d_a_alink/asm/func_800DF798.s b/include/d/d_a/d_a_alink/asm/func_800DF798.s index 3d676a87669..b694eaa01ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DF798.s +++ b/include/d/d_a/d_a_alink/asm/func_800DF798.s @@ -18,7 +18,7 @@ lbl_800DF7D0: /* 800DF7D8 000DC718 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF7DC 000DC71C 41 82 00 24 */ beq lbl_800DF800 /* 800DF7E0 000DC720 7F E3 FB 78 */ mr r3, r31 -/* 800DF7E4 000DC724 4B FD 2E 51 */ bl daAlink_c_NS_itemTrigger +/* 800DF7E4 000DC724 4B FD 2E 51 */ bl itemTrigger__9daAlink_cFv /* 800DF7E8 000DC728 2C 03 00 00 */ cmpwi r3, 0 /* 800DF7EC 000DC72C 41 82 00 14 */ beq lbl_800DF800 /* 800DF7F0 000DC730 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800DFDDC.s b/include/d/d_a/d_a_alink/asm/func_800DFDDC.s index c4bb26cf00d..66570056767 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFDDC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFDDC.s @@ -4,7 +4,7 @@ /* 800DFDE8 000DCD28 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFDEC 000DCD2C 7C 7F 1B 78 */ mr r31, r3 /* 800DFDF0 000DCD30 38 80 00 12 */ li r4, 0x12 -/* 800DFDF4 000DCD34 4B FD 34 5D */ bl daAlink_c_NS_setDoStatus +/* 800DFDF4 000DCD34 4B FD 34 5D */ bl setDoStatus__9daAlink_cFUc /* 800DFDF8 000DCD38 7F E3 FB 78 */ mr r3, r31 /* 800DFDFC 000DCD3C 38 80 00 00 */ li r4, 0 /* 800DFE00 000DCD40 4B FD A2 D1 */ bl daAlink_c_NS_checkNextAction diff --git a/include/d/d_a/d_a_alink/asm/func_800DFEC0.s b/include/d/d_a/d_a_alink/asm/func_800DFEC0.s index 9b4c5673767..872da29107f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFEC0.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFEC0.s @@ -16,7 +16,7 @@ /* 800DFEFC 000DCE3C 28 00 00 0D */ cmplwi r0, 0xd /* 800DFF00 000DCE40 40 82 00 24 */ bne lbl_800DFF24 /* 800DFF04 000DCE44 7F E3 FB 78 */ mr r3, r31 -/* 800DFF08 000DCE48 4B FD 26 FD */ bl daAlink_c_NS_itemButton +/* 800DFF08 000DCE48 4B FD 26 FD */ bl itemButton__9daAlink_cFv /* 800DFF0C 000DCE4C 2C 03 00 00 */ cmpwi r3, 0 /* 800DFF10 000DCE50 40 82 00 14 */ bne lbl_800DFF24 /* 800DFF14 000DCE54 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0A9C.s b/include/d/d_a/d_a_alink/asm/func_800E0A9C.s index 50ca4df6e43..33a8c2a78c5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0A9C.s @@ -19,7 +19,7 @@ lbl_800E0AD8: /* 800E0AE0 000DDA20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0AE4 000DDA24 41 82 00 54 */ beq lbl_800E0B38 /* 800E0AE8 000DDA28 7F E3 FB 78 */ mr r3, r31 -/* 800E0AEC 000DDA2C 4B FD 1B 19 */ bl daAlink_c_NS_itemButton +/* 800E0AEC 000DDA2C 4B FD 1B 19 */ bl itemButton__9daAlink_cFv /* 800E0AF0 000DDA30 2C 03 00 00 */ cmpwi r3, 0 /* 800E0AF4 000DDA34 40 82 00 44 */ bne lbl_800E0B38 /* 800E0AF8 000DDA38 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0B58.s b/include/d/d_a/d_a_alink/asm/func_800E0B58.s index c7d0b5fdba6..0c25deedbd3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0B58.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0B58.s @@ -26,7 +26,7 @@ lbl_800E0BA8: /* 800E0BB0 000DDAF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0BB4 000DDAF4 41 82 00 1C */ beq lbl_800E0BD0 /* 800E0BB8 000DDAF8 7F E3 FB 78 */ mr r3, r31 -/* 800E0BBC 000DDAFC 4B FD 1A 79 */ bl daAlink_c_NS_itemTrigger +/* 800E0BBC 000DDAFC 4B FD 1A 79 */ bl itemTrigger__9daAlink_cFv /* 800E0BC0 000DDB00 2C 03 00 00 */ cmpwi r3, 0 /* 800E0BC4 000DDB04 41 82 00 0C */ beq lbl_800E0BD0 /* 800E0BC8 000DDB08 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0FA0.s b/include/d/d_a/d_a_alink/asm/func_800E0FA0.s index 168aabac052..ebcce22b56c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0FA0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0FA0.s @@ -25,7 +25,7 @@ lbl_800E0FF0: /* 800E0FF4 000DDF34 41 82 00 10 */ beq lbl_800E1004 /* 800E0FF8 000DDF38 7F E3 FB 78 */ mr r3, r31 /* 800E0FFC 000DDF3C 38 80 00 12 */ li r4, 0x12 -/* 800E1000 000DDF40 4B FD 22 51 */ bl daAlink_c_NS_setDoStatus +/* 800E1000 000DDF40 4B FD 22 51 */ bl setDoStatus__9daAlink_cFUc lbl_800E1004: /* 800E1004 000DDF44 7F E3 FB 78 */ mr r3, r31 /* 800E1008 000DDF48 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1ADC.s b/include/d/d_a/d_a_alink/asm/func_800E1ADC.s index 9cc394db516..c18ded173e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1ADC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1ADC.s @@ -14,7 +14,7 @@ lbl_800E1B04: /* 800E1B0C 000DEA4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1B10 000DEA50 41 82 00 84 */ beq lbl_800E1B94 /* 800E1B14 000DEA54 7F E3 FB 78 */ mr r3, r31 -/* 800E1B18 000DEA58 4B FD 0A ED */ bl daAlink_c_NS_itemButton +/* 800E1B18 000DEA58 4B FD 0A ED */ bl itemButton__9daAlink_cFv /* 800E1B1C 000DEA5C 2C 03 00 00 */ cmpwi r3, 0 /* 800E1B20 000DEA60 40 82 00 74 */ bne lbl_800E1B94 /* 800E1B24 000DEA64 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1BB4.s b/include/d/d_a/d_a_alink/asm/func_800E1BB4.s index 4fd0bc35113..ca683c8e647 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1BB4.s @@ -26,7 +26,7 @@ lbl_800E1C08: /* 800E1C10 000DEB50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1C14 000DEB54 41 82 00 1C */ beq lbl_800E1C30 /* 800E1C18 000DEB58 7F E3 FB 78 */ mr r3, r31 -/* 800E1C1C 000DEB5C 4B FD 0A 19 */ bl daAlink_c_NS_itemTrigger +/* 800E1C1C 000DEB5C 4B FD 0A 19 */ bl itemTrigger__9daAlink_cFv /* 800E1C20 000DEB60 2C 03 00 00 */ cmpwi r3, 0 /* 800E1C24 000DEB64 41 82 00 0C */ beq lbl_800E1C30 /* 800E1C28 000DEB68 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1EB0.s b/include/d/d_a/d_a_alink/asm/func_800E1EB0.s index 9ead2b9e88a..26b2e8d2d65 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1EB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1EB0.s @@ -22,7 +22,7 @@ lbl_800E1EF8: /* 800E1EFC 000DEE3C 41 82 00 10 */ beq lbl_800E1F0C /* 800E1F00 000DEE40 7F E3 FB 78 */ mr r3, r31 /* 800E1F04 000DEE44 38 80 00 12 */ li r4, 0x12 -/* 800E1F08 000DEE48 4B FD 13 49 */ bl daAlink_c_NS_setDoStatus +/* 800E1F08 000DEE48 4B FD 13 49 */ bl setDoStatus__9daAlink_cFUc lbl_800E1F0C: /* 800E1F0C 000DEE4C 7F E3 FB 78 */ mr r3, r31 /* 800E1F10 000DEE50 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E5170.s b/include/d/d_a/d_a_alink/asm/func_800E5170.s index 102d109da66..b8ef7835d4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5170.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5170.s @@ -28,7 +28,7 @@ lbl_800E51A0: /* 800E51D8 000E2118 41 82 00 14 */ beq lbl_800E51EC /* 800E51DC 000E211C 7F C3 F3 78 */ mr r3, r30 /* 800E51E0 000E2120 38 80 00 06 */ li r4, 6 -/* 800E51E4 000E2124 4B FC E0 6D */ bl daAlink_c_NS_setDoStatus +/* 800E51E4 000E2124 4B FC E0 6D */ bl setDoStatus__9daAlink_cFUc /* 800E51E8 000E2128 48 00 00 A0 */ b lbl_800E5288 lbl_800E51EC: /* 800E51EC 000E212C 80 9E 27 F4 */ lwz r4, 0x27f4(r30) @@ -48,7 +48,7 @@ lbl_800E5218: /* 800E5220 000E2160 41 82 00 14 */ beq lbl_800E5234 /* 800E5224 000E2164 7F C3 F3 78 */ mr r3, r30 /* 800E5228 000E2168 38 80 00 13 */ li r4, 0x13 -/* 800E522C 000E216C 4B FC E0 25 */ bl daAlink_c_NS_setDoStatus +/* 800E522C 000E216C 4B FC E0 25 */ bl setDoStatus__9daAlink_cFUc /* 800E5230 000E2170 48 00 00 58 */ b lbl_800E5288 lbl_800E5234: /* 800E5234 000E2174 7F C3 F3 78 */ mr r3, r30 @@ -69,12 +69,12 @@ lbl_800E525C: lbl_800E526C: /* 800E526C 000E21AC 7F C3 F3 78 */ mr r3, r30 /* 800E5270 000E21B0 38 80 00 14 */ li r4, 0x14 -/* 800E5274 000E21B4 4B FC DF DD */ bl daAlink_c_NS_setDoStatus +/* 800E5274 000E21B4 4B FC DF DD */ bl setDoStatus__9daAlink_cFUc /* 800E5278 000E21B8 48 00 00 10 */ b lbl_800E5288 lbl_800E527C: /* 800E527C 000E21BC 7F C3 F3 78 */ mr r3, r30 /* 800E5280 000E21C0 38 80 00 13 */ li r4, 0x13 -/* 800E5284 000E21C4 4B FC DF CD */ bl daAlink_c_NS_setDoStatus +/* 800E5284 000E21C4 4B FC DF CD */ bl setDoStatus__9daAlink_cFUc lbl_800E5288: /* 800E5288 000E21C8 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800E528C 000E21CC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b diff --git a/include/d/d_a/d_a_alink/asm/func_800E7EF4.s b/include/d/d_a/d_a_alink/asm/func_800E7EF4.s index 7a0d712584d..9a9b353464d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7EF4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7EF4.s @@ -2,7 +2,7 @@ /* 800E7EF8 000E4E38 7C 08 02 A6 */ mflr r0 /* 800E7EFC 000E4E3C 90 01 00 14 */ stw r0, 0x14(r1) /* 800E7F00 000E4E40 38 80 00 40 */ li r4, 0x40 -/* 800E7F04 000E4E44 4B FC A6 C9 */ bl daAlink_c_NS_itemTriggerCheck +/* 800E7F04 000E4E44 4B FC A6 C9 */ bl itemTriggerCheck__9daAlink_cFUc /* 800E7F08 000E4E48 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E7F0C 000E4E4C 7C 08 03 A6 */ mtlr r0 /* 800E7F10 000E4E50 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800E7F18.s b/include/d/d_a/d_a_alink/asm/func_800E7F18.s index bf7425d06c4..56034861d42 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7F18.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7F18.s @@ -2,7 +2,7 @@ /* 800E7F1C 000E4E5C 7C 08 02 A6 */ mflr r0 /* 800E7F20 000E4E60 90 01 00 14 */ stw r0, 0x14(r1) /* 800E7F24 000E4E64 38 80 00 40 */ li r4, 0x40 -/* 800E7F28 000E4E68 4B FC A6 C1 */ bl daAlink_c_NS_itemButtonCheck +/* 800E7F28 000E4E68 4B FC A6 C1 */ bl itemButtonCheck__9daAlink_cFUc /* 800E7F2C 000E4E6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E7F30 000E4E70 7C 08 03 A6 */ mtlr r0 /* 800E7F34 000E4E74 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800E9434.s b/include/d/d_a/d_a_alink/asm/func_800E9434.s index bb29f57958a..47363e4d97c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9434.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9434.s @@ -81,7 +81,7 @@ lbl_800E9554: /* 800E9560 000E64A0 40 80 00 34 */ bge lbl_800E9594 /* 800E9564 000E64A4 7F C3 F3 78 */ mr r3, r30 /* 800E9568 000E64A8 38 80 00 15 */ li r4, 0x15 -/* 800E956C 000E64AC 4B FC 9C FD */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800E956C 000E64AC 4B FC 9C FD */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800E9570 000E64B0 48 00 00 24 */ b lbl_800E9594 lbl_800E9574: /* 800E9574 000E64B4 C0 02 94 A0 */ lfs f0, lbl_80452EA0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E9894.s b/include/d/d_a/d_a_alink/asm/func_800E9894.s index 17fde796c37..4536a0f6e53 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9894.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9894.s @@ -54,7 +54,7 @@ lbl_800E9910: /* 800E9964 000E68A4 41 82 00 18 */ beq lbl_800E997C /* 800E9968 000E68A8 7F C3 F3 78 */ mr r3, r30 /* 800E996C 000E68AC 38 80 00 00 */ li r4, 0 -/* 800E9970 000E68B0 4B FC 98 E1 */ bl daAlink_c_NS_setDoStatus +/* 800E9970 000E68B0 4B FC 98 E1 */ bl setDoStatus__9daAlink_cFUc /* 800E9974 000E68B4 38 60 00 00 */ li r3, 0 /* 800E9978 000E68B8 48 00 02 38 */ b lbl_800E9BB0 lbl_800E997C: diff --git a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s index 70383b72641..723e510dd75 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s @@ -249,7 +249,7 @@ lbl_800E9F44: lbl_800E9F58: /* 800E9F58 000E6E98 7F 83 E3 78 */ mr r3, r28 /* 800E9F5C 000E6E9C 38 80 00 15 */ li r4, 0x15 -/* 800E9F60 000E6EA0 4B FC 93 09 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800E9F60 000E6EA0 4B FC 93 09 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800E9F64 000E6EA4 A8 7C 04 E6 */ lha r3, 0x4e6(r28) /* 800E9F68 000E6EA8 A8 1C 2F E2 */ lha r0, 0x2fe2(r28) /* 800E9F6C 000E6EAC 7C 03 00 50 */ subf r0, r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s index 12f9824ab19..5338b51b3b6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s @@ -65,7 +65,7 @@ lbl_800EA584: /* 800EA5B4 000E74F4 40 82 00 C0 */ bne lbl_800EA674 /* 800EA5B8 000E74F8 7F E3 FB 78 */ mr r3, r31 /* 800EA5BC 000E74FC 38 80 00 91 */ li r4, 0x91 -/* 800EA5C0 000E7500 4B FC 8C 91 */ bl daAlink_c_NS_setDoStatus +/* 800EA5C0 000E7500 4B FC 8C 91 */ bl setDoStatus__9daAlink_cFUc /* 800EA5C4 000E7504 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800EA5C8 000E7508 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EA5CC 000E750C 41 82 00 10 */ beq lbl_800EA5DC diff --git a/include/d/d_a/d_a_alink/asm/func_800EA908.s b/include/d/d_a/d_a_alink/asm/func_800EA908.s index 04c48129e58..508fd86d876 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA908.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA908.s @@ -2,7 +2,7 @@ /* 800EA90C 000E784C 7C 08 02 A6 */ mflr r0 /* 800EA910 000E7850 90 01 00 14 */ stw r0, 0x14(r1) /* 800EA914 000E7854 38 80 00 08 */ li r4, 8 -/* 800EA918 000E7858 4B FC 7C B5 */ bl daAlink_c_NS_itemTriggerCheck +/* 800EA918 000E7858 4B FC 7C B5 */ bl itemTriggerCheck__9daAlink_cFUc /* 800EA91C 000E785C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EA920 000E7860 7C 08 03 A6 */ mtlr r0 /* 800EA924 000E7864 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA92C.s b/include/d/d_a/d_a_alink/asm/func_800EA92C.s index 07f9d4fc3cc..05d51bba5f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA92C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA92C.s @@ -2,7 +2,7 @@ /* 800EA930 000E7870 7C 08 02 A6 */ mflr r0 /* 800EA934 000E7874 90 01 00 14 */ stw r0, 0x14(r1) /* 800EA938 000E7878 38 80 00 44 */ li r4, 0x44 -/* 800EA93C 000E787C 4B FC 89 5D */ bl daAlink_c_NS_setBStatus +/* 800EA93C 000E787C 4B FC 89 5D */ bl setBStatus__9daAlink_cFUc /* 800EA940 000E7880 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EA944 000E7884 7C 08 03 A6 */ mtlr r0 /* 800EA948 000E7888 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800EAA28.s b/include/d/d_a/d_a_alink/asm/func_800EAA28.s index 9e0ed0878b3..b5881606b36 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAA28.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAA28.s @@ -24,7 +24,7 @@ lbl_800EAA78: /* 800EAA7C 000E79BC 4B FF FE B1 */ bl daAlink_c_NS_setSumouPunchStatus /* 800EAA80 000E79C0 7F E3 FB 78 */ mr r3, r31 /* 800EAA84 000E79C4 38 80 00 15 */ li r4, 0x15 -/* 800EAA88 000E79C8 4B FC 87 E1 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800EAA88 000E79C8 4B FC 87 E1 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800EAA8C 000E79CC 38 00 00 05 */ li r0, 5 /* 800EAA90 000E79D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800EAA94 000E79D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800EAD84.s b/include/d/d_a/d_a_alink/asm/func_800EAD84.s index 395e4c1c3de..0179af8b5bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAD84.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAD84.s @@ -106,7 +106,7 @@ lbl_800EAED4: lbl_800EAF00: /* 800EAF00 000E7E40 7F A3 EB 78 */ mr r3, r29 /* 800EAF04 000E7E44 38 80 00 64 */ li r4, 0x64 -/* 800EAF08 000E7E48 4B FC 83 79 */ bl daAlink_c_NS_setDoStatusContinuation +/* 800EAF08 000E7E48 4B FC 83 79 */ bl setDoStatusContinuation__9daAlink_cFUc /* 800EAF0C 000E7E4C C0 3D 33 9C */ lfs f1, 0x339c(r29) /* 800EAF10 000E7E50 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EAF14 000E7E54 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EB208.s b/include/d/d_a/d_a_alink/asm/func_800EB208.s index 1b8916e89a9..50e9242fb05 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB208.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB208.s @@ -25,7 +25,7 @@ /* 800EB268 000E81A8 4B FF F6 C5 */ bl daAlink_c_NS_setSumouPunchStatus /* 800EB26C 000E81AC 7F E3 FB 78 */ mr r3, r31 /* 800EB270 000E81B0 38 80 00 15 */ li r4, 0x15 -/* 800EB274 000E81B4 4B FC 7F F5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800EB274 000E81B4 4B FC 7F F5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800EB278 000E81B8 38 00 00 05 */ li r0, 5 /* 800EB27C 000E81BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800EB280 000E81C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s index 3666054d1c0..30b80fa6213 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s @@ -80,7 +80,7 @@ lbl_800EB3DC: /* 800EB3E0 000E8320 4B FF F5 4D */ bl daAlink_c_NS_setSumouPunchStatus /* 800EB3E4 000E8324 7F E3 FB 78 */ mr r3, r31 /* 800EB3E8 000E8328 38 80 00 15 */ li r4, 0x15 -/* 800EB3EC 000E832C 4B FC 7E 7D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800EB3EC 000E832C 4B FC 7E 7D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800EB3F0 000E8330 38 00 00 05 */ li r0, 5 /* 800EB3F4 000E8334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800EB3F8 000E8338 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800EB624.s b/include/d/d_a/d_a_alink/asm/func_800EB624.s index 7f57b41654b..010bb20f4f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB624.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB624.s @@ -217,7 +217,7 @@ lbl_800EB920: /* 800EB924 000E8864 41 82 00 24 */ beq lbl_800EB948 /* 800EB928 000E8868 7F 63 DB 78 */ mr r3, r27 /* 800EB92C 000E886C 38 80 00 15 */ li r4, 0x15 -/* 800EB930 000E8870 4B FC 79 39 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800EB930 000E8870 4B FC 79 39 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800EB934 000E8874 38 00 00 15 */ li r0, 0x15 /* 800EB938 000E8878 B0 1B 30 0E */ sth r0, 0x300e(r27) /* 800EB93C 000E887C 38 00 00 04 */ li r0, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s index 2327f487fd8..d9c231a95db 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s @@ -159,7 +159,7 @@ lbl_800EBF20: /* 800EBF28 000E8E68 40 82 00 14 */ bne lbl_800EBF3C /* 800EBF2C 000E8E6C 7F E3 FB 78 */ mr r3, r31 /* 800EBF30 000E8E70 38 80 00 15 */ li r4, 0x15 -/* 800EBF34 000E8E74 4B FC 73 35 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800EBF34 000E8E74 4B FC 73 35 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800EBF38 000E8E78 48 00 00 14 */ b lbl_800EBF4C lbl_800EBF3C: /* 800EBF3C 000E8E7C 2C 00 00 44 */ cmpwi r0, 0x44 diff --git a/include/d/d_a/d_a_alink/asm/func_800EDB48.s b/include/d/d_a/d_a_alink/asm/func_800EDB48.s index bb75f4be6c9..6cb6fe6597c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDB48.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDB48.s @@ -25,15 +25,15 @@ lbl_800EDB88: /* 800EDBA4 000EAAE4 41 82 00 14 */ beq lbl_800EDBB8 /* 800EDBA8 000EAAE8 7F 83 E3 78 */ mr r3, r28 /* 800EDBAC 000EAAEC 38 80 00 0B */ li r4, 0xb -/* 800EDBB0 000EAAF0 4B FC 56 71 */ bl daAlink_c_NS_setRStatus +/* 800EDBB0 000EAAF0 4B FC 56 71 */ bl setRStatus__9daAlink_cFUc /* 800EDBB4 000EAAF4 48 00 00 10 */ b lbl_800EDBC4 lbl_800EDBB8: /* 800EDBB8 000EAAF8 7F 83 E3 78 */ mr r3, r28 /* 800EDBBC 000EAAFC 38 80 00 3E */ li r4, 0x3e -/* 800EDBC0 000EAB00 4B FC 56 61 */ bl daAlink_c_NS_setRStatus +/* 800EDBC0 000EAB00 4B FC 56 61 */ bl setRStatus__9daAlink_cFUc lbl_800EDBC4: /* 800EDBC4 000EAB04 7F 83 E3 78 */ mr r3, r28 -/* 800EDBC8 000EAB08 4B FC 4A 9D */ bl daAlink_c_NS_spActionButton +/* 800EDBC8 000EAB08 4B FC 4A 9D */ bl spActionButton__9daAlink_cFv /* 800EDBCC 000EAB0C 2C 03 00 00 */ cmpwi r3, 0 /* 800EDBD0 000EAB10 41 82 00 24 */ beq lbl_800EDBF4 /* 800EDBD4 000EAB14 7F 83 E3 78 */ mr r3, r28 diff --git a/include/d/d_a/d_a_alink/asm/func_800EDEEC.s b/include/d/d_a/d_a_alink/asm/func_800EDEEC.s index a2d4040dc9c..759a86afc2e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDEEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDEEC.s @@ -97,7 +97,7 @@ lbl_800EE04C: /* 800EE058 000EAF98 2C 03 00 00 */ cmpwi r3, 0 /* 800EE05C 000EAF9C 41 82 00 40 */ beq lbl_800EE09C /* 800EE060 000EAFA0 7F A3 EB 78 */ mr r3, r29 -/* 800EE064 000EAFA4 4B FC 46 01 */ bl daAlink_c_NS_spActionButton +/* 800EE064 000EAFA4 4B FC 46 01 */ bl spActionButton__9daAlink_cFv /* 800EE068 000EAFA8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE06C 000EAFAC 41 82 00 30 */ beq lbl_800EE09C /* 800EE070 000EAFB0 7F A3 EB 78 */ mr r3, r29 @@ -171,7 +171,7 @@ lbl_800EE158: /* 800EE170 000EB0B0 41 82 01 54 */ beq lbl_800EE2C4 /* 800EE174 000EB0B4 7F A3 EB 78 */ mr r3, r29 /* 800EE178 000EB0B8 38 80 00 28 */ li r4, 0x28 -/* 800EE17C 000EB0BC 4B FC 50 D5 */ bl daAlink_c_NS_setDoStatus +/* 800EE17C 000EB0BC 4B FC 50 D5 */ bl setDoStatus__9daAlink_cFUc /* 800EE180 000EB0C0 88 1D 2F 8D */ lbz r0, 0x2f8d(r29) /* 800EE184 000EB0C4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EE188 000EB0C8 41 82 01 3C */ beq lbl_800EE2C4 @@ -201,7 +201,7 @@ lbl_800EE1DC: /* 800EE1E4 000EB124 41 82 00 E0 */ beq lbl_800EE2C4 /* 800EE1E8 000EB128 7F A3 EB 78 */ mr r3, r29 /* 800EE1EC 000EB12C 38 80 00 09 */ li r4, 9 -/* 800EE1F0 000EB130 4B FC 50 61 */ bl daAlink_c_NS_setDoStatus +/* 800EE1F0 000EB130 4B FC 50 61 */ bl setDoStatus__9daAlink_cFUc /* 800EE1F4 000EB134 88 1D 2F 8D */ lbz r0, 0x2f8d(r29) /* 800EE1F8 000EB138 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EE1FC 000EB13C 41 82 00 C8 */ beq lbl_800EE2C4 @@ -405,7 +405,7 @@ lbl_800EE4BC: /* 800EE4D4 000EB414 2C 03 00 4E */ cmpwi r3, 0x4e /* 800EE4D8 000EB418 41 82 00 38 */ beq lbl_800EE510 /* 800EE4DC 000EB41C 7F A3 EB 78 */ mr r3, r29 -/* 800EE4E0 000EB420 4B FC 41 85 */ bl daAlink_c_NS_spActionButton +/* 800EE4E0 000EB420 4B FC 41 85 */ bl spActionButton__9daAlink_cFv /* 800EE4E4 000EB424 2C 03 00 00 */ cmpwi r3, 0 /* 800EE4E8 000EB428 41 82 00 34 */ beq lbl_800EE51C /* 800EE4EC 000EB42C 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_800EE64C.s b/include/d/d_a/d_a_alink/asm/func_800EE64C.s index 1fd1ba1f0af..8f048302166 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EE64C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EE64C.s @@ -65,7 +65,7 @@ lbl_800EE720: /* 800EE740 000EB680 41 82 00 24 */ beq lbl_800EE764 /* 800EE744 000EB684 7F C3 F3 78 */ mr r3, r30 /* 800EE748 000EB688 38 80 00 09 */ li r4, 9 -/* 800EE74C 000EB68C 4B FC 4B 05 */ bl daAlink_c_NS_setDoStatus +/* 800EE74C 000EB68C 4B FC 4B 05 */ bl setDoStatus__9daAlink_cFUc /* 800EE750 000EB690 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800EE754 000EB694 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EE758 000EB698 41 82 00 0C */ beq lbl_800EE764 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF6B0.s b/include/d/d_a/d_a_alink/asm/func_800EF6B0.s index db599b94518..56db28e4403 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF6B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF6B0.s @@ -31,12 +31,12 @@ lbl_800EF70C: /* 800EF724 000EC664 40 82 00 14 */ bne lbl_800EF738 /* 800EF728 000EC668 7F C3 F3 78 */ mr r3, r30 /* 800EF72C 000EC66C 38 80 00 32 */ li r4, 0x32 -/* 800EF730 000EC670 4B FC 3B 21 */ bl daAlink_c_NS_setDoStatus +/* 800EF730 000EC670 4B FC 3B 21 */ bl setDoStatus__9daAlink_cFUc /* 800EF734 000EC674 48 00 01 34 */ b lbl_800EF868 lbl_800EF738: /* 800EF738 000EC678 7F C3 F3 78 */ mr r3, r30 /* 800EF73C 000EC67C 38 80 00 8C */ li r4, 0x8c -/* 800EF740 000EC680 4B FC 3B 11 */ bl daAlink_c_NS_setDoStatus +/* 800EF740 000EC680 4B FC 3B 11 */ bl setDoStatus__9daAlink_cFUc /* 800EF744 000EC684 48 00 01 24 */ b lbl_800EF868 lbl_800EF748: /* 800EF748 000EC688 7F C3 F3 78 */ mr r3, r30 @@ -84,12 +84,12 @@ lbl_800EF7D4: /* 800EF7E8 000EC728 40 82 00 14 */ bne lbl_800EF7FC /* 800EF7EC 000EC72C 7F C3 F3 78 */ mr r3, r30 /* 800EF7F0 000EC730 38 80 00 32 */ li r4, 0x32 -/* 800EF7F4 000EC734 4B FC 3A 5D */ bl daAlink_c_NS_setDoStatus +/* 800EF7F4 000EC734 4B FC 3A 5D */ bl setDoStatus__9daAlink_cFUc /* 800EF7F8 000EC738 48 00 00 70 */ b lbl_800EF868 lbl_800EF7FC: /* 800EF7FC 000EC73C 7F C3 F3 78 */ mr r3, r30 /* 800EF800 000EC740 38 80 00 8C */ li r4, 0x8c -/* 800EF804 000EC744 4B FC 3A 4D */ bl daAlink_c_NS_setDoStatus +/* 800EF804 000EC744 4B FC 3A 4D */ bl setDoStatus__9daAlink_cFUc /* 800EF808 000EC748 48 00 00 60 */ b lbl_800EF868 lbl_800EF80C: /* 800EF80C 000EC74C 7F C3 F3 78 */ mr r3, r30 @@ -110,12 +110,12 @@ lbl_800EF80C: /* 800EF848 000EC788 41 82 00 14 */ beq lbl_800EF85C /* 800EF84C 000EC78C 7F C3 F3 78 */ mr r3, r30 /* 800EF850 000EC790 38 80 00 32 */ li r4, 0x32 -/* 800EF854 000EC794 4B FC 39 FD */ bl daAlink_c_NS_setDoStatus +/* 800EF854 000EC794 4B FC 39 FD */ bl setDoStatus__9daAlink_cFUc /* 800EF858 000EC798 48 00 00 10 */ b lbl_800EF868 lbl_800EF85C: /* 800EF85C 000EC79C 7F C3 F3 78 */ mr r3, r30 /* 800EF860 000EC7A0 38 80 00 04 */ li r4, 4 -/* 800EF864 000EC7A4 4B FC 39 ED */ bl daAlink_c_NS_setDoStatus +/* 800EF864 000EC7A4 4B FC 39 ED */ bl setDoStatus__9daAlink_cFUc lbl_800EF868: /* 800EF868 000EC7A8 7F E3 FB 78 */ mr r3, r31 /* 800EF86C 000EC7AC 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s index 909bfc33ca4..ff9db8718c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s @@ -95,7 +95,7 @@ lbl_800F0B70: /* 800F0C04 000EDB44 40 80 00 14 */ bge lbl_800F0C18 /* 800F0C08 000EDB48 7F E3 FB 78 */ mr r3, r31 /* 800F0C0C 000EDB4C 38 80 00 2E */ li r4, 0x2e -/* 800F0C10 000EDB50 4B FC 26 89 */ bl daAlink_c_NS_setBStatus +/* 800F0C10 000EDB50 4B FC 26 89 */ bl setBStatus__9daAlink_cFUc /* 800F0C14 000EDB54 48 00 00 3C */ b lbl_800F0C50 lbl_800F0C18: /* 800F0C18 000EDB58 80 1F 05 88 */ lwz r0, 0x588(r31) @@ -111,7 +111,7 @@ lbl_800F0C18: /* 800F0C40 000EDB80 98 03 5E 4B */ stb r0, 0x5e4b(r3) /* 800F0C44 000EDB84 7F E3 FB 78 */ mr r3, r31 /* 800F0C48 000EDB88 38 80 00 2E */ li r4, 0x2e -/* 800F0C4C 000EDB8C 4B FC 26 4D */ bl daAlink_c_NS_setBStatus +/* 800F0C4C 000EDB8C 4B FC 26 4D */ bl setBStatus__9daAlink_cFUc lbl_800F0C50: /* 800F0C50 000EDB90 38 60 00 01 */ li r3, 1 lbl_800F0C54: diff --git a/include/d/d_a/d_a_alink/asm/func_800F0CE4.s b/include/d/d_a/d_a_alink/asm/func_800F0CE4.s index df846a761da..a102a63b351 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0CE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0CE4.s @@ -109,15 +109,15 @@ lbl_800F0E3C: /* 800F0E74 000EDDB4 41 82 00 14 */ beq lbl_800F0E88 /* 800F0E78 000EDDB8 7F C3 F3 78 */ mr r3, r30 /* 800F0E7C 000EDDBC 38 80 00 0B */ li r4, 0xb -/* 800F0E80 000EDDC0 4B FC 23 A1 */ bl daAlink_c_NS_setRStatus +/* 800F0E80 000EDDC0 4B FC 23 A1 */ bl setRStatus__9daAlink_cFUc /* 800F0E84 000EDDC4 48 00 00 10 */ b lbl_800F0E94 lbl_800F0E88: /* 800F0E88 000EDDC8 7F C3 F3 78 */ mr r3, r30 /* 800F0E8C 000EDDCC 38 80 00 3E */ li r4, 0x3e -/* 800F0E90 000EDDD0 4B FC 23 91 */ bl daAlink_c_NS_setRStatus +/* 800F0E90 000EDDD0 4B FC 23 91 */ bl setRStatus__9daAlink_cFUc lbl_800F0E94: /* 800F0E94 000EDDD4 7F C3 F3 78 */ mr r3, r30 -/* 800F0E98 000EDDD8 4B FC 17 CD */ bl daAlink_c_NS_spActionButton +/* 800F0E98 000EDDD8 4B FC 17 CD */ bl spActionButton__9daAlink_cFv /* 800F0E9C 000EDDDC 2C 03 00 00 */ cmpwi r3, 0 /* 800F0EA0 000EDDE0 41 82 00 24 */ beq lbl_800F0EC4 /* 800F0EA4 000EDDE4 7F C3 F3 78 */ mr r3, r30 @@ -204,7 +204,7 @@ lbl_800F0F5C: /* 800F0FC8 000EDF08 48 00 00 80 */ b lbl_800F1048 lbl_800F0FCC: /* 800F0FCC 000EDF0C 7F C3 F3 78 */ mr r3, r30 -/* 800F0FD0 000EDF10 4B FC 16 95 */ bl daAlink_c_NS_spActionButton +/* 800F0FD0 000EDF10 4B FC 16 95 */ bl spActionButton__9daAlink_cFv /* 800F0FD4 000EDF14 2C 03 00 00 */ cmpwi r3, 0 /* 800F0FD8 000EDF18 41 82 00 64 */ beq lbl_800F103C /* 800F0FDC 000EDF1C 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -212,7 +212,7 @@ lbl_800F0FCC: /* 800F0FE4 000EDF24 40 82 00 58 */ bne lbl_800F103C /* 800F0FE8 000EDF28 7F C3 F3 78 */ mr r3, r30 /* 800F0FEC 000EDF2C 38 80 00 32 */ li r4, 0x32 -/* 800F0FF0 000EDF30 4B FC 22 61 */ bl daAlink_c_NS_setDoStatus +/* 800F0FF0 000EDF30 4B FC 22 61 */ bl setDoStatus__9daAlink_cFUc /* 800F0FF4 000EDF34 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800F0FF8 000EDF38 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800F0FFC 000EDF3C 41 82 00 40 */ beq lbl_800F103C diff --git a/include/d/d_a/d_a_alink/asm/func_800F1688.s b/include/d/d_a/d_a_alink/asm/func_800F1688.s index 42e5d6369c0..d118e6b9258 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1688.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1688.s @@ -51,7 +51,7 @@ lbl_800F1724: /* 800F1744 000EE684 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800F1748 000EE688 40 82 00 14 */ bne lbl_800F175C /* 800F174C 000EE68C 7F E3 FB 78 */ mr r3, r31 -/* 800F1750 000EE690 4B FC 0F 15 */ bl daAlink_c_NS_spActionButton +/* 800F1750 000EE690 4B FC 0F 15 */ bl spActionButton__9daAlink_cFv /* 800F1754 000EE694 2C 03 00 00 */ cmpwi r3, 0 /* 800F1758 000EE698 41 82 00 8C */ beq lbl_800F17E4 lbl_800F175C: @@ -76,12 +76,12 @@ lbl_800F178C: /* 800F179C 000EE6DC 41 82 00 14 */ beq lbl_800F17B0 /* 800F17A0 000EE6E0 7F E3 FB 78 */ mr r3, r31 /* 800F17A4 000EE6E4 38 80 00 0B */ li r4, 0xb -/* 800F17A8 000EE6E8 4B FC 1A 79 */ bl daAlink_c_NS_setRStatus +/* 800F17A8 000EE6E8 4B FC 1A 79 */ bl setRStatus__9daAlink_cFUc /* 800F17AC 000EE6EC 48 00 00 10 */ b lbl_800F17BC lbl_800F17B0: /* 800F17B0 000EE6F0 7F E3 FB 78 */ mr r3, r31 /* 800F17B4 000EE6F4 38 80 00 3E */ li r4, 0x3e -/* 800F17B8 000EE6F8 4B FC 1A 69 */ bl daAlink_c_NS_setRStatus +/* 800F17B8 000EE6F8 4B FC 1A 69 */ bl setRStatus__9daAlink_cFUc lbl_800F17BC: /* 800F17BC 000EE6FC 7F E3 FB 78 */ mr r3, r31 /* 800F17C0 000EE700 38 80 00 02 */ li r4, 2 @@ -105,12 +105,12 @@ lbl_800F17E4: /* 800F1804 000EE744 41 82 00 14 */ beq lbl_800F1818 /* 800F1808 000EE748 7F E3 FB 78 */ mr r3, r31 /* 800F180C 000EE74C 38 80 00 0B */ li r4, 0xb -/* 800F1810 000EE750 4B FC 1A 11 */ bl daAlink_c_NS_setRStatus +/* 800F1810 000EE750 4B FC 1A 11 */ bl setRStatus__9daAlink_cFUc /* 800F1814 000EE754 48 00 00 10 */ b lbl_800F1824 lbl_800F1818: /* 800F1818 000EE758 7F E3 FB 78 */ mr r3, r31 /* 800F181C 000EE75C 38 80 00 3E */ li r4, 0x3e -/* 800F1820 000EE760 4B FC 1A 01 */ bl daAlink_c_NS_setRStatus +/* 800F1820 000EE760 4B FC 1A 01 */ bl setRStatus__9daAlink_cFUc lbl_800F1824: /* 800F1824 000EE764 7F E3 FB 78 */ mr r3, r31 /* 800F1828 000EE768 38 80 00 01 */ li r4, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F194C.s b/include/d/d_a/d_a_alink/asm/func_800F194C.s index 85bc64f02d8..5418473c910 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F194C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F194C.s @@ -68,7 +68,7 @@ lbl_800F1A44: lbl_800F1A48: /* 800F1A48 000EE988 7F C3 F3 78 */ mr r3, r30 /* 800F1A4C 000EE98C 38 80 00 08 */ li r4, 8 -/* 800F1A50 000EE990 4B FC 0B 99 */ bl daAlink_c_NS_itemButtonCheck +/* 800F1A50 000EE990 4B FC 0B 99 */ bl itemButtonCheck__9daAlink_cFUc /* 800F1A54 000EE994 2C 03 00 00 */ cmpwi r3, 0 /* 800F1A58 000EE998 40 82 00 38 */ bne lbl_800F1A90 /* 800F1A5C 000EE99C A8 1E 30 0C */ lha r0, 0x300c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F21B4.s b/include/d/d_a/d_a_alink/asm/func_800F21B4.s index 0112b504de0..087e1abea92 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F21B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F21B4.s @@ -4,7 +4,7 @@ /* 800F21C0 000EF100 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F21C4 000EF104 7C 7F 1B 78 */ mr r31, r3 /* 800F21C8 000EF108 38 80 00 12 */ li r4, 0x12 -/* 800F21CC 000EF10C 4B FC 10 85 */ bl daAlink_c_NS_setDoStatus +/* 800F21CC 000EF10C 4B FC 10 85 */ bl setDoStatus__9daAlink_cFUc /* 800F21D0 000EF110 7F E3 FB 78 */ mr r3, r31 /* 800F21D4 000EF114 4B FF B8 51 */ bl daAlink_c_NS_setSyncRidePos /* 800F21D8 000EF118 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F22A8.s b/include/d/d_a/d_a_alink/asm/func_800F22A8.s index 5f87dd009c1..6ef404aa05e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F22A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F22A8.s @@ -4,7 +4,7 @@ /* 800F22B4 000EF1F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F22B8 000EF1F8 7C 7F 1B 78 */ mr r31, r3 /* 800F22BC 000EF1FC 38 80 00 12 */ li r4, 0x12 -/* 800F22C0 000EF200 4B FC 0F 91 */ bl daAlink_c_NS_setDoStatus +/* 800F22C0 000EF200 4B FC 0F 91 */ bl setDoStatus__9daAlink_cFUc /* 800F22C4 000EF204 7F E3 FB 78 */ mr r3, r31 /* 800F22C8 000EF208 4B FF B7 5D */ bl daAlink_c_NS_setSyncRidePos /* 800F22CC 000EF20C 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F24C8.s b/include/d/d_a/d_a_alink/asm/func_800F24C8.s index 552ea67d9a5..f8fec73e74f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F24C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F24C8.s @@ -25,7 +25,7 @@ lbl_800F2518: /* 800F251C 000EF45C 41 82 00 10 */ beq lbl_800F252C /* 800F2520 000EF460 7F E3 FB 78 */ mr r3, r31 /* 800F2524 000EF464 38 80 00 12 */ li r4, 0x12 -/* 800F2528 000EF468 4B FC 0D 29 */ bl daAlink_c_NS_setDoStatus +/* 800F2528 000EF468 4B FC 0D 29 */ bl setDoStatus__9daAlink_cFUc lbl_800F252C: /* 800F252C 000EF46C 7F E3 FB 78 */ mr r3, r31 /* 800F2530 000EF470 4B FF B4 F5 */ bl daAlink_c_NS_setSyncRidePos diff --git a/include/d/d_a/d_a_alink/asm/func_800F2628.s b/include/d/d_a/d_a_alink/asm/func_800F2628.s index c3c751d93bd..e101c991bfd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2628.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2628.s @@ -25,7 +25,7 @@ lbl_800F2678: /* 800F267C 000EF5BC 41 82 00 10 */ beq lbl_800F268C /* 800F2680 000EF5C0 7F E3 FB 78 */ mr r3, r31 /* 800F2684 000EF5C4 38 80 00 12 */ li r4, 0x12 -/* 800F2688 000EF5C8 4B FC 0B C9 */ bl daAlink_c_NS_setDoStatus +/* 800F2688 000EF5C8 4B FC 0B C9 */ bl setDoStatus__9daAlink_cFUc lbl_800F268C: /* 800F268C 000EF5CC 7F E3 FB 78 */ mr r3, r31 /* 800F2690 000EF5D0 4B FF B3 95 */ bl daAlink_c_NS_setSyncRidePos diff --git a/include/d/d_a/d_a_alink/asm/func_800F2770.s b/include/d/d_a/d_a_alink/asm/func_800F2770.s index b3f3d995b61..d4441d74c00 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2770.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2770.s @@ -8,7 +8,7 @@ /* 800F278C 000EF6CC 41 82 00 10 */ beq lbl_800F279C /* 800F2790 000EF6D0 7F E3 FB 78 */ mr r3, r31 /* 800F2794 000EF6D4 38 80 00 12 */ li r4, 0x12 -/* 800F2798 000EF6D8 4B FC 0A B9 */ bl daAlink_c_NS_setDoStatus +/* 800F2798 000EF6D8 4B FC 0A B9 */ bl setDoStatus__9daAlink_cFUc lbl_800F279C: /* 800F279C 000EF6DC 7F E3 FB 78 */ mr r3, r31 /* 800F27A0 000EF6E0 4B FF B2 85 */ bl daAlink_c_NS_setSyncRidePos diff --git a/include/d/d_a/d_a_alink/asm/func_800F2898.s b/include/d/d_a/d_a_alink/asm/func_800F2898.s index 47830bf51dd..2e1e1c1826d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2898.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2898.s @@ -10,7 +10,7 @@ /* 800F28BC 000EF7FC 41 82 00 10 */ beq lbl_800F28CC /* 800F28C0 000EF800 7F E3 FB 78 */ mr r3, r31 /* 800F28C4 000EF804 38 80 00 12 */ li r4, 0x12 -/* 800F28C8 000EF808 4B FC 09 89 */ bl daAlink_c_NS_setDoStatus +/* 800F28C8 000EF808 4B FC 09 89 */ bl setDoStatus__9daAlink_cFUc lbl_800F28CC: /* 800F28CC 000EF80C 7F E3 FB 78 */ mr r3, r31 /* 800F28D0 000EF810 4B FF B1 55 */ bl daAlink_c_NS_setSyncRidePos diff --git a/include/d/d_a/d_a_alink/asm/func_800F2F98.s b/include/d/d_a/d_a_alink/asm/func_800F2F98.s index 157d35d0065..f14905a9fff 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2F98.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2F98.s @@ -271,7 +271,7 @@ lbl_800F3378: /* 800F338C 000F02CC 41 82 00 78 */ beq lbl_800F3404 /* 800F3390 000F02D0 7F C3 F3 78 */ mr r3, r30 /* 800F3394 000F02D4 38 80 00 6F */ li r4, 0x6f -/* 800F3398 000F02D8 4B FB FE B9 */ bl daAlink_c_NS_setDoStatus +/* 800F3398 000F02D8 4B FB FE B9 */ bl setDoStatus__9daAlink_cFUc /* 800F339C 000F02DC 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 800F33A0 000F02E0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800F33A4 000F02E4 41 82 00 58 */ beq lbl_800F33FC diff --git a/include/d/d_a/d_a_alink/asm/func_800F542C.s b/include/d/d_a/d_a_alink/asm/func_800F542C.s index bc8ea274a66..afd8b5babb8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F542C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F542C.s @@ -46,7 +46,7 @@ lbl_800F546C: /* 800F54D8 000F2418 40 82 00 10 */ bne lbl_800F54E8 /* 800F54DC 000F241C 7F E3 FB 78 */ mr r3, r31 /* 800F54E0 000F2420 38 80 00 16 */ li r4, 0x16 -/* 800F54E4 000F2424 4B FB DD 85 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800F54E4 000F2424 4B FB DD 85 */ bl setDoStatusEmphasys__9daAlink_cFUc lbl_800F54E8: /* 800F54E8 000F2428 7F E3 FB 78 */ mr r3, r31 /* 800F54EC 000F242C 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F6D64.s b/include/d/d_a/d_a_alink/asm/func_800F6D64.s index 9ec56c1cda9..1df32ab64e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6D64.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6D64.s @@ -5,7 +5,7 @@ /* 800F6D74 000F3CB4 48 26 B4 69 */ bl _savegpr_29 /* 800F6D78 000F3CB8 7C 7D 1B 78 */ mr r29, r3 /* 800F6D7C 000F3CBC 38 80 00 12 */ li r4, 0x12 -/* 800F6D80 000F3CC0 4B FB C4 D1 */ bl daAlink_c_NS_setDoStatus +/* 800F6D80 000F3CC0 4B FB C4 D1 */ bl setDoStatus__9daAlink_cFUc /* 800F6D84 000F3CC4 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F6D88 000F3CC8 AB DD 04 DE */ lha r30, 0x4de(r29) /* 800F6D8C 000F3CCC 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_800F6E44.s b/include/d/d_a/d_a_alink/asm/func_800F6E44.s index 09aafa54a4a..4da1ba30760 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6E44.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6E44.s @@ -4,7 +4,7 @@ /* 800F6E50 000F3D90 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6E54 000F3D94 7C 7F 1B 78 */ mr r31, r3 /* 800F6E58 000F3D98 38 80 00 12 */ li r4, 0x12 -/* 800F6E5C 000F3D9C 4B FB C3 F5 */ bl daAlink_c_NS_setDoStatus +/* 800F6E5C 000F3D9C 4B FB C3 F5 */ bl setDoStatus__9daAlink_cFUc /* 800F6E60 000F3DA0 7F E3 FB 78 */ mr r3, r31 /* 800F6E64 000F3DA4 4B FF D9 75 */ bl daAlink_c_NS_canoeCommon /* 800F6E68 000F3DA8 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7010.s b/include/d/d_a/d_a_alink/asm/func_800F7010.s index e8cbd470ca2..458c9e15956 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7010.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7010.s @@ -26,7 +26,7 @@ lbl_800F7064: /* 800F7068 000F3FA8 41 82 00 10 */ beq lbl_800F7078 /* 800F706C 000F3FAC 7F A3 EB 78 */ mr r3, r29 /* 800F7070 000F3FB0 38 80 00 12 */ li r4, 0x12 -/* 800F7074 000F3FB4 4B FB C1 DD */ bl daAlink_c_NS_setDoStatus +/* 800F7074 000F3FB4 4B FB C1 DD */ bl setDoStatus__9daAlink_cFUc lbl_800F7078: /* 800F7078 000F3FB8 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F707C 000F3FBC AB DD 04 DE */ lha r30, 0x4de(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F715C.s b/include/d/d_a/d_a_alink/asm/func_800F715C.s index 980135bc7b2..b557f2191a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F715C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F715C.s @@ -25,7 +25,7 @@ lbl_800F71AC: /* 800F71B0 000F40F0 41 82 00 10 */ beq lbl_800F71C0 /* 800F71B4 000F40F4 7F E3 FB 78 */ mr r3, r31 /* 800F71B8 000F40F8 38 80 00 12 */ li r4, 0x12 -/* 800F71BC 000F40FC 4B FB C0 95 */ bl daAlink_c_NS_setDoStatus +/* 800F71BC 000F40FC 4B FB C0 95 */ bl setDoStatus__9daAlink_cFUc lbl_800F71C0: /* 800F71C0 000F4100 7F E3 FB 78 */ mr r3, r31 /* 800F71C4 000F4104 4B FF D6 15 */ bl daAlink_c_NS_canoeCommon diff --git a/include/d/d_a/d_a_alink/asm/func_800F7274.s b/include/d/d_a/d_a_alink/asm/func_800F7274.s index 089412cf3ab..3bd79a87066 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7274.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7274.s @@ -9,7 +9,7 @@ /* 800F7294 000F41D4 41 82 00 10 */ beq lbl_800F72A4 /* 800F7298 000F41D8 7F A3 EB 78 */ mr r3, r29 /* 800F729C 000F41DC 38 80 00 12 */ li r4, 0x12 -/* 800F72A0 000F41E0 4B FB BF B1 */ bl daAlink_c_NS_setDoStatus +/* 800F72A0 000F41E0 4B FB BF B1 */ bl setDoStatus__9daAlink_cFUc lbl_800F72A4: /* 800F72A4 000F41E4 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F72A8 000F41E8 AB DD 04 DE */ lha r30, 0x4de(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7388.s b/include/d/d_a/d_a_alink/asm/func_800F7388.s index 4a6916621ee..ebf4193310b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7388.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7388.s @@ -10,7 +10,7 @@ /* 800F73AC 000F42EC 41 82 00 10 */ beq lbl_800F73BC /* 800F73B0 000F42F0 7F E3 FB 78 */ mr r3, r31 /* 800F73B4 000F42F4 38 80 00 12 */ li r4, 0x12 -/* 800F73B8 000F42F8 4B FB BE 99 */ bl daAlink_c_NS_setDoStatus +/* 800F73B8 000F42F8 4B FB BE 99 */ bl setDoStatus__9daAlink_cFUc lbl_800F73BC: /* 800F73BC 000F42FC 7F E3 FB 78 */ mr r3, r31 /* 800F73C0 000F4300 4B FF D4 19 */ bl daAlink_c_NS_canoeCommon diff --git a/include/d/d_a/d_a_alink/asm/func_800FA78C.s b/include/d/d_a/d_a_alink/asm/func_800FA78C.s index bef3f5c8e05..fc0b5958a5a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA78C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA78C.s @@ -33,7 +33,7 @@ lbl_800FA7E8: lbl_800FA808: /* 800FA808 000F7748 7F E3 FB 78 */ mr r3, r31 /* 800FA80C 000F774C 38 80 00 33 */ li r4, 0x33 -/* 800FA810 000F7750 4B FB 8A 41 */ bl daAlink_c_NS_setDoStatus +/* 800FA810 000F7750 4B FB 8A 41 */ bl setDoStatus__9daAlink_cFUc /* 800FA814 000F7754 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800FA818 000F7758 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800FA81C 000F775C 41 82 00 28 */ beq lbl_800FA844 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC870.s b/include/d/d_a/d_a_alink/asm/func_800FC870.s index 175c2dda7aa..b0aa5309b62 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC870.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC870.s @@ -62,7 +62,7 @@ lbl_800FC93C: /* 800FC950 000F9890 41 82 00 10 */ beq lbl_800FC960 /* 800FC954 000F9894 7F A3 EB 78 */ mr r3, r29 /* 800FC958 000F9898 38 80 00 30 */ li r4, 0x30 -/* 800FC95C 000F989C 4B FB 69 0D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 800FC95C 000F989C 4B FB 69 0D */ bl setDoStatusEmphasys__9daAlink_cFUc lbl_800FC960: /* 800FC960 000F98A0 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800FC964 000F98A4 7F C3 F3 78 */ mr r3, r30 @@ -142,7 +142,7 @@ lbl_800FCA44: /* 800FCA6C 000F99AC 40 82 00 14 */ bne lbl_800FCA80 lbl_800FCA70: /* 800FCA70 000F99B0 7F A3 EB 78 */ mr r3, r29 -/* 800FCA74 000F99B4 4B FB 5C 45 */ bl daAlink_c_NS_swordSwingTrigger +/* 800FCA74 000F99B4 4B FB 5C 45 */ bl swordSwingTrigger__9daAlink_cFv /* 800FCA78 000F99B8 2C 03 00 00 */ cmpwi r3, 0 /* 800FCA7C 000F99BC 41 82 01 94 */ beq lbl_800FCC10 lbl_800FCA80: diff --git a/include/d/d_a/d_a_alink/asm/func_800FD5E4.s b/include/d/d_a/d_a_alink/asm/func_800FD5E4.s index a37637bff5d..7a6dd2981be 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD5E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD5E4.s @@ -4,7 +4,7 @@ /* 800FD5F0 000FA530 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FD5F4 000FA534 7C 7F 1B 78 */ mr r31, r3 /* 800FD5F8 000FA538 38 80 00 33 */ li r4, 0x33 -/* 800FD5FC 000FA53C 4B FB 5C 55 */ bl daAlink_c_NS_setDoStatus +/* 800FD5FC 000FA53C 4B FB 5C 55 */ bl setDoStatus__9daAlink_cFUc /* 800FD600 000FA540 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800FD604 000FA544 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800FD608 000FA548 41 82 00 28 */ beq lbl_800FD630 diff --git a/include/d/d_a/d_a_alink/asm/func_80100770.s b/include/d/d_a/d_a_alink/asm/func_80100770.s index a543c7ce696..ba2914760f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100770.s +++ b/include/d/d_a/d_a_alink/asm/func_80100770.s @@ -29,7 +29,7 @@ lbl_801007E0: /* 801007E0 000FD720 7F C3 F3 78 */ mr r3, r30 /* 801007E4 000FD724 38 80 00 33 */ li r4, 0x33 -/* 801007E8 000FD728 4B FB 2A 69 */ bl daAlink_c_NS_setDoStatus +/* 801007E8 000FD728 4B FB 2A 69 */ bl setDoStatus__9daAlink_cFUc /* 801007EC 000FD72C 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 801007F0 000FD730 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 801007F4 000FD734 41 82 00 20 */ beq lbl_80100814 diff --git a/include/d/d_a/d_a_alink/asm/func_801017AC.s b/include/d/d_a/d_a_alink/asm/func_801017AC.s index c60ff0a7c6e..d39175e7dd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_801017AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801017AC.s @@ -34,7 +34,7 @@ lbl_80101820: /* 80101828 000FE768 41 82 00 34 */ beq lbl_8010185C /* 8010182C 000FE76C 7F E3 FB 78 */ mr r3, r31 /* 80101830 000FE770 38 80 00 33 */ li r4, 0x33 -/* 80101834 000FE774 4B FB 1A 1D */ bl daAlink_c_NS_setDoStatus +/* 80101834 000FE774 4B FB 1A 1D */ bl setDoStatus__9daAlink_cFUc /* 80101838 000FE778 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 8010183C 000FE77C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80101840 000FE780 41 82 00 1C */ beq lbl_8010185C diff --git a/include/d/d_a/d_a_alink/asm/func_801023E4.s b/include/d/d_a/d_a_alink/asm/func_801023E4.s index 564a3e7c888..2f1cc9f8567 100644 --- a/include/d/d_a/d_a_alink/asm/func_801023E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801023E4.s @@ -51,12 +51,12 @@ lbl_8010247C: /* 801024A0 000FF3E0 40 82 00 84 */ bne lbl_80102524 /* 801024A4 000FF3E4 7F E3 FB 78 */ mr r3, r31 /* 801024A8 000FF3E8 38 80 00 41 */ li r4, 0x41 -/* 801024AC 000FF3EC 4B FB 0D A5 */ bl daAlink_c_NS_setDoStatus +/* 801024AC 000FF3EC 4B FB 0D A5 */ bl setDoStatus__9daAlink_cFUc /* 801024B0 000FF3F0 48 00 00 74 */ b lbl_80102524 lbl_801024B4: /* 801024B4 000FF3F4 7F E3 FB 78 */ mr r3, r31 /* 801024B8 000FF3F8 38 80 00 4C */ li r4, 0x4c -/* 801024BC 000FF3FC 4B FB 0D 95 */ bl daAlink_c_NS_setDoStatus +/* 801024BC 000FF3FC 4B FB 0D 95 */ bl setDoStatus__9daAlink_cFUc /* 801024C0 000FF400 48 00 00 64 */ b lbl_80102524 lbl_801024C4: /* 801024C4 000FF404 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -64,7 +64,7 @@ lbl_801024C4: /* 801024CC 000FF40C 40 82 00 14 */ bne lbl_801024E0 /* 801024D0 000FF410 7F E3 FB 78 */ mr r3, r31 /* 801024D4 000FF414 38 80 00 97 */ li r4, 0x97 -/* 801024D8 000FF418 4B FB 0D 79 */ bl daAlink_c_NS_setDoStatus +/* 801024D8 000FF418 4B FB 0D 79 */ bl setDoStatus__9daAlink_cFUc /* 801024DC 000FF41C 48 00 00 48 */ b lbl_80102524 lbl_801024E0: /* 801024E0 000FF420 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -83,7 +83,7 @@ lbl_801024E0: /* 80102514 000FF454 40 82 00 10 */ bne lbl_80102524 /* 80102518 000FF458 7F E3 FB 78 */ mr r3, r31 /* 8010251C 000FF45C 38 80 00 09 */ li r4, 9 -/* 80102520 000FF460 4B FB 0D 31 */ bl daAlink_c_NS_setDoStatus +/* 80102520 000FF460 4B FB 0D 31 */ bl setDoStatus__9daAlink_cFUc lbl_80102524: /* 80102524 000FF464 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 80102528 000FF468 28 00 00 7E */ cmplwi r0, 0x7e diff --git a/include/d/d_a/d_a_alink/asm/func_801029C8.s b/include/d/d_a/d_a_alink/asm/func_801029C8.s index c2ad4bce32e..224798c1034 100644 --- a/include/d/d_a/d_a_alink/asm/func_801029C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801029C8.s @@ -54,7 +54,7 @@ lbl_80102A58: /* 80102A88 000FF9C8 40 82 00 28 */ bne lbl_80102AB0 /* 80102A8C 000FF9CC 7F E3 FB 78 */ mr r3, r31 /* 80102A90 000FF9D0 38 80 00 17 */ li r4, 0x17 -/* 80102A94 000FF9D4 4B FB 07 BD */ bl daAlink_c_NS_setDoStatus +/* 80102A94 000FF9D4 4B FB 07 BD */ bl setDoStatus__9daAlink_cFUc /* 80102A98 000FF9D8 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80102A9C 000FF9DC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80102AA0 000FF9E0 41 82 00 60 */ beq lbl_80102B00 diff --git a/include/d/d_a/d_a_alink/asm/func_80103698.s b/include/d/d_a/d_a_alink/asm/func_80103698.s index 74a16427eba..8a15ceb8e00 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103698.s +++ b/include/d/d_a/d_a_alink/asm/func_80103698.s @@ -368,7 +368,7 @@ lbl_80103BAC: /* 80103BB0 00100AF0 40 82 00 10 */ bne lbl_80103BC0 /* 80103BB4 00100AF4 7F 43 D3 78 */ mr r3, r26 /* 80103BB8 00100AF8 38 80 00 04 */ li r4, 4 -/* 80103BBC 00100AFC 4B FA F6 95 */ bl daAlink_c_NS_setDoStatus +/* 80103BBC 00100AFC 4B FA F6 95 */ bl setDoStatus__9daAlink_cFUc lbl_80103BC0: /* 80103BC0 00100B00 80 1A 31 98 */ lwz r0, 0x3198(r26) /* 80103BC4 00100B04 7C 1D 00 00 */ cmpw r29, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801044B4.s b/include/d/d_a/d_a_alink/asm/func_801044B4.s index d814e7a52f2..0011ed78a27 100644 --- a/include/d/d_a/d_a_alink/asm/func_801044B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801044B4.s @@ -45,7 +45,7 @@ lbl_8010453C: /* 80104558 00101498 41 82 00 10 */ beq lbl_80104568 /* 8010455C 0010149C 7F E3 FB 78 */ mr r3, r31 /* 80104560 001014A0 38 80 00 04 */ li r4, 4 -/* 80104564 001014A4 4B FA EC ED */ bl daAlink_c_NS_setDoStatus +/* 80104564 001014A4 4B FA EC ED */ bl setDoStatus__9daAlink_cFUc lbl_80104568: /* 80104568 001014A8 7F E3 FB 78 */ mr r3, r31 /* 8010456C 001014AC 4B FF EA ED */ bl daAlink_c_NS_checkSwimUpAction diff --git a/include/d/d_a/d_a_alink/asm/func_80104AA0.s b/include/d/d_a/d_a_alink/asm/func_80104AA0.s index d10ab0fec14..6aee80dcfe9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104AA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80104AA0.s @@ -9,7 +9,7 @@ /* 80104AC0 00101A00 2C 00 00 00 */ cmpwi r0, 0 /* 80104AC4 00101A04 40 82 00 10 */ bne lbl_80104AD4 /* 80104AC8 00101A08 38 80 00 4C */ li r4, 0x4c -/* 80104ACC 00101A0C 4B FA E7 85 */ bl daAlink_c_NS_setDoStatus +/* 80104ACC 00101A0C 4B FA E7 85 */ bl setDoStatus__9daAlink_cFUc /* 80104AD0 00101A10 48 00 00 3C */ b lbl_80104B0C lbl_80104AD4: /* 80104AD4 00101A14 80 1F 05 70 */ lwz r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80104D7C.s b/include/d/d_a/d_a_alink/asm/func_80104D7C.s index b1744726d61..3a4d39d334d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104D7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80104D7C.s @@ -14,7 +14,7 @@ /* 80104DB0 00101CF0 41 82 00 10 */ beq lbl_80104DC0 /* 80104DB4 00101CF4 7F E3 FB 78 */ mr r3, r31 /* 80104DB8 00101CF8 38 80 00 12 */ li r4, 0x12 -/* 80104DBC 00101CFC 4B FA E4 95 */ bl daAlink_c_NS_setDoStatus +/* 80104DBC 00101CFC 4B FA E4 95 */ bl setDoStatus__9daAlink_cFUc lbl_80104DC0: /* 80104DC0 00101D00 7F E3 FB 78 */ mr r3, r31 /* 80104DC4 00101D04 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80104FC4.s b/include/d/d_a/d_a_alink/asm/func_80104FC4.s index bb05ced31a5..5fb8e532f75 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104FC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80104FC4.s @@ -14,7 +14,7 @@ /* 80104FF8 00101F38 40 82 00 10 */ bne lbl_80105008 /* 80104FFC 00101F3C 7F E3 FB 78 */ mr r3, r31 /* 80105000 00101F40 38 80 00 12 */ li r4, 0x12 -/* 80105004 00101F44 4B FA E2 4D */ bl daAlink_c_NS_setDoStatus +/* 80105004 00101F44 4B FA E2 4D */ bl setDoStatus__9daAlink_cFUc lbl_80105008: /* 80105008 00101F48 A8 1F 30 18 */ lha r0, 0x3018(r31) /* 8010500C 00101F4C 2C 00 00 00 */ cmpwi r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80106BCC.s b/include/d/d_a/d_a_alink/asm/func_80106BCC.s index b3482e47127..6191f6caf4c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106BCC.s +++ b/include/d/d_a/d_a_alink/asm/func_80106BCC.s @@ -34,7 +34,7 @@ lbl_80106C30: /* 80106C48 00103B88 40 82 00 C4 */ bne lbl_80106D0C /* 80106C4C 00103B8C 7F E3 FB 78 */ mr r3, r31 /* 80106C50 00103B90 38 80 00 08 */ li r4, 8 -/* 80106C54 00103B94 4B FA B9 95 */ bl daAlink_c_NS_itemButtonCheck +/* 80106C54 00103B94 4B FA B9 95 */ bl itemButtonCheck__9daAlink_cFUc /* 80106C58 00103B98 2C 03 00 00 */ cmpwi r3, 0 /* 80106C5C 00103B9C 41 82 00 B0 */ beq lbl_80106D0C /* 80106C60 00103BA0 A8 1F 30 0A */ lha r0, 0x300a(r31) @@ -117,7 +117,7 @@ lbl_80106D5C: /* 80106D7C 00103CBC 41 82 00 EC */ beq lbl_80106E68 /* 80106D80 00103CC0 7F E3 FB 78 */ mr r3, r31 /* 80106D84 00103CC4 38 80 00 0A */ li r4, 0xa -/* 80106D88 00103CC8 4B FA C4 C9 */ bl daAlink_c_NS_setDoStatus +/* 80106D88 00103CC8 4B FA C4 C9 */ bl setDoStatus__9daAlink_cFUc /* 80106D8C 00103CCC 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) /* 80106D90 00103CD0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80106D94 00103CD4 41 82 00 D4 */ beq lbl_80106E68 @@ -155,7 +155,7 @@ lbl_80106DF4: /* 80106E08 00103D48 40 81 00 10 */ ble lbl_80106E18 /* 80106E0C 00103D4C 7F E3 FB 78 */ mr r3, r31 /* 80106E10 00103D50 38 80 00 19 */ li r4, 0x19 -/* 80106E14 00103D54 4B FA C4 3D */ bl daAlink_c_NS_setDoStatus +/* 80106E14 00103D54 4B FA C4 3D */ bl setDoStatus__9daAlink_cFUc lbl_80106E18: /* 80106E18 00103D58 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) /* 80106E1C 00103D5C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b diff --git a/include/d/d_a/d_a_alink/asm/func_80108F64.s b/include/d/d_a/d_a_alink/asm/func_80108F64.s index dd877cbcc8a..4e319f6ca67 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108F64.s +++ b/include/d/d_a/d_a_alink/asm/func_80108F64.s @@ -40,7 +40,7 @@ lbl_80108FF0: /* 80108FF4 00105F34 41 82 00 14 */ beq lbl_80109008 lbl_80108FF8: /* 80108FF8 00105F38 7F A3 EB 78 */ mr r3, r29 -/* 80108FFC 00105F3C 4B FA 96 09 */ bl daAlink_c_NS_itemButton +/* 80108FFC 00105F3C 4B FA 96 09 */ bl itemButton__9daAlink_cFv /* 80109000 00105F40 2C 03 00 00 */ cmpwi r3, 0 /* 80109004 00105F44 40 82 00 1C */ bne lbl_80109020 lbl_80109008: diff --git a/include/d/d_a/d_a_alink/asm/func_80109284.s b/include/d/d_a/d_a_alink/asm/func_80109284.s index 2fdec88a5a3..3bcc05a3c71 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109284.s +++ b/include/d/d_a/d_a_alink/asm/func_80109284.s @@ -15,7 +15,7 @@ lbl_801092B4: /* 801092B8 001061F8 2C 03 00 01 */ cmpwi r3, 1 /* 801092BC 001061FC 40 82 01 94 */ bne lbl_80109450 /* 801092C0 00106200 7F E3 FB 78 */ mr r3, r31 -/* 801092C4 00106204 4B FA 93 41 */ bl daAlink_c_NS_itemButton +/* 801092C4 00106204 4B FA 93 41 */ bl itemButton__9daAlink_cFv /* 801092C8 00106208 2C 03 00 00 */ cmpwi r3, 0 /* 801092CC 0010620C 40 82 02 C4 */ bne lbl_80109590 /* 801092D0 00106210 A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -162,7 +162,7 @@ lbl_801094CC: /* 801094D4 00106414 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801094D8 00106418 41 82 00 B8 */ beq lbl_80109590 /* 801094DC 0010641C 7F E3 FB 78 */ mr r3, r31 -/* 801094E0 00106420 4B FA 91 25 */ bl daAlink_c_NS_itemButton +/* 801094E0 00106420 4B FA 91 25 */ bl itemButton__9daAlink_cFv /* 801094E4 00106424 2C 03 00 00 */ cmpwi r3, 0 /* 801094E8 00106428 41 82 00 A8 */ beq lbl_80109590 /* 801094EC 0010642C 7F E3 FB 78 */ mr r3, r31 @@ -176,7 +176,7 @@ lbl_801094F8: /* 80109508 00106448 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010950C 0010644C 41 82 00 1C */ beq lbl_80109528 /* 80109510 00106450 7F E3 FB 78 */ mr r3, r31 -/* 80109514 00106454 4B FA 91 21 */ bl daAlink_c_NS_itemTrigger +/* 80109514 00106454 4B FA 91 21 */ bl itemTrigger__9daAlink_cFv /* 80109518 00106458 2C 03 00 00 */ cmpwi r3, 0 /* 8010951C 0010645C 41 82 00 0C */ beq lbl_80109528 /* 80109520 00106460 38 00 00 06 */ li r0, 6 diff --git a/include/d/d_a/d_a_alink/asm/func_8010BB48.s b/include/d/d_a/d_a_alink/asm/func_8010BB48.s index 70a4cc75b4a..47546bb70e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BB48.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BB48.s @@ -8,7 +8,7 @@ /* 8010BB64 00108AA4 41 82 00 10 */ beq lbl_8010BB74 /* 8010BB68 00108AA8 7F E3 FB 78 */ mr r3, r31 /* 8010BB6C 00108AAC 38 80 00 12 */ li r4, 0x12 -/* 8010BB70 00108AB0 4B FA 76 E1 */ bl daAlink_c_NS_setDoStatus +/* 8010BB70 00108AB0 4B FA 76 E1 */ bl setDoStatus__9daAlink_cFUc lbl_8010BB74: /* 8010BB74 00108AB4 7F E3 FB 78 */ mr r3, r31 /* 8010BB78 00108AB8 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s index aa2e7af5293..f027a4185d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s @@ -252,7 +252,7 @@ lbl_8010C268: /* 8010C26C 001091AC 2C 00 00 00 */ cmpwi r0, 0 /* 8010C270 001091B0 41 82 00 1C */ beq lbl_8010C28C /* 8010C274 001091B4 7F 23 CB 78 */ mr r3, r25 -/* 8010C278 001091B8 4B FA 63 8D */ bl daAlink_c_NS_itemButton +/* 8010C278 001091B8 4B FA 63 8D */ bl itemButton__9daAlink_cFv /* 8010C27C 001091BC 2C 03 00 00 */ cmpwi r3, 0 /* 8010C280 001091C0 40 82 00 0C */ bne lbl_8010C28C /* 8010C284 001091C4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010C9F4.s b/include/d/d_a/d_a_alink/asm/func_8010C9F4.s index 16039e9e5b9..3da1d546d9c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010C9F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010C9F4.s @@ -82,7 +82,7 @@ lbl_8010CAFC: lbl_8010CB28: /* 8010CB28 00109A68 7F E3 FB 78 */ mr r3, r31 /* 8010CB2C 00109A6C 38 80 00 01 */ li r4, 1 -/* 8010CB30 00109A70 4B FA 67 39 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 8010CB30 00109A70 4B FA 67 39 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 8010CB34 00109A74 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 8010CB38 00109A78 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8010CB3C 00109A7C 41 82 00 18 */ beq lbl_8010CB54 @@ -111,7 +111,7 @@ lbl_8010CB8C: /* 8010CB90 00109AD0 2C 00 00 00 */ cmpwi r0, 0 /* 8010CB94 00109AD4 41 82 00 1C */ beq lbl_8010CBB0 /* 8010CB98 00109AD8 7F E3 FB 78 */ mr r3, r31 -/* 8010CB9C 00109ADC 4B FA 5A 69 */ bl daAlink_c_NS_itemButton +/* 8010CB9C 00109ADC 4B FA 5A 69 */ bl itemButton__9daAlink_cFv /* 8010CBA0 00109AE0 2C 03 00 00 */ cmpwi r3, 0 /* 8010CBA4 00109AE4 40 82 00 0C */ bne lbl_8010CBB0 /* 8010CBA8 00109AE8 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010CD60.s b/include/d/d_a/d_a_alink/asm/func_8010CD60.s index b60f621b87d..d73f69443f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CD60.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CD60.s @@ -9,7 +9,7 @@ /* 8010CD80 00109CC0 41 82 00 10 */ beq lbl_8010CD90 /* 8010CD84 00109CC4 7F E3 FB 78 */ mr r3, r31 /* 8010CD88 00109CC8 38 80 00 12 */ li r4, 0x12 -/* 8010CD8C 00109CCC 4B FA 64 C5 */ bl daAlink_c_NS_setDoStatus +/* 8010CD8C 00109CCC 4B FA 64 C5 */ bl setDoStatus__9daAlink_cFUc lbl_8010CD90: /* 8010CD90 00109CD0 7F E3 FB 78 */ mr r3, r31 /* 8010CD94 00109CD4 4B FF EB D9 */ bl daAlink_c_NS_commonHookshotRoofWait diff --git a/include/d/d_a/d_a_alink/asm/func_8010D034.s b/include/d/d_a/d_a_alink/asm/func_8010D034.s index 99e16285221..eda0f658304 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D034.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D034.s @@ -24,7 +24,7 @@ lbl_8010D060: lbl_8010D08C: /* 8010D08C 00109FCC 7F C3 F3 78 */ mr r3, r30 /* 8010D090 00109FD0 38 80 00 01 */ li r4, 1 -/* 8010D094 00109FD4 4B FA 61 D5 */ bl daAlink_c_NS_setDoStatusEmphasys +/* 8010D094 00109FD4 4B FA 61 D5 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 8010D098 00109FD8 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 8010D09C 00109FDC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8010D0A0 00109FE0 41 82 00 18 */ beq lbl_8010D0B8 diff --git a/include/d/d_a/d_a_alink/asm/func_8010D38C.s b/include/d/d_a/d_a_alink/asm/func_8010D38C.s index 57649300c7a..6af7f338a95 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D38C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D38C.s @@ -87,7 +87,7 @@ lbl_8010D4BC: lbl_8010D4D4: /* 8010D4D4 0010A414 7F E3 FB 78 */ mr r3, r31 /* 8010D4D8 0010A418 38 80 00 01 */ li r4, 1 -/* 8010D4DC 0010A41C 4B FA 5D 8D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 8010D4DC 0010A41C 4B FA 5D 8D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 8010D4E0 0010A420 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 8010D4E4 0010A424 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8010D4E8 0010A428 41 82 00 18 */ beq lbl_8010D500 @@ -113,7 +113,7 @@ lbl_8010D52C: /* 8010D530 0010A470 2C 00 00 00 */ cmpwi r0, 0 /* 8010D534 0010A474 41 82 00 1C */ beq lbl_8010D550 /* 8010D538 0010A478 7F E3 FB 78 */ mr r3, r31 -/* 8010D53C 0010A47C 4B FA 50 C9 */ bl daAlink_c_NS_itemButton +/* 8010D53C 0010A47C 4B FA 50 C9 */ bl itemButton__9daAlink_cFv /* 8010D540 0010A480 2C 03 00 00 */ cmpwi r3, 0 /* 8010D544 0010A484 40 82 00 0C */ bne lbl_8010D550 /* 8010D548 0010A488 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s index 82e6dfc6313..18469a1f565 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s @@ -9,7 +9,7 @@ /* 8010D6EC 0010A62C 41 82 00 10 */ beq lbl_8010D6FC /* 8010D6F0 0010A630 7F A3 EB 78 */ mr r3, r29 /* 8010D6F4 0010A634 38 80 00 12 */ li r4, 0x12 -/* 8010D6F8 0010A638 4B FA 5B 59 */ bl daAlink_c_NS_setDoStatus +/* 8010D6F8 0010A638 4B FA 5B 59 */ bl setDoStatus__9daAlink_cFUc lbl_8010D6FC: /* 8010D6FC 0010A63C 7F A3 EB 78 */ mr r3, r29 /* 8010D700 0010A640 4B FF E3 6D */ bl daAlink_c_NS_commonHookshotWallWait diff --git a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s index 6aa1631dc2e..28816879b7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s @@ -56,7 +56,7 @@ lbl_8010E008: /* 8010E01C 0010AF5C 2C 00 00 00 */ cmpwi r0, 0 /* 8010E020 0010AF60 40 82 00 C8 */ bne lbl_8010E0E8 /* 8010E024 0010AF64 7F C3 F3 78 */ mr r3, r30 -/* 8010E028 0010AF68 4B FA 45 DD */ bl daAlink_c_NS_itemButton +/* 8010E028 0010AF68 4B FA 45 DD */ bl itemButton__9daAlink_cFv /* 8010E02C 0010AF6C 2C 03 00 00 */ cmpwi r3, 0 /* 8010E030 0010AF70 40 82 00 44 */ bne lbl_8010E074 /* 8010E034 0010AF74 38 00 00 01 */ li r0, 1 @@ -114,14 +114,14 @@ lbl_8010E0E8: /* 8010E0F4 0010B034 2C 03 00 00 */ cmpwi r3, 0 /* 8010E0F8 0010B038 40 82 00 1C */ bne lbl_8010E114 /* 8010E0FC 0010B03C 7F C3 F3 78 */ mr r3, r30 -/* 8010E100 0010B040 4B FA 45 B9 */ bl daAlink_c_NS_swordSwingTrigger +/* 8010E100 0010B040 4B FA 45 B9 */ bl swordSwingTrigger__9daAlink_cFv /* 8010E104 0010B044 2C 03 00 00 */ cmpwi r3, 0 /* 8010E108 0010B048 40 82 00 0C */ bne lbl_8010E114 /* 8010E10C 0010B04C 2C 1D 00 02 */ cmpwi r29, 2 /* 8010E110 0010B050 40 82 00 4C */ bne lbl_8010E15C lbl_8010E114: /* 8010E114 0010B054 7F C3 F3 78 */ mr r3, r30 -/* 8010E118 0010B058 4B FA 45 A1 */ bl daAlink_c_NS_swordSwingTrigger +/* 8010E118 0010B058 4B FA 45 A1 */ bl swordSwingTrigger__9daAlink_cFv /* 8010E11C 0010B05C 2C 03 00 00 */ cmpwi r3, 0 /* 8010E120 0010B060 41 82 00 10 */ beq lbl_8010E130 /* 8010E124 0010B064 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80111CA4.s b/include/d/d_a/d_a_alink/asm/func_80111CA4.s index ba75d1dea71..aa6077f632b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111CA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80111CA4.s @@ -121,7 +121,7 @@ lbl_80111E34: lbl_80111E50: /* 80111E50 0010ED90 7F E3 FB 78 */ mr r3, r31 /* 80111E54 0010ED94 38 80 00 00 */ li r4, 0 -/* 80111E58 0010ED98 4B FA 14 41 */ bl daAlink_c_NS_setBStatus +/* 80111E58 0010ED98 4B FA 14 41 */ bl setBStatus__9daAlink_cFUc /* 80111E5C 0010ED9C 48 00 01 78 */ b lbl_80111FD4 lbl_80111E60: /* 80111E60 0010EDA0 38 7F 20 48 */ addi r3, r31, 0x2048 @@ -130,10 +130,10 @@ lbl_80111E60: /* 80111E6C 0010EDAC 41 82 01 5C */ beq lbl_80111FC8 /* 80111E70 0010EDB0 7F E3 FB 78 */ mr r3, r31 /* 80111E74 0010EDB4 38 80 00 12 */ li r4, 0x12 -/* 80111E78 0010EDB8 4B FA 14 21 */ bl daAlink_c_NS_setBStatus +/* 80111E78 0010EDB8 4B FA 14 21 */ bl setBStatus__9daAlink_cFUc /* 80111E7C 0010EDBC 7F E3 FB 78 */ mr r3, r31 /* 80111E80 0010EDC0 38 80 00 2C */ li r4, 0x2c -/* 80111E84 0010EDC4 4B FA 13 CD */ bl daAlink_c_NS_setDoStatus +/* 80111E84 0010EDC4 4B FA 13 CD */ bl setDoStatus__9daAlink_cFUc /* 80111E88 0010EDC8 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 80111E8C 0010EDCC 2C 00 00 03 */ cmpwi r0, 3 /* 80111E90 0010EDD0 41 82 00 10 */ beq lbl_80111EA0 @@ -205,7 +205,7 @@ lbl_80111F48: lbl_80111F90: /* 80111F90 0010EED0 7F E3 FB 78 */ mr r3, r31 /* 80111F94 0010EED4 38 80 00 08 */ li r4, 8 -/* 80111F98 0010EED8 4B FA 06 35 */ bl daAlink_c_NS_itemTriggerCheck +/* 80111F98 0010EED8 4B FA 06 35 */ bl itemTriggerCheck__9daAlink_cFUc /* 80111F9C 0010EEDC 2C 03 00 00 */ cmpwi r3, 0 /* 80111FA0 0010EEE0 41 82 00 34 */ beq lbl_80111FD4 /* 80111FA4 0010EEE4 7F E3 FB 78 */ mr r3, r31 @@ -220,7 +220,7 @@ lbl_80111F90: lbl_80111FC8: /* 80111FC8 0010EF08 7F E3 FB 78 */ mr r3, r31 /* 80111FCC 0010EF0C 38 80 00 00 */ li r4, 0 -/* 80111FD0 0010EF10 4B FA 12 C9 */ bl daAlink_c_NS_setBStatus +/* 80111FD0 0010EF10 4B FA 12 C9 */ bl setBStatus__9daAlink_cFUc lbl_80111FD4: /* 80111FD4 0010EF14 38 60 00 01 */ li r3, 1 lbl_80111FD8: diff --git a/include/d/d_a/d_a_alink/asm/func_80111FF0.s b/include/d/d_a/d_a_alink/asm/func_80111FF0.s index b04c3af3c82..92139ef7d2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111FF0.s +++ b/include/d/d_a/d_a_alink/asm/func_80111FF0.s @@ -44,7 +44,7 @@ lbl_80112070: lbl_8011208C: /* 8011208C 0010EFCC 7F C3 F3 78 */ mr r3, r30 /* 80112090 0010EFD0 38 80 00 00 */ li r4, 0 -/* 80112094 0010EFD4 4B FA 12 05 */ bl daAlink_c_NS_setBStatus +/* 80112094 0010EFD4 4B FA 12 05 */ bl setBStatus__9daAlink_cFUc /* 80112098 0010EFD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011209C 0010EFDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801120A0 0010EFE0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_801120C8.s b/include/d/d_a/d_a_alink/asm/func_801120C8.s index 608ce686043..308b304ecee 100644 --- a/include/d/d_a/d_a_alink/asm/func_801120C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801120C8.s @@ -4,7 +4,7 @@ /* 801120D4 0010F014 93 E1 00 0C */ stw r31, 0xc(r1) /* 801120D8 0010F018 7C 7F 1B 78 */ mr r31, r3 /* 801120DC 0010F01C 38 80 00 00 */ li r4, 0 -/* 801120E0 0010F020 4B FA 11 B9 */ bl daAlink_c_NS_setBStatus +/* 801120E0 0010F020 4B FA 11 B9 */ bl setBStatus__9daAlink_cFUc /* 801120E4 0010F024 A8 7F 30 10 */ lha r3, 0x3010(r31) /* 801120E8 0010F028 38 03 FF FF */ addi r0, r3, -1 /* 801120EC 0010F02C B0 1F 30 10 */ sth r0, 0x3010(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80112304.s b/include/d/d_a/d_a_alink/asm/func_80112304.s index 8a7b4148df4..4781cf28e98 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112304.s +++ b/include/d/d_a/d_a_alink/asm/func_80112304.s @@ -30,10 +30,10 @@ lbl_80112370: /* 80112370 0010F2B0 83 FE 28 10 */ lwz r31, 0x2810(r30) /* 80112374 0010F2B4 7F C3 F3 78 */ mr r3, r30 /* 80112378 0010F2B8 38 80 00 12 */ li r4, 0x12 -/* 8011237C 0010F2BC 4B FA 0F 1D */ bl daAlink_c_NS_setBStatus +/* 8011237C 0010F2BC 4B FA 0F 1D */ bl setBStatus__9daAlink_cFUc /* 80112380 0010F2C0 7F C3 F3 78 */ mr r3, r30 /* 80112384 0010F2C4 38 80 00 31 */ li r4, 0x31 -/* 80112388 0010F2C8 4B FA 0E C9 */ bl daAlink_c_NS_setDoStatus +/* 80112388 0010F2C8 4B FA 0E C9 */ bl setDoStatus__9daAlink_cFUc /* 8011238C 0010F2CC 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 80112390 0010F2D0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80112394 0010F2D4 41 82 00 2C */ beq lbl_801123C0 @@ -50,7 +50,7 @@ lbl_80112370: lbl_801123C0: /* 801123C0 0010F300 7F C3 F3 78 */ mr r3, r30 /* 801123C4 0010F304 38 80 00 08 */ li r4, 8 -/* 801123C8 0010F308 4B FA 02 05 */ bl daAlink_c_NS_itemTriggerCheck +/* 801123C8 0010F308 4B FA 02 05 */ bl itemTriggerCheck__9daAlink_cFUc /* 801123CC 0010F30C 2C 03 00 00 */ cmpwi r3, 0 /* 801123D0 0010F310 41 82 00 10 */ beq lbl_801123E0 /* 801123D4 0010F314 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80115254.s b/include/d/d_a/d_a_alink/asm/func_80115254.s index f9c681fa693..ea1b0e56e08 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115254.s +++ b/include/d/d_a/d_a_alink/asm/func_80115254.s @@ -4,7 +4,7 @@ /* 80115260 001121A0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80115264 001121A4 93 C1 00 08 */ stw r30, 8(r1) /* 80115268 001121A8 7C 7F 1B 78 */ mr r31, r3 -/* 8011526C 001121AC 4B F9 D3 99 */ bl daAlink_c_NS_itemButton +/* 8011526C 001121AC 4B F9 D3 99 */ bl itemButton__9daAlink_cFv /* 80115270 001121B0 2C 03 00 00 */ cmpwi r3, 0 /* 80115274 001121B4 40 82 00 1C */ bne lbl_80115290 /* 80115278 001121B8 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_80115564.s b/include/d/d_a/d_a_alink/asm/func_80115564.s index 747e2daebb8..44ff058d6c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115564.s +++ b/include/d/d_a/d_a_alink/asm/func_80115564.s @@ -8,7 +8,7 @@ /* 80115580 001124C0 41 82 00 10 */ beq lbl_80115590 /* 80115584 001124C4 7F E3 FB 78 */ mr r3, r31 /* 80115588 001124C8 38 80 00 12 */ li r4, 0x12 -/* 8011558C 001124CC 4B F9 DC C5 */ bl daAlink_c_NS_setDoStatus +/* 8011558C 001124CC 4B F9 DC C5 */ bl setDoStatus__9daAlink_cFUc lbl_80115590: /* 80115590 001124D0 7F E3 FB 78 */ mr r3, r31 /* 80115594 001124D4 38 80 00 00 */ li r4, 0 @@ -19,7 +19,7 @@ lbl_80115590: /* 801155A8 001124E8 2C 03 00 00 */ cmpwi r3, 0 /* 801155AC 001124EC 40 82 00 28 */ bne lbl_801155D4 /* 801155B0 001124F0 7F E3 FB 78 */ mr r3, r31 -/* 801155B4 001124F4 4B F9 D0 51 */ bl daAlink_c_NS_itemButton +/* 801155B4 001124F4 4B F9 D0 51 */ bl itemButton__9daAlink_cFv /* 801155B8 001124F8 2C 03 00 00 */ cmpwi r3, 0 /* 801155BC 001124FC 41 82 00 18 */ beq lbl_801155D4 /* 801155C0 00112500 A8 1F 30 18 */ lha r0, 0x3018(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80115674.s b/include/d/d_a/d_a_alink/asm/func_80115674.s index 59eaca93391..4fe9082b28b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115674.s +++ b/include/d/d_a/d_a_alink/asm/func_80115674.s @@ -10,7 +10,7 @@ /* 80115698 001125D8 41 82 00 10 */ beq lbl_801156A8 /* 8011569C 001125DC 7F E3 FB 78 */ mr r3, r31 /* 801156A0 001125E0 38 80 00 12 */ li r4, 0x12 -/* 801156A4 001125E4 4B F9 DB AD */ bl daAlink_c_NS_setDoStatus +/* 801156A4 001125E4 4B F9 DB AD */ bl setDoStatus__9daAlink_cFUc lbl_801156A8: /* 801156A8 001125E8 7F E3 FB 78 */ mr r3, r31 /* 801156AC 001125EC 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80127CF0.s b/include/d/d_a/d_a_alink/asm/func_80127CF0.s index 6709acfaa6e..f98b7de33b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127CF0.s +++ b/include/d/d_a/d_a_alink/asm/func_80127CF0.s @@ -2,7 +2,7 @@ /* 80127CF4 00124C34 7C 08 02 A6 */ mflr r0 /* 80127CF8 00124C38 90 01 00 14 */ stw r0, 0x14(r1) /* 80127CFC 00124C3C 38 80 00 01 */ li r4, 1 -/* 80127D00 00124C40 4B F8 A8 CD */ bl daAlink_c_NS_itemTriggerCheck +/* 80127D00 00124C40 4B F8 A8 CD */ bl itemTriggerCheck__9daAlink_cFUc /* 80127D04 00124C44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80127D08 00124C48 7C 08 03 A6 */ mtlr r0 /* 80127D0C 00124C4C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80127D2C.s b/include/d/d_a/d_a_alink/asm/func_80127D2C.s index 8f51916fa31..7f9d7e2ab3a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127D2C.s +++ b/include/d/d_a/d_a_alink/asm/func_80127D2C.s @@ -2,7 +2,7 @@ /* 80127D30 00124C70 7C 08 02 A6 */ mflr r0 /* 80127D34 00124C74 90 01 00 14 */ stw r0, 0x14(r1) /* 80127D38 00124C78 38 80 00 02 */ li r4, 2 -/* 80127D3C 00124C7C 4B F8 A8 91 */ bl daAlink_c_NS_itemTriggerCheck +/* 80127D3C 00124C7C 4B F8 A8 91 */ bl itemTriggerCheck__9daAlink_cFUc /* 80127D40 00124C80 80 01 00 14 */ lwz r0, 0x14(r1) /* 80127D44 00124C84 7C 08 03 A6 */ mtlr r0 /* 80127D48 00124C88 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_8012D590.s b/include/d/d_a/d_a_alink/asm/func_8012D590.s index 6ec4eb1eeb9..510c42e0f52 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D590.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D590.s @@ -75,7 +75,7 @@ lbl_8012D670: /* 8012D6A4 0012A5E4 48 00 02 04 */ b lbl_8012D8A8 lbl_8012D6A8: /* 8012D6A8 0012A5E8 7F C3 F3 78 */ mr r3, r30 -/* 8012D6AC 0012A5EC 4B F8 50 0D */ bl daAlink_c_NS_swordSwingTrigger +/* 8012D6AC 0012A5EC 4B F8 50 0D */ bl swordSwingTrigger__9daAlink_cFv /* 8012D6B0 0012A5F0 2C 03 00 00 */ cmpwi r3, 0 /* 8012D6B4 0012A5F4 41 82 00 0C */ beq lbl_8012D6C0 /* 8012D6B8 0012A5F8 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8012F358.s b/include/d/d_a/d_a_alink/asm/func_8012F358.s index a7b798ccecc..d69b8364a65 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F358.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F358.s @@ -21,7 +21,7 @@ lbl_8012F39C: lbl_8012F3A4: /* 8012F3A4 0012C2E4 48 14 13 9D */ bl cLib_chaseF__FPfff /* 8012F3A8 0012C2E8 7F A3 EB 78 */ mr r3, r29 -/* 8012F3AC 0012C2EC 4B F8 32 B9 */ bl daAlink_c_NS_spActionButton +/* 8012F3AC 0012C2EC 4B F8 32 B9 */ bl spActionButton__9daAlink_cFv /* 8012F3B0 0012C2F0 2C 03 00 00 */ cmpwi r3, 0 /* 8012F3B4 0012C2F4 40 82 00 1C */ bne lbl_8012F3D0 /* 8012F3B8 0012C2F8 80 1D 06 14 */ lwz r0, 0x614(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80131DA0.s b/include/d/d_a/d_a_alink/asm/func_80131DA0.s index fccd1751ad2..b1f1784d840 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131DA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80131DA0.s @@ -79,7 +79,7 @@ lbl_80131EB8: /* 80131EC0 0012EE00 41 82 00 2C */ beq lbl_80131EEC /* 80131EC4 0012EE04 7F 43 D3 78 */ mr r3, r26 /* 80131EC8 0012EE08 38 80 00 8B */ li r4, 0x8b -/* 80131ECC 0012EE0C 4B F8 13 85 */ bl daAlink_c_NS_setDoStatus +/* 80131ECC 0012EE0C 4B F8 13 85 */ bl setDoStatus__9daAlink_cFUc /* 80131ED0 0012EE10 88 1A 2F 8D */ lbz r0, 0x2f8d(r26) /* 80131ED4 0012EE14 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80131ED8 0012EE18 41 82 00 14 */ beq lbl_80131EEC diff --git a/include/d/d_a/d_a_alink/asm/func_80132914.s b/include/d/d_a/d_a_alink/asm/func_80132914.s index 5f5fb64b694..c711528aad7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132914.s +++ b/include/d/d_a/d_a_alink/asm/func_80132914.s @@ -88,7 +88,7 @@ lbl_80132A40: lbl_80132A5C: /* 80132A5C 0012F99C 7F C3 F3 78 */ mr r3, r30 /* 80132A60 0012F9A0 38 80 00 33 */ li r4, 0x33 -/* 80132A64 0012F9A4 4B F8 07 ED */ bl daAlink_c_NS_setDoStatus +/* 80132A64 0012F9A4 4B F8 07 ED */ bl setDoStatus__9daAlink_cFUc /* 80132A68 0012F9A8 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) /* 80132A6C 0012F9AC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80132A70 0012F9B0 41 82 00 84 */ beq lbl_80132AF4 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 e8ab96f5f81..e13c0c3f73c 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 @@ -58,7 +58,7 @@ lbl_801348EC: /* 80134900 00131840 D0 1D 37 40 */ stfs f0, 0x3740(r29) /* 80134904 00131844 7F A3 EB 78 */ mr r3, r29 /* 80134908 00131848 38 80 00 93 */ li r4, 0x93 -/* 8013490C 0013184C 4B F7 E9 45 */ bl daAlink_c_NS_setDoStatus +/* 8013490C 0013184C 4B F7 E9 45 */ bl setDoStatus__9daAlink_cFUc /* 80134910 00131850 38 7D 04 D0 */ addi r3, r29, 0x4d0 /* 80134914 00131854 38 9D 37 38 */ addi r4, r29, 0x3738 /* 80134918 00131858 48 13 C2 ED */ bl cLib_targetAngleY__FPC3VecPC3Vec diff --git a/include/d/d_a/d_a_alink/asm/func_80134EBC.s b/include/d/d_a/d_a_alink/asm/func_80134EBC.s index c12fbe09d20..1075ec9ca4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134EBC.s +++ b/include/d/d_a/d_a_alink/asm/func_80134EBC.s @@ -43,7 +43,7 @@ lbl_80134F28: /* 80134F54 00131E94 40 81 00 2C */ ble lbl_80134F80 /* 80134F58 00131E98 7F E3 FB 78 */ mr r3, r31 /* 80134F5C 00131E9C 38 80 00 93 */ li r4, 0x93 -/* 80134F60 00131EA0 4B F7 E2 F1 */ bl daAlink_c_NS_setDoStatus +/* 80134F60 00131EA0 4B F7 E2 F1 */ bl setDoStatus__9daAlink_cFUc /* 80134F64 00131EA4 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80134F68 00131EA8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80134F6C 00131EAC 41 82 00 14 */ beq lbl_80134F80 diff --git a/include/d/d_a/d_a_alink/asm/func_801351F8.s b/include/d/d_a/d_a_alink/asm/func_801351F8.s index 697623bdf1b..adb12ee751e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801351F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801351F8.s @@ -24,7 +24,7 @@ lbl_80135224: /* 80135250 00132190 41 82 01 74 */ beq lbl_801353C4 /* 80135254 00132194 7F E3 FB 78 */ mr r3, r31 /* 80135258 00132198 38 80 00 1C */ li r4, 0x1c -/* 8013525C 0013219C 4B F7 E0 0D */ bl daAlink_c_NS_setDoStatusEmphasys +/* 8013525C 0013219C 4B F7 E0 0D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 80135260 001321A0 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80135264 001321A4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80135268 001321A8 41 82 00 30 */ beq lbl_80135298 diff --git a/include/d/d_a/d_a_alink/asm/func_801354C8.s b/include/d/d_a/d_a_alink/asm/func_801354C8.s index 1461698cdef..1da1eec8dbc 100644 --- a/include/d/d_a/d_a_alink/asm/func_801354C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801354C8.s @@ -35,7 +35,7 @@ lbl_80135520: lbl_80135548: /* 80135548 00132488 7F E3 FB 78 */ mr r3, r31 /* 8013554C 0013248C 38 80 00 33 */ li r4, 0x33 -/* 80135550 00132490 4B F7 DD 01 */ bl daAlink_c_NS_setDoStatus +/* 80135550 00132490 4B F7 DD 01 */ bl setDoStatus__9daAlink_cFUc /* 80135554 00132494 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80135558 00132498 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8013555C 0013249C 41 82 00 78 */ beq lbl_801355D4 diff --git a/include/d/d_a/d_a_alink/asm/func_801381F8.s b/include/d/d_a/d_a_alink/asm/func_801381F8.s index f237789fcfd..d624feebb2a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801381F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801381F8.s @@ -20,7 +20,7 @@ lbl_8013822C: /* 80138240 00135180 40 82 00 38 */ bne lbl_80138278 /* 80138244 00135184 7F E3 FB 78 */ mr r3, r31 /* 80138248 00135188 38 80 00 39 */ li r4, 0x39 -/* 8013824C 0013518C 4B F7 B0 05 */ bl daAlink_c_NS_setDoStatus +/* 8013824C 0013518C 4B F7 B0 05 */ bl setDoStatus__9daAlink_cFUc /* 80138250 00135190 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80138254 00135194 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80138258 00135198 41 82 00 E8 */ beq lbl_80138340 @@ -48,7 +48,7 @@ lbl_80138278: /* 801382AC 001351EC 40 82 00 94 */ bne lbl_80138340 /* 801382B0 001351F0 7F E3 FB 78 */ mr r3, r31 /* 801382B4 001351F4 38 80 00 09 */ li r4, 9 -/* 801382B8 001351F8 4B F7 AF 99 */ bl daAlink_c_NS_setDoStatus +/* 801382B8 001351F8 4B F7 AF 99 */ bl setDoStatus__9daAlink_cFUc /* 801382BC 001351FC 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 801382C0 00135200 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 801382C4 00135204 41 82 00 7C */ beq lbl_80138340 diff --git a/include/d/d_a/d_a_alink/asm/func_80139908.s b/include/d/d_a/d_a_alink/asm/func_80139908.s index 262436ee55c..b3a60594095 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139908.s +++ b/include/d/d_a/d_a_alink/asm/func_80139908.s @@ -11,7 +11,7 @@ lbl_80139930: /* 80139930 00136870 7F E3 FB 78 */ mr r3, r31 /* 80139934 00136874 38 80 00 08 */ li r4, 8 -/* 80139938 00136878 4B F7 8C B1 */ bl daAlink_c_NS_itemButtonCheck +/* 80139938 00136878 4B F7 8C B1 */ bl itemButtonCheck__9daAlink_cFUc /* 8013993C 0013687C 2C 03 00 00 */ cmpwi r3, 0 /* 80139940 00136880 40 82 00 10 */ bne lbl_80139950 /* 80139944 00136884 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_80139A70.s b/include/d/d_a/d_a_alink/asm/func_80139A70.s index 9471304e170..80b69cff6bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139A70.s +++ b/include/d/d_a/d_a_alink/asm/func_80139A70.s @@ -15,7 +15,7 @@ lbl_80139AA8: /* 80139AA8 001369E8 7F C3 F3 78 */ mr r3, r30 /* 80139AAC 001369EC 38 80 00 08 */ li r4, 8 -/* 80139AB0 001369F0 4B F7 8B 39 */ bl daAlink_c_NS_itemButtonCheck +/* 80139AB0 001369F0 4B F7 8B 39 */ bl itemButtonCheck__9daAlink_cFUc /* 80139AB4 001369F4 2C 03 00 00 */ cmpwi r3, 0 /* 80139AB8 001369F8 41 82 00 10 */ beq lbl_80139AC8 /* 80139ABC 001369FC A8 1E 30 0A */ lha r0, 0x300a(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s index d984b80884b..50ed677a6a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s @@ -24,7 +24,7 @@ lbl_8013CE28: /* 8013CE44 00139D84 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 8013CE48 00139D88 7F A3 EB 78 */ mr r3, r29 /* 8013CE4C 00139D8C 38 80 00 03 */ li r4, 3 -/* 8013CE50 00139D90 4B F7 64 31 */ bl daAlink_c_NS_setDoStatusContinuation +/* 8013CE50 00139D90 4B F7 64 31 */ bl setDoStatusContinuation__9daAlink_cFUc /* 8013CE54 00139D94 88 1D 2F 8D */ lbz r0, 0x2f8d(r29) /* 8013CE58 00139D98 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8013CE5C 00139D9C 41 82 00 20 */ beq lbl_8013CE7C diff --git a/include/d/d_a/d_a_alink/asm/func_80140064.s b/include/d/d_a/d_a_alink/asm/func_80140064.s deleted file mode 100644 index 2c7d2e4439c..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_80140064.s +++ /dev/null @@ -1,3 +0,0 @@ -/* 80140064 0013CFA4 38 00 00 04 */ li r0, 4 -/* 80140068 0013CFA8 98 03 2F D1 */ stb r0, 0x2fd1(r3) -/* 8014006C 0013CFAC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_80141944.s b/include/d/d_a/d_a_alink/asm/func_80141944.s deleted file mode 100644 index d2c6d85f25e..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_80141944.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 80141944 0013E884 80 63 12 58 */ lwz r3, 0x1258(r3) -/* 80141948 0013E888 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_8014194C.s b/include/d/d_a/d_a_alink/asm/func_8014194C.s deleted file mode 100644 index befc58ab1ad..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_8014194C.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8014194C 0013E88C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80141950 0013E890 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80141954 0013E894 88 63 5E 24 */ lbz r3, 0x5e24(r3) -/* 80141958 0013E898 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_80141990.s b/include/d/d_a/d_a_alink/asm/func_80141990.s deleted file mode 100644 index d757ad7a22c..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_80141990.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 80141990 0013E8D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha -/* 80141994 0013E8D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l -/* 80141998 0013E8D8 A0 63 00 04 */ lhz r3, 4(r3) -/* 8014199C 0013E8DC 4E 80 00 20 */ blr diff --git a/include/d/d_a/d_a_alink/asm/func_801419A0.s b/include/d/d_a/d_a_alink/asm/func_801419A0.s deleted file mode 100644 index 5b09b28b35f..00000000000 --- a/include/d/d_a/d_a_alink/asm/func_801419A0.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 801419A0 0013E8E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha -/* 801419A4 0013E8E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l -/* 801419A8 0013E8E8 80 04 5D C4 */ lwz r0, 0x5dc4(r4) -/* 801419AC 0013E8EC 7C 00 1A 14 */ add r0, r0, r3 -/* 801419B0 0013E8F0 90 04 5D C4 */ stw r0, 0x5dc4(r4) -/* 801419B4 0013E8F4 4E 80 00 20 */ blr 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 9e505ae60b6..bd3a537b73d 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 @@ -45,7 +45,7 @@ public: // member functions u32 getE3Zhint(void); const char* getAlinkArcName(void); - u32 checkStageName(const char*); + bool checkStageName(const char*); void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*); void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*); void setMatrixWorldAxisRot(float (*)[4], short, short, short, int, const cXyz*); @@ -195,13 +195,29 @@ public: void setPlayerPosAndAngle(float (*)[4]); u32 itemTriggerCheck(u8); u32 itemButtonCheck(u8); + void itemButton(void); + void itemTrigger(void); + void spActionButton(void); + void spActionTrigger(void); + u32 midnaTalkTrigger(void) const; + void swordSwingTrigger(void); + void setItemActionButtonStatus(u8); + void itemActionTrigger(void); /*---*/ + void setRStatus(u8); + void setRStatusEmphasys(u8); + void setDoStatus(u8); + void setDoStatusEmphasys(u8); + void setDoStatusContinuation(u8); + void setBStatus(u8); + int checkRAction(void); BOOL checkMagicArmorHeavy(void) const; BOOL checkBootsOrArmorHeavy(void) const; void setSpecialGravity(float, float, int); int checkMagicArmorWearAbility(void) const; void onFrollCrashFlg(u8, int); void setMidnaTalkStatus(u8); + void setShieldChange(void); private: u8 unk[1328]; @@ -214,9 +230,20 @@ private: u32 unk1404; u8 unk1408[6716]; u16 unk8124; - u8 unk8126[4070]; + u8 unk8126[4047]; + u8 unk12173; + u8 unk12174; + u8 unk12175[13]; + u8 unk12188; + u8 unk12199[7]; u8 unk12196; - u8 unk12197[2071]; + u8 unk12197[9]; + u8 unk12206; + u8 unk12207[16]; + u8 unk12223; + u8 unk12224[17]; + u8 unk12241; + u8 unk12242[2026]; }; class daMidna_c { @@ -233,6 +260,15 @@ private: u32 unk2200; }; +class daHorse_c { +public: + u32 getZeldaActor(void); + +private: + u8 unk[0x1254]; + daPy_actorKeep_c actorKeep; +}; + extern "C" { void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*, diff --git a/include/d/d_a/d_a_player/d_a_player.h b/include/d/d_a/d_a_player/d_a_player.h index 02e3aab329a..8506e63c72d 100644 --- a/include/d/d_a/d_a_player/d_a_player.h +++ b/include/d/d_a/d_a_player/d_a_player.h @@ -1,6 +1,198 @@ #ifndef D_A_PLAYER_H_ #define D_A_PLAYER_H_ +#include "SComponent/c_bg_s_poly_info.h" +#include "SComponent/c_xyz.h" +#include "d/d_a/d_a_alink/d_a_alink.h" +#include "f/f_op/f_op_actor.h" +#include "global.h" + class daPy_anmHeap_c {}; +class daPy_actorKeep_c { +public: + daPy_actorKeep_c(void); + void setActor(void); + void setData(void); + void clearData(void); + + u32 getID(void) const { return mID; } + void setID(u32 id) { mID = id; } + u32 getActor(void) const { return mActor; } + +private: + u32 mID; + u32 mActor; +}; + +class daPy_py_c { +public: + enum daPy_FLG2 {}; + enum daPy_ERFLG0 {}; + + u32 checkBoarSingleBattle(void) const; + u32 checkEndResetFlg0(daPy_ERFLG0) const; + int getMidnaAtnPos(void) const; + void setMidnaMsgNum(fopAc_ac_c*, u16); + u32 getModelMtx(void); + u32 getInvMtx(void); + daPy_py_c* getShadowTalkAtnPos(void); + u32 getLeftItemMatrix(void); + u32 getRightItemMatrix(void); + u32 getLeftHandMatrix(void); + u32 getRightHandMatrix(void); + u32 getLinkBackBone1Matrix(void); + u32 getWolfMouthMatrix(void); + u32 getWolfBackbone2Matrix(void); + int getBottleMtx(void); + int checkPlayerGuard(void); + int checkAutoJump(void) const; + int checkSideStep(void) const; + int checkWolfTriggerJump(void) const; + int checkGuardBreakMode(void) const; + int checkLv3Slide(void) const; + int checkWolfHowlDemoMode(void) const; + int checkChainBlockPushPull(void); + int checkElecDamage(void) const; + int checkEmptyBottleSwing(void) const; + int checkBottleSwingMode(void) const; + int checkHawkWait(void) const; + int checkGoatThrow(void) const; + int checkGoatThrowAfter(void) const; + int checkWolfTagLockJump(void) const; + int checkWolfTagLockJumpLand(void) const; + int checkWolfRope(void); + int checkWolfRopeHang(void) const; + int checkRollJump(void) const; + int checkGoronRideWait(void) const; + int checkWolfChain(void) const; + int checkWolfWait(void) const; + int checkWolfJumpAttack(void) const; + int checkWolfRSit(void) const; + int checkBubbleFly(void) const; + int checkBottleDrinkEnd(void) const; + int checkWolfDig(void) const; + int checkCutCharge(void) const; + int checkCutTurnCharge(void) const; + int checkCutLargeJumpCharge(void) const; + int getBokoFlamePos(cXyz*); + int checkComboCutTurn(void) const; + int checkClimbMove(void) const; + int checkGrassWhistle(void) const; + int checkBoarRun(void) const; + int checkFmChainPut(void) const; + int checkHorseElecDamage(void) const; + float getBaseAnimeFrameRate(void) const; + float getBaseAnimeFrame(void) const; + float setAnimeFrame(float); + int checkWolfLock(fopAc_ac_c*) const; + int cancelWolfLock(fopAc_ac_c*) const; + int getItemID(void) const; + int exchangeGrabActor(fopAc_ac_c*); + int setForceGrab(fopAc_ac_c*, int, int); + void setForcePutPos(cXyz const&); + int checkPlayerNoDraw(void); + int checkRopeTag(void); + void voiceStart(u32); + void seStartOnlyReverb(u32); + void seStartOnlyReverbLevel(u32); + float setOutPower(float, short, int); + void setGrabCollisionOffset(float, float, cBgS_PolyInfo*); + void onMagneGrab(float, float); + int getModelJointMtx(u16); + int getHeadMtx(void); + int setHookshotCarryOffset(u32, cXyz const*); + int checkIronBallReturn(void) const; + int checkIronBallGroundStop(void) const; + int checkSingleBoarBattleSecondBowReady(void) const; + int checkPointSubWindowMode(void) const; + void setClothesChange(int); + void setPlayerPosAndAngle(float (*)[4]); + // void setPlayerPosAndAngle(cXyz const*, csXyz const*); + void setPlayerPosAndAngle(cXyz const*, short, int); + int setThrowDamage(short, float, float, int, int, int); + int checkSetNpcTks(cXyz*, int, int); + int setRollJump(float, float, short); + void playerStartCollisionSE(u32, u32); + void changeTextureAnime(u16, u16, int); + void cancelChangeTextureAnime(void); + void cancelDungeonWarpReadyNeck(void); + void onSceneChangeArea(u8, u8, fopAc_ac_c*); + void onSceneChangeAreaJump(u8, u8, fopAc_ac_c*); + void onSceneChangeDead(u8, int); + int getSpinnerActor(void); + int checkHorseRideNotReady(void) const; + int checkArrowChargeEnd(void) const; + float getSearchBallScale(void) const; + int checkFastShotTime(void); + int checkNoEquipItem(void) const; + int checkFireMaterial(void) const; + int checkKandelaarSwing(int) const; + int getBoardCutTurnOffsetAngleY(void) const; + int getMagneHitPos(void); + int getMagneBootsTopVec(void); + int checkUseKandelaar(int); + void setDkCaught(fopAc_ac_c*); + void onPressedDamage(cXyz const&, short); + int checkPriActorOwn(fopAc_ac_c const*) const; + int onWolfEnemyBiteAll(fopAc_ac_c*, daPy_FLG2); + int checkWolfEnemyBiteAllOwn(fopAc_ac_c const*) const; + void setWolfEnemyHangBiteAngle(short); + void setKandelaarMtx(float (*)[4], int, int); + int getStickAngleFromPlayerShape(short*) const; + int checkSpinnerPathMove(void); + int checkSpinnerTriggerAttack(void); + void onSpinnerPathForceRemove(void); + int getIronBallBgHit(void) const; + int getIronBallCenterPos(void); + int checkCanoeFishingGetLeft(void) const; + int checkCanoeFishingGetRight(void) const; + int checkBeeChildDrink(void) const; + void skipPortalObjWarp(void); + int checkTreasureRupeeReturn(int) const; + void setSumouReady(fopAc_ac_c*); + int checkAcceptDungeonWarpAlink(int); + int getSumouCounter(void) const; + int checkSumouWithstand(void) const; + void cancelGoronThrowEvent(void); + void setSumouGraspCancelCount(int); + void setSumouPushBackDirection(short); + void setSumouLoseHeadUp(void); + s16 getGiantPuzzleAimAngle(void) const; + void setGoronSideMove(fopAc_ac_c*); + void setCargoCarry(fopAc_ac_c*); + int getDpdFarFlg(void) const; + int getHookshotTopPos(void); + int checkHookshotReturnMode(void) const; + int checkHookshotShootReturnMode(void) const; + int checkOctaIealHang(void) const; + void cancelOctaIealHang(void); + void cancelDragonHangBackJump(void); + void setOctaIealWildHang(void); + int checkDragonHangRide(void) const; + void changeDragonActor(fopAc_ac_c*); + int getClothesChangeWaitTimer(void) const; + int getShieldChangeWaitTimer(void) const; + int getSwordChangeWaitTimer(void) const; + int checkMetamorphose(void) const; + int checkWolfDownAttackPullOut(void) const; + int checkBootsOrArmorHeavy(void) const; + int getBottleOpenAppearItem(void) const; + int checkItemSwordEquip(void) const; + float getSinkShapeOffset(void) const; + int checkSinkDead(void) const; + int checkHorseStart(void); + int getWolfHowlMgrP(void); + int checkWolfHowlSuccessAnime(void) const; + int checkCopyRodTopUse(void); + int checkCopyRodEquip(void) const; + int checkCutJumpMode(void) const; + +private: + u8 unk[0x4e6]; + s16 mGiantPuzzleAimAngle; + u32 unk0x578; + u32 unk0x588; +}; + #endif \ No newline at end of file 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 dc5447a5155..0b28014ec67 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 @@ -79,6 +79,18 @@ public: field_0x4ec0[0x3B] = status; field_0x4ec0[0x56] = unk; } + void setRStatus(u8 status, u8 unk) { + field_0x4ec0[0x24] = status; + field_0x4ec0[0x4A] = unk; + } + void setDoStatus(u8 status, u8 unk) { + field_0x4ec0[0x2C] = status; + field_0x4ec0[0x52] = unk; + } + void setAStatus(u8 status, u8 unk) { + field_0x4ec0[0x25] = status; + field_0x4ec0[0x4B] = unk; + } void setItemLifeCount(float hearts, u8 unk) { give_item.hearts += hearts; unk_heart = unk; @@ -92,6 +104,8 @@ public: void setItemMaxLifeCount(short max) { give_item.max_life += max; } void setOxygen(long oxygen) { give_item.oxygen = oxygen; } void setMaxOxygen(long max) { give_item.max_oxygen = max; } + u8 getDoStatus(void) { return field_0x4ec0[0x2C]; } + u8 getRStatus(void) { return field_0x4ec0[0x24]; } private: /* 0x00000 */ dBgS dbgs; @@ -186,17 +200,22 @@ private: extern dComIfG_inf_c g_dComIfG_gameInfo; +void dComIfGp_setItemLifeCount(float, u8); +void dComIfGp_setItemRupeeCount(long); int dComIfGs_isItemFirstBit(u8); +inline void dComIfGp_setRStatus(u8 status, u8 unk) { + g_dComIfG_gameInfo.getPlay().setRStatus(status, unk); +} +inline void dComIfGp_setDoStatus(u8 status, u8 unk) { + g_dComIfG_gameInfo.getPlay().setDoStatus(status, unk); +} +inline void dComIfGp_setAStatus(u8 status, u8 unk) { + g_dComIfG_gameInfo.getPlay().setAStatus(status, unk); +} inline void dComIfGp_setZStatus(u8 status, u8 unk) { g_dComIfG_gameInfo.getPlay().setZStatus(status, unk); } -inline void dComIfGp_setItemLifeCount(float amount, u8 unk) { - g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk); -} -inline void dComIfGp_setItemRupeeCount(long amount) { - g_dComIfG_gameInfo.getPlay().setItemRupeeCount(amount); -} inline void dComIfGp_setItemMagicCount(short amount) { g_dComIfG_gameInfo.getPlay().setItemMagicCount(amount); } @@ -330,5 +349,20 @@ inline u8 dComIfGs_checkBottle(u8 type) { inline BOOL dComIfGs_isLightDropGetFlag(u8 area_id) { return g_dComIfG_gameInfo.getSaveFile().getLightDrop().isLightDropGetFlag(area_id); } +inline u8 dComIfGs_getArrowMax(void) { + return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getArrowNum(); +} +inline u8 dComIfGs_getCollectSmell(void) { + return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getSelectEquip(3); +} +inline u8 dComIfGs_getPohSpiritNum(void) { + return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().getPohNum(); +} +inline u8 dComIfGs_getKeyNum(void) { + return g_dComIfG_gameInfo.getMemory().getTempFlags().getKeyNum(); +} +inline void dComIfGs_onItemFirstBit(u8 i_no) { + g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().onFirstBit(i_no); +} #endif \ No newline at end of file diff --git a/include/d/d_item/d_item/d_item.h b/include/d/d_item/d_item/d_item.h index aebfacd2120..b703c8ecb44 100644 --- a/include/d/d_item/d_item/d_item.h +++ b/include/d/d_item/d_item/d_item.h @@ -9,4 +9,12 @@ int checkItemGet(u8, int); extern int (*item_func_ptr[256])(void); extern int (*item_getcheck_func_ptr[256])(void); +inline int getItemFunc(u8 i_no) { + dComIfGs_onItemFirstBit(i_no); + return item_func_ptr[i_no](); +} +inline int getCheckItemFunc(u8 i_no) { + return item_getcheck_func_ptr[i_no](); +} + #endif \ No newline at end of file diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 4480da87291..c2acd22d426 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -326,10 +326,10 @@ public: u16 getRupeeMax(void) const; int isMagicFlag(u8) const; - u16& getCurrentHealth() { return mCurrentHealth; } - u16& getCurrentRupees() { return mCurrentRupees; } - u16& getCurrentLanternOil() { return mCurrentLanternOil; } - u8& getScent() { return mEquipment[3]; } + u16& getLife() { return mCurrentHealth; } + u16& getRupee() { return mCurrentRupees; } + u16& getOil() { return mCurrentLanternOil; } + u8& getSelectEquip(int item) { return mEquipment[item]; } void setWalletLV(u8 lv) { mCurrentWallet = lv; } void setOil(u16 oil) { mCurrentLanternOil = oil; } void setMaxOil(u16 max) { mMaxLanternOil = max; } @@ -512,7 +512,7 @@ public: u8 getBombNum(u8) const; void setArrowNum(u8 max) { mItemCapacities[0] = max; } - u8 getBowCapacity() { return mItemCapacities[0]; } + u8 getArrowNum() { return mItemCapacities[0]; } private: u8 mItemCapacities[8]; @@ -528,7 +528,7 @@ public: void onCollectMirror(u8); BOOL isCollectMirror(u8) const; - u8 getPoeCount() { return mPoeCount; } + u8 getPohNum() { return mPoeCount; } private: u8 unk0[8]; @@ -683,7 +683,7 @@ public: void onDungeonItem(int); bool isDungeonItem(int) const; - u8 getSmallKeys() { return small_key_flags; } + u8 getKeyNum() { return small_key_flags; } void onDungeonItemMap() { onDungeonItem(MAP_FLAG); } bool isDungeonItemMap() const { return isDungeonItem(MAP_FLAG); } void onDungeonItemCompass() { onDungeonItem(COMPASS_FLAG); } diff --git a/include/functions.h b/include/functions.h index 653b77dbb10..e34ac6eff5c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1343,7 +1343,7 @@ void func_801417E0(void); void normZP__4cXyzCFv(void); void daAlink_c_NS_checkEquipAnime(void); void daAlink_c_NS_concatMagneBootInvMtx(void); -void dComIfGp_getRStatus(void); +u8 dComIfGp_getRStatus(void); void daAlink_c_NS_commonHookshotWallWait(void); void daAlink_c_NS_checkBootsMoveAnime(void); void func_800EC5F4(void); @@ -1484,7 +1484,7 @@ void setWolfEyeOpen__14Z2CreatureLinkFb(void); void GXSetCurrentMtx(void); void daAlink_c_NS_setWolfJumpAttackEffect(void); void func_8014471C(void); -void daAlink_c_NS_setRStatusEmphasys(void); +void setRStatusEmphasys__9daAlink_cFUc(void); void func_8011EBDC(void); void daAlink_c_NS_setSmallGuard(void); void daAlink_c_NS_setBodyPartPos(void); @@ -1522,7 +1522,7 @@ void Z2SeqMgr_NS_taktModeMute(void); void daAlink_c_NS_procInsectCatchInit(void); void dBgS_NS_GetGrpSoundId(void); void func_8011ED18(void); -void daAlink_c_NS_setDoStatusEmphasys(void); +void setDoStatusEmphasys__9daAlink_cFUc(void); void func_800B4908(void); void daAlink_c_NS_setSwordCutSplash(void); void func_8011C890(void); @@ -1655,7 +1655,7 @@ void daAlink_c_NS_procCopyRodSwingInit(void); void daPy_addCalcShort(void); void daAlink_c_NS_setSyncBoarPos(void); void cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf(void); -void daAlink_c_NS_itemTriggerCheck(void); +void itemTriggerCheck__9daAlink_cFUc(void); void daAlink_c_NS_checkClimbRoof(void); void daAlink_c_NS_checkUpperItemActionFly(void); void func_800D0660(void); @@ -1767,7 +1767,7 @@ void dBgS_RoofChk_NS_dtor(void); void daAlink_c_NS_checkReinRide(void); void func_800CF314(void); void func_800E7BD0(void); -void daAlink_c_NS_itemTrigger(void); +void itemTrigger__9daAlink_cFv(void); void cM3dGPla_NS_dtor(void); void daAlink_c_NS_warpModelTexScroll(void); void func_800DC8C4(void); @@ -1815,7 +1815,7 @@ void mDoMtx_ZXYrotS(void); void daAlink_c_NS_setWolfSenceStatus(void); void dEvt_control_c_NS_convPId(void); void daAlink_c_NS_setHookshotSight(void); -void daAlink_c_NS_midnaTalkTrigger(void); +void midnaTalkTrigger__9daAlink_cCFv(void); void daAlink_c_NS_checkForceSwordSwing(void); void daPy_py_c_NS_checkBoarSingleBattle(void); void func_800F6E44(void); @@ -2001,7 +2001,7 @@ void cM_rnd__Fv(void); void dCcD_GObjInf_NS_GetAtHitGObj(void); void dBgS_RoofChk(void); void daAlink_c_NS_getCutDirection(void); -void daAlink_c_NS_setDoStatus(void); +void setDoStatus__9daAlink_cFUc(void); void func_800CF2F8(void); void dBgS_ArrowLinChk_NS_dtor(void); void daAlink_c_NS_setCutType(void); @@ -2193,7 +2193,7 @@ void func_80141724(void); void daAlink_c_NS_procWolfHowlInit(void); void daAlink_c_NS_checkSwordTwirlAction(void); void func_800D0360(void); -void daAlink_c_NS_setBStatus(void); +void setBStatus__9daAlink_cFUc(void); void func_800C3868(void); void dPa_control_c_NS_getPolyColor(void); void daAlink_searchPeepObj(void); @@ -2335,7 +2335,7 @@ void func_80141684(void); void daAlink_c_NS_procCoDeadInit(void); void daAlink_c_NS_setSelectEquipItem(void); void daAlink_c_NS_setTradeItemOutHand(void); -void daAlink_c_NS_swordSwingTrigger(void); +void swordSwingTrigger__9daAlink_cFv(void); void func_801351F8(void); void dKy_shadow_mode_set(void); void daAlink_c_NS_checkCutReverseAt(void); @@ -2355,7 +2355,7 @@ void daAlink_c_NS_checkUnderMove1BckNoArc(void); void dComIfG_resLoad_X1_(void); void daAlink_c_NS_setSwimUpDownOffset(void); void daAlink_c_NS_procBowMoveInit(void); -void daAlink_c_NS_itemButtonCheck(void); +void itemButtonCheck__9daAlink_cFUc(void); void daAlink_c_NS_getClimbDirectionFromAngle(void); void daAlink_c_NS_commonSingleAnime(void); void func_8014186C(void); @@ -2505,7 +2505,7 @@ void daAlink_c_NS_wolfSenseTrigger(void); void daAlink_c_NS_setShieldGuard(void); void func_800F10F8(void); void daAlink_c_NS_checkNextActionHorse(void); -void daPy_actorKeep_c(void); +void __ct__16daPy_actorKeep_cFv(void); void daAlink_c_NS_getWallEdgePos(void); void daAlink_c_NS_checkGrabAnimeAndThrow(void); void func_8014171C(void); @@ -2640,7 +2640,7 @@ void daAlink_c_NS_checkRestartDead(void); void func_800F5048(void); void func_800D09AC(void); void daNpcT_ActorMngr_c_NS_getActorP(void); -void daAlink_c_NS_spActionButton(void); +void spActionButton__9daAlink_cFv(void); void daAlink_c_NS_checkLandHookshotHang(void); void daAlink_c_NS_setBoardLandAnime(void); void daAlink_c_NS_setSwordPos(void); @@ -2860,7 +2860,7 @@ void daAlink_c_NS_checkPushPullTurnBlock(void); void dMeter2Info_c_NS_resetWarpStatus(void); void daAlink_c_NS_procHorseSubjectivityInit(void); void dEvent_manager_c_NS_setGoal(void); -void daAlink_c_NS_spActionTrigger(void); +void spActionTrigger__9daAlink_cFv(void); void func_800F24C8(void); void cXyz_X2_(void); void daAlink_c_NS_procFrontRollSuccessInit(void); @@ -2912,7 +2912,7 @@ void daAlink_c_NS_setIronBallPos(void); void daAlink_c_NS_setSwordVoiceSe(void); void func_800D07FC(void); void daAlink_c_NS_checkGrabNotThrow(void); -void daAlink_c_NS_setShieldChange(void); +void setShieldChange__9daAlink_cFv(void); void daAlink_c_NS_setWolfBiteDamage(void); void func_800F3818(void); void dPaPoF_c_NS_clearFourAllID(void); @@ -3042,7 +3042,7 @@ void daAlink_c_NS_checkHugeAttack(void); void daAlink_c_NS_cancelItemUseQuake(void); void daAlink_c_NS_initDemoModel(void); void daAlink_c_NS_setRoomInfo(void); -void dComIfGs_getLife(void); +u16 dComIfGs_getLife(void); void daAlink_c_NS_procHookshotMoveInit(void); void daAlink_c_NS_procCoWarpInit(void); void dCcD_Cyl(void); @@ -3054,7 +3054,7 @@ void func_801418C0(void); void daAlink_c_NS_checkOilBottleItemNotGet(void); void func_800C755C(void); void J3DMaterialTable_NS_removeTevRegAnimator(void); -void daAlink_c_NS_setRStatus(void); +void setRStatus__9daAlink_cFUc(void); void daAlink_c_NS_checkBossBabaRoom(void); void JPAEmitterCallBack_NS_dtor(void); void daAlink_c_NS_procWolfMidnaRideShockInit(void); @@ -3159,14 +3159,14 @@ void daAlink_c_NS_setGoatStopGameFail(void); void daAlink_c_NS_procLandInit(void); void daAlink_c_NS_setLastSceneDamage(void); void daAlink_c_NS_setShapeAngleToAtnActor(void); -void dComIfGp_setItemRupeeCount(void); +void dComIfGp_setItemRupeeCount__Fl(long); void dMsgFlow_c_NS_doFlow(void); void func_800F9F30(void); void dBgS_NS_PushPullCallBack(void); void daPy_py_c_NS_checkMidnaRide(void); void dBgS_NS_GetRoomId(void); void dEvt_control_c_NS_isOrderOK(void); -void daAlink_c_NS_itemButton(void); +void itemButton__9daAlink_cFv(void); void dCcD_Cyl_NS_StartCAt(void); void daAlink_c_NS_setGrabUpperAnime(void); void mDoMtx_stack_c_NS_transS(void); @@ -3178,7 +3178,7 @@ void daAlink_c_NS_setSyncHorsePos(void); void daAlink_c_NS_setStickAnmData(void); void func_800D67FC(void); void func_8010FF58(void); -void dComIfGp_getDoStatus(void); +u8 dComIfGp_getDoStatus(void); void dBgS_LinkLinChk_NS_dtor(void); void func_801120C8(void); void daAlink_c_NS_checkAutoJumpAction(void); @@ -3385,7 +3385,7 @@ void daAlink_searchEnemyCargo(void); void dComIfGp_setBottleStatus(void); void daAlink_c_NS_setStickData(void); void daAlink_c_NS_procWolfLargeDamageUpInit(void); -void dComIfGs_getRupee(void); +u16 dComIfGs_getRupee(void); void daAlink_c_NS_checkCutTurnInput(void); void dAttention_c_NS_LockonTarget(void); void func_801446E4(void); @@ -3400,7 +3400,7 @@ void daAlink_c_NS_makeFairy(void); void daAlink_c_NS_procRoofHangFrontMoveInit(void); void dJntCol_c_NS_getHitmarkPosAndAngle(void); void func_800D079C(void); -void dComIfGp_setItemLifeCount(void); +void dComIfGp_setItemLifeCount__FfUc(void); void func_801417A8(void); void func_80110E80(void); void func_801196D8(void); @@ -3573,7 +3573,7 @@ void onNoServiceWait__9daMidna_cFv(void); void func_80105728(void); void daAlink_searchNightStalker(void); void func_80107418(void); -void daHorse_c_NS_getZeldaActor(void); +void getZeldaActor__9daHorse_cFv(void); void func_800D6DA4(void); void J3DAnmTevRegKey_NS_getTevColorReg(void); void daAlink_c_NS_makeItemType(void); @@ -3762,7 +3762,7 @@ void daAlink_c_NS_autoGroundHit(void); void dBgS_NS_GetSpecialCode(void); void daAlink_c_NS_setCollisionPos(void); void daAlink_c_NS_procCutHeadLandInit(void); -void daAlink_c_NS_setDoStatusContinuation(void); +void setDoStatusContinuation__9daAlink_cFUc(void); void func_800CD78C(void); void daAlink_c_NS_procHookshotSubjectInit(void); void daAlink_c_NS_setUpperAnimeParam(void); diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index cfbdfaa70fb..afe63d9718a 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -44,14 +44,14 @@ asm void daAlink_matAnm_c::calc(J3DMaterial*) const { #include "d/d_a/d_a_alink/asm/func_8009D90C.s" } -// 1 missing mr instruction +// matches but need to fix class structure #ifdef NONMATCHING -u32 daAlink_c::checkStageName(const char* stage) { - return (u32)__cntlzw(strcmp(g_dComIfG_gameInfo.stage, (char*)stage)) >> - 5; // no idea if current stage vars are a struct or part of some class +bool daAlink_c::checkStageName(const char* stage) { + stage = (const char*)this; + return strcmp(dComIfGp_getStartStageName(), stage) == 0; } #else -asm u32 daAlink_c::checkStageName(char const* stage) { +asm bool daAlink_c::checkStageName(char const* stage) { nofralloc #include "d/d_a/d_a_alink/asm/func_8009DA60.s" } @@ -1031,10 +1031,23 @@ asm void daAlink_c_NS_setSandShapeOffset(void) { // checkLv2MiddleBossBgRide__9daAlink_cFs // daAlink_c::checkLv2MiddleBossBgRide(short) +#ifdef NONMATCHING +bool daAlink_c::checkLv2MiddleBossBgRide(short param1) { + bool check = 0; + + // beqlr needs to be beq + if (param1 != 0x7B && param1 == 0x7D) { + check = 1; + } + + return check; +} +#else asm void daAlink_c_NS_checkLv2MiddleBossBgRide(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1FB8.s" } +#endif // getSlidePolygon__9daAlink_cFP8cM3dGPla // daAlink_c::getSlidePolygon(cM3dGPla*) @@ -1065,65 +1078,42 @@ asm void func_800B23FC(void) { } // setPlayerPosAndAngle__9daAlink_cFPA4_f -asm void func_800B24F4(void) { - nofralloc +asm void func_800B24F4(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800B24F4.s" } -// itemTriggerCheck__9daAlink_cFUc -// daAlink_c::itemTriggerCheck(unsigned char) -asm void daAlink_c_NS_itemTriggerCheck(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B25CC.s" +u32 daAlink_c::itemTriggerCheck(u8 param1) { + unk12206 |= param1; + return unk12173 & param1; } -// itemButtonCheck__9daAlink_cFUc -// daAlink_c::itemButtonCheck(unsigned char) -asm void daAlink_c_NS_itemButtonCheck(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B25E8.s" +u32 daAlink_c::itemButtonCheck(u8 param1) { + unk12206 |= param1; + return unk12174 & param1; } -// itemButton__9daAlink_cFv -// daAlink_c::itemButton(void) -asm void daAlink_c_NS_itemButton(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B2604.s" +void daAlink_c::itemButton(void) { + itemButtonCheck(1 << unk12188); } -// itemTrigger__9daAlink_cFv -// daAlink_c::itemTrigger(void) -asm void daAlink_c_NS_itemTrigger(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B2634.s" +void daAlink_c::itemTrigger(void) { + itemTriggerCheck(1 << unk12188); } -// spActionButton__9daAlink_cFv -// daAlink_c::spActionButton(void) -asm void daAlink_c_NS_spActionButton(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B2664.s" +void daAlink_c::spActionButton(void) { + itemButtonCheck(64); } -// spActionTrigger__9daAlink_cFv -// daAlink_c::spActionTrigger(void) -asm void daAlink_c_NS_spActionTrigger(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B2688.s" +void daAlink_c::spActionTrigger(void) { + itemTriggerCheck(64); } -// midnaTalkTrigger__9daAlink_cCFv -// daAlink_c::midnaTalkTrigger(const void) -asm void daAlink_c_NS_midnaTalkTrigger(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B26AC.s" +u32 daAlink_c::midnaTalkTrigger(void) const { + return unk12173 & 4; } -// swordSwingTrigger__9daAlink_cFv -// daAlink_c::swordSwingTrigger(void) -asm void daAlink_c_NS_swordSwingTrigger(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B26B8.s" +void daAlink_c::swordSwingTrigger(void) { + itemTriggerCheck(8); } // setItemActionButtonStatus__9daAlink_cFUc @@ -1156,44 +1146,28 @@ asm void daAlink_c_NS_setAtnList(void) { // setRStatus__9daAlink_cFUc // daAlink_c::setRStatus(unsigned char) -asm void daAlink_c_NS_setRStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3220.s" +void daAlink_c::setRStatus(u8 status) { + dComIfGp_setRStatus(status, 0); } -// setRStatusEmphasys__9daAlink_cFUc -// daAlink_c::setRStatusEmphasys(unsigned char) -asm void daAlink_c_NS_setRStatusEmphasys(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3238.s" +void daAlink_c::setRStatusEmphasys(u8 status) { + dComIfGp_setRStatus(status, 2); } -// setDoStatus__9daAlink_cFUc -// daAlink_c::setDoStatus(unsigned char) -asm void daAlink_c_NS_setDoStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3250.s" +void daAlink_c::setDoStatus(u8 status) { + dComIfGp_setDoStatus(status, 0); } -// setDoStatusEmphasys__9daAlink_cFUc -// daAlink_c::setDoStatusEmphasys(unsigned char) -asm void daAlink_c_NS_setDoStatusEmphasys(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3268.s" +void daAlink_c::setDoStatusEmphasys(u8 status) { + dComIfGp_setDoStatus(status, 2); } -// setDoStatusContinuation__9daAlink_cFUc -// daAlink_c::setDoStatusContinuation(unsigned char) -asm void daAlink_c_NS_setDoStatusContinuation(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3280.s" +void daAlink_c::setDoStatusContinuation(u8 status) { + dComIfGp_setDoStatus(status, 4); } -// setBStatus__9daAlink_cFUc -// daAlink_c::setBStatus(unsigned char) -asm void daAlink_c_NS_setBStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800B3298.s" +void daAlink_c::setBStatus(u8 status) { + dComIfGp_setAStatus(status, 0); } // checkAtnWaitAnime__9daAlink_cFv @@ -1759,7 +1733,7 @@ BOOL daAlink_c::checkMagicArmorHeavy(void) const { BOOL check = FALSE; if (checkMagicArmorWearAbility() != 0 && - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getCurrentRupees() == 0) { + g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getRupee() == 0) { check = TRUE; } @@ -2156,10 +2130,24 @@ asm void daAlink_c_NS_checkRoomOnly(void) { // checkLv2DungeonRoomSpecial__9daAlink_cFv // daAlink_c::checkLv2DungeonRoomSpecial(void) +#ifdef NONMATCHING +bool daAlink_c::checkLv2DungeonRoomSpecial(void) { + bool check = 0; + + // lbl_80392094 needs to be in r3 instead of r4 + if (checkStageName(lbl_80392094.lv2) && + (lbl_80450D64 == 14 || lbl_80450D64 == 16 || lbl_80450D64 == 17)) { + check = 1; + } + + return check; +} +#else asm void daAlink_c_NS_checkLv2DungeonRoomSpecial(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C044C.s" } +#endif // checkRoomSpecial__9daAlink_cFv // daAlink_c::checkRoomSpecial(void) @@ -3140,23 +3128,16 @@ asm void dComIfGp_att_getCatghTarget(void) { // mDoAud_setLinkHp__Fll // mDoAud_setLinkHp(long, long) -asm void mDoAud_setLinkHp(void) { - nofralloc +asm void mDoAud_setLinkHp(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800CFEF4.s" } -// dComIfGs_getLife__Fv -// dComIfGs_getLife(void) -asm void dComIfGs_getLife(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800CFF2C.s" +u16 dComIfGs_getLife(void) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getLife(); } -// dComIfGp_getRStatus__Fv -// dComIfGp_getRStatus(void) -asm void dComIfGp_getRStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800CFF3C.s" +u8 dComIfGp_getRStatus(void) { + return g_dComIfG_gameInfo.getPlay().getRStatus(); } // checkAttentionLock__9daAlink_cFv @@ -3166,11 +3147,8 @@ asm void daAlink_c_NS_checkAttentionLock(void) { #include "d/d_a/d_a_alink/asm/func_800CFF4C.s" } -// dComIfGp_setItemLifeCount__FfUc -// dComIfGp_setItemLifeCount(float, unsigned char) -asm void dComIfGp_setItemLifeCount(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_800CFFA4.s" +void dComIfGp_setItemLifeCount(float amount, u8 unk) { + g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk); } // cMtx_multVec__FPA4_CfPC3VecP3Vec @@ -13480,9 +13458,8 @@ asm void func_80140038(void) { // setShieldChange__9daAlink_cFv // daAlink_c::setShieldChange(void) -asm void daAlink_c_NS_setShieldChange(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_80140064.s" +void daAlink_c::setShieldChange(void) { + unk12241 = 4; } // loadModelDVD__9daAlink_cFv @@ -13668,7 +13645,7 @@ asm void func_801410A4(void) { // __ct__16daPy_actorKeep_cFv // daPy_actorKeep_c::daPy_actorKeep_c(void) -asm void daPy_actorKeep_c(void) { +asm daPy_actorKeep_c::daPy_actorKeep_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801410EC.s" } @@ -15043,23 +15020,16 @@ asm void func_80141934(void) { // checkCutJumpMode__9daPy_py_cCFv // daPy_py_c::checkCutJumpMode(const void) -asm void func_8014193C(void) { - nofralloc +asm void func_8014193C(void){nofralloc #include "d/d_a/d_a_alink/asm/func_8014193C.s" } -// getZeldaActor__9daHorse_cFv -// daHorse_c::getZeldaActor(void) -asm void daHorse_c_NS_getZeldaActor(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_80141944.s" +u32 daHorse_c::getZeldaActor(void) { + return actorKeep.getActor(); } -// dComIfGp_getDoStatus__Fv -// dComIfGp_getDoStatus(void) -asm void dComIfGp_getDoStatus(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_8014194C.s" +u8 dComIfGp_getDoStatus(void) { + return g_dComIfG_gameInfo.getPlay().getDoStatus(); } // __ct__4cXyzFfff @@ -15080,18 +15050,12 @@ void Z2CreatureLink::setLinkState(u8 state) { link_state = state; } -// dComIfGs_getRupee__Fv -// dComIfGs_getRupee(void) -asm void dComIfGs_getRupee(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_80141990.s" +u16 dComIfGs_getRupee(void) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getRupee(); } -// dComIfGp_setItemRupeeCount__Fl -// dComIfGp_setItemRupeeCount(long) -asm void dComIfGp_setItemRupeeCount(void) { - nofralloc -#include "d/d_a/d_a_alink/asm/func_801419A0.s" +void dComIfGp_setItemRupeeCount(long amount) { + g_dComIfG_gameInfo.getPlay().setItemRupeeCount(amount); } // dMeter2Info_setFloatingMessage__FUssb diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp index 35d6c2a6dce..0e1e52d9084 100644 --- a/src/d/d_file/d_file_sel_info.cpp +++ b/src/d/d_file/d_file_sel_info.cpp @@ -34,9 +34,9 @@ s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) { } else { if (!save_file->getPlayer().getPlayerInfo().getLinkName()) { if ((this->unk34) && (param_3 == DAT_804070D8)) { - save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = DAT_804061C2; + save_file->getPlayer().getPlayerStatusA().getLife() = DAT_804061C2; this->setHeartCnt(save_file); - save_file->getPlayer().getPlayerStatusA().getCurrentHealth() = 0xC; + save_file->getPlayer().getPlayerStatusA().getLife() = 0xC; strcpy(this->unk44, DAT_80406374); strcpy(this->save_date, (char*)DAT_803948D8); strcpy(this->play_time, (char*)DAT_803948D8); diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp index 220cd6b6f6b..3ace193bfc9 100644 --- a/src/d/d_item/d_item.cpp +++ b/src/d/d_item/d_item.cpp @@ -1,17 +1,26 @@ #include "d/d_item/d_item/d_item.h" #include "global.h" +inline void dComIfGp_setItemLifeCount(float amount, u8 unk) { + g_dComIfG_gameInfo.getPlay().setItemLifeCount(amount, unk); +} +inline void dComIfGp_setItemRupeeCount(long amount) { + g_dComIfG_gameInfo.getPlay().setItemRupeeCount(amount); +} +inline int dComIfGs_isItemFirstBit(u8 i_no) { + return g_dComIfG_gameInfo.getSaveFile().getPlayerGetItem().isFirstBit(i_no); +} + void execItemGet(u8 item_id) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().onFirstBit(item_id); - item_func_ptr[item_id](); + getItemFunc(item_id); } int checkItemGet(u8 item_id, int param_2) { - int uVar2 = item_getcheck_func_ptr[item_id](); - if (uVar2 == -1) { - uVar2 = param_2; + int checkItem = getCheckItemFunc(item_id); + if (checkItem == -1) { + checkItem = param_2; } - return uVar2; + return checkItem; } void item_func_HEART(void) { @@ -812,32 +821,32 @@ int item_getcheck_func_HEART(void) { return -1; } -void item_getcheck_func_GREEN_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(GREEN_RUPEE); +int item_getcheck_func_GREEN_RUPEE(void) { + return dComIfGs_isItemFirstBit(GREEN_RUPEE); } -void item_getcheck_func_BLUE_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BLUE_RUPEE); +int item_getcheck_func_BLUE_RUPEE(void) { + return dComIfGs_isItemFirstBit(BLUE_RUPEE); } -void item_getcheck_func_YELLOW_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(YELLOW_RUPEE); +int item_getcheck_func_YELLOW_RUPEE(void) { + return dComIfGs_isItemFirstBit(YELLOW_RUPEE); } -void item_getcheck_func_RED_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(RED_RUPEE); +int item_getcheck_func_RED_RUPEE(void) { + return dComIfGs_isItemFirstBit(RED_RUPEE); } -void item_getcheck_func_PURPLE_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(PURPLE_RUPEE); +int item_getcheck_func_PURPLE_RUPEE(void) { + return dComIfGs_isItemFirstBit(PURPLE_RUPEE); } -void item_getcheck_func_ORANGE_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ORANGE_RUPEE); +int item_getcheck_func_ORANGE_RUPEE(void) { + return dComIfGs_isItemFirstBit(ORANGE_RUPEE); } -void item_getcheck_func_SILVER_RUPEE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(SILVER_RUPEE); +int item_getcheck_func_SILVER_RUPEE(void) { + return dComIfGs_isItemFirstBit(SILVER_RUPEE); } int item_getcheck_func_S_MAGIC(void) { @@ -848,40 +857,40 @@ int item_getcheck_func_L_MAGIC(void) { return -1; } -void item_getcheck_func_BOMB_5(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_5); +int item_getcheck_func_BOMB_5(void) { + return dComIfGs_isItemFirstBit(BOMB_5); } -void item_getcheck_func_BOMB_10(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_10); +int item_getcheck_func_BOMB_10(void) { + return dComIfGs_isItemFirstBit(BOMB_10); } -void item_getcheck_func_BOMB_20(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_20); +int item_getcheck_func_BOMB_20(void) { + return dComIfGs_isItemFirstBit(BOMB_20); } -void item_getcheck_func_BOMB_30(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_30); +int item_getcheck_func_BOMB_30(void) { + return dComIfGs_isItemFirstBit(BOMB_30); } -void item_getcheck_func_ARROW_10(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_10); +int item_getcheck_func_ARROW_10(void) { + return dComIfGs_isItemFirstBit(ARROW_10); } -void item_getcheck_func_ARROW_20(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_20); +int item_getcheck_func_ARROW_20(void) { + return dComIfGs_isItemFirstBit(ARROW_20); } -void item_getcheck_func_ARROW_30(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_30); +int item_getcheck_func_ARROW_30(void) { + return dComIfGs_isItemFirstBit(ARROW_30); } -void item_getcheck_func_ARROW_1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARROW_1); +int item_getcheck_func_ARROW_1(void) { + return dComIfGs_isItemFirstBit(ARROW_1); } -void item_getcheck_func_PACHINKO_SHOT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(PACHINKO_SHOT); +int item_getcheck_func_PACHINKO_SHOT(void) { + return dComIfGs_isItemFirstBit(PACHINKO_SHOT); } int item_getcheck_func_WATER_BOMB_5(void) { @@ -904,16 +913,16 @@ int item_getcheck_func_BOMB_INSECT_5(void) { return -1; } -void item_getcheck_func_BOMB_INSECT_10(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_10); +int item_getcheck_func_BOMB_INSECT_10(void) { + return dComIfGs_isItemFirstBit(BOMB_INSECT_10); } -void item_getcheck_func_BOMB_INSECT_20(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_20); +int item_getcheck_func_BOMB_INSECT_20(void) { + return dComIfGs_isItemFirstBit(BOMB_INSECT_20); } -void item_getcheck_func_BOMB_INSECT_30(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_INSECT_30); +int item_getcheck_func_BOMB_INSECT_30(void) { + return dComIfGs_isItemFirstBit(BOMB_INSECT_30); } int item_getcheck_func_RECOVER_FAILY(void) { @@ -964,36 +973,36 @@ BOOL item_getcheck_func_MASTER_SWORD(void) { return dComIfGs_isCollectSword(MASTER_SWORD_FLAG); } -void item_getcheck_func_WOOD_SHIELD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_SHIELD); +int item_getcheck_func_WOOD_SHIELD(void) { + return dComIfGs_isItemFirstBit(WOOD_SHIELD); } -void item_getcheck_func_SHIELD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(SHIELD); +int item_getcheck_func_SHIELD(void) { + return dComIfGs_isItemFirstBit(SHIELD); } -void item_getcheck_func_HYLIA_SHIELD(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HYLIA_SHIELD); +int item_getcheck_func_HYLIA_SHIELD(void) { + return dComIfGs_isItemFirstBit(HYLIA_SHIELD); } bool item_getcheck_func_TKS_LETTER(void) { return dComIfGs_getItem(SLOT_18, true) == TKS_LETTER; } -void item_getcheck_func_WEAR_CASUAL(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WEARS_CASUAL); +int item_getcheck_func_WEAR_CASUAL(void) { + return dComIfGs_isItemFirstBit(WEARS_CASUAL); } BOOL item_getcheck_func_WEAR_KOKIRI(void) { return dComIfGs_isCollectClothing(KOKIRI_CLOTHES_FLAG); } -void item_getcheck_func_ARMOR(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(ARMOR); +int item_getcheck_func_ARMOR(void) { + return dComIfGs_isItemFirstBit(ARMOR); } -void item_getcheck_func_WEAR_ZORA(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WEAR_ZORA); +int item_getcheck_func_WEAR_ZORA(void) { + return dComIfGs_isItemFirstBit(WEAR_ZORA); } int item_getcheck_func_MAGIC_LV1(void) { @@ -1020,12 +1029,12 @@ bool item_getcheck_func_ZORAS_JEWEL(void) { return dComIfGs_getItem(SLOT_20, true) == ZORAS_JEWEL; } -void item_getcheck_func_HAWK_EYE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(HAWK_EYE); +int item_getcheck_func_HAWK_EYE(void) { + return dComIfGs_isItemFirstBit(HAWK_EYE); } -void item_getcheck_func_WOOD_STICK(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WOOD_STICK); +int item_getcheck_func_WOOD_STICK(void) { + return dComIfGs_isItemFirstBit(WOOD_STICK); } bool item_getcheck_func_BOOMERANG(void) { @@ -1081,44 +1090,32 @@ int item_getcheck_func_COPY_ROD_2(void) { return -1; } -void item_getcheck_func_BOMB_BAG_LV2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV2); +int item_getcheck_func_BOMB_BAG_LV2(void) { + return dComIfGs_isItemFirstBit(BOMB_BAG_LV2); } -void item_getcheck_func_BOMB_BAG_LV1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_BAG_LV1); +int item_getcheck_func_BOMB_BAG_LV1(void) { + return dComIfGs_isItemFirstBit(BOMB_BAG_LV1); } -void item_getcheck_func_BOMB_IN_BAG(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(BOMB_IN_BAG); +int item_getcheck_func_BOMB_IN_BAG(void) { + return dComIfGs_isItemFirstBit(BOMB_IN_BAG); } -void item_getcheck_func_LIGHT_ARROW(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LIGHT_ARROW); +int item_getcheck_func_LIGHT_ARROW(void) { + return dComIfGs_isItemFirstBit(LIGHT_ARROW); } int item_getcheck_func_ARROW_LV1(void) { - return (dComIfGs_getItem(SLOT_4, false) == BOW && - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= - 30) ? - 1 : - 0; + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 30) ? 1 : 0; } int item_getcheck_func_ARROW_LV2(void) { - return (dComIfGs_getItem(SLOT_4, false) == BOW && - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= - 60) ? - 1 : - 0; + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 60) ? 1 : 0; } int item_getcheck_func_ARROW_LV3(void) { - return (dComIfGs_getItem(SLOT_4, false) == BOW && - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerItemMax().getBowCapacity() >= - 100) ? - 1 : - 0; + return (dComIfGs_getItem(SLOT_4, false) == BOW && dComIfGs_getArrowMax() >= 100) ? 1 : 0; } int item_getcheck_func_LURE_ROD(void) { @@ -1217,16 +1214,16 @@ int item_getcheck_func_OIL(void) { return dComIfGs_checkBottle(OIL); } -void item_getcheck_func_NORMAL_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(NORMAL_BOMB); +int item_getcheck_func_NORMAL_BOMB(void) { + return dComIfGs_isItemFirstBit(NORMAL_BOMB); } -void item_getcheck_func_WATER_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(WATER_BOMB); +int item_getcheck_func_WATER_BOMB(void) { + return dComIfGs_isItemFirstBit(WATER_BOMB); } -void item_getcheck_func_POKE_BOMB(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(POKE_BOMB); +int item_getcheck_func_POKE_BOMB(void) { + return dComIfGs_isItemFirstBit(POKE_BOMB); } int item_getcheck_func_FAIRY_DROP(void) { @@ -1237,8 +1234,8 @@ int item_getcheck_func_WORM(void) { return dComIfGs_checkBottle(WORM); } -void item_getcheck_func_DROP_BOTTLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(DROP_BOTTLE); +int item_getcheck_func_DROP_BOTTLE(void) { + return dComIfGs_isItemFirstBit(DROP_BOTTLE); } int item_getcheck_func_BEE_CHILD(void) { @@ -1269,16 +1266,16 @@ int item_getcheck_func_CHUCHU_PURPLE(void) { return dComIfGs_checkBottle(CHUCHU_PURPLE); } -void item_getcheck_func_LV1_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV1_SOUP); +int item_getcheck_func_LV1_SOUP(void) { + return dComIfGs_isItemFirstBit(LV1_SOUP); } -void item_getcheck_func_LV2_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV2_SOUP); +int item_getcheck_func_LV2_SOUP(void) { + return dComIfGs_isItemFirstBit(LV2_SOUP); } -void item_getcheck_func_LV3_SOUP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LV3_SOUP); +int item_getcheck_func_LV3_SOUP(void) { + return dComIfGs_isItemFirstBit(LV3_SOUP); } bool item_getcheck_func_LETTER(void) { @@ -1325,8 +1322,8 @@ int item_getcheck_func_CHUCHU_BLACK(void) { return dComIfGs_checkBottle(CHUCHU_BLACK); } -void item_getcheck_func_LIGHT_DROP(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(LIGHT_DROP); +int item_getcheck_func_LIGHT_DROP(void) { + return dComIfGs_isItemFirstBit(LIGHT_DROP); } BOOL item_getcheck_func_DROP_CONTAINER(void) { @@ -1358,8 +1355,7 @@ int item_getcheck_func_MIRROR_PIECE_4(void) { } bool item_getcheck_func_SMELL_YELIA_POUCH(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getScent() == - SMELL_YELIA_POUCH; + return dComIfGs_getCollectSmell() == SMELL_YELIA_POUCH; } int item_getcheck_func_SMELL_PUMPKIN(void) { @@ -1367,121 +1363,119 @@ int item_getcheck_func_SMELL_PUMPKIN(void) { } bool item_getcheck_func_SMELL_POH(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getScent() == SMELL_POH; + return dComIfGs_getCollectSmell() == SMELL_POH; } bool item_getcheck_func_SMELL_FISH(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getScent() == SMELL_FISH; + return dComIfGs_getCollectSmell() == SMELL_FISH; } bool item_getcheck_func_SMELL_CHILDREN(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getScent() == - SMELL_CHILDREN; + return dComIfGs_getCollectSmell() == SMELL_CHILDREN; } bool item_getcheck_func_SMELL_MEDICINE(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerStatusA().getScent() == - SMELL_MEDICINE; + return dComIfGs_getCollectSmell() == SMELL_MEDICINE; } -void item_getcheck_func_M_BEETLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_BEETLE); +int item_getcheck_func_M_BEETLE(void) { + return dComIfGs_isItemFirstBit(M_BEETLE); } -void item_getcheck_func_F_BEETLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_BEETLE); +int item_getcheck_func_F_BEETLE(void) { + return dComIfGs_isItemFirstBit(F_BEETLE); } -void item_getcheck_func_M_BUTTERFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_BUTTERFLY); +int item_getcheck_func_M_BUTTERFLY(void) { + return dComIfGs_isItemFirstBit(M_BUTTERFLY); } -void item_getcheck_func_F_BUTTERFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_BUTTERFLY); +int item_getcheck_func_F_BUTTERFLY(void) { + return dComIfGs_isItemFirstBit(F_BUTTERFLY); } -void item_getcheck_func_M_STAG_BEETLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_STAG_BEETLE); +int item_getcheck_func_M_STAG_BEETLE(void) { + return dComIfGs_isItemFirstBit(M_STAG_BEETLE); } -void item_getcheck_func_F_STAG_BEETLE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_STAG_BEETLE); +int item_getcheck_func_F_STAG_BEETLE(void) { + return dComIfGs_isItemFirstBit(F_STAG_BEETLE); } -void item_getcheck_func_M_GRASSHOPPER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_GRASSHOPPER); +int item_getcheck_func_M_GRASSHOPPER(void) { + return dComIfGs_isItemFirstBit(M_GRASSHOPPER); } -void item_getcheck_func_F_GRASSHOPPER(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_GRASSHOPPER); +int item_getcheck_func_F_GRASSHOPPER(void) { + return dComIfGs_isItemFirstBit(F_GRASSHOPPER); } -void item_getcheck_func_M_NANAFUSHI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_NANAFUSHI); +int item_getcheck_func_M_NANAFUSHI(void) { + return dComIfGs_isItemFirstBit(M_NANAFUSHI); } -void item_getcheck_func_F_NANAFUSHI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_NANAFUSHI); +int item_getcheck_func_F_NANAFUSHI(void) { + return dComIfGs_isItemFirstBit(F_NANAFUSHI); } -void item_getcheck_func_M_DANGOMUSHI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_DANGOMUSHI); +int item_getcheck_func_M_DANGOMUSHI(void) { + return dComIfGs_isItemFirstBit(M_DANGOMUSHI); } -void item_getcheck_func_F_DANGOMUSHI(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_DANGOMUSHI); +int item_getcheck_func_F_DANGOMUSHI(void) { + return dComIfGs_isItemFirstBit(F_DANGOMUSHI); } -void item_getcheck_func_M_MANTIS(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_MANTIS); +int item_getcheck_func_M_MANTIS(void) { + return dComIfGs_isItemFirstBit(M_MANTIS); } -void item_getcheck_func_F_MANTIS(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_MANTIS); +int item_getcheck_func_F_MANTIS(void) { + return dComIfGs_isItemFirstBit(F_MANTIS); } -void item_getcheck_func_M_LADYBUG(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_LADYBUG); +int item_getcheck_func_M_LADYBUG(void) { + return dComIfGs_isItemFirstBit(M_LADYBUG); } -void item_getcheck_func_F_LADYBUG(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_LADYBUG); +int item_getcheck_func_F_LADYBUG(void) { + return dComIfGs_isItemFirstBit(F_LADYBUG); } -void item_getcheck_func_M_SNAIL(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_SNAIL); +int item_getcheck_func_M_SNAIL(void) { + return dComIfGs_isItemFirstBit(M_SNAIL); } -void item_getcheck_func_F_SNAIL(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_SNAIL); +int item_getcheck_func_F_SNAIL(void) { + return dComIfGs_isItemFirstBit(F_SNAIL); } -void item_getcheck_func_M_DRAGONFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_DRAGONFLY); +int item_getcheck_func_M_DRAGONFLY(void) { + return dComIfGs_isItemFirstBit(M_DRAGONFLY); } -void item_getcheck_func_F_DRAGONFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_DRAGONFLY); +int item_getcheck_func_F_DRAGONFLY(void) { + return dComIfGs_isItemFirstBit(F_DRAGONFLY); } -void item_getcheck_func_M_ANT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_ANT); +int item_getcheck_func_M_ANT(void) { + return dComIfGs_isItemFirstBit(M_ANT); } -void item_getcheck_func_F_ANT(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_ANT); +int item_getcheck_func_F_ANT(void) { + return dComIfGs_isItemFirstBit(F_ANT); } -void item_getcheck_func_M_MAYFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(M_MAYFLY); +int item_getcheck_func_M_MAYFLY(void) { + return dComIfGs_isItemFirstBit(M_MAYFLY); } -void item_getcheck_func_F_MAYFLY(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(F_MAYFLY); +int item_getcheck_func_F_MAYFLY(void) { + return dComIfGs_isItemFirstBit(F_MAYFLY); } int item_getcheck_func_POU_SPIRIT(void) { - return g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerCollect().getPoeCount(); + return dComIfGs_getPohSpiritNum(); } bool item_getcheck_func_ANCIENT_DOCUMENT(void) { @@ -1528,16 +1522,16 @@ int item_getcheck_func_BOSSRIDER_KEY(void) { return -1; } -void item_getcheck_func_TOMATO_PUREE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(TOMATO_PUREE); +int item_getcheck_func_TOMATO_PUREE(void) { + return dComIfGs_isItemFirstBit(TOMATO_PUREE); } -void item_getcheck_func_TASTE(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(TASTE); +int item_getcheck_func_TASTE(void) { + return dComIfGs_isItemFirstBit(TASTE); } -void item_getcheck_func_LV5_BOSS_KEY(void) { - g_dComIfG_gameInfo.getMemory().getTempFlags().isDungeonItem(BOSS_KEY_FLAG); +bool item_getcheck_func_LV5_BOSS_KEY(void) { + return dComIfGs_isDungeonItemBossKey(); } int item_getcheck_func_SURFBOARD(void) { @@ -1548,20 +1542,20 @@ int item_getcheck_func_KANTERA2(void) { return -1; } -void item_getcheck_func_L2_KEY_PIECES1(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES1); +int item_getcheck_func_L2_KEY_PIECES1(void) { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES1); } -void item_getcheck_func_L2_KEY_PIECES2(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES2); +int item_getcheck_func_L2_KEY_PIECES2(void) { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES2); } -void item_getcheck_func_L2_KEY_PIECES3(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(L2_KEY_PIECES3); +int item_getcheck_func_L2_KEY_PIECES3(void) { + return dComIfGs_isItemFirstBit(L2_KEY_PIECES3); } -void item_getcheck_func_KEY_OF_CARAVAN(void) { - g_dComIfG_gameInfo.getSaveFile().getPlayer().getPlayerGetItem().isFirstBit(KEY_OF_CARAVAN); +int item_getcheck_func_KEY_OF_CARAVAN(void) { + return dComIfGs_isItemFirstBit(KEY_OF_CARAVAN); } bool item_getcheck_func_LV2_BOSS_KEY(void) { @@ -1569,7 +1563,7 @@ bool item_getcheck_func_LV2_BOSS_KEY(void) { } int item_getcheck_func_KEY_OF_FILONE(void) { - return g_dComIfG_gameInfo.getMemory().getTempFlags().getSmallKeys(); + return dComIfGs_getKeyNum(); } #ifdef NONMATCHING @@ -1596,14 +1590,12 @@ asm bool isBomb(u8 param1) { } #endif -bool isArrow(u8 param1) { - bool is_arrow; +bool isArrow(u8 item_no) { + bool is_arrow = false; - is_arrow = false; - if (param1 == ARROW_1 || (u8)(param1 - ARROW_10) <= 1 || param1 == ARROW_30) { + if (item_no == ARROW_1 || item_no == ARROW_10 || item_no == ARROW_20 || item_no == ARROW_30) { is_arrow = true; } - return is_arrow; } @@ -1612,11 +1604,10 @@ asm bool isBottleItem(u8 param1) { #include "d/d_item/d_item/asm/func_8009B708.s" } -bool isHeart(u8 param1) { - bool is_heart; +bool isHeart(u8 item_no) { + bool is_heart = false; - is_heart = false; - if (param1 == HEART || param1 == TRIPLE_HEART) { + if (item_no == HEART || item_no == TRIPLE_HEART) { is_heart = true; } return is_heart; @@ -1640,10 +1631,33 @@ asm bool isInsect(u8 param1) { } #endif +#ifdef NONMATCHING +int check_itemno(int param1) { + if (dComIfGs_isGetMagicUseFlag() == 0 && (param1 == 8 || param1 == 9)) { + param1 = 1; + return param1; + } else if (param1 == 0x11) { + if (dComIfGs_isItemFirstBit(67) == false) { + param1 = 1; + return param1; + } + } else if (isArrow(param1)) { + if (dComIfGs_isItemFirstBit(67) == false) { + param1 = 1; + return param1; + } + } else if (test_getLayerNo(0) != 0xd) { + if (test_getLayerNo(0) == 0xe) { + } + } + return param1; +} +#else asm u32 check_itemno(int param1) { nofralloc #include "d/d_item/d_item/asm/func_8009B7C4.s" } +#endif asm void addBombCount(u8 param1, u8 param2) { nofralloc