mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-20 06:06:50 -04: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 00:02:19 -07:00
committed by GitHub
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
include/d/d_a/d_a_alink/asm/func_800B271C.s
+10 -10
View File
@@ -187,8 +187,8 @@ lbl_800B29B0:
/* 800B29C4 000AF904 B0 7E 2F E0 */ sth r3, 0x2fe0(r30)
/* 800B29C8 000AF908 48 00 00 24 */ b lbl_800B29EC
lbl_800B29CC:
/* 800B29CC 000AF90C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B29D0 000AF910 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B29CC 000AF90C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B29D0 000AF910 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B29D4 000AF914 C0 03 00 08 */ lfs f0, 8(r3)
/* 800B29D8 000AF918 D0 1E 33 A8 */ stfs f0, 0x33a8(r30)
/* 800B29DC 000AF91C A8 63 00 0C */ lha r3, 0xc(r3)
@@ -264,8 +264,8 @@ lbl_800B2AD4:
/* 800B2AD4 000AFA14 38 00 00 01 */ li r0, 1
/* 800B2AD8 000AFA18 98 1E 2F B9 */ stb r0, 0x2fb9(r30)
lbl_800B2ADC:
/* 800B2ADC 000AFA1C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2AE0 000AFA20 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2ADC 000AFA1C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2AE0 000AFA20 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2AE4 000AFA24 80 03 00 34 */ lwz r0, 0x34(r3)
/* 800B2AE8 000AFA28 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16
/* 800B2AEC 000AFA2C 41 82 00 10 */ beq lbl_800B2AFC
@@ -308,8 +308,8 @@ lbl_800B2B5C:
/* 800B2B6C 000AFAAC 60 00 00 20 */ ori r0, r0, 0x20
/* 800B2B70 000AFAB0 98 1E 2F 8D */ stb r0, 0x2f8d(r30)
lbl_800B2B74:
/* 800B2B74 000AFAB4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2B78 000AFAB8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2B74 000AFAB4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2B78 000AFAB8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2B7C 000AFABC 88 03 00 3C */ lbz r0, 0x3c(r3)
/* 800B2B80 000AFAC0 28 00 00 00 */ cmplwi r0, 0
/* 800B2B84 000AFAC4 41 82 00 10 */ beq lbl_800B2B94
@@ -317,8 +317,8 @@ lbl_800B2B74:
/* 800B2B8C 000AFACC 60 00 00 40 */ ori r0, r0, 0x40
/* 800B2B90 000AFAD0 98 1E 2F 8D */ stb r0, 0x2f8d(r30)
lbl_800B2B94:
/* 800B2B94 000AFAD4 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2B98 000AFAD8 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2B94 000AFAD4 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2B98 000AFAD8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2B9C 000AFADC 80 03 00 30 */ lwz r0, 0x30(r3)
/* 800B2BA0 000AFAE0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17
/* 800B2BA4 000AFAE4 41 82 00 10 */ beq lbl_800B2BB4
@@ -361,8 +361,8 @@ lbl_800B2C14:
/* 800B2C24 000AFB64 60 00 00 20 */ ori r0, r0, 0x20
/* 800B2C28 000AFB68 98 1E 2F 8E */ stb r0, 0x2f8e(r30)
lbl_800B2C2C:
/* 800B2C2C 000AFB6C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 800B2C30 000AFB70 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 800B2C2C 000AFB6C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 800B2C30 000AFB70 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 800B2C34 000AFB74 88 03 00 3B */ lbz r0, 0x3b(r3)
/* 800B2C38 000AFB78 28 00 00 00 */ cmplwi r0, 0
/* 800B2C3C 000AFB7C 41 82 00 10 */ beq lbl_800B2C4C
include/d/d_a/d_a_alink/asm/func_80117CF8.s
+2 -2
View File
@@ -170,8 +170,8 @@ lbl_80117F4C:
/* 80117F60 00114EA0 28 00 00 F2 */ cmplwi r0, 0xf2
/* 80117F64 00114EA4 40 82 00 64 */ bne lbl_80117FC8
lbl_80117F68:
/* 80117F68 00114EA8 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80117F6C 00114EAC 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80117F68 00114EA8 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80117F6C 00114EAC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80117F70 00114EB0 C0 03 00 08 */ lfs f0, 8(r3)
/* 80117F74 00114EB4 D0 1C 33 A8 */ stfs f0, 0x33a8(r28)
/* 80117F78 00114EB8 A8 63 00 0C */ lha r3, 0xc(r3)
include/d/d_a/d_a_alink/asm/func_80130BC4.s
+4 -4
View File
@@ -108,8 +108,8 @@ lbl_80130D38:
/* 80130D4C 0012DC8C D0 1F 34 7C */ stfs f0, 0x347c(r31)
/* 80130D50 0012DC90 48 00 05 54 */ b lbl_801312A4
lbl_80130D54:
/* 80130D54 0012DC94 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80130D58 0012DC98 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80130D54 0012DC94 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80130D58 0012DC98 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80130D5C 0012DC9C 80 03 00 30 */ lwz r0, 0x30(r3)
/* 80130D60 0012DCA0 54 1A C7 FE */ rlwinm r26, r0, 0x18, 0x1f, 0x1f
/* 80130D64 0012DCA4 A8 1F 30 10 */ lha r0, 0x3010(r31)
@@ -252,8 +252,8 @@ lbl_80130F24:
/* 80130F4C 0012DE8C 4B FF 87 8D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed
lbl_80130F50:
/* 80130F50 0012DE90 AB 3F 30 0E */ lha r25, 0x300e(r31)
/* 80130F54 0012DE94 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80130F58 0012DE98 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 80130F54 0012DE94 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80130F58 0012DE98 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l
/* 80130F5C 0012DE9C C3 E3 00 04 */ lfs f31, 4(r3)
/* 80130F60 0012DEA0 38 7F 2D 84 */ addi r3, r31, 0x2d84
/* 80130F64 0012DEA4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2)
include/d/d_attention/asm/func_80070018.s
+2 -2
View File
@@ -1,6 +1,6 @@
/* 80070018 0006CF58 54 64 30 32 */ slwi r4, r3, 6
/* 8007001C 0006CF5C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80070020 0006CF60 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 8007001C 0006CF5C 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80070020 0006CF60 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 80070024 0006CF64 7C 60 22 14 */ add r3, r0, r4
/* 80070028 0006CF68 88 63 00 39 */ lbz r3, 0x39(r3)
/* 8007002C 0006CF6C 30 03 FF FF */ addic r0, r3, -1
include/d/d_attention/asm/func_800725F0.s
+2 -2
View File
@@ -77,8 +77,8 @@ lbl_80072700:
/* 80072708 0006F648 40 82 00 80 */ bne lbl_80072788
/* 8007270C 0006F64C 80 1F 00 0C */ lwz r0, 0xc(r31)
/* 80072710 0006F650 54 04 30 32 */ slwi r4, r0, 6
/* 80072714 0006F654 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80072718 0006F658 38 03 D2 E8 */ addi r0, r3, lbl_803DD2E8@l
/* 80072714 0006F654 3C 60 80 3E */ lis r3, m_cpadInfo@ha
/* 80072718 0006F658 38 03 D2 E8 */ addi r0, r3, m_cpadInfo@l
/* 8007271C 0006F65C 7C 60 22 14 */ add r3, r0, r4
/* 80072720 0006F660 C0 23 00 04 */ lfs f1, 4(r3)
/* 80072724 0006F664 C0 02 8C 34 */ lfs f0, lbl_80452634-_SDA2_BASE_(r2)
include/d/d_lib/asm/CSTControl_NS_getAngleStick.s
+2 -2
View File
@@ -1,4 +1,4 @@
/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8003218C 0002F0CC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032190 0002F0D0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032194 0002F0D4 A8 63 00 1C */ lha r3, 0x1c(r3)
/* 80032198 0002F0D8 4E 80 00 20 */ blr
include/d/d_lib/asm/CSTControl_NS_getValueStick.s
+2 -2
View File
@@ -1,4 +1,4 @@
/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8003217C 0002F0BC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032180 0002F0C0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032184 0002F0C4 C0 23 00 18 */ lfs f1, 0x18(r3)
/* 80032188 0002F0C8 4E 80 00 20 */ blr
include/d/d_lib/asm/getAngleStick.s
+2 -2
View File
@@ -1,4 +1,4 @@
/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8003216C 0002F0AC 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032170 0002F0B0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032174 0002F0B4 A8 63 00 0C */ lha r3, 0xc(r3)
/* 80032178 0002F0B8 4E 80 00 20 */ blr
include/d/d_lib/asm/getValueStick.s
+2 -2
View File
@@ -1,4 +1,4 @@
/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, lbl_803DD2E8@ha
/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, lbl_803DD2E8@l
/* 8003215C 0002F09C 3C 60 80 3E */ lis r3, m_gamePad@ha
/* 80032160 0002F0A0 38 63 D2 E8 */ addi r3, r3, m_gamePad@l
/* 80032164 0002F0A4 C0 23 00 08 */ lfs f1, 8(r3)
/* 80032168 0002F0A8 4E 80 00 20 */ blr
include/d/d_lib/d_lib.h
-10
View File
@@ -54,16 +54,6 @@ struct CSTControl {
s16 getAngleStick();
};
struct m_cpadInfo {
u8 p1[0x8];
f32 stickValue;
s16 stickAngle;
u8 p2[0x8];
f32 CstickValue;
s16 CstickAngle;
u8 p3[0xE2];
};
u32 dLib_getEventSwitchNo(int param_1);
struct fopAc_ac_c;