Fix up data types in overlay 20

1 files changed, 86 insertions, 46 deletions

diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index 6794fd36..93fc85ff 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -747,8 +747,8 @@ _02252972:
 	.align 2, 0
 	thumb_func_end MOD20_02252968
 
-	thumb_func_start MOD20_02252978
-MOD20_02252978: ; 0x02252978
+	thumb_func_start Poketch_InitApp
+Poketch_InitApp: ; 0x02252978
 	push {r3, r4, r5, lr}
 	add r5, r0, #0
 	add r4, r1, #0
@@ -758,7 +758,7 @@ MOD20_02252978: ; 0x02252978
 	mov r1, #0
 	str r1, [r0, #0x44]
 	pop {r3, r4, r5, pc}
-	thumb_func_end MOD20_02252978
+	thumb_func_end Poketch_InitApp
 
 	thumb_func_start MOD20_0225298C
 MOD20_0225298C: ; 0x0225298C
@@ -4523,13 +4523,13 @@ _02254470:
 	lsl r1, r5, #3
 	ldr r0, [r0, r1]
 	str r0, [r4]
-	ldr r0, _02254484 ; =MOD20_02254728
+	ldr r0, _02254484 ; =MOD20_02254724 + 4
 	ldr r0, [r0, r1]
 	str r0, [r6]
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 _02254480: .word MOD20_02254724
-_02254484: .word MOD20_02254728
+_02254484: .word MOD20_02254724 + 4
 	thumb_func_end MOD20_02254460
 
 	thumb_func_start MOD20_02254488
@@ -4541,11 +4541,11 @@ _0225448E:
 	ldrh r3, [r5]
 	cmp r0, r3
 	bne _022544A8
-	ldr r0, _022544BC ; =MOD20_022547C4
+	ldr r0, _022544BC ; =MOD20_022547C2 + 2
 	lsl r3, r4, #2
 	ldrb r0, [r0, r3]
 	str r0, [r1]
-	ldr r0, _022544C0 ; =MOD20_022547C5
+	ldr r0, _022544C0 ; =MOD20_022547C2 + 3
 	ldrb r0, [r0, r3]
 	str r0, [r2]
 	mov r0, #1
@@ -4561,8 +4561,8 @@ _022544A8:
 	bx lr
 	nop
 _022544B8: .word MOD20_022547C2
-_022544BC: .word MOD20_022547C4
-_022544C0: .word MOD20_022547C5
+_022544BC: .word MOD20_022547C2 + 2
+_022544C0: .word MOD20_022547C2 + 3
 	thumb_func_end MOD20_02254488
 
 	.rodata
@@ -4618,12 +4618,12 @@ MOD20_022545D0: ; 0x022545D0
 
 	.global MOD20_022545EC
 MOD20_022545EC: ; 0x022545EC
-	.byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x15, 0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 0x00
-	.byte 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00
-	.byte 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00
-	.byte 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00
-	.byte 0x2A, 0x00, 0x2B, 0x00, 0x2C, 0x00, 0x2D, 0x00, 0x3F, 0x00, 0x40, 0x00, 0x41, 0x00, 0x42, 0x00
-	.byte 0x54, 0x00, 0x55, 0x00, 0x56, 0x00, 0x57, 0x00
+	.short 0x0000, 0x0001, 0x0002, 0x0003, 0x0015, 0x0016, 0x0017, 0x0018
+	.short 0x002A, 0x002B, 0x002C, 0x002D, 0x002A, 0x002B, 0x002C, 0x002D
+	.short 0x002A, 0x002B, 0x002C, 0x002D, 0x002A, 0x002B, 0x002C, 0x002D
+	.short 0x002A, 0x002B, 0x002C, 0x002D, 0x002A, 0x002B, 0x002C, 0x002D
+	.short 0x002A, 0x002B, 0x002C, 0x002D, 0x003F, 0x0040, 0x0041, 0x0042
+	.short 0x0054, 0x0055, 0x0056, 0x0057
 
 	.global MOD20_02254644
 MOD20_02254644: ; 0x02254644
@@ -4663,46 +4663,86 @@ MOD20_02254710: ; 0x02254710
 
 	.global MOD20_02254724
 MOD20_02254724: ; 0x02254724
-	.byte 0x20, 0x00, 0x00, 0x00
-
-	.global MOD20_02254728
-MOD20_02254728: ; 0x02254728
-	.byte 0x2A, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00
-	.byte 0x7A, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00
+	.word 0x00000020, 0x0000002A
+	.word 0x00000032, 0x0000002A
+	.word 0x000000A8, 0x0000007A
+	.word 0x000000C2, 0x0000003A
 
 	.global MOD20_02254744
 MOD20_02254744: ; 0x02254744
-	.byte 0x1A, 0x00, 0x20, 0x00, 0x26, 0x00, 0x2C, 0x00, 0x32, 0x00, 0x38, 0x00, 0x3E, 0x00, 0x44, 0x00
-	.byte 0x4A, 0x00, 0x50, 0x00, 0x56, 0x00, 0x5C, 0x00, 0x62, 0x00, 0x68, 0x00, 0x6E, 0x00, 0x74, 0x00
-	.byte 0x7A, 0x00, 0x80, 0x00, 0x86, 0x00, 0x8C, 0x00, 0x92, 0x00, 0x98, 0x00, 0x9E, 0x00, 0xA4, 0x00
-	.byte 0xAA, 0x00, 0xB0, 0x00, 0xB6, 0x00, 0xBC, 0x00, 0xC2, 0x00, 0xC8, 0x00
+	.short 0x001A, 0x0020, 0x0026, 0x002C, 0x0032, 0x0038, 0x003E, 0x0044
+	.short 0x004A, 0x0050, 0x0056, 0x005C, 0x0062, 0x0068, 0x006E, 0x0074
+	.short 0x007A, 0x0080, 0x0086, 0x008C, 0x0092, 0x0098, 0x009E, 0x00A4
+	.short 0x00AA, 0x00B0, 0x00B6, 0x00BC, 0x00C2, 0x00C8
 
 	.global MOD20_02254780
 MOD20_02254780: ; 0x02254780
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x1E, 0x00, 0x24, 0x00
-	.byte 0x2A, 0x00, 0x30, 0x00, 0x36, 0x00, 0x3C, 0x00, 0x42, 0x00, 0x48, 0x00, 0x4E, 0x00, 0x54, 0x00
-	.byte 0x5A, 0x00, 0x60, 0x00, 0x66, 0x00, 0x6C, 0x00, 0x72, 0x00, 0x78, 0x00, 0x7E, 0x00, 0x84, 0x00
-	.byte 0x8A, 0x00, 0x90, 0x00, 0x96, 0x00, 0x9C, 0x00, 0xA2, 0x00, 0xA8, 0x00, 0xAE, 0x00, 0xB4, 0x00
-	.byte 0xBA, 0x00
+	.short 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0018, 0x001E, 0x0024
+	.short 0x002A, 0x0030, 0x0036, 0x003C, 0x0042, 0x0048, 0x004E, 0x0054
+	.short 0x005A, 0x0060, 0x0066, 0x006C, 0x0072, 0x0078, 0x007E, 0x0084
+	.short 0x008A, 0x0090, 0x0096, 0x009C, 0x00A2, 0x00A8, 0x00AE, 0x00B4
+	.short 0x00BA
 
 	.global MOD20_022547C2
 MOD20_022547C2: ; 0x022547C2
-	.byte 0x56, 0x01
-
-	.global MOD20_022547C4
-MOD20_022547C4: ; 0x022547C4
-	.byte 0x2F
-
-	.global MOD20_022547C5
-MOD20_022547C5: ; 0x022547C5
-	.byte 0x96, 0x57, 0x01, 0x38, 0x90, 0x58, 0x01, 0x41, 0x84, 0x59, 0x01, 0x32, 0x7E, 0x5A, 0x01, 0x32
-	.byte 0x78, 0x5B, 0x01, 0x3E, 0x6C, 0x5D, 0x01, 0x4A, 0x5A, 0x5E, 0x01, 0x50, 0x6F, 0x61, 0x01, 0x53
-	.byte 0x7E, 0x62, 0x01, 0x65, 0x7E, 0x64, 0x01, 0x7D, 0x7E, 0x6A, 0x01, 0x80, 0x66, 0x6B, 0x01, 0x7A
-	.byte 0x5A, 0x6D, 0x01, 0x5C, 0x5A, 0x6E, 0x01, 0x68, 0x5A, 0x6F, 0x01, 0x6E, 0x8A, 0x73, 0x01, 0x77
-	.byte 0x96, 0x75, 0x01, 0x98, 0x93, 0x7C, 0x01, 0x98, 0x78, 0x7E, 0x01, 0x8C, 0x66, 0x7F, 0x01, 0x56
-	.byte 0x42, 0x81, 0x01, 0x50, 0x33, 0x84, 0x01, 0x29, 0x84, 0x87, 0x01, 0x38, 0x9C, 0xD3, 0x01, 0x3B
-	.byte 0xA2, 0x88, 0x01, 0x4A, 0xA2, 0x8B, 0x01, 0xAA, 0x8A, 0xC8, 0x00, 0x44, 0x72, 0xCC, 0x00, 0x38
-	.byte 0x66, 0x00, 0x00
+	.short 0x0156
+	.byte 0x2F, 0x96
+	.short 0x0157
+	.byte 0x38, 0x90
+	.short 0x0158
+	.byte 0x41, 0x84
+	.short 0x0159
+	.byte 0x32, 0x7E
+	.short 0x015A
+	.byte 0x32, 0x78
+	.short 0x015B
+	.byte 0x3E, 0x6C
+	.short 0x015D
+	.byte 0x4A, 0x5A
+	.short 0x015E
+	.byte 0x50, 0x6F
+	.short 0x0161
+	.byte 0x53, 0x7E
+	.short 0x0162
+	.byte 0x65, 0x7E
+	.short 0x0164
+	.byte 0x7D, 0x7E
+	.short 0x016A
+	.byte 0x80, 0x66
+	.short 0x016B
+	.byte 0x7A, 0x5A
+	.short 0x016D
+	.byte 0x5C, 0x5A
+	.short 0x016E
+	.byte 0x68, 0x5A
+	.short 0x016F
+	.byte 0x6E, 0x8A
+	.short 0x0173
+	.byte 0x77, 0x96
+	.short 0x0175
+	.byte 0x98, 0x93
+	.short 0x017C
+	.byte 0x98, 0x78
+	.short 0x017E
+	.byte 0x8C, 0x66
+	.short 0x017F
+	.byte 0x56, 0x42
+	.short 0x0181
+	.byte 0x50, 0x33
+	.short 0x0184
+	.byte 0x29, 0x84
+	.short 0x0187
+	.byte 0x38, 0x9C
+	.short 0x01D3
+	.byte 0x3B, 0xA2
+	.short 0x0188
+	.byte 0x4A, 0xA2
+	.short 0x018B
+	.byte 0xAA, 0x8A
+	.short 0x00C8
+	.byte 0x44, 0x72
+	.short 0x00CC
+	.byte 0x38, 0x66
 
 	.data
 	.bss