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/d/msg/d_msg_object.s
+20 -20
View File
@@ -1775,8 +1775,8 @@ lbl_802343C8:
/* 802343CC 0023130C 98 1D 12 4D */ stb r0, 0x124d(r29)
/* 802343D0 00231310 48 00 01 20 */ b lbl_802344F0
lbl_802343D4:
/* 802343D4 00231314 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 802343D8 00231318 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 802343D4 00231314 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 802343D8 00231318 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 802343DC 0023131C 80 63 00 34 */ lwz r3, 0x34(r3)
/* 802343E0 00231320 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 802343E4 00231324 41 82 00 2C */ beq lbl_80234410
@@ -2232,8 +2232,8 @@ lbl_80234A8C:
/* 80234A98 002319D8 C0 22 B0 C0 */ lfs f1, lbl_80454AC0-_SDA2_BASE_(r2)
/* 80234A9C 002319DC FC 02 08 40 */ fcmpo cr0, f2, f1
/* 80234AA0 002319E0 40 80 00 60 */ bge lbl_80234B00
/* 80234AA4 002319E4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80234AA8 002319E8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80234AA4 002319E4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80234AA8 002319E8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80234AAC 002319EC 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80234AB0 002319F0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 80234AB4 002319F4 41 82 00 0C */ beq lbl_80234AC0
@@ -2626,8 +2626,8 @@ dMsgObject_c_NS_continueProc:
/* 80235044 00231F84 7D 89 03 A6 */ mtctr r12
/* 80235048 00231F88 4E 80 04 21 */ bctrl
lbl_8023504C:
/* 8023504C 00231F8C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80235050 00231F90 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8023504C 00231F8C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80235050 00231F90 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80235054 00231F94 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80235058 00231F98 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 8023505C 00231F9C 40 82 00 0C */ bne lbl_80235068
@@ -2860,8 +2860,8 @@ lbl_80235380:
/* 802353AC 002322EC 38 00 00 00 */ li r0, 0
/* 802353B0 002322F0 98 03 5E 50 */ stb r0, 0x5e50(r3)
lbl_802353B4:
/* 802353B4 002322F4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 802353B8 002322F8 3B C3 D2 E8 */ addi r30, r3, lbl_803DD2E8@l
/* 802353B4 002322F4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 802353B8 002322F8 3B C3 D2 E8 */ addi r30, r3, m_cpadInfo@l
/* 802353BC 002322FC 80 7E 00 34 */ lwz r3, 0x34(r30)
/* 802353C0 00232300 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 802353C4 00232304 41 82 00 24 */ beq lbl_802353E8
@@ -3239,8 +3239,8 @@ dMsgObject_c_NS_inputProc:
/* 80235910 00232850 41 82 01 AC */ beq lbl_80235ABC
/* 80235914 00232854 38 00 00 00 */ li r0, 0
/* 80235918 00232858 98 1C 01 99 */ stb r0, 0x199(r28)
/* 8023591C 0023285C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80235920 00232860 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8023591C 0023285C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80235920 00232860 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80235924 00232864 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80235928 00232868 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 8023592C 0023286C 41 82 01 58 */ beq lbl_80235A84
@@ -3421,8 +3421,8 @@ lbl_80235B9C:
/* 80235BB0 00232AF0 48 00 C4 D1 */ bl dMsgScrnHowl_c_NS_isKeyCheck
/* 80235BB4 00232AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80235BB8 00232AF8 41 82 00 1C */ beq lbl_80235BD4
/* 80235BBC 00232AFC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80235BC0 00232B00 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80235BBC 00232AFC 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80235BC0 00232B00 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80235BC4 00232B04 80 03 00 34 */ lwz r0, 0x34(r3)
/* 80235BC8 00232B08 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16
/* 80235BCC 00232B0C 41 82 00 08 */ beq lbl_80235BD4
@@ -3431,8 +3431,8 @@ lbl_80235BD4:
/* 80235BD4 00232B14 7F E3 FB 78 */ mr r3, r31
/* 80235BD8 00232B18 48 00 0E 01 */ bl dMsgObject_c_NS_isSend
/* 80235BDC 00232B1C 7C 7E 1B 78 */ mr r30, r3
/* 80235BE0 00232B20 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80235BE4 00232B24 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80235BE0 00232B20 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80235BE4 00232B24 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80235BE8 00232B28 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80235BEC 00232B2C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80235BF0 00232B30 40 82 00 1C */ bne lbl_80235C0C
@@ -4483,8 +4483,8 @@ lbl_80236A90:
/* 80236AA8 002339E8 40 82 00 38 */ bne lbl_80236AE0
/* 80236AAC 002339EC 7F E3 FB 78 */ mr r3, r31
/* 80236AB0 002339F0 48 00 11 4D */ bl dMsgObject_c_NS_setButtonStatusLocal
/* 80236AB4 002339F4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80236AB8 002339F8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80236AB4 002339F4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80236AB8 002339F8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80236ABC 002339FC 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80236AC0 00233A00 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80236AC4 00233A04 40 82 00 0C */ bne lbl_80236AD0
@@ -4521,8 +4521,8 @@ lbl_80236B1C:
/* 80236B24 00233A64 40 82 00 98 */ bne lbl_80236BBC
/* 80236B28 00233A68 7F E3 FB 78 */ mr r3, r31
/* 80236B2C 00233A6C 48 00 10 D1 */ bl dMsgObject_c_NS_setButtonStatusLocal
/* 80236B30 00233A70 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80236B34 00233A74 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80236B30 00233A70 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80236B34 00233A74 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80236B38 00233A78 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80236B3C 00233A7C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80236B40 00233A80 40 82 00 0C */ bne lbl_80236B4C
@@ -4546,8 +4546,8 @@ lbl_80236B54:
/* 80236B80 00233AC0 38 60 00 02 */ li r3, 2
/* 80236B84 00233AC4 48 00 00 5C */ b lbl_80236BE0
lbl_80236B88:
/* 80236B88 00233AC8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80236B8C 00233ACC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80236B88 00233AC8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80236B8C 00233ACC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80236B90 00233AD0 80 63 00 34 */ lwz r3, 0x34(r3)
/* 80236B94 00233AD4 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17
/* 80236B98 00233AD8 40 82 00 0C */ bne lbl_80236BA4