Merge branch 'master' into link

1 files changed, 161 insertions, 8 deletions

diff --git a/data/text_window.s b/data/text_window.s
index a7389572b..716425100 100644
--- a/data/text_window.s
+++ b/data/text_window.s
@@ -1,17 +1,170 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 
-    .section .rodata
-    .align 2, 0
+	.section .rodata
+	.align 2, 0
 
 gUnknown_0850E87C:: @ 850E87C
-	.incbin "baserom.gba", 0x50e87c, 0x1680
+	 .incbin "baserom.gba", 0x50e87c, 0x120
+
+gUnknown_0850E99C:: @ 850E99C
+	 .incbin "baserom.gba", 0x50e99c, 0x120
+
+gUnknown_0850EABC:: @ 850EABC
+	 .incbin "baserom.gba", 0x50eabc, 0x120
+
+gUnknown_0850EBDC:: @ 850EBDC
+	 .incbin "baserom.gba", 0x50ebdc, 0x120
+
+gUnknown_0850ECFC:: @ 850ECFC
+	 .incbin "baserom.gba", 0x50ecfc, 0x120
+
+gUnknown_0850EE1C:: @ 850EE1C
+	 .incbin "baserom.gba", 0x50ee1c, 0x120
+
+gUnknown_0850EF3C:: @ 850EF3C
+	 .incbin "baserom.gba", 0x50ef3c, 0x120
+
+gUnknown_0850F05C:: @ 850F05C
+	 .incbin "baserom.gba", 0x50f05c, 0x120
+
+gUnknown_0850F17C:: @ 850F17C
+	 .incbin "baserom.gba", 0x50f17c, 0x120
+
+gUnknown_0850F29C:: @ 850F29C
+	 .incbin "baserom.gba", 0x50f29c, 0x120
+
+gUnknown_0850F3BC:: @ 850F3BC
+	 .incbin "baserom.gba", 0x50f3bc, 0x120
+
+gUnknown_0850F4DC:: @ 850F4DC
+	 .incbin "baserom.gba", 0x50f4dc, 0x120
+
+gUnknown_0850F5FC:: @ 850F5FC
+	 .incbin "baserom.gba", 0x50f5fc, 0x120
+
+gUnknown_0850F71C:: @ 850F71C
+	 .incbin "baserom.gba", 0x50f71c, 0x120
+
+gUnknown_0850F83C:: @ 850F83C
+	 .incbin "baserom.gba", 0x50f83c, 0x120
+
+gUnknown_0850F95C:: @ 850F95C
+	 .incbin "baserom.gba", 0x50f95c, 0x120
+
+gUnknown_0850FA7C:: @ 850FA7C
+	 .incbin "baserom.gba", 0x50fa7c, 0x120
+
+gUnknown_0850FB9C:: @ 850FB9C
+	 .incbin "baserom.gba", 0x50fb9c, 0x120
+
+gUnknown_0850FCBC:: @ 850FCBC
+	 .incbin "baserom.gba", 0x50fcbc, 0x120
+
+gUnknown_0850FDDC:: @ 850FDDC
+	 .incbin "baserom.gba", 0x50fddc, 0x120
 
 gUnknown_0850FEFC:: @ 850FEFC
-	.incbin "baserom.gba", 0x50fefc, 0x280
+	 .incbin "baserom.gba", 0x50fefc, 0x20
+
+gUnknown_0850FF1C:: @ 850FF1C
+	 .incbin "baserom.gba", 0x50ff1c, 0x20
+
+gUnknown_0850FF3C:: @ 850FF3C
+	 .incbin "baserom.gba", 0x50ff3c, 0x20
+
+gUnknown_0850FF5C:: @ 850FF5C
+	 .incbin "baserom.gba", 0x50ff5c, 0x20
+
+gUnknown_0850FF7C:: @ 850FF7C
+	 .incbin "baserom.gba", 0x50ff7c, 0x20
+
+gUnknown_0850FF9C:: @ 850FF9C
+	 .incbin "baserom.gba", 0x50ff9c, 0x20
+
+gUnknown_0850FFBC:: @ 850FFBC
+	 .incbin "baserom.gba", 0x50ffbc, 0x20
+
+gUnknown_0850FFDC:: @ 850FFDC
+	 .incbin "baserom.gba", 0x50ffdc, 0x20
+
+gUnknown_0850FFFC:: @ 850FFFC
+	 .incbin "baserom.gba", 0x50fffc, 0x20
+
+gUnknown_0851001C:: @ 851001C
+	 .incbin "baserom.gba", 0x51001c, 0x20
+
+gUnknown_0851003C:: @ 851003C
+	 .incbin "baserom.gba", 0x51003c, 0x20
+
+gUnknown_0851005C:: @ 851005C
+	 .incbin "baserom.gba", 0x51005c, 0x20
+
+gUnknown_0851007C:: @ 851007C
+	 .incbin "baserom.gba", 0x51007c, 0x20
+
+gUnknown_0851009C:: @ 851009C
+	 .incbin "baserom.gba", 0x51009c, 0x20
+
+gUnknown_085100BC:: @ 85100BC
+	 .incbin "baserom.gba", 0x5100bc, 0x20
+
+gUnknown_085100DC:: @ 85100DC
+	 .incbin "baserom.gba", 0x5100dc, 0x20
+
+gUnknown_085100FC:: @ 85100FC
+	 .incbin "baserom.gba", 0x5100fc, 0x20
+
+gUnknown_0851011C:: @ 851011C
+	 .incbin "baserom.gba", 0x51011c, 0x20
+
+gUnknown_0851013C:: @ 851013C
+	 .incbin "baserom.gba", 0x51013c, 0x20
+
+gUnknown_0851015C:: @ 851015C
+	 .incbin "baserom.gba", 0x51015c, 0x20
 
 gUnknown_0851017C:: @ 851017C
-	.incbin "baserom.gba", 0x51017c, 0xa0
+	 .incbin "baserom.gba", 0x51017c, 0xA0
 
 gUnknown_0851021C:: @ 851021C
-	.incbin "baserom.gba", 0x51021c, 0xa0
+	.4byte gUnknown_0850E87C
+	.4byte gUnknown_0850FEFC
+	.4byte gUnknown_0850E99C
+	.4byte gUnknown_0850FF1C
+	.4byte gUnknown_0850EABC
+	.4byte gUnknown_0850FF3C
+	.4byte gUnknown_0850EBDC
+	.4byte gUnknown_0850FF5C
+	.4byte gUnknown_0850ECFC
+	.4byte gUnknown_0850FF7C
+	.4byte gUnknown_0850EE1C
+	.4byte gUnknown_0850FF9C
+	.4byte gUnknown_0850EF3C
+	.4byte gUnknown_0850FFBC
+	.4byte gUnknown_0850F05C
+	.4byte gUnknown_0850FFDC
+	.4byte gUnknown_0850F17C
+	.4byte gUnknown_0850FFFC
+	.4byte gUnknown_0850F29C
+	.4byte gUnknown_0851001C
+	.4byte gUnknown_0850F3BC
+	.4byte gUnknown_0851003C
+	.4byte gUnknown_0850F4DC
+	.4byte gUnknown_0851005C
+	.4byte gUnknown_0850F5FC
+	.4byte gUnknown_0851007C
+	.4byte gUnknown_0850F71C
+	.4byte gUnknown_0851009C
+	.4byte gUnknown_0850F83C
+	.4byte gUnknown_085100BC
+	.4byte gUnknown_0850F95C
+	.4byte gUnknown_085100DC
+	.4byte gUnknown_0850FA7C
+	.4byte gUnknown_085100FC
+	.4byte gUnknown_0850FB9C
+	.4byte gUnknown_0851011C
+	.4byte gUnknown_0850FCBC
+	.4byte gUnknown_0851013C
+	.4byte gUnknown_0850FDDC
+	.4byte gUnknown_0851015C