Distribute rom2.o

12 files changed, 55 insertions, 64 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 69bab74d..778faf68 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -562,7 +562,8 @@ SECTIONS {
 		// * (.init)
 		. = ALIGN(4);
 		/* Text data */
-		rom2.o (.rodata)
+		main.o (.rodata)
+		unk_02001B80.o (.rodata)
 		string_util.o (.rodata)
 		rom2_2.o (.rodata)
 		FS_command.o (.rodata)
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index d8a20e1d..9179c025 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -1,7 +1,7 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC4
+	.extern gGameLanguage
 
 	.text
 
@@ -894,7 +894,7 @@ FUN_02040DEC: ; 0x02040DEC
 	add r1, r0, #0x0
 	add r0, r4, #0x0
 	bl FUN_02021E28
-	ldr r0, _02040E48 ; =UNK_020ECAC4
+	ldr r0, _02040E48 ; =gGameLanguage
 	mov r3, #0x0
 	ldrb r0, [r0, #0x0]
 	str r3, [sp, #0x0]
@@ -909,7 +909,7 @@ FUN_02040DEC: ; 0x02040DEC
 	add sp, #0x8
 	pop {r3-r7, pc}
 	nop
-_02040E48: .word UNK_020ECAC4
+_02040E48: .word gGameLanguage
 
 	thumb_func_start FUN_02040E4C
 FUN_02040E4C: ; 0x02040E4C
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index ed0e058a..10a31936 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -1,9 +1,15 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC8
 	.extern gUnknown21C48B8
 
+	.section .rodata
+
+	.balign 4, 0
+	.global UNK_020ECAC8
+UNK_020ECAC8: ; 0x020ECAC8
+	.incbin "graphics/unk_020ECAC8.4bpp"
+
 	.text
 
 	thumb_func_start FUN_02001B80
diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s
index b9e66861..267b067c 100644
--- a/arm9/asm/unk_02025658.s
+++ b/arm9/asm/unk_02025658.s
@@ -1,8 +1,8 @@
 	.include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC4
-	.extern UNK_020ECAC0
+	.extern gGameLanguage
+	.extern gGameVersion
 
 	.text
 
@@ -13,11 +13,11 @@ FUN_02025658: ; 0x02025658
 	mov r0, #0x0
 	str r0, [r4, #0x0]
 	strb r0, [r4, #0x4]
-	ldr r0, _020256A0 ; =UNK_020ECAC4
+	ldr r0, _020256A0 ; =gGameLanguage
 	mov r1, #0x8
 	ldrb r0, [r0, #0x0]
 	strb r0, [r4, #0x5]
-	ldr r0, _020256A4 ; =UNK_020ECAC0
+	ldr r0, _020256A4 ; =gGameVersion
 	ldrb r0, [r0, #0x0]
 	strb r0, [r4, #0x6]
 	mov r0, #0xff
@@ -45,8 +45,8 @@ _02025690:
 	blt _02025690
 	pop {r3-r5, pc}
 	.balign 4
-_020256A0: .word UNK_020ECAC4
-_020256A4: .word UNK_020ECAC0
+_020256A0: .word gGameLanguage
+_020256A4: .word gGameVersion
 _020256A8: .word 0x0000FFFF
 
 	thumb_func_start FUN_020256AC
diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s
index 51bb9f42..f1c29be8 100644
--- a/arm9/asm/unk_02026CD0.s
+++ b/arm9/asm/unk_02026CD0.s
@@ -1,7 +1,7 @@
 	.include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC4
+	.extern gGameLanguage
 
 	.text
 
@@ -877,7 +877,7 @@ _020272EC:
 _020272F4:
 	ldr r0, _02027308 ; =0x00002345
 	str r0, [r4, #0x0]
-	ldr r0, _0202730C ; =UNK_020ECAC4
+	ldr r0, _0202730C ; =gGameLanguage
 	add r4, #0x71
 	ldrb r0, [r0, #0x0]
 	strb r0, [r4, #0x0]
@@ -885,7 +885,7 @@ _020272F4:
 	nop
 _02027304: .word 0x00001234
 _02027308: .word 0x00002345
-_0202730C: .word UNK_020ECAC4
+_0202730C: .word gGameLanguage
 
 	thumb_func_start FUN_02027310
 FUN_02027310: ; 0x02027310
diff --git a/arm9/asm/unk_02034710.s b/arm9/asm/unk_02034710.s
index ebc0892f..47aa1662 100644
--- a/arm9/asm/unk_02034710.s
+++ b/arm9/asm/unk_02034710.s
@@ -13,7 +13,7 @@
 	.extern UNK_020EED78
 	.extern UNK_020EEDBE
 	.extern UNK_020EED54
-	.extern UNK_020ECAC0
+	.extern gGameVersion
 	.extern UNK_020EEDC0
 	.extern UNK_020EEDD0
 	.extern UNK_020EEDC6
@@ -68,7 +68,7 @@ FUN_0203474C: ; 0x0203474C
 	ldrh r0, [r0, r1]
 	cmp r0, #0x16
 	bne _02034768
-	ldr r1, _02034770 ; =UNK_020ECAC0
+	ldr r1, _02034770 ; =gGameVersion
 	ldrb r1, [r1, #0x0]
 	cmp r1, #0xb
 	bne _02034768
@@ -77,7 +77,7 @@ _02034768:
 	pop {r3, pc}
 	nop
 _0203476C: .word UNK_020EEDBE
-_02034770: .word UNK_020ECAC0
+_02034770: .word gGameVersion
 
 	thumb_func_start FUN_02034774
 FUN_02034774: ; 0x02034774
diff --git a/arm9/asm/unk_02066840.s b/arm9/asm/unk_02066840.s
index 40ae80b8..a7031b20 100644
--- a/arm9/asm/unk_02066840.s
+++ b/arm9/asm/unk_02066840.s
@@ -1,8 +1,8 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC4
-	.extern UNK_020ECAC0
+	.extern gGameLanguage
+	.extern gGameVersion
 
 	.text
 
@@ -36,12 +36,12 @@ FUN_02066840: ; 0x02066840
 	add r1, r7, #0x0
 	add r1, #0xbc
 	str r0, [r1, #0x0]
-	ldr r0, _02066970 ; =UNK_020ECAC0
+	ldr r0, _02066970 ; =gGameVersion
 	ldrb r1, [r0, #0x0]
 	add r0, r7, #0x0
 	add r0, #0xb8
 	strb r1, [r0, #0x0]
-	ldr r0, _02066974 ; =UNK_020ECAC4
+	ldr r0, _02066974 ; =gGameLanguage
 	ldrb r1, [r0, #0x0]
 	add r0, r7, #0x0
 	add r0, #0xb9
@@ -144,5 +144,5 @@ _0206696C:
 	add sp, #0xc
 	pop {r4-r7, pc}
 	.balign 4
-_02066970: .word UNK_020ECAC0
-_02066974: .word UNK_020ECAC4
+_02066970: .word gGameVersion
+_02066974: .word gGameLanguage
diff --git a/arm9/asm/unk_02066978.s b/arm9/asm/unk_02066978.s
index 3f3c592e..88afff5d 100644
--- a/arm9/asm/unk_02066978.s
+++ b/arm9/asm/unk_02066978.s
@@ -1,13 +1,13 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020ECAC4
+	.extern gGameLanguage
 	.extern UNK_021C5AC0
 	.extern UNK_020F7F16
 	.extern UNK_020F7F93
 	.extern UNK_020F7ED4
 	.extern UNK_020F7ECC
-	.extern UNK_020ECAC0
+	.extern gGameVersion
 	.extern UNK_02105FC8
 	.extern UNK_020F7EF2
 	.extern UNK_020F7ECE
@@ -329,7 +329,7 @@ _02066BDE:
 	mov r1, #0x7
 	add r2, sp, #0x3c
 	bl FUN_02067960
-	ldr r2, _02066D88 ; =UNK_020ECAC4
+	ldr r2, _02066D88 ; =gGameLanguage
 	add r0, r5, #0x0
 	mov r1, #0xc
 	bl FUN_02067960
@@ -361,7 +361,7 @@ _02066BDE:
 	mov r1, #0x9b
 	add r2, sp, #0x28
 	bl FUN_02067960
-	ldr r2, _02066D8C ; =UNK_020ECAC0
+	ldr r2, _02066D8C ; =gGameVersion
 	add r0, r5, #0x0
 	mov r1, #0x79
 	bl FUN_02067960
@@ -509,8 +509,8 @@ _02066D5A:
 	bx r3
 	.balign 4
 _02066D84: .word 0xFFFF0000
-_02066D88: .word UNK_020ECAC4
-_02066D8C: .word UNK_020ECAC0
+_02066D88: .word gGameLanguage
+_02066D8C: .word gGameVersion
 
 	thumb_func_start FUN_02066D90
 FUN_02066D90: ; 0x02066D90
@@ -7391,7 +7391,7 @@ FUN_0206A054: ; 0x0206A054
 	str r2, [sp, #0x0]
 	mov r2, #0x0
 	bl FUN_020808AC
-	ldr r2, _0206A090 ; =UNK_020ECAC0
+	ldr r2, _0206A090 ; =gGameVersion
 	add r0, r4, #0x0
 	mov r1, #0x79
 	bl FUN_02067960
@@ -7409,7 +7409,7 @@ FUN_0206A054: ; 0x0206A054
 	add sp, #0x10
 	bx r3
 	nop
-_0206A090: .word UNK_020ECAC0
+_0206A090: .word gGameVersion
 
 	thumb_func_start FUN_0206A094
 FUN_0206A094: ; 0x0206A094
diff --git a/arm9/data/rom2.s b/arm9/data/rom2.s
deleted file mode 100644
index 5cdb9ae0..00000000
--- a/arm9/data/rom2.s
+++ /dev/null
@@ -1,33 +0,0 @@
-
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020ECAC0
-UNK_020ECAC0: ; 0x020ECAC0
-	.byte 0x0A, 0x00, 0x00, 0x00
-
-	.global UNK_020ECAC4
-UNK_020ECAC4: ; 0x020ECAC4
-	.byte 0x02, 0x00, 0x00, 0x00
-
-	.global UNK_020ECAC8
-UNK_020ECAC8: ; 0x020ECAC8
-	.byte 0xFF, 0xFF, 0xFF, 0x00
-	.byte 0xFF, 0xFF, 0xFF, 0x00
-	.byte 0x21, 0xFF, 0xFF, 0x00
-	.byte 0x11, 0xF2, 0xFF, 0x00
-	.byte 0x11, 0x21, 0xFF, 0x00
-	.byte 0x11, 0x11, 0xF2, 0x00
-	.byte 0x11, 0x11, 0x21, 0x00
-	.byte 0x11, 0x11, 0x22, 0x00
-	.byte 0x11, 0x21, 0xF2, 0x00
-	.byte 0x11, 0x22, 0xFF, 0x00
-	.byte 0x21, 0xF2, 0xFF, 0x00
-	.byte 0x22, 0xFF, 0xFF, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-
diff --git a/arm9/graphics/unk_020ECAC8.png b/arm9/graphics/unk_020ECAC8.png
new file mode 100644
index 00000000..b1b610c4
--- /dev/null
+++ b/arm9/graphics/unk_020ECAC8.png
diff --git a/arm9/src/main.c b/arm9/src/main.c
index 93858cc2..9e6a6227 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -52,6 +52,9 @@ extern struct Unk21DBE18 MOD52_UNK_021D76C8;
 
 extern u8 SDK_STATIC_BSS_START[];
 
+const enum GameVersion gGameVersion = VERSION_DIAMOND;
+const enum GameLanguage gGameLanguage = LANGUAGE_ENGLISH;
+
 THUMB_FUNC void NitroMain(void)
 {
     InitSystemForTheGame();
diff --git a/include/global.h b/include/global.h
index b872b96c..8d5a3e78 100644
--- a/include/global.h
+++ b/include/global.h
@@ -4,6 +4,20 @@
 #include "function_target.h"
 #include "nitro.h"
 
+enum GameVersion {
+    VERSION_SAPPHIRE   =  1,
+    VERSION_RUBY       =  2,
+    VERSION_EMERALD    =  3,
+    VERSION_FIRE_RED   =  4,
+    VERSION_LEAF_GREEN =  5,
+    VERSION_DIAMOND    = 10,
+};
+
+enum GameLanguage {
+    LANGUAGE_JAPANESE   = 1,
+    LANGUAGE_ENGLISH    = 2,
+};
+
 extern void ErrorHandling(void);
 
 #endif //GUARD_GLOBAL_H