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

M_do_controller_pad split and partially matched (#36)

Browse Source 
* m_Do_controller_pad split

* Attempt to match and match mDoCPd_c::recalibrate

* Fix Merge Errors

* clang-format

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
jdflyer
2021-01-02 02:02:19 -05:00
committed by GitHub
co-authored by Pheenoh
parent 69faf591d4
commit e42d44e6cb
70 changed files with 1604 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/JUtility/JUTException.s
+5 -5
View File
@@ -1353,16 +1353,16 @@ lbl_802E2F88:
/* 802E2FDC 002DFF1C 40 82 03 A4 */ bne lbl_802E3380
/* 802E2FE0 002DFF20 38 61 02 C8 */ addi r3, r1, 0x2c8
/* 802E2FE4 002DFF24 38 80 00 00 */ li r4, 0
/* 802E2FE8 002DFF28 4B FF D6 F5 */ bl __ct__10JUTGamePadFUl
/* 802E2FE8 002DFF28 4B FF D6 F5 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E2FEC 002DFF2C 38 61 02 18 */ addi r3, r1, 0x218
/* 802E2FF0 002DFF30 38 80 00 01 */ li r4, 1
/* 802E2FF4 002DFF34 4B FF D6 E9 */ bl __ct__10JUTGamePadFUl
/* 802E2FF4 002DFF34 4B FF D6 E9 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E2FF8 002DFF38 38 61 01 68 */ addi r3, r1, 0x168
/* 802E2FFC 002DFF3C 38 80 00 02 */ li r4, 2
/* 802E3000 002DFF40 4B FF D6 DD */ bl __ct__10JUTGamePadFUl
/* 802E3000 002DFF40 4B FF D6 DD */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3004 002DFF44 38 61 00 B8 */ addi r3, r1, 0xb8
/* 802E3008 002DFF48 38 80 00 03 */ li r4, 3
/* 802E300C 002DFF4C 4B FF D6 D1 */ bl __ct__10JUTGamePadFUl
/* 802E300C 002DFF4C 4B FF D6 D1 */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3010 002DFF50 4B FF D8 D5 */ bl read__10JUTGamePadFv
/* 802E3014 002DFF54 38 60 00 00 */ li r3, 0
/* 802E3018 002DFF58 A8 01 03 44 */ lha r0, 0x344(r1)
@@ -1614,7 +1614,7 @@ lbl_802E3380:
/* 802E3384 002E02C4 2C 04 00 00 */ cmpwi r4, 0
/* 802E3388 002E02C8 41 80 00 E4 */ blt lbl_802E346C
/* 802E338C 002E02CC 38 61 00 08 */ addi r3, r1, 8
/* 802E3390 002E02D0 4B FF D3 4D */ bl __ct__10JUTGamePadFUl
/* 802E3390 002E02D0 4B FF D3 4D */ bl __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
/* 802E3394 002E02D4 3C 60 80 3D */ lis r3, lbl_803CC640@ha
/* 802E3398 002E02D8 3B 43 C6 40 */ addi r26, r3, lbl_803CC640@l
/* 802E339C 002E02DC 38 60 00 00 */ li r3, 0
asm/SComponent/c/API/controller/c_API_controller_pad.s
+3 -3
View File
@@ -8,7 +8,7 @@ cAPICPad_recalibrate:
/* 8026328C 002601CC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80263290 002601D0 7C 08 02 A6 */ mflr r0
/* 80263294 002601D4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80263298 002601D8 4B DA 4A DD */ bl mDoCPd_c_NS_recalibrate
/* 80263298 002601D8 4B DA 4A DD */ bl recalibrate__8mDoCPd_cFv
/* 8026329C 002601DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802632A0 002601E0 7C 08 03 A6 */ mtlr r0
/* 802632A4 002601E4 38 21 00 10 */ addi r1, r1, 0x10
@@ -17,8 +17,8 @@ cAPICPad_recalibrate:
.global cAPICPad_ANY_BUTTON
cAPICPad_ANY_BUTTON:
/* 802632AC 002601EC 54 64 30 32 */ slwi r4, r3, 6
/* 802632B0 002601F0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 802632B0 002601F0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 802632B4 002601F4 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 802632B8 002601F8 7C 60 22 14 */ add r3, r0, r4
/* 802632BC 002601FC 80 03 00 34 */ lwz r0, 0x34(r3)
/* 802632C0 00260200 70 03 13 00 */ andi. r3, r0, 0x1300
asm/SComponent/c/c_lib.s
+2 -2
View File
@@ -14,8 +14,8 @@ cLib_memCpy:
/* 8026F954 0026C894 38 21 00 10 */ addi r1, r1, 0x10
/* 8026F958 0026C898 4E 80 00 20 */ blr
.global cLib_memSet
cLib_memSet:
.global cLib_memSet__FPviUl
cLib_memSet__FPviUl:
/* 8026F95C 0026C89C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8026F960 0026C8A0 7C 08 02 A6 */ mflr r0
/* 8026F964 0026C8A4 90 01 00 14 */ stw r0, 0x14(r1)
asm/bss.s
+6 -6
View File
@@ -17,11 +17,11 @@ lbl_803DBF40:
.global lbl_803DBF4C
lbl_803DBF4C:
.skip 0x138C
.global lbl_803DD2D8
lbl_803DD2D8:
.global m_gamePad
m_gamePad:
.skip 0x10
.global lbl_803DD2E8
lbl_803DD2E8:
.global m_cpadInfo
m_cpadInfo:
.skip 0x100
.global lbl_803DD3E8
lbl_803DD3E8:
@@ -86,8 +86,8 @@ lbl_803F0F50:
.global lbl_803F1BB0
lbl_803F1BB0:
.skip 0xC
.global lbl_803F1BBC
lbl_803F1BBC:
.global g_HIO
g_HIO:
.skip 0x44
.global lbl_803F1C00
lbl_803F1C00:
asm/d/bright/d_bright_check.s
+2 -2
View File
@@ -412,8 +412,8 @@ dBrightCheck_c_NS__move:
/* 80193514 00190454 90 01 00 24 */ stw r0, 0x24(r1)
/* 80193518 00190458 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 8019351C 0019045C 7C 7F 1B 78 */ mr r31, r3
/* 80193520 00190460 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80193524 00190464 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80193520 00190460 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80193524 00190464 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80193528 00190468 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8019352C 0019046C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80193530 00190470 40 82 00 0C */ bne lbl_8019353C
asm/d/com/inf/d_com_inf_game.s
+2 -2
View File
@@ -4032,8 +4032,8 @@ dComIfGs_gameStart:
/* 8002E9CC 0002B90C 38 21 00 10 */ addi r1, r1, 0x10
/* 8002E9D0 0002B910 4E 80 00 20 */ blr
/* 8002E9D4 0002B914 54 64 30 32 */ slwi r4, r3, 6
/* 8002E9D8 0002B918 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8002E9DC 0002B91C 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8002E9D8 0002B918 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8002E9DC 0002B91C 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 8002E9E0 0002B920 7C 60 22 14 */ add r3, r0, r4
/* 8002E9E4 0002B924 80 03 00 34 */ lwz r0, 0x34(r3)
/* 8002E9E8 0002B928 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
asm/d/d_camera.s
+26 -26
View File
@@ -1872,8 +1872,8 @@ dCamera_c_NS_initPad:
lbl_80161570:
/* 80161570 0015E4B0 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 80161574 0015E4B4 54 00 30 32 */ slwi r0, r0, 6
/* 80161578 0015E4B8 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 8016157C 0015E4BC 38 A4 D2 E8 */ addi r5, r4, lbl_803DD2E8@l
/* 80161578 0015E4B8 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 8016157C 0015E4BC 38 A4 D2 E8 */ addi r5, r4, m_cpadInfo@l
/* 80161580 0015E4C0 7C 05 04 2E */ lfsx f0, r5, r0
/* 80161584 0015E4C4 D0 03 01 BC */ stfs f0, 0x1bc(r3)
/* 80161588 0015E4C8 80 03 01 7C */ lwz r0, 0x17c(r3)
@@ -1903,8 +1903,8 @@ lbl_801615B0:
lbl_801615E4:
/* 801615E4 0015E524 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 801615E8 0015E528 54 00 30 32 */ slwi r0, r0, 6
/* 801615EC 0015E52C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801615F0 0015E530 38 A4 D2 E8 */ addi r5, r4, lbl_803DD2E8@l
/* 801615EC 0015E52C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801615F0 0015E530 38 A4 D2 E8 */ addi r5, r4, m_cpadInfo@l
/* 801615F4 0015E534 7C 85 02 14 */ add r4, r5, r0
/* 801615F8 0015E538 C0 04 00 10 */ lfs f0, 0x10(r4)
/* 801615FC 0015E53C D0 03 01 D8 */ stfs f0, 0x1d8(r3)
@@ -1931,8 +1931,8 @@ lbl_80161628:
/* 8016164C 0015E58C 90 83 01 F4 */ stw r4, 0x1f4(r3)
/* 80161650 0015E590 80 03 01 7C */ lwz r0, 0x17c(r3)
/* 80161654 0015E594 54 06 30 32 */ slwi r6, r0, 6
/* 80161658 0015E598 3C A0 80 3E */ lis r5, lbl_803DD2E8@ha
/* 8016165C 0015E59C 38 05 D2 E8 */ addi r0, r5, lbl_803DD2E8@l
/* 80161658 0015E598 3C A0 80 3E */ lis r5, m_cpadInfo@ha
/* 8016165C 0015E59C 38 05 D2 E8 */ addi r0, r5, m_cpadInfo@l
/* 80161660 0015E5A0 7C A0 32 14 */ add r5, r0, r6
/* 80161664 0015E5A4 C0 25 00 28 */ lfs f1, 0x28(r5)
/* 80161668 0015E5A8 D0 23 02 00 */ stfs f1, 0x200(r3)
@@ -2041,8 +2041,8 @@ dCamera_c_NS_updatePad:
lbl_801617F8:
/* 801617F8 0015E738 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801617FC 0015E73C 54 04 30 32 */ slwi r4, r0, 6
/* 80161800 0015E740 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161804 0015E744 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161800 0015E740 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161804 0015E744 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161808 0015E748 7C 60 22 14 */ add r3, r0, r4
/* 8016180C 0015E74C C0 23 00 00 */ lfs f1, 0(r3)
/* 80161810 0015E750 C0 43 00 04 */ lfs f2, 4(r3)
@@ -2062,8 +2062,8 @@ lbl_80161818:
/* 80161844 0015E784 D0 7E 01 C4 */ stfs f3, 0x1c4(r30)
/* 80161848 0015E788 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 8016184C 0015E78C 54 04 30 32 */ slwi r4, r0, 6
/* 80161850 0015E790 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161854 0015E794 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161850 0015E790 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161854 0015E794 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161858 0015E798 7C 60 22 14 */ add r3, r0, r4
/* 8016185C 0015E79C A8 83 00 0C */ lha r4, 0xc(r3)
/* 80161860 0015E7A0 38 7E 01 D4 */ addi r3, r30, 0x1d4
@@ -2078,8 +2078,8 @@ lbl_80161818:
lbl_80161884:
/* 80161884 0015E7C4 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161888 0015E7C8 54 04 30 32 */ slwi r4, r0, 6
/* 8016188C 0015E7CC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161890 0015E7D0 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8016188C 0015E7CC 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161890 0015E7D0 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161894 0015E7D4 7C 60 22 14 */ add r3, r0, r4
/* 80161898 0015E7D8 C0 23 00 10 */ lfs f1, 0x10(r3)
/* 8016189C 0015E7DC C0 43 00 14 */ lfs f2, 0x14(r3)
@@ -2099,16 +2099,16 @@ lbl_801618A4:
/* 801618D0 0015E810 D0 7E 01 E0 */ stfs f3, 0x1e0(r30)
/* 801618D4 0015E814 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801618D8 0015E818 54 04 30 32 */ slwi r4, r0, 6
/* 801618DC 0015E81C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801618E0 0015E820 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 801618DC 0015E81C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801618E0 0015E820 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 801618E4 0015E824 7C 60 22 14 */ add r3, r0, r4
/* 801618E8 0015E828 A8 83 00 1C */ lha r4, 0x1c(r3)
/* 801618EC 0015E82C 38 7E 01 F0 */ addi r3, r30, 0x1f0
/* 801618F0 0015E830 48 10 F7 15 */ bl cSAngle_NS_Val_X2_
/* 801618F4 0015E834 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801618F8 0015E838 54 00 30 32 */ slwi r0, r0, 6
/* 801618FC 0015E83C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161900 0015E840 38 83 D2 E8 */ addi r4, r3, lbl_803DD2E8@l
/* 801618FC 0015E83C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161900 0015E840 38 83 D2 E8 */ addi r4, r3, m_cpadInfo@l
/* 80161904 0015E844 7C 64 02 14 */ add r3, r4, r0
/* 80161908 0015E848 C0 23 00 28 */ lfs f1, 0x28(r3)
/* 8016190C 0015E84C C0 1E 02 00 */ lfs f0, 0x200(r30)
@@ -2153,8 +2153,8 @@ lbl_80161990:
lbl_8016199C:
/* 8016199C 0015E8DC 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 801619A0 0015E8E0 54 00 30 32 */ slwi r0, r0, 6
/* 801619A4 0015E8E4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801619A8 0015E8E8 38 83 D2 E8 */ addi r4, r3, lbl_803DD2E8@l
/* 801619A4 0015E8E4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801619A8 0015E8E8 38 83 D2 E8 */ addi r4, r3, m_cpadInfo@l
/* 801619AC 0015E8EC 7C 64 02 14 */ add r3, r4, r0
/* 801619B0 0015E8F0 C0 23 00 2C */ lfs f1, 0x2c(r3)
/* 801619B4 0015E8F4 C0 1E 02 0C */ lfs f0, 0x20c(r30)
@@ -2199,8 +2199,8 @@ lbl_80161A38:
lbl_80161A44:
/* 80161A44 0015E984 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161A48 0015E988 54 04 30 32 */ slwi r4, r0, 6
/* 80161A4C 0015E98C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161A50 0015E990 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161A4C 0015E98C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161A50 0015E990 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161A54 0015E994 7C 60 22 14 */ add r3, r0, r4
/* 80161A58 0015E998 80 63 00 30 */ lwz r3, 0x30(r3)
/* 80161A5C 0015E99C 54 63 B7 FE */ rlwinm r3, r3, 0x16, 0x1f, 0x1f
@@ -2400,8 +2400,8 @@ lbl_80161D1C:
/* 80161D24 0015EC64 98 1E 02 24 */ stb r0, 0x224(r30)
/* 80161D28 0015EC68 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80161D2C 0015EC6C 54 04 30 32 */ slwi r4, r0, 6
/* 80161D30 0015EC70 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80161D34 0015EC74 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80161D30 0015EC70 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80161D34 0015EC74 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80161D38 0015EC78 7C 60 22 14 */ add r3, r0, r4
/* 80161D3C 0015EC7C C0 23 00 08 */ lfs f1, 8(r3)
/* 80161D40 0015EC80 C0 02 9C C0 */ lfs f0, lbl_804536C0-_SDA2_BASE_(r2)
@@ -13915,8 +13915,8 @@ _unnamed_d_camera_cpp__NS_sAngleX:
.global mDoCPd_c_NS_getHoldA
mDoCPd_c_NS_getHoldA:
/* 8016C314 00169254 54 64 30 32 */ slwi r4, r3, 6
/* 8016C318 00169258 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8016C31C 0016925C 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8016C318 00169258 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8016C31C 0016925C 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 8016C320 00169260 7C 60 22 14 */ add r3, r0, r4
/* 8016C324 00169264 80 03 00 30 */ lwz r0, 0x30(r3)
/* 8016C328 00169268 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
@@ -38326,8 +38326,8 @@ dCamSetup_c_NS_WaitRollTimer:
.global mDoCPd_c_NS_getTrigA
mDoCPd_c_NS_getTrigA:
/* 80182BF8 0017FB38 54 64 30 32 */ slwi r4, r3, 6
/* 80182BFC 0017FB3C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80182C00 0017FB40 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80182BFC 0017FB3C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80182C00 0017FB40 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80182C04 0017FB44 7C 60 22 14 */ add r3, r0, r4
/* 80182C08 0017FB48 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80182C0C 0017FB4C 54 03 05 EE */ rlwinm r3, r0, 0, 0x17, 0x17
asm/d/d_event.s
+2 -2
View File
@@ -1591,8 +1591,8 @@ dEvt_control_c_NS_skipper:
/* 80042A14 0003F954 41 82 00 08 */ beq lbl_80042A1C
/* 80042A18 0003F958 3B C0 00 01 */ li r30, 1
lbl_80042A1C:
/* 80042A1C 0003F95C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80042A20 0003F960 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80042A1C 0003F95C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80042A20 0003F960 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80042A24 0003F964 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80042A28 0003F968 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13
/* 80042A2C 0003F96C 41 82 00 44 */ beq lbl_80042A70
asm/d/d_name.s
+6 -6
View File
@@ -424,8 +424,8 @@ dName_c_NS__move:
/* 8024E9D0 0024B910 7D 80 2A 14 */ add r12, r0, r5
/* 8024E9D4 0024B914 48 11 36 B1 */ bl func_80362084
/* 8024E9D8 0024B918 60 00 00 00 */ nop
/* 8024E9DC 0024B91C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8024E9E0 0024B920 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8024E9DC 0024B91C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8024E9E0 0024B920 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8024E9E4 0024B924 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8024E9E8 0024B928 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e
/* 8024E9EC 0024B92C 41 82 00 64 */ beq lbl_8024EA50
@@ -673,8 +673,8 @@ lbl_8024ED08:
/* 8024ED54 0024BC94 90 01 00 34 */ stw r0, 0x34(r1)
/* 8024ED58 0024BC98 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 8024ED5C 0024BC9C 7C 7F 1B 78 */ mr r31, r3
/* 8024ED60 0024BCA0 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 8024ED64 0024BCA4 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 8024ED60 0024BCA0 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 8024ED64 0024BCA4 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 8024ED68 0024BCA8 80 04 00 34 */ lwz r0, 0x34(r4)
/* 8024ED6C 0024BCAC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 8024ED70 0024BCB0 41 82 00 0C */ beq lbl_8024ED7C
@@ -1696,8 +1696,8 @@ lbl_8024FBA8:
/* 8024FC0C 0024CB4C 98 1F 02 AB */ stb r0, 0x2ab(r31)
/* 8024FC10 0024CB50 48 00 01 7C */ b lbl_8024FD8C
lbl_8024FC14:
/* 8024FC14 0024CB54 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8024FC18 0024CB58 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8024FC14 0024CB54 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8024FC18 0024CB58 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8024FC1C 0024CB5C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8024FC20 0024CB60 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 8024FC24 0024CB64 41 82 00 D0 */ beq lbl_8024FCF4
asm/d/d_vibration.s
+22 -22
View File
@@ -445,8 +445,8 @@ lbl_8006F750:
/* 8006F774 0006C6B4 7F C5 F3 78 */ mr r5, r30
/* 8006F778 0006C6B8 4B FF F9 F1 */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F77C 0006C6BC 7C 64 1B 78 */ mr r4, r3
/* 8006F780 0006C6C0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F784 0006C6C4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F780 0006C6C0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F784 0006C6C4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F788 0006C6C8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F78C 0006C6CC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F790 0006C6D0 38 A0 00 00 */ li r5, 0
@@ -471,8 +471,8 @@ lbl_8006F7A0:
/* 8006F7D8 0006C718 7F A5 EB 78 */ mr r5, r29
/* 8006F7DC 0006C71C 4B FF F9 8D */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F7E0 0006C720 7C 64 1B 78 */ mr r4, r3
/* 8006F7E4 0006C724 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F7E8 0006C728 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F7E4 0006C724 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F7E8 0006C728 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F7EC 0006C72C 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F7F0 0006C730 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F7F4 0006C734 38 A0 00 01 */ li r5, 1
@@ -512,8 +512,8 @@ lbl_8006F84C:
/* 8006F874 0006C7B4 7F A5 EB 78 */ mr r5, r29
/* 8006F878 0006C7B8 4B FF F8 F1 */ bl _unnamed_d_vibration_cpp__NS_makedata
/* 8006F87C 0006C7BC 7C 64 1B 78 */ mr r4, r3
/* 8006F880 0006C7C0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F884 0006C7C4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F880 0006C7C0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F884 0006C7C4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F888 0006C7C8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F88C 0006C7CC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F890 0006C7D0 38 A0 00 00 */ li r5, 0
@@ -521,13 +521,13 @@ lbl_8006F84C:
/* 8006F898 0006C7D8 48 27 20 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl
/* 8006F89C 0006C7DC 48 00 00 3C */ b lbl_8006F8D8
lbl_8006F8A0:
/* 8006F8A0 0006C7E0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F8A4 0006C7E4 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F8A0 0006C7E0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F8A4 0006C7E4 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F8A8 0006C7E8 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F8AC 0006C7EC 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F8B0 0006C7F0 48 27 20 C9 */ bl stopPatternedRumbleAtThePeriod__Q210JUTGamePad7CRumbleFv
/* 8006F8B4 0006C7F4 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F8B8 0006C7F8 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F8B4 0006C7F4 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F8B8 0006C7F8 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F8BC 0006C7FC 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F8C0 0006C800 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006F8C4 0006C804 38 80 00 00 */ li r4, 0
@@ -588,13 +588,13 @@ lbl_8006F978:
lbl_8006F990:
/* 8006F990 0006C8D0 2C 03 03 84 */ cmpwi r3, 0x384
/* 8006F994 0006C8D4 41 80 00 40 */ blt lbl_8006F9D4
/* 8006F998 0006C8D8 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F99C 0006C8DC 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F998 0006C8D8 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F99C 0006C8DC 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F9A0 0006C8E0 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F9A4 0006C8E4 38 63 00 68 */ addi r3, r3, 0x68
/* 8006F9A8 0006C8E8 48 27 1F D1 */ bl stopPatternedRumbleAtThePeriod__Q210JUTGamePad7CRumbleFv
/* 8006F9AC 0006C8EC 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006F9B0 0006C8F0 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006F9AC 0006C8EC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006F9B0 0006C8F0 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006F9B4 0006C8F4 80 63 00 00 */ lwz r3, 0(r3)
/* 8006F9B8 0006C8F8 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006F9BC 0006C8FC 38 80 00 00 */ li r4, 0
@@ -901,13 +901,13 @@ dVibration_c_NS_Kill:
/* 8006FE08 0006CD48 90 01 00 14 */ stw r0, 0x14(r1)
/* 8006FE0C 0006CD4C 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8006FE10 0006CD50 7C 7F 1B 78 */ mr r31, r3
/* 8006FE14 0006CD54 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FE18 0006CD58 80 83 D2 D8 */ lwz r4, lbl_803DD2D8@l(r3)
/* 8006FE14 0006CD54 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FE18 0006CD58 80 83 D2 D8 */ lwz r4, m_gamePad@l(r3)
/* 8006FE1C 0006CD5C 38 64 00 68 */ addi r3, r4, 0x68
/* 8006FE20 0006CD60 A8 84 00 7C */ lha r4, 0x7c(r4)
/* 8006FE24 0006CD64 48 27 1B 25 */ bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs
/* 8006FE28 0006CD68 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FE2C 0006CD6C 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006FE28 0006CD68 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FE2C 0006CD6C 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006FE30 0006CD70 80 63 00 00 */ lwz r3, 0(r3)
/* 8006FE34 0006CD74 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006FE38 0006CD78 38 80 00 01 */ li r4, 1
@@ -1000,13 +1000,13 @@ dVibration_c_NS_Pause:
/* 8006FF68 0006CEA8 2C 00 FF FF */ cmpwi r0, -1
/* 8006FF6C 0006CEAC 41 82 00 30 */ beq lbl_8006FF9C
lbl_8006FF70:
/* 8006FF70 0006CEB0 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FF74 0006CEB4 80 83 D2 D8 */ lwz r4, lbl_803DD2D8@l(r3)
/* 8006FF70 0006CEB0 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FF74 0006CEB4 80 83 D2 D8 */ lwz r4, m_gamePad@l(r3)
/* 8006FF78 0006CEB8 38 64 00 68 */ addi r3, r4, 0x68
/* 8006FF7C 0006CEBC A8 84 00 7C */ lha r4, 0x7c(r4)
/* 8006FF80 0006CEC0 48 27 19 C9 */ bl stopPatternedRumble__Q210JUTGamePad7CRumbleFs
/* 8006FF84 0006CEC4 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 8006FF88 0006CEC8 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 8006FF84 0006CEC4 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 8006FF88 0006CEC8 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 8006FF8C 0006CECC 80 63 00 00 */ lwz r3, 0(r3)
/* 8006FF90 0006CED0 A8 63 00 7C */ lha r3, 0x7c(r3)
/* 8006FF94 0006CED4 38 80 00 01 */ li r4, 1
asm/d/ev/d_ev_camera.s
+2 -2
View File
@@ -8383,8 +8383,8 @@ lbl_800903FC:
/* 80090420 0008D360 38 60 00 01 */ li r3, 1
/* 80090424 0008D364 80 1E 01 7C */ lwz r0, 0x17c(r30)
/* 80090428 0008D368 54 05 30 32 */ slwi r5, r0, 6
/* 8009042C 0008D36C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 80090430 0008D370 38 04 D2 E8 */ addi r0, r4, lbl_803DD2E8@l
/* 8009042C 0008D36C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 80090430 0008D370 38 04 D2 E8 */ addi r0, r4, m_cpadInfo@l
/* 80090434 0008D374 7C 80 2A 14 */ add r4, r0, r5
/* 80090438 0008D378 80 84 00 30 */ lwz r4, 0x30(r4)
/* 8009043C 0008D37C 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
asm/d/file/d_file_select.s
+10 -10
View File
@@ -2101,8 +2101,8 @@ lbl_801853AC:
/* 801853D4 00182314 7C 7F 1B 78 */ mr r31, r3
/* 801853D8 00182318 80 63 02 54 */ lwz r3, 0x254(r3)
/* 801853DC 0018231C 4B EA CD C1 */ bl checkTrigger__9STControlFv
/* 801853E0 00182320 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801853E4 00182324 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801853E0 00182320 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801853E4 00182324 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801853E8 00182328 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801853EC 0018232C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801853F0 00182330 40 82 00 0C */ bne lbl_801853FC
@@ -3428,8 +3428,8 @@ lbl_8018675C:
/* 80186784 001836C4 7C 7F 1B 78 */ mr r31, r3
/* 80186788 001836C8 80 63 02 54 */ lwz r3, 0x254(r3)
/* 8018678C 001836CC 4B EA BA 11 */ bl checkTrigger__9STControlFv
/* 80186790 001836D0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80186794 001836D4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80186790 001836D0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80186794 001836D4 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80186798 001836D8 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8018679C 001836DC 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801867A0 001836E0 41 82 00 10 */ beq lbl_801867B0
@@ -5002,8 +5002,8 @@ lbl_80187EAC:
/* 80187EE4 00184E24 7C 7F 1B 78 */ mr r31, r3
/* 80187EE8 00184E28 80 63 02 54 */ lwz r3, 0x254(r3)
/* 80187EEC 00184E2C 4B EA A2 B1 */ bl checkTrigger__9STControlFv
/* 80187EF0 00184E30 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80187EF4 00184E34 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80187EF0 00184E30 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80187EF4 00184E34 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80187EF8 00184E38 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80187EFC 00184E3C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80187F00 00184E40 41 82 00 10 */ beq lbl_80187F10
@@ -6343,8 +6343,8 @@ lbl_80189288:
/* 801892AC 001861EC 7C 7F 1B 78 */ mr r31, r3
/* 801892B0 001861F0 80 63 02 54 */ lwz r3, 0x254(r3)
/* 801892B4 001861F4 4B EA 8E E9 */ bl checkTrigger__9STControlFv
/* 801892B8 001861F8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801892BC 001861FC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801892B8 001861F8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801892BC 001861FC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801892C0 00186200 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801892C4 00186204 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801892C8 00186208 41 82 00 10 */ beq lbl_801892D8
@@ -13347,8 +13347,8 @@ dFile_select_c_NS_errYesNoSelect:
/* 8018FA44 0018C984 3B E0 00 00 */ li r31, 0
/* 8018FA48 0018C988 80 63 02 54 */ lwz r3, 0x254(r3)
/* 8018FA4C 0018C98C 4B EA 27 51 */ bl checkTrigger__9STControlFv
/* 8018FA50 0018C990 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 8018FA54 0018C994 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8018FA50 0018C990 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 8018FA54 0018C994 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 8018FA58 0018C998 80 03 00 34 */ lwz r0, 0x34(r3)
/* 8018FA5C 0018C99C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 8018FA60 0018C9A0 41 82 00 90 */ beq lbl_8018FAF0
asm/d/menu/d_menu_calibration.s
+6 -6
View File
@@ -235,8 +235,8 @@ lbl_801AF068:
/* 801AF0C0 001AC000 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801AF0C4 001AC004 7C 08 02 A6 */ mflr r0
/* 801AF0C8 001AC008 90 01 00 14 */ stw r0, 0x14(r1)
/* 801AF0CC 001AC00C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801AF0D0 001AC010 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801AF0CC 001AC00C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801AF0D0 001AC010 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801AF0D4 001AC014 80 84 00 34 */ lwz r4, 0x34(r4)
/* 801AF0D8 001AC018 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801AF0DC 001AC01C 41 82 00 50 */ beq lbl_801AF12C
@@ -433,8 +433,8 @@ lbl_801AF35C:
/* 801AF3BC 001AC2FC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801AF3C0 001AC300 7C 08 02 A6 */ mflr r0
/* 801AF3C4 001AC304 90 01 00 14 */ stw r0, 0x14(r1)
/* 801AF3C8 001AC308 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801AF3CC 001AC30C 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801AF3C8 001AC308 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801AF3CC 001AC30C 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801AF3D0 001AC310 80 84 00 34 */ lwz r4, 0x34(r4)
/* 801AF3D4 001AC314 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801AF3D8 001AC318 41 82 00 50 */ beq lbl_801AF428
@@ -596,8 +596,8 @@ lbl_801AF5D8:
/* 801AF638 001AC578 90 01 00 24 */ stw r0, 0x24(r1)
/* 801AF63C 001AC57C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801AF640 001AC580 7C 7F 1B 78 */ mr r31, r3
/* 801AF644 001AC584 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801AF648 001AC588 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801AF644 001AC584 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801AF648 001AC588 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801AF64C 001AC58C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801AF650 001AC590 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801AF654 001AC594 41 82 00 58 */ beq lbl_801AF6AC
asm/d/menu/d_menu_dmap.s
+4 -4
View File
@@ -7560,8 +7560,8 @@ lbl_801BED5C:
/* 801BEDE0 001BBD20 48 00 01 ED */ bl dMenu_Dmap_c_NS_itemSelectAnmInit
/* 801BEDE4 001BBD24 48 00 01 2C */ b lbl_801BEF10
lbl_801BEDE8:
/* 801BEDE8 001BBD28 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801BEDEC 001BBD2C 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801BEDE8 001BBD28 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801BEDEC 001BBD2C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801BEDF0 001BBD30 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801BEDF4 001BBD34 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 801BEDF8 001BBD38 41 82 01 18 */ beq lbl_801BEF10
@@ -8757,8 +8757,8 @@ lbl_801BFF5C:
/* 801BFF9C 001BCEDC 88 03 01 7B */ lbz r0, 0x17b(r3)
/* 801BFFA0 001BCEE0 28 00 00 01 */ cmplwi r0, 1
/* 801BFFA4 001BCEE4 40 82 00 D4 */ bne lbl_801C0078
/* 801BFFA8 001BCEE8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801BFFAC 001BCEEC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801BFFA8 001BCEE8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801BFFAC 001BCEEC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801BFFB0 001BCEF0 80 83 00 34 */ lwz r4, 0x34(r3)
/* 801BFFB4 001BCEF4 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801BFFB8 001BCEF8 41 82 00 48 */ beq lbl_801C0000
asm/d/menu/d_menu_fishing.s
+2 -2
View File
@@ -597,8 +597,8 @@ lbl_801C5550:
/* 801C55AC 001C24EC 80 04 00 04 */ lwz r0, 4(r4)
/* 801C55B0 001C24F0 2C 00 00 01 */ cmpwi r0, 1
/* 801C55B4 001C24F4 4C 82 00 20 */ bnelr
/* 801C55B8 001C24F8 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801C55BC 001C24FC 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801C55B8 001C24F8 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801C55BC 001C24FC 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801C55C0 001C2500 80 04 00 34 */ lwz r0, 0x34(r4)
/* 801C55C4 001C2504 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16
/* 801C55C8 001C2508 4D 82 00 20 */ beqlr
asm/d/menu/d_menu_insect.s
+6 -6
View File
@@ -824,8 +824,8 @@ lbl_801D8CAC:
/* 801D8CE4 001D5C24 80 04 00 04 */ lwz r0, 4(r4)
/* 801D8CE8 001D5C28 2C 00 00 01 */ cmpwi r0, 1
/* 801D8CEC 001D5C2C 40 82 01 00 */ bne lbl_801D8DEC
/* 801D8CF0 001D5C30 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801D8CF4 001D5C34 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801D8CF0 001D5C30 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801D8CF4 001D5C34 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801D8CF8 001D5C38 80 A4 00 34 */ lwz r5, 0x34(r4)
/* 801D8CFC 001D5C3C 54 A4 05 AD */ rlwinm. r4, r5, 0, 0x16, 0x16
/* 801D8D00 001D5C40 40 82 00 10 */ bne lbl_801D8D10
@@ -1188,8 +1188,8 @@ lbl_801D9250:
/* 801D925C 001D619C 38 21 00 10 */ addi r1, r1, 0x10
/* 801D9260 001D61A0 4E 80 00 20 */ blr
/* 801D9264 001D61A4 4E 80 00 20 */ blr
/* 801D9268 001D61A8 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801D926C 001D61AC 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801D9268 001D61A8 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801D926C 001D61AC 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801D9270 001D61B0 80 84 00 34 */ lwz r4, 0x34(r4)
/* 801D9274 001D61B4 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801D9278 001D61B8 40 82 00 0C */ bne lbl_801D9284
@@ -1225,8 +1225,8 @@ lbl_801D9284:
/* 801D92EC 001D622C 7C 7F 1B 78 */ mr r31, r3
/* 801D92F0 001D6230 80 63 00 0C */ lwz r3, 0xc(r3)
/* 801D92F4 001D6234 4B E5 8E A9 */ bl checkTrigger__9STControlFv
/* 801D92F8 001D6238 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801D92FC 001D623C 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801D92F8 001D6238 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801D92FC 001D623C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801D9300 001D6240 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801D9304 001D6244 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801D9308 001D6248 41 82 00 8C */ beq lbl_801D9394
asm/d/menu/d_menu_letter.s
+4 -4
View File
@@ -1173,8 +1173,8 @@ lbl_801DDDF8:
/* 801DDE74 001DADB4 80 03 00 04 */ lwz r0, 4(r3)
/* 801DDE78 001DADB8 2C 00 00 01 */ cmpwi r0, 1
/* 801DDE7C 001DADBC 40 82 02 D0 */ bne lbl_801DE14C
/* 801DDE80 001DADC0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801DDE84 001DADC4 3B A3 D2 E8 */ addi r29, r3, lbl_803DD2E8@l
/* 801DDE80 001DADC0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801DDE84 001DADC4 3B A3 D2 E8 */ addi r29, r3, m_cpadInfo@l
/* 801DDE88 001DADC8 80 7D 00 34 */ lwz r3, 0x34(r29)
/* 801DDE8C 001DADCC 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16
/* 801DDE90 001DADD0 41 82 00 20 */ beq lbl_801DDEB0
@@ -1821,8 +1821,8 @@ lbl_801DE810:
/* 801DE82C 001DB76C 90 01 00 B4 */ stw r0, 0xb4(r1)
/* 801DE830 001DB770 93 E1 00 AC */ stw r31, 0xac(r1)
/* 801DE834 001DB774 7C 7F 1B 78 */ mr r31, r3
/* 801DE838 001DB778 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801DE83C 001DB77C 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801DE838 001DB778 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801DE83C 001DB77C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801DE840 001DB780 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801DE844 001DB784 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801DE848 001DB788 41 82 00 A4 */ beq lbl_801DE8EC
asm/d/menu/d_menu_option.s
+12 -12
View File
@@ -1474,8 +1474,8 @@ lbl_801E344C:
/* 801E3450 001E0390 80 03 00 04 */ lwz r0, 4(r3)
/* 801E3454 001E0394 2C 00 00 01 */ cmpwi r0, 1
/* 801E3458 001E0398 40 82 01 84 */ bne lbl_801E35DC
/* 801E345C 001E039C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801E3460 001E03A0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801E345C 001E039C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801E3460 001E03A0 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801E3464 001E03A4 80 83 00 34 */ lwz r4, 0x34(r3)
/* 801E3468 001E03A8 54 85 05 EF */ rlwinm. r5, r4, 0, 0x17, 0x17
/* 801E346C 001E03AC 41 82 00 B8 */ beq lbl_801E3524
@@ -2485,8 +2485,8 @@ lbl_801E42F8:
/* 801E4318 001E1258 40 82 00 38 */ bne lbl_801E4350
/* 801E431C 001E125C 38 00 00 01 */ li r0, 1
/* 801E4320 001E1260 98 1F 03 EA */ stb r0, 0x3ea(r31)
/* 801E4324 001E1264 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 801E4328 001E1268 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 801E4324 001E1264 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 801E4328 001E1268 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 801E432C 001E126C 80 63 00 00 */ lwz r3, 0(r3)
/* 801E4330 001E1270 38 63 00 68 */ addi r3, r3, 0x68
/* 801E4334 001E1274 38 9F 03 E0 */ addi r4, r31, 0x3e0
@@ -2534,8 +2534,8 @@ lbl_801E43B0:
/* 801E43D0 001E1310 40 82 00 38 */ bne lbl_801E4408
/* 801E43D4 001E1314 38 00 00 01 */ li r0, 1
/* 801E43D8 001E1318 98 1F 03 EA */ stb r0, 0x3ea(r31)
/* 801E43DC 001E131C 3C 60 80 3E */ lis r3, lbl_803DD2D8@ha
/* 801E43E0 001E1320 38 63 D2 D8 */ addi r3, r3, lbl_803DD2D8@l
/* 801E43DC 001E131C 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 801E43E0 001E1320 38 63 D2 D8 */ addi r3, r3, m_gamePad@l
/* 801E43E4 001E1324 80 63 00 00 */ lwz r3, 0(r3)
/* 801E43E8 001E1328 38 63 00 68 */ addi r3, r3, 0x68
/* 801E43EC 001E132C 38 9F 03 E0 */ addi r4, r31, 0x3e0
@@ -3181,8 +3181,8 @@ lbl_801E4CBC:
/* 801E4D3C 001E1C7C 7C 7E 1B 78 */ mr r30, r3
/* 801E4D40 001E1C80 7F E3 FB 78 */ mr r3, r31
/* 801E4D44 001E1C84 4B FF ED 85 */ bl dMenu_Option_c_NS_checkRightTrigger
/* 801E4D48 001E1C88 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801E4D4C 001E1C8C 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801E4D48 001E1C88 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801E4D4C 001E1C8C 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801E4D50 001E1C90 80 84 00 34 */ lwz r4, 0x34(r4)
/* 801E4D54 001E1C94 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17
/* 801E4D58 001E1C98 41 82 00 1C */ beq lbl_801E4D74
@@ -3525,8 +3525,8 @@ lbl_801E5230:
/* 801E5268 001E21A8 90 01 00 24 */ stw r0, 0x24(r1)
/* 801E526C 001E21AC 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801E5270 001E21B0 7C 7F 1B 78 */ mr r31, r3
/* 801E5274 001E21B4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801E5278 001E21B8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801E5274 001E21B4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801E5278 001E21B8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801E527C 001E21BC 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801E5280 001E21C0 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b
/* 801E5284 001E21C4 40 82 00 0C */ bne lbl_801E5290
@@ -6511,8 +6511,8 @@ dMenu_Option_c_NS_changeTVCheck:
/* 801E7DFC 001E4D3C 90 01 00 24 */ stw r0, 0x24(r1)
/* 801E7E00 001E4D40 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801E7E04 001E4D44 7C 7F 1B 78 */ mr r31, r3
/* 801E7E08 001E4D48 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801E7E0C 001E4D4C 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801E7E08 001E4D48 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801E7E0C 001E4D4C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801E7E10 001E4D50 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801E7E14 001E4D54 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b
/* 801E7E18 001E4D58 41 82 00 6C */ beq lbl_801E7E84
asm/d/menu/d_menu_ring.s
+6 -6
View File
@@ -2614,8 +2614,8 @@ lbl_801EB70C:
/* 801EB710 001E8650 55 25 06 3E */ clrlwi r5, r9, 0x18
/* 801EB714 001E8654 7C 07 28 40 */ cmplw r7, r5
/* 801EB718 001E8658 41 82 01 8C */ beq lbl_801EB8A4
/* 801EB71C 001E865C 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801EB720 001E8660 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801EB71C 001E865C 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801EB720 001E8660 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801EB724 001E8664 80 04 00 30 */ lwz r0, 0x30(r4)
/* 801EB728 001E8668 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19
/* 801EB72C 001E866C 41 82 00 38 */ beq lbl_801EB764
@@ -3638,8 +3638,8 @@ dMenu_Ring_c_NS_setActiveCursor:
/* 801EC560 001E94A0 88 04 00 E0 */ lbz r0, 0xe0(r4)
/* 801EC564 001E94A4 28 00 00 00 */ cmplwi r0, 0
/* 801EC568 001E94A8 40 82 01 D4 */ bne lbl_801EC73C
/* 801EC56C 001E94AC 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801EC570 001E94B0 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801EC56C 001E94AC 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801EC570 001E94B0 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801EC574 001E94B4 80 84 00 34 */ lwz r4, 0x34(r4)
/* 801EC578 001E94B8 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a
/* 801EC57C 001E94BC 41 82 00 44 */ beq lbl_801EC5C0
@@ -4543,8 +4543,8 @@ lbl_801ED294:
/* 801ED2B0 001EA1F0 7C 08 03 A6 */ mtlr r0
/* 801ED2B4 001EA1F4 38 21 00 70 */ addi r1, r1, 0x70
/* 801ED2B8 001EA1F8 4E 80 00 20 */ blr
/* 801ED2BC 001EA1FC 3C 80 80 3E */ lis r4, lbl_803DD2E8@ha
/* 801ED2C0 001EA200 38 84 D2 E8 */ addi r4, r4, lbl_803DD2E8@l
/* 801ED2BC 001EA1FC 3C 80 80 3E */ lis r4, m_cpadInfo@ha
/* 801ED2C0 001EA200 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l
/* 801ED2C4 001EA204 80 04 00 30 */ lwz r0, 0x30(r4)
/* 801ED2C8 001EA208 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19
/* 801ED2CC 001EA20C 41 82 00 30 */ beq lbl_801ED2FC
asm/d/menu/d_menu_save.s
+6 -6
View File
@@ -4598,8 +4598,8 @@ lbl_801F391C:
/* 801F3954 001F0894 40 82 01 2C */ bne lbl_801F3A80
/* 801F3958 001F0898 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 801F395C 001F089C 4B E3 E8 41 */ bl checkTrigger__9STControlFv
/* 801F3960 001F08A0 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801F3964 001F08A4 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801F3960 001F08A0 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801F3964 001F08A4 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801F3968 001F08A8 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801F396C 001F08AC 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801F3970 001F08B0 41 82 00 10 */ beq lbl_801F3980
@@ -5110,8 +5110,8 @@ lbl_801F40C0:
/* 801F40F8 001F1038 40 82 01 2C */ bne lbl_801F4224
/* 801F40FC 001F103C 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 801F4100 001F1040 4B E3 E0 9D */ bl checkTrigger__9STControlFv
/* 801F4104 001F1044 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801F4108 001F1048 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801F4104 001F1044 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801F4108 001F1048 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801F410C 001F104C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 801F4110 001F1050 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 801F4114 001F1054 41 82 00 10 */ beq lbl_801F4124
@@ -6037,8 +6037,8 @@ dMenu_save_c_NS_errYesNoSelect:
lbl_801F4E84:
/* 801F4E84 001F1DC4 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 801F4E88 001F1DC8 4B E3 D3 15 */ bl checkTrigger__9STControlFv
/* 801F4E8C 001F1DCC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 801F4E90 001F1DD0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 801F4E8C 001F1DCC 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 801F4E90 001F1DD0 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 801F4E94 001F1DD4 80 03 00 34 */ lwz r0, 0x34(r3)
/* 801F4E98 001F1DD8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 801F4E9C 001F1DDC 41 82 00 A0 */ beq lbl_801F4F3C

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