Merge branch 'upstream-master' into pr/dtk-template

doldecomp · Sep 7, 2024 · f583700 · f583700
2 parents 523a182 + cb52999
commit f583700
Show file tree

Hide file tree

Showing 16 changed files with 391 additions and 350 deletions.
diff --git a/asm/melee/it/items/itkinoko.s b/asm/melee/it/items/itkinoko.s
diff --git a/asm/melee/lb/lbcardgame.s b/asm/melee/lb/lbcardgame.s
@@ -117,7 +117,7 @@
 /* 800199FC 000165DC  48 00 00 35 */	bl lb_80019A30
 /* 80019A00 000165E0  2C 03 00 00 */	cmpwi r3, 0x0
 /* 80019A04 000165E4  41 82 00 08 */	beq .L_80019A0C
-/* 80019A08 000165E8  48 35 E1 4D */	bl HSD_PadZeroQueue
+/* 80019A08 000165E8  48 35 E1 4D */	bl HSD_PadRenewGameStatus
 .L_80019A0C:
 /* 80019A0C 000165EC  38 60 00 00 */	li r3, 0x0
 /* 80019A10 000165F0  48 00 00 21 */	bl lb_80019A30

diff --git a/asm/sysdolphin/baselib/controller.s b/asm/sysdolphin/baselib/controller.s
@@ -1235,7 +1235,7 @@
 /* 000011B4 000011F4  4E 80 00 20 */	blr
 .endfn HSD_PadRenewCopyStatus
 
-.fn HSD_PadZeroQueue, global
+.fn HSD_PadRenewGameStatus, global
 /* 000011B8 000011F8  3C 60 00 00 */	lis r3, HSD_PadLibData@ha
 /* 000011BC 000011FC  C0 00 00 00 */	lfs f0, HSD_Controller_804DE5B0@sda21(r0)
 /* 000011C0 00001200  38 63 00 00 */	addi r3, r3, HSD_PadLibData@l
@@ -1343,7 +1343,7 @@
 /* 00001340 00001380  38 A5 00 44 */	addi r5, r5, 0x44
 /* 00001344 00001384  42 00 FE 90 */	bdnz .L_000011D4
 /* 00001348 00001388  4E 80 00 20 */	blr
-.endfn HSD_PadZeroQueue
+.endfn HSD_PadRenewGameStatus
 
 .fn HSD_PadRenewStatus, global
 /* 0000134C 0000138C  7C 08 02 A6 */	mflr r0
@@ -1353,7 +1353,7 @@
 /* 0000135C 0000139C  48 00 00 01 */	bl HSD_PadRenewRawStatus
 /* 00001360 000013A0  48 00 00 01 */	bl HSD_PadRenewMasterStatus
 /* 00001364 000013A4  48 00 00 01 */	bl HSD_PadRenewCopyStatus
-/* 00001368 000013A8  48 00 00 01 */	bl HSD_PadZeroQueue
+/* 00001368 000013A8  48 00 00 01 */	bl HSD_PadRenewGameStatus
 /* 0000136C 000013AC  80 01 00 0C */	lwz r0, 0xc(r1)
 /* 00001370 000013B0  38 21 00 08 */	addi r1, r1, 0x8
 /* 00001374 000013B4  7C 08 03 A6 */	mtlr r0
@@ -1669,9 +1669,13 @@
 	.skip 0x110
 .endobj HSD_PadCopyStatus
 
-.obj HSD_PadRumbleData, global
-	.skip 0x114
-.endobj HSD_PadRumbleData
+.obj HSD_PadGameStatus, global
+	.skip 0x110
+.endobj HSD_PadGameStatus
+
+.obj pad, local
+    .skip 0x4
+.endobj pad
 
 # 0x00000000 - 0x00000070
 .section .sdata2, "a"

diff --git a/config/GALE01/symbols.txt b/config/GALE01/symbols.txt
@@ -14322,7 +14322,7 @@ it_80293754 = .text:0x80293754; // type:function size:0x8 scope:global
 it_8029375C = .text:0x8029375C; // type:function size:0x3C scope:global
 it_80293798 = .text:0x80293798; // type:function size:0xC4 scope:global
 it_8029385C = .text:0x8029385C; // type:function size:0x28 scope:global
-fn_80293884 = .text:0x80293884; // type:function size:0x28
+it_80293884 = .text:0x80293884; // type:function size:0x28
 it_802938AC = .text:0x802938AC; // type:function size:0x8 scope:global
 it_802938B4 = .text:0x802938B4; // type:function size:0xB0 scope:global
 it_80293964 = .text:0x80293964; // type:function size:0x7C scope:global
@@ -19453,7 +19453,7 @@ HSD_PadADConvertCheck1 = .text:0x803771D4; // type:function size:0x27C scope:glo
 HSD_PadCrossDir = .text:0x80377450; // type:function size:0xBC scope:global
 HSD_PadRenewMasterStatus = .text:0x8037750C; // type:function size:0x4B4 scope:global
 HSD_PadRenewCopyStatus = .text:0x803779C0; // type:function size:0x194 scope:global
-HSD_PadZeroQueue = .text:0x80377B54; // type:function size:0x194 scope:global
+HSD_PadRenewGameStatus = .text:0x80377B54; // type:function size:0x194 scope:global
 HSD_PadRenewStatus = .text:0x80377CE8; // type:function size:0x30 scope:global
 HSD_PadReset = .text:0x80377D18; // type:function size:0x80 scope:global
 HSD_PadInit = .text:0x80377D98; // type:function size:0x2F8 scope:global
@@ -25163,7 +25163,7 @@ HSD_VIData = .bss:0x804C1D80; // type:object size:0x1F4 scope:global data:4byte
 HSD_PadLibData = .bss:0x804C1F78; // type:object size:0x34 scope:global data:byte
 HSD_PadMasterStatus = .bss:0x804C1FAC; // type:object size:0x110 scope:global data:4byte
 HSD_PadCopyStatus = .bss:0x804C20BC; // type:object size:0x110 scope:global data:4byte
-HSD_PadRumbleData = .bss:0x804C21CC; // type:object size:0x114 scope:global data:4byte
+HSD_PadGameStatus = .bss:0x804C21CC; // type:object size:0x110 scope:global data:4byte
 HSD_Rumble_804C22E0 = .bss:0x804C22E0; // type:object size:0x30 scope:global data:4byte
 ...bss.0 = .bss:0x804C22E0; // type:label scope:local
 HSD_Mtx_804C2310 = .bss:0x804C2310; // type:object size:0x2C scope:global