Merge pull request #193 from PikalaxALT/pikalax_work

Build Pokemon Pearl

8 files changed, 142 insertions, 10 deletions

diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 0279b0fc..11800b6f 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -66803,8 +66803,11 @@ UNK05_021FC634: ; 0x021FC634
 
 	.global UNK05_021FC644
 UNK05_021FC644: ; 0x021FC644
-	.byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00
+.ifdef DIAMOND
+	.word 2, 3, 4
+.else
+	.word 5, 6, 7
+.endif
 
 	.global UNK05_021FC650
 UNK05_021FC650: ; 0x021FC650
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index bda36f5e..81c8d551 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -1209,19 +1209,30 @@ MOD06_02239F80: ; 0x02239F80
 	ldr r1, _0223A01C ; =0x000022A2
 	add r0, sp, #0
 	strh r1, [r0]
+	.ifdef DIAMOND
 	mov r1, #0x3e
 	lsl r1, r1, #0xa
+	.else
+	ldr r1, _0223A01C_PEARL ; =0x0000090C
+	.endif
 	strh r1, [r0, #2]
 	mov r1, #0
 	strh r1, [r0, #4]
 	ldr r1, [r5, #0x20]
 	add r0, sp, #0
 	bl FUN_0201EF90
+	.ifdef DIAMOND
 	mov r0, #2
 	mov r1, #0x7d
+	.else
+	mov r0, #0xe
+	ldr r1, _0223A020_PEARL ; 0x007EF000
+	.endif
 	ldr r2, [r5, #0x20]
 	lsl r0, r0, #0xc
+	.ifdef DIAMOND
 	lsl r1, r1, #0x10
+	.endif
 	bl FUN_0201EC94
 	mov r0, #4
 	bl MOD06_0223B574
@@ -1245,12 +1256,23 @@ MOD06_02239F80: ; 0x02239F80
 	add sp, #0x14
 	pop {r4, r5, pc}
 	nop
+	.ifdef DIAMOND
 _0223A008: .word 0x00001701
 _0223A00C: .word 0x000C8A55
 _0223A010: .word 0x002280EF
 _0223A014: .word 0x000CA424
 _0223A018: .word 0x00268C50
 _0223A01C: .word 0x000022A2
+	.else
+_0223A008: .word 0x000010C1
+_0223A00C: .word 0x000D5052
+_0223A010: .word 0x001BFFBD
+_0223A014: .word 0x000AA361
+_0223A018: .word 0x0025DFDC
+_0223A01C: .word 0x000019A3
+_0223A01C_PEARL: .word 0x0000090C
+_0223A020_PEARL: .word 0x007EF000
+	.endif
 
 	thumb_func_start MOD06_0223A020
 MOD06_0223A020: ; 0x0223A020
@@ -4163,10 +4185,20 @@ MOD06_0223B598: ; 0x0223B598
 	str r4, [sp]
 	ldr r4, _0223B5C0 ; =0x000080B5
 	str r4, [sp, #4]
+	.ifdef DIAMOND
 	sub r4, r4, #7
+	.else
+	ldr r4, _0223B5C4 ; =0x000085A8
+	.endif
 	str r4, [sp, #8]
+	.ifdef DIAMOND
 	ldr r4, _0223B5C4 ; =0x00029BA8
 	add r1, r1, r4
+	.else
+	mov r4, #0x4b
+	lsl r4, r4, #0xc
+	sub r1, r1, r4
+	.endif
 	ldr r4, _0223B5C8 ; =0x00037294
 	sub r2, r2, r4
 	ldr r4, _0223B5CC ; =0x000B6876
@@ -4174,12 +4206,24 @@ MOD06_0223B598: ; 0x0223B598
 	bl MOD06_0223B514
 	add sp, #0xc
 	pop {r3, r4, pc}
+	.ifdef DIAMOND
 	.align 2, 0
+	.else
+	nop
+	.endif
+.ifdef DIAMOND
 _0223B5BC: .word 0x0000F49F
 _0223B5C0: .word 0x000080B5
 _0223B5C4: .word 0x00029BA8
 _0223B5C8: .word 0x00037294
 _0223B5CC: .word 0x000B6876
+.else
+_0223B5BC: .word 0x0000E667
+_0223B5C0: .word 0x0000760B
+_0223B5C4: .word 0x000085A8
+_0223B5C8: .word 0x000156B1
+_0223B5CC: .word 0x00099919
+.endif
 
 	thumb_func_start MOD06_0223B5D0
 MOD06_0223B5D0: ; 0x0223B5D0
@@ -4274,8 +4318,13 @@ MOD06_0223B66C: ; 0x0223B66C
 	str r4, [sp, #4]
 	ldr r4, _0223B6A0 ; =0x000080B5
 	str r4, [sp, #8]
+	.ifdef DIAMOND
 	sub r4, r4, #7
+	.else
+	ldr r4, _0223B6AC_PEARL ; =0x000085A8
+	.endif
 	str r4, [sp, #0xc]
+	.ifdef DIAMOND
 	mov r4, #0x11
 	lsl r4, r4, #0xc
 	add r1, r1, r4
@@ -4284,13 +4333,29 @@ MOD06_0223B66C: ; 0x0223B66C
 	sub r2, r2, r4
 	mov r4, #0xcb
 	lsl r4, r4, #0xc
+	.else
+	mov r4, #0x3e
+	lsl r4, r4, #0xc
+	sub r1, r1, r4
+	mov r4, #0x4f
+	lsl r4, r4, #0xc
+	sub r2, r2, r4
+	mov r4, #0xd
+	lsl r4, r4, #0x10
+	.endif
 	sub r3, r3, r4
 	bl MOD06_0223B20C
 	add sp, #0x10
 	pop {r4, pc}
 	nop
+	.ifdef DIAMOND
 _0223B69C: .word 0x0000F49F
 _0223B6A0: .word 0x000080B5
+	.else
+_0223B69C: .word 0x0000E667
+_0223B6A0: .word 0x0000760B
+_0223B6AC_PEARL: .word 0x000085A8
+	.endif
 
 	thumb_func_start MOD06_0223B6A4
 MOD06_0223B6A4: ; 0x0223B6A4
@@ -31366,7 +31431,7 @@ MOD06_02248BC0: ; 0x02248BC0
 	mov r1, #2
 	bl MOD06_02248B1C
 	add r0, r4, #0
-	mov r1, #0xa
+	mov r1, #GAME_VERSION
 	bl MOD06_02248B20
 	add r0, r6, #0
 	bl FUN_0202B544
@@ -31403,7 +31468,7 @@ MOD06_02248C18: ; 0x02248C18
 	mov r1, #2
 	bl MOD06_02248B1C
 	add r0, r4, #0
-	mov r1, #0xa
+	mov r1, #GAME_VERSION
 	bl MOD06_02248B20
 	mov r0, #0
 	str r0, [r4, #0x14]
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index d7f81901..72471ecd 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -9771,7 +9771,12 @@ MOD16_021DBC48: ; 0x021DBC48
 _021DBC6C:
 	add r0, r5, r4
 	str r0, [sp, #4]
+	.ifdef DIAMOND
 	ldr r0, _021DBC98 ; =0x00000267
+	.else
+	mov r0, #0x9a
+	lsl r0, r0, #2
+	.endif
 	b _021DBC8C
 _021DBC74:
 	cmp r4, #1
@@ -9792,8 +9797,11 @@ _021DBC8C:
 	bl MOD16_021DBCA0
 	add sp, #0x10
 	pop {r4, r5, r6, pc}
-	.align 2, 0
+	.ifdef DIAMOND
 _021DBC98: .word 0x00000267
+	.else
+	nop
+	.endif
 _021DBC9C: .word 0x00000269
 	thumb_func_end MOD16_021DBC48
 
@@ -9935,7 +9943,11 @@ _021DBD82:
 	str r2, [sp]
 	add r0, sp, #8
 	str r0, [sp, #4]
+	.ifdef DIAMOND
 	mov r0, #0x8b
+	.else
+	mov r0, #0x8c
+	.endif
 	add r1, r5, r1
 	bl FUN_02006D18
 	str r0, [r4]
@@ -9986,7 +9998,11 @@ MOD16_021DBDE4: ; 0x021DBDE4
 	str r1, [sp]
 	add r0, sp, #8
 	str r0, [sp, #4]
+	.ifdef DIAMOND
 	mov r0, #0x8b
+	.else
+	mov r0, #0x8c
+	.endif
 	add r2, r1, #0
 	bl FUN_02006D18
 	cmp r4, #0
@@ -10010,7 +10026,11 @@ MOD16_021DBE0C: ; 0x021DBE0C
 	str r2, [sp]
 	add r0, sp, #8
 	str r0, [sp, #4]
+	.ifdef DIAMOND
 	mov r0, #0x8b
+	.else
+	mov r0, #0x8c
+	.endif
 	mov r1, #2
 	bl FUN_02006D18
 	add r5, r0, #0
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 80b4595e..874c8dbf 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -3032,20 +3032,36 @@ MOD18_0223AE88: ; 0x0223AE88
 	mov r1, #0
 	cmp r0, #0
 	beq _0223AEB6
+	.ifdef DIAMOND
 	ldrh r0, [r5, #8]
+	.else
+	ldrh r0, [r5, #0xa]
+	.endif
 	b _0223AEB8
 _0223AEB6:
+	.ifdef DIAMOND
 	ldrh r0, [r5, #4]
+	.else
+	ldrh r0, [r5, #6]
+	.endif
 _0223AEB8:
 	add r0, r1, r0
 	cmp r4, #0
 	beq _0223AECC
 	ldrb r1, [r5, #0xe]
+	.ifdef DIAMOND
 	cmp r1, #6
+	.else
+	cmp r1, #7
+	.endif
 	bne _0223AEC6
 	add r0, #0x21
 _0223AEC6:
+	.ifdef DIAMOND
 	cmp r1, #1
+	.else
+	cmp r1, #2
+	.endif
 	bne _0223AECC
 	add r0, #0x42
 _0223AECC:
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 86ac09d1..752e8f3c 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -3735,7 +3735,7 @@ _021D91DC:
 	add r0, r4, #0
 	bl FUN_020239CC
 	strb r0, [r5, #4]
-	mov r0, #0xa
+	mov r0, #GAME_VERSION
 	strb r0, [r5, #5]
 	mov r0, #2
 	strb r0, [r5, #6]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 2af8ecb3..257ac70a 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -13623,7 +13623,7 @@ _022342BC:
 	add r1, #0xf6
 	strb r0, [r1]
 	ldr r0, _0223432C ; =0x00000122
-	mov r1, #0xa
+	mov r1, #GAME_VERSION
 	strb r1, [r5, r0]
 	mov r1, #2
 	add r0, r0, #1
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index f601cbf0..3937ec87 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -11565,7 +11565,11 @@ _022332E8:
 	mov r4, #0
 	mvn r4, r4
 _022332F0:
+	.ifdef DIAMOND
 	mov r0, #1
+	.else
+	mov r0, #2
+	.endif
 	lsl r0, r0, #0xa
 	tst r0, r4
 	bne _022332FC
@@ -18703,7 +18707,11 @@ _02236926:
 	ldr r0, _02236B50 ; =0x0000E88C
 	ldr r0, [r4, r0]
 	bl FUN_020146C4
+	.ifdef DIAMOND
 	mov r0, #0x22
+	.else
+	mov r0, #0x23
+	.endif
 	str r0, [r4, #8]
 	mov r0, #4
 	str r0, [r5]
@@ -19190,7 +19198,11 @@ _02236D12:
 	bl FUN_020054C8
 	cmp r6, #0xb
 	bne _02236D34
+	.ifdef DIAMOND
 	mov r1, #0x1d
+	.else
+	mov r1, #0x1e
+	.endif
 	b _02236D36
 _02236D34:
 	mov r1, #0x24
@@ -26871,8 +26883,20 @@ MOD83_0223B280: ; 0x0223B280
 
 	.global MOD83_0223B288
 MOD83_0223B288: ; 0x0223B288
-	.byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00
-	.byte 0x18, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00
+	.word 0x00
+	.ifdef DIAMOND
+	.word 0x14
+	.word 0x12
+	.word 0x16
+	.word 0x18
+	.word 0x1A
+	.else
+	.word 0x15
+	.word 0x13
+	.word 0x17
+	.word 0x19
+	.word 0x1B
+	.endif
 
 	.global MOD83_0223B2A0
 MOD83_0223B2A0: ; 0x0223B2A0
diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s
index 244ed0d7..c01fd84c 100644
--- a/arm9/modules/84/asm/module_84.s
+++ b/arm9/modules/84/asm/module_84.s
@@ -6308,7 +6308,11 @@ MOD84_021DA700: ; 0x021DA700
 
 	.global MOD84_021DA764
 MOD84_021DA764: ; 0x021DA764
-	.byte 0x00, 0x00
+	.ifdef DIAMOND
+	.short 0
+	.else
+	.short 1
+	.endif
 
 	.global MOD84_021DA766
 MOD84_021DA766: ; 0x021DA766