resolve tv.c conflict

3 files changed, 13 insertions, 103 deletions

diff --git a/asm/crt0.s b/asm/crt0.s
index 121b11744..049392be9 100644
--- a/asm/crt0.s
+++ b/asm/crt0.s
@@ -1,4 +1,6 @@
 	.include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
+	.include "constants/version.inc"
 
 	.syntax unified
 
@@ -47,10 +49,15 @@ GPIOPortReadEnable: @ 80000C8
 	.4byte 0xFFFFFFFF
 	.4byte 0xFFFFFFFF
 	.4byte 0xFFFFFFFF
-	.4byte          2
-	.4byte          5
+	.4byte GAME_VERSION
+	.4byte GAME_LANGUAGE
+	.ifdef SAPPHIRE
+	.ascii "pokemon sapphire version"
+	.space 8
+	.else
 	.ascii "pokemon ruby version"
 	.space 12
+	.endif
 	.4byte gMonFrontPicTable
 	.4byte gMonBackPicTable
 	.4byte gMonPaletteTable
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index c34212a24..6b85e1e76 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -10730,105 +10730,4 @@ _080EB3F6:
 	bx r1
 	thumb_func_end sub_80EB37C
 
-	thumb_func_start sub_80EB3FC
-sub_80EB3FC: @ 80EB3FC
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	lsls r6, r1, 16
-	lsrs r4, r6, 16
-	adds r7, r4, 0
-	adds r0, r4, 0
-	bl sub_80EB37C
-	lsls r0, 24
-	cmp r0, 0
-	beq _080EB420
-	ldr r1, _080EB41C @ =gOtherText_ThreeQuestions
-	adds r0, r5, 0
-	bl StringCopy
-	b _080EB4A6
-	.align 2, 0
-_080EB41C: .4byte gOtherText_ThreeQuestions
-_080EB420:
-	ldr r0, _080EB43C @ =0x0000ffff
-	cmp r4, r0
-	beq _080EB4A0
-	lsrs r1, r6, 25
-	ldr r2, _080EB440 @ =0x000001ff
-	ands r2, r7
-	cmp r1, 0x13
-	bgt _080EB444
-	cmp r1, 0x12
-	bge _080EB458
-	cmp r1, 0
-	beq _080EB448
-	b _080EB468
-	.align 2, 0
-_080EB43C: .4byte 0x0000ffff
-_080EB440: .4byte 0x000001ff
-_080EB444:
-	cmp r1, 0x15
-	bne _080EB468
-_080EB448:
-	movs r0, 0xB
-	adds r1, r2, 0
-	muls r1, r0
-	ldr r0, _080EB454 @ =gSpeciesNames
-	adds r1, r0
-	b _080EB498
-	.align 2, 0
-_080EB454: .4byte gSpeciesNames
-_080EB458:
-	movs r0, 0xD
-	adds r1, r2, 0
-	muls r1, r0
-	ldr r0, _080EB464 @ =gMoveNames
-	adds r1, r0
-	b _080EB498
-	.align 2, 0
-_080EB464: .4byte gMoveNames
-_080EB468:
-	ldr r0, _080EB4AC @ =gEasyChatGroupWords
-	lsls r1, 2
-	adds r1, r0
-	ldr r1, [r1]
-	subs r0, r2, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldr r0, _080EB4B0 @ =0x0000ffff
-	cmp r2, r0
-	beq _080EB498
-	adds r3, r0, 0
-_080EB47E:
-	ldrb r0, [r1]
-	adds r1, 0x1
-	subs r2, 0x1
-	cmp r0, 0xFF
-	beq _080EB490
-_080EB488:
-	ldrb r0, [r1]
-	adds r1, 0x1
-	cmp r0, 0xFF
-	bne _080EB488
-_080EB490:
-	lsls r0, r2, 16
-	lsrs r2, r0, 16
-	cmp r2, r3
-	bne _080EB47E
-_080EB498:
-	adds r0, r5, 0
-	bl StringCopy
-	adds r5, r0, 0
-_080EB4A0:
-	movs r0, 0xFF
-	strb r0, [r5]
-	adds r0, r5, 0
-_080EB4A6:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080EB4AC: .4byte gEasyChatGroupWords
-_080EB4B0: .4byte 0x0000ffff
-	thumb_func_end sub_80EB3FC
-
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/rom_header.inc b/asm/rom_header.inc
index 43eec30bb..a852a9f23 100644
--- a/asm/rom_header.inc
+++ b/asm/rom_header.inc
@@ -66,8 +66,12 @@ RomHeaderChecksum:
 	.byte 0x41 - REVISION
 	.endif
 	.else
+	.ifdef SAPPHIRE
+	.byte 0x56
+	.else
 	.byte 0x42
 	.endif
+	.endif
 
 RomHeaderReserved2:
 	.space 2