Hardcoded addresses in rom2_4.s

1 files changed, 50 insertions, 31 deletions

diff --git a/arm9/data/rom2_4.s b/arm9/data/rom2_4.s
index ad1846a0..8864d6c7 100644
--- a/arm9/data/rom2_4.s
+++ b/arm9/data/rom2_4.s
@@ -3,6 +3,12 @@
 
 	/* rom2.s TODO: Disassemble */
 
+	.extern UNK_021D71A8
+	.extern UNK_021D72A8
+	.extern UNK_021D73A8
+	.extern __mbtowc_noconv
+	.extern __wctomb_noconv
+
 	.section .data
 
 	/* 0x0210683C */
@@ -46,7 +52,7 @@ Unk_02106900: ; 0x02106900
 
 	.global Unk_02106A00
 Unk_02106A00: ; 0x02106A00
-	.word 0x020D33C8
+	.word DGTi_hash2_arm4_small
 
 	.global Unk_02106A04
 Unk_02106A04: ; 0x02106A04
@@ -65,7 +71,7 @@ UNK_02106A20: ; 0x02106A20
 
 	.global UNK_02106A50
 UNK_02106A50: ; 0x02106A50
-	.byte 0x00, 0xFE, 0x7F, 0x02
+	.word 0x027FFE00
 
 	.global UNK_02106A54
 UNK_02106A54: ; 0x02106A54
@@ -74,31 +80,43 @@ UNK_02106A54: ; 0x02106A54
 	.global UNK_02106A58
 UNK_02106A58: ; 0x02106A58
 	.byte 0x00, 0x00, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x73, 0x1D, 0x02
-	.byte 0x00, 0x01, 0x00, 0x00, 0xA8, 0x73, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC6, 0x0E, 0x02
-	.word 0x020EC658
-	.word 0x020EC68C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word UNK_021D73A8
+	.byte 0x00, 0x01, 0x00, 0x00
+	.word UNK_021D73A8
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word __read_console
+	.word __write_console
+	.word __close_console
 	.byte 0x00, 0x00, 0x00, 0x00
 
 	.global UNK_02106AA4
 UNK_02106AA4: ; 0x02106AA4
 	.byte 0x01, 0x00, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x72, 0x1D, 0x02
-	.byte 0x00, 0x01, 0x00, 0x00, 0xA8, 0x72, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC6, 0x0E, 0x02
-	.word 0x020EC658
-	.word 0x020EC68C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word UNK_021D72A8
+	.byte 0x00, 0x01, 0x00, 0x00
+	.word UNK_021D72A8
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word __read_console
+	.word __write_console
+	.word __close_console
 	.byte 0x00, 0x00, 0x00, 0x00
 
 	.global UNK_02106AF0
 UNK_02106AF0: ; 0x02106AF0
 	.byte 0x02, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0x71, 0x1D, 0x02
-	.byte 0x00, 0x01, 0x00, 0x00, 0xA8, 0x71, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xC6, 0x0E, 0x02
-	.word 0x020EC658
-	.word 0x020EC68C
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word UNK_021D71A8
+	.byte 0x00, 0x01, 0x00, 0x00
+	.word UNK_021D71A8
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word __read_console
+	.word __write_console
+	.word __close_console
 	.byte 0x00, 0x00, 0x00, 0x00
 
 	.global UNK_02106B3C
@@ -133,23 +151,24 @@ UNK_02106B8C: ; 0x02106B8C
 	.balign 4, 0
 	.global UNK_02106B94
 UNK_02106B94: ; 0x02106B94
-	.word 0x020DF2D0
-	.word 0x020DF308
+	.word __mbtowc_noconv
+	.word __wctomb_noconv
 
 	.global UNK_02106B9C
 UNK_02106B9C: ; 0x02106B9C
-	.byte 0x20, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x6B, 0x10, 0x02
+	.byte 0x20, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word UNK_02106BCC
 
 	.global UNK_02106BAC
 UNK_02106BAC: ; 0x02106BAC
-	.word 0x02106B8C
-	.word 0x02106CB0
-	.word 0x02106CA4
-	.word 0x02106C8C
-	.word 0x02106B88
-	.word 0x02106CC0
-	.word 0x02106D18
-	.word 0x02106B84
+	.word UNK_02106B8C
+	.word UNK_02106CB0
+	.word UNK_02106CA4
+	.word UNK_02106C8C
+	.word UNK_02106B88
+	.word UNK_02106CC0
+	.word UNK_02106D18
+	.word UNK_02106B84
 
 	.global UNK_02106BCC
 UNK_02106BCC: ; 0x02106BCC
@@ -173,9 +192,9 @@ UNK_02106C8C: ; 0x02106C8C
 	.balign 4, 0
 	.global UNK_02106C98
 UNK_02106C98: ; 0x02106C98
-	.word 0x02106BAC
-	.word 0x02106B9C
-	.word 0x02106B94
+	.word UNK_02106BAC
+	.word UNK_02106B9C
+	.word UNK_02106B94
 
 	.global UNK_02106CA4
 UNK_02106CA4: ; 0x02106CA4