encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

dSv_memory_c::init ok, dSv_memory2_c::init ok, some dSv_event_c::offEventBit ok

Browse Source
This commit is contained in:
unknown
2020-11-26 23:55:28 -05:00
parent b0ffcd3878
commit c1f0b47a93
45 changed files with 477 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/Z2AudioLib/Z2EnvSeMgr.s
+2 -2
View File
@@ -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:
asm/Z2AudioLib/Z2LinkMgr.s
+1 -1
View File
@@ -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)
asm/Z2AudioLib/Z2SceneMgr.s
+1 -1
View File
@@ -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
asm/d/a/d_a_alink.s
+40 -40
View File
@@ -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
asm/d/a/d_a_npc.s
+11 -11
View File
@@ -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
asm/d/com/d_com_static.s
+10 -10
View File
@@ -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
asm/d/com/inf/d_com_inf_game.s
+90 -90
View File
File diff suppressed because it is too large Load Diff
asm/d/d_camera.s
+1 -1
View File
@@ -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
asm/d/d_event.s
+10 -10
View File
@@ -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
asm/d/d_gameover.s
+3 -3
View File
@@ -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
asm/d/d_insect.s
+1 -1
View File
@@ -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)
asm/d/d_item.s
+1 -1
View File
@@ -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
asm/d/d_kankyo.s
+2 -2
View File
@@ -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
asm/d/d_map.s
+1 -1
View File
@@ -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
asm/d/d_meter2.s
+2 -2
View File
@@ -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
asm/d/d_save.s
+13 -165
View File
@@ -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
asm/d/event/d_event_data.s
+10 -10
View File
@@ -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
asm/d/file/d_file_select.s
+3 -3
View File
@@ -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
asm/d/map/path/d_map_path_fmap.s
+4 -4
View File
@@ -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
asm/d/menu/d_menu_collect.s
+12 -12
View File
@@ -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

Some files were not shown because too many files have changed in this diff Show More