Match InitializePlayer without any ASM hacks

SAT-R · Feb 12, 2025 · 5b74950 · 5b74950
1 parent ef4f989
commit 5b74950
Show file tree

Hide file tree

Showing 27 changed files with 343 additions and 149 deletions.
diff --git a/asm/game_0_1.s b/asm/game_0_1.s
@@ -2932,7 +2932,7 @@ _0800FD2A:
 	ldr r1, _0800FD94 @ =0xFFDFFFFF
 	ands r0, r1
 	str r0, [r2, #0x10]
-	ldr r1, _0800FD98 @ =gUnknown_030060E0
+	ldr r1, _0800FD98 @ =gPlayerControls
 	ldrh r0, [r1]
 	ldrh r1, [r1, #2]
 	orrs r0, r1
@@ -2955,7 +2955,7 @@ _0800FD88: .4byte gMultiplayerPlayerTasks
 _0800FD8C: .4byte gStageFlags
 _0800FD90: .4byte 0x0000FFFE
 _0800FD94: .4byte 0xFFDFFFFF
-_0800FD98: .4byte gUnknown_030060E0
+_0800FD98: .4byte gPlayerControls
 
 	thumb_func_start sub_800FD9C
 sub_800FD9C: @ 0x0800FD9C

diff --git a/asm/game_1_x.s b/asm/game_1_x.s
@@ -365,7 +365,7 @@ _0804D024:
 	thumb_func_start sub_804D02C
 sub_804D02C: @ 0x0804D02C
 	adds r2, r0, #0
-	ldr r3, _0804D04C @ =gUnknown_030060E0
+	ldr r3, _0804D04C @ =gPlayerControls
 	cmp r2, #0
 	beq _0804D040
 	ldr r0, _0804D050 @ =gStageFlags
@@ -381,7 +381,7 @@ _0804D040:
 	strh r0, [r3, #2]
 	b _0804D05E
 	.align 2, 0
-_0804D04C: .4byte gUnknown_030060E0
+_0804D04C: .4byte gPlayerControls
 _0804D050: .4byte gStageFlags
 _0804D054:
 	cmp r2, #1

diff --git a/asm/game_2.s b/asm/game_2.s
@@ -8192,7 +8192,7 @@ _0805C5F6:
 	ldr r4, _0805C688 @ =0xFFDFFFFF
 	ands r0, r4
 	str r0, [r3, #0x10]
-	ldr r0, _0805C68C @ =gUnknown_030060E0
+	ldr r0, _0805C68C @ =gPlayerControls
 	ldrh r2, [r0]
 	ldrh r0, [r0, #2]
 	orrs r2, r0
@@ -8230,7 +8230,7 @@ _0805C67C: .4byte gStageFlags
 _0805C680: .4byte 0x0000FFFE
 _0805C684: .4byte gPlayer
 _0805C688: .4byte 0xFFDFFFFF
-_0805C68C: .4byte gUnknown_030060E0
+_0805C68C: .4byte gPlayerControls
 _0805C690: .4byte gPartner
 _0805C694: .4byte gCurTask
 _0805C698:

diff --git a/asm/game__special_stage.s b/asm/game__special_stage.s
@@ -821,7 +821,7 @@ _08029FC4:
 	strb r0, [r1]
 	adds r0, r3, #0
 	adds r0, #0x44
-	ldr r1, _0802A010 @ =gUnknown_030060E0
+	ldr r1, _0802A010 @ =gPlayerControls
 	ldrh r2, [r0]
 	ldrh r0, [r1, #2]
 	ands r0, r2
@@ -846,13 +846,13 @@ _08029FC4:
 	movs r0, #1
 	b _0802A062
 	.align 2, 0
-_0802A010: .4byte gUnknown_030060E0
+_0802A010: .4byte gPlayerControls
 _0802A014: .4byte gMPlayTable
 _0802A018: .4byte gSongTable
 _0802A01C:
 	adds r0, r3, #0
 	adds r0, #0x44
-	ldr r1, _0802A04C @ =gUnknown_030060E0
+	ldr r1, _0802A04C @ =gPlayerControls
 	ldrh r2, [r0]
 	ldrh r0, [r1, #2]
 	ands r0, r2
@@ -875,7 +875,7 @@ _0802A01C:
 	strb r1, [r0]
 	b _0802A058
 	.align 2, 0
-_0802A04C: .4byte gUnknown_030060E0
+_0802A04C: .4byte gPlayerControls
 _0802A050:
 	adds r1, r3, #0
 	adds r1, #0x3c
@@ -1655,7 +1655,7 @@ _0802A5DC:
 	asrs r0, r0, #0x1a
 	strh r0, [r4, #0x10]
     @ inline of sub_802D6B4?
-	ldr r0, _0802A638 @ =gUnknown_030060E0 
+	ldr r0, _0802A638 @ =gPlayerControls 
 	ldrh r1, [r7]
 	ldrh r0, [r0]
 	ands r0, r1
@@ -1674,7 +1674,7 @@ _0802A5DC:
 	.align 2, 0
 _0802A630: .4byte 0x000003FF
 _0802A634: .4byte gSineTable
-_0802A638: .4byte gUnknown_030060E0
+_0802A638: .4byte gPlayerControls
 _0802A63C:
 	ldrb r1, [r2]
 	movs r0, #2
@@ -7654,7 +7654,7 @@ sub_802D6B4: @ 0x0802D6B4
 	adds r2, r0, #0
 	adds r1, r2, #0
 	adds r1, #0x42
-	ldr r0, _0802D6DC @ =gUnknown_030060E0
+	ldr r0, _0802D6DC @ =gPlayerControls
 	ldrh r1, [r1]
 	ldrh r0, [r0]
 	ands r0, r1
@@ -7671,7 +7671,7 @@ sub_802D6B4: @ 0x0802D6B4
 	lsls r0, r0, #1
 	b _0802D6F6
 	.align 2, 0
-_0802D6DC: .4byte gUnknown_030060E0
+_0802D6DC: .4byte gPlayerControls
 _0802D6E0:
 	adds r0, r2, #0
 	adds r0, #0x29