Match Pearl ARM9 binary

7 files changed, 35 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index eb3b43df..7c996051 100644
--- a/Makefile
+++ b/Makefile
@@ -335,7 +335,7 @@ print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
 
 ### Other targets
 
-diamond:          ; @$(MAKE) $(HOST_VARS) GAME_VERSION=DIAMOND
-pearl:            ; @$(MAKE) $(HOST_VARS) GAME_VERSION=PEARL
-compare_diamond:  ; @$(MAKE) $(HOST_VARS) GAME_VERSION=DIAMOND COMPARE=1
-compare_pearl:    ; @$(MAKE) $(HOST_VARS) GAME_VERSION=PEARL COMPARE=1
+diamond:          ; @$(HOST_VARS) $(MAKE) GAME_VERSION=DIAMOND
+pearl:            ; @$(HOST_VARS) $(MAKE) GAME_VERSION=PEARL
+compare_diamond:  ; @$(HOST_VARS) $(MAKE) GAME_VERSION=DIAMOND COMPARE=1
+compare_pearl:    ; @$(HOST_VARS) $(MAKE) GAME_VERSION=PEARL COMPARE=1
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index 3913f74c..68c87867 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -8607,7 +8607,7 @@ FUN_0203DE00: ; 0x0203DE00
 	add r0, #0x80
 	ldr r0, [r0, #0x0]
 	bl FUN_020394F0
-	bl MOD06_0224CA58
+	bl MOD18_0224CA58
 	strb r0, [r4, #0x0]
 	ldr r1, _0203DE34 ; =FUN_0203DE38
 	add r0, r5, #0x0
diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s
index 6c3ae7b3..6351a0e1 100644
--- a/arm9/asm/unk_0204CB20.s
+++ b/arm9/asm/unk_0204CB20.s
@@ -1861,14 +1861,14 @@ _0204D90A:
 	cmp r0, #0x0
 	bne _0204D93C
 	add r0, r5, #0x0
-	bl MOD06_02247544
+	bl MOD18_02247544
 	cmp r0, #0x0
 	bne _0204D976
 _0204D93C:
 	ldr r0, [sp, #0x4]
 	cmp r0, #0x0
 	beq _0204D94A
-	bl MOD06_02244DB0
+	bl MOD18_02244DB0
 	cmp r0, #0x0
 	beq _0204D976
 _0204D94A:
@@ -4003,7 +4003,7 @@ _0204E936:
 	ldr r1, [r1, #0x0]
 	ldr r0, _0204E968 ; =FUN_0204D308
 	ldr r1, [r1, #0x54]
-	bl MOD06_0224A7C8
+	bl MOD18_0224A7C8
 _0204E962:
 	pop {r4, pc}
 	.balign 4
diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s
index c64ebb9f..6c8271dc 100644
--- a/arm9/asm/unk_0204FBA8.s
+++ b/arm9/asm/unk_0204FBA8.s
@@ -707,7 +707,7 @@ _020500B6:
 	mov r0, #0x0
 	bl FUN_0204D168
 	bl MOD18_0223EF7C
-	bl MOD06_02245FA0
+	bl MOD18_02245FA0
 	ldr r0, _02050108 ; =UNK_021C5A6C
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
@@ -777,7 +777,7 @@ _02050164: .word FUN_02050168
 	thumb_func_start FUN_02050168
 FUN_02050168: ; 0x02050168
 	push {r3, lr}
-	bl MOD06_0223DFB4
+	bl MOD18_0223DFB4
 	bl FUN_0204F80C
 	bl FUN_020318C4
 	cmp r0, #0x0
@@ -877,7 +877,7 @@ _02050248: .word FUN_02050350
 	thumb_func_start FUN_0205024C
 FUN_0205024C: ; 0x0205024C
 	push {r3, lr}
-	bl MOD06_0223DFB4
+	bl MOD18_0223DFB4
 	ldr r0, _020502A0 ; =UNK_021C5A6C
 	ldr r1, [r0, #0x0]
 	ldrh r0, [r1, #0x3c]
@@ -905,7 +905,7 @@ _0205027E:
 	mov r0, #0x0
 	bl FUN_0204D168
 	bl FUN_0204F930
-	bl MOD06_02245FA0
+	bl MOD18_02245FA0
 	bl MOD18_0223E7FC
 	ldr r0, _020502A8 ; =FUN_020502AC
 	mov r1, #0x0
@@ -920,7 +920,7 @@ _020502A8: .word FUN_020502AC
 	thumb_func_start FUN_020502AC
 FUN_020502AC: ; 0x020502AC
 	push {r3, lr}
-	bl MOD06_0223DFB4
+	bl MOD18_0223DFB4
 	ldr r0, _02050314 ; =UNK_021C5A6C
 	ldr r0, [r0, #0x0]
 	ldr r0, [r0, #0x18]
@@ -944,7 +944,7 @@ _020502E2:
 	mov r0, #0x0
 	bl MOD18_02245358
 	bl FUN_0204F90C
-	bl MOD06_02247808
+	bl MOD18_02247808
 	mov r0, #0x2b
 	bl FUN_020311DC
 	bl FUN_02031190
@@ -974,10 +974,10 @@ _0205032C: .word FUN_02050330
 
 	thumb_func_start FUN_02050330
 FUN_02050330: ; 0x02050330
-	ldr r3, _02050334 ; =MOD06_0223DFB4
+	ldr r3, _02050334 ; =MOD18_0223DFB4
 	bx r3
 	.balign 4
-_02050334: .word MOD06_0223DFB4
+_02050334: .word MOD18_0223DFB4
 
 	thumb_func_start FUN_02050338
 FUN_02050338: ; 0x02050338
@@ -1074,7 +1074,7 @@ FUN_020503F0: ; 0x020503F0
 	ldr r0, _02050418 ; =UNK_02105E94
 	bl FUN_0204FBAC
 	bl MOD18_0223F4F4
-	bl MOD06_02245FA0
+	bl MOD18_02245FA0
 	ldr r0, _0205041C ; =FUN_02050420
 	mov r1, #0x0
 	bl FUN_02050094
@@ -1177,10 +1177,10 @@ _020504CC: .word FUN_020500A4
 
 	thumb_func_start FUN_020504D0
 FUN_020504D0: ; 0x020504D0
-	ldr r3, _020504D4 ; =MOD06_0223DFB4
+	ldr r3, _020504D4 ; =MOD18_0223DFB4
 	bx r3
 	.balign 4
-_020504D4: .word MOD06_0223DFB4
+_020504D4: .word MOD18_0223DFB4
 
 	thumb_func_start FUN_020504D8
 FUN_020504D8: ; 0x020504D8
@@ -1196,7 +1196,7 @@ FUN_020504D8: ; 0x020504D8
 	mov r0, #0x0
 	bl FUN_0204D168
 	bl MOD18_0223EF7C
-	bl MOD06_02245FA0
+	bl MOD18_02245FA0
 	ldr r0, _0205050C ; =FUN_020504D0
 	mov r1, #0x0
 	bl FUN_02050094
@@ -1230,7 +1230,7 @@ _02050544: .word FUN_020504A4
 	thumb_func_start FUN_02050548
 FUN_02050548: ; 0x02050548
 	push {r3, lr}
-	bl MOD06_0223DFB4
+	bl MOD18_0223DFB4
 	bl FUN_0204F80C
 	ldr r0, _02050574 ; =UNK_021C5A6C
 	ldr r0, [r0, #0x0]
diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s
index a81ecdce..79c9b817 100644
--- a/arm9/asm/unk_02063948.s
+++ b/arm9/asm/unk_02063948.s
@@ -1103,14 +1103,14 @@ FUN_02064174: ; 0x02064174
 	add r6, r0, #0x0
 	add r0, r4, #0x0
 	bl FreeToHeap
-	ldr r1, _020641A8 ; =0x0224CB55
+	ldr r1, _020641A8 ; =MOD06_0224CB54
 	add r0, r5, #0x0
 	add r2, r6, #0x0
 	bl FUN_020463EC
 	mov r0, #0x0
 	pop {r4-r6, pc}
 	nop
-_020641A8: .word 0x0224CB55
+_020641A8: .word MOD06_0224CB54
 
 	thumb_func_start FUN_020641AC
 FUN_020641AC: ; 0x020641AC
@@ -1207,14 +1207,14 @@ FUN_02064230: ; 0x02064230
 	bl FUN_02028AD4
 	add r0, r6, #0x0
 	bl FreeToHeap
-	ldr r1, _02064280 ; =0x0224CAAD
+	ldr r1, _02064280 ; =MOD06_0224CAAC
 	add r0, r5, #0x0
 	add r2, r7, #0x0
 	bl FUN_020463EC
 	mov r0, #0x0
 	pop {r3-r7, pc}
 	nop
-_02064280: .word 0x0224CAAD
+_02064280: .word MOD06_0224CAAC
 
 	thumb_func_start FUN_02064284
 FUN_02064284: ; 0x02064284
diff --git a/arm9/global.inc b/arm9/global.inc
index 1f0a338e..f63505da 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -8021,3 +8021,12 @@
 .extern DWC_Auth_CheckWiFiIDNeedCreate
 .extern UNK_021064B8
 .extern UNK_021064C0
+.extern MOD18_0224CA58
+.extern MOD18_0223DFB4
+.extern MOD18_02245FA0
+.extern MOD18_02247808
+.extern MOD18_02244DB0
+.extern MOD18_02247544
+.extern MOD18_0224A7C8
+.extern MOD06_0224CAAC
+.extern MOD06_0224CB54
diff --git a/arm9/pokepearl.us.sha1 b/arm9/pokepearl.us.sha1
index 20126316..5119f8f0 100644
--- a/arm9/pokepearl.us.sha1
+++ b/arm9/pokepearl.us.sha1
@@ -1,4 +1,4 @@
-3d3633517922c35d5e9a328f99ca73a43f310aac  build/pearl.us/arm9.sbin
+9bc91434a07a321bda33c35cc10ec629fef349c6  build/pearl.us/arm9.sbin
 ec5e730b64477dbc4354aa2bbc572f3a349714d2  build/pearl.us/arm9_table.sbin
 de8a847bff8c343d69b853a215e6ee775ef2ef96  build/pearl.us/MODULE_00.sbin
 efeb3b1410ea015d74802b84094474f937746866  build/pearl.us/MODULE_01.sbin