M_do_controller_pad split and partially matched (#36)

* 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
+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