diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s index bcffac52e6c..46942c84ce3 100644 --- a/asm/Z2AudioLib/Z2EnvSeMgr.s +++ b/asm/Z2AudioLib/Z2EnvSeMgr.s @@ -1002,14 +1002,14 @@ Z2EnvSeMgr_NS_framework: /* 802C6708 002C3648 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802C670C 002C364C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 802C6710 002C3650 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 802C6714 002C3654 4B D6 E2 A9 */ bl dSv_event_c_NS_isEventBit +/* 802C6714 002C3654 4B D6 E2 A9 */ bl isEventBit__11dSv_event_cCFUs /* 802C6718 002C3658 2C 03 00 00 */ cmpwi r3, 0 /* 802C671C 002C365C 41 82 00 48 */ beq lbl_802C6764 /* 802C6720 002C3660 7F A3 EB 78 */ mr r3, r29 /* 802C6724 002C3664 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802C6728 002C3668 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 802C672C 002C366C A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 802C6730 002C3670 4B D6 E2 8D */ bl dSv_event_c_NS_isEventBit +/* 802C6730 002C3670 4B D6 E2 8D */ bl isEventBit__11dSv_event_cCFUs /* 802C6734 002C3674 2C 03 00 00 */ cmpwi r3, 0 /* 802C6738 002C3678 40 82 00 2C */ bne lbl_802C6764 lbl_802C673C: diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s index 6d50f0e13b7..b0a66a8e718 100644 --- a/asm/Z2AudioLib/Z2LinkMgr.s +++ b/asm/Z2AudioLib/Z2LinkMgr.s @@ -1106,7 +1106,7 @@ lbl_802C41A0: /* 802C41AC 002C10EC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802C41B0 002C10F0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 802C41B4 002C10F4 A0 84 02 14 */ lhz r4, 0x214(r4) -/* 802C41B8 002C10F8 4B D7 08 05 */ bl dSv_event_c_NS_isEventBit +/* 802C41B8 002C10F8 4B D7 08 05 */ bl isEventBit__11dSv_event_cCFUs /* 802C41BC 002C10FC 2C 03 00 00 */ cmpwi r3, 0 /* 802C41C0 002C1100 41 82 00 3C */ beq lbl_802C41FC /* 802C41C4 002C1104 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) diff --git a/asm/Z2AudioLib/Z2SceneMgr.s b/asm/Z2AudioLib/Z2SceneMgr.s index b28b290df9a..1ce0c7c90be 100644 --- a/asm/Z2AudioLib/Z2SceneMgr.s +++ b/asm/Z2AudioLib/Z2SceneMgr.s @@ -3765,7 +3765,7 @@ Z2SceneMgr_NS__load1stWaveInner_1: /* 802B9DCC 002B6D0C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802B9DD0 002B6D10 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 802B9DD4 002B6D14 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 802B9DD8 002B6D18 4B D7 AB E5 */ bl dSv_event_c_NS_isEventBit +/* 802B9DD8 002B6D18 4B D7 AB E5 */ bl isEventBit__11dSv_event_cCFUs /* 802B9DDC 002B6D1C 30 03 FF FF */ addic r0, r3, -1 /* 802B9DE0 002B6D20 7C 60 19 10 */ subfe r3, r0, r3 /* 802B9DE4 002B6D24 38 03 00 58 */ addi r0, r3, 0x58 diff --git a/asm/d/a/d_a_alink.s b/asm/d/a/d_a_alink.s index b11534fac4b..6e107cb057f 100644 --- a/asm/d/a/d_a_alink.s +++ b/asm/d/a/d_a_alink.s @@ -9459,7 +9459,7 @@ lbl_800A5D9C: /* 800A5DC4 000A2D04 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800A5DC8 000A2D08 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800A5DCC 000A2D0C A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 800A5DD0 000A2D10 4B F8 EB ED */ bl dSv_event_c_NS_isEventBit +/* 800A5DD0 000A2D10 4B F8 EB ED */ bl isEventBit__11dSv_event_cCFUs /* 800A5DD4 000A2D14 2C 03 00 00 */ cmpwi r3, 0 /* 800A5DD8 000A2D18 41 82 00 0C */ beq lbl_800A5DE4 /* 800A5DDC 000A2D1C 38 60 00 2F */ li r3, 0x2f @@ -30286,7 +30286,7 @@ lbl_800B8204: /* 800B8208 000B5148 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800B820C 000B514C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800B8210 000B5150 38 80 61 40 */ li r4, 0x6140 -/* 800B8214 000B5154 4B F7 C7 A9 */ bl dSv_event_c_NS_isEventBit +/* 800B8214 000B5154 4B F7 C7 A9 */ bl isEventBit__11dSv_event_cCFUs /* 800B8218 000B5158 2C 03 00 00 */ cmpwi r3, 0 /* 800B821C 000B515C 41 82 00 0C */ beq lbl_800B8228 lbl_800B8220: @@ -31244,7 +31244,7 @@ lbl_800B8F24: /* 800B8F28 000B5E68 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800B8F2C 000B5E6C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800B8F30 000B5E70 38 80 29 08 */ li r4, 0x2908 -/* 800B8F34 000B5E74 4B F7 BA 89 */ bl dSv_event_c_NS_isEventBit +/* 800B8F34 000B5E74 4B F7 BA 89 */ bl isEventBit__11dSv_event_cCFUs /* 800B8F38 000B5E78 2C 03 00 00 */ cmpwi r3, 0 /* 800B8F3C 000B5E7C 40 82 00 10 */ bne lbl_800B8F4C /* 800B8F40 000B5E80 80 1F 05 7C */ lwz r0, 0x57c(r31) @@ -37102,7 +37102,7 @@ lbl_800BE144: /* 800BE148 000BB088 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800BE14C 000BB08C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800BE150 000BB090 38 80 20 08 */ li r4, 0x2008 -/* 800BE154 000BB094 4B F7 68 69 */ bl dSv_event_c_NS_isEventBit +/* 800BE154 000BB094 4B F7 68 69 */ bl isEventBit__11dSv_event_cCFUs /* 800BE158 000BB098 2C 03 00 00 */ cmpwi r3, 0 /* 800BE15C 000BB09C 40 82 00 3C */ bne lbl_800BE198 /* 800BE160 000BB0A0 7F 83 E3 78 */ mr r3, r28 @@ -48350,7 +48350,7 @@ lbl_800C7FE8: /* 800C8010 000C4F50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800C8014 000C4F54 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800C8018 000C4F58 38 80 5E 40 */ li r4, 0x5e40 -/* 800C801C 000C4F5C 4B F6 C9 71 */ bl dSv_event_c_NS_onEventBit +/* 800C801C 000C4F5C 4B F6 C9 71 */ bl onEventBit__11dSv_event_cFUs lbl_800C8020: /* 800C8020 000C4F60 C0 1E 00 10 */ lfs f0, 0x10(r30) /* 800C8024 000C4F64 D0 1D 33 DC */ stfs f0, 0x33dc(r29) @@ -52057,7 +52057,7 @@ lbl_800CB4DC: /* 800CB4F8 000C8438 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800CB4FC 000C843C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CB500 000C8440 38 80 0C 08 */ li r4, 0xc08 -/* 800CB504 000C8444 4B F6 94 B9 */ bl dSv_event_c_NS_isEventBit +/* 800CB504 000C8444 4B F6 94 B9 */ bl isEventBit__11dSv_event_cCFUs /* 800CB508 000C8448 2C 03 00 00 */ cmpwi r3, 0 /* 800CB50C 000C844C 41 82 00 08 */ beq lbl_800CB514 /* 800CB510 000C8450 3B C0 00 00 */ li r30, 0 @@ -52111,7 +52111,7 @@ lbl_800CB598: /* 800CB5B4 000C84F4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800CB5B8 000C84F8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CB5BC 000C84FC 38 80 0C 08 */ li r4, 0xc08 -/* 800CB5C0 000C8500 4B F6 93 FD */ bl dSv_event_c_NS_isEventBit +/* 800CB5C0 000C8500 4B F6 93 FD */ bl isEventBit__11dSv_event_cCFUs /* 800CB5C4 000C8504 2C 03 00 00 */ cmpwi r3, 0 /* 800CB5C8 000C8508 41 82 00 08 */ beq lbl_800CB5D0 /* 800CB5CC 000C850C 3B C0 00 00 */ li r30, 0 @@ -53836,7 +53836,7 @@ lbl_800CCE28: /* 800CCE68 000C9DA8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800CCE6C 000C9DAC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800CCE70 000C9DB0 38 80 05 10 */ li r4, 0x510 -/* 800CCE74 000C9DB4 4B F6 7B 49 */ bl dSv_event_c_NS_isEventBit +/* 800CCE74 000C9DB4 4B F6 7B 49 */ bl isEventBit__11dSv_event_cCFUs /* 800CCE78 000C9DB8 2C 03 00 00 */ cmpwi r3, 0 /* 800CCE7C 000C9DBC 41 82 00 30 */ beq lbl_800CCEAC /* 800CCE80 000C9DC0 3B 00 00 00 */ li r24, 0 @@ -58640,7 +58640,7 @@ lbl_800D1120: /* 800D1140 000CE080 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D1144 000CE084 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D1148 000CE088 38 80 2A 80 */ li r4, 0x2a80 -/* 800D114C 000CE08C 4B F6 38 71 */ bl dSv_event_c_NS_isEventBit +/* 800D114C 000CE08C 4B F6 38 71 */ bl isEventBit__11dSv_event_cCFUs /* 800D1150 000CE090 2C 03 00 00 */ cmpwi r3, 0 /* 800D1154 000CE094 40 82 00 10 */ bne lbl_800D1164 /* 800D1158 000CE098 80 1F 05 7C */ lwz r0, 0x57c(r31) @@ -60322,7 +60322,7 @@ daAlink_c_NS_checkDoCutAction: /* 800D2808 000CF748 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D280C 000CF74C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2810 000CF750 38 80 2A 40 */ li r4, 0x2a40 -/* 800D2814 000CF754 4B F6 21 A9 */ bl dSv_event_c_NS_isEventBit +/* 800D2814 000CF754 4B F6 21 A9 */ bl isEventBit__11dSv_event_cCFUs /* 800D2818 000CF758 2C 03 00 00 */ cmpwi r3, 0 /* 800D281C 000CF75C 40 82 00 10 */ bne lbl_800D282C /* 800D2820 000CF760 80 1F 05 7C */ lwz r0, 0x57c(r31) @@ -60372,7 +60372,7 @@ daAlink_c_NS_checkCutBackState: /* 800D28B0 000CF7F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D28B4 000CF7F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D28B8 000CF7F8 38 80 29 02 */ li r4, 0x2902 -/* 800D28BC 000CF7FC 4B F6 21 01 */ bl dSv_event_c_NS_isEventBit +/* 800D28BC 000CF7FC 4B F6 21 01 */ bl isEventBit__11dSv_event_cCFUs /* 800D28C0 000CF800 2C 03 00 00 */ cmpwi r3, 0 /* 800D28C4 000CF804 40 82 00 14 */ bne lbl_800D28D8 /* 800D28C8 000CF808 80 1E 05 7C */ lwz r0, 0x57c(r30) @@ -60418,7 +60418,7 @@ lbl_800D2944: /* 800D2954 000CF894 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D2958 000CF898 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D295C 000CF89C 38 80 29 01 */ li r4, 0x2901 -/* 800D2960 000CF8A0 4B F6 20 5D */ bl dSv_event_c_NS_isEventBit +/* 800D2960 000CF8A0 4B F6 20 5D */ bl isEventBit__11dSv_event_cCFUs /* 800D2964 000CF8A4 2C 03 00 00 */ cmpwi r3, 0 /* 800D2968 000CF8A8 40 82 00 14 */ bne lbl_800D297C /* 800D296C 000CF8AC 80 1A 05 7C */ lwz r0, 0x57c(r26) @@ -60476,7 +60476,7 @@ daAlink_c_NS_checkDownAttackState: /* 800D2A20 000CF960 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D2A24 000CF964 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2A28 000CF968 38 80 29 04 */ li r4, 0x2904 -/* 800D2A2C 000CF96C 4B F6 1F 91 */ bl dSv_event_c_NS_isEventBit +/* 800D2A2C 000CF96C 4B F6 1F 91 */ bl isEventBit__11dSv_event_cCFUs /* 800D2A30 000CF970 2C 03 00 00 */ cmpwi r3, 0 /* 800D2A34 000CF974 40 82 00 10 */ bne lbl_800D2A44 /* 800D2A38 000CF978 80 1E 05 7C */ lwz r0, 0x57c(r30) @@ -60534,7 +60534,7 @@ daAlink_c_NS_checkCutLargeTurnState: /* 800D2AE4 000CFA24 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800D2AE8 000CFA28 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800D2AEC 000CFA2C 38 80 2A 20 */ li r4, 0x2a20 -/* 800D2AF0 000CFA30 4B F6 1E CD */ bl dSv_event_c_NS_isEventBit +/* 800D2AF0 000CFA30 4B F6 1E CD */ bl isEventBit__11dSv_event_cCFUs /* 800D2AF4 000CFA34 2C 03 00 00 */ cmpwi r3, 0 /* 800D2AF8 000CFA38 40 82 00 14 */ bne lbl_800D2B0C /* 800D2AFC 000CFA3C 80 1C 05 7C */ lwz r0, 0x57c(r28) @@ -77107,7 +77107,7 @@ lbl_800E1444: /* 800E1484 000DE3C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800E1488 000DE3C8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 800E148C 000DE3CC 38 80 25 80 */ li r4, 0x2580 -/* 800E1490 000DE3D0 4B F5 35 2D */ bl dSv_event_c_NS_isEventBit +/* 800E1490 000DE3D0 4B F5 35 2D */ bl isEventBit__11dSv_event_cCFUs /* 800E1494 000DE3D4 2C 03 00 00 */ cmpwi r3, 0 /* 800E1498 000DE3D8 41 82 00 30 */ beq lbl_800E14C8 /* 800E149C 000DE3DC 38 60 00 00 */ li r3, 0 @@ -86895,21 +86895,21 @@ lbl_800E9E30: /* 800E9E48 000E6D88 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800E9E4C 000E6D8C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800E9E50 000E6D90 A0 84 04 6A */ lhz r4, 0x46a(r4) -/* 800E9E54 000E6D94 4B F4 AB 69 */ bl dSv_event_c_NS_isEventBit +/* 800E9E54 000E6D94 4B F4 AB 69 */ bl isEventBit__11dSv_event_cCFUs /* 800E9E58 000E6D98 2C 03 00 00 */ cmpwi r3, 0 /* 800E9E5C 000E6D9C 41 82 00 1C */ beq lbl_800E9E78 /* 800E9E60 000E6DA0 7F 63 DB 78 */ mr r3, r27 /* 800E9E64 000E6DA4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800E9E68 000E6DA8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800E9E6C 000E6DAC A0 84 04 96 */ lhz r4, 0x496(r4) -/* 800E9E70 000E6DB0 4B F4 AB 1D */ bl dSv_event_c_NS_onEventBit +/* 800E9E70 000E6DB0 4B F4 AB 1D */ bl onEventBit__11dSv_event_cFUs /* 800E9E74 000E6DB4 48 00 00 18 */ b lbl_800E9E8C lbl_800E9E78: /* 800E9E78 000E6DB8 7F 63 DB 78 */ mr r3, r27 /* 800E9E7C 000E6DBC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800E9E80 000E6DC0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800E9E84 000E6DC4 A0 84 01 64 */ lhz r4, 0x164(r4) -/* 800E9E88 000E6DC8 4B F4 AB 05 */ bl dSv_event_c_NS_onEventBit +/* 800E9E88 000E6DC8 4B F4 AB 05 */ bl onEventBit__11dSv_event_cFUs lbl_800E9E8C: /* 800E9E8C 000E6DCC 7F 83 E3 78 */ mr r3, r28 /* 800E9E90 000E6DD0 4B FD 95 29 */ bl daAlink_c_NS_procWaitInit @@ -87101,7 +87101,7 @@ lbl_800EA10C: /* 800EA134 000E7074 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800EA138 000E7078 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800EA13C 000E707C A0 84 00 46 */ lhz r4, 0x46(r4) -/* 800EA140 000E7080 4B F4 A8 4D */ bl dSv_event_c_NS_onEventBit +/* 800EA140 000E7080 4B F4 A8 4D */ bl onEventBit__11dSv_event_cFUs lbl_800EA144: /* 800EA144 000E7084 38 00 00 04 */ li r0, 4 /* 800EA148 000E7088 98 1C 2F 99 */ stb r0, 0x2f99(r28) @@ -130323,12 +130323,12 @@ lbl_801104C4: /* 801104D8 0010D418 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 801104DC 0010D41C 7F C3 F3 78 */ mr r3, r30 /* 801104E0 0010D420 38 80 4A 40 */ li r4, 0x4a40 -/* 801104E4 0010D424 4B F2 44 D9 */ bl dSv_event_c_NS_isEventBit +/* 801104E4 0010D424 4B F2 44 D9 */ bl isEventBit__11dSv_event_cCFUs /* 801104E8 0010D428 2C 03 00 00 */ cmpwi r3, 0 /* 801104EC 0010D42C 41 82 00 10 */ beq lbl_801104FC /* 801104F0 0010D430 7F C3 F3 78 */ mr r3, r30 /* 801104F4 0010D434 38 80 4C 80 */ li r4, 0x4c80 -/* 801104F8 0010D438 4B F2 44 95 */ bl dSv_event_c_NS_onEventBit +/* 801104F8 0010D438 4B F2 44 95 */ bl onEventBit__11dSv_event_cFUs lbl_801104FC: /* 801104FC 0010D43C 38 60 00 01 */ li r3, 1 /* 80110500 0010D440 39 61 00 20 */ addi r11, r1, 0x20 @@ -132170,17 +132170,17 @@ lbl_80111EA0: /* 80111F0C 0010EE4C 3B C3 07 F0 */ addi r30, r3, 0x7f0 /* 80111F10 0010EE50 7F C3 F3 78 */ mr r3, r30 /* 80111F14 0010EE54 38 80 4A 40 */ li r4, 0x4a40 -/* 80111F18 0010EE58 4B F2 2A A5 */ bl dSv_event_c_NS_isEventBit +/* 80111F18 0010EE58 4B F2 2A A5 */ bl isEventBit__11dSv_event_cCFUs /* 80111F1C 0010EE5C 2C 03 00 00 */ cmpwi r3, 0 /* 80111F20 0010EE60 41 82 00 B4 */ beq lbl_80111FD4 /* 80111F24 0010EE64 7F C3 F3 78 */ mr r3, r30 /* 80111F28 0010EE68 38 80 10 02 */ li r4, 0x1002 -/* 80111F2C 0010EE6C 4B F2 2A 91 */ bl dSv_event_c_NS_isEventBit +/* 80111F2C 0010EE6C 4B F2 2A 91 */ bl isEventBit__11dSv_event_cCFUs /* 80111F30 0010EE70 2C 03 00 00 */ cmpwi r3, 0 /* 80111F34 0010EE74 41 82 00 A0 */ beq lbl_80111FD4 /* 80111F38 0010EE78 7F C3 F3 78 */ mr r3, r30 /* 80111F3C 0010EE7C 38 80 47 10 */ li r4, 0x4710 -/* 80111F40 0010EE80 4B F2 2A 4D */ bl dSv_event_c_NS_onEventBit +/* 80111F40 0010EE80 4B F2 2A 4D */ bl onEventBit__11dSv_event_cFUs /* 80111F44 0010EE84 48 00 00 90 */ b lbl_80111FD4 lbl_80111F48: /* 80111F48 0010EE88 7F E3 FB 78 */ mr r3, r31 @@ -132199,7 +132199,7 @@ lbl_80111F48: /* 80111F7C 0010EEBC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80111F80 0010EEC0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80111F84 0010EEC4 38 80 47 20 */ li r4, 0x4720 -/* 80111F88 0010EEC8 4B F2 2A 05 */ bl dSv_event_c_NS_onEventBit +/* 80111F88 0010EEC8 4B F2 2A 05 */ bl onEventBit__11dSv_event_cFUs /* 80111F8C 0010EECC 48 00 00 48 */ b lbl_80111FD4 lbl_80111F90: /* 80111F90 0010EED0 7F E3 FB 78 */ mr r3, r31 @@ -143926,7 +143926,7 @@ lbl_8011C578: /* 8011C594 001194D4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8011C598 001194D8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8011C59C 001194DC 38 80 28 80 */ li r4, 0x2880 -/* 8011C5A0 001194E0 4B F1 84 1D */ bl dSv_event_c_NS_isEventBit +/* 8011C5A0 001194E0 4B F1 84 1D */ bl isEventBit__11dSv_event_cCFUs /* 8011C5A4 001194E4 2C 03 00 00 */ cmpwi r3, 0 /* 8011C5A8 001194E8 40 82 00 0C */ bne lbl_8011C5B4 lbl_8011C5AC: @@ -158696,7 +158696,7 @@ lbl_801299EC: /* 801299F0 00126930 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801299F4 00126934 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801299F8 00126938 38 80 43 08 */ li r4, 0x4308 -/* 801299FC 0012693C 4B F0 AF C1 */ bl dSv_event_c_NS_isEventBit +/* 801299FC 0012693C 4B F0 AF C1 */ bl isEventBit__11dSv_event_cCFUs /* 80129A00 00126940 2C 03 00 00 */ cmpwi r3, 0 /* 80129A04 00126944 41 82 00 68 */ beq lbl_80129A6C /* 80129A08 00126948 88 1F 2F D2 */ lbz r0, 0x2fd2(r31) @@ -163586,7 +163586,7 @@ daAlink_c_NS_procWolfSideStepInit: /* 8012DEFC 0012AE3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8012DF00 0012AE40 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8012DF04 0012AE44 38 80 0C 10 */ li r4, 0xc10 -/* 8012DF08 0012AE48 4B F0 6A B5 */ bl dSv_event_c_NS_isEventBit +/* 8012DF08 0012AE48 4B F0 6A B5 */ bl isEventBit__11dSv_event_cCFUs /* 8012DF0C 0012AE4C 2C 03 00 00 */ cmpwi r3, 0 /* 8012DF10 0012AE50 41 82 00 48 */ beq lbl_8012DF58 /* 8012DF14 0012AE54 38 60 00 00 */ li r3, 0 @@ -166267,7 +166267,7 @@ daAlink_searchWolfHowl: /* 801305B0 0012D4F0 40 82 00 18 */ bne lbl_801305C8 /* 801305B4 0012D4F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801305B8 0012D4F8 38 80 0A 10 */ li r4, 0xa10 -/* 801305BC 0012D4FC 4B F0 44 01 */ bl dSv_event_c_NS_isEventBit +/* 801305BC 0012D4FC 4B F0 44 01 */ bl isEventBit__11dSv_event_cCFUs /* 801305C0 0012D500 2C 03 00 00 */ cmpwi r3, 0 /* 801305C4 0012D504 40 82 00 70 */ bne lbl_80130634 lbl_801305C8: @@ -176610,7 +176610,7 @@ daAlink_c_NS_checkWolfLockAttackChargeState: /* 801397D4 00136714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801397D8 00136718 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801397DC 0013671C 38 80 05 01 */ li r4, 0x501 -/* 801397E0 00136720 4B EF B1 DD */ bl dSv_event_c_NS_isEventBit +/* 801397E0 00136720 4B EF B1 DD */ bl isEventBit__11dSv_event_cCFUs /* 801397E4 00136724 2C 03 00 00 */ cmpwi r3, 0 /* 801397E8 00136728 41 82 00 08 */ beq lbl_801397F0 /* 801397EC 0013672C 3B A0 00 01 */ li r29, 1 @@ -176629,7 +176629,7 @@ lbl_801397F0: /* 8013981C 0013675C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80139820 00136760 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80139824 00136764 38 80 1E 08 */ li r4, 0x1e08 -/* 80139828 00136768 4B EF B1 95 */ bl dSv_event_c_NS_isEventBit +/* 80139828 00136768 4B EF B1 95 */ bl isEventBit__11dSv_event_cCFUs /* 8013982C 0013676C 2C 03 00 00 */ cmpwi r3, 0 /* 80139830 00136770 40 82 00 08 */ bne lbl_80139838 /* 80139834 00136774 3B A0 00 01 */ li r29, 1 @@ -177115,7 +177115,7 @@ lbl_80139EB0: /* 80139EFC 00136E3C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80139F00 00136E40 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80139F04 00136E44 38 80 05 20 */ li r4, 0x520 -/* 80139F08 00136E48 4B EF AA B5 */ bl dSv_event_c_NS_isEventBit +/* 80139F08 00136E48 4B EF AA B5 */ bl isEventBit__11dSv_event_cCFUs /* 80139F0C 00136E4C 2C 03 00 00 */ cmpwi r3, 0 /* 80139F10 00136E50 40 82 00 24 */ bne lbl_80139F34 /* 80139F14 00136E54 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -183409,7 +183409,7 @@ daAlink_c_NS_setSmellSave: /* 8013F930 0013C870 40 82 00 10 */ bne lbl_8013F940 /* 8013F934 0013C874 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F938 0013C878 38 80 2F 04 */ li r4, 0x2f04 -/* 8013F93C 0013C87C 4B EF 50 69 */ bl dSv_event_c_NS_offEventBit +/* 8013F93C 0013C87C 4B EF 50 69 */ bl offEventBit__11dSv_event_cFUs lbl_8013F940: /* 8013F940 0013C880 A8 1F 30 12 */ lha r0, 0x3012(r31) /* 8013F944 0013C884 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -183421,7 +183421,7 @@ lbl_8013F940: /* 8013F95C 0013C89C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013F960 0013C8A0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F964 0013C8A4 38 80 2F 04 */ li r4, 0x2f04 -/* 8013F968 0013C8A8 4B EF 50 25 */ bl dSv_event_c_NS_onEventBit +/* 8013F968 0013C8A8 4B EF 50 25 */ bl onEventBit__11dSv_event_cFUs /* 8013F96C 0013C8AC 48 00 00 88 */ b lbl_8013F9F4 lbl_8013F970: /* 8013F970 0013C8B0 2C 00 00 B4 */ cmpwi r0, 0xb4 @@ -183450,7 +183450,7 @@ lbl_8013F9B8: /* 8013F9C4 0013C904 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013F9C8 0013C908 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F9CC 0013C90C 38 80 61 20 */ li r4, 0x6120 -/* 8013F9D0 0013C910 4B EF 4F BD */ bl dSv_event_c_NS_onEventBit +/* 8013F9D0 0013C910 4B EF 4F BD */ bl onEventBit__11dSv_event_cFUs /* 8013F9D4 0013C914 48 00 00 20 */ b lbl_8013F9F4 lbl_8013F9D8: /* 8013F9D8 0013C918 2C 00 00 B2 */ cmpwi r0, 0xb2 @@ -183459,7 +183459,7 @@ lbl_8013F9D8: /* 8013F9E4 0013C924 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013F9E8 0013C928 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013F9EC 0013C92C 38 80 62 10 */ li r4, 0x6210 -/* 8013F9F0 0013C930 4B EF 4F 9D */ bl dSv_event_c_NS_onEventBit +/* 8013F9F0 0013C930 4B EF 4F 9D */ bl onEventBit__11dSv_event_cFUs lbl_8013F9F4: /* 8013F9F4 0013C934 7F E3 FB 78 */ mr r3, r31 /* 8013F9F8 0013C938 A8 9F 30 12 */ lha r4, 0x3012(r31) @@ -183585,7 +183585,7 @@ lbl_8013FBA8: /* 8013FBB8 0013CAF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013FBBC 0013CAFC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013FBC0 0013CB00 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8013FBC4 0013CB04 4B EF 4D F9 */ bl dSv_event_c_NS_isEventBit +/* 8013FBC4 0013CB04 4B EF 4D F9 */ bl isEventBit__11dSv_event_cCFUs /* 8013FBC8 0013CB08 2C 03 00 00 */ cmpwi r3, 0 /* 8013FBCC 0013CB0C 41 82 00 0C */ beq lbl_8013FBD8 lbl_8013FBD0: @@ -183670,7 +183670,7 @@ lbl_8013FCE4: /* 8013FCF4 0013CC34 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013FCF8 0013CC38 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8013FCFC 0013CC3C 54 84 04 3E */ clrlwi r4, r4, 0x10 -/* 8013FD00 0013CC40 4B EF 4C 8D */ bl dSv_event_c_NS_onEventBit +/* 8013FD00 0013CC40 4B EF 4C 8D */ bl onEventBit__11dSv_event_cFUs /* 8013FD04 0013CC44 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8013FD08 0013CC48 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8013FD0C 0013CC4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 @@ -185380,7 +185380,7 @@ dComIfGs_isEventBit: /* 801413AC 0013E2EC 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801413B0 0013E2F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801413B4 0013E2F4 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 801413B8 0013E2F8 4B EF 36 05 */ bl dSv_event_c_NS_isEventBit +/* 801413B8 0013E2F8 4B EF 36 05 */ bl isEventBit__11dSv_event_cCFUs /* 801413BC 0013E2FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801413C0 0013E300 7C 08 03 A6 */ mtlr r0 /* 801413C4 0013E304 38 21 00 10 */ addi r1, r1, 0x10 @@ -185886,7 +185886,7 @@ daMidna_c_NS_checkMidnaTired: /* 80141A50 0013E990 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80141A54 0013E994 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80141A58 0013E998 38 80 1E 08 */ li r4, 0x1e08 -/* 80141A5C 0013E99C 4B EF 2F 61 */ bl dSv_event_c_NS_isEventBit +/* 80141A5C 0013E99C 4B EF 2F 61 */ bl isEventBit__11dSv_event_cCFUs /* 80141A60 0013E9A0 2C 03 00 00 */ cmpwi r3, 0 /* 80141A64 0013E9A4 40 82 00 08 */ bne lbl_80141A6C /* 80141A68 0013E9A8 3B E0 00 01 */ li r31, 1 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index 1a5ae15fcd0..bd927d0460a 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -7954,7 +7954,7 @@ lbl_8014C9F4: /* 8014CA4C 0014998C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8014CA50 00149990 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8014CA54 00149994 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CA58 00149998 4B EE 7F 35 */ bl dSv_event_c_NS_onEventBit +/* 8014CA58 00149998 4B EE 7F 35 */ bl onEventBit__11dSv_event_cFUs /* 8014CA5C 0014999C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CA60 001499A0 7C 08 03 A6 */ mtlr r0 /* 8014CA64 001499A4 38 21 00 10 */ addi r1, r1, 0x10 @@ -7970,7 +7970,7 @@ lbl_8014C9F4: /* 8014CA8C 001499CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8014CA90 001499D0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8014CA94 001499D4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CA98 001499D8 4B EE 7F 0D */ bl dSv_event_c_NS_offEventBit +/* 8014CA98 001499D8 4B EE 7F 0D */ bl offEventBit__11dSv_event_cFUs /* 8014CA9C 001499DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CAA0 001499E0 7C 08 03 A6 */ mtlr r0 /* 8014CAA4 001499E4 38 21 00 10 */ addi r1, r1, 0x10 @@ -7986,7 +7986,7 @@ lbl_8014C9F4: /* 8014CACC 00149A0C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8014CAD0 00149A10 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8014CAD4 00149A14 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CAD8 00149A18 4B EE 7E E5 */ bl dSv_event_c_NS_isEventBit +/* 8014CAD8 00149A18 4B EE 7E E5 */ bl isEventBit__11dSv_event_cCFUs /* 8014CADC 00149A1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CAE0 00149A20 7C 08 03 A6 */ mtlr r0 /* 8014CAE4 00149A24 38 21 00 10 */ addi r1, r1, 0x10 @@ -8002,7 +8002,7 @@ lbl_8014C9F4: /* 8014CB0C 00149A4C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8014CB10 00149A50 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8014CB14 00149A54 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB18 00149A58 4B EE 7E 75 */ bl dSv_event_c_NS_onEventBit +/* 8014CB18 00149A58 4B EE 7E 75 */ bl onEventBit__11dSv_event_cFUs /* 8014CB1C 00149A5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CB20 00149A60 7C 08 03 A6 */ mtlr r0 /* 8014CB24 00149A64 38 21 00 10 */ addi r1, r1, 0x10 @@ -8018,7 +8018,7 @@ lbl_8014C9F4: /* 8014CB4C 00149A8C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8014CB50 00149A90 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8014CB54 00149A94 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB58 00149A98 4B EE 7E 4D */ bl dSv_event_c_NS_offEventBit +/* 8014CB58 00149A98 4B EE 7E 4D */ bl offEventBit__11dSv_event_cFUs /* 8014CB5C 00149A9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CB60 00149AA0 7C 08 03 A6 */ mtlr r0 /* 8014CB64 00149AA4 38 21 00 10 */ addi r1, r1, 0x10 @@ -8034,7 +8034,7 @@ lbl_8014C9F4: /* 8014CB8C 00149ACC 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8014CB90 00149AD0 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8014CB94 00149AD4 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8014CB98 00149AD8 4B EE 7E 25 */ bl dSv_event_c_NS_isEventBit +/* 8014CB98 00149AD8 4B EE 7E 25 */ bl isEventBit__11dSv_event_cCFUs /* 8014CB9C 00149ADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014CBA0 00149AE0 7C 08 03 A6 */ mtlr r0 /* 8014CBA4 00149AE4 38 21 00 10 */ addi r1, r1, 0x10 @@ -17707,7 +17707,7 @@ lbl_8015561C: /* 80155654 00152594 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80155658 00152598 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8015565C 0015259C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155660 001525A0 4B ED F3 5D */ bl dSv_event_c_NS_isEventBit +/* 80155660 001525A0 4B ED F3 5D */ bl isEventBit__11dSv_event_cCFUs /* 80155664 001525A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80155668 001525A8 7C 08 03 A6 */ mtlr r0 /* 8015566C 001525AC 38 21 00 10 */ addi r1, r1, 0x10 @@ -17723,7 +17723,7 @@ lbl_8015561C: /* 80155694 001525D4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80155698 001525D8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8015569C 001525DC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801556A0 001525E0 4B ED F2 ED */ bl dSv_event_c_NS_onEventBit +/* 801556A0 001525E0 4B ED F2 ED */ bl onEventBit__11dSv_event_cFUs /* 801556A4 001525E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801556A8 001525E8 7C 08 03 A6 */ mtlr r0 /* 801556AC 001525EC 38 21 00 10 */ addi r1, r1, 0x10 @@ -17739,7 +17739,7 @@ lbl_8015561C: /* 801556D4 00152614 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 801556D8 00152618 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 801556DC 0015261C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801556E0 00152620 4B ED F2 DD */ bl dSv_event_c_NS_isEventBit +/* 801556E0 00152620 4B ED F2 DD */ bl isEventBit__11dSv_event_cCFUs /* 801556E4 00152624 80 01 00 14 */ lwz r0, 0x14(r1) /* 801556E8 00152628 7C 08 03 A6 */ mtlr r0 /* 801556EC 0015262C 38 21 00 10 */ addi r1, r1, 0x10 @@ -17755,7 +17755,7 @@ lbl_8015561C: /* 80155714 00152654 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80155718 00152658 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8015571C 0015265C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155720 00152660 4B ED F2 6D */ bl dSv_event_c_NS_onEventBit +/* 80155720 00152660 4B ED F2 6D */ bl onEventBit__11dSv_event_cFUs /* 80155724 00152664 80 01 00 14 */ lwz r0, 0x14(r1) /* 80155728 00152668 7C 08 03 A6 */ mtlr r0 /* 8015572C 0015266C 38 21 00 10 */ addi r1, r1, 0x10 @@ -17774,7 +17774,7 @@ daNpcF_offTmpBit: /* 80155754 00152694 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80155758 00152698 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8015575C 0015269C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80155760 001526A0 4B ED F2 45 */ bl dSv_event_c_NS_offEventBit +/* 80155760 001526A0 4B ED F2 45 */ bl offEventBit__11dSv_event_cFUs /* 80155764 001526A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80155768 001526A8 7C 08 03 A6 */ mtlr r0 /* 8015576C 001526AC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index 3b29f476f0e..e8f88b9527b 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -528,7 +528,7 @@ lbl_800315E8: /* 80031624 0002E564 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031628 0002E568 3C 80 00 01 */ lis r4, 0x0000FDFF@ha /* 8003162C 0002E56C 38 84 FD FF */ addi r4, r4, 0x0000FDFF@l -/* 80031630 0002E570 48 00 33 B1 */ bl dSv_event_c_NS_setEventReg +/* 80031630 0002E570 48 00 33 B1 */ bl setEventReg__11dSv_event_cFUsUc /* 80031634 0002E574 38 60 00 01 */ li r3, 1 /* 80031638 0002E578 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003163C 0002E57C 7C 08 03 A6 */ mtlr r0 @@ -568,7 +568,7 @@ lbl_80031690: /* 800316C0 0002E600 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800316C4 0002E604 3C 80 00 01 */ lis r4, 0x0000FF0F@ha /* 800316C8 0002E608 38 84 FF 0F */ addi r4, r4, 0x0000FF0F@l -/* 800316CC 0002E60C 48 00 33 15 */ bl dSv_event_c_NS_setEventReg +/* 800316CC 0002E60C 48 00 33 15 */ bl setEventReg__11dSv_event_cFUsUc /* 800316D0 0002E610 80 01 00 14 */ lwz r0, 0x14(r1) /* 800316D4 0002E614 7C 08 03 A6 */ mtlr r0 /* 800316D8 0002E618 38 21 00 10 */ addi r1, r1, 0x10 @@ -584,7 +584,7 @@ daNpcKakashi_getSwdTutorialStep: /* 800316F4 0002E634 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800316F8 0002E638 3C 80 00 01 */ lis r4, 0x0000FF0F@ha /* 800316FC 0002E63C 38 84 FF 0F */ addi r4, r4, 0x0000FF0F@l -/* 80031700 0002E640 48 00 33 05 */ bl dSv_event_c_NS_getEventReg +/* 80031700 0002E640 48 00 33 05 */ bl getEventReg__11dSv_event_cCFUs /* 80031704 0002E644 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 80031708 0002E648 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003170C 0002E64C 7C 08 03 A6 */ mtlr r0 @@ -600,7 +600,7 @@ daNpcKakashi_getSwdTutorialResult: /* 80031728 0002E668 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8003172C 0002E66C 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031730 0002E670 38 80 00 40 */ li r4, 0x40 -/* 80031734 0002E674 48 00 32 89 */ bl dSv_event_c_NS_isEventBit +/* 80031734 0002E674 48 00 32 89 */ bl isEventBit__11dSv_event_cCFUs /* 80031738 0002E678 30 03 FF FF */ addic r0, r3, -1 /* 8003173C 0002E67C 7C 00 19 10 */ subfe r0, r0, r3 /* 80031740 0002E680 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -617,14 +617,14 @@ daNpcKakashi_getSwdTutorialResult: /* 8003176C 0002E6AC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80031770 0002E6B0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 80031774 0002E6B4 38 80 00 40 */ li r4, 0x40 -/* 80031778 0002E6B8 48 00 32 15 */ bl dSv_event_c_NS_onEventBit +/* 80031778 0002E6B8 48 00 32 15 */ bl onEventBit__11dSv_event_cFUs /* 8003177C 0002E6BC 48 00 00 18 */ b lbl_80031794 lbl_80031780: /* 80031780 0002E6C0 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 80031784 0002E6C4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80031788 0002E6C8 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8003178C 0002E6CC 38 80 00 40 */ li r4, 0x40 -/* 80031790 0002E6D0 48 00 32 15 */ bl dSv_event_c_NS_offEventBit +/* 80031790 0002E6D0 48 00 32 15 */ bl offEventBit__11dSv_event_cFUs lbl_80031794: /* 80031794 0002E6D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80031798 0002E6D8 7C 08 03 A6 */ mtlr r0 @@ -641,7 +641,7 @@ daNpcKakashi_getSuccessCount: /* 800317B8 0002E6F8 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 800317BC 0002E6FC 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 800317C0 0002E700 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l -/* 800317C4 0002E704 48 00 32 41 */ bl dSv_event_c_NS_getEventReg +/* 800317C4 0002E704 48 00 32 41 */ bl getEventReg__11dSv_event_cCFUs /* 800317C8 0002E708 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800317CC 0002E70C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800317D0 0002E710 7C 08 03 A6 */ mtlr r0 @@ -657,14 +657,14 @@ daNpcKakashi_getSuccessCount: /* 800317F8 0002E738 7F E3 FB 78 */ mr r3, r31 /* 800317FC 0002E73C 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 80031800 0002E740 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l -/* 80031804 0002E744 48 00 32 01 */ bl dSv_event_c_NS_getEventReg +/* 80031804 0002E744 48 00 32 01 */ bl getEventReg__11dSv_event_cCFUs /* 80031808 0002E748 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8003180C 0002E74C 7F E3 FB 78 */ mr r3, r31 /* 80031810 0002E750 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 80031814 0002E754 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l /* 80031818 0002E758 38 05 00 01 */ addi r0, r5, 1 /* 8003181C 0002E75C 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80031820 0002E760 48 00 31 C1 */ bl dSv_event_c_NS_setEventReg +/* 80031820 0002E760 48 00 31 C1 */ bl setEventReg__11dSv_event_cFUsUc /* 80031824 0002E764 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80031828 0002E768 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003182C 0002E76C 7C 08 03 A6 */ mtlr r0 @@ -679,7 +679,7 @@ daNpcKakashi_getSuccessCount: /* 80031850 0002E790 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 80031854 0002E794 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l /* 80031858 0002E798 38 A0 00 00 */ li r5, 0 -/* 8003185C 0002E79C 48 00 31 85 */ bl dSv_event_c_NS_setEventReg +/* 8003185C 0002E79C 48 00 31 85 */ bl setEventReg__11dSv_event_cFUsUc /* 80031860 0002E7A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80031864 0002E7A4 7C 08 03 A6 */ mtlr r0 /* 80031868 0002E7A8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/com/inf/d_com_inf_game.s b/asm/d/com/inf/d_com_inf_game.s index ea041049784..b7e73156c1d 100644 --- a/asm/d/com/inf/d_com_inf_game.s +++ b/asm/d/com/inf/d_com_inf_game.s @@ -236,7 +236,7 @@ lbl_8002B4BC: /* 8002B4CC 0002840C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B4D0 00028410 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B4D4 00028414 A0 84 02 14 */ lhz r4, 0x214(r4) -/* 8002B4D8 00028418 48 00 94 E5 */ bl dSv_event_c_NS_isEventBit +/* 8002B4D8 00028418 48 00 94 E5 */ bl isEventBit__11dSv_event_cCFUs /* 8002B4DC 0002841C 2C 03 00 00 */ cmpwi r3, 0 /* 8002B4E0 00028420 41 82 00 10 */ beq lbl_8002B4F0 /* 8002B4E4 00028424 38 00 00 03 */ li r0, 3 @@ -247,7 +247,7 @@ lbl_8002B4F0: /* 8002B4F4 00028434 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B4F8 00028438 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B4FC 0002843C A0 84 01 46 */ lhz r4, 0x146(r4) -/* 8002B500 00028440 48 00 94 BD */ bl dSv_event_c_NS_isEventBit +/* 8002B500 00028440 48 00 94 BD */ bl isEventBit__11dSv_event_cCFUs /* 8002B504 00028444 2C 03 00 00 */ cmpwi r3, 0 /* 8002B508 00028448 41 82 00 10 */ beq lbl_8002B518 /* 8002B50C 0002844C 38 00 00 02 */ li r0, 2 @@ -258,7 +258,7 @@ lbl_8002B518: /* 8002B51C 0002845C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B520 00028460 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B524 00028464 A0 84 01 44 */ lhz r4, 0x144(r4) -/* 8002B528 00028468 48 00 94 95 */ bl dSv_event_c_NS_isEventBit +/* 8002B528 00028468 48 00 94 95 */ bl isEventBit__11dSv_event_cCFUs /* 8002B52C 0002846C 2C 03 00 00 */ cmpwi r3, 0 /* 8002B530 00028470 41 82 11 FC */ beq lbl_8002C72C /* 8002B534 00028474 38 00 00 01 */ li r0, 1 @@ -277,7 +277,7 @@ lbl_8002B540: /* 8002B564 000284A4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B568 000284A8 7F A3 EB 78 */ mr r3, r29 /* 8002B56C 000284AC 38 80 20 08 */ li r4, 0x2008 -/* 8002B570 000284B0 48 00 94 4D */ bl dSv_event_c_NS_isEventBit +/* 8002B570 000284B0 48 00 94 4D */ bl isEventBit__11dSv_event_cCFUs /* 8002B574 000284B4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B578 000284B8 41 82 00 10 */ beq lbl_8002B588 /* 8002B57C 000284BC 38 00 00 05 */ li r0, 5 @@ -286,7 +286,7 @@ lbl_8002B540: lbl_8002B588: /* 8002B588 000284C8 7F A3 EB 78 */ mr r3, r29 /* 8002B58C 000284CC 38 80 1E 08 */ li r4, 0x1e08 -/* 8002B590 000284D0 48 00 94 2D */ bl dSv_event_c_NS_isEventBit +/* 8002B590 000284D0 48 00 94 2D */ bl isEventBit__11dSv_event_cCFUs /* 8002B594 000284D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B598 000284D8 41 82 00 10 */ beq lbl_8002B5A8 /* 8002B59C 000284DC 38 00 00 03 */ li r0, 3 @@ -295,7 +295,7 @@ lbl_8002B588: lbl_8002B5A8: /* 8002B5A8 000284E8 7F A3 EB 78 */ mr r3, r29 /* 8002B5AC 000284EC 38 80 06 02 */ li r4, 0x602 -/* 8002B5B0 000284F0 48 00 94 0D */ bl dSv_event_c_NS_isEventBit +/* 8002B5B0 000284F0 48 00 94 0D */ bl isEventBit__11dSv_event_cCFUs /* 8002B5B4 000284F4 2C 03 00 00 */ cmpwi r3, 0 /* 8002B5B8 000284F8 41 82 00 10 */ beq lbl_8002B5C8 /* 8002B5BC 000284FC 38 00 00 02 */ li r0, 2 @@ -304,7 +304,7 @@ lbl_8002B5A8: lbl_8002B5C8: /* 8002B5C8 00028508 7F A3 EB 78 */ mr r3, r29 /* 8002B5CC 0002850C 38 80 45 10 */ li r4, 0x4510 -/* 8002B5D0 00028510 48 00 93 ED */ bl dSv_event_c_NS_isEventBit +/* 8002B5D0 00028510 48 00 93 ED */ bl isEventBit__11dSv_event_cCFUs /* 8002B5D4 00028514 2C 03 00 00 */ cmpwi r3, 0 /* 8002B5D8 00028518 40 82 11 54 */ bne lbl_8002C72C /* 8002B5DC 0002851C 38 00 00 01 */ li r0, 1 @@ -325,7 +325,7 @@ lbl_8002B5E8: /* 8002B614 00028554 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B618 00028558 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B61C 0002855C A0 84 00 6E */ lhz r4, 0x6e(r4) -/* 8002B620 00028560 48 00 93 9D */ bl dSv_event_c_NS_isEventBit +/* 8002B620 00028560 48 00 93 9D */ bl isEventBit__11dSv_event_cCFUs /* 8002B624 00028564 2C 03 00 00 */ cmpwi r3, 0 /* 8002B628 00028568 41 82 00 10 */ beq lbl_8002B638 /* 8002B62C 0002856C 38 00 00 02 */ li r0, 2 @@ -334,7 +334,7 @@ lbl_8002B5E8: lbl_8002B638: /* 8002B638 00028578 7F A3 EB 78 */ mr r3, r29 /* 8002B63C 0002857C 38 80 45 10 */ li r4, 0x4510 -/* 8002B640 00028580 48 00 93 7D */ bl dSv_event_c_NS_isEventBit +/* 8002B640 00028580 48 00 93 7D */ bl isEventBit__11dSv_event_cCFUs /* 8002B644 00028584 2C 03 00 00 */ cmpwi r3, 0 /* 8002B648 00028588 40 82 10 E4 */ bne lbl_8002C72C /* 8002B64C 0002858C 38 00 00 01 */ li r0, 1 @@ -361,7 +361,7 @@ lbl_8002B690: /* 8002B698 000285D8 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B69C 000285DC 7F A3 EB 78 */ mr r3, r29 /* 8002B6A0 000285E0 38 80 08 04 */ li r4, 0x804 -/* 8002B6A4 000285E4 48 00 93 19 */ bl dSv_event_c_NS_isEventBit +/* 8002B6A4 000285E4 48 00 93 19 */ bl isEventBit__11dSv_event_cCFUs /* 8002B6A8 000285E8 2C 03 00 00 */ cmpwi r3, 0 /* 8002B6AC 000285EC 41 82 00 18 */ beq lbl_8002B6C4 /* 8002B6B0 000285F0 38 00 00 02 */ li r0, 2 @@ -372,7 +372,7 @@ lbl_8002B690: lbl_8002B6C4: /* 8002B6C4 00028604 7F A3 EB 78 */ mr r3, r29 /* 8002B6C8 00028608 38 80 08 10 */ li r4, 0x810 -/* 8002B6CC 0002860C 48 00 92 F1 */ bl dSv_event_c_NS_isEventBit +/* 8002B6CC 0002860C 48 00 92 F1 */ bl isEventBit__11dSv_event_cCFUs /* 8002B6D0 00028610 2C 03 00 00 */ cmpwi r3, 0 /* 8002B6D4 00028614 41 82 00 10 */ beq lbl_8002B6E4 /* 8002B6D8 00028618 38 00 00 04 */ li r0, 4 @@ -381,7 +381,7 @@ lbl_8002B6C4: lbl_8002B6E4: /* 8002B6E4 00028624 7F A3 EB 78 */ mr r3, r29 /* 8002B6E8 00028628 38 80 13 20 */ li r4, 0x1320 -/* 8002B6EC 0002862C 48 00 92 D1 */ bl dSv_event_c_NS_isEventBit +/* 8002B6EC 0002862C 48 00 92 D1 */ bl isEventBit__11dSv_event_cCFUs /* 8002B6F0 00028630 2C 03 00 00 */ cmpwi r3, 0 /* 8002B6F4 00028634 41 82 00 18 */ beq lbl_8002B70C /* 8002B6F8 00028638 38 00 00 02 */ li r0, 2 @@ -392,7 +392,7 @@ lbl_8002B6E4: lbl_8002B70C: /* 8002B70C 0002864C 7F A3 EB 78 */ mr r3, r29 /* 8002B710 00028650 38 80 07 01 */ li r4, 0x701 -/* 8002B714 00028654 48 00 92 A9 */ bl dSv_event_c_NS_isEventBit +/* 8002B714 00028654 48 00 92 A9 */ bl isEventBit__11dSv_event_cCFUs /* 8002B718 00028658 2C 03 00 00 */ cmpwi r3, 0 /* 8002B71C 0002865C 41 82 00 10 */ beq lbl_8002B72C /* 8002B720 00028660 38 00 00 0C */ li r0, 0xc @@ -401,7 +401,7 @@ lbl_8002B70C: lbl_8002B72C: /* 8002B72C 0002866C 7F A3 EB 78 */ mr r3, r29 /* 8002B730 00028670 38 80 0A 08 */ li r4, 0xa08 -/* 8002B734 00028674 48 00 92 89 */ bl dSv_event_c_NS_isEventBit +/* 8002B734 00028674 48 00 92 89 */ bl isEventBit__11dSv_event_cCFUs /* 8002B738 00028678 2C 03 00 00 */ cmpwi r3, 0 /* 8002B73C 0002867C 41 82 00 18 */ beq lbl_8002B754 /* 8002B740 00028680 38 00 00 02 */ li r0, 2 @@ -412,7 +412,7 @@ lbl_8002B72C: lbl_8002B754: /* 8002B754 00028694 7F A3 EB 78 */ mr r3, r29 /* 8002B758 00028698 38 80 06 08 */ li r4, 0x608 -/* 8002B75C 0002869C 48 00 92 61 */ bl dSv_event_c_NS_isEventBit +/* 8002B75C 0002869C 48 00 92 61 */ bl isEventBit__11dSv_event_cCFUs /* 8002B760 000286A0 2C 03 00 00 */ cmpwi r3, 0 /* 8002B764 000286A4 41 82 0F C8 */ beq lbl_8002C72C /* 8002B768 000286A8 38 00 00 01 */ li r0, 1 @@ -447,7 +447,7 @@ lbl_8002B7AC: /* 8002B7D4 00028714 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002B7D8 00028718 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002B7DC 0002871C 38 80 09 04 */ li r4, 0x904 -/* 8002B7E0 00028720 48 00 91 DD */ bl dSv_event_c_NS_isEventBit +/* 8002B7E0 00028720 48 00 91 DD */ bl isEventBit__11dSv_event_cCFUs /* 8002B7E4 00028724 2C 03 00 00 */ cmpwi r3, 0 /* 8002B7E8 00028728 41 82 00 18 */ beq lbl_8002B800 /* 8002B7EC 0002872C 38 00 00 04 */ li r0, 4 @@ -463,7 +463,7 @@ lbl_8002B800: /* 8002B810 00028750 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B814 00028754 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B818 00028758 A0 84 00 AA */ lhz r4, 0xaa(r4) -/* 8002B81C 0002875C 48 00 91 A1 */ bl dSv_event_c_NS_isEventBit +/* 8002B81C 0002875C 48 00 91 A1 */ bl isEventBit__11dSv_event_cCFUs /* 8002B820 00028760 2C 03 00 00 */ cmpwi r3, 0 /* 8002B824 00028764 41 82 00 18 */ beq lbl_8002B83C /* 8002B828 00028768 38 00 00 02 */ li r0, 2 @@ -476,7 +476,7 @@ lbl_8002B83C: /* 8002B840 00028780 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B844 00028784 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B848 00028788 A0 84 00 6A */ lhz r4, 0x6a(r4) -/* 8002B84C 0002878C 48 00 91 71 */ bl dSv_event_c_NS_isEventBit +/* 8002B84C 0002878C 48 00 91 71 */ bl isEventBit__11dSv_event_cCFUs /* 8002B850 00028790 2C 03 00 00 */ cmpwi r3, 0 /* 8002B854 00028794 41 82 0E D8 */ beq lbl_8002C72C /* 8002B858 00028798 38 00 00 01 */ li r0, 1 @@ -496,7 +496,7 @@ lbl_8002B864: /* 8002B88C 000287CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002B890 000287D0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002B894 000287D4 A0 84 00 80 */ lhz r4, 0x80(r4) -/* 8002B898 000287D8 48 00 91 25 */ bl dSv_event_c_NS_isEventBit +/* 8002B898 000287D8 48 00 91 25 */ bl isEventBit__11dSv_event_cCFUs /* 8002B89C 000287DC 2C 03 00 00 */ cmpwi r3, 0 /* 8002B8A0 000287E0 41 82 0E 8C */ beq lbl_8002C72C /* 8002B8A4 000287E4 38 00 00 02 */ li r0, 2 @@ -515,7 +515,7 @@ lbl_8002B8B0: /* 8002B8D4 00028814 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002B8D8 00028818 7F A3 EB 78 */ mr r3, r29 /* 8002B8DC 0002881C 38 80 23 20 */ li r4, 0x2320 -/* 8002B8E0 00028820 48 00 90 DD */ bl dSv_event_c_NS_isEventBit +/* 8002B8E0 00028820 48 00 90 DD */ bl isEventBit__11dSv_event_cCFUs /* 8002B8E4 00028824 2C 03 00 00 */ cmpwi r3, 0 /* 8002B8E8 00028828 41 82 00 10 */ beq lbl_8002B8F8 /* 8002B8EC 0002882C 38 00 00 03 */ li r0, 3 @@ -524,7 +524,7 @@ lbl_8002B8B0: lbl_8002B8F8: /* 8002B8F8 00028838 7F A3 EB 78 */ mr r3, r29 /* 8002B8FC 0002883C 38 80 20 04 */ li r4, 0x2004 -/* 8002B900 00028840 48 00 90 BD */ bl dSv_event_c_NS_isEventBit +/* 8002B900 00028840 48 00 90 BD */ bl isEventBit__11dSv_event_cCFUs /* 8002B904 00028844 2C 03 00 00 */ cmpwi r3, 0 /* 8002B908 00028848 41 82 00 10 */ beq lbl_8002B918 /* 8002B90C 0002884C 38 00 00 04 */ li r0, 4 @@ -533,7 +533,7 @@ lbl_8002B8F8: lbl_8002B918: /* 8002B918 00028858 7F A3 EB 78 */ mr r3, r29 /* 8002B91C 0002885C 38 80 20 20 */ li r4, 0x2020 -/* 8002B920 00028860 48 00 90 9D */ bl dSv_event_c_NS_isEventBit +/* 8002B920 00028860 48 00 90 9D */ bl isEventBit__11dSv_event_cCFUs /* 8002B924 00028864 2C 03 00 00 */ cmpwi r3, 0 /* 8002B928 00028868 41 82 00 10 */ beq lbl_8002B938 /* 8002B92C 0002886C 38 00 00 02 */ li r0, 2 @@ -542,7 +542,7 @@ lbl_8002B918: lbl_8002B938: /* 8002B938 00028878 7F A3 EB 78 */ mr r3, r29 /* 8002B93C 0002887C 38 80 07 01 */ li r4, 0x701 -/* 8002B940 00028880 48 00 90 7D */ bl dSv_event_c_NS_isEventBit +/* 8002B940 00028880 48 00 90 7D */ bl isEventBit__11dSv_event_cCFUs /* 8002B944 00028884 2C 03 00 00 */ cmpwi r3, 0 /* 8002B948 00028888 41 82 0D E4 */ beq lbl_8002C72C /* 8002B94C 0002888C 38 00 00 01 */ li r0, 1 @@ -595,7 +595,7 @@ lbl_8002B9D0: /* 8002B9FC 0002893C 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BA00 00028940 7F A3 EB 78 */ mr r3, r29 /* 8002BA04 00028944 38 80 3B 08 */ li r4, 0x3b08 -/* 8002BA08 00028948 48 00 8F B5 */ bl dSv_event_c_NS_isEventBit +/* 8002BA08 00028948 48 00 8F B5 */ bl isEventBit__11dSv_event_cCFUs /* 8002BA0C 0002894C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BA10 00028950 41 82 00 10 */ beq lbl_8002BA20 /* 8002BA14 00028954 38 00 00 03 */ li r0, 3 @@ -604,7 +604,7 @@ lbl_8002B9D0: lbl_8002BA20: /* 8002BA20 00028960 7F A3 EB 78 */ mr r3, r29 /* 8002BA24 00028964 38 80 31 20 */ li r4, 0x3120 -/* 8002BA28 00028968 48 00 8F 95 */ bl dSv_event_c_NS_isEventBit +/* 8002BA28 00028968 48 00 8F 95 */ bl isEventBit__11dSv_event_cCFUs /* 8002BA2C 0002896C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BA30 00028970 41 82 00 10 */ beq lbl_8002BA40 /* 8002BA34 00028974 38 00 00 01 */ li r0, 1 @@ -613,7 +613,7 @@ lbl_8002BA20: lbl_8002BA40: /* 8002BA40 00028980 7F A3 EB 78 */ mr r3, r29 /* 8002BA44 00028984 38 80 09 04 */ li r4, 0x904 -/* 8002BA48 00028988 48 00 8F 75 */ bl dSv_event_c_NS_isEventBit +/* 8002BA48 00028988 48 00 8F 75 */ bl isEventBit__11dSv_event_cCFUs /* 8002BA4C 0002898C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BA50 00028990 41 82 0C DC */ beq lbl_8002C72C /* 8002BA54 00028994 38 00 00 02 */ li r0, 2 @@ -633,7 +633,7 @@ lbl_8002BA60: /* 8002BA88 000289C8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BA8C 000289CC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BA90 000289D0 38 80 20 20 */ li r4, 0x2020 -/* 8002BA94 000289D4 48 00 8F 29 */ bl dSv_event_c_NS_isEventBit +/* 8002BA94 000289D4 48 00 8F 29 */ bl isEventBit__11dSv_event_cCFUs /* 8002BA98 000289D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BA9C 000289DC 41 82 00 10 */ beq lbl_8002BAAC /* 8002BAA0 000289E0 38 00 00 04 */ li r0, 4 @@ -645,7 +645,7 @@ lbl_8002BAAC: /* 8002BAB4 000289F4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BAB8 000289F8 7F A3 EB 78 */ mr r3, r29 /* 8002BABC 000289FC 38 80 1E 08 */ li r4, 0x1e08 -/* 8002BAC0 00028A00 48 00 8E FD */ bl dSv_event_c_NS_isEventBit +/* 8002BAC0 00028A00 48 00 8E FD */ bl isEventBit__11dSv_event_cCFUs /* 8002BAC4 00028A04 2C 03 00 00 */ cmpwi r3, 0 /* 8002BAC8 00028A08 41 82 00 50 */ beq lbl_8002BB18 /* 8002BACC 00028A0C 7F E3 FB 78 */ mr r3, r31 @@ -671,7 +671,7 @@ lbl_8002BB0C: lbl_8002BB18: /* 8002BB18 00028A58 7F A3 EB 78 */ mr r3, r29 /* 8002BB1C 00028A5C 38 80 09 04 */ li r4, 0x904 -/* 8002BB20 00028A60 48 00 8E 9D */ bl dSv_event_c_NS_isEventBit +/* 8002BB20 00028A60 48 00 8E 9D */ bl isEventBit__11dSv_event_cCFUs /* 8002BB24 00028A64 2C 03 00 00 */ cmpwi r3, 0 /* 8002BB28 00028A68 41 82 00 54 */ beq lbl_8002BB7C /* 8002BB2C 00028A6C 7F E3 FB 78 */ mr r3, r31 @@ -685,7 +685,7 @@ lbl_8002BB18: /* 8002BB4C 00028A8C 40 82 00 24 */ bne lbl_8002BB70 /* 8002BB50 00028A90 7F A3 EB 78 */ mr r3, r29 /* 8002BB54 00028A94 38 80 0C 01 */ li r4, 0xc01 -/* 8002BB58 00028A98 48 00 8E 65 */ bl dSv_event_c_NS_isEventBit +/* 8002BB58 00028A98 48 00 8E 65 */ bl isEventBit__11dSv_event_cCFUs /* 8002BB5C 00028A9C 2C 03 00 00 */ cmpwi r3, 0 /* 8002BB60 00028AA0 40 82 00 10 */ bne lbl_8002BB70 /* 8002BB64 00028AA4 38 00 00 09 */ li r0, 9 @@ -709,7 +709,7 @@ lbl_8002BB7C: /* 8002BBA4 00028AE4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BBA8 00028AE8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BBAC 00028AEC A0 84 00 88 */ lhz r4, 0x88(r4) -/* 8002BBB0 00028AF0 48 00 8E 0D */ bl dSv_event_c_NS_isEventBit +/* 8002BBB0 00028AF0 48 00 8E 0D */ bl isEventBit__11dSv_event_cCFUs /* 8002BBB4 00028AF4 2C 03 00 00 */ cmpwi r3, 0 /* 8002BBB8 00028AF8 41 82 0B 74 */ beq lbl_8002C72C /* 8002BBBC 00028AFC 38 00 00 01 */ li r0, 1 @@ -727,7 +727,7 @@ lbl_8002BBC8: /* 8002BBE8 00028B28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BBEC 00028B2C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BBF0 00028B30 38 80 20 08 */ li r4, 0x2008 -/* 8002BBF4 00028B34 48 00 8D C9 */ bl dSv_event_c_NS_isEventBit +/* 8002BBF4 00028B34 48 00 8D C9 */ bl isEventBit__11dSv_event_cCFUs /* 8002BBF8 00028B38 2C 03 00 00 */ cmpwi r3, 0 /* 8002BBFC 00028B3C 41 82 0B 30 */ beq lbl_8002C72C /* 8002BC00 00028B40 38 00 00 02 */ li r0, 2 @@ -747,7 +747,7 @@ lbl_8002BC0C: /* 8002BC34 00028B74 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BC38 00028B78 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BC3C 00028B7C A0 84 00 BE */ lhz r4, 0xbe(r4) -/* 8002BC40 00028B80 48 00 8D 7D */ bl dSv_event_c_NS_isEventBit +/* 8002BC40 00028B80 48 00 8D 7D */ bl isEventBit__11dSv_event_cCFUs /* 8002BC44 00028B84 2C 03 00 00 */ cmpwi r3, 0 /* 8002BC48 00028B88 41 82 0A E4 */ beq lbl_8002C72C /* 8002BC4C 00028B8C 38 00 00 01 */ li r0, 1 @@ -769,7 +769,7 @@ lbl_8002BC58: /* 8002BC88 00028BC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BC8C 00028BCC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BC90 00028BD0 38 80 40 08 */ li r4, 0x4008 -/* 8002BC94 00028BD4 48 00 8D 29 */ bl dSv_event_c_NS_isEventBit +/* 8002BC94 00028BD4 48 00 8D 29 */ bl isEventBit__11dSv_event_cCFUs /* 8002BC98 00028BD8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BC9C 00028BDC 41 82 0A 90 */ beq lbl_8002C72C /* 8002BCA0 00028BE0 38 00 00 00 */ li r0, 0 @@ -788,7 +788,7 @@ lbl_8002BCAC: /* 8002BCD0 00028C10 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BCD4 00028C14 7F A3 EB 78 */ mr r3, r29 /* 8002BCD8 00028C18 38 80 0B 01 */ li r4, 0xb01 -/* 8002BCDC 00028C1C 48 00 8C E1 */ bl dSv_event_c_NS_isEventBit +/* 8002BCDC 00028C1C 48 00 8C E1 */ bl isEventBit__11dSv_event_cCFUs /* 8002BCE0 00028C20 2C 03 00 00 */ cmpwi r3, 0 /* 8002BCE4 00028C24 41 82 00 10 */ beq lbl_8002BCF4 /* 8002BCE8 00028C28 38 00 00 01 */ li r0, 1 @@ -797,7 +797,7 @@ lbl_8002BCAC: lbl_8002BCF4: /* 8002BCF4 00028C34 7F A3 EB 78 */ mr r3, r29 /* 8002BCF8 00028C38 38 80 09 02 */ li r4, 0x902 -/* 8002BCFC 00028C3C 48 00 8C C1 */ bl dSv_event_c_NS_isEventBit +/* 8002BCFC 00028C3C 48 00 8C C1 */ bl isEventBit__11dSv_event_cCFUs /* 8002BD00 00028C40 2C 03 00 00 */ cmpwi r3, 0 /* 8002BD04 00028C44 41 82 0A 28 */ beq lbl_8002C72C /* 8002BD08 00028C48 38 00 00 02 */ li r0, 2 @@ -820,7 +820,7 @@ lbl_8002BD14: /* 8002BD48 00028C88 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BD4C 00028C8C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BD50 00028C90 A0 84 00 70 */ lhz r4, 0x70(r4) -/* 8002BD54 00028C94 48 00 8C 69 */ bl dSv_event_c_NS_isEventBit +/* 8002BD54 00028C94 48 00 8C 69 */ bl isEventBit__11dSv_event_cCFUs /* 8002BD58 00028C98 2C 03 00 00 */ cmpwi r3, 0 /* 8002BD5C 00028C9C 41 82 00 18 */ beq lbl_8002BD74 /* 8002BD60 00028CA0 38 00 00 04 */ li r0, 4 @@ -846,7 +846,7 @@ lbl_8002BDA4: /* 8002BDA8 00028CE8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BDAC 00028CEC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BDB0 00028CF0 A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002BDB4 00028CF4 48 00 8C 09 */ bl dSv_event_c_NS_isEventBit +/* 8002BDB4 00028CF4 48 00 8C 09 */ bl isEventBit__11dSv_event_cCFUs /* 8002BDB8 00028CF8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BDBC 00028CFC 41 82 00 10 */ beq lbl_8002BDCC /* 8002BDC0 00028D00 38 00 00 01 */ li r0, 1 @@ -855,7 +855,7 @@ lbl_8002BDA4: lbl_8002BDCC: /* 8002BDCC 00028D0C 7F A3 EB 78 */ mr r3, r29 /* 8002BDD0 00028D10 38 80 45 10 */ li r4, 0x4510 -/* 8002BDD4 00028D14 48 00 8B E9 */ bl dSv_event_c_NS_isEventBit +/* 8002BDD4 00028D14 48 00 8B E9 */ bl isEventBit__11dSv_event_cCFUs /* 8002BDD8 00028D18 2C 03 00 00 */ cmpwi r3, 0 /* 8002BDDC 00028D1C 41 82 00 10 */ beq lbl_8002BDEC /* 8002BDE0 00028D20 38 00 00 07 */ li r0, 7 @@ -864,7 +864,7 @@ lbl_8002BDCC: lbl_8002BDEC: /* 8002BDEC 00028D2C 7F A3 EB 78 */ mr r3, r29 /* 8002BDF0 00028D30 38 80 4A 40 */ li r4, 0x4a40 -/* 8002BDF4 00028D34 48 00 8B C9 */ bl dSv_event_c_NS_isEventBit +/* 8002BDF4 00028D34 48 00 8B C9 */ bl isEventBit__11dSv_event_cCFUs /* 8002BDF8 00028D38 2C 03 00 00 */ cmpwi r3, 0 /* 8002BDFC 00028D3C 41 82 00 10 */ beq lbl_8002BE0C /* 8002BE00 00028D40 38 00 00 00 */ li r0, 0 @@ -895,7 +895,7 @@ lbl_8002BE48: /* 8002BE58 00028D98 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BE5C 00028D9C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BE60 00028DA0 A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002BE64 00028DA4 48 00 8B 59 */ bl dSv_event_c_NS_isEventBit +/* 8002BE64 00028DA4 48 00 8B 59 */ bl isEventBit__11dSv_event_cCFUs /* 8002BE68 00028DA8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BE6C 00028DAC 41 82 00 10 */ beq lbl_8002BE7C /* 8002BE70 00028DB0 38 00 00 01 */ li r0, 1 @@ -904,7 +904,7 @@ lbl_8002BE48: lbl_8002BE7C: /* 8002BE7C 00028DBC 7F A3 EB 78 */ mr r3, r29 /* 8002BE80 00028DC0 38 80 45 10 */ li r4, 0x4510 -/* 8002BE84 00028DC4 48 00 8B 39 */ bl dSv_event_c_NS_isEventBit +/* 8002BE84 00028DC4 48 00 8B 39 */ bl isEventBit__11dSv_event_cCFUs /* 8002BE88 00028DC8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BE8C 00028DCC 41 82 00 10 */ beq lbl_8002BE9C /* 8002BE90 00028DD0 38 00 00 00 */ li r0, 0 @@ -913,7 +913,7 @@ lbl_8002BE7C: lbl_8002BE9C: /* 8002BE9C 00028DDC 7F A3 EB 78 */ mr r3, r29 /* 8002BEA0 00028DE0 38 80 4A 40 */ li r4, 0x4a40 -/* 8002BEA4 00028DE4 48 00 8B 19 */ bl dSv_event_c_NS_isEventBit +/* 8002BEA4 00028DE4 48 00 8B 19 */ bl isEventBit__11dSv_event_cCFUs /* 8002BEA8 00028DE8 2C 03 00 00 */ cmpwi r3, 0 /* 8002BEAC 00028DEC 41 82 00 10 */ beq lbl_8002BEBC /* 8002BEB0 00028DF0 38 00 00 04 */ li r0, 4 @@ -951,7 +951,7 @@ lbl_8002BF14: /* 8002BF24 00028E64 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002BF28 00028E68 7F A3 EB 78 */ mr r3, r29 /* 8002BF2C 00028E6C 38 80 07 80 */ li r4, 0x780 -/* 8002BF30 00028E70 48 00 8A 8D */ bl dSv_event_c_NS_isEventBit +/* 8002BF30 00028E70 48 00 8A 8D */ bl isEventBit__11dSv_event_cCFUs /* 8002BF34 00028E74 2C 03 00 00 */ cmpwi r3, 0 /* 8002BF38 00028E78 41 82 00 10 */ beq lbl_8002BF48 /* 8002BF3C 00028E7C 38 00 00 03 */ li r0, 3 @@ -973,7 +973,7 @@ lbl_8002BF70: /* 8002BF74 00028EB4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002BF78 00028EB8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002BF7C 00028EBC A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002BF80 00028EC0 48 00 8A 3D */ bl dSv_event_c_NS_isEventBit +/* 8002BF80 00028EC0 48 00 8A 3D */ bl isEventBit__11dSv_event_cCFUs /* 8002BF84 00028EC4 2C 03 00 00 */ cmpwi r3, 0 /* 8002BF88 00028EC8 41 82 07 A4 */ beq lbl_8002C72C /* 8002BF8C 00028ECC 38 00 00 01 */ li r0, 1 @@ -986,7 +986,7 @@ lbl_8002BF98: /* 8002BFA4 00028EE4 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002BFA8 00028EE8 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002BFAC 00028EEC 38 80 06 01 */ li r4, 0x601 -/* 8002BFB0 00028EF0 48 00 8A 0D */ bl dSv_event_c_NS_isEventBit +/* 8002BFB0 00028EF0 48 00 8A 0D */ bl isEventBit__11dSv_event_cCFUs /* 8002BFB4 00028EF4 2C 03 00 00 */ cmpwi r3, 0 /* 8002BFB8 00028EF8 41 82 00 10 */ beq lbl_8002BFC8 /* 8002BFBC 00028EFC 38 00 00 04 */ li r0, 4 @@ -1031,7 +1031,7 @@ lbl_8002C03C: /* 8002C04C 00028F8C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C050 00028F90 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C054 00028F94 A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002C058 00028F98 48 00 89 65 */ bl dSv_event_c_NS_isEventBit +/* 8002C058 00028F98 48 00 89 65 */ bl isEventBit__11dSv_event_cCFUs /* 8002C05C 00028F9C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C060 00028FA0 41 82 00 10 */ beq lbl_8002C070 /* 8002C064 00028FA4 38 00 00 04 */ li r0, 4 @@ -1040,7 +1040,7 @@ lbl_8002C03C: lbl_8002C070: /* 8002C070 00028FB0 7F A3 EB 78 */ mr r3, r29 /* 8002C074 00028FB4 38 80 45 10 */ li r4, 0x4510 -/* 8002C078 00028FB8 48 00 89 45 */ bl dSv_event_c_NS_isEventBit +/* 8002C078 00028FB8 48 00 89 45 */ bl isEventBit__11dSv_event_cCFUs /* 8002C07C 00028FBC 2C 03 00 00 */ cmpwi r3, 0 /* 8002C080 00028FC0 41 82 00 10 */ beq lbl_8002C090 /* 8002C084 00028FC4 38 00 00 00 */ li r0, 0 @@ -1049,7 +1049,7 @@ lbl_8002C070: lbl_8002C090: /* 8002C090 00028FD0 7F A3 EB 78 */ mr r3, r29 /* 8002C094 00028FD4 38 80 4A 20 */ li r4, 0x4a20 -/* 8002C098 00028FD8 48 00 89 25 */ bl dSv_event_c_NS_isEventBit +/* 8002C098 00028FD8 48 00 89 25 */ bl isEventBit__11dSv_event_cCFUs /* 8002C09C 00028FDC 2C 03 00 00 */ cmpwi r3, 0 /* 8002C0A0 00028FE0 41 82 00 10 */ beq lbl_8002C0B0 /* 8002C0A4 00028FE4 38 00 00 03 */ li r0, 3 @@ -1077,7 +1077,7 @@ lbl_8002C0E4: /* 8002C0F0 00029030 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C0F4 00029034 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C0F8 00029038 A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002C0FC 0002903C 48 00 88 C1 */ bl dSv_event_c_NS_isEventBit +/* 8002C0FC 0002903C 48 00 88 C1 */ bl isEventBit__11dSv_event_cCFUs /* 8002C100 00029040 2C 03 00 00 */ cmpwi r3, 0 /* 8002C104 00029044 41 82 06 28 */ beq lbl_8002C72C /* 8002C108 00029048 38 00 00 04 */ li r0, 4 @@ -1111,7 +1111,7 @@ lbl_8002C160: /* 8002C170 000290B0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C174 000290B4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C178 000290B8 A0 84 00 5E */ lhz r4, 0x5e(r4) -/* 8002C17C 000290BC 48 00 88 41 */ bl dSv_event_c_NS_isEventBit +/* 8002C17C 000290BC 48 00 88 41 */ bl isEventBit__11dSv_event_cCFUs /* 8002C180 000290C0 2C 03 00 00 */ cmpwi r3, 0 /* 8002C184 000290C4 41 82 00 10 */ beq lbl_8002C194 /* 8002C188 000290C8 38 00 00 01 */ li r0, 1 @@ -1122,7 +1122,7 @@ lbl_8002C194: /* 8002C198 000290D8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C19C 000290DC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C1A0 000290E0 A0 84 01 52 */ lhz r4, 0x152(r4) -/* 8002C1A4 000290E4 48 00 88 19 */ bl dSv_event_c_NS_isEventBit +/* 8002C1A4 000290E4 48 00 88 19 */ bl isEventBit__11dSv_event_cCFUs /* 8002C1A8 000290E8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C1AC 000290EC 41 82 00 10 */ beq lbl_8002C1BC /* 8002C1B0 000290F0 38 00 00 0A */ li r0, 0xa @@ -1131,7 +1131,7 @@ lbl_8002C194: lbl_8002C1BC: /* 8002C1BC 000290FC 7F A3 EB 78 */ mr r3, r29 /* 8002C1C0 00029100 38 80 45 10 */ li r4, 0x4510 -/* 8002C1C4 00029104 48 00 87 F9 */ bl dSv_event_c_NS_isEventBit +/* 8002C1C4 00029104 48 00 87 F9 */ bl isEventBit__11dSv_event_cCFUs /* 8002C1C8 00029108 2C 03 00 00 */ cmpwi r3, 0 /* 8002C1CC 0002910C 41 82 00 10 */ beq lbl_8002C1DC /* 8002C1D0 00029110 38 00 00 09 */ li r0, 9 @@ -1140,7 +1140,7 @@ lbl_8002C1BC: lbl_8002C1DC: /* 8002C1DC 0002911C 7F A3 EB 78 */ mr r3, r29 /* 8002C1E0 00029120 38 80 4A 40 */ li r4, 0x4a40 -/* 8002C1E4 00029124 48 00 87 D9 */ bl dSv_event_c_NS_isEventBit +/* 8002C1E4 00029124 48 00 87 D9 */ bl isEventBit__11dSv_event_cCFUs /* 8002C1E8 00029128 2C 03 00 00 */ cmpwi r3, 0 /* 8002C1EC 0002912C 41 82 00 10 */ beq lbl_8002C1FC /* 8002C1F0 00029130 38 00 00 0B */ li r0, 0xb @@ -1163,7 +1163,7 @@ lbl_8002C208: /* 8002C22C 0002916C 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C230 00029170 7F A3 EB 78 */ mr r3, r29 /* 8002C234 00029174 38 80 1E 08 */ li r4, 0x1e08 -/* 8002C238 00029178 48 00 87 85 */ bl dSv_event_c_NS_isEventBit +/* 8002C238 00029178 48 00 87 85 */ bl isEventBit__11dSv_event_cCFUs /* 8002C23C 0002917C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C240 00029180 41 82 00 10 */ beq lbl_8002C250 /* 8002C244 00029184 38 00 00 06 */ li r0, 6 @@ -1172,7 +1172,7 @@ lbl_8002C208: lbl_8002C250: /* 8002C250 00029190 7F A3 EB 78 */ mr r3, r29 /* 8002C254 00029194 38 80 0C 01 */ li r4, 0xc01 -/* 8002C258 00029198 48 00 87 65 */ bl dSv_event_c_NS_isEventBit +/* 8002C258 00029198 48 00 87 65 */ bl isEventBit__11dSv_event_cCFUs /* 8002C25C 0002919C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C260 000291A0 41 82 00 10 */ beq lbl_8002C270 /* 8002C264 000291A4 38 00 00 04 */ li r0, 4 @@ -1183,7 +1183,7 @@ lbl_8002C270: /* 8002C274 000291B4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C278 000291B8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C27C 000291BC A0 84 00 88 */ lhz r4, 0x88(r4) -/* 8002C280 000291C0 48 00 87 3D */ bl dSv_event_c_NS_isEventBit +/* 8002C280 000291C0 48 00 87 3D */ bl isEventBit__11dSv_event_cCFUs /* 8002C284 000291C4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C288 000291C8 41 82 00 10 */ beq lbl_8002C298 /* 8002C28C 000291CC 38 00 00 00 */ li r0, 0 @@ -1195,12 +1195,12 @@ lbl_8002C298: /* 8002C2A0 000291E0 3B A3 0D D8 */ addi r29, r3, 0xdd8 /* 8002C2A4 000291E4 7F A3 EB 78 */ mr r3, r29 /* 8002C2A8 000291E8 38 80 06 01 */ li r4, 0x601 -/* 8002C2AC 000291EC 48 00 87 11 */ bl dSv_event_c_NS_isEventBit +/* 8002C2AC 000291EC 48 00 87 11 */ bl isEventBit__11dSv_event_cCFUs /* 8002C2B0 000291F0 2C 03 00 00 */ cmpwi r3, 0 /* 8002C2B4 000291F4 41 82 04 78 */ beq lbl_8002C72C /* 8002C2B8 000291F8 7F A3 EB 78 */ mr r3, r29 /* 8002C2BC 000291FC 38 80 06 02 */ li r4, 0x602 -/* 8002C2C0 00029200 48 00 86 FD */ bl dSv_event_c_NS_isEventBit +/* 8002C2C0 00029200 48 00 86 FD */ bl isEventBit__11dSv_event_cCFUs /* 8002C2C4 00029204 2C 03 00 00 */ cmpwi r3, 0 /* 8002C2C8 00029208 41 82 00 10 */ beq lbl_8002C2D8 /* 8002C2CC 0002920C 38 00 00 02 */ li r0, 2 @@ -1225,7 +1225,7 @@ lbl_8002C2E4: /* 8002C310 00029250 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C314 00029254 7F A3 EB 78 */ mr r3, r29 /* 8002C318 00029258 38 80 1E 08 */ li r4, 0x1e08 -/* 8002C31C 0002925C 48 00 86 A1 */ bl dSv_event_c_NS_isEventBit +/* 8002C31C 0002925C 48 00 86 A1 */ bl isEventBit__11dSv_event_cCFUs /* 8002C320 00029260 2C 03 00 00 */ cmpwi r3, 0 /* 8002C324 00029264 41 82 00 10 */ beq lbl_8002C334 /* 8002C328 00029268 38 00 00 06 */ li r0, 6 @@ -1234,7 +1234,7 @@ lbl_8002C2E4: lbl_8002C334: /* 8002C334 00029274 7F A3 EB 78 */ mr r3, r29 /* 8002C338 00029278 38 80 0C 01 */ li r4, 0xc01 -/* 8002C33C 0002927C 48 00 86 81 */ bl dSv_event_c_NS_isEventBit +/* 8002C33C 0002927C 48 00 86 81 */ bl isEventBit__11dSv_event_cCFUs /* 8002C340 00029280 2C 03 00 00 */ cmpwi r3, 0 /* 8002C344 00029284 41 82 03 E8 */ beq lbl_8002C72C /* 8002C348 00029288 38 00 00 04 */ li r0, 4 @@ -1248,7 +1248,7 @@ lbl_8002C354: /* 8002C364 000292A4 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C368 000292A8 7F A3 EB 78 */ mr r3, r29 /* 8002C36C 000292AC 38 80 22 04 */ li r4, 0x2204 -/* 8002C370 000292B0 48 00 86 4D */ bl dSv_event_c_NS_isEventBit +/* 8002C370 000292B0 48 00 86 4D */ bl isEventBit__11dSv_event_cCFUs /* 8002C374 000292B4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C378 000292B8 41 82 00 10 */ beq lbl_8002C388 /* 8002C37C 000292BC 38 00 00 06 */ li r0, 6 @@ -1257,7 +1257,7 @@ lbl_8002C354: lbl_8002C388: /* 8002C388 000292C8 7F A3 EB 78 */ mr r3, r29 /* 8002C38C 000292CC 38 80 21 02 */ li r4, 0x2102 -/* 8002C390 000292D0 48 00 86 2D */ bl dSv_event_c_NS_isEventBit +/* 8002C390 000292D0 48 00 86 2D */ bl isEventBit__11dSv_event_cCFUs /* 8002C394 000292D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C398 000292D8 41 82 00 10 */ beq lbl_8002C3A8 /* 8002C39C 000292DC 38 00 00 01 */ li r0, 1 @@ -1266,7 +1266,7 @@ lbl_8002C388: lbl_8002C3A8: /* 8002C3A8 000292E8 7F A3 EB 78 */ mr r3, r29 /* 8002C3AC 000292EC 38 80 1E 08 */ li r4, 0x1e08 -/* 8002C3B0 000292F0 48 00 86 0D */ bl dSv_event_c_NS_isEventBit +/* 8002C3B0 000292F0 48 00 86 0D */ bl isEventBit__11dSv_event_cCFUs /* 8002C3B4 000292F4 2C 03 00 00 */ cmpwi r3, 0 /* 8002C3B8 000292F8 41 82 00 10 */ beq lbl_8002C3C8 /* 8002C3BC 000292FC 38 00 00 06 */ li r0, 6 @@ -1275,7 +1275,7 @@ lbl_8002C3A8: lbl_8002C3C8: /* 8002C3C8 00029308 7F A3 EB 78 */ mr r3, r29 /* 8002C3CC 0002930C 38 80 0C 01 */ li r4, 0xc01 -/* 8002C3D0 00029310 48 00 85 ED */ bl dSv_event_c_NS_isEventBit +/* 8002C3D0 00029310 48 00 85 ED */ bl isEventBit__11dSv_event_cCFUs /* 8002C3D4 00029314 2C 03 00 00 */ cmpwi r3, 0 /* 8002C3D8 00029318 41 82 03 54 */ beq lbl_8002C72C /* 8002C3DC 0002931C 38 00 00 04 */ li r0, 4 @@ -1289,7 +1289,7 @@ lbl_8002C3E8: /* 8002C3F8 00029338 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C3FC 0002933C 7F A3 EB 78 */ mr r3, r29 /* 8002C400 00029340 38 80 1E 08 */ li r4, 0x1e08 -/* 8002C404 00029344 48 00 85 B9 */ bl dSv_event_c_NS_isEventBit +/* 8002C404 00029344 48 00 85 B9 */ bl isEventBit__11dSv_event_cCFUs /* 8002C408 00029348 2C 03 00 00 */ cmpwi r3, 0 /* 8002C40C 0002934C 41 82 00 10 */ beq lbl_8002C41C /* 8002C410 00029350 38 00 00 00 */ li r0, 0 @@ -1298,7 +1298,7 @@ lbl_8002C3E8: lbl_8002C41C: /* 8002C41C 0002935C 7F A3 EB 78 */ mr r3, r29 /* 8002C420 00029360 38 80 0C 01 */ li r4, 0xc01 -/* 8002C424 00029364 48 00 85 99 */ bl dSv_event_c_NS_isEventBit +/* 8002C424 00029364 48 00 85 99 */ bl isEventBit__11dSv_event_cCFUs /* 8002C428 00029368 2C 03 00 00 */ cmpwi r3, 0 /* 8002C42C 0002936C 41 82 03 00 */ beq lbl_8002C72C /* 8002C430 00029370 38 00 00 04 */ li r0, 4 @@ -1316,7 +1316,7 @@ lbl_8002C43C: /* 8002C45C 0002939C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C460 000293A0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C464 000293A4 38 80 23 20 */ li r4, 0x2320 -/* 8002C468 000293A8 48 00 85 55 */ bl dSv_event_c_NS_isEventBit +/* 8002C468 000293A8 48 00 85 55 */ bl isEventBit__11dSv_event_cCFUs /* 8002C46C 000293AC 2C 03 00 00 */ cmpwi r3, 0 /* 8002C470 000293B0 41 82 02 BC */ beq lbl_8002C72C /* 8002C474 000293B4 38 00 00 01 */ li r0, 1 @@ -1336,7 +1336,7 @@ lbl_8002C480: /* 8002C4A8 000293E8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C4AC 000293EC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C4B0 000293F0 38 80 1E 08 */ li r4, 0x1e08 -/* 8002C4B4 000293F4 48 00 85 09 */ bl dSv_event_c_NS_isEventBit +/* 8002C4B4 000293F4 48 00 85 09 */ bl isEventBit__11dSv_event_cCFUs /* 8002C4B8 000293F8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C4BC 000293FC 41 82 00 10 */ beq lbl_8002C4CC /* 8002C4C0 00029400 38 00 00 00 */ li r0, 0 @@ -1351,7 +1351,7 @@ lbl_8002C4D8: /* 8002C4DC 0002941C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C4E0 00029420 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C4E4 00029424 38 80 22 10 */ li r4, 0x2210 -/* 8002C4E8 00029428 48 00 84 D5 */ bl dSv_event_c_NS_isEventBit +/* 8002C4E8 00029428 48 00 84 D5 */ bl isEventBit__11dSv_event_cCFUs /* 8002C4EC 0002942C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C4F0 00029430 41 82 02 3C */ beq lbl_8002C72C /* 8002C4F4 00029434 38 00 00 01 */ li r0, 1 @@ -1369,7 +1369,7 @@ lbl_8002C500: /* 8002C520 00029460 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C524 00029464 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C528 00029468 38 80 20 08 */ li r4, 0x2008 -/* 8002C52C 0002946C 48 00 84 91 */ bl dSv_event_c_NS_isEventBit +/* 8002C52C 0002946C 48 00 84 91 */ bl isEventBit__11dSv_event_cCFUs /* 8002C530 00029470 2C 03 00 00 */ cmpwi r3, 0 /* 8002C534 00029474 41 82 01 F8 */ beq lbl_8002C72C /* 8002C538 00029478 38 00 00 02 */ li r0, 2 @@ -1388,7 +1388,7 @@ lbl_8002C544: /* 8002C568 000294A8 3B A3 07 F0 */ addi r29, r3, 0x7f0 /* 8002C56C 000294AC 7F A3 EB 78 */ mr r3, r29 /* 8002C570 000294B0 38 80 2B 08 */ li r4, 0x2b08 -/* 8002C574 000294B4 48 00 84 49 */ bl dSv_event_c_NS_isEventBit +/* 8002C574 000294B4 48 00 84 49 */ bl isEventBit__11dSv_event_cCFUs /* 8002C578 000294B8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C57C 000294BC 41 82 00 10 */ beq lbl_8002C58C /* 8002C580 000294C0 38 00 00 03 */ li r0, 3 @@ -1397,7 +1397,7 @@ lbl_8002C544: lbl_8002C58C: /* 8002C58C 000294CC 7F A3 EB 78 */ mr r3, r29 /* 8002C590 000294D0 38 80 20 10 */ li r4, 0x2010 -/* 8002C594 000294D4 48 00 84 29 */ bl dSv_event_c_NS_isEventBit +/* 8002C594 000294D4 48 00 84 29 */ bl isEventBit__11dSv_event_cCFUs /* 8002C598 000294D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C59C 000294DC 41 82 00 10 */ beq lbl_8002C5AC /* 8002C5A0 000294E0 38 00 00 02 */ li r0, 2 @@ -1406,7 +1406,7 @@ lbl_8002C58C: lbl_8002C5AC: /* 8002C5AC 000294EC 7F A3 EB 78 */ mr r3, r29 /* 8002C5B0 000294F0 38 80 0B 40 */ li r4, 0xb40 -/* 8002C5B4 000294F4 48 00 84 09 */ bl dSv_event_c_NS_isEventBit +/* 8002C5B4 000294F4 48 00 84 09 */ bl isEventBit__11dSv_event_cCFUs /* 8002C5B8 000294F8 2C 03 00 00 */ cmpwi r3, 0 /* 8002C5BC 000294FC 41 82 01 70 */ beq lbl_8002C72C /* 8002C5C0 00029500 38 00 00 01 */ li r0, 1 @@ -1424,7 +1424,7 @@ lbl_8002C5CC: /* 8002C5EC 0002952C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002C5F0 00029530 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002C5F4 00029534 38 80 45 10 */ li r4, 0x4510 -/* 8002C5F8 00029538 48 00 83 C5 */ bl dSv_event_c_NS_isEventBit +/* 8002C5F8 00029538 48 00 83 C5 */ bl isEventBit__11dSv_event_cCFUs /* 8002C5FC 0002953C 2C 03 00 00 */ cmpwi r3, 0 /* 8002C600 00029540 41 82 01 2C */ beq lbl_8002C72C /* 8002C604 00029544 38 00 00 01 */ li r0, 1 @@ -1521,7 +1521,7 @@ lbl_8002C72C: /* 8002C748 00029688 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8002C74C 0002968C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8002C750 00029690 A0 84 00 82 */ lhz r4, 0x82(r4) -/* 8002C754 00029694 48 00 82 69 */ bl dSv_event_c_NS_isEventBit +/* 8002C754 00029694 48 00 82 69 */ bl isEventBit__11dSv_event_cCFUs /* 8002C758 00029698 2C 03 00 00 */ cmpwi r3, 0 /* 8002C75C 0002969C 41 82 01 48 */ beq lbl_8002C8A4 /* 8002C760 000296A0 7F E3 FB 78 */ mr r3, r31 @@ -1620,7 +1620,7 @@ lbl_8002C8A4: /* 8002C8C4 00029804 40 82 00 24 */ bne lbl_8002C8E8 /* 8002C8C8 00029808 7F A3 EB 78 */ mr r3, r29 /* 8002C8CC 0002980C 38 80 4D 08 */ li r4, 0x4d08 -/* 8002C8D0 00029810 48 00 80 ED */ bl dSv_event_c_NS_isEventBit +/* 8002C8D0 00029810 48 00 80 ED */ bl isEventBit__11dSv_event_cCFUs /* 8002C8D4 00029814 2C 03 00 00 */ cmpwi r3, 0 /* 8002C8D8 00029818 40 82 00 5C */ bne lbl_8002C934 /* 8002C8DC 0002981C 38 00 00 0B */ li r0, 0xb @@ -1638,7 +1638,7 @@ lbl_8002C8E8: /* 8002C908 00029848 40 82 00 2C */ bne lbl_8002C934 /* 8002C90C 0002984C 7F A3 EB 78 */ mr r3, r29 /* 8002C910 00029850 38 80 54 10 */ li r4, 0x5410 -/* 8002C914 00029854 48 00 80 A9 */ bl dSv_event_c_NS_isEventBit +/* 8002C914 00029854 48 00 80 A9 */ bl isEventBit__11dSv_event_cCFUs /* 8002C918 00029858 2C 03 00 00 */ cmpwi r3, 0 /* 8002C91C 0002985C 41 82 00 10 */ beq lbl_8002C92C /* 8002C920 00029860 38 00 00 01 */ li r0, 1 @@ -3395,7 +3395,7 @@ dComIfGp_mapShow: /* 8002E058 0002AF98 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E05C 0002AF9C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E060 0002AFA0 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E064 0002AFA4 48 00 69 41 */ bl dSv_event_c_NS_offEventBit +/* 8002E064 0002AFA4 48 00 69 41 */ bl offEventBit__11dSv_event_cFUs /* 8002E068 0002AFA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E06C 0002AFAC 7C 08 03 A6 */ mtlr r0 /* 8002E070 0002AFB0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3410,7 +3410,7 @@ dComIfGp_mapHide: /* 8002E088 0002AFC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E08C 0002AFCC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E090 0002AFD0 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E094 0002AFD4 48 00 68 F9 */ bl dSv_event_c_NS_onEventBit +/* 8002E094 0002AFD4 48 00 68 F9 */ bl onEventBit__11dSv_event_cFUs /* 8002E098 0002AFD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E09C 0002AFDC 7C 08 03 A6 */ mtlr r0 /* 8002E0A0 0002AFE0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3425,7 +3425,7 @@ dComIfGp_checkMapShow: /* 8002E0B8 0002AFF8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002E0BC 0002AFFC 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002E0C0 0002B000 38 80 1D 01 */ li r4, 0x1d01 -/* 8002E0C4 0002B004 48 00 68 F9 */ bl dSv_event_c_NS_isEventBit +/* 8002E0C4 0002B004 48 00 68 F9 */ bl isEventBit__11dSv_event_cCFUs /* 8002E0C8 0002B008 7C 60 00 34 */ cntlzw r0, r3 /* 8002E0CC 0002B00C 54 03 D9 7E */ srwi r3, r0, 5 /* 8002E0D0 0002B010 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3714,7 +3714,7 @@ lbl_8002E46C: /* 8002E484 0002B3C4 7F 83 E3 78 */ mr r3, r28 /* 8002E488 0002B3C8 7C 9E FA 14 */ add r4, r30, r31 /* 8002E48C 0002B3CC A0 84 03 22 */ lhz r4, 0x322(r4) -/* 8002E490 0002B3D0 48 00 65 2D */ bl dSv_event_c_NS_isEventBit +/* 8002E490 0002B3D0 48 00 65 2D */ bl isEventBit__11dSv_event_cCFUs /* 8002E494 0002B3D4 2C 03 00 00 */ cmpwi r3, 0 /* 8002E498 0002B3D8 41 82 00 08 */ beq lbl_8002E4A0 /* 8002E49C 0002B3DC 3B 7B 00 01 */ addi r27, r27, 1 @@ -4154,7 +4154,7 @@ lbl_8002EA68: /* 8002EA88 0002B9C8 98 03 00 7C */ stb r0, 0x7c(r3) /* 8002EA8C 0002B9CC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8002EA90 0002B9D0 38 80 13 01 */ li r4, 0x1301 -/* 8002EA94 0002B9D4 48 00 5F 29 */ bl dSv_event_c_NS_isEventBit +/* 8002EA94 0002B9D4 48 00 5F 29 */ bl isEventBit__11dSv_event_cCFUs /* 8002EA98 0002B9D8 2C 03 00 00 */ cmpwi r3, 0 /* 8002EA9C 0002B9DC 40 82 01 54 */ bne lbl_8002EBF0 /* 8002EAA0 0002B9E0 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5168,7 +5168,7 @@ dComIfGs_Wolf_Change_Check: /* 8002F82C 0002C76C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8002F830 0002C770 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8002F834 0002C774 38 80 0D 04 */ li r4, 0xd04 -/* 8002F838 0002C778 48 00 51 85 */ bl dSv_event_c_NS_isEventBit +/* 8002F838 0002C778 48 00 51 85 */ bl isEventBit__11dSv_event_cCFUs /* 8002F83C 0002C77C 2C 03 00 00 */ cmpwi r3, 0 /* 8002F840 0002C780 41 82 00 14 */ beq lbl_8002F854 /* 8002F844 0002C784 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -5458,7 +5458,7 @@ lbl_8002FBFC: /* 8002FC14 0002CB54 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FC18 0002CB58 48 00 54 91 */ bl dSv_save_c_NS_getSave2 /* 8002FC1C 0002CB5C 7F 84 E3 78 */ mr r4, r28 -/* 8002FC20 0002CB60 48 00 4E 85 */ bl dSv_memory2_c_NS_onVisitedRoom +/* 8002FC20 0002CB60 48 00 4E 85 */ bl onVisitedRoom__13dSv_memory2_cFi lbl_8002FC24: /* 8002FC24 0002CB64 39 61 00 20 */ addi r11, r1, 0x20 /* 8002FC28 0002CB68 48 33 25 FD */ bl _restgpr_28 @@ -5483,7 +5483,7 @@ lbl_8002FC24: /* 8002FC74 0002CBB4 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FC78 0002CBB8 48 00 54 31 */ bl dSv_save_c_NS_getSave2 /* 8002FC7C 0002CBBC 7F E4 FB 78 */ mr r4, r31 -/* 8002FC80 0002CBC0 48 00 4E 49 */ bl dSv_memory2_c_NS_offVisitedRoom +/* 8002FC80 0002CBC0 48 00 4E 49 */ bl offVisitedRoom__13dSv_memory2_cFi /* 8002FC84 0002CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002FC88 0002CBC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002FC8C 0002CBCC 7C 08 03 A6 */ mtlr r0 @@ -5509,7 +5509,7 @@ dComIfGs_isVisitedRoom: /* 8002FCD0 0002CC10 88 84 00 13 */ lbz r4, 0x13(r4) /* 8002FCD4 0002CC14 48 00 53 D5 */ bl dSv_save_c_NS_getSave2 /* 8002FCD8 0002CC18 7F E4 FB 78 */ mr r4, r31 -/* 8002FCDC 0002CC1C 48 00 4E 11 */ bl dSv_memory2_c_NS_isVisitedRoom +/* 8002FCDC 0002CC1C 48 00 4E 11 */ bl isVisitedRoom__13dSv_memory2_cFi /* 8002FCE0 0002CC20 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002FCE4 0002CC24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002FCE8 0002CC28 7C 08 03 A6 */ mtlr r0 @@ -5946,7 +5946,7 @@ dComIfG_inf_c: /* 80030294 0002D1D4 38 E0 00 40 */ li r7, 0x40 /* 80030298 0002D1D8 48 33 1A C9 */ bl func_80361D60 /* 8003029C 0002D1DC 38 7D 09 58 */ addi r3, r29, 0x958 -/* 800302A0 0002D1E0 48 00 47 C5 */ bl dSv_memory_c_NS_init +/* 800302A0 0002D1E0 48 00 47 C5 */ bl init__12dSv_memory_cFv /* 800302A4 0002D1E4 38 7D 09 B4 */ addi r3, r29, 0x9b4 .global dSv_zone_c /* 800302A8 0002D1E8 3C 80 80 03 */ lis r4, dSv_zone_c@ha @@ -6782,7 +6782,7 @@ dSv_memory2_c: /* 80030D88 0002DCC8 90 01 00 14 */ stw r0, 0x14(r1) /* 80030D8C 0002DCCC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80030D90 0002DCD0 7C 7F 1B 78 */ mr r31, r3 -/* 80030D94 0002DCD4 48 00 3C F1 */ bl dSv_memory2_c_NS_init +/* 80030D94 0002DCD4 48 00 3C F1 */ bl init__13dSv_memory2_cFv /* 80030D98 0002DCD8 7F E3 FB 78 */ mr r3, r31 /* 80030D9C 0002DCDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80030DA0 0002DCE0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6796,7 +6796,7 @@ dSv_memory_c: /* 80030DB8 0002DCF8 90 01 00 14 */ stw r0, 0x14(r1) /* 80030DBC 0002DCFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80030DC0 0002DD00 7C 7F 1B 78 */ mr r31, r3 -/* 80030DC4 0002DD04 48 00 3C A1 */ bl dSv_memory_c_NS_init +/* 80030DC4 0002DD04 48 00 3C A1 */ bl init__12dSv_memory_cFv /* 80030DC8 0002DD08 7F E3 FB 78 */ mr r3, r31 /* 80030DCC 0002DD0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80030DD0 0002DD10 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/d_camera.s b/asm/d/d_camera.s index ca41935cd01..f1ca1a77a75 100644 --- a/asm/d/d_camera.s +++ b/asm/d/d_camera.s @@ -38012,7 +38012,7 @@ dComIfGs_isTmpBit: /* 801828B4 0017F7F4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801828B8 0017F7F8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801828BC 0017F7FC 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 801828C0 0017F800 4B EB 20 FD */ bl dSv_event_c_NS_isEventBit +/* 801828C0 0017F800 4B EB 20 FD */ bl isEventBit__11dSv_event_cCFUs /* 801828C4 0017F804 80 01 00 14 */ lwz r0, 0x14(r1) /* 801828C8 0017F808 7C 08 03 A6 */ mtlr r0 /* 801828CC 0017F80C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index 70db0ac16f2..79736477317 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -21,52 +21,52 @@ _unnamed_d_event_cpp__NS_clear_tmpflag_for_message: /* 800414A8 0003E3E8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800414AC 0003E3EC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800414B0 0003E3F0 A0 84 00 16 */ lhz r4, 0x16(r4) -/* 800414B4 0003E3F4 4B FF 34 F1 */ bl dSv_event_c_NS_offEventBit +/* 800414B4 0003E3F4 4B FF 34 F1 */ bl offEventBit__11dSv_event_cFUs /* 800414B8 0003E3F8 7F E3 FB 78 */ mr r3, r31 /* 800414BC 0003E3FC 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800414C0 0003E400 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800414C4 0003E404 A0 84 00 18 */ lhz r4, 0x18(r4) -/* 800414C8 0003E408 4B FF 34 DD */ bl dSv_event_c_NS_offEventBit +/* 800414C8 0003E408 4B FF 34 DD */ bl offEventBit__11dSv_event_cFUs /* 800414CC 0003E40C 7F E3 FB 78 */ mr r3, r31 /* 800414D0 0003E410 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800414D4 0003E414 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800414D8 0003E418 A0 84 00 1A */ lhz r4, 0x1a(r4) -/* 800414DC 0003E41C 4B FF 34 C9 */ bl dSv_event_c_NS_offEventBit +/* 800414DC 0003E41C 4B FF 34 C9 */ bl offEventBit__11dSv_event_cFUs /* 800414E0 0003E420 7F E3 FB 78 */ mr r3, r31 /* 800414E4 0003E424 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800414E8 0003E428 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800414EC 0003E42C A0 84 00 1C */ lhz r4, 0x1c(r4) -/* 800414F0 0003E430 4B FF 34 B5 */ bl dSv_event_c_NS_offEventBit +/* 800414F0 0003E430 4B FF 34 B5 */ bl offEventBit__11dSv_event_cFUs /* 800414F4 0003E434 7F E3 FB 78 */ mr r3, r31 /* 800414F8 0003E438 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800414FC 0003E43C 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80041500 0003E440 A0 84 00 1E */ lhz r4, 0x1e(r4) -/* 80041504 0003E444 4B FF 34 A1 */ bl dSv_event_c_NS_offEventBit +/* 80041504 0003E444 4B FF 34 A1 */ bl offEventBit__11dSv_event_cFUs /* 80041508 0003E448 7F E3 FB 78 */ mr r3, r31 /* 8004150C 0003E44C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80041510 0003E450 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80041514 0003E454 A0 84 00 66 */ lhz r4, 0x66(r4) -/* 80041518 0003E458 4B FF 34 8D */ bl dSv_event_c_NS_offEventBit +/* 80041518 0003E458 4B FF 34 8D */ bl offEventBit__11dSv_event_cFUs /* 8004151C 0003E45C 7F E3 FB 78 */ mr r3, r31 /* 80041520 0003E460 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80041524 0003E464 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80041528 0003E468 A0 84 00 68 */ lhz r4, 0x68(r4) -/* 8004152C 0003E46C 4B FF 34 79 */ bl dSv_event_c_NS_offEventBit +/* 8004152C 0003E46C 4B FF 34 79 */ bl offEventBit__11dSv_event_cFUs /* 80041530 0003E470 7F E3 FB 78 */ mr r3, r31 /* 80041534 0003E474 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80041538 0003E478 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8004153C 0003E47C A0 84 00 6A */ lhz r4, 0x6a(r4) -/* 80041540 0003E480 4B FF 34 65 */ bl dSv_event_c_NS_offEventBit +/* 80041540 0003E480 4B FF 34 65 */ bl offEventBit__11dSv_event_cFUs /* 80041544 0003E484 7F E3 FB 78 */ mr r3, r31 /* 80041548 0003E488 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8004154C 0003E48C 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80041550 0003E490 A0 84 00 6C */ lhz r4, 0x6c(r4) -/* 80041554 0003E494 4B FF 34 51 */ bl dSv_event_c_NS_offEventBit +/* 80041554 0003E494 4B FF 34 51 */ bl offEventBit__11dSv_event_cFUs /* 80041558 0003E498 7F E3 FB 78 */ mr r3, r31 /* 8004155C 0003E49C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80041560 0003E4A0 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80041564 0003E4A4 A0 84 00 6E */ lhz r4, 0x6e(r4) -/* 80041568 0003E4A8 4B FF 34 3D */ bl dSv_event_c_NS_offEventBit +/* 80041568 0003E4A8 4B FF 34 3D */ bl offEventBit__11dSv_event_cFUs /* 8004156C 0003E4AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80041570 0003E4B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80041574 0003E4B4 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 97a665fd7e0..a9cd0c9c0da 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -663,19 +663,19 @@ lbl_8019B68C: /* 8019B6A4 001985E4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8019B6A8 001985E8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8019B6AC 001985EC A0 84 01 C4 */ lhz r4, 0x1c4(r4) -/* 8019B6B0 001985F0 4B E9 93 0D */ bl dSv_event_c_NS_isEventBit +/* 8019B6B0 001985F0 4B E9 93 0D */ bl isEventBit__11dSv_event_cCFUs /* 8019B6B4 001985F4 2C 03 00 00 */ cmpwi r3, 0 /* 8019B6B8 001985F8 40 82 00 2C */ bne lbl_8019B6E4 /* 8019B6BC 001985FC 7F C3 F3 78 */ mr r3, r30 /* 8019B6C0 00198600 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8019B6C4 00198604 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8019B6C8 00198608 A0 84 01 C0 */ lhz r4, 0x1c0(r4) -/* 8019B6CC 0019860C 4B E9 92 D9 */ bl dSv_event_c_NS_offEventBit +/* 8019B6CC 0019860C 4B E9 92 D9 */ bl offEventBit__11dSv_event_cFUs /* 8019B6D0 00198610 7F C3 F3 78 */ mr r3, r30 /* 8019B6D4 00198614 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8019B6D8 00198618 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8019B6DC 0019861C A0 84 01 C2 */ lhz r4, 0x1c2(r4) -/* 8019B6E0 00198620 4B E9 92 C5 */ bl dSv_event_c_NS_offEventBit +/* 8019B6E0 00198620 4B E9 92 C5 */ bl offEventBit__11dSv_event_cFUs lbl_8019B6E4: /* 8019B6E4 00198624 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8019B6E8 00198628 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l diff --git a/asm/d/d_insect.s b/asm/d/d_insect.s index 3d0b4d1da69..2b0d611a727 100644 --- a/asm/d/d_insect.s +++ b/asm/d/d_insect.s @@ -129,7 +129,7 @@ lbl_8015E1A4: /* 8015E1E0 0015B120 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8015E1E4 0015B124 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8015E1E8 0015B128 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8015E1EC 0015B12C 4B ED 67 D1 */ bl dSv_event_c_NS_isEventBit +/* 8015E1EC 0015B12C 4B ED 67 D1 */ bl isEventBit__11dSv_event_cCFUs /* 8015E1F0 0015B130 2C 03 00 00 */ cmpwi r3, 0 /* 8015E1F4 0015B134 40 82 00 10 */ bne lbl_8015E204 /* 8015E1F8 0015B138 88 1F 05 85 */ lbz r0, 0x585(r31) diff --git a/asm/d/d_item.s b/asm/d/d_item.s index c8995375dcd..c5596bc6bfa 100644 --- a/asm/d/d_item.s +++ b/asm/d/d_item.s @@ -1246,7 +1246,7 @@ lbl_80098F68: /* 800991B0 000960F0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800991B4 000960F4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800991B8 000960F8 A0 84 02 36 */ lhz r4, 0x236(r4) -/* 800991BC 000960FC 4B F9 B7 D1 */ bl dSv_event_c_NS_onEventBit +/* 800991BC 000960FC 4B F9 B7 D1 */ bl onEventBit__11dSv_event_cFUs /* 800991C0 00096100 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800991C4 00096104 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800991C8 00096108 38 63 00 9C */ addi r3, r3, 0x9c diff --git a/asm/d/d_kankyo.s b/asm/d/d_kankyo.s index 44945a253a0..c9da921ea9e 100644 --- a/asm/d/d_kankyo.s +++ b/asm/d/d_kankyo.s @@ -18202,7 +18202,7 @@ lbl_801AC6BC: /* 801AC6D4 001A9614 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801AC6D8 001A9618 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801AC6DC 001A961C 38 80 45 10 */ li r4, 0x4510 -/* 801AC6E0 001A9620 4B E8 82 DD */ bl dSv_event_c_NS_isEventBit +/* 801AC6E0 001A9620 4B E8 82 DD */ bl isEventBit__11dSv_event_cCFUs /* 801AC6E4 001A9624 2C 03 00 00 */ cmpwi r3, 0 /* 801AC6E8 001A9628 40 82 00 08 */ bne lbl_801AC6F0 /* 801AC6EC 001A962C 3B C0 FF FF */ li r30, -1 @@ -19740,7 +19740,7 @@ dKankyo_DayProc: /* 801ADD18 001AAC58 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 801ADD1C 001AAC5C 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 801ADD20 001AAC60 A0 84 00 B6 */ lhz r4, 0xb6(r4) -/* 801ADD24 001AAC64 4B E8 6C 81 */ bl dSv_event_c_NS_offEventBit +/* 801ADD24 001AAC64 4B E8 6C 81 */ bl offEventBit__11dSv_event_cFUs /* 801ADD28 001AAC68 80 01 00 14 */ lwz r0, 0x14(r1) /* 801ADD2C 001AAC6C 7C 08 03 A6 */ mtlr r0 /* 801ADD30 001AAC70 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 898b577137c..5a9ff5d9b6e 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -1014,7 +1014,7 @@ lbl_80029360: /* 8002936C 000262AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80029370 000262B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80029374 000262B4 A0 84 00 EE */ lhz r4, 0xee(r4) -/* 80029378 000262B8 48 00 B6 45 */ bl dSv_event_c_NS_isEventBit +/* 80029378 000262B8 48 00 B6 45 */ bl isEventBit__11dSv_event_cCFUs /* 8002937C 000262BC 2C 03 00 00 */ cmpwi r3, 0 /* 80029380 000262C0 41 82 00 18 */ beq lbl_80029398 /* 80029384 000262C4 3A E0 00 01 */ li r23, 1 diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index c0db7c38e24..dbcf2acffef 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -508,7 +508,7 @@ dMeter2_c_NS__execute: /* 8021F170 0021C0B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8021F174 0021C0B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8021F178 0021C0B8 38 80 54 20 */ li r4, 0x5420 -/* 8021F17C 0021C0BC 4B E1 58 41 */ bl dSv_event_c_NS_isEventBit +/* 8021F17C 0021C0BC 4B E1 58 41 */ bl isEventBit__11dSv_event_cCFUs /* 8021F180 0021C0C0 2C 03 00 00 */ cmpwi r3, 0 /* 8021F184 0021C0C4 41 82 00 10 */ beq lbl_8021F194 /* 8021F188 0021C0C8 7F C3 F3 78 */ mr r3, r30 @@ -524,7 +524,7 @@ lbl_8021F194: /* 8021F1AC 0021C0EC 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8021F1B0 0021C0F0 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8021F1B4 0021C0F4 38 80 54 10 */ li r4, 0x5410 -/* 8021F1B8 0021C0F8 4B E1 58 05 */ bl dSv_event_c_NS_isEventBit +/* 8021F1B8 0021C0F8 4B E1 58 05 */ bl isEventBit__11dSv_event_cCFUs /* 8021F1BC 0021C0FC 2C 03 00 00 */ cmpwi r3, 0 /* 8021F1C0 0021C100 41 82 00 10 */ beq lbl_8021F1D0 /* 8021F1C4 0021C104 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/d_save.s b/asm/d/d_save.s index 6d58719dc23..95042f1f235 100644 --- a/asm/d/d_save.s +++ b/asm/d/d_save.s @@ -2,158 +2,6 @@ .section .text, "ax" # 80032918 -.global dSv_event_c_NS_init -dSv_event_c_NS_init: -/* 80034954 00031894 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80034958 00031898 7C 08 02 A6 */ mflr r0 -/* 8003495C 0003189C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034960 000318A0 38 80 00 00 */ li r4, 0 -/* 80034964 000318A4 38 00 01 00 */ li r0, 0x100 -/* 80034968 000318A8 7C 09 03 A6 */ mtctr r0 -lbl_8003496C: -/* 8003496C 000318AC 98 83 00 00 */ stb r4, 0(r3) -/* 80034970 000318B0 38 63 00 01 */ addi r3, r3, 1 -/* 80034974 000318B4 42 00 FF F8 */ bdnz lbl_8003496C -/* 80034978 000318B8 48 00 13 11 */ bl setInitEventBit -/* 8003497C 000318BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034980 000318C0 7C 08 03 A6 */ mtlr r0 -/* 80034984 000318C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034988 000318C8 4E 80 00 20 */ blr - -.global dSv_event_c_NS_onEventBit -dSv_event_c_NS_onEventBit: -/* 8003498C 000318CC 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f -/* 80034990 000318D0 7C A3 30 AE */ lbzx r5, r3, r6 -/* 80034994 000318D4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80034998 000318D8 7C A0 03 78 */ or r0, r5, r0 -/* 8003499C 000318DC 7C 03 31 AE */ stbx r0, r3, r6 -/* 800349A0 000318E0 4E 80 00 20 */ blr - -.global dSv_event_c_NS_offEventBit -dSv_event_c_NS_offEventBit: -/* 800349A4 000318E4 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f -/* 800349A8 000318E8 7C A3 30 AE */ lbzx r5, r3, r6 -/* 800349AC 000318EC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800349B0 000318F0 7C A0 00 78 */ andc r0, r5, r0 -/* 800349B4 000318F4 7C 03 31 AE */ stbx r0, r3, r6 -/* 800349B8 000318F8 4E 80 00 20 */ blr - -.global dSv_event_c_NS_isEventBit -dSv_event_c_NS_isEventBit: -/* 800349BC 000318FC 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 800349C0 00031900 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f -/* 800349C4 00031904 7C 03 00 AE */ lbzx r0, r3, r0 -/* 800349C8 00031908 7C A0 00 39 */ and. r0, r5, r0 -/* 800349CC 0003190C 41 82 00 0C */ beq lbl_800349D8 -/* 800349D0 00031910 38 60 00 01 */ li r3, 1 -/* 800349D4 00031914 4E 80 00 20 */ blr -lbl_800349D8: -/* 800349D8 00031918 38 60 00 00 */ li r3, 0 -/* 800349DC 0003191C 4E 80 00 20 */ blr - -.global dSv_event_c_NS_setEventReg -dSv_event_c_NS_setEventReg: -/* 800349E0 00031920 54 87 C6 3E */ rlwinm r7, r4, 0x18, 0x18, 0x1f -/* 800349E4 00031924 7C C3 38 AE */ lbzx r6, r3, r7 -/* 800349E8 00031928 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 800349EC 0003192C 7C C0 00 78 */ andc r0, r6, r0 -/* 800349F0 00031930 7C 03 39 AE */ stbx r0, r3, r7 -/* 800349F4 00031934 7C 03 38 AE */ lbzx r0, r3, r7 -/* 800349F8 00031938 7C 00 2B 78 */ or r0, r0, r5 -/* 800349FC 0003193C 7C 03 39 AE */ stbx r0, r3, r7 -/* 80034A00 00031940 4E 80 00 20 */ blr - -.global dSv_event_c_NS_getEventReg -dSv_event_c_NS_getEventReg: -/* 80034A04 00031944 54 85 06 3E */ clrlwi r5, r4, 0x18 -/* 80034A08 00031948 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f -/* 80034A0C 0003194C 7C 03 00 AE */ lbzx r0, r3, r0 -/* 80034A10 00031950 7C A0 00 38 */ and r0, r5, r0 -/* 80034A14 00031954 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 80034A18 00031958 4E 80 00 20 */ blr - -.global dSv_MiniGame_c_NS_init -dSv_MiniGame_c_NS_init: -/* 80034A1C 0003195C 38 80 00 00 */ li r4, 0 -/* 80034A20 00031960 98 83 00 00 */ stb r4, 0(r3) -/* 80034A24 00031964 38 A0 00 00 */ li r5, 0 -/* 80034A28 00031968 38 00 00 03 */ li r0, 3 -/* 80034A2C 0003196C 7C 09 03 A6 */ mtctr r0 -lbl_80034A30: -/* 80034A30 00031970 38 05 00 01 */ addi r0, r5, 1 -/* 80034A34 00031974 7C 83 01 AE */ stbx r4, r3, r0 -/* 80034A38 00031978 38 A5 00 01 */ addi r5, r5, 1 -/* 80034A3C 0003197C 42 00 FF F4 */ bdnz lbl_80034A30 -/* 80034A40 00031980 3C 80 00 02 */ lis r4, 0x0001D4C0@ha -/* 80034A44 00031984 38 04 D4 C0 */ addi r0, r4, 0x0001D4C0@l -/* 80034A48 00031988 90 03 00 04 */ stw r0, 4(r3) -/* 80034A4C 0003198C 38 00 00 00 */ li r0, 0 -/* 80034A50 00031990 90 03 00 08 */ stw r0, 8(r3) -/* 80034A54 00031994 90 03 00 0C */ stw r0, 0xc(r3) -/* 80034A58 00031998 90 03 00 10 */ stw r0, 0x10(r3) -/* 80034A5C 0003199C 90 03 00 14 */ stw r0, 0x14(r3) -/* 80034A60 000319A0 4E 80 00 20 */ blr - -.global dSv_memory_c_NS_init -dSv_memory_c_NS_init: -/* 80034A64 000319A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80034A68 000319A8 7C 08 02 A6 */ mflr r0 -/* 80034A6C 000319AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80034A70 000319B0 4B FF FC E1 */ bl init__12dSv_memBit_cFv -/* 80034A74 000319B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80034A78 000319B8 7C 08 03 A6 */ mtlr r0 -/* 80034A7C 000319BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80034A80 000319C0 4E 80 00 20 */ blr - -.global dSv_memory2_c_NS_init -dSv_memory2_c_NS_init: -/* 80034A84 000319C4 38 80 00 00 */ li r4, 0 -/* 80034A88 000319C8 7C 85 23 78 */ mr r5, r4 -/* 80034A8C 000319CC 38 00 00 02 */ li r0, 2 -/* 80034A90 000319D0 7C 09 03 A6 */ mtctr r0 -lbl_80034A94: -/* 80034A94 000319D4 7C A3 21 2E */ stwx r5, r3, r4 -/* 80034A98 000319D8 38 84 00 04 */ addi r4, r4, 4 -/* 80034A9C 000319DC 42 00 FF F8 */ bdnz lbl_80034A94 -/* 80034AA0 000319E0 4E 80 00 20 */ blr - -.global dSv_memory2_c_NS_onVisitedRoom -dSv_memory2_c_NS_onVisitedRoom: -/* 80034AA4 000319E4 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034AA8 000319E8 54 07 10 3A */ slwi r7, r0, 2 -/* 80034AAC 000319EC 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80034AB0 000319F0 38 A0 00 01 */ li r5, 1 -/* 80034AB4 000319F4 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034AB8 000319F8 7C A0 00 30 */ slw r0, r5, r0 -/* 80034ABC 000319FC 7C C0 03 78 */ or r0, r6, r0 -/* 80034AC0 00031A00 7C 03 39 2E */ stwx r0, r3, r7 -/* 80034AC4 00031A04 4E 80 00 20 */ blr - -.global dSv_memory2_c_NS_offVisitedRoom -dSv_memory2_c_NS_offVisitedRoom: -/* 80034AC8 00031A08 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034ACC 00031A0C 54 07 10 3A */ slwi r7, r0, 2 -/* 80034AD0 00031A10 7C C3 38 2E */ lwzx r6, r3, r7 -/* 80034AD4 00031A14 38 A0 00 01 */ li r5, 1 -/* 80034AD8 00031A18 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034ADC 00031A1C 7C A0 00 30 */ slw r0, r5, r0 -/* 80034AE0 00031A20 7C C0 00 78 */ andc r0, r6, r0 -/* 80034AE4 00031A24 7C 03 39 2E */ stwx r0, r3, r7 -/* 80034AE8 00031A28 4E 80 00 20 */ blr - -.global dSv_memory2_c_NS_isVisitedRoom -dSv_memory2_c_NS_isVisitedRoom: -/* 80034AEC 00031A2C 38 A0 00 01 */ li r5, 1 -/* 80034AF0 00031A30 54 80 06 FE */ clrlwi r0, r4, 0x1b -/* 80034AF4 00031A34 7C A5 00 30 */ slw r5, r5, r0 -/* 80034AF8 00031A38 7C 80 2E 70 */ srawi r0, r4, 5 -/* 80034AFC 00031A3C 54 00 10 3A */ slwi r0, r0, 2 -/* 80034B00 00031A40 7C 03 00 2E */ lwzx r0, r3, r0 -/* 80034B04 00031A44 7C A3 00 38 */ and r3, r5, r0 -/* 80034B08 00031A48 30 03 FF FF */ addic r0, r3, -1 -/* 80034B0C 00031A4C 7C 60 19 10 */ subfe r3, r0, r3 -/* 80034B10 00031A50 4E 80 00 20 */ blr - .global dSv_danBit_c_NS_init dSv_danBit_c_NS_init: /* 80034B14 00031A54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -558,14 +406,14 @@ dSv_info_c_NS_init: /* 80034FDC 00031F1C 7C 7F 1B 78 */ mr r31, r3 /* 80034FE0 00031F20 48 00 00 3D */ bl dSv_save_c_NS_init /* 80034FE4 00031F24 38 7F 09 58 */ addi r3, r31, 0x958 -/* 80034FE8 00031F28 4B FF FA 7D */ bl dSv_memory_c_NS_init +/* 80034FE8 00031F28 4B FF FA 7D */ bl init__12dSv_memory_cFv /* 80034FEC 00031F2C 38 7F 09 78 */ addi r3, r31, 0x978 /* 80034FF0 00031F30 38 80 FF FF */ li r4, -1 /* 80034FF4 00031F34 4B FF FB 21 */ bl dSv_danBit_c_NS_init /* 80034FF8 00031F38 7F E3 FB 78 */ mr r3, r31 /* 80034FFC 00031F3C 48 00 01 51 */ bl dSv_info_c_NS_initZone /* 80035000 00031F40 38 7F 0D D8 */ addi r3, r31, 0xdd8 -/* 80035004 00031F44 4B FF F9 51 */ bl dSv_event_c_NS_init +/* 80035004 00031F44 4B FF F9 51 */ bl init__11dSv_event_cFv /* 80035008 00031F48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003500C 00031F4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80035010 00031F50 7C 08 03 A6 */ mtlr r0 @@ -586,7 +434,7 @@ dSv_save_c_NS_init: lbl_80035040: /* 80035040 00031F80 38 7F 01 F0 */ addi r3, r31, 0x1f0 /* 80035044 00031F84 7C 7D 1A 14 */ add r3, r29, r3 -/* 80035048 00031F88 4B FF FA 1D */ bl dSv_memory_c_NS_init +/* 80035048 00031F88 4B FF FA 1D */ bl init__12dSv_memory_cFv /* 8003504C 00031F8C 3B DE 00 01 */ addi r30, r30, 1 /* 80035050 00031F90 2C 1E 00 20 */ cmpwi r30, 0x20 /* 80035054 00031F94 3B FF 00 20 */ addi r31, r31, 0x20 @@ -596,15 +444,15 @@ lbl_80035040: lbl_80035064: /* 80035064 00031FA4 38 7F 05 F0 */ addi r3, r31, 0x5f0 /* 80035068 00031FA8 7C 7D 1A 14 */ add r3, r29, r3 -/* 8003506C 00031FAC 4B FF FA 19 */ bl dSv_memory2_c_NS_init +/* 8003506C 00031FAC 4B FF FA 19 */ bl init__13dSv_memory2_cFv /* 80035070 00031FB0 3B DE 00 01 */ addi r30, r30, 1 /* 80035074 00031FB4 2C 1E 00 40 */ cmpwi r30, 0x40 /* 80035078 00031FB8 3B FF 00 08 */ addi r31, r31, 8 /* 8003507C 00031FBC 41 80 FF E8 */ blt lbl_80035064 /* 80035080 00031FC0 38 7D 07 F0 */ addi r3, r29, 0x7f0 -/* 80035084 00031FC4 4B FF F8 D1 */ bl dSv_event_c_NS_init +/* 80035084 00031FC4 4B FF F8 D1 */ bl init__11dSv_event_cFv /* 80035088 00031FC8 38 7D 09 40 */ addi r3, r29, 0x940 -/* 8003508C 00031FCC 4B FF F9 91 */ bl dSv_MiniGame_c_NS_init +/* 8003508C 00031FCC 4B FF F9 91 */ bl init__14dSv_MiniGame_cFv /* 80035090 00031FD0 39 61 00 20 */ addi r11, r1, 0x20 /* 80035094 00031FD4 48 32 D1 95 */ bl _restgpr_29 /* 80035098 00031FD8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1160,27 +1008,27 @@ dSv_info_c_NS_memory_to_card: /* 800357D0 00032710 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800357D4 00032714 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 800357D8 00032718 A0 84 01 C4 */ lhz r4, 0x1c4(r4) -/* 800357DC 0003271C 4B FF F1 E1 */ bl dSv_event_c_NS_isEventBit +/* 800357DC 0003271C 4B FF F1 E1 */ bl isEventBit__11dSv_event_cCFUs /* 800357E0 00032720 2C 03 00 00 */ cmpwi r3, 0 /* 800357E4 00032724 40 82 00 50 */ bne lbl_80035834 /* 800357E8 00032728 7F A3 EB 78 */ mr r3, r29 /* 800357EC 0003272C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 800357F0 00032730 3B 24 72 88 */ addi r25, r4, lbl_803A7288@l /* 800357F4 00032734 A0 99 01 C0 */ lhz r4, 0x1c0(r25) -/* 800357F8 00032738 4B FF F1 C5 */ bl dSv_event_c_NS_isEventBit +/* 800357F8 00032738 4B FF F1 C5 */ bl isEventBit__11dSv_event_cCFUs /* 800357FC 0003273C 7C 7B 1B 78 */ mr r27, r3 /* 80035800 00032740 7F A3 EB 78 */ mr r3, r29 /* 80035804 00032744 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80035808 00032748 3A C4 72 88 */ addi r22, r4, lbl_803A7288@l /* 8003580C 0003274C A0 96 01 C2 */ lhz r4, 0x1c2(r22) -/* 80035810 00032750 4B FF F1 AD */ bl dSv_event_c_NS_isEventBit +/* 80035810 00032750 4B FF F1 AD */ bl isEventBit__11dSv_event_cCFUs /* 80035814 00032754 7C 77 1B 78 */ mr r23, r3 /* 80035818 00032758 7F A3 EB 78 */ mr r3, r29 /* 8003581C 0003275C A0 99 01 C0 */ lhz r4, 0x1c0(r25) -/* 80035820 00032760 4B FF F1 85 */ bl dSv_event_c_NS_offEventBit +/* 80035820 00032760 4B FF F1 85 */ bl offEventBit__11dSv_event_cFUs /* 80035824 00032764 7F A3 EB 78 */ mr r3, r29 /* 80035828 00032768 A0 96 01 C2 */ lhz r4, 0x1c2(r22) -/* 8003582C 0003276C 4B FF F1 79 */ bl dSv_event_c_NS_offEventBit +/* 8003582C 0003276C 4B FF F1 79 */ bl offEventBit__11dSv_event_cFUs /* 80035830 00032770 3A C0 00 01 */ li r22, 1 lbl_80035834: /* 80035834 00032774 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -1268,7 +1116,7 @@ lbl_80035928: /* 80035974 000328B4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80035978 000328B8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8003597C 000328BC A0 84 01 C0 */ lhz r4, 0x1c0(r4) -/* 80035980 000328C0 4B FF F0 0D */ bl dSv_event_c_NS_onEventBit +/* 80035980 000328C0 4B FF F0 0D */ bl onEventBit__11dSv_event_cFUs lbl_80035984: /* 80035984 000328C4 2C 17 00 00 */ cmpwi r23, 0 /* 80035988 000328C8 41 82 00 18 */ beq lbl_800359A0 @@ -1276,7 +1124,7 @@ lbl_80035984: /* 80035990 000328D0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80035994 000328D4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80035998 000328D8 A0 84 01 C2 */ lhz r4, 0x1c2(r4) -/* 8003599C 000328DC 4B FF EF F1 */ bl dSv_event_c_NS_onEventBit +/* 8003599C 000328DC 4B FF EF F1 */ bl onEventBit__11dSv_event_cFUs lbl_800359A0: /* 800359A0 000328E0 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 800359A4 000328E4 28 00 00 01 */ cmplwi r0, 1 diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index dee9431f8ef..6af52b06f81 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -140,7 +140,7 @@ lbl_800438DC: /* 800438F0 00040830 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 800438F4 00040834 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 800438F8 00040838 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 800438FC 0004083C 4B FF 10 C1 */ bl dSv_event_c_NS_isEventBit +/* 800438FC 0004083C 4B FF 10 C1 */ bl isEventBit__11dSv_event_cCFUs /* 80043900 00040840 2C 03 00 00 */ cmpwi r3, 0 /* 80043904 00040844 40 82 00 10 */ bne lbl_80043914 /* 80043908 00040848 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -1764,7 +1764,7 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044F94 00041ED4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80044F98 00041ED8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80044F9C 00041EDC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80044FA0 00041EE0 4B FE F9 ED */ bl dSv_event_c_NS_onEventBit +/* 80044FA0 00041EE0 4B FE F9 ED */ bl onEventBit__11dSv_event_cFUs lbl_80044FA4: /* 80044FA4 00041EE4 7F C3 F3 78 */ mr r3, r30 /* 80044FA8 00041EE8 7F E4 FB 78 */ mr r4, r31 @@ -1783,7 +1783,7 @@ lbl_80044FA4: /* 80044FDC 00041F1C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80044FE0 00041F20 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80044FE4 00041F24 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80044FE8 00041F28 4B FE F9 BD */ bl dSv_event_c_NS_offEventBit +/* 80044FE8 00041F28 4B FE F9 BD */ bl offEventBit__11dSv_event_cFUs lbl_80044FEC: /* 80044FEC 00041F2C 7F C3 F3 78 */ mr r3, r30 /* 80044FF0 00041F30 7F E4 FB 78 */ mr r4, r31 @@ -1849,7 +1849,7 @@ lbl_80045098: /* 800450D0 00042010 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 800450D4 00042014 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 800450D8 00042018 7C 84 02 2E */ lhzx r4, r4, r0 -/* 800450DC 0004201C 4B FE F8 B1 */ bl dSv_event_c_NS_onEventBit +/* 800450DC 0004201C 4B FE F8 B1 */ bl onEventBit__11dSv_event_cFUs lbl_800450E0: /* 800450E0 00042020 7F C3 F3 78 */ mr r3, r30 /* 800450E4 00042024 7F E4 FB 78 */ mr r4, r31 @@ -1868,7 +1868,7 @@ lbl_800450E0: /* 80045118 00042058 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8004511C 0004205C 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80045120 00042060 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80045124 00042064 4B FE F8 81 */ bl dSv_event_c_NS_offEventBit +/* 80045124 00042064 4B FE F8 81 */ bl offEventBit__11dSv_event_cFUs lbl_80045128: /* 80045128 00042068 80 9A 00 00 */ lwz r4, 0(r26) /* 8004512C 0004206C 3C 60 53 4B */ lis r3, 0x534B4950@ha @@ -2230,27 +2230,27 @@ lbl_80045638: /* 80045648 00042588 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8004564C 0004258C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80045650 00042590 A0 84 03 F4 */ lhz r4, 0x3f4(r4) -/* 80045654 00042594 4B FE F3 69 */ bl dSv_event_c_NS_isEventBit +/* 80045654 00042594 4B FE F3 69 */ bl isEventBit__11dSv_event_cCFUs /* 80045658 00042598 2C 03 00 00 */ cmpwi r3, 0 /* 8004565C 0004259C 41 82 00 18 */ beq lbl_80045674 /* 80045660 000425A0 7F 23 CB 78 */ mr r3, r25 /* 80045664 000425A4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80045668 000425A8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8004566C 000425AC A0 84 04 6C */ lhz r4, 0x46c(r4) -/* 80045670 000425B0 4B FE F3 1D */ bl dSv_event_c_NS_onEventBit +/* 80045670 000425B0 4B FE F3 1D */ bl onEventBit__11dSv_event_cFUs lbl_80045674: /* 80045674 000425B4 7F 23 CB 78 */ mr r3, r25 /* 80045678 000425B8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8004567C 000425BC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80045680 000425C0 A0 84 03 F6 */ lhz r4, 0x3f6(r4) -/* 80045684 000425C4 4B FE F3 39 */ bl dSv_event_c_NS_isEventBit +/* 80045684 000425C4 4B FE F3 39 */ bl isEventBit__11dSv_event_cCFUs /* 80045688 000425C8 2C 03 00 00 */ cmpwi r3, 0 /* 8004568C 000425CC 41 82 00 18 */ beq lbl_800456A4 /* 80045690 000425D0 7F 23 CB 78 */ mr r3, r25 /* 80045694 000425D4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80045698 000425D8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8004569C 000425DC A0 84 04 6E */ lhz r4, 0x46e(r4) -/* 800456A0 000425E0 4B FE F2 ED */ bl dSv_event_c_NS_onEventBit +/* 800456A0 000425E0 4B FE F2 ED */ bl onEventBit__11dSv_event_cFUs lbl_800456A4: /* 800456A4 000425E4 80 9A 00 00 */ lwz r4, 0(r26) /* 800456A8 000425E8 3C 60 56 49 */ lis r3, 0x56494252@ha @@ -2493,7 +2493,7 @@ lbl_800459B4: /* 80045A0C 0004294C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80045A10 00042950 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80045A14 00042954 7C 84 02 2E */ lhzx r4, r4, r0 -/* 80045A18 00042958 4B FE EF 75 */ bl dSv_event_c_NS_onEventBit +/* 80045A18 00042958 4B FE EF 75 */ bl onEventBit__11dSv_event_cFUs lbl_80045A1C: /* 80045A1C 0004295C 80 9F 00 00 */ lwz r4, 0(r31) /* 80045A20 00042960 3C 60 57 41 */ lis r3, 0x57414954@ha diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index de82e4be047..76386587ca9 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -2998,7 +2998,7 @@ lbl_8018612C: /* 8018613C 0018307C 41 82 00 28 */ beq lbl_80186164 /* 80186140 00183080 38 7F 07 F0 */ addi r3, r31, 0x7f0 /* 80186144 00183084 38 80 03 02 */ li r4, 0x302 -/* 80186148 00183088 4B EA E8 75 */ bl dSv_event_c_NS_isEventBit +/* 80186148 00183088 4B EA E8 75 */ bl isEventBit__11dSv_event_cCFUs /* 8018614C 0018308C 2C 03 00 00 */ cmpwi r3, 0 /* 80186150 00183090 40 82 00 14 */ bne lbl_80186164 /* 80186154 00183094 38 00 00 01 */ li r0, 1 @@ -3200,7 +3200,7 @@ lbl_8018640C: lbl_8018641C: /* 8018641C 0018335C 38 7F 07 F0 */ addi r3, r31, 0x7f0 /* 80186420 00183360 38 80 0C 01 */ li r4, 0xc01 -/* 80186424 00183364 4B EA E5 99 */ bl dSv_event_c_NS_isEventBit +/* 80186424 00183364 4B EA E5 99 */ bl isEventBit__11dSv_event_cCFUs /* 80186428 00183368 2C 03 00 00 */ cmpwi r3, 0 /* 8018642C 0018336C 41 82 00 18 */ beq lbl_80186444 /* 80186430 00183370 38 7F 01 00 */ addi r3, r31, 0x100 @@ -3211,7 +3211,7 @@ lbl_8018641C: lbl_80186444: /* 80186444 00183384 38 7F 07 F0 */ addi r3, r31, 0x7f0 /* 80186448 00183388 38 80 2B 08 */ li r4, 0x2b08 -/* 8018644C 0018338C 4B EA E5 71 */ bl dSv_event_c_NS_isEventBit +/* 8018644C 0018338C 4B EA E5 71 */ bl isEventBit__11dSv_event_cCFUs /* 80186450 00183390 2C 03 00 00 */ cmpwi r3, 0 /* 80186454 00183394 41 82 00 28 */ beq lbl_8018647C /* 80186458 00183398 38 7F 01 00 */ addi r3, r31, 0x100 diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index d35570b7da0..1553dcae1d1 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -57,7 +57,7 @@ dMenu_Fmap_room_data_c_NS_isArrival: /* 8003D83C 0003A77C 88 84 00 02 */ lbz r4, 2(r4) /* 8003D840 0003A780 4B FF 78 69 */ bl dSv_save_c_NS_getSave2 /* 8003D844 0003A784 88 9F 00 10 */ lbz r4, 0x10(r31) -/* 8003D848 0003A788 4B FF 72 A5 */ bl dSv_memory2_c_NS_isVisitedRoom +/* 8003D848 0003A788 4B FF 72 A5 */ bl isVisitedRoom__13dSv_memory2_cFi /* 8003D84C 0003A78C 30 03 FF FF */ addic r0, r3, -1 /* 8003D850 0003A790 7C 60 19 10 */ subfe r3, r0, r3 /* 8003D854 0003A794 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -162,7 +162,7 @@ lbl_8003D98C: /* 8003D990 0003A8D0 7F A4 EB 78 */ mr r4, r29 /* 8003D994 0003A8D4 4B FF 77 15 */ bl dSv_save_c_NS_getSave2 /* 8003D998 0003A8D8 88 9E 00 10 */ lbz r4, 0x10(r30) -/* 8003D99C 0003A8DC 4B FF 71 51 */ bl dSv_memory2_c_NS_isVisitedRoom +/* 8003D99C 0003A8DC 4B FF 71 51 */ bl isVisitedRoom__13dSv_memory2_cFi /* 8003D9A0 0003A8E0 30 03 FF FF */ addic r0, r3, -1 /* 8003D9A4 0003A8E4 7C 80 19 10 */ subfe r4, r0, r3 /* 8003D9A8 0003A8E8 83 DE 00 08 */ lwz r30, 8(r30) @@ -353,7 +353,7 @@ lbl_8003DC24: /* 8003DC2C 0003AB6C 80 81 00 38 */ lwz r4, 0x38(r1) /* 8003DC30 0003AB70 4B FF 74 79 */ bl dSv_save_c_NS_getSave2 /* 8003DC34 0003AB74 88 99 00 10 */ lbz r4, 0x10(r25) -/* 8003DC38 0003AB78 4B FF 6E B5 */ bl dSv_memory2_c_NS_isVisitedRoom +/* 8003DC38 0003AB78 4B FF 6E B5 */ bl isVisitedRoom__13dSv_memory2_cFi /* 8003DC3C 0003AB7C 2C 03 00 00 */ cmpwi r3, 0 /* 8003DC40 0003AB80 41 82 02 10 */ beq lbl_8003DE50 /* 8003DC44 0003AB84 C0 2F 00 08 */ lfs f1, 8(r15) @@ -1258,7 +1258,7 @@ lbl_8003E87C: /* 8003E888 0003B7C8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8003E88C 0003B7CC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8003E890 0003B7D0 A0 84 00 EE */ lhz r4, 0xee(r4) -/* 8003E894 0003B7D4 4B FF 61 29 */ bl dSv_event_c_NS_isEventBit +/* 8003E894 0003B7D4 4B FF 61 29 */ bl isEventBit__11dSv_event_cCFUs /* 8003E898 0003B7D8 2C 03 00 00 */ cmpwi r3, 0 /* 8003E89C 0003B7DC 41 82 00 18 */ beq lbl_8003E8B4 /* 8003E8A0 0003B7E0 3B A0 00 01 */ li r29, 1 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index abd7cae7c92..7d8a0146cc8 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -640,49 +640,49 @@ dMenu_Collect2D_c_NS_isSkillIconVisible: /* 801B063C 001AD57C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B0640 001AD580 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B0644 001AD584 A0 84 02 A4 */ lhz r4, 0x2a4(r4) -/* 801B0648 001AD588 4B E8 43 75 */ bl dSv_event_c_NS_isEventBit +/* 801B0648 001AD588 4B E8 43 75 */ bl isEventBit__11dSv_event_cCFUs /* 801B064C 001AD58C 2C 03 00 00 */ cmpwi r3, 0 /* 801B0650 001AD590 40 82 00 AC */ bne lbl_801B06FC /* 801B0654 001AD594 7F E3 FB 78 */ mr r3, r31 /* 801B0658 001AD598 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B065C 001AD59C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B0660 001AD5A0 A0 84 02 A6 */ lhz r4, 0x2a6(r4) -/* 801B0664 001AD5A4 4B E8 43 59 */ bl dSv_event_c_NS_isEventBit +/* 801B0664 001AD5A4 4B E8 43 59 */ bl isEventBit__11dSv_event_cCFUs /* 801B0668 001AD5A8 2C 03 00 00 */ cmpwi r3, 0 /* 801B066C 001AD5AC 40 82 00 90 */ bne lbl_801B06FC /* 801B0670 001AD5B0 7F E3 FB 78 */ mr r3, r31 /* 801B0674 001AD5B4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B0678 001AD5B8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B067C 001AD5BC A0 84 02 A8 */ lhz r4, 0x2a8(r4) -/* 801B0680 001AD5C0 4B E8 43 3D */ bl dSv_event_c_NS_isEventBit +/* 801B0680 001AD5C0 4B E8 43 3D */ bl isEventBit__11dSv_event_cCFUs /* 801B0684 001AD5C4 2C 03 00 00 */ cmpwi r3, 0 /* 801B0688 001AD5C8 40 82 00 74 */ bne lbl_801B06FC /* 801B068C 001AD5CC 7F E3 FB 78 */ mr r3, r31 /* 801B0690 001AD5D0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B0694 001AD5D4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B0698 001AD5D8 A0 84 02 AA */ lhz r4, 0x2aa(r4) -/* 801B069C 001AD5DC 4B E8 43 21 */ bl dSv_event_c_NS_isEventBit +/* 801B069C 001AD5DC 4B E8 43 21 */ bl isEventBit__11dSv_event_cCFUs /* 801B06A0 001AD5E0 2C 03 00 00 */ cmpwi r3, 0 /* 801B06A4 001AD5E4 40 82 00 58 */ bne lbl_801B06FC /* 801B06A8 001AD5E8 7F E3 FB 78 */ mr r3, r31 /* 801B06AC 001AD5EC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B06B0 001AD5F0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B06B4 001AD5F4 A0 84 02 AC */ lhz r4, 0x2ac(r4) -/* 801B06B8 001AD5F8 4B E8 43 05 */ bl dSv_event_c_NS_isEventBit +/* 801B06B8 001AD5F8 4B E8 43 05 */ bl isEventBit__11dSv_event_cCFUs /* 801B06BC 001AD5FC 2C 03 00 00 */ cmpwi r3, 0 /* 801B06C0 001AD600 40 82 00 3C */ bne lbl_801B06FC /* 801B06C4 001AD604 7F E3 FB 78 */ mr r3, r31 /* 801B06C8 001AD608 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B06CC 001AD60C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B06D0 001AD610 A0 84 02 AE */ lhz r4, 0x2ae(r4) -/* 801B06D4 001AD614 4B E8 42 E9 */ bl dSv_event_c_NS_isEventBit +/* 801B06D4 001AD614 4B E8 42 E9 */ bl isEventBit__11dSv_event_cCFUs /* 801B06D8 001AD618 2C 03 00 00 */ cmpwi r3, 0 /* 801B06DC 001AD61C 40 82 00 20 */ bne lbl_801B06FC /* 801B06E0 001AD620 7F E3 FB 78 */ mr r3, r31 /* 801B06E4 001AD624 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B06E8 001AD628 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B06EC 001AD62C A0 84 02 B0 */ lhz r4, 0x2b0(r4) -/* 801B06F0 001AD630 4B E8 42 CD */ bl dSv_event_c_NS_isEventBit +/* 801B06F0 001AD630 4B E8 42 CD */ bl isEventBit__11dSv_event_cCFUs /* 801B06F4 001AD634 2C 03 00 00 */ cmpwi r3, 0 /* 801B06F8 001AD638 41 82 00 0C */ beq lbl_801B0704 lbl_801B06FC: @@ -1225,7 +1225,7 @@ lbl_801B0A10: /* 801B0F34 001ADE74 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801B0F38 001ADE78 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801B0F3C 001ADE7C 38 80 03 02 */ li r4, 0x302 -/* 801B0F40 001ADE80 4B E8 3A 7D */ bl dSv_event_c_NS_isEventBit +/* 801B0F40 001ADE80 4B E8 3A 7D */ bl isEventBit__11dSv_event_cCFUs /* 801B0F44 001ADE84 2C 03 00 00 */ cmpwi r3, 0 /* 801B0F48 001ADE88 40 82 00 08 */ bne lbl_801B0F50 /* 801B0F4C 001ADE8C 3A C0 00 01 */ li r22, 1 @@ -1277,7 +1277,7 @@ lbl_801B0FE0: /* 801B0FF8 001ADF38 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801B0FFC 001ADF3C 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801B1000 001ADF40 38 80 03 02 */ li r4, 0x302 -/* 801B1004 001ADF44 4B E8 39 B9 */ bl dSv_event_c_NS_isEventBit +/* 801B1004 001ADF44 4B E8 39 B9 */ bl isEventBit__11dSv_event_cCFUs /* 801B1008 001ADF48 2C 03 00 00 */ cmpwi r3, 0 /* 801B100C 001ADF4C 40 82 00 54 */ bne lbl_801B1060 /* 801B1010 001ADF50 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -1796,7 +1796,7 @@ lbl_801B16B4: /* 801B176C 001AE6AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801B1770 001AE6B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801B1774 001AE6B4 A0 84 03 90 */ lhz r4, 0x390(r4) -/* 801B1778 001AE6B8 4B E8 32 45 */ bl dSv_event_c_NS_isEventBit +/* 801B1778 001AE6B8 4B E8 32 45 */ bl isEventBit__11dSv_event_cCFUs /* 801B177C 001AE6BC 2C 03 00 00 */ cmpwi r3, 0 /* 801B1780 001AE6C0 41 82 00 10 */ beq lbl_801B1790 /* 801B1784 001AE6C4 38 00 12 D8 */ li r0, 0x12d8 @@ -8297,7 +8297,7 @@ lbl_801B752C: /* 801B7534 001B4474 3B E3 07 F0 */ addi r31, r3, 0x7f0 /* 801B7538 001B4478 7F E3 FB 78 */ mr r3, r31 /* 801B753C 001B447C 38 80 0C 01 */ li r4, 0xc01 -/* 801B7540 001B4480 4B E7 D4 7D */ bl dSv_event_c_NS_isEventBit +/* 801B7540 001B4480 4B E7 D4 7D */ bl isEventBit__11dSv_event_cCFUs /* 801B7544 001B4484 2C 03 00 00 */ cmpwi r3, 0 /* 801B7548 001B4488 41 82 00 20 */ beq lbl_801B7568 /* 801B754C 001B448C 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -8310,7 +8310,7 @@ lbl_801B752C: lbl_801B7568: /* 801B7568 001B44A8 7F E3 FB 78 */ mr r3, r31 /* 801B756C 001B44AC 38 80 2B 08 */ li r4, 0x2b08 -/* 801B7570 001B44B0 4B E7 D4 4D */ bl dSv_event_c_NS_isEventBit +/* 801B7570 001B44B0 4B E7 D4 4D */ bl isEventBit__11dSv_event_cCFUs /* 801B7574 001B44B4 2C 03 00 00 */ cmpwi r3, 0 /* 801B7578 001B44B8 41 82 00 28 */ beq lbl_801B75A0 /* 801B757C 001B44BC 3C 60 80 40 */ lis r3, lbl_804061C0@ha diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index 263cae646d5..17eb2aeaf86 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -4629,7 +4629,7 @@ lbl_801BC358: /* 801BC370 001B92B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801BC374 001B92B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801BC378 001B92B8 38 80 00 02 */ li r4, 2 -/* 801BC37C 001B92BC 4B E7 86 41 */ bl dSv_event_c_NS_isEventBit +/* 801BC37C 001B92BC 4B E7 86 41 */ bl isEventBit__11dSv_event_cCFUs /* 801BC380 001B92C0 2C 03 00 00 */ cmpwi r3, 0 /* 801BC384 001B92C4 40 82 00 14 */ bne lbl_801BC398 /* 801BC388 001B92C8 3B 80 00 F4 */ li r28, 0xf4 @@ -4646,7 +4646,7 @@ lbl_801BC398: /* 801BC3B0 001B92F0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 801BC3B4 001B92F4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 801BC3B8 001B92F8 38 80 00 01 */ li r4, 1 -/* 801BC3BC 001B92FC 4B E7 86 01 */ bl dSv_event_c_NS_isEventBit +/* 801BC3BC 001B92FC 4B E7 86 01 */ bl isEventBit__11dSv_event_cCFUs /* 801BC3C0 001B9300 2C 03 00 00 */ cmpwi r3, 0 /* 801BC3C4 001B9304 40 82 00 10 */ bne lbl_801BC3D4 /* 801BC3C8 001B9308 3B 80 00 F5 */ li r28, 0xf5 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 6cbf1c11900..67ba38612b3 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -1721,14 +1721,14 @@ lbl_801C7E94: /* 801C7EC0 001C4E00 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C7EC4 001C4E04 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C7EC8 001C4E08 A0 84 02 12 */ lhz r4, 0x212(r4) -/* 801C7ECC 001C4E0C 4B E6 CA F1 */ bl dSv_event_c_NS_isEventBit +/* 801C7ECC 001C4E0C 4B E6 CA F1 */ bl isEventBit__11dSv_event_cCFUs /* 801C7ED0 001C4E10 2C 03 00 00 */ cmpwi r3, 0 /* 801C7ED4 001C4E14 41 82 00 9C */ beq lbl_801C7F70 /* 801C7ED8 001C4E18 7F E3 FB 78 */ mr r3, r31 /* 801C7EDC 001C4E1C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C7EE0 001C4E20 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C7EE4 001C4E24 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801C7EE8 001C4E28 4B E6 CA D5 */ bl dSv_event_c_NS_isEventBit +/* 801C7EE8 001C4E28 4B E6 CA D5 */ bl isEventBit__11dSv_event_cCFUs /* 801C7EEC 001C4E2C 2C 03 00 00 */ cmpwi r3, 0 /* 801C7EF0 001C4E30 40 82 00 80 */ bne lbl_801C7F70 /* 801C7EF4 001C4E34 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -1820,14 +1820,14 @@ lbl_801C802C: /* 801C8040 001C4F80 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8044 001C4F84 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8048 001C4F88 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C804C 001C4F8C 4B E6 C9 71 */ bl dSv_event_c_NS_isEventBit +/* 801C804C 001C4F8C 4B E6 C9 71 */ bl isEventBit__11dSv_event_cCFUs /* 801C8050 001C4F90 2C 03 00 00 */ cmpwi r3, 0 /* 801C8054 001C4F94 41 82 00 44 */ beq lbl_801C8098 /* 801C8058 001C4F98 7F E3 FB 78 */ mr r3, r31 /* 801C805C 001C4F9C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8060 001C4FA0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8064 001C4FA4 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C8068 001C4FA8 4B E6 C9 55 */ bl dSv_event_c_NS_isEventBit +/* 801C8068 001C4FA8 4B E6 C9 55 */ bl isEventBit__11dSv_event_cCFUs /* 801C806C 001C4FAC 2C 03 00 00 */ cmpwi r3, 0 /* 801C8070 001C4FB0 40 82 00 28 */ bne lbl_801C8098 /* 801C8074 001C4FB4 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -1856,7 +1856,7 @@ lbl_801C8098: /* 801C80CC 001C500C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C80D0 001C5010 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C80D4 001C5014 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C80D8 001C5018 4B E6 C8 B5 */ bl dSv_event_c_NS_onEventBit +/* 801C80D8 001C5018 4B E6 C8 B5 */ bl onEventBit__11dSv_event_cFUs /* 801C80DC 001C501C 48 00 00 58 */ b lbl_801C8134 lbl_801C80E0: /* 801C80E0 001C5020 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2275,14 +2275,14 @@ lbl_801C86D4: /* 801C8700 001C5640 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8704 001C5644 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8708 001C5648 A0 84 02 12 */ lhz r4, 0x212(r4) -/* 801C870C 001C564C 4B E6 C2 B1 */ bl dSv_event_c_NS_isEventBit +/* 801C870C 001C564C 4B E6 C2 B1 */ bl isEventBit__11dSv_event_cCFUs /* 801C8710 001C5650 2C 03 00 00 */ cmpwi r3, 0 /* 801C8714 001C5654 41 82 00 9C */ beq lbl_801C87B0 /* 801C8718 001C5658 7F E3 FB 78 */ mr r3, r31 /* 801C871C 001C565C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8720 001C5660 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8724 001C5664 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801C8728 001C5668 4B E6 C2 95 */ bl dSv_event_c_NS_isEventBit +/* 801C8728 001C5668 4B E6 C2 95 */ bl isEventBit__11dSv_event_cCFUs /* 801C872C 001C566C 2C 03 00 00 */ cmpwi r3, 0 /* 801C8730 001C5670 40 82 00 80 */ bne lbl_801C87B0 /* 801C8734 001C5674 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2358,14 +2358,14 @@ lbl_801C8830: /* 801C8844 001C5784 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8848 001C5788 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C884C 001C578C A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C8850 001C5790 4B E6 C1 6D */ bl dSv_event_c_NS_isEventBit +/* 801C8850 001C5790 4B E6 C1 6D */ bl isEventBit__11dSv_event_cCFUs /* 801C8854 001C5794 2C 03 00 00 */ cmpwi r3, 0 /* 801C8858 001C5798 41 82 00 44 */ beq lbl_801C889C /* 801C885C 001C579C 7F E3 FB 78 */ mr r3, r31 /* 801C8860 001C57A0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8864 001C57A4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8868 001C57A8 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C886C 001C57AC 4B E6 C1 51 */ bl dSv_event_c_NS_isEventBit +/* 801C886C 001C57AC 4B E6 C1 51 */ bl isEventBit__11dSv_event_cCFUs /* 801C8870 001C57B0 2C 03 00 00 */ cmpwi r3, 0 /* 801C8874 001C57B4 40 82 00 28 */ bne lbl_801C889C /* 801C8878 001C57B8 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2394,7 +2394,7 @@ lbl_801C889C: /* 801C88D0 001C5810 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C88D4 001C5814 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C88D8 001C5818 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C88DC 001C581C 4B E6 C0 B1 */ bl dSv_event_c_NS_onEventBit +/* 801C88DC 001C581C 4B E6 C0 B1 */ bl onEventBit__11dSv_event_cFUs /* 801C88E0 001C5820 48 00 00 58 */ b lbl_801C8938 lbl_801C88E4: /* 801C88E4 001C5824 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2677,14 +2677,14 @@ lbl_801C8C84: /* 801C8D00 001C5C40 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8D04 001C5C44 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8D08 001C5C48 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C8D0C 001C5C4C 4B E6 BC B1 */ bl dSv_event_c_NS_isEventBit +/* 801C8D0C 001C5C4C 4B E6 BC B1 */ bl isEventBit__11dSv_event_cCFUs /* 801C8D10 001C5C50 2C 03 00 00 */ cmpwi r3, 0 /* 801C8D14 001C5C54 41 82 00 44 */ beq lbl_801C8D58 /* 801C8D18 001C5C58 7F E3 FB 78 */ mr r3, r31 /* 801C8D1C 001C5C5C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8D20 001C5C60 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8D24 001C5C64 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C8D28 001C5C68 4B E6 BC 95 */ bl dSv_event_c_NS_isEventBit +/* 801C8D28 001C5C68 4B E6 BC 95 */ bl isEventBit__11dSv_event_cCFUs /* 801C8D2C 001C5C6C 2C 03 00 00 */ cmpwi r3, 0 /* 801C8D30 001C5C70 40 82 00 28 */ bne lbl_801C8D58 /* 801C8D34 001C5C74 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2701,14 +2701,14 @@ lbl_801C8D58: /* 801C8D5C 001C5C9C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8D60 001C5CA0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8D64 001C5CA4 A0 84 06 24 */ lhz r4, 0x624(r4) -/* 801C8D68 001C5CA8 4B E6 BC 55 */ bl dSv_event_c_NS_isEventBit +/* 801C8D68 001C5CA8 4B E6 BC 55 */ bl isEventBit__11dSv_event_cCFUs /* 801C8D6C 001C5CAC 2C 03 00 00 */ cmpwi r3, 0 /* 801C8D70 001C5CB0 41 82 00 58 */ beq lbl_801C8DC8 /* 801C8D74 001C5CB4 7F E3 FB 78 */ mr r3, r31 /* 801C8D78 001C5CB8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8D7C 001C5CBC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8D80 001C5CC0 A0 84 06 22 */ lhz r4, 0x622(r4) -/* 801C8D84 001C5CC4 4B E6 BC 39 */ bl dSv_event_c_NS_isEventBit +/* 801C8D84 001C5CC4 4B E6 BC 39 */ bl isEventBit__11dSv_event_cCFUs /* 801C8D88 001C5CC8 2C 03 00 00 */ cmpwi r3, 0 /* 801C8D8C 001C5CCC 40 82 00 3C */ bne lbl_801C8DC8 /* 801C8D90 001C5CD0 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2723,7 +2723,7 @@ lbl_801C8D58: /* 801C8DB4 001C5CF4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8DB8 001C5CF8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8DBC 001C5CFC A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C8DC0 001C5D00 4B E6 BB CD */ bl dSv_event_c_NS_onEventBit +/* 801C8DC0 001C5D00 4B E6 BB CD */ bl onEventBit__11dSv_event_cFUs /* 801C8DC4 001C5D04 48 00 01 9C */ b lbl_801C8F60 lbl_801C8DC8: /* 801C8DC8 001C5D08 88 1E 03 08 */ lbz r0, 0x308(r30) @@ -2754,7 +2754,7 @@ lbl_801C8E20: /* 801C8E24 001C5D64 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8E28 001C5D68 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8E2C 001C5D6C A0 84 00 FA */ lhz r4, 0xfa(r4) -/* 801C8E30 001C5D70 4B E6 BB 8D */ bl dSv_event_c_NS_isEventBit +/* 801C8E30 001C5D70 4B E6 BB 8D */ bl isEventBit__11dSv_event_cCFUs /* 801C8E34 001C5D74 2C 03 00 00 */ cmpwi r3, 0 /* 801C8E38 001C5D78 41 82 00 28 */ beq lbl_801C8E60 lbl_801C8E3C: @@ -2805,7 +2805,7 @@ lbl_801C8EDC: /* 801C8EE0 001C5E20 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8EE4 001C5E24 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C8EE8 001C5E28 A0 84 00 66 */ lhz r4, 0x66(r4) -/* 801C8EEC 001C5E2C 4B E6 BA D1 */ bl dSv_event_c_NS_isEventBit +/* 801C8EEC 001C5E2C 4B E6 BA D1 */ bl isEventBit__11dSv_event_cCFUs /* 801C8EF0 001C5E30 2C 03 00 00 */ cmpwi r3, 0 /* 801C8EF4 001C5E34 41 82 00 28 */ beq lbl_801C8F1C lbl_801C8EF8: @@ -3385,14 +3385,14 @@ lbl_801C976C: /* 801C978C 001C66CC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C9790 001C66D0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C9794 001C66D4 A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801C9798 001C66D8 4B E6 B2 25 */ bl dSv_event_c_NS_isEventBit +/* 801C9798 001C66D8 4B E6 B2 25 */ bl isEventBit__11dSv_event_cCFUs /* 801C979C 001C66DC 2C 03 00 00 */ cmpwi r3, 0 /* 801C97A0 001C66E0 41 82 00 44 */ beq lbl_801C97E4 /* 801C97A4 001C66E4 7F C3 F3 78 */ mr r3, r30 /* 801C97A8 001C66E8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C97AC 001C66EC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C97B0 001C66F0 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801C97B4 001C66F4 4B E6 B2 09 */ bl dSv_event_c_NS_isEventBit +/* 801C97B4 001C66F4 4B E6 B2 09 */ bl isEventBit__11dSv_event_cCFUs /* 801C97B8 001C66F8 2C 03 00 00 */ cmpwi r3, 0 /* 801C97BC 001C66FC 40 82 00 28 */ bne lbl_801C97E4 /* 801C97C0 001C6700 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -3421,7 +3421,7 @@ lbl_801C97E4: /* 801C9818 001C6758 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C981C 001C675C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801C9820 001C6760 A0 84 06 26 */ lhz r4, 0x626(r4) -/* 801C9824 001C6764 4B E6 B1 69 */ bl dSv_event_c_NS_onEventBit +/* 801C9824 001C6764 4B E6 B1 69 */ bl onEventBit__11dSv_event_cFUs /* 801C9828 001C6768 48 00 00 58 */ b lbl_801C9880 lbl_801C982C: /* 801C982C 001C676C 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -4189,7 +4189,7 @@ lbl_801CA338: /* 801CA3A0 001C72E0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801CA3A4 001C72E4 3B E4 72 88 */ addi r31, r4, lbl_803A7288@l /* 801CA3A8 001C72E8 A0 9F 00 EE */ lhz r4, 0xee(r31) -/* 801CA3AC 001C72EC 4B E6 A6 11 */ bl dSv_event_c_NS_isEventBit +/* 801CA3AC 001C72EC 4B E6 A6 11 */ bl isEventBit__11dSv_event_cCFUs /* 801CA3B0 001C72F0 2C 03 00 00 */ cmpwi r3, 0 /* 801CA3B4 001C72F4 41 82 00 20 */ beq lbl_801CA3D4 /* 801CA3B8 001C72F8 A8 1D 02 14 */ lha r0, 0x214(r29) @@ -4207,7 +4207,7 @@ lbl_801CA3D4: /* 801CA3E4 001C7324 98 1D 03 0B */ stb r0, 0x30b(r29) /* 801CA3E8 001C7328 7F C3 F3 78 */ mr r3, r30 /* 801CA3EC 001C732C A0 9F 00 EE */ lhz r4, 0xee(r31) -/* 801CA3F0 001C7330 4B E6 A5 9D */ bl dSv_event_c_NS_onEventBit +/* 801CA3F0 001C7330 4B E6 A5 9D */ bl onEventBit__11dSv_event_cFUs lbl_801CA3F4: /* 801CA3F4 001C7334 39 61 00 20 */ addi r11, r1, 0x20 /* 801CA3F8 001C7338 48 19 7E 31 */ bl _restgpr_29 @@ -7802,14 +7802,14 @@ lbl_801CD610: /* 801CD628 001CA568 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801CD62C 001CA56C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801CD630 001CA570 A0 84 02 D2 */ lhz r4, 0x2d2(r4) -/* 801CD634 001CA574 4B E6 73 89 */ bl dSv_event_c_NS_isEventBit +/* 801CD634 001CA574 4B E6 73 89 */ bl isEventBit__11dSv_event_cCFUs /* 801CD638 001CA578 2C 03 00 00 */ cmpwi r3, 0 /* 801CD63C 001CA57C 41 82 00 20 */ beq lbl_801CD65C /* 801CD640 001CA580 7F A3 EB 78 */ mr r3, r29 /* 801CD644 001CA584 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801CD648 001CA588 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801CD64C 001CA58C A0 84 00 CE */ lhz r4, 0xce(r4) -/* 801CD650 001CA590 4B E6 73 6D */ bl dSv_event_c_NS_isEventBit +/* 801CD650 001CA590 4B E6 73 6D */ bl isEventBit__11dSv_event_cCFUs /* 801CD654 001CA594 2C 03 00 00 */ cmpwi r3, 0 /* 801CD658 001CA598 40 82 00 34 */ bne lbl_801CD68C lbl_801CD65C: @@ -7818,7 +7818,7 @@ lbl_801CD65C: /* 801CD664 001CA5A4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801CD668 001CA5A8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801CD66C 001CA5AC A0 84 02 10 */ lhz r4, 0x210(r4) -/* 801CD670 001CA5B0 4B E6 73 4D */ bl dSv_event_c_NS_isEventBit +/* 801CD670 001CA5B0 4B E6 73 4D */ bl isEventBit__11dSv_event_cCFUs /* 801CD674 001CA5B4 2C 03 00 00 */ cmpwi r3, 0 /* 801CD678 001CA5B8 40 82 00 0C */ bne lbl_801CD684 /* 801CD67C 001CA5BC 3B A0 00 4F */ li r29, 0x4f diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 7f29a091638..dba93fda7e7 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -9202,14 +9202,14 @@ lbl_801D7AF4: /* 801D7B04 001D4A44 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D7B08 001D4A48 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D7B0C 001D4A4C A0 84 00 D0 */ lhz r4, 0xd0(r4) -/* 801D7B10 001D4A50 4B E5 CE AD */ bl dSv_event_c_NS_isEventBit +/* 801D7B10 001D4A50 4B E5 CE AD */ bl isEventBit__11dSv_event_cCFUs /* 801D7B14 001D4A54 2C 03 00 00 */ cmpwi r3, 0 /* 801D7B18 001D4A58 41 82 00 28 */ beq lbl_801D7B40 /* 801D7B1C 001D4A5C 7F E3 FB 78 */ mr r3, r31 /* 801D7B20 001D4A60 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D7B24 001D4A64 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D7B28 001D4A68 A0 84 01 F4 */ lhz r4, 0x1f4(r4) -/* 801D7B2C 001D4A6C 4B E5 CE 91 */ bl dSv_event_c_NS_isEventBit +/* 801D7B2C 001D4A6C 4B E5 CE 91 */ bl isEventBit__11dSv_event_cCFUs /* 801D7B30 001D4A70 2C 03 00 00 */ cmpwi r3, 0 /* 801D7B34 001D4A74 40 82 00 0C */ bne lbl_801D7B40 /* 801D7B38 001D4A78 38 60 00 00 */ li r3, 0 @@ -9236,14 +9236,14 @@ dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon: /* 801D7B78 001D4AB8 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D7B7C 001D4ABC 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D7B80 001D4AC0 A0 84 06 24 */ lhz r4, 0x624(r4) -/* 801D7B84 001D4AC4 4B E5 CE 39 */ bl dSv_event_c_NS_isEventBit +/* 801D7B84 001D4AC4 4B E5 CE 39 */ bl isEventBit__11dSv_event_cCFUs /* 801D7B88 001D4AC8 2C 03 00 00 */ cmpwi r3, 0 /* 801D7B8C 001D4ACC 41 82 00 28 */ beq lbl_801D7BB4 /* 801D7B90 001D4AD0 7F E3 FB 78 */ mr r3, r31 /* 801D7B94 001D4AD4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D7B98 001D4AD8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D7B9C 001D4ADC A0 84 06 22 */ lhz r4, 0x622(r4) -/* 801D7BA0 001D4AE0 4B E5 CE 1D */ bl dSv_event_c_NS_isEventBit +/* 801D7BA0 001D4AE0 4B E5 CE 1D */ bl isEventBit__11dSv_event_cCFUs /* 801D7BA4 001D4AE4 2C 03 00 00 */ cmpwi r3, 0 /* 801D7BA8 001D4AE8 40 82 00 0C */ bne lbl_801D7BB4 /* 801D7BAC 001D4AEC 38 60 00 00 */ li r3, 0 @@ -9591,7 +9591,7 @@ dMenu_Fmap2DTop_c_NS_isWarpAccept: /* 801D80A0 001D4FE0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D80A4 001D4FE4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D80A8 001D4FE8 A0 84 00 6C */ lhz r4, 0x6c(r4) -/* 801D80AC 001D4FEC 4B E5 C9 11 */ bl dSv_event_c_NS_isEventBit +/* 801D80AC 001D4FEC 4B E5 C9 11 */ bl isEventBit__11dSv_event_cCFUs /* 801D80B0 001D4FF0 2C 03 00 00 */ cmpwi r3, 0 /* 801D80B4 001D4FF4 41 82 00 28 */ beq lbl_801D80DC /* 801D80B8 001D4FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index bba01791fe4..493bd6996f1 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -2008,7 +2008,7 @@ dMenu_Insect_c_NS_isGiveInsect: /* 801D9E54 001D6D94 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D9E58 001D6D98 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D9E5C 001D6D9C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801D9E60 001D6DA0 4B E5 AB 5D */ bl dSv_event_c_NS_isEventBit +/* 801D9E60 001D6DA0 4B E5 AB 5D */ bl isEventBit__11dSv_event_cCFUs /* 801D9E64 001D6DA4 30 03 FF FF */ addic r0, r3, -1 /* 801D9E68 001D6DA8 7C 60 19 10 */ subfe r3, r0, r3 /* 801D9E6C 001D6DAC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2061,7 +2061,7 @@ dMenu_Insect_c_NS_isGiveInsect_X1_: /* 801D9F08 001D6E48 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801D9F0C 001D6E4C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801D9F10 001D6E50 7C 84 02 2E */ lhzx r4, r4, r0 -/* 801D9F14 001D6E54 4B E5 AA A9 */ bl dSv_event_c_NS_isEventBit +/* 801D9F14 001D6E54 4B E5 AA A9 */ bl isEventBit__11dSv_event_cCFUs /* 801D9F18 001D6E58 30 03 FF FF */ addic r0, r3, -1 /* 801D9F1C 001D6E5C 7C 00 19 10 */ subfe r0, r0, r3 /* 801D9F20 001D6E60 54 03 06 3E */ clrlwi r3, r0, 0x18 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 6bb65ea1087..80f772161a8 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -4008,19 +4008,19 @@ dMenu_save_c_NS_restartInit: /* 801F30D8 001F0018 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801F30DC 001F001C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801F30E0 001F0020 A0 84 01 C4 */ lhz r4, 0x1c4(r4) -/* 801F30E4 001F0024 4B E4 18 D9 */ bl dSv_event_c_NS_isEventBit +/* 801F30E4 001F0024 4B E4 18 D9 */ bl isEventBit__11dSv_event_cCFUs /* 801F30E8 001F0028 2C 03 00 00 */ cmpwi r3, 0 /* 801F30EC 001F002C 40 82 00 2C */ bne lbl_801F3118 /* 801F30F0 001F0030 7F E3 FB 78 */ mr r3, r31 /* 801F30F4 001F0034 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801F30F8 001F0038 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801F30FC 001F003C A0 84 01 C0 */ lhz r4, 0x1c0(r4) -/* 801F3100 001F0040 4B E4 18 A5 */ bl dSv_event_c_NS_offEventBit +/* 801F3100 001F0040 4B E4 18 A5 */ bl offEventBit__11dSv_event_cFUs /* 801F3104 001F0044 7F E3 FB 78 */ mr r3, r31 /* 801F3108 001F0048 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801F310C 001F004C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 801F3110 001F0050 A0 84 01 C2 */ lhz r4, 0x1c2(r4) -/* 801F3114 001F0054 4B E4 18 91 */ bl dSv_event_c_NS_offEventBit +/* 801F3114 001F0054 4B E4 18 91 */ bl offEventBit__11dSv_event_cFUs lbl_801F3118: /* 801F3118 001F0058 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 801F311C 001F005C 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index c074e9a224d..fdddd83ed9a 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -2370,7 +2370,7 @@ lbl_801F94AC: /* 801F94B0 001F63F0 7C 1D F8 2E */ lwzx r0, r29, r31 /* 801F94B4 001F63F4 54 00 08 3C */ slwi r0, r0, 1 /* 801F94B8 001F63F8 7C 9E 02 2E */ lhzx r4, r30, r0 -/* 801F94BC 001F63FC 4B E3 B5 01 */ bl dSv_event_c_NS_isEventBit +/* 801F94BC 001F63FC 4B E3 B5 01 */ bl isEventBit__11dSv_event_cCFUs /* 801F94C0 001F6400 2C 03 00 00 */ cmpwi r3, 0 /* 801F94C4 001F6404 41 82 00 10 */ beq lbl_801F94D4 /* 801F94C8 001F6408 57 63 06 3E */ clrlwi r3, r27, 0x18 diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 2025945e06d..963e01c7616 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -103,7 +103,7 @@ dMeterButton_c_NS__execute: /* 80201488 001FE3C8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8020148C 001FE3CC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80201490 001FE3D0 A0 84 00 62 */ lhz r4, 0x62(r4) -/* 80201494 001FE3D4 4B E3 35 29 */ bl dSv_event_c_NS_isEventBit +/* 80201494 001FE3D4 4B E3 35 29 */ bl isEventBit__11dSv_event_cCFUs /* 80201498 001FE3D8 2C 03 00 00 */ cmpwi r3, 0 /* 8020149C 001FE3DC 41 82 00 24 */ beq lbl_802014C0 /* 802014A0 001FE3E0 48 03 6D 8D */ bl dMsgObject_c_NS_getStatus diff --git a/asm/d/meter/d_meter_map.s b/asm/d/meter/d_meter_map.s index 69795ccc5a4..8d2d568648f 100644 --- a/asm/d/meter/d_meter_map.s +++ b/asm/d/meter/d_meter_map.s @@ -567,7 +567,7 @@ lbl_8020DC08: /* 8020DC24 0020AB64 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8020DC28 0020AB68 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8020DC2C 0020AB6C A0 84 00 EC */ lhz r4, 0xec(r4) -/* 8020DC30 0020AB70 4B E2 6D 8D */ bl dSv_event_c_NS_isEventBit +/* 8020DC30 0020AB70 4B E2 6D 8D */ bl isEventBit__11dSv_event_cCFUs /* 8020DC34 0020AB74 98 7F 00 2B */ stb r3, 0x2b(r31) /* 8020DC38 0020AB78 39 61 00 30 */ addi r11, r1, 0x30 /* 8020DC3C 0020AB7C 48 15 45 E5 */ bl _restgpr_27 @@ -639,7 +639,7 @@ dMeterMap_c_NS__move: /* 8020DD1C 0020AC5C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8020DD20 0020AC60 3B A4 72 88 */ addi r29, r4, lbl_803A7288@l /* 8020DD24 0020AC64 A0 9D 00 EC */ lhz r4, 0xec(r29) -/* 8020DD28 0020AC68 4B E2 6C 95 */ bl dSv_event_c_NS_isEventBit +/* 8020DD28 0020AC68 4B E2 6C 95 */ bl isEventBit__11dSv_event_cCFUs /* 8020DD2C 0020AC6C 2C 03 00 00 */ cmpwi r3, 0 /* 8020DD30 0020AC70 41 82 00 5C */ beq lbl_8020DD8C /* 8020DD34 0020AC74 3C 60 80 40 */ lis r3, lbl_804061C0@ha @@ -654,12 +654,12 @@ dMeterMap_c_NS__move: /* 8020DD58 0020AC98 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8020DD5C 0020AC9C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8020DD60 0020ACA0 A0 84 00 EE */ lhz r4, 0xee(r4) -/* 8020DD64 0020ACA4 4B E2 6C 29 */ bl dSv_event_c_NS_onEventBit +/* 8020DD64 0020ACA4 4B E2 6C 29 */ bl onEventBit__11dSv_event_cFUs /* 8020DD68 0020ACA8 48 00 00 24 */ b lbl_8020DD8C lbl_8020DD6C: /* 8020DD6C 0020ACAC 7F 83 E3 78 */ mr r3, r28 /* 8020DD70 0020ACB0 A0 9D 00 EC */ lhz r4, 0xec(r29) -/* 8020DD74 0020ACB4 4B E2 6C 49 */ bl dSv_event_c_NS_isEventBit +/* 8020DD74 0020ACB4 4B E2 6C 49 */ bl isEventBit__11dSv_event_cCFUs /* 8020DD78 0020ACB8 98 7E 00 2B */ stb r3, 0x2b(r30) /* 8020DD7C 0020ACBC 38 00 00 02 */ li r0, 2 /* 8020DD80 0020ACC0 3C 60 80 43 */ lis r3, lbl_80430188@ha diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index 4d6eb0a1488..63a1d3a2b00 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -11127,7 +11127,7 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: /* 80219B78 00216AB8 3B 83 07 F0 */ addi r28, r3, 0x7f0 /* 80219B7C 00216ABC 7F 83 E3 78 */ mr r3, r28 /* 80219B80 00216AC0 38 80 05 40 */ li r4, 0x540 -/* 80219B84 00216AC4 4B E1 AE 39 */ bl dSv_event_c_NS_isEventBit +/* 80219B84 00216AC4 4B E1 AE 39 */ bl isEventBit__11dSv_event_cCFUs /* 80219B88 00216AC8 2C 03 00 00 */ cmpwi r3, 0 /* 80219B8C 00216ACC 40 82 00 18 */ bne lbl_80219BA4 /* 80219B90 00216AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -11138,12 +11138,12 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: lbl_80219BA4: /* 80219BA4 00216AE4 7F 83 E3 78 */ mr r3, r28 /* 80219BA8 00216AE8 38 80 0C 10 */ li r4, 0xc10 -/* 80219BAC 00216AEC 4B E1 AE 11 */ bl dSv_event_c_NS_isEventBit +/* 80219BAC 00216AEC 4B E1 AE 11 */ bl isEventBit__11dSv_event_cCFUs /* 80219BB0 00216AF0 2C 03 00 00 */ cmpwi r3, 0 /* 80219BB4 00216AF4 41 82 00 18 */ beq lbl_80219BCC /* 80219BB8 00216AF8 7F 83 E3 78 */ mr r3, r28 /* 80219BBC 00216AFC 38 80 61 40 */ li r4, 0x6140 -/* 80219BC0 00216B00 4B E1 AD FD */ bl dSv_event_c_NS_isEventBit +/* 80219BC0 00216B00 4B E1 AD FD */ bl isEventBit__11dSv_event_cCFUs /* 80219BC4 00216B04 2C 03 00 00 */ cmpwi r3, 0 /* 80219BC8 00216B08 41 82 00 0C */ beq lbl_80219BD4 lbl_80219BCC: diff --git a/asm/d/meter2/d_meter2_info.s b/asm/d/meter2/d_meter2_info.s index fc33b5aedbb..97c71afb9d5 100644 --- a/asm/d/meter2/d_meter2_info.s +++ b/asm/d/meter2/d_meter2_info.s @@ -3007,7 +3007,7 @@ lbl_8021E784: /* 8021E7BC 0021B6FC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8021E7C0 0021B700 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8021E7C4 0021B704 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8021E7C8 0021B708 4B E1 61 F5 */ bl dSv_event_c_NS_isEventBit +/* 8021E7C8 0021B708 4B E1 61 F5 */ bl isEventBit__11dSv_event_cCFUs /* 8021E7CC 0021B70C 2C 03 00 00 */ cmpwi r3, 0 /* 8021E7D0 0021B710 41 82 00 08 */ beq lbl_8021E7D8 /* 8021E7D4 0021B714 3B 9C 00 01 */ addi r28, r28, 1 @@ -3057,7 +3057,7 @@ lbl_8021E834: /* 8021E870 0021B7B0 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8021E874 0021B7B4 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8021E878 0021B7B8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8021E87C 0021B7BC 4B E1 61 41 */ bl dSv_event_c_NS_isEventBit +/* 8021E87C 0021B7BC 4B E1 61 41 */ bl isEventBit__11dSv_event_cCFUs /* 8021E880 0021B7C0 2C 03 00 00 */ cmpwi r3, 0 /* 8021E884 0021B7C4 41 82 00 2C */ beq lbl_8021E8B0 /* 8021E888 0021B7C8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 @@ -3120,7 +3120,7 @@ lbl_8021E914: /* 8021E94C 0021B88C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8021E950 0021B890 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8021E954 0021B894 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8021E958 0021B898 4B E1 60 65 */ bl dSv_event_c_NS_isEventBit +/* 8021E958 0021B898 4B E1 60 65 */ bl isEventBit__11dSv_event_cCFUs /* 8021E95C 0021B89C 2C 03 00 00 */ cmpwi r3, 0 /* 8021E960 0021B8A0 41 82 00 44 */ beq lbl_8021E9A4 /* 8021E964 0021B8A4 7F 83 E3 78 */ mr r3, r28 diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 992f66b148c..37e8ae7ee26 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -2908,7 +2908,7 @@ lbl_8022ADE8: /* 8022AE48 00227D88 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8022AE4C 00227D8C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8022AE50 00227D90 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l -/* 8022AE54 00227D94 4B E0 9B B1 */ bl dSv_event_c_NS_getEventReg +/* 8022AE54 00227D94 4B E0 9B B1 */ bl getEventReg__11dSv_event_cCFUs /* 8022AE58 00227D98 7C 60 1B 78 */ mr r0, r3 /* 8022AE5C 00227D9C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE60 00227DA0 38 80 00 06 */ li r4, 6 @@ -3571,7 +3571,7 @@ lbl_8022B78C: /* 8022B7BC 002286FC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8022B7C0 00228700 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8022B7C4 00228704 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8022B7C8 00228708 4B E0 91 C5 */ bl dSv_event_c_NS_onEventBit +/* 8022B7C8 00228708 4B E0 91 C5 */ bl onEventBit__11dSv_event_cFUs lbl_8022B7CC: /* 8022B7CC 0022870C 80 7F 05 C0 */ lwz r3, 0x5c0(r31) /* 8022B7D0 00228710 48 00 A8 D1 */ bl dMsgObject_c_NS_talkStartInit @@ -4663,7 +4663,7 @@ lbl_8022C6A8: /* 8022C74C 0022968C 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8022C750 00229690 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8022C754 00229694 A0 84 00 A0 */ lhz r4, 0xa0(r4) -/* 8022C758 00229698 4B E0 82 35 */ bl dSv_event_c_NS_onEventBit +/* 8022C758 00229698 4B E0 82 35 */ bl onEventBit__11dSv_event_cFUs lbl_8022C75C: /* 8022C75C 0022969C 38 60 00 01 */ li r3, 1 /* 8022C760 002296A0 48 00 01 84 */ b lbl_8022C8E4 @@ -8975,7 +8975,7 @@ lbl_802305B8: /* 80230618 0022D558 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8023061C 0022D55C 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80230620 0022D560 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l -/* 80230624 0022D564 4B E0 43 E1 */ bl dSv_event_c_NS_getEventReg +/* 80230624 0022D564 4B E0 43 E1 */ bl getEventReg__11dSv_event_cCFUs /* 80230628 0022D568 7C 60 1B 78 */ mr r0, r3 /* 8023062C 0022D56C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230630 0022D570 38 80 00 06 */ li r4, 6 @@ -10334,7 +10334,7 @@ lbl_802319D0: /* 80231A30 0022E970 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80231A34 0022E974 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 80231A38 0022E978 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l -/* 80231A3C 0022E97C 4B E0 2F C9 */ bl dSv_event_c_NS_getEventReg +/* 80231A3C 0022E97C 4B E0 2F C9 */ bl getEventReg__11dSv_event_cCFUs /* 80231A40 0022E980 7C 60 1B 78 */ mr r0, r3 /* 80231A44 0022E984 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A48 0022E988 38 80 00 06 */ li r4, 6 diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 4884e12a90d..274201a3dab 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -1347,7 +1347,7 @@ dMsgFlow_c_NS_getParam_X2_: /* 8024B158 00248098 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8024B15C 0024809C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8024B160 002480A0 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024B164 002480A4 4B DE 98 59 */ bl dSv_event_c_NS_isEventBit +/* 8024B164 002480A4 4B DE 98 59 */ bl isEventBit__11dSv_event_cCFUs /* 8024B168 002480A8 7C 60 00 34 */ cntlzw r0, r3 /* 8024B16C 002480AC 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B170 002480B0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1600,7 +1600,7 @@ lbl_8024B3E8: /* 8024B524 00248464 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8024B528 00248468 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8024B52C 0024846C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024B530 00248470 4B DE 94 8D */ bl dSv_event_c_NS_isEventBit +/* 8024B530 00248470 4B DE 94 8D */ bl isEventBit__11dSv_event_cCFUs /* 8024B534 00248474 7C 60 00 34 */ cntlzw r0, r3 /* 8024B538 00248478 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B53C 0024847C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1989,7 +1989,7 @@ lbl_8024BAD8: /* 8024BAF4 00248A34 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BAF8 00248A38 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BAFC 00248A3C 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024BB00 00248A40 4B DE 8F 05 */ bl dSv_event_c_NS_getEventReg +/* 8024BB00 00248A40 4B DE 8F 05 */ bl getEventReg__11dSv_event_cCFUs /* 8024BB04 00248A44 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8024BB08 00248A48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024BB0C 00248A4C 7C 08 03 A6 */ mtlr r0 @@ -2005,7 +2005,7 @@ lbl_8024BAD8: /* 8024BB34 00248A74 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8024BB38 00248A78 3C 80 00 01 */ lis r4, 0x0000FF1F@ha /* 8024BB3C 00248A7C 38 84 FF 1F */ addi r4, r4, 0x0000FF1F@l -/* 8024BB40 00248A80 4B DE 8E C5 */ bl dSv_event_c_NS_getEventReg +/* 8024BB40 00248A80 4B DE 8E C5 */ bl getEventReg__11dSv_event_cCFUs /* 8024BB44 00248A84 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024BB48 00248A88 20 00 00 14 */ subfic r0, r0, 0x14 /* 8024BB4C 00248A8C 7F E0 02 78 */ xor r0, r31, r0 @@ -2134,7 +2134,7 @@ lbl_8024BD18: /* 8024BD20 00248C60 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BD24 00248C64 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BD28 00248C68 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024BD2C 00248C6C 4B DE 8C D9 */ bl dSv_event_c_NS_getEventReg +/* 8024BD2C 00248C6C 4B DE 8C D9 */ bl getEventReg__11dSv_event_cCFUs /* 8024BD30 00248C70 38 03 FF FF */ addi r0, r3, -1 /* 8024BD34 00248C74 54 04 06 3E */ clrlwi r4, r0, 0x18 lbl_8024BD38: @@ -2184,7 +2184,7 @@ lbl_8024BD94: /* 8024BDD0 00248D10 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BDD4 00248D14 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BDD8 00248D18 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024BDDC 00248D1C 4B DE 8C 29 */ bl dSv_event_c_NS_getEventReg +/* 8024BDDC 00248D1C 4B DE 8C 29 */ bl getEventReg__11dSv_event_cCFUs /* 8024BDE0 00248D20 7C 64 1B 78 */ mr r4, r3 /* 8024BDE4 00248D24 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024BDE8 00248D28 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2241,7 +2241,7 @@ lbl_8024BEA4: /* 8024BEAC 00248DEC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BEB0 00248DF0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BEB4 00248DF4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024BEB8 00248DF8 4B DE 8B 4D */ bl dSv_event_c_NS_getEventReg +/* 8024BEB8 00248DF8 4B DE 8B 4D */ bl getEventReg__11dSv_event_cCFUs /* 8024BEBC 00248DFC 38 03 FF FF */ addi r0, r3, -1 /* 8024BEC0 00248E00 54 1E 06 3E */ clrlwi r30, r0, 0x18 lbl_8024BEC4: @@ -2294,7 +2294,7 @@ lbl_8024BF34: /* 8024BF70 00248EB0 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024BF74 00248EB4 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024BF78 00248EB8 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024BF7C 00248EBC 4B DE 8A 89 */ bl dSv_event_c_NS_getEventReg +/* 8024BF7C 00248EBC 4B DE 8A 89 */ bl getEventReg__11dSv_event_cCFUs /* 8024BF80 00248EC0 7C 64 1B 78 */ mr r4, r3 /* 8024BF84 00248EC4 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024BF88 00248EC8 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2384,7 +2384,7 @@ lbl_8024C08C: /* 8024C0C8 00249008 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024C0CC 0024900C 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024C0D0 00249010 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024C0D4 00249014 4B DE 89 31 */ bl dSv_event_c_NS_getEventReg +/* 8024C0D4 00249014 4B DE 89 31 */ bl getEventReg__11dSv_event_cCFUs /* 8024C0D8 00249018 7C 64 1B 78 */ mr r4, r3 /* 8024C0DC 0024901C 3C 60 80 40 */ lis r3, lbl_804061C0@ha /* 8024C0E0 00249020 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l @@ -2624,7 +2624,7 @@ lbl_8024C3F4: /* 8024C438 00249378 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8024C43C 0024937C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8024C440 00249380 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C444 00249384 4B DE 85 49 */ bl dSv_event_c_NS_onEventBit +/* 8024C444 00249384 4B DE 85 49 */ bl onEventBit__11dSv_event_cFUs lbl_8024C448: /* 8024C448 00249388 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C44C 0024938C 28 00 00 00 */ cmplwi r0, 0 @@ -2636,7 +2636,7 @@ lbl_8024C448: /* 8024C464 002493A4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8024C468 002493A8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8024C46C 002493AC 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C470 002493B0 4B DE 85 1D */ bl dSv_event_c_NS_onEventBit +/* 8024C470 002493B0 4B DE 85 1D */ bl onEventBit__11dSv_event_cFUs lbl_8024C474: /* 8024C474 002493B4 38 60 00 01 */ li r3, 1 /* 8024C478 002493B8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2661,7 +2661,7 @@ lbl_8024C474: /* 8024C4C4 00249404 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8024C4C8 00249408 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8024C4CC 0024940C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C4D0 00249410 4B DE 84 D5 */ bl dSv_event_c_NS_offEventBit +/* 8024C4D0 00249410 4B DE 84 D5 */ bl offEventBit__11dSv_event_cFUs lbl_8024C4D4: /* 8024C4D4 00249414 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C4D8 00249418 28 00 00 00 */ cmplwi r0, 0 @@ -2673,7 +2673,7 @@ lbl_8024C4D4: /* 8024C4F0 00249430 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 8024C4F4 00249434 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 8024C4F8 00249438 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C4FC 0024943C 4B DE 84 A9 */ bl dSv_event_c_NS_offEventBit +/* 8024C4FC 0024943C 4B DE 84 A9 */ bl offEventBit__11dSv_event_cFUs lbl_8024C500: /* 8024C500 00249440 38 60 00 01 */ li r3, 1 /* 8024C504 00249444 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2850,7 +2850,7 @@ lbl_8024C730: /* 8024C7A8 002496E8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8024C7AC 002496EC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8024C7B0 002496F0 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C7B4 002496F4 4B DE 81 D9 */ bl dSv_event_c_NS_onEventBit +/* 8024C7B4 002496F4 4B DE 81 D9 */ bl onEventBit__11dSv_event_cFUs lbl_8024C7B8: /* 8024C7B8 002496F8 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C7BC 002496FC 28 00 00 00 */ cmplwi r0, 0 @@ -2862,7 +2862,7 @@ lbl_8024C7B8: /* 8024C7D4 00249714 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8024C7D8 00249718 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8024C7DC 0024971C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C7E0 00249720 4B DE 81 AD */ bl dSv_event_c_NS_onEventBit +/* 8024C7E0 00249720 4B DE 81 AD */ bl onEventBit__11dSv_event_cFUs lbl_8024C7E4: /* 8024C7E4 00249724 38 60 00 01 */ li r3, 1 /* 8024C7E8 00249728 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2887,7 +2887,7 @@ lbl_8024C7E4: /* 8024C834 00249774 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8024C838 00249778 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8024C83C 0024977C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C840 00249780 4B DE 81 65 */ bl dSv_event_c_NS_offEventBit +/* 8024C840 00249780 4B DE 81 65 */ bl offEventBit__11dSv_event_cFUs lbl_8024C844: /* 8024C844 00249784 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024C848 00249788 28 00 00 00 */ cmplwi r0, 0 @@ -2899,7 +2899,7 @@ lbl_8024C844: /* 8024C860 002497A0 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 8024C864 002497A4 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 8024C868 002497A8 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024C86C 002497AC 4B DE 81 39 */ bl dSv_event_c_NS_offEventBit +/* 8024C86C 002497AC 4B DE 81 39 */ bl offEventBit__11dSv_event_cFUs lbl_8024C870: /* 8024C870 002497B0 38 60 00 01 */ li r3, 1 /* 8024C874 002497B4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3388,7 +3388,7 @@ lbl_8024CF18: /* 8024CF78 00249EB8 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024CF7C 00249EBC 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 8024CF80 00249EC0 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024CF84 00249EC4 4B DE 7A 5D */ bl dSv_event_c_NS_setEventReg +/* 8024CF84 00249EC4 4B DE 7A 5D */ bl setEventReg__11dSv_event_cFUsUc /* 8024CF88 00249EC8 38 60 00 01 */ li r3, 1 /* 8024CF8C 00249ECC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024CF90 00249ED0 7C 08 03 A6 */ mtlr r0 @@ -3462,7 +3462,7 @@ lbl_8024D084: /* 8024D08C 00249FCC 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D090 00249FD0 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D094 00249FD4 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024D098 00249FD8 4B DE 79 6D */ bl dSv_event_c_NS_getEventReg +/* 8024D098 00249FD8 4B DE 79 6D */ bl getEventReg__11dSv_event_cCFUs /* 8024D09C 00249FDC 38 03 FF FF */ addi r0, r3, -1 /* 8024D0A0 00249FE0 54 1F 06 3E */ clrlwi r31, r0, 0x18 lbl_8024D0A4: @@ -3683,7 +3683,7 @@ lbl_8024D3A8: /* 8024D3E0 0024A320 38 63 0D D8 */ addi r3, r3, 0xdd8 /* 8024D3E4 0024A324 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 8024D3E8 0024A328 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 8024D3EC 0024A32C 4B DE 76 19 */ bl dSv_event_c_NS_getEventReg +/* 8024D3EC 0024A32C 4B DE 76 19 */ bl getEventReg__11dSv_event_cCFUs /* 8024D3F0 0024A330 38 03 FF FF */ addi r0, r3, -1 /* 8024D3F4 0024A334 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8024D3F8 0024A338 4B FE B0 75 */ bl dMsgObject_c_NS_setSelectCursorPos diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index a71c9289725..a5380ef10c5 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -3251,7 +3251,7 @@ dMsgObject_c_NS_inputProc: /* 80235940 00232880 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80235944 00232884 3B E4 90 C0 */ addi r31, r4, lbl_803790C0@l /* 80235948 00232888 A0 9F 00 A0 */ lhz r4, 0xa0(r31) -/* 8023594C 0023288C 4B DF F0 71 */ bl dSv_event_c_NS_isEventBit +/* 8023594C 0023288C 4B DF F0 71 */ bl isEventBit__11dSv_event_cCFUs /* 80235950 00232890 7C 7B 1B 78 */ mr r27, r3 /* 80235954 00232894 A8 1C 01 74 */ lha r0, 0x174(r28) /* 80235958 00232898 2C 00 00 00 */ cmpwi r0, 0 @@ -3262,7 +3262,7 @@ dMsgObject_c_NS_inputProc: /* 8023596C 002328AC 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80235970 002328B0 38 84 72 88 */ addi r4, r4, lbl_803A7288@l /* 80235974 002328B4 A0 84 06 44 */ lhz r4, 0x644(r4) -/* 80235978 002328B8 4B DF F0 45 */ bl dSv_event_c_NS_isEventBit +/* 80235978 002328B8 4B DF F0 45 */ bl isEventBit__11dSv_event_cCFUs /* 8023597C 002328BC 2C 03 00 00 */ cmpwi r3, 0 /* 80235980 002328C0 40 82 00 0C */ bne lbl_8023598C /* 80235984 002328C4 38 00 00 01 */ li r0, 1 @@ -3293,33 +3293,33 @@ lbl_8023598C: /* 802359E4 00232924 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 802359E8 00232928 3B E4 72 88 */ addi r31, r4, lbl_803A7288@l /* 802359EC 0023292C A0 9F 00 F8 */ lhz r4, 0xf8(r31) -/* 802359F0 00232930 4B DF EF CD */ bl dSv_event_c_NS_isEventBit +/* 802359F0 00232930 4B DF EF CD */ bl isEventBit__11dSv_event_cCFUs /* 802359F4 00232934 2C 03 00 00 */ cmpwi r3, 0 /* 802359F8 00232938 40 82 00 74 */ bne lbl_80235A6C /* 802359FC 0023293C 7F 63 DB 78 */ mr r3, r27 /* 80235A00 00232940 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 80235A04 00232944 3B A4 72 88 */ addi r29, r4, lbl_803A7288@l /* 80235A08 00232948 A0 9D 02 F0 */ lhz r4, 0x2f0(r29) -/* 80235A0C 0023294C 4B DF EF B1 */ bl dSv_event_c_NS_isEventBit +/* 80235A0C 0023294C 4B DF EF B1 */ bl isEventBit__11dSv_event_cCFUs /* 80235A10 00232950 2C 03 00 00 */ cmpwi r3, 0 /* 80235A14 00232954 40 82 00 1C */ bne lbl_80235A30 /* 80235A18 00232958 7F 63 DB 78 */ mr r3, r27 /* 80235A1C 0023295C A0 9D 02 F0 */ lhz r4, 0x2f0(r29) -/* 80235A20 00232960 4B DF EF 6D */ bl dSv_event_c_NS_onEventBit +/* 80235A20 00232960 4B DF EF 6D */ bl onEventBit__11dSv_event_cFUs /* 80235A24 00232964 38 60 00 00 */ li r3, 0 /* 80235A28 00232968 48 00 2F 69 */ bl dMsgObject_setFundRaising /* 80235A2C 0023296C 48 00 00 40 */ b lbl_80235A6C lbl_80235A30: /* 80235A30 00232970 7F 63 DB 78 */ mr r3, r27 /* 80235A34 00232974 A0 9F 00 F8 */ lhz r4, 0xf8(r31) -/* 80235A38 00232978 4B DF EF 55 */ bl dSv_event_c_NS_onEventBit +/* 80235A38 00232978 4B DF EF 55 */ bl onEventBit__11dSv_event_cFUs /* 80235A3C 0023297C 38 60 00 00 */ li r3, 0 /* 80235A40 00232980 48 00 2F 51 */ bl dMsgObject_setFundRaising /* 80235A44 00232984 48 00 00 28 */ b lbl_80235A6C lbl_80235A48: /* 80235A48 00232988 7F A3 EB 78 */ mr r3, r29 /* 80235A4C 0023298C A0 9F 00 A0 */ lhz r4, 0xa0(r31) -/* 80235A50 00232990 4B DF EF 55 */ bl dSv_event_c_NS_offEventBit +/* 80235A50 00232990 4B DF EF 55 */ bl offEventBit__11dSv_event_cFUs /* 80235A54 00232994 48 00 00 18 */ b lbl_80235A6C lbl_80235A58: /* 80235A58 00232998 48 00 2E 3D */ bl dMsgObject_addTotalPayment @@ -3345,7 +3345,7 @@ lbl_80235A84: /* 80235A98 002329D8 3C 80 80 38 */ lis r4, lbl_803790C0@ha /* 80235A9C 002329DC 38 84 90 C0 */ addi r4, r4, lbl_803790C0@l /* 80235AA0 002329E0 A0 84 00 A0 */ lhz r4, 0xa0(r4) -/* 80235AA4 002329E4 4B DF EF 01 */ bl dSv_event_c_NS_offEventBit +/* 80235AA4 002329E4 4B DF EF 01 */ bl offEventBit__11dSv_event_cFUs /* 80235AA8 002329E8 38 00 00 00 */ li r0, 0 /* 80235AAC 002329EC 98 1E 00 BD */ stb r0, 0xbd(r30) /* 80235AB0 002329F0 7F 83 E3 78 */ mr r3, r28 @@ -6663,12 +6663,12 @@ dMsgObject_getTotalPrice: /* 80238680 002355C0 7F C3 F3 78 */ mr r3, r30 /* 80238684 002355C4 3C 80 00 01 */ lis r4, 0x0000FEFF@ha /* 80238688 002355C8 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l -/* 8023868C 002355CC 4B DF C3 79 */ bl dSv_event_c_NS_getEventReg +/* 8023868C 002355CC 4B DF C3 79 */ bl getEventReg__11dSv_event_cCFUs /* 80238690 002355D0 7C 7F 1B 78 */ mr r31, r3 /* 80238694 002355D4 7F C3 F3 78 */ mr r3, r30 /* 80238698 002355D8 3C 80 00 01 */ lis r4, 0x0000FDFF@ha /* 8023869C 002355DC 38 84 FD FF */ addi r4, r4, 0x0000FDFF@l -/* 802386A0 002355E0 4B DF C3 65 */ bl dSv_event_c_NS_getEventReg +/* 802386A0 002355E0 4B DF C3 65 */ bl getEventReg__11dSv_event_cCFUs /* 802386A4 002355E4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802386A8 002355E8 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 /* 802386AC 002355EC 54 03 04 3E */ clrlwi r3, r0, 0x10 @@ -6692,12 +6692,12 @@ dMsgObject_getTotalPrice: /* 802386F4 00235634 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l /* 802386F8 00235638 54 1F 04 3E */ clrlwi r31, r0, 0x10 /* 802386FC 0023563C 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238700 00235640 4B DF C2 E1 */ bl dSv_event_c_NS_setEventReg +/* 80238700 00235640 4B DF C2 E1 */ bl setEventReg__11dSv_event_cFUsUc /* 80238704 00235644 7F C3 F3 78 */ mr r3, r30 /* 80238708 00235648 3C 80 00 01 */ lis r4, 0x0000FDFF@ha /* 8023870C 0023564C 38 84 FD FF */ addi r4, r4, 0x0000FDFF@l /* 80238710 00235650 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238714 00235654 4B DF C2 CD */ bl dSv_event_c_NS_setEventReg +/* 80238714 00235654 4B DF C2 CD */ bl setEventReg__11dSv_event_cFUsUc /* 80238718 00235658 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023871C 0023565C 83 C1 00 08 */ lwz r30, 8(r1) /* 80238720 00235660 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6730,12 +6730,12 @@ lbl_80238774: /* 80238788 002356C8 38 84 FE FF */ addi r4, r4, 0x0000FEFF@l /* 8023878C 002356CC 57 BF 04 3E */ clrlwi r31, r29, 0x10 /* 80238790 002356D0 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 80238794 002356D4 4B DF C2 4D */ bl dSv_event_c_NS_setEventReg +/* 80238794 002356D4 4B DF C2 4D */ bl setEventReg__11dSv_event_cFUsUc /* 80238798 002356D8 7F C3 F3 78 */ mr r3, r30 /* 8023879C 002356DC 3C 80 00 01 */ lis r4, 0x0000FDFF@ha /* 802387A0 002356E0 38 84 FD FF */ addi r4, r4, 0x0000FDFF@l /* 802387A4 002356E4 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 802387A8 002356E8 4B DF C2 39 */ bl dSv_event_c_NS_setEventReg +/* 802387A8 002356E8 4B DF C2 39 */ bl setEventReg__11dSv_event_cFUsUc /* 802387AC 002356EC 39 61 00 20 */ addi r11, r1, 0x20 /* 802387B0 002356F0 48 12 9A 79 */ bl _restgpr_29 /* 802387B4 002356F4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6756,12 +6756,12 @@ dMsgObject_getTotalPayment: /* 802387E4 00235724 7F C3 F3 78 */ mr r3, r30 /* 802387E8 00235728 3C 80 00 01 */ lis r4, 0x0000FCFF@ha /* 802387EC 0023572C 38 84 FC FF */ addi r4, r4, 0x0000FCFF@l -/* 802387F0 00235730 4B DF C2 15 */ bl dSv_event_c_NS_getEventReg +/* 802387F0 00235730 4B DF C2 15 */ bl getEventReg__11dSv_event_cCFUs /* 802387F4 00235734 7C 7F 1B 78 */ mr r31, r3 /* 802387F8 00235738 7F C3 F3 78 */ mr r3, r30 /* 802387FC 0023573C 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 80238800 00235740 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l -/* 80238804 00235744 4B DF C2 01 */ bl dSv_event_c_NS_getEventReg +/* 80238804 00235744 4B DF C2 01 */ bl getEventReg__11dSv_event_cCFUs /* 80238808 00235748 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8023880C 0023574C 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 /* 80238810 00235750 54 03 04 3E */ clrlwi r3, r0, 0x10 @@ -6785,12 +6785,12 @@ dMsgObject_getTotalPayment: /* 80238858 00235798 38 84 FC FF */ addi r4, r4, 0x0000FCFF@l /* 8023885C 0023579C 54 1F 04 3E */ clrlwi r31, r0, 0x10 /* 80238860 002357A0 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238864 002357A4 4B DF C1 7D */ bl dSv_event_c_NS_setEventReg +/* 80238864 002357A4 4B DF C1 7D */ bl setEventReg__11dSv_event_cFUsUc /* 80238868 002357A8 7F C3 F3 78 */ mr r3, r30 /* 8023886C 002357AC 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 80238870 002357B0 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 80238874 002357B4 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238878 002357B8 4B DF C1 69 */ bl dSv_event_c_NS_setEventReg +/* 80238878 002357B8 4B DF C1 69 */ bl setEventReg__11dSv_event_cFUsUc /* 8023887C 002357BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80238880 002357C0 83 C1 00 08 */ lwz r30, 8(r1) /* 80238884 002357C4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6826,12 +6826,12 @@ lbl_802388D8: /* 802388EC 0023582C 38 84 FC FF */ addi r4, r4, 0x0000FCFF@l /* 802388F0 00235830 57 BF 04 3E */ clrlwi r31, r29, 0x10 /* 802388F4 00235834 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 802388F8 00235838 4B DF C0 E9 */ bl dSv_event_c_NS_setEventReg +/* 802388F8 00235838 4B DF C0 E9 */ bl setEventReg__11dSv_event_cFUsUc /* 802388FC 0023583C 7F C3 F3 78 */ mr r3, r30 /* 80238900 00235840 3C 80 00 01 */ lis r4, 0x0000FBFF@ha /* 80238904 00235844 38 84 FB FF */ addi r4, r4, 0x0000FBFF@l /* 80238908 00235848 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8023890C 0023584C 4B DF C0 D5 */ bl dSv_event_c_NS_setEventReg +/* 8023890C 0023584C 4B DF C0 D5 */ bl setEventReg__11dSv_event_cFUsUc /* 80238910 00235850 39 61 00 20 */ addi r11, r1, 0x20 /* 80238914 00235854 48 12 99 15 */ bl _restgpr_29 /* 80238918 00235858 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6852,12 +6852,12 @@ dMsgObject_getFundRaising: /* 80238948 00235888 7F C3 F3 78 */ mr r3, r30 /* 8023894C 0023588C 3C 80 00 01 */ lis r4, 0x0000F9FF@ha /* 80238950 00235890 38 84 F9 FF */ addi r4, r4, 0x0000F9FF@l -/* 80238954 00235894 4B DF C0 B1 */ bl dSv_event_c_NS_getEventReg +/* 80238954 00235894 4B DF C0 B1 */ bl getEventReg__11dSv_event_cCFUs /* 80238958 00235898 7C 7F 1B 78 */ mr r31, r3 /* 8023895C 0023589C 7F C3 F3 78 */ mr r3, r30 /* 80238960 002358A0 3C 80 00 01 */ lis r4, 0x0000FAFF@ha /* 80238964 002358A4 38 84 FA FF */ addi r4, r4, 0x0000FAFF@l -/* 80238968 002358A8 4B DF C0 9D */ bl dSv_event_c_NS_getEventReg +/* 80238968 002358A8 4B DF C0 9D */ bl getEventReg__11dSv_event_cCFUs /* 8023896C 002358AC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80238970 002358B0 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 /* 80238974 002358B4 54 03 04 3E */ clrlwi r3, r0, 0x10 @@ -6884,12 +6884,12 @@ dMsgObject_setFundRaising: /* 802389BC 002358FC 38 84 F9 FF */ addi r4, r4, 0x0000F9FF@l /* 802389C0 00235900 54 1F 04 3E */ clrlwi r31, r0, 0x10 /* 802389C4 00235904 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 802389C8 00235908 4B DF C0 19 */ bl dSv_event_c_NS_setEventReg +/* 802389C8 00235908 4B DF C0 19 */ bl setEventReg__11dSv_event_cFUsUc /* 802389CC 0023590C 7F C3 F3 78 */ mr r3, r30 /* 802389D0 00235910 3C 80 00 01 */ lis r4, 0x0000FAFF@ha /* 802389D4 00235914 38 84 FA FF */ addi r4, r4, 0x0000FAFF@l /* 802389D8 00235918 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 802389DC 0023591C 4B DF C0 05 */ bl dSv_event_c_NS_setEventReg +/* 802389DC 0023591C 4B DF C0 05 */ bl setEventReg__11dSv_event_cFUsUc /* 802389E0 00235920 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802389E4 00235924 83 C1 00 08 */ lwz r30, 8(r1) /* 802389E8 00235928 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6919,12 +6919,12 @@ lbl_80238A24: /* 80238A38 00235978 38 84 F9 FF */ addi r4, r4, 0x0000F9FF@l /* 80238A3C 0023597C 57 BF 04 3E */ clrlwi r31, r29, 0x10 /* 80238A40 00235980 57 A5 C6 3E */ rlwinm r5, r29, 0x18, 0x18, 0x1f -/* 80238A44 00235984 4B DF BF 9D */ bl dSv_event_c_NS_setEventReg +/* 80238A44 00235984 4B DF BF 9D */ bl setEventReg__11dSv_event_cFUsUc /* 80238A48 00235988 7F C3 F3 78 */ mr r3, r30 /* 80238A4C 0023598C 3C 80 00 01 */ lis r4, 0x0000FAFF@ha /* 80238A50 00235990 38 84 FA FF */ addi r4, r4, 0x0000FAFF@l /* 80238A54 00235994 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238A58 00235998 4B DF BF 89 */ bl dSv_event_c_NS_setEventReg +/* 80238A58 00235998 4B DF BF 89 */ bl setEventReg__11dSv_event_cFUsUc /* 80238A5C 0023599C 39 61 00 20 */ addi r11, r1, 0x20 /* 80238A60 002359A0 48 12 97 C9 */ bl _restgpr_29 /* 80238A64 002359A4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6945,12 +6945,12 @@ dMsgObject_getOffering: /* 80238A94 002359D4 7F C3 F3 78 */ mr r3, r30 /* 80238A98 002359D8 3C 80 00 01 */ lis r4, 0x0000F7FF@ha /* 80238A9C 002359DC 38 84 F7 FF */ addi r4, r4, 0x0000F7FF@l -/* 80238AA0 002359E0 4B DF BF 65 */ bl dSv_event_c_NS_getEventReg +/* 80238AA0 002359E0 4B DF BF 65 */ bl getEventReg__11dSv_event_cCFUs /* 80238AA4 002359E4 7C 7F 1B 78 */ mr r31, r3 /* 80238AA8 002359E8 7F C3 F3 78 */ mr r3, r30 /* 80238AAC 002359EC 3C 80 00 01 */ lis r4, 0x0000F8FF@ha /* 80238AB0 002359F0 38 84 F8 FF */ addi r4, r4, 0x0000F8FF@l -/* 80238AB4 002359F4 4B DF BF 51 */ bl dSv_event_c_NS_getEventReg +/* 80238AB4 002359F4 4B DF BF 51 */ bl getEventReg__11dSv_event_cCFUs /* 80238AB8 002359F8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80238ABC 002359FC 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 /* 80238AC0 00235A00 54 03 04 3E */ clrlwi r3, r0, 0x10 @@ -6983,12 +6983,12 @@ lbl_80238B08: /* 80238B1C 00235A5C 38 84 F7 FF */ addi r4, r4, 0x0000F7FF@l /* 80238B20 00235A60 54 1F 04 3E */ clrlwi r31, r0, 0x10 /* 80238B24 00235A64 54 05 C6 3E */ rlwinm r5, r0, 0x18, 0x18, 0x1f -/* 80238B28 00235A68 4B DF BE B9 */ bl dSv_event_c_NS_setEventReg +/* 80238B28 00235A68 4B DF BE B9 */ bl setEventReg__11dSv_event_cFUsUc /* 80238B2C 00235A6C 7F C3 F3 78 */ mr r3, r30 /* 80238B30 00235A70 3C 80 00 01 */ lis r4, 0x0000F8FF@ha /* 80238B34 00235A74 38 84 F8 FF */ addi r4, r4, 0x0000F8FF@l /* 80238B38 00235A78 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80238B3C 00235A7C 4B DF BE A5 */ bl dSv_event_c_NS_setEventReg +/* 80238B3C 00235A7C 4B DF BE A5 */ bl setEventReg__11dSv_event_cFUsUc /* 80238B40 00235A80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80238B44 00235A84 83 C1 00 08 */ lwz r30, 8(r1) /* 80238B48 00235A88 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 13db5761991..d4fd2e9c9c0 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -1433,7 +1433,7 @@ lbl_8025A788: /* 8025A8C0 00257800 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8025A8C4 00257804 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8025A8C8 00257808 38 80 06 01 */ li r4, 0x601 -/* 8025A8CC 0025780C 4B DD A0 C1 */ bl dSv_event_c_NS_onEventBit +/* 8025A8CC 0025780C 4B DD A0 C1 */ bl onEventBit__11dSv_event_cFUs lbl_8025A8D0: /* 8025A8D0 00257810 4B DE 52 A1 */ bl dMpath_c_NS_create /* 8025A8D4 00257814 4B E4 13 45 */ bl dTres_c_NS_create diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index 654669b420f..98961dd5b65 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -550,7 +550,7 @@ dSvBit_HIO_c_NS_init: /* 8025C270 002591B0 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 8025C274 002591B4 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8025C278 002591B8 38 80 0D 04 */ li r4, 0xd04 -/* 8025C27C 002591BC 4B DD 87 41 */ bl dSv_event_c_NS_isEventBit +/* 8025C27C 002591BC 4B DD 87 41 */ bl isEventBit__11dSv_event_cCFUs /* 8025C280 002591C0 98 7F 04 9D */ stb r3, 0x49d(r31) /* 8025C284 002591C4 98 7F 04 9C */ stb r3, 0x49c(r31) /* 8025C288 002591C8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/func_80032AF8.s b/include/func_80032AF8.s index 092714e4bc5..b7aacb506bc 100644 --- a/include/func_80032AF8.s +++ b/include/func_80032AF8.s @@ -7,7 +7,7 @@ /* 80032B10 0002FA50 38 63 61 C0 */ addi r3, r3, lbl_804061C0@l /* 80032B14 0002FA54 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 80032B18 0002FA58 38 80 23 04 */ li r4, 0x2304 -/* 80032B1C 0002FA5C 48 00 1E A1 */ bl dSv_event_c_NS_isEventBit +/* 80032B1C 0002FA5C 48 00 1E A1 */ bl isEventBit__11dSv_event_cCFUs /* 80032B20 0002FA60 48 00 00 20 */ b lbl_80032B40 lbl_80032B24: /* 80032B24 0002FA64 88 63 00 1C */ lbz r3, 0x1c(r3) diff --git a/include/func_80033754.s b/include/func_80033754.s index f146951d9a5..5bfe70dabf3 100644 --- a/include/func_80033754.s +++ b/include/func_80033754.s @@ -21,7 +21,7 @@ lbl_80033788: /* 800337A0 000306E0 7F 83 E3 78 */ mr r3, r28 /* 800337A4 000306E4 7C 9E FA 14 */ add r4, r30, r31 /* 800337A8 000306E8 A0 84 03 22 */ lhz r4, 0x322(r4) -/* 800337AC 000306EC 48 00 12 11 */ bl dSv_event_c_NS_isEventBit +/* 800337AC 000306EC 48 00 12 11 */ bl isEventBit__11dSv_event_cCFUs /* 800337B0 000306F0 2C 03 00 00 */ cmpwi r3, 0 /* 800337B4 000306F4 40 82 00 0C */ bne lbl_800337C0 /* 800337B8 000306F8 38 60 00 01 */ li r3, 1 diff --git a/include/func_8003498C.s b/include/func_8003498C.s new file mode 100644 index 00000000000..63a40c2b1d8 --- /dev/null +++ b/include/func_8003498C.s @@ -0,0 +1,6 @@ +/* 8003498C 000318CC 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f +/* 80034990 000318D0 7C A3 30 AE */ lbzx r5, r3, r6 +/* 80034994 000318D4 54 80 06 3E */ clrlwi r0, r4, 0x18 +/* 80034998 000318D8 7C A0 03 78 */ or r0, r5, r0 +/* 8003499C 000318DC 7C 03 31 AE */ stbx r0, r3, r6 +/* 800349A0 000318E0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_800349A4.s b/include/func_800349A4.s new file mode 100644 index 00000000000..33ee8713535 --- /dev/null +++ b/include/func_800349A4.s @@ -0,0 +1,6 @@ +/* 800349A4 000318E4 54 86 C6 3E */ rlwinm r6, r4, 0x18, 0x18, 0x1f +/* 800349A8 000318E8 7C A3 30 AE */ lbzx r5, r3, r6 +/* 800349AC 000318EC 54 80 06 3E */ clrlwi r0, r4, 0x18 +/* 800349B0 000318F0 7C A0 00 78 */ andc r0, r5, r0 +/* 800349B4 000318F4 7C 03 31 AE */ stbx r0, r3, r6 +/* 800349B8 000318F8 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_800349BC.s b/include/func_800349BC.s new file mode 100644 index 00000000000..fae43a2c821 --- /dev/null +++ b/include/func_800349BC.s @@ -0,0 +1,10 @@ +/* 800349BC 000318FC 54 85 06 3E */ clrlwi r5, r4, 0x18 +/* 800349C0 00031900 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f +/* 800349C4 00031904 7C 03 00 AE */ lbzx r0, r3, r0 +/* 800349C8 00031908 7C A0 00 39 */ and. r0, r5, r0 +/* 800349CC 0003190C 41 82 00 0C */ beq lbl_800349D8 +/* 800349D0 00031910 38 60 00 01 */ li r3, 1 +/* 800349D4 00031914 4E 80 00 20 */ blr +lbl_800349D8: +/* 800349D8 00031918 38 60 00 00 */ li r3, 0 +/* 800349DC 0003191C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80034AA4.s b/include/func_80034AA4.s new file mode 100644 index 00000000000..aa3c2c7947b --- /dev/null +++ b/include/func_80034AA4.s @@ -0,0 +1,9 @@ +/* 80034AA4 000319E4 7C 80 2E 70 */ srawi r0, r4, 5 +/* 80034AA8 000319E8 54 07 10 3A */ slwi r7, r0, 2 +/* 80034AAC 000319EC 7C C3 38 2E */ lwzx r6, r3, r7 +/* 80034AB0 000319F0 38 A0 00 01 */ li r5, 1 +/* 80034AB4 000319F4 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034AB8 000319F8 7C A0 00 30 */ slw r0, r5, r0 +/* 80034ABC 000319FC 7C C0 03 78 */ or r0, r6, r0 +/* 80034AC0 00031A00 7C 03 39 2E */ stwx r0, r3, r7 +/* 80034AC4 00031A04 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80034AC8.s b/include/func_80034AC8.s new file mode 100644 index 00000000000..b1aee300af2 --- /dev/null +++ b/include/func_80034AC8.s @@ -0,0 +1,9 @@ +/* 80034AC8 00031A08 7C 80 2E 70 */ srawi r0, r4, 5 +/* 80034ACC 00031A0C 54 07 10 3A */ slwi r7, r0, 2 +/* 80034AD0 00031A10 7C C3 38 2E */ lwzx r6, r3, r7 +/* 80034AD4 00031A14 38 A0 00 01 */ li r5, 1 +/* 80034AD8 00031A18 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034ADC 00031A1C 7C A0 00 30 */ slw r0, r5, r0 +/* 80034AE0 00031A20 7C C0 00 78 */ andc r0, r6, r0 +/* 80034AE4 00031A24 7C 03 39 2E */ stwx r0, r3, r7 +/* 80034AE8 00031A28 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/func_80034AEC.s b/include/func_80034AEC.s new file mode 100644 index 00000000000..c25232fe95d --- /dev/null +++ b/include/func_80034AEC.s @@ -0,0 +1,10 @@ +/* 80034AEC 00031A2C 38 A0 00 01 */ li r5, 1 +/* 80034AF0 00031A30 54 80 06 FE */ clrlwi r0, r4, 0x1b +/* 80034AF4 00031A34 7C A5 00 30 */ slw r5, r5, r0 +/* 80034AF8 00031A38 7C 80 2E 70 */ srawi r0, r4, 5 +/* 80034AFC 00031A3C 54 00 10 3A */ slwi r0, r0, 2 +/* 80034B00 00031A40 7C 03 00 2E */ lwzx r0, r3, r0 +/* 80034B04 00031A44 7C A3 00 38 */ and r3, r5, r0 +/* 80034B08 00031A48 30 03 FF FF */ addic r0, r3, -1 +/* 80034B0C 00031A4C 7C 60 19 10 */ subfe r3, r0, r3 +/* 80034B10 00031A50 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index dc7b9055f7a..3b4e3d27320 100644 --- a/include/functions.h +++ b/include/functions.h @@ -6,7 +6,7 @@ extern "C" { void init__20dSv_player_collect_cFv(void); void dComIfGp_setSelectItem(int); void OSReport_Error(void); - void dSv_event_c_NS_isEventBit(void); + void isEventBit__11dSv_event_cCFUs(void); void dComIfGs_setMixItemIndex(void); void dComIfGs_setSelectItemIndex(void); void dComIfGs_getMixItemIndex(void); @@ -39,4 +39,5 @@ extern "C" { u32 OSGetSoundMode(void); void Z2AudioMgr_NS_setOutputMode(u32,unsigned long); void dComIfG_play_c_NS_getNowVibration(void); + void setInitEventBit(void); } \ No newline at end of file diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index f656c26ac69..beb29ca9dbf 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -795,7 +795,7 @@ asm bool dSv_letter_info_c::isLetterGetFlag(int param_1) const { #ifdef NONMATCHING void dSv_letter_info_c::onLetterReadFlag(int param_1) { - (this->letter_read_flags + (param_1 >> 0x5))[0x2] = (this->letter_read_flags + (param_1 >> 0x5))[0x2] | 0x1 << (u8)(param_1); + (this->letter_read_flags + (param_1 >> 0x5))[0x2] |= 0x1 << (u8)(param_1); } #else asm void dSv_letter_info_c::onLetterReadFlag(int param_1) { @@ -1009,6 +1009,7 @@ asm void dSv_memBit_c::onItem(int) { nofralloc #include "func_800348C4.s" } + asm bool dSv_memBit_c::isItem(int) const { nofralloc #include "func_800348EC.s" @@ -1020,4 +1021,100 @@ void dSv_memBit_c::onDungeonItem(int param_1) { bool dSv_memBit_c::isDungeonItem(int param_1) const { return this->dungeons_flags & (u8)(1 << param_1) ? true : false; -} \ No newline at end of file +} + +void dSv_event_c::init(void) { + for (int i = 0; i < 256; i++) { + this->events[i] = 0; + } + setInitEventBit(); +} + +void dSv_event_c::onEventBit(u16 param_1) { + this->events[(param_1 >> 8)] |= (u8)param_1; +} + +void dSv_event_c::offEventBit(u16 param_1) { + this->events[(param_1 >> 8)] &= ~(u8)param_1; +} + +// close +#ifdef NONMATCHING +bool dSv_event_c::isEventBit(u16 param_1) const { + return this->events[(param_1 >> 8)] & param_1 ? true : false; +} +#else +asm bool dSv_event_c::isEventBit(u16 param_1) const { + nofralloc + #include "func_800349BC.s" +} +#endif + +void dSv_event_c::setEventReg(u16 param_1, u8 param_2) { + u8 uVar1 = (param_1 >> 8); + this->events[uVar1] &= ~(u8)param_1; + this->events[uVar1] |= param_2; +} + +u8 dSv_event_c::getEventReg(u16 param_1) const { + return (u8)param_1 & this->events[param_1 >> 8]; +} + +void dSv_MiniGame_c::init(void) { + this->unk0 = 0; + for (int i = 0; i < 3; i++) { + this->unk1[i] = 0; + } + this->unk4 = 120000; + this->unk8 = 0; + this->unk12 = 0; + this->unk16 = 0; + this->unk20 = 0; +} + +void dSv_memory_c::init(void) { + temp_flags.init(); +} + +void dSv_memory2_c::init(void) { + for (int i = 0; i < 2; i++) { + this->unk0[i] = 0; + } +} + +// 1 instruction off +#ifdef NONMATCHING +void dSv_memory2_c::onVisitedRoom(int param_1) { + u8 test = param_1 >> 5 + this->unk0[test] |= 1 << (u8)param_1; +} +#else +asm void dSv_memory2_c::onVisitedRoom(int param_1) { + nofralloc + #include "func_80034AA4.s" +} +#endif + +// 1 instruction off +#ifdef NONMATCHING +void dSv_memory2_c::offVisitedRoom(int param_1) { + this->unk0[param_1 >> 5] &= ~(1 << (u8)param_1); +} +#else +asm void dSv_memory2_c::offVisitedRoom(int param_1) { + nofralloc + #include "func_80034AC8.s" +} +#endif + +// 1 instruction off +#ifdef NONMATCHING +bool dSv_memory2_c::isVisitedRoom(int param_1) { + return (1 << (u8)param_1 & this->unk0[param_1 >> 5]) ? true : false; +} +#else +asm bool dSv_memory2_c::isVisitedRoom(int param_1) { + nofralloc + #include "func_80034AEC.s" +} +#endif \ No newline at end of file