Some data rearrangement

4 files changed, 527 insertions, 199 deletions

diff --git a/arm9/asm/unk_02006D98.s b/arm9/asm/unk_02006D98.s
index 8bcac588..0e1ff930 100644
--- a/arm9/asm/unk_02006D98.s
+++ b/arm9/asm/unk_02006D98.s
@@ -150,7 +150,7 @@ _02006E12:
 	strb r0, [r4, r2]
 	sub r2, #0x4b
 	ldr r2, [r4, r2]
-	mov r0, #0x75
+	mov r0, #0x75 ; NARC_POKETOOL_POKEGRA_OTHERPOKE
 	mov r1, #0xd3
 	bl AllocAndReadWholeNarcMemberByIdPair
 	add r1, sp, #0xc
@@ -3641,7 +3641,7 @@ _0200874A:
 	mov r2, #0xa6
 	lsl r2, r2, #0x2
 	ldr r2, [r5, r2]
-	mov r0, #0x75
+	mov r0, #0x75 ; NARC_POKETOOL_POKEGRA_OTHERPOKE
 	mov r1, #0xd4
 	bl AllocAndReadWholeNarcMemberByIdPair
 	add r1, sp, #0x18
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index bfab698c..70ccee6d 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -1078,7 +1078,7 @@ FUN_0200D300: ; 0x0200D300
 	add r3, r6, #0x0
 	str r4, [sp, #0xc]
 	bl FUN_0200687C
-	mov r0, #0x24
+	mov r0, #0x24 ; NARC_GRAPHIC_FIELD_BOARD
 	mov r1, #0x1
 	add r2, r4, #0x0
 	bl AllocAndReadWholeNarcMemberByIdPair
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index d2024491..8d7d828a 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -8,11 +8,12 @@
 
 	.global UNK_020F944C
 UNK_020F944C: ; 0x020F944C
-	.byte 0x01
-
-	.global UNK_020F944D
-UNK_020F944D: ; 0x020F944D
-	.byte 0x03, 0x1A, 0x03, 0x01, 0x0A, 0x1A, 0x0A, 0x01, 0x11, 0x1A, 0x11
+	.byte 0x01, 0x03
+	.byte 0x1A, 0x03
+	.byte 0x01, 0x0A
+	.byte 0x1A, 0x0A
+	.byte 0x01, 0x11
+	.byte 0x1A, 0x11
 
 	.global UNK_020F9458
 UNK_020F9458: ; 0x020F9458
@@ -20,8 +21,10 @@ UNK_020F9458: ; 0x020F9458
 
 	.global UNK_020F9468
 UNK_020F9468: ; 0x020F9468
-	.byte 0x00, 0x02, 0x04, 0x01, 0x03, 0x05, 0x01, 0x03, 0x05, 0x00, 0x02, 0x04, 0x04, 0x02, 0x00, 0x05
-	.byte 0x03, 0x01, 0x05, 0x03, 0x01, 0x04, 0x02, 0x00
+	.byte 0x00, 0x02, 0x04, 0x01, 0x03, 0x05
+	.byte 0x01, 0x03, 0x05, 0x00, 0x02, 0x04
+	.byte 0x04, 0x02, 0x00, 0x05, 0x03, 0x01
+	.byte 0x05, 0x03, 0x01, 0x04, 0x02, 0x00
 
 	.global UNK_020F9480
 UNK_020F9480: ; 0x020F9480
@@ -1265,7 +1268,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r1, #0x11
 	mov r3, #0x3
 	bl FUN_020068C8
-	mov r0, #0x14
+	mov r0, #0x14 ; NARC_GRAPHIC_PLIST_GRA
 	mov r1, #0x10
 	mov r2, #0xc
 	bl AllocAndReadWholeNarcMemberByIdPair
@@ -4614,7 +4617,7 @@ FUN_020717E8: ; 0x020717E8
 	lsl r3, r3, #0x1
 	add r0, r0, r3
 	mov r12, r0
-	ldr r0, _0207184C ; =UNK_020F944D
+	ldr r0, _0207184C ; =UNK_020F944C + 1
 	ldrb r7, [r0, r1]
 _02071816:
 	lsl r0, r2, #0x2
@@ -4643,7 +4646,7 @@ _02071824:
 	nop
 _02071844: .word 0x00001005
 _02071848: .word UNK_020F944C
-_0207184C: .word UNK_020F944D
+_0207184C: .word UNK_020F944C + 1
 
 	thumb_func_start FUN_02071850
 FUN_02071850: ; 0x02071850
@@ -4653,7 +4656,7 @@ FUN_02071850: ; 0x02071850
 	lsl r0, r0, #0x3
 	add r0, #0x14
 	strh r0, [r1, #0x0]
-	ldr r0, _0207186C ; =UNK_020F944D
+	ldr r0, _0207186C ; =UNK_020F944C + 1
 	ldrb r0, [r0, r3]
 	lsl r0, r0, #0x3
 	add r0, #0x14
@@ -4661,7 +4664,7 @@ FUN_02071850: ; 0x02071850
 	bx lr
 	.balign 4
 _02071868: .word UNK_020F944C
-_0207186C: .word UNK_020F944D
+_0207186C: .word UNK_020F944C + 1
 
 	thumb_func_start FUN_02071870
 FUN_02071870: ; 0x02071870
@@ -6194,7 +6197,7 @@ FUN_020724D4: ; 0x020724D4
 	add r4, r0, #0x0
 	add r5, r1, #0x0
 	add r6, r2, #0x0
-	mov r0, #0x14
+	mov r0, #0x14 ; NARC_GRAPHIC_PLIST_GRA
 	mov r1, #0x16
 	add r2, r4, #0x0
 	add r7, r3, #0x0
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 7ada0ae4..7a24d756 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -2,8 +2,6 @@
     .include "global.inc"
 
 	.extern gMain
-	.extern gMain
-	.extern gMain
 
 	.section .rodata
 
@@ -25,7 +23,9 @@ UNK_020F9D38: ; 0x020F9D38
 
 	.global UNK_020F9D40
 UNK_020F9D40: ; 0x020F9D40
-	.byte 0x70, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00
+	.word 0x00000070
+	.word 0x0000004C
+	.word 0x00000048
 
 	.global UNK_020F9D4C
 UNK_020F9D4C: ; 0x020F9D4C
@@ -37,25 +37,52 @@ UNK_020F9D5C: ; 0x020F9D5C
 
 	.global UNK_020F9D6C
 UNK_020F9D6C: ; 0x020F9D6C
-	.byte 0x19, 0x00, 0x39, 0x00, 0x59, 0x00, 0x61, 0x00, 0x7A, 0x00, 0x9E, 0x00, 0xC6, 0x00, 0x00, 0x00
-	.byte 0x03, 0x00, 0x2B, 0x00, 0x20, 0x00, 0x2F, 0x00, 0x01, 0x00, 0x2B, 0x00, 0x3F, 0x00, 0x09, 0x00
-	.byte 0x30, 0x00, 0xE2, 0x00, 0xFF, 0xFF, 0x8D, 0x00, 0x74, 0x00, 0x60, 0x00, 0x6A, 0x00, 0x2F, 0x00
-	.byte 0x01, 0x00, 0x2B, 0x00, 0x3F, 0x00, 0x09, 0x00, 0x30, 0x00, 0xE2, 0x00, 0xFF, 0xFF
+	.short 0x0019
+	.short 0x0039
+	.short 0x0059
+	.short 0x0061
+	.short 0x007A
+	.short 0x009E
+	.short 0x00C6
+	.short 0x0000
+	.short 0x0003
+	.short 0x002B
+	.short 0x0020
+	.short 0x002F
+	.short 0x0001
+	.short 0x002B
+	.short 0x003F
+	.short 0x0009
+	.short 0x0030
+	.short 0x00E2
+	.short 0xFFFF
+	.short 0x008D
+	.short 0x0074
+	.short 0x0060
+	.short 0x006A
+	.short 0x002F
+	.short 0x0001
+	.short 0x002B
+	.short 0x003F
+	.short 0x0009
+	.short 0x0030
+	.short 0x00E2
+	.short 0xFFFF
 
 	.global UNK_020F9DAA
 UNK_020F9DAA: ; 0x020F9DAA
-	.byte 0x02, 0xE0, 0x02, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x04, 0xE0, 0x04, 0xE0, 0x04, 0xD0, 0x04, 0xD0
-	.byte 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, 0x08, 0xE0, 0x08, 0xE0
+	.short 0xE002, 0xE002, 0xE003, 0xE003, 0xE004, 0xE004, 0xD004, 0xD004
+	.short 0xE007, 0xE007, 0xE007, 0xE008, 0xE008
 
 	.global UNK_020F9DC4
 UNK_020F9DC4: ; 0x020F9DC4
-	.byte 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0, 0x04, 0xD0
-	.byte 0x07, 0xE0, 0x07, 0xE0, 0x07, 0xE0, 0x08, 0xE0, 0x08, 0xE0
+	.short 0xD004, 0xD004, 0xD004, 0xD004, 0xD004, 0xD004, 0xD004, 0xD004
+	.short 0xE007, 0xE007, 0xE007, 0xE008, 0xE008
 
 	.global UNK_020F9DDE
 UNK_020F9DDE: ; 0x020F9DDE
-	.byte 0xE3, 0x00, 0xE4, 0x00, 0xF9, 0x00, 0xF8, 0x00, 0xE5, 0x00, 0xE6, 0x00, 0xF5, 0x00, 0xF6, 0x00
-	.byte 0xF7, 0x00, 0xE7, 0x00, 0x01, 0x00, 0xEE, 0x00, 0xEF, 0x00, 0xFF, 0xFF, 0x00, 0x00
+	.short 0x00E3, 0x00E4, 0x00F9, 0x00F8, 0x00E5, 0x00E6, 0x00F5, 0x00F6
+	.short 0x00F7, 0x00E7, 0x0001, 0x00EE, 0x00EF, 0xFFFF, 0x0000
 
 	.global UNK_020F9DFC
 UNK_020F9DFC: ; 0x020F9DFC
@@ -64,33 +91,33 @@ UNK_020F9DFC: ; 0x020F9DFC
 
 	.global UNK_020F9E18
 UNK_020F9E18: ; 0x020F9E18
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9E34
 UNK_020F9E34: ; 0x020F9E34
-	.byte 0x07, 0x01, 0x08, 0x01, 0x09, 0x01, 0x0A, 0x01, 0x0B, 0x01, 0x0C, 0x01, 0x0D, 0x01, 0x0E, 0x01
-	.byte 0x11, 0x01, 0x0F, 0x01, 0x10, 0x01, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF
+	.short 0x0107, 0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x010D, 0x010E
+	.short 0x0111, 0x010F, 0x0110, 0x0001, 0x0001, 0xFFFF
 
 	.global UNK_020F9E50
 UNK_020F9E50: ; 0x020F9E50
-	.byte 0x21, 0x01, 0x22, 0x01, 0x23, 0x01, 0x24, 0x01, 0x25, 0x01, 0x26, 0x01, 0x27, 0x01, 0x28, 0x01
-	.byte 0x29, 0x01, 0x2A, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, 0x0127, 0x0128
+	.short 0x0129, 0x012A, 0x01DE, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9E6C
 UNK_020F9E6C: ; 0x020F9E6C
-	.byte 0x2B, 0x01, 0x2C, 0x01, 0x2D, 0x01, 0x2E, 0x01, 0x2F, 0x01, 0x30, 0x01, 0x31, 0x01, 0x32, 0x01
-	.byte 0x33, 0x01, 0x34, 0x01, 0xDE, 0x01, 0xAD, 0x01, 0xAE, 0x01, 0xFF, 0xFF
+	.short 0x012B, 0x012C, 0x012D, 0x012E, 0x012F, 0x0130, 0x0131, 0x0132
+	.short 0x0133, 0x0134, 0x01DE, 0x01AD, 0x01AE, 0xFFFF
 
 	.global UNK_020F9E88
 UNK_020F9E88: ; 0x020F9E88
-	.byte 0x35, 0x01, 0x36, 0x01, 0x37, 0x01, 0x38, 0x01, 0x39, 0x01, 0x3A, 0x01, 0x3B, 0x01, 0x3C, 0x01
-	.byte 0x3D, 0x01, 0x3E, 0x01, 0xDE, 0x01, 0xB3, 0x01, 0xBE, 0x01, 0xFF, 0xFF
+	.short 0x0135, 0x0136, 0x0137, 0x0138, 0x0139, 0x013A, 0x013B, 0x013C
+	.short 0x013D, 0x013E, 0x01DE, 0x01B3, 0x01BE, 0xFFFF
 
 	.global UNK_020F9EA4
 UNK_020F9EA4: ; 0x020F9EA4
-	.byte 0x3F, 0x01, 0x40, 0x01, 0x41, 0x01, 0x42, 0x01, 0x43, 0x01, 0x44, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xBB, 0x01, 0xBC, 0x01, 0xFF, 0xFF
+	.short 0x013F, 0x0140, 0x0141, 0x0142, 0x0143, 0x0144, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01BB, 0x01BC, 0xFFFF
 
 	.global UNK_020F9EC0
 UNK_020F9EC0: ; 0x020F9EC0
@@ -99,38 +126,38 @@ UNK_020F9EC0: ; 0x020F9EC0
 
 	.global UNK_020F9EDC
 UNK_020F9EDC: ; 0x020F9EDC
-	.byte 0x45, 0x01, 0x46, 0x01, 0x47, 0x01, 0x48, 0x01, 0x49, 0x01, 0x4A, 0x01, 0x4B, 0x01, 0x4C, 0x01
-	.byte 0x4D, 0x01, 0x4E, 0x01, 0xDE, 0x01, 0xAD, 0x01, 0xAE, 0x01, 0xFF, 0xFF
+	.short 0x0145, 0x0146, 0x0147, 0x0148, 0x0149, 0x014A, 0x014B, 0x014C
+	.short 0x014D, 0x014E, 0x01DE, 0x01AD, 0x01AE, 0xFFFF
 
 	.global UNK_020F9EF8
 UNK_020F9EF8: ; 0x020F9EF8
-	.byte 0x4F, 0x01, 0x50, 0x01, 0x51, 0x01, 0x52, 0x01, 0x53, 0x01, 0x54, 0x01, 0x55, 0x01, 0x56, 0x01
-	.byte 0x57, 0x01, 0x58, 0x01, 0xDE, 0x01, 0xB3, 0x01, 0xBE, 0x01, 0xFF, 0xFF
+	.short 0x014F, 0x0150, 0x0151, 0x0152, 0x0153, 0x0154, 0x0155, 0x0156
+	.short 0x0157, 0x0158, 0x01DE, 0x01B3, 0x01BE, 0xFFFF
 
 	.global UNK_020F9F14
 UNK_020F9F14: ; 0x020F9F14
-	.byte 0xFF, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0xFC, 0x00, 0xFA, 0x00, 0xFD, 0x00
-	.byte 0xFB, 0x00, 0xFE, 0x00, 0x05, 0x01, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF
+	.short 0x00FF, 0x0100, 0x0101, 0x0102, 0x0103, 0x00FC, 0x00FA, 0x00FD
+	.short 0x00FB, 0x00FE, 0x0105, 0x0001, 0x0001, 0xFFFF
 
 	.global UNK_020F9F30
 UNK_020F9F30: ; 0x020F9F30
-	.byte 0xE8, 0x00, 0xE9, 0x00, 0xEA, 0x00, 0xEB, 0x00, 0xEC, 0x00, 0xED, 0x00, 0xF0, 0x00, 0xF1, 0x00
-	.byte 0xF2, 0x00, 0xF3, 0x00, 0xF4, 0x00, 0x06, 0x01, 0x04, 0x01, 0xFF, 0xFF
+	.short 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00F0, 0x00F1
+	.short 0x00F2, 0x00F3, 0x00F4, 0x0106, 0x0104, 0xFFFF
 
 	.global UNK_020F9F4C
 UNK_020F9F4C: ; 0x020F9F4C
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9F68
 UNK_020F9F68: ; 0x020F9F68
-	.byte 0xA2, 0x00, 0xA3, 0x00, 0xA4, 0x00, 0xA5, 0x00, 0xA6, 0x00, 0xA7, 0x00, 0xA8, 0x00, 0xA9, 0x00
-	.byte 0xAA, 0x00, 0xAB, 0x00, 0x01, 0x00, 0xE1, 0x00, 0xE2, 0x00, 0xFF, 0xFF
+	.short 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9
+	.short 0x00AA, 0x00AB, 0x0001, 0x00E1, 0x00E2, 0xFFFF
 
 	.global UNK_020F9F84
 UNK_020F9F84: ; 0x020F9F84
-	.byte 0xAD, 0x01, 0xAE, 0x01, 0xC4, 0x01, 0xC5, 0x01, 0xAB, 0x01, 0xAC, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xBB, 0x01, 0xBC, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01AD, 0x01AE, 0x01C4, 0x01C5, 0x01AB, 0x01AC, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01BB, 0x01BC, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9FA0
 UNK_020F9FA0: ; 0x020F9FA0
@@ -139,33 +166,33 @@ UNK_020F9FA0: ; 0x020F9FA0
 
 	.global UNK_020F9FBC
 UNK_020F9FBC: ; 0x020F9FBC
-	.byte 0xB4, 0x01, 0xB5, 0x01, 0xB2, 0x01, 0xB3, 0x01, 0xB9, 0x01, 0xBA, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01B4, 0x01B5, 0x01B2, 0x01B3, 0x01B9, 0x01BA, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9FD8
 UNK_020F9FD8: ; 0x020F9FD8
-	.byte 0xAF, 0x01, 0xB0, 0x01, 0xC3, 0x01, 0xD0, 0x01, 0xC0, 0x01, 0xD2, 0x01, 0xBD, 0x01, 0xBE, 0x01
-	.byte 0xBF, 0x01, 0xB1, 0x01, 0xC1, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01AF, 0x01B0, 0x01C3, 0x01D0, 0x01C0, 0x01D2, 0x01BD, 0x01BE
+	.short 0x01BF, 0x01B1, 0x01C1, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020F9FF4
 UNK_020F9FF4: ; 0x020F9FF4
-	.byte 0xCB, 0x01, 0xCC, 0x01, 0xCD, 0x01, 0xCE, 0x01, 0xCF, 0x01, 0xC6, 0x01, 0xC8, 0x01, 0xC9, 0x01
-	.byte 0xC7, 0x01, 0xCA, 0x01, 0xD1, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01CB, 0x01CC, 0x01CD, 0x01CE, 0x01CF, 0x01C6, 0x01C8, 0x01C9
+	.short 0x01C7, 0x01CA, 0x01D1, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020FA010
 UNK_020FA010: ; 0x020FA010
-	.byte 0x21, 0x01, 0x22, 0x01, 0x23, 0x01, 0x24, 0x01, 0x25, 0x01, 0x26, 0x01, 0x27, 0x01, 0x28, 0x01
-	.byte 0x29, 0x01, 0x2A, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0126, 0x0127, 0x0128
+	.short 0x0129, 0x012A, 0x01DE, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020FA02C
 UNK_020FA02C: ; 0x020FA02C
-	.byte 0xD3, 0x01, 0xD4, 0x01, 0xD5, 0x01, 0xD6, 0x01, 0xD7, 0x01, 0xD8, 0x01, 0xD9, 0x01, 0xDA, 0x01
-	.byte 0xDD, 0x01, 0xDB, 0x01, 0xDC, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xFF, 0xFF
+	.short 0x01D3, 0x01D4, 0x01D5, 0x01D6, 0x01D7, 0x01D8, 0x01D9, 0x01DA
+	.short 0x01DD, 0x01DB, 0x01DC, 0x01DE, 0x01DE, 0xFFFF
 
 	.global UNK_020FA048
 UNK_020FA048: ; 0x020FA048
-	.byte 0x59, 0x01, 0x5A, 0x01, 0x5B, 0x01, 0x5C, 0x01, 0x5D, 0x01, 0x5E, 0x01, 0xDE, 0x01, 0xDE, 0x01
-	.byte 0xDE, 0x01, 0xDE, 0x01, 0xDE, 0x01, 0xBB, 0x01, 0xBC, 0x01, 0xFF, 0xFF
+	.short 0x0159, 0x015A, 0x015B, 0x015C, 0x015D, 0x015E, 0x01DE, 0x01DE
+	.short 0x01DE, 0x01DE, 0x01DE, 0x01BB, 0x01BC, 0xFFFF
 
 	.global UNK_020FA064
 UNK_020FA064: ; 0x020FA064
@@ -176,26 +203,26 @@ UNK_020FA064: ; 0x020FA064
 
 	.global UNK_020FA0A0
 UNK_020FA0A0: ; 0x020FA0A0
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+	.short 0x0000, 0x0000, 0x0001, 0x0000, 0x0002, 0x0000, 0x0003, 0x0000
+	.short 0x0004, 0x0000, 0x0005, 0x0000, 0x0006, 0x0000, 0x0003, 0x0000
 
 	.global UNK_020FA0C0
 UNK_020FA0C0: ; 0x020FA0C0
-	.byte 0x21, 0x01, 0x22, 0x01, 0x23, 0x01, 0x24, 0x01, 0x25, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0xFF, 0xFF
+	.short 0x0121, 0x0122, 0x0123, 0x0124, 0x0125, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0xFFFF
 
 	.global UNK_020FA0E4
 UNK_020FA0E4: ; 0x020FA0E4
-	.byte 0x26, 0x01, 0x27, 0x01, 0x28, 0x01, 0x29, 0x01, 0x2A, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0xFF, 0xFF
+	.short 0x0126, 0x0127, 0x0128, 0x0129, 0x012A, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0xFFFF
 
 	.global UNK_020FA108
 UNK_020FA108: ; 0x020FA108
-	.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
-	.byte 0x01, 0x00, 0xFF, 0xFF
+	.short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.short 0x0001, 0xFFFF
 
 	.global UNK_020FA12C
 UNK_020FA12C: ; 0x020FA12C
@@ -205,122 +232,440 @@ UNK_020FA12C: ; 0x020FA12C
 
 	.global UNK_020FA154
 UNK_020FA154: ; 0x020FA154
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.global UNK_020FA158
-UNK_020FA158: ; 0x020FA158
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00
-	.byte 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
+	.word 0x00000000, 0x00000000
+	.word 0x00000000, 0xFFFFFFFF
+	.word 0x00000000, 0x00000001
+	.word 0xFFFFFFFF, 0x00000000
+	.word 0x00000001, 0x00000000
 
 	.global UNK_020FA17C
 UNK_020FA17C: ; 0x020FA17C
-	.byte 0x31, 0x00
-
-	.global UNK_020FA17E
-UNK_020FA17E: ; 0x020FA17E
-	.byte 0x32, 0x00, 0x34, 0x00, 0x35, 0x00, 0x37, 0x00, 0x38, 0x00, 0x3A, 0x00, 0x3B, 0x00, 0x3D, 0x00
-	.byte 0x3E, 0x00, 0x81, 0x00, 0x82, 0x00, 0x84, 0x00, 0x85, 0x00, 0x87, 0x00, 0x88, 0x00, 0x8A, 0x00
-	.byte 0x8B, 0x00, 0x8D, 0x00, 0x8E, 0x00
+	.short 0x0031, 0x0032
+	.short 0x0034, 0x0035
+	.short 0x0037, 0x0038
+	.short 0x003A, 0x003B
+	.short 0x003D, 0x003E
+	.short 0x0081, 0x0082
+	.short 0x0084, 0x0085
+	.short 0x0087, 0x0088
+	.short 0x008A, 0x008B
+	.short 0x008D, 0x008E
 
 	.global UNK_020FA1A4
 UNK_020FA1A4: ; 0x020FA1A4
-	.byte 0x24, 0x00
-
-	.global UNK_020FA1A6
-UNK_020FA1A6: ; 0x020FA1A6
-	.byte 0x26, 0x00, 0x74, 0x00, 0x76, 0x00, 0x32, 0x00, 0x31, 0x00, 0x35, 0x00, 0x34, 0x00, 0x38, 0x00
-	.byte 0x37, 0x00, 0x3B, 0x00, 0x3A, 0x00, 0x3E, 0x00, 0x3D, 0x00, 0x82, 0x00, 0x81, 0x00, 0x85, 0x00
-	.byte 0x84, 0x00, 0x88, 0x00, 0x87, 0x00, 0x8B, 0x00, 0x8A, 0x00, 0x8E, 0x00, 0x8D, 0x00
+	.short 0x0024, 0x0026
+	.short 0x0074, 0x0076
+	.short 0x0032, 0x0031
+	.short 0x0035, 0x0034
+	.short 0x0038, 0x0037
+	.short 0x003B, 0x003A
+	.short 0x003E, 0x003D
+	.short 0x0082, 0x0081
+	.short 0x0085, 0x0084
+	.short 0x0088, 0x0087
+	.short 0x008B, 0x008A
+	.short 0x008E, 0x008D
 
 	.global UNK_020FA1D4
 UNK_020FA1D4: ; 0x020FA1D4
-	.byte 0x04, 0x00, 0x00, 0x00
+	.word 0x00000004
 
 	.global UNK_020FA1D8
 UNK_020FA1D8: ; 0x020FA1D8
-	.byte 0x44, 0x00, 0x00, 0x00
+	.word 0x00000044
 
 	.global UNK_020FA1DC
 UNK_020FA1DC: ; 0x020FA1DC
-	.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00
-	.byte 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00
-	.byte 0x0D, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00
-	.byte 0x12, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00
-	.byte 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+	.word 0x00000003, 0x00000001 
+	.word 0x00000024, 0x00000044
+	.word 0x00000008, 0x00000001 
+	.word 0x00000044, 0x00000044
+	.word 0x0000000D, 0x00000001 
+	.word 0x00000000, 0x000000C8
+	.word 0x00000012, 0x00000001 
+	.word 0x00000065, 0x00000044
+	.word 0x00000014, 0x00000001
 
 	.global UNK_020FA224
 UNK_020FA224: ; 0x020FA224
-	.byte 0x88, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0xB0, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-	.byte 0x16, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-	.byte 0x1A, 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word 0x00000088, 0x00000044, 0x00000017, 0x00000001
+	.word 0x000000B0, 0x00000044, 0x00000019, 0x00000001
+	.word 0x00000016, 0x00000038, 0x00000025, 0x00000002
+	.word 0x0000001A, 0x0000005B, 0x00000027, 0x00000000
 
 	.global UNK_020FA264
 UNK_020FA264: ; 0x020FA264
-	.byte 0x19, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x39, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x59, 0x3C, 0x00, 0x00
-	.byte 0x04, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x04, 0x00, 0x9D, 0x3C, 0x01, 0x00, 0x08, 0x00, 0xC5, 0x3C
-	.byte 0x01, 0x00, 0x0B, 0x00, 0x1C, 0x58, 0x02, 0x00, 0x00, 0x01, 0x2C, 0x58, 0x02, 0x00, 0x01, 0x01
-	.byte 0x3C, 0x58, 0x02, 0x00, 0x02, 0x01, 0x4C, 0x58, 0x02, 0x00, 0x03, 0x01, 0x5C, 0x58, 0x02, 0x00
-	.byte 0x04, 0x01, 0x6C, 0x58, 0x02, 0x00, 0x05, 0x01, 0x7C, 0x58, 0x02, 0x00, 0x06, 0x01, 0x8C, 0x58
-	.byte 0x02, 0x00, 0x07, 0x01, 0x9C, 0x58, 0x02, 0x00, 0x08, 0x01, 0xAC, 0x58, 0x02, 0x00, 0x09, 0x01
-	.byte 0xBC, 0x58, 0x02, 0x00, 0x0A, 0x01, 0xCC, 0x58, 0x02, 0x00, 0x0B, 0x01, 0xDC, 0x58, 0x02, 0x00
-	.byte 0x0C, 0x01, 0x1C, 0x6B, 0x02, 0x00, 0x00, 0x02, 0x2C, 0x6B, 0x02, 0x00, 0x01, 0x02, 0x3C, 0x6B
-	.byte 0x02, 0x00, 0x02, 0x02, 0x4C, 0x6B, 0x02, 0x00, 0x03, 0x02, 0x5C, 0x6B, 0x02, 0x00, 0x04, 0x02
-	.byte 0x6C, 0x6B, 0x02, 0x00, 0x05, 0x02, 0x7C, 0x6B, 0x02, 0x00, 0x06, 0x02, 0x8C, 0x6B, 0x02, 0x00
-	.byte 0x07, 0x02, 0x9C, 0x6B, 0x02, 0x00, 0x08, 0x02, 0xAC, 0x6B, 0x02, 0x00, 0x09, 0x02, 0xBC, 0x6B
-	.byte 0x02, 0x00, 0x0A, 0x02, 0xCC, 0x6B, 0x02, 0x00, 0x0B, 0x02, 0xDC, 0x6B, 0x02, 0x00, 0x0C, 0x02
-	.byte 0x1C, 0x7E, 0x02, 0x00, 0x00, 0x03, 0x2C, 0x7E, 0x02, 0x00, 0x01, 0x03, 0x3C, 0x7E, 0x02, 0x00
-	.byte 0x02, 0x03, 0x4C, 0x7E, 0x02, 0x00, 0x03, 0x03, 0x5C, 0x7E, 0x02, 0x00, 0x04, 0x03, 0x6C, 0x7E
-	.byte 0x02, 0x00, 0x05, 0x03, 0x7C, 0x7E, 0x02, 0x00, 0x06, 0x03, 0x8C, 0x7E, 0x02, 0x00, 0x07, 0x03
-	.byte 0x9C, 0x7E, 0x02, 0x00, 0x08, 0x03, 0xAC, 0x7E, 0x02, 0x00, 0x09, 0x03, 0xBC, 0x7E, 0x02, 0x00
-	.byte 0x0A, 0x03, 0xCC, 0x7E, 0x02, 0x00, 0x0B, 0x03, 0xDC, 0x7E, 0x02, 0x00, 0x0C, 0x03, 0x1C, 0x91
-	.byte 0x02, 0x00, 0x00, 0x04, 0x2C, 0x91, 0x02, 0x00, 0x01, 0x04, 0x3C, 0x91, 0x02, 0x00, 0x02, 0x04
-	.byte 0x4C, 0x91, 0x02, 0x00, 0x03, 0x04, 0x5C, 0x91, 0x02, 0x00, 0x04, 0x04, 0x6C, 0x91, 0x02, 0x00
-	.byte 0x05, 0x04, 0x7C, 0x91, 0x02, 0x00, 0x06, 0x04, 0x8C, 0x91, 0x02, 0x00, 0x07, 0x04, 0x9C, 0x91
-	.byte 0x02, 0x00, 0x08, 0x04, 0xAC, 0x91, 0x02, 0x00, 0x09, 0x04, 0xBC, 0x91, 0x02, 0x00, 0x0A, 0x04
-	.byte 0xCC, 0x91, 0x02, 0x00, 0x0B, 0x04, 0xDC, 0x91, 0x02, 0x00, 0x0C, 0x04, 0x1C, 0xA4, 0x02, 0x00
-	.byte 0x00, 0x05, 0x2C, 0xA4, 0x02, 0x00, 0x01, 0x05, 0x3C, 0xA4, 0x02, 0x00, 0x02, 0x05, 0x4C, 0xA4
-	.byte 0x02, 0x00, 0x03, 0x05, 0x5C, 0xA4, 0x02, 0x00, 0x04, 0x05, 0x6C, 0xA4, 0x02, 0x00, 0x05, 0x05
-	.byte 0x7C, 0xA4, 0x02, 0x00, 0x06, 0x05, 0x8C, 0xA4, 0x02, 0x00, 0x07, 0x05, 0x9C, 0xA4, 0x02, 0x00
-	.byte 0x08, 0x05, 0xAC, 0xA4, 0x02, 0x00, 0x09, 0x05, 0xBC, 0xA4, 0x02, 0x00, 0x0A, 0x05, 0xCC, 0xA4
-	.byte 0x02, 0x00, 0x0B, 0x05, 0xDC, 0xA4, 0x02, 0x00, 0x0C, 0x05
+	.byte 0x19, 0x3C
+	.short 0x0000
+	.byte 0x00, 0x00
+
+	.byte 0x39, 0x3C
+	.short 0x0000
+	.byte 0x02, 0x00
+
+	.byte 0x59, 0x3C
+	.short 0x0000
+	.byte 0x04, 0x00
+
+	.byte 0x00, 0xC0
+	.short 0x0000
+	.byte 0x04, 0x00
+
+	.byte 0x9D, 0x3C
+	.short 0x0001
+	.byte 0x08, 0x00
+
+	.byte 0xC5, 0x3C
+	.short 0x0001
+	.byte 0x0B, 0x00
+
+	.byte 0x1C, 0x58
+	.short 0x0002
+	.byte 0x00, 0x01
+
+	.byte 0x2C, 0x58
+	.short 0x0002
+	.byte 0x01, 0x01
+
+	.byte 0x3C, 0x58
+	.short 0x0002
+	.byte 0x02, 0x01
+
+	.byte 0x4C, 0x58
+	.short 0x0002
+	.byte 0x03, 0x01
+
+	.byte 0x5C, 0x58
+	.short 0x0002
+	.byte 0x04, 0x01
+
+	.byte 0x6C, 0x58
+	.short 0x0002
+	.byte 0x05, 0x01
+
+	.byte 0x7C, 0x58
+	.short 0x0002
+	.byte 0x06, 0x01
+
+	.byte 0x8C, 0x58
+	.short 0x0002
+	.byte 0x07, 0x01
+
+	.byte 0x9C, 0x58
+	.short 0x0002
+	.byte 0x08, 0x01
+
+	.byte 0xAC, 0x58
+	.short 0x0002
+	.byte 0x09, 0x01
+
+	.byte 0xBC, 0x58
+	.short 0x0002
+	.byte 0x0A, 0x01
+
+	.byte 0xCC, 0x58
+	.short 0x0002
+	.byte 0x0B, 0x01
+
+	.byte 0xDC, 0x58
+	.short 0x0002
+	.byte 0x0C, 0x01
+
+	.byte 0x1C, 0x6B
+	.short 0x0002
+	.byte 0x00, 0x02
+
+	.byte 0x2C, 0x6B
+	.short 0x0002
+	.byte 0x01, 0x02
+
+	.byte 0x3C, 0x6B
+	.short 0x0002
+	.byte 0x02, 0x02
+
+	.byte 0x4C, 0x6B
+	.short 0x0002
+	.byte 0x03, 0x02
+
+	.byte 0x5C, 0x6B
+	.short 0x0002
+	.byte 0x04, 0x02
+
+	.byte 0x6C, 0x6B
+	.short 0x0002
+	.byte 0x05, 0x02
+
+	.byte 0x7C, 0x6B
+	.short 0x0002
+	.byte 0x06, 0x02
+
+	.byte 0x8C, 0x6B
+	.short 0x0002
+	.byte 0x07, 0x02
+
+	.byte 0x9C, 0x6B
+	.short 0x0002
+	.byte 0x08, 0x02
+
+	.byte 0xAC, 0x6B
+	.short 0x0002
+	.byte 0x09, 0x02
+
+	.byte 0xBC, 0x6B
+	.short 0x0002
+	.byte 0x0A, 0x02
+
+	.byte 0xCC, 0x6B
+	.short 0x0002
+	.byte 0x0B, 0x02
+
+	.byte 0xDC, 0x6B
+	.short 0x0002
+	.byte 0x0C, 0x02
+
+	.byte 0x1C, 0x7E
+	.short 0x0002
+	.byte 0x00, 0x03
+
+	.byte 0x2C, 0x7E
+	.short 0x0002
+	.byte 0x01, 0x03
+
+	.byte 0x3C, 0x7E
+	.short 0x0002
+	.byte 0x02, 0x03
+
+	.byte 0x4C, 0x7E
+	.short 0x0002
+	.byte 0x03, 0x03
+
+	.byte 0x5C, 0x7E
+	.short 0x0002
+	.byte 0x04, 0x03
+
+	.byte 0x6C, 0x7E
+	.short 0x0002
+	.byte 0x05, 0x03
+
+	.byte 0x7C, 0x7E
+	.short 0x0002
+	.byte 0x06, 0x03
+
+	.byte 0x8C, 0x7E
+	.short 0x0002
+	.byte 0x07, 0x03
+
+	.byte 0x9C, 0x7E
+	.short 0x0002
+	.byte 0x08, 0x03
+
+	.byte 0xAC, 0x7E
+	.short 0x0002
+	.byte 0x09, 0x03
+
+	.byte 0xBC, 0x7E
+	.short 0x0002
+	.byte 0x0A, 0x03
+
+	.byte 0xCC, 0x7E
+	.short 0x0002
+	.byte 0x0B, 0x03
+
+	.byte 0xDC, 0x7E
+	.short 0x0002
+	.byte 0x0C, 0x03
+
+	.byte 0x1C, 0x91
+	.short 0x0002
+	.byte 0x00, 0x04
+
+	.byte 0x2C, 0x91
+	.short 0x0002
+	.byte 0x01, 0x04
+
+	.byte 0x3C, 0x91
+	.short 0x0002
+	.byte 0x02, 0x04
+
+	.byte 0x4C, 0x91
+	.short 0x0002
+	.byte 0x03, 0x04
+
+	.byte 0x5C, 0x91
+	.short 0x0002
+	.byte 0x04, 0x04
+
+	.byte 0x6C, 0x91
+	.short 0x0002
+	.byte 0x05, 0x04
+
+	.byte 0x7C, 0x91
+	.short 0x0002
+	.byte 0x06, 0x04
+
+	.byte 0x8C, 0x91
+	.short 0x0002
+	.byte 0x07, 0x04
+
+	.byte 0x9C, 0x91
+	.short 0x0002
+	.byte 0x08, 0x04
+
+	.byte 0xAC, 0x91
+	.short 0x0002
+	.byte 0x09, 0x04
+
+	.byte 0xBC, 0x91
+	.short 0x0002
+	.byte 0x0A, 0x04
+
+	.byte 0xCC, 0x91
+	.short 0x0002
+	.byte 0x0B, 0x04
+
+	.byte 0xDC, 0x91
+	.short 0x0002
+	.byte 0x0C, 0x04
+
+	.byte 0x1C, 0xA4
+	.short 0x0002
+	.byte 0x00, 0x05
+
+	.byte 0x2C, 0xA4
+	.short 0x0002
+	.byte 0x01, 0x05
+
+	.byte 0x3C, 0xA4
+	.short 0x0002
+	.byte 0x02, 0x05
+
+	.byte 0x4C, 0xA4
+	.short 0x0002
+	.byte 0x03, 0x05
+
+	.byte 0x5C, 0xA4
+	.short 0x0002
+	.byte 0x04, 0x05
+
+	.byte 0x6C, 0xA4
+	.short 0x0002
+	.byte 0x05, 0x05
+
+	.byte 0x7C, 0xA4
+	.short 0x0002
+	.byte 0x06, 0x05
+
+	.byte 0x8C, 0xA4
+	.short 0x0002
+	.byte 0x07, 0x05
+
+	.byte 0x9C, 0xA4
+	.short 0x0002
+	.byte 0x08, 0x05
+
+	.byte 0xAC, 0xA4
+	.short 0x0002
+	.byte 0x09, 0x05
+
+	.byte 0xBC, 0xA4
+	.short 0x0002
+	.byte 0x0A, 0x05
+
+	.byte 0xCC, 0xA4
+	.short 0x0002
+	.byte 0x0B, 0x05
+
+	.byte 0xDC, 0xA4
+	.short 0x0002
+	.byte 0x0C, 0x05
 
 	.global UNK_020FA40E
 UNK_020FA40E: ; 0x020FA40E
-	.byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0x04, 0x00, 0x07, 0x00, 0x01, 0x00
-	.byte 0x06, 0x00, 0x09, 0x00, 0x01, 0x00, 0x08, 0x00, 0x0B, 0x00, 0x01, 0x00, 0x0A, 0x00, 0x53, 0x00
-	.byte 0x01, 0x00, 0x52, 0x00, 0x55, 0x00, 0x01, 0x00, 0x54, 0x00, 0x57, 0x00, 0x01, 0x00, 0x56, 0x00
-	.byte 0x59, 0x00, 0x01, 0x00, 0x58, 0x00, 0x5B, 0x00, 0x01, 0x00, 0x5A, 0x00, 0x45, 0x00, 0x01, 0x00
-	.byte 0x44, 0x00, 0x47, 0x00, 0x01, 0x00, 0x46, 0x00, 0x49, 0x00, 0x01, 0x00, 0x48, 0x00, 0x95, 0x00
-	.byte 0x01, 0x00, 0x94, 0x00, 0x97, 0x00, 0x01, 0x00, 0x96, 0x00, 0x99, 0x00, 0x01, 0x00, 0x98, 0x00
-	.byte 0xAC, 0x00, 0x01, 0x00, 0xC6, 0x00, 0xAD, 0x00, 0x01, 0x00, 0xC7, 0x00, 0xAE, 0x00, 0x01, 0x00
-	.byte 0xC8, 0x00, 0xAF, 0x00, 0x01, 0x00, 0xC9, 0x00, 0xB0, 0x00, 0x01, 0x00, 0xCA, 0x00, 0xB1, 0x00
-	.byte 0x01, 0x00, 0xCB, 0x00, 0xB2, 0x00, 0x01, 0x00, 0xCC, 0x00, 0xB3, 0x00, 0x01, 0x00, 0xCD, 0x00
-	.byte 0xB4, 0x00, 0x01, 0x00, 0xCE, 0x00, 0xB5, 0x00, 0x01, 0x00, 0xCF, 0x00, 0xB6, 0x00, 0x01, 0x00
-	.byte 0xD0, 0x00, 0xB7, 0x00, 0x01, 0x00, 0xD1, 0x00, 0xB8, 0x00, 0x01, 0x00, 0xD2, 0x00, 0xB9, 0x00
-	.byte 0x01, 0x00, 0xD3, 0x00, 0xBA, 0x00, 0x01, 0x00, 0xD4, 0x00, 0xBB, 0x00, 0x01, 0x00, 0xD5, 0x00
-	.byte 0xBC, 0x00, 0x01, 0x00, 0xD6, 0x00, 0xBD, 0x00, 0x01, 0x00, 0xD7, 0x00, 0xBE, 0x00, 0x01, 0x00
-	.byte 0xD8, 0x00, 0xBF, 0x00, 0x01, 0x00, 0xD9, 0x00, 0xC0, 0x00, 0x01, 0x00, 0xDA, 0x00, 0xC1, 0x00
-	.byte 0x01, 0x00, 0xDB, 0x00, 0xC2, 0x00, 0x01, 0x00, 0xDC, 0x00, 0xC3, 0x00, 0x01, 0x00, 0xDD, 0x00
-	.byte 0xC4, 0x00, 0x01, 0x00, 0xDE, 0x00, 0xC5, 0x00, 0x01, 0x00, 0xDF, 0x00, 0x25, 0x00, 0x26, 0x00
-	.byte 0x24, 0x00, 0x75, 0x00, 0x76, 0x00, 0x74, 0x00, 0x0C, 0x00, 0x0D, 0x00, 0x01, 0x00, 0x0E, 0x00
-	.byte 0x0F, 0x00, 0x01, 0x00, 0x10, 0x00, 0x11, 0x00, 0x01, 0x00, 0x12, 0x00, 0x13, 0x00, 0x01, 0x00
-	.byte 0x14, 0x00, 0x15, 0x00, 0x01, 0x00, 0x16, 0x00, 0x17, 0x00, 0x01, 0x00, 0x18, 0x00, 0x19, 0x00
-	.byte 0x01, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x01, 0x00, 0x1C, 0x00, 0x1D, 0x00, 0x01, 0x00, 0x1E, 0x00
-	.byte 0x1F, 0x00, 0x01, 0x00, 0x20, 0x00, 0x21, 0x00, 0x01, 0x00, 0x22, 0x00, 0x23, 0x00, 0x01, 0x00
-	.byte 0x27, 0x00, 0x28, 0x00, 0x01, 0x00, 0x29, 0x00, 0x2A, 0x00, 0x01, 0x00, 0x5C, 0x00, 0x5D, 0x00
-	.byte 0x01, 0x00, 0x5E, 0x00, 0x5F, 0x00, 0x01, 0x00, 0x60, 0x00, 0x61, 0x00, 0x01, 0x00, 0x62, 0x00
-	.byte 0x63, 0x00, 0x01, 0x00, 0x64, 0x00, 0x65, 0x00, 0x01, 0x00, 0x66, 0x00, 0x67, 0x00, 0x01, 0x00
-	.byte 0x68, 0x00, 0x69, 0x00, 0x01, 0x00, 0x6A, 0x00, 0x6B, 0x00, 0x01, 0x00, 0x6C, 0x00, 0x6D, 0x00
-	.byte 0x01, 0x00, 0x6E, 0x00, 0x6F, 0x00, 0x01, 0x00, 0x70, 0x00, 0x71, 0x00, 0x01, 0x00, 0x72, 0x00
-	.byte 0x73, 0x00, 0x01, 0x00, 0x77, 0x00, 0x78, 0x00, 0x01, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x01, 0x00
-	.byte 0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x00
-	.byte 0x38, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00, 0x80, 0x00
-	.byte 0x81, 0x00, 0x82, 0x00, 0x83, 0x00, 0x84, 0x00, 0x85, 0x00, 0x86, 0x00, 0x87, 0x00, 0x88, 0x00
-	.byte 0x89, 0x00, 0x8A, 0x00, 0x8B, 0x00, 0x8C, 0x00, 0x8D, 0x00, 0x8E, 0x00, 0x00, 0x00
+	.short 0x0003, 0x0001, 0x0002
+	.short 0x0005, 0x0001, 0x0004
+	.short 0x0007, 0x0001, 0x0006
+	.short 0x0009, 0x0001, 0x0008
+	.short 0x000B, 0x0001, 0x000A
+	.short 0x0053, 0x0001, 0x0052
+	.short 0x0055, 0x0001, 0x0054
+	.short 0x0057, 0x0001, 0x0056
+	.short 0x0059, 0x0001, 0x0058
+	.short 0x005B, 0x0001, 0x005A
+	.short 0x0045, 0x0001, 0x0044
+	.short 0x0047, 0x0001, 0x0046
+	.short 0x0049, 0x0001, 0x0048
+	.short 0x0095, 0x0001, 0x0094
+	.short 0x0097, 0x0001, 0x0096
+	.short 0x0099, 0x0001, 0x0098
+	.short 0x00AC, 0x0001, 0x00C6
+	.short 0x00AD, 0x0001, 0x00C7
+	.short 0x00AE, 0x0001, 0x00C8
+	.short 0x00AF, 0x0001, 0x00C9
+	.short 0x00B0, 0x0001, 0x00CA
+	.short 0x00B1, 0x0001, 0x00CB
+	.short 0x00B2, 0x0001, 0x00CC
+	.short 0x00B3, 0x0001, 0x00CD
+	.short 0x00B4, 0x0001, 0x00CE
+	.short 0x00B5, 0x0001, 0x00CF
+	.short 0x00B6, 0x0001, 0x00D0
+	.short 0x00B7, 0x0001, 0x00D1
+	.short 0x00B8, 0x0001, 0x00D2
+	.short 0x00B9, 0x0001, 0x00D3
+	.short 0x00BA, 0x0001, 0x00D4
+	.short 0x00BB, 0x0001, 0x00D5
+	.short 0x00BC, 0x0001, 0x00D6
+	.short 0x00BD, 0x0001, 0x00D7
+	.short 0x00BE, 0x0001, 0x00D8
+	.short 0x00BF, 0x0001, 0x00D9
+	.short 0x00C0, 0x0001, 0x00DA
+	.short 0x00C1, 0x0001, 0x00DB
+	.short 0x00C2, 0x0001, 0x00DC
+	.short 0x00C3, 0x0001, 0x00DD
+	.short 0x00C4, 0x0001, 0x00DE
+	.short 0x00C5, 0x0001, 0x00DF
+	.short 0x0025, 0x0026, 0x0024
+	.short 0x0075, 0x0076, 0x0074
+	.short 0x000C, 0x000D, 0x0001
+	.short 0x000E, 0x000F, 0x0001
+	.short 0x0010, 0x0011, 0x0001
+	.short 0x0012, 0x0013, 0x0001
+	.short 0x0014, 0x0015, 0x0001
+	.short 0x0016, 0x0017, 0x0001
+	.short 0x0018, 0x0019, 0x0001
+	.short 0x001A, 0x001B, 0x0001
+	.short 0x001C, 0x001D, 0x0001
+	.short 0x001E, 0x001F, 0x0001
+	.short 0x0020, 0x0021, 0x0001
+	.short 0x0022, 0x0023, 0x0001
+	.short 0x0027, 0x0028, 0x0001
+	.short 0x0029, 0x002A, 0x0001
+	.short 0x005C, 0x005D, 0x0001
+	.short 0x005E, 0x005F, 0x0001
+	.short 0x0060, 0x0061, 0x0001
+	.short 0x0062, 0x0063, 0x0001
+	.short 0x0064, 0x0065, 0x0001
+	.short 0x0066, 0x0067, 0x0001
+	.short 0x0068, 0x0069, 0x0001
+	.short 0x006A, 0x006B, 0x0001
+	.short 0x006C, 0x006D, 0x0001
+	.short 0x006E, 0x006F, 0x0001
+	.short 0x0070, 0x0071, 0x0001
+	.short 0x0072, 0x0073, 0x0001
+	.short 0x0077, 0x0078, 0x0001
+	.short 0x0079, 0x007A, 0x0001
+	.short 0x0030, 0x0031, 0x0032
+	.short 0x0033, 0x0034, 0x0035
+	.short 0x0036, 0x0037, 0x0038
+	.short 0x0039, 0x003A, 0x003B
+	.short 0x003C, 0x003D, 0x003E
+	.short 0x0080, 0x0081, 0x0082
+	.short 0x0083, 0x0084, 0x0085
+	.short 0x0086, 0x0087, 0x0088
+	.short 0x0089, 0x008A, 0x008B
+	.short 0x008C, 0x008D, 0x008E
 
 	.global UNK_020FA5FC
+	.balign 4, 0
 UNK_020FA5FC: ; 0x020FA5FC
 	.word FUN_020772E8, FUN_020774EC, FUN_02077894, 0xFFFFFFFF
 
@@ -336,31 +681,11 @@ UNK_02106058: ; 0x02106058
 
 	.global UNK_0210606C
 UNK_0210606C: ; 0x0210606C
-	.word UNK_020F9E6C
-	.word UNK_020F9E88
-	.word UNK_020F9EA4
-	.word UNK_020F9E18
-	.word UNK_020F9E50
-	.word UNK_020F9EDC
-	.word UNK_020F9EF8
-	.word UNK_020FA048
-	.word UNK_020F9F4C
-	.word UNK_020FA010
-	.word UNK_020F9F84
-	.word UNK_020F9FBC
-	.word UNK_020F9FD8
-	.word UNK_020F9FF4
-	.word UNK_020FA02C
-	.word UNK_020F9F68
-	.word UNK_020F9DDE
-	.word UNK_020F9F30
-	.word UNK_020F9F14
-	.word UNK_020F9E34
-	.word UNK_020FA0C0
-	.word UNK_020FA0E4
-	.word UNK_020FA108
-	.word UNK_020FA108
-	.word UNK_020FA108
+	.word UNK_020F9E6C, UNK_020F9E88, UNK_020F9EA4, UNK_020F9E18, UNK_020F9E50
+	.word UNK_020F9EDC, UNK_020F9EF8, UNK_020FA048, UNK_020F9F4C, UNK_020FA010
+	.word UNK_020F9F84, UNK_020F9FBC, UNK_020F9FD8, UNK_020F9FF4, UNK_020FA02C
+	.word UNK_020F9F68, UNK_020F9DDE, UNK_020F9F30, UNK_020F9F14, UNK_020F9E34
+	.word UNK_020FA0C0, UNK_020FA0E4, UNK_020FA108, UNK_020FA108, UNK_020FA108
 
 	.section .bss
 
@@ -3424,7 +3749,7 @@ FUN_02078BE0: ; 0x02078BE0
 	mov r1, #0x0
 	bl FUN_02078BD0
 	add r4, r0, #0x0
-	ldr r0, _02078C8C ; =UNK_020FA158
+	ldr r0, _02078C8C ; =UNK_020FA154 + 4
 	ldr r1, [r5, #0x20]
 	ldr r0, [r0, r6]
 	mov r2, #0x6
@@ -3488,7 +3813,7 @@ _02078C84:
 	pop {r3-r7, pc}
 	nop
 _02078C88: .word UNK_020FA154
-_02078C8C: .word UNK_020FA158
+_02078C8C: .word UNK_020FA154 + 4
 _02078C90: .word 0x0000D004
 _02078C94: .word 0x0000E001
 
@@ -4776,7 +5101,7 @@ _0207969C:
 	ldrh r0, [r1, #0x0]
 	cmp r5, r0
 	bne _020796AE
-	ldr r0, _02079704 ; =UNK_020FA1A6
+	ldr r0, _02079704 ; =UNK_020FA1A4 + 2
 	lsl r1, r2, #0x2
 	ldrh r0, [r0, r1]
 	strh r0, [r6, r7]
@@ -4795,7 +5120,7 @@ _020796BC:
 	ldrh r0, [r1, #0x0]
 	cmp r5, r0
 	bne _020796CE
-	ldr r0, _0207970C ; =UNK_020FA17E
+	ldr r0, _0207970C ; =UNK_020FA17C + 2
 	lsl r1, r2, #0x2
 	ldrh r0, [r0, r1]
 	strh r0, [r6, r7]
@@ -4829,9 +5154,9 @@ _020796F4: .word UNK_020FA40E
 _020796F8: .word 0x0000D001
 _020796FC: .word 0x0000E006
 _02079700: .word UNK_020FA1A4
-_02079704: .word UNK_020FA1A6
+_02079704: .word UNK_020FA1A4 + 2
 _02079708: .word UNK_020FA17C
-_0207970C: .word UNK_020FA17E
+_0207970C: .word UNK_020FA17C + 2
 
 	thumb_func_start FUN_02079710
 FUN_02079710: ; 0x02079710