Merge branch 'master' into field_map_obj

2017-09-17 13:38:33 -04:00
parent 4b04e92e8b 74bda5b680
commit 71b40f50c0
206 changed files with 137559 additions and 132143 deletions
--- a/data/berry_tag_screen.s
+++ b/data/berry_tag_screen.s
@@ -3,6 +3,7 @@

 	.section .rodata

+    .align 2
 gUnknown_085EFCF0:: @ 85EFCF0
 	.incbin "baserom.gba", 0x5efcf0, 0x10

--- a/data/data2.s
+++ b/data/data2.s
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -75,7 +75,13 @@ gUnknown_082FF178:: @ 82FF178
 	.incbin "baserom.gba", 0x2ff178, 0x50

 gUnknown_082FF1C8:: @ 82FF1C8
-	.incbin "baserom.gba", 0x2ff1c8, 0x450
+	.incbin "baserom.gba", 0x2ff1c8, 0x10
+
+gUnknown_082FF1D8:: @ 82FF1D8
+	.incbin "baserom.gba", 0x2ff1d8, 0x20
+
+gUnknown_082FF1F8:: @ 82FF1F8
+	.incbin "baserom.gba", 0x2ff1f8, 0x420

 gUnknown_082FF618:: @ 82FF618
 	.incbin "baserom.gba", 0x2ff618, 0x7c
--- a/data/data3.s
+++ b/data/data3.s
@@ -1400,7 +1400,294 @@ gUnknown_0852489C:: @ 852489C
 	.incbin "baserom.gba", 0x52489c, 0x20

 sFanfares:: @ 85248BC
-	.incbin "baserom.gba", 0x5248bc, 0x288
+	.incbin "baserom.gba", 0x5248bc, 0x48
+
+gUnknown_08524904:: @ 8524904
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852490C:: @ 852490C
+	.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524914:: @ 8524914
+	.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852491C:: @ 852491C
+	.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524924:: @ 8524924
+	.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852492C:: @ 852492C
+	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524934:: @ 8524934
+	.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852493C:: @ 852493C
+	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524944:: @ 8524944
+	.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852494C:: @ 852494C
+	.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524954:: @ 8524954
+	.byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852495C:: @ 852495C
+	.byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524964:: @ 8524964
+	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852496C:: @ 852496C
+	.byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524974:: @ 8524974
+	.byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852497C:: @ 852497C
+	.byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524984:: @ 8524984
+	.byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852498C:: @ 852498C
+	.byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524994:: @ 8524994
+	.byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_0852499C:: @ 852499C
+	.byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249A4:: @ 85249A4
+	.byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249AC:: @ 85249AC
+	.byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249B4:: @ 85249B4
+	.byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249BC:: @ 85249BC
+	.byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249C4:: @ 85249C4
+	.byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249CC:: @ 85249CC
+	.byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249D4:: @ 85249D4
+	.byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249DC:: @ 85249DC
+	.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249E4:: @ 85249E4
+	.byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249EC:: @ 85249EC
+	.byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249F4:: @ 85249F4
+	.byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_085249FC:: @ 85249FC
+	.byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A04:: @ 8524A04
+	.byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A0C:: @ 8524A0C
+	.byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A14:: @ 8524A14
+	.byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A1C:: @ 8524A1C
+	.byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A24:: @ 8524A24
+	.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A2C:: @ 8524A2C
+	.byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A34:: @ 8524A34
+	.byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A3C:: @ 8524A3C
+	.byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A44:: @ 8524A44
+	.byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A4C:: @ 8524A4C
+	.byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A54:: @ 8524A54
+	.byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A5C:: @ 8524A5C
+	.byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A64:: @ 8524A64
+	.byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A6C:: @ 8524A6C
+	.byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A74:: @ 8524A74
+	.byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A7C:: @ 8524A7C
+	.byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A84:: @ 8524A84
+	.byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A8C:: @ 8524A8C
+	.byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A94:: @ 8524A94
+	.byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524A9C:: @ 8524A9C
+	.byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AA4:: @ 8524AA4
+	.byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AAC:: @ 8524AAC
+	.byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AB4:: @ 8524AB4
+	.byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524ABC:: @ 8524ABC
+	.byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AC4:: @ 8524AC4
+	.byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524ACC:: @ 8524ACC
+	.byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AD4:: @ 8524AD4
+	.byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524ADC:: @ 8524ADC
+	.byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AE4:: @ 8524AE4
+	.byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AEC:: @ 8524AEC
+	.byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AF4:: @ 8524AF4
+	.byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524AFC:: @ 8524AFC
+	.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B04:: @ 8524B04
+	.byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B0C:: @ 8524B0C
+	.byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B14:: @ 8524B14
+	.byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B1C:: @ 8524B1C
+	.byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B24:: @ 8524B24
+	.byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B2C:: @ 8524B2C
+	.byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B34:: @ 8524B34
+	.byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
+
+	.align 2
+gUnknown_08524B3C:: @ 8524B3C
+	.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00

 gUnknown_08524B44:: @ 8524B44
 	.incbin "baserom.gba", 0x524b44, 0x1d0
--- a/data/data3a.s
+++ b/data/data3a.s
@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    @ unknown unreferenced data
-    
-	.incbin "baserom.gba", 0x58d977, 0x2a1
--- a/data/data3b.s
+++ b/data/data3b.s
@@ -5,6 +5,9 @@

 	.section .rodata

+    .align 2
+    .incbin "baserom.gba", 0x58d978, 0x2a0
+    
 	.align 2
 gFieldEffectObjectPalette7:: @ 858DC18
 	.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
--- a/data/data_emerald2.s
+++ b/data/data_emerald2.s
@@ -932,6 +932,114 @@ gUnknown_0862B7E8:: @ 862B7E8
 	.incbin "baserom.gba", 0x62b7e8, 0x14

 gUnknown_0862B7FC:: @ 862B7FC
-	.incbin "baserom.gba", 0x62b7fc, 0x2e8
+	.incbin "baserom.gba", 0x62b7fc, 0x14

-    
+	.align 2
+	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+    .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+    .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+    .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+    .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
+    .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
+    .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+    .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+    .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
+    .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
+    .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+    .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+    .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+    .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
+    .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
+    .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
+
+gUnknown_0862B9F9:: @ 862B9F9
+    .string "ABCDE$"
+
+gUnknown_0862B9FF:: @ 862B9FF
+    .string "FGHIJ$"
+
+gUnknown_0862BA05:: @ 862BA05
+    .string "KLMNO$"
+
+gUnknown_0862BA0B:: @ 862BA0B
+    .string "PQRST$"
+
+gUnknown_0862BA11:: @ 862BA11
+    .string "UVWXY$"
+
+gUnknown_0862BA17:: @ 862BA17
+    .string "Z    $"
+
+gUnknown_0862BA1D:: @ 862BA1D
+    .string "01234$"
+
+gUnknown_0862BA23:: @ 862BA23
+    .string "56789$"
+
+gUnknown_0862BA29:: @ 862BA29
+    .string ".,!? $"
+
+gUnknown_0862BA2F:: @ 862BA2F
+    .string "-/&… $"
+
+gUnknown_0862BA35:: @ 862BA35
+    .string "abcde$"
+
+gUnknown_0862BA3B:: @ 862BA3B
+    .string "fghij$"
+
+gUnknown_0862BA41:: @ 862BA41
+    .string "klmno$"
+
+gUnknown_0862BA47:: @ 862BA47
+    .string "pqrst$"
+
+gUnknown_0862BA4D:: @ 862BA4D
+    .string "uvwxy$"
+
+gUnknown_0862BA53:: @ 862BA53
+    .string "z    $"
+
+gUnknown_0862BA59:: @ 862BA59
+    .string "01234$"
+
+gUnknown_0862BA5F:: @ 862BA5F
+    .string "56789$"
+
+gUnknown_0862BA65:: @ 862BA65
+    .string ".,!? $"
+
+gUnknown_0862BA6B:: @ 862BA6B
+    .string "-/&… $"
+
+    .string "$$$$$$$$"
+
+gUnknown_0862BA79:: @ 862BA79
+    .string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$"
+
+gUnknown_0862BA84:: @ 862BA84
+    .string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$"
+
+gUnknown_0862BA8F:: @ 862BA8F
+    .string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$"
+
+gUnknown_0862BA9A:: @ 862BA9A
+    .string "♂♀{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$"
+
+gUnknown_0862BAA3:: @ 862BAA3
+    .string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$"
+
+gUnknown_0862BAAE:: @ 862BAAE
+    .string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$"
+
+gUnknown_0862BAB9:: @ 862BAB9
+    .string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$"
+
+gUnknown_0862BAC4:: @ 862BAC4
+    .string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$"
+
+gUnknown_0862BACF:: @ 862BACF
+    .string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$"
+
+gUnknown_0862BADA:: @ 862BADA
+    .string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}ょ: $"
--- a/data/fonts.s
+++ b/data/fonts.s
@@ -7,6 +7,7 @@
 gFont8LatinGlyphs:: @ 862BAE4
 	.incbin "data/graphics/fonts/font8.latfont"

+	.align 2
 gFont8LatinGlyphWidths:: @ 8633AE4
 	.include "data/graphics/fonts/font8_latin_widths.inc"

@@ -14,6 +15,7 @@ gFont8LatinGlyphWidths:: @ 8633AE4
 gFont0LatinGlyphs:: @ 8633CE4
 	.incbin "data/graphics/fonts/font0.latfont"

+	.align 2
 gFont0LatinGlyphWidths:: @ 863BCE4
 	.include "data/graphics/fonts/font0_latin_widths.inc"

@@ -21,6 +23,7 @@ gFont0LatinGlyphWidths:: @ 863BCE4
 gFont7LatinGlyphs:: @ 863BEE4
 	.incbin "data/graphics/fonts/font7.latfont"

+	.align 2
 gFont7LatinGlyphWidths:: @ 8643EE4
 	.include "data/graphics/fonts/font7_latin_widths.inc"

@@ -28,6 +31,7 @@ gFont7LatinGlyphWidths:: @ 8643EE4
 gFont2LatinGlyphs:: @ 86440E4
 	.incbin "data/graphics/fonts/font2.latfont"

+	.align 2
 gFont2LatinGlyphWidths:: @ 864C0E4
 	.include "data/graphics/fonts/font2_latin_widths.inc"

@@ -35,6 +39,7 @@ gFont2LatinGlyphWidths:: @ 864C0E4
 gFont1LatinGlyphs:: @ 864C2E4
 	.incbin "data/graphics/fonts/font1.latfont"

+	.align 2
 gFont1LatinGlyphWidths:: @ 86542E4
 	.include "data/graphics/fonts/font1_latin_widths.inc"

@@ -50,6 +55,7 @@ gFont1JapaneseGlyphs:: @ 86584E4
 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
 	.incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont"

+	.align 2
 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
 	.include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc"

@@ -57,6 +63,7 @@ gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
 	.incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont"

+	.align 2
 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
 	.include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc"

@@ -64,5 +71,6 @@ gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
 gFont2JapaneseGlyphs:: @ 866C8E4
 	.incbin "data/graphics/fonts/font2.fwjpnfont"

+	.align 2
 gFont2JapaneseGlyphWidths:: @ 86748E4
 	.include "data/graphics/fonts/font2_japanese_widths.inc"
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -952,7 +952,11 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
 	.incbin "baserom.gba", 0xdd4bf0, 0x5c

 gUnknown_08DD4C4C:: @ 8DD4C4C
-	.incbin "baserom.gba", 0xdd4c4c, 0x1c4
+	.incbin "baserom.gba", 0xdd4c4c, 0xac
+    
+    .align 2
+gUnknown_08DD4CF8:: @ 8DD4CF8
+	.incbin "graphics/interface/unk_change_case.4bpp.lz"

 	.align 2
 gTilesetPalettes_General:: @ 8DD4E10
--- a/data/io_reg.s
+++ b/data/io_reg.s
@@ -7,7 +7,22 @@

 .align 2
 gUnref_82EC784:: @ 82EC784
-	.incbin "baserom.gba", 0x2EC784, 0x40
+    .4byte 0x00000000
+    .4byte 0x00000000
+    .4byte 0x04000008
+    .4byte 0x0400000A
+    .4byte 0x0400000C
+    .4byte 0x0400000E
+    .4byte 0x04000010
+    .4byte 0x04000014
+    .4byte 0x04000018
+    .4byte 0x0400001C
+    .4byte 0x04000012
+    .4byte 0x04000016
+    .4byte 0x0400001A
+    .4byte 0x0400001E
+    .4byte 0x02000100
+    .4byte 0x08000400

 gUnknown_82EC7C4:: @ 82EC7C4
 	.2byte 0x0100
--- a/data/link.s
+++ b/data/link.s
--- a/data/strings.s
+++ b/data/strings.s