Merge branch 'master' into master

34 files changed, 166 insertions, 126 deletions

diff --git a/arm9/global.inc b/arm9/global.inc
index 905123e3..3e25f9aa 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7058,7 +7058,7 @@
 .extern MOD20_022524DC
 .extern MOD20_02252534
 .extern MOD20_02252538
-.extern MOD20_02252978
+.extern Poketch_InitApp
 .extern MOD20_0225298C
 .extern MOD20_022529A0
 .extern MOD20_022529B4
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index 107de27a..93fc85ff 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -197,7 +197,7 @@ MOD20_0225257C: ; 0x0225257C
 	add r0, r4, #0
 	bl MOD20_02252A08
 	add r0, r4, #0
-	bl MOD20_022528FC
+	bl ClosePoketchApp
 	ldr r0, [r4, #0x1c]
 	bl MOD20_02252E18
 	pop {r4, pc}
@@ -443,7 +443,7 @@ _02252750:
 	cmp r0, #0
 	beq _022527AA
 	add r0, r4, #0
-	bl MOD20_022528FC
+	bl ClosePoketchApp
 	bl FUN_020893E0
 	add r0, r4, #0
 	mov r1, #2
@@ -610,7 +610,7 @@ _02252890:
 	cmp r0, #0
 	beq _022528AC
 	add r0, r4, #0
-	bl MOD20_022528FC
+	bl ClosePoketchApp
 	bl FUN_0201CD04
 	add r0, r4, #0
 	mov r1, #4
@@ -663,8 +663,8 @@ _022528F4: .word sPoketchAppOverlayMapping
 _022528F8: .word sPoketchAppOverlayMapping + 4
 	thumb_func_end LoadPoketchApp
 
-	thumb_func_start MOD20_022528FC
-MOD20_022528FC: ; 0x022528FC
+	thumb_func_start ClosePoketchApp
+ClosePoketchApp: ; 0x022528FC
 	push {r4, lr}
 	add r4, r0, #0
 	mov r0, #0
@@ -679,7 +679,7 @@ MOD20_022528FC: ; 0x022528FC
 	str r0, [r4, #0x14]
 _02252916:
 	pop {r4, pc}
-	thumb_func_end MOD20_022528FC
+	thumb_func_end ClosePoketchApp
 
 	thumb_func_start MOD20_02252918
 MOD20_02252918: ; 0x02252918
@@ -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
diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s
index d0a6eed9..7ec2a1e6 100644
--- a/arm9/modules/21/asm/module_21.s
+++ b/arm9/modules/21/asm/module_21.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD21_02254840
 MOD21_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD21_02254854
 	ldr r1, _02254850 ; =MOD21_0225496C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD21_02254854
 _02254850: .word MOD21_0225496C
 	thumb_func_end MOD21_02254840
diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s
index 8d928551..8889fb04 100644
--- a/arm9/modules/22/asm/module_22.s
+++ b/arm9/modules/22/asm/module_22.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD22_02254840
 MOD22_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD22_02254854
 	ldr r1, _02254850 ; =MOD22_022549D8
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD22_02254854
 _02254850: .word MOD22_022549D8
 	thumb_func_end MOD22_02254840
diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s
index 51b98b07..370847aa 100644
--- a/arm9/modules/23/asm/module_23.s
+++ b/arm9/modules/23/asm/module_23.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD23_02254840
 MOD23_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD23_02254854
 	ldr r1, _02254850 ; =MOD23_022549A4
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD23_02254854
 _02254850: .word MOD23_022549A4
 	thumb_func_end MOD23_02254840
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s
index 504f59b5..8ec9903c 100644
--- a/arm9/modules/24/asm/module_24.s
+++ b/arm9/modules/24/asm/module_24.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD24_02254840
 MOD24_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD24_02254854
 	ldr r1, _02254850 ; =MOD24_02254990
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD24_02254854
 _02254850: .word MOD24_02254990
 	thumb_func_end MOD24_02254840
diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s
index b83d964c..cf57dc32 100644
--- a/arm9/modules/25/asm/module_25.s
+++ b/arm9/modules/25/asm/module_25.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD25_02254840
 MOD25_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD25_02254854
 	ldr r1, _02254850 ; =MOD25_0225496C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD25_02254854
 _02254850: .word MOD25_0225496C
 	thumb_func_end MOD25_02254840
diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s
index 05d00696..bba03256 100644
--- a/arm9/modules/26/asm/module_26.s
+++ b/arm9/modules/26/asm/module_26.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD26_02254840
 MOD26_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD26_02254854
 	ldr r1, _02254850 ; =MOD26_02254A84
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD26_02254854
 _02254850: .word MOD26_02254A84
 	thumb_func_end MOD26_02254840
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 4508ffdc..1b731add 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD27_02254840
 MOD27_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD27_02254854
 	ldr r1, _02254850 ; =MOD27_0225492C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD27_02254854
 _02254850: .word MOD27_0225492C
 	thumb_func_end MOD27_02254840
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 290e264f..847028e6 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD28_02254840
 MOD28_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD28_02254854
 	ldr r1, _02254850 ; =MOD28_022549F4
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD28_02254854
 _02254850: .word MOD28_022549F4
 	thumb_func_end MOD28_02254840
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s
index 8744eadd..80e5d5b9 100644
--- a/arm9/modules/29/asm/module_29.s
+++ b/arm9/modules/29/asm/module_29.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD29_02254840
 MOD29_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD29_02254854
 	ldr r1, _02254850 ; =MOD29_02254914
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD29_02254854
 _02254850: .word MOD29_02254914
 	thumb_func_end MOD29_02254840
diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s
index 153c1b76..eadbd751 100644
--- a/arm9/modules/30/asm/module_30.s
+++ b/arm9/modules/30/asm/module_30.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD30_02254840
 MOD30_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD30_02254854
 	ldr r1, _02254850 ; =MOD30_0225496C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD30_02254854
 _02254850: .word MOD30_0225496C
 	thumb_func_end MOD30_02254840
diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s
index 3c06ab64..47018f81 100644
--- a/arm9/modules/31/asm/module_31.s
+++ b/arm9/modules/31/asm/module_31.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD31_02254840
 MOD31_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD31_02254854
 	ldr r1, _02254850 ; =MOD31_02254954
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD31_02254854
 _02254850: .word MOD31_02254954
 	thumb_func_end MOD31_02254840
diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s
index d75a5d63..5a5feeea 100644
--- a/arm9/modules/32/asm/module_32.s
+++ b/arm9/modules/32/asm/module_32.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD32_02254840
 MOD32_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD32_02254854
 	ldr r1, _02254850 ; =MOD32_0225495C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD32_02254854
 _02254850: .word MOD32_0225495C
 	thumb_func_end MOD32_02254840
diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s
index c878125b..83b48eba 100644
--- a/arm9/modules/33/asm/module_33.s
+++ b/arm9/modules/33/asm/module_33.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD33_02254840
 MOD33_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD33_02254854
 	ldr r1, _02254850 ; =MOD33_02254908
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD33_02254854
 _02254850: .word MOD33_02254908
 	thumb_func_end MOD33_02254840
diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s
index e69ff4f1..d53be79b 100644
--- a/arm9/modules/34/asm/module_34.s
+++ b/arm9/modules/34/asm/module_34.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD34_02254840
 MOD34_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD34_02254854
 	ldr r1, _02254850 ; =MOD34_02254948
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD34_02254854
 _02254850: .word MOD34_02254948
 	thumb_func_end MOD34_02254840
diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s
index 707bc4d9..dfdc8530 100644
--- a/arm9/modules/35/asm/module_35.s
+++ b/arm9/modules/35/asm/module_35.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD35_02254840
 MOD35_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD35_02254854
 	ldr r1, _02254850 ; =MOD35_02254924
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD35_02254854
 _02254850: .word MOD35_02254924
 	thumb_func_end MOD35_02254840
diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s
index 75b165b9..d5ba87c7 100644
--- a/arm9/modules/36/asm/module_36.s
+++ b/arm9/modules/36/asm/module_36.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD36_02254840
 MOD36_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD36_02254854
 	ldr r1, _02254850 ; =MOD36_02254990
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD36_02254854
 _02254850: .word MOD36_02254990
 	thumb_func_end MOD36_02254840
diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s
index 886ec479..f4d426db 100644
--- a/arm9/modules/37/asm/module_37.s
+++ b/arm9/modules/37/asm/module_37.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD37_02254840
 MOD37_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD37_02254854
 	ldr r1, _02254850 ; =MOD37_02254934
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD37_02254854
 _02254850: .word MOD37_02254934
 	thumb_func_end MOD37_02254840
diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s
index 85a18fda..46391ca3 100644
--- a/arm9/modules/38/asm/module_38.s
+++ b/arm9/modules/38/asm/module_38.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD38_02254840
 MOD38_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD38_02254854
 	ldr r1, _02254850 ; =MOD38_02254990
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD38_02254854
 _02254850: .word MOD38_02254990
 	thumb_func_end MOD38_02254840
diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s
index 97390152..27675b6d 100644
--- a/arm9/modules/39/asm/module_39.s
+++ b/arm9/modules/39/asm/module_39.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD39_02254840
 MOD39_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD39_02254854
 	ldr r1, _02254850 ; =MOD39_022549D4
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD39_02254854
 _02254850: .word MOD39_022549D4
 	thumb_func_end MOD39_02254840
diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s
index 304931b8..02f648c8 100644
--- a/arm9/modules/40/asm/module_40.s
+++ b/arm9/modules/40/asm/module_40.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD40_02254840
 MOD40_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD40_02254854
 	ldr r1, _02254850 ; =MOD40_022549D4
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD40_02254854
 _02254850: .word MOD40_022549D4
 	thumb_func_end MOD40_02254840
diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s
index 594ec16c..0e9851e2 100644
--- a/arm9/modules/41/asm/module_41.s
+++ b/arm9/modules/41/asm/module_41.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD41_02254840
 MOD41_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD41_02254854
 	ldr r1, _02254850 ; =MOD41_02254AD8
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD41_02254854
 _02254850: .word MOD41_02254AD8
 	thumb_func_end MOD41_02254840
diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s
index e630bbb7..f13fb22c 100644
--- a/arm9/modules/42/asm/module_42.s
+++ b/arm9/modules/42/asm/module_42.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD42_02254840
 MOD42_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD42_02254854
 	ldr r1, _02254850 ; =MOD42_02254A38
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD42_02254854
 _02254850: .word MOD42_02254A38
 	thumb_func_end MOD42_02254840
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s
index 667029af..b4667463 100644
--- a/arm9/modules/43/asm/module_43.s
+++ b/arm9/modules/43/asm/module_43.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD43_02254840
 MOD43_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD43_02254854
 	ldr r1, _02254850 ; =MOD43_02254970
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD43_02254854
 _02254850: .word MOD43_02254970
 	thumb_func_end MOD43_02254840
diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s
index f40d59c0..dfb28de6 100644
--- a/arm9/modules/44/asm/module_44.s
+++ b/arm9/modules/44/asm/module_44.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD44_02254840
 MOD44_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD44_02254854
 	ldr r1, _02254850 ; =MOD44_02254920
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD44_02254854
 _02254850: .word MOD44_02254920
 	thumb_func_end MOD44_02254840
diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s
index b64df933..7f47eb2f 100644
--- a/arm9/modules/45/asm/module_45.s
+++ b/arm9/modules/45/asm/module_45.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD45_02254840
 MOD45_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD45_02254854
 	ldr r1, _02254850 ; =MOD45_02254A30
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD45_02254854
 _02254850: .word MOD45_02254A30
 	thumb_func_end MOD45_02254840
diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s
index 72013e2e..fce37ff3 100644
--- a/arm9/modules/46/asm/module_46.s
+++ b/arm9/modules/46/asm/module_46.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD46_02254840
 MOD46_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD46_02254854
 	ldr r1, _02254850 ; =MOD46_02254908
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD46_02254854
 _02254850: .word MOD46_02254908
 	thumb_func_end MOD46_02254840
diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s
index 978634c1..63e10ef6 100644
--- a/arm9/modules/47/asm/module_47.s
+++ b/arm9/modules/47/asm/module_47.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD47_02254840
 MOD47_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD47_02254854
 	ldr r1, _02254850 ; =MOD47_0225491C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD47_02254854
 _02254850: .word MOD47_0225491C
 	thumb_func_end MOD47_02254840
diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s
index b67ca546..661529fd 100644
--- a/arm9/modules/48/asm/module_48.s
+++ b/arm9/modules/48/asm/module_48.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD48_02254840
 MOD48_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD48_02254854
 	ldr r1, _02254850 ; =MOD48_0225498C
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD48_02254854
 _02254850: .word MOD48_0225498C
 	thumb_func_end MOD48_02254840
diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s
index 79f8fd7d..d829718b 100644
--- a/arm9/modules/49/asm/module_49.s
+++ b/arm9/modules/49/asm/module_49.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD49_02254840
 MOD49_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD49_02254854
 	ldr r1, _02254850 ; =MOD49_02254974
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD49_02254854
 _02254850: .word MOD49_02254974
 	thumb_func_end MOD49_02254840
diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s
index 3310d44c..31f6263d 100644
--- a/arm9/modules/50/asm/module_50.s
+++ b/arm9/modules/50/asm/module_50.s
@@ -5,12 +5,12 @@
 
 	thumb_func_start MOD50_02254840
 MOD50_02254840: ; 0x02254840
-	ldr r3, _02254848 ; =MOD20_02252978
+	ldr r3, _02254848 ; =Poketch_InitApp
 	ldr r0, _0225484C ; =MOD50_02254854
 	ldr r1, _02254850 ; =MOD50_02254908
 	bx r3
 	.align 2, 0
-_02254848: .word MOD20_02252978
+_02254848: .word Poketch_InitApp
 _0225484C: .word MOD50_02254854
 _02254850: .word MOD50_02254908
 	thumb_func_end MOD50_02254840
diff --git a/arm9/src/unk_0200CA44.c b/arm9/src/unk_0200CA44.c
index 5c422ba7..90b07f59 100644
--- a/arm9/src/unk_0200CA44.c
+++ b/arm9/src/unk_0200CA44.c
@@ -2,27 +2,27 @@
 #include "main.h"
 #include "unk_0200CA44.h"
 
-extern void FUN_0201B60C(s32, u16, u16, u16);
+extern void FUN_0201B60C(s32, void (*)(void *, void *), void *, void *);
 extern void FUN_0201B6A0(s32);
 
-THUMB_FUNC void FUN_0200CA44(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA44(void (*r0)(void *, void *), void * r1, void * r2)
 {
-    FUN_0201B60C(gUnknown21C48B8.unk18,r0,r1,r2);
+    FUN_0201B60C(gUnknown21C48B8.unk18, r0, r1, r2);
 }
 
-THUMB_FUNC void FUN_0200CA60(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2)
 {
-    FUN_0201B60C(gUnknown21C48B8.unk1C,r0,r1,r2);
+    FUN_0201B60C(gUnknown21C48B8.unk1C, r0, r1, r2);
 }
 
-THUMB_FUNC void FUN_0200CA7C(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2)
 {
-    FUN_0201B60C(gUnknown21C48B8.unk24,r0,r1,r2);
+    FUN_0201B60C(gUnknown21C48B8.unk24, r0, r1, r2);
 }
 
-THUMB_FUNC void FUN_0200CA98(u16 r0, u16 r1, u16 r2)
+THUMB_FUNC void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2)
 {
-    FUN_0201B60C(gUnknown21C48B8.unk20,r0,r1,r2);
+    FUN_0201B60C(gUnknown21C48B8.unk20, r0, r1, r2);
 }
 
 THUMB_FUNC void FUN_0200CAB4(s32 unk1)
diff --git a/include/unk_0200CA44.h b/include/unk_0200CA44.h
index 2c681b8d..27d58c5c 100644
--- a/include/unk_0200CA44.h
+++ b/include/unk_0200CA44.h
@@ -1,10 +1,10 @@
 #ifndef POKEDIAMOND_UNK_0200CA44_H
 #define POKEDIAMOND_UNK_0200CA44_H
 
-void FUN_0200CA44(u16 r0, u16 r1, u16 r2);
-void FUN_0200CA60(u16 r0, u16 r1, u16 r2);
-void FUN_0200CA7C(u16 r0, u16 r1, u16 r2);
-void FUN_0200CA98(u16 r0, u16 r1, u16 r2);
+void FUN_0200CA44(void (*r0)(void *, void *), void * r1, void * r2);
+void FUN_0200CA60(void (*r0)(void *, void *), void * r1, void * r2);
+void FUN_0200CA7C(void (*r0)(void *, void *), void * r1, void * r2);
+void FUN_0200CA98(void (*r0)(void *, void *), void * r1, void * r2);
 void FUN_0200CAB4(s32 unk1);
 
 #endif //POKEDIAMOND_UNK_0200CA44_H