Merge pull request #324 from marijnvdwerf/de/integrate-data-includes

Integrate German

6 files changed, 102 insertions, 129 deletions

diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index a8305b2b1..15cb95854 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -3603,5 +3603,61 @@ _0813611E:
 	.align 2, 0
 _0813612C: .4byte gSaveBlock2 + 0x556
 	thumb_func_end sub_813610C
-	
+
+.ifdef GERMAN
+	thumb_func_start de_sub_81364AC
+de_sub_81364AC: @ 81364AC
+	push {lr}
+	ldr r2, _DE_081364C0 @ =gSaveBlock2
+	ldr r0, _DE_081364C4 @ =0x00000564
+	adds r1, r2, r0
+	ldrb r0, [r1]
+	cmp r0, 0xC8
+	bne _DE_081364CC
+	ldr r1, _DE_081364C8 @ =0x00000499
+	adds r0, r2, r1
+	b _DE_081364F2
+	.align 2, 0
+_DE_081364C0: .4byte gSaveBlock2
+_DE_081364C4: .4byte 0x00000564
+_DE_081364C8: .4byte 0x00000499
+_DE_081364CC:
+	cmp r0, 0x63
+	bhi _DE_081364E4
+	ldr r2, _DE_081364E0 @ =gBattleTowerTrainers
+	ldrb r1, [r1]
+	lsls r0, r1, 1
+	adds r0, r1
+	lsls r0, 3
+	adds r0, r2
+	b _DE_081364F2
+	.align 2, 0
+_DE_081364E0: .4byte gBattleTowerTrainers
+_DE_081364E4:
+	ldrb r0, [r1]
+	subs r0, 0x64
+	movs r1, 0xA4
+	muls r0, r1
+	adds r0, r2
+	adds r1, 0xA9
+	adds r0, r1
+_DE_081364F2:
+	ldrb r0, [r0]
+	pop {r1}
+	bx r1
+	thumb_func_end de_sub_81364AC
+
+	thumb_func_start de_sub_81364F8
+de_sub_81364F8: @ 81364F8
+	ldr r0, _DE_08136504 @ =gSaveBlock2
+	ldr r1, _DE_08136508 @ =0x00000499
+	adds r0, r1
+	ldrb r0, [r0]
+	bx lr
+	.align 2, 0
+_DE_08136504: .4byte gSaveBlock2
+_DE_08136508: .4byte 0x00000499
+	thumb_func_end de_sub_81364F8
+.endif
+
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/item_menu.s b/asm/item_menu.s
index b76f24ccf..17e399160 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -2516,7 +2516,11 @@ _080A4470:
 	bl ItemId_GetItem
 	adds r1, r0, 0
 	adds r0, r7, 0
+.ifdef ENGLISH
 	movs r2, 0x60
+.else
+	movs r2, 0x63
+.endif
 	movs r3, 0
 	bl sub_8072C74
 	ldr r0, _080A44F0 @ =gStringVar1
diff --git a/asm/learn_move.s b/asm/learn_move.s
index fdf650a08..89cd2efb8 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -1037,7 +1037,7 @@ _08132F58:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08132FD6
-	ldr r0, _08132F78 @ =gOtherText_ForgotOrDidNotLearnMove
+	ldr r0, _08132F78 @ =gOtherText_ForgotOrDidNotLearnMove / deuOtherText_ForgotAndLearned
 	bl sub_81328E8
 	ldr r0, _08132F7C @ =gUnknown_030007B0
 	ldr r1, [r0]
@@ -1047,7 +1047,11 @@ _08132F58:
 	bl PlayFanfare
 	b _08132FD6
 	.align 2, 0
+.ifdef ENGLISH
 _08132F78: .4byte gOtherText_ForgotOrDidNotLearnMove
+.else
+_08132F78: .4byte deuOtherText_ForgotAndLearned
+.endif
 _08132F7C: .4byte gUnknown_030007B0
 _08132F80: .4byte 0x0000016f
 _08132F84:
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
index caab4e299..d227b17c1 100644
--- a/asm/mon_markings.s
+++ b/asm/mon_markings.s
@@ -720,7 +720,11 @@ _080F7770:
 	ldr r2, [r1, 0x24]
 	ldr r3, [sp, 0x58]
 	asrs r0, r3, 16
+.ifdef ENGLISH
 	adds r0, 0x20
+.else
+	adds r0, 0x18
+.endif
 	strh r0, [r2, 0x20]
 	ldr r2, [r1, 0x24]
 	mov r0, r8
diff --git a/asm/rom_header.inc b/asm/rom_header.inc
index a7348ad1f..43eec30bb 100644
--- a/asm/rom_header.inc
+++ b/asm/rom_header.inc
@@ -30,9 +30,14 @@ RomHeaderGameTitle:
 
 RomHeaderGameCode:
 	.ifdef SAPPHIRE
-	.ascii "AXPE"
+	.ascii "AXP"
 	.else
-	.ascii "AXVE"
+	.ascii "AXV"
+	.endif
+	.ifdef ENGLISH
+	.ascii "E"
+	.else
+	.ascii "D"
 	.endif
 
 RomHeaderMakerCode:
@@ -54,11 +59,15 @@ RomHeaderSoftwareVersion:
 	.byte REVISION
 
 RomHeaderChecksum:
+	.ifdef ENGLISH
 	.ifdef SAPPHIRE
 	.byte 0x55 - REVISION
 	.else
 	.byte 0x41 - REVISION
 	.endif
+	.else
+	.byte 0x42
+	.endif
 
 RomHeaderReserved2:
 	.space 2
diff --git a/asm/trade.s b/asm/trade.s
index e4d45ec73..223f62474 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -6,6 +6,10 @@
 
 	.text
 
+.ifdef ENGLISH
+	.set sub_804A96C_alt, sub_804A96C
+.endif
+
 	thumb_func_start sub_8047CD8
 sub_8047CD8: @ 8047CD8
 	push {lr}
@@ -4348,7 +4352,7 @@ _08049F8E:
 	movs r5, 0
 	str r5, [sp, 0x8]
 	movs r2, 0
-	bl sub_804A96C
+	bl sub_804A96C_alt
 	ldr r0, [sp, 0x6C]
 	cmp r0, 0
 	beq _0804A08C
@@ -4407,7 +4411,7 @@ _0804A0E4:
 	movs r5, 0
 	str r5, [sp, 0x8]
 	movs r2, 0
-	bl sub_804A96C
+	bl sub_804A96C_alt
 	ldr r0, _0804A22C @ =gUnknown_03004824
 	ldr r3, [r0]
 	ldr r1, [sp, 0x6C]
@@ -5122,6 +5126,13 @@ _0804A690:
 _0804A6CA:
 	strh r0, [r1]
 _0804A6CC:
+.ifdef GERMAN
+	ldr r0, _0804A6E8 @ =gUnknown_03004824
+	ldr r0, [r0]
+	adds r0, 0xD8
+	movs r1, 0x1
+	strb r1, [r0]
+.endif
 	add sp, 0x28
 	pop {r3-r5}
 	mov r8, r3
@@ -5130,6 +5141,10 @@ _0804A6CC:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
+.ifdef GERMAN
+	.align 2, 0
+_0804A6E8: .4byte gUnknown_03004824
+.endif
 	thumb_func_end sub_804A51C
 
 	thumb_func_start sub_804A6DC
@@ -5347,7 +5362,7 @@ sub_804A840: @ 804A840
 	str r5, [sp, 0x8]
 	movs r1, 0
 	movs r2, 0
-	bl sub_804A96C
+	bl sub_804A96C_alt
 	movs r0, 0
 	bl sub_804A6DC
 	movs r0, 0
@@ -5387,7 +5402,7 @@ _0804A8A8:
 	str r1, [sp, 0x8]
 	movs r1, 0xF
 	movs r2, 0
-	bl sub_804A96C
+	bl sub_804A96C_alt
 	movs r0, 0x1
 	bl sub_804A6DC
 	movs r0, 0x1
@@ -5462,81 +5477,7 @@ sub_804A964: @ 804A964
 	bx lr
 	thumb_func_end sub_804A964
 
-	thumb_func_start sub_804A96C
-sub_804A96C: @ 804A96C
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	str r0, [sp]
-	mov r10, r3
-	ldr r0, [sp, 0x24]
-	ldr r3, [sp, 0x28]
-	ldr r4, [sp, 0x2C]
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r6, r2, 24
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r3, 24
-	lsrs r3, 24
-	mov r12, r3
-	lsls r4, 16
-	lsrs r7, r4, 16
-	movs r2, 0
-	cmp r2, r12
-	bge _0804A9DE
-	ldr r0, [sp]
-	adds r0, 0x12
-	mov r9, r0
-	lsls r0, r6, 5
-	adds r0, r1
-	mov r8, r0
-_0804A9AA:
-	movs r4, 0
-	adds r6, r2, 0x1
-	cmp r4, r5
-	bge _0804A9D8
-	lsls r1, r2, 5
-	add r1, r8
-	adds r0, r5, 0
-	muls r0, r2
-	lsls r0, 1
-	mov r2, r10
-	adds r3, r0, r2
-	lsls r1, 1
-	mov r0, r9
-	adds r2, r1, r0
-_0804A9C6:
-	ldrh r1, [r3]
-	adds r0, r7, 0
-	orrs r0, r1
-	strh r0, [r2]
-	adds r3, 0x2
-	adds r2, 0x2
-	adds r4, 0x1
-	cmp r4, r5
-	blt _0804A9C6
-_0804A9D8:
-	adds r2, r6, 0
-	cmp r2, r12
-	blt _0804A9AA
-_0804A9DE:
-	movs r0, 0x1
-	ldr r1, [sp]
-	strb r0, [r1, 0x10]
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_804A96C
+.section .text.sub_804A9F4
 
 	thumb_func_start sub_804A9F4
 sub_804A9F4: @ 804A9F4
@@ -11309,52 +11250,7 @@ _0804DAC0:
 _0804DAD0: .4byte gEnemyParty
 	thumb_func_end sub_804D948
 
-	thumb_func_start sub_804DAD4
-sub_804DAD4: @ 804DAD4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r2, _0804DB28 @ =gIngameTradeMail
-	adds r0, r5, 0
-	adds r0, 0x2A
-	ldrb r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0, r2
-	adds r1, r4, 0
-	movs r3, 0x8
-_0804DAEE:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _0804DAEE
-	adds r0, r4, 0
-	adds r0, 0x12
-	adds r1, r5, 0
-	adds r1, 0x2B
-	bl StringCopy
-	ldr r1, [r5, 0x18]
-	lsrs r0, r1, 24
-	strb r0, [r4, 0x1A]
-	lsrs r0, r1, 16
-	strb r0, [r4, 0x1B]
-	lsrs r0, r1, 8
-	strb r0, [r4, 0x1C]
-	strb r1, [r4, 0x1D]
-	ldrh r0, [r5, 0xC]
-	strh r0, [r4, 0x1E]
-	ldrh r0, [r5, 0x28]
-	strh r0, [r4, 0x20]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804DB28: .4byte gIngameTradeMail
-	thumb_func_end sub_804DAD4
+.section .text.sub_804DB2C
 
 	thumb_func_start sub_804DB2C
 sub_804DB2C: @ 804DB2C