7 files changed, 69 insertions, 44 deletions
diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
index 252405dd..5a905b2d 100644
--- a/arm9/asm/unk_02035068.s
+++ b/arm9/asm/unk_02035068.s
@@ -2,7 +2,6 @@
     .include "global.inc"
 
 	.extern UNK_020F96DC
-
 	.section .rodata
 
 	.global UNK_020F2A8C
@@ -32,11 +31,11 @@ UNK_020F2ACC: ; 0x020F2ACC
 
 	.global UNK_020F2AD0
 UNK_020F2AD0: ; 0x020F2AD0
-	.byte 0x11, 0x5D, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x5D, 0x03, 0x02, 0x02, 0x00, 0x00, 0x00
-	.byte 0x85, 0x62, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x11, 0x65, 0x03, 0x02, 0x04, 0x00, 0x00, 0x00
-	.byte 0xBD, 0x65, 0x03, 0x02, 0x05, 0x00, 0x00, 0x00, 0x85, 0x66, 0x03, 0x02, 0x06, 0x00, 0x00, 0x00
-	.byte 0xFE, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x01, 0x67, 0x03, 0x02, 0x08, 0x00, 0x00, 0x00
-	.byte 0xE9, 0x67, 0x03, 0x02
+	.word FUN_02035D10, 0x00000001, FUN_02035DF8, 0x00000002
+	.word FUN_02036284, 0x00000003, FUN_02036510, 0x00000004
+	.word FUN_020365BC, 0x00000005, FUN_02036684, 0x00000006
+	.word 0xFFFFFFFE, 0x00000007, FUN_02036700, 0x00000008
+	.word FUN_020367E8
 
 	.global UNK_020F2B14
 UNK_020F2B14: ; 0x020F2B14
@@ -50,9 +49,15 @@ UNK_020F2B48: ; 0x020F2B48
 	.byte 0xAE, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x01, 0x00, 0x00, 0x00, 0xD9, 0x34, 0x00, 0x00, 0xD8, 0x34, 0x00, 0x00, 0xD9, 0x34, 0x00, 0x00
 	.byte 0xD9, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x73, 0x03, 0x02, 0x1D, 0x73, 0x03, 0x02, 0x35, 0x73, 0x03, 0x02
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x72, 0x03, 0x02, 0x1D, 0x73, 0x03, 0x02, 0x35, 0x73, 0x03, 0x02
-	.byte 0xFF, 0xFF, 0xFF, 0xFF
+	.byte 0x00, 0x00, 0x00, 0x00
+
+	.global UNK_020F2B7C
+UNK_020F2B7C: ; 0x020F2B7C
+	.word FUN_02037304, FUN_0203731C, FUN_02037334, 0xFFFFFFFF
+
+	.global UNK_020F2B8C
+UNK_020F2B8C: ; 0x020F2B8C
+	.word FUN_020372D4, FUN_0203731C, FUN_02037334, 0xFFFFFFFF
 
 	.text
 
diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s
index 32c141c4..92ff091d 100644
--- a/arm9/asm/unk_020372D4.s
+++ b/arm9/asm/unk_020372D4.s
@@ -67,13 +67,13 @@ FUN_02037334: ; 0x02037334
 	push {r3, lr}
 	bl FUN_020374B0
 	ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID
-	ldr r1, _0203734C ; =UNK63_021DBAB8
+	ldr r1, _0203734C ; =MOD63_021DBAB8
 	bl FUN_02000E7C
 	mov r0, #0x1
 	pop {r3, pc}
 	nop
 _02037348: .word SDK_OVERLAY_MODULE_63_ID
-_0203734C: .word UNK63_021DBAB8
+_0203734C: .word MOD63_021DBAB8
 
 	thumb_func_start LoadOverlay_MODULE_05
 LoadOverlay_MODULE_05: ; 0x02037350
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 7d27a313..f5272628 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -36,39 +36,39 @@ UNK_020F2BE8: ; 0x020F2BE8
 
 	.global UNK_020F2BF4
 UNK_020F2BF4: ; 0x020F2BF4
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0x8D, 0x75, 0x1D, 0x02, 0x5D, 0x75, 0x1D, 0x02, 0x46, 0x00, 0x00, 0x00
+	.word MOD70_021D74E0, MOD70_021D758C, MOD70_021D755C, SDK_OVERLAY_MODULE_70_ID
 
 	.global UNK_020F2C04
 UNK_020F2C04: ; 0x020F2C04
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0x49, 0x77, 0x1D, 0x02, 0xA5, 0x76, 0x1D, 0x02, 0x54, 0x00, 0x00, 0x00
+	.word MOD84_021D74E0, MOD84_021D7748, MOD84_021D76A4, SDK_OVERLAY_MODULE_84_ID
 
 	.global UNK_020F2C14
 UNK_020F2C14: ; 0x020F2C14
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0xA1, 0x75, 0x1D, 0x02, 0x45, 0x76, 0x1D, 0x02, 0x55, 0x00, 0x00, 0x00
+	.word MOD85_021D74E0, MOD85_021D75A0, MOD85_021D7644, SDK_OVERLAY_MODULE_85_ID
 
 	.global UNK_020F2C24
 UNK_020F2C24: ; 0x020F2C24
-	.byte 0x21, 0x9A, 0x1D, 0x02, 0x8D, 0x9B, 0x1D, 0x02, 0xF1, 0x9B, 0x1D, 0x02, 0x3A, 0x00, 0x00, 0x00
+	.word MOD58_021D9A20, MOD58_021D9B8C, MOD58_021D9BF0, SDK_OVERLAY_MODULE_58_ID
 
 	.global UNK_020F2C34
 UNK_020F2C34: ; 0x020F2C34
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0x41, 0x76, 0x1D, 0x02, 0xF5, 0x76, 0x1D, 0x02, 0x40, 0x00, 0x00, 0x00
+	.word MOD64_021D74E0, MOD64_021D7640, MOD64_021D76F4, SDK_OVERLAY_MODULE_64_ID
 
 	.global UNK_020F2C44
 UNK_020F2C44: ; 0x020F2C44
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0x89, 0x75, 0x1D, 0x02, 0x15, 0x76, 0x1D, 0x02, 0x10, 0x00, 0x00, 0x00
+	.word MOD16_021D74E0, MOD16_021D7588, MOD16_021D7614, SDK_OVERLAY_MODULE_16_ID
 
 	.global UNK_020F2C54
 UNK_020F2C54: ; 0x020F2C54
-	.byte 0xE1, 0x74, 0x1D, 0x02, 0x15, 0x77, 0x1D, 0x02, 0x45, 0x79, 0x1D, 0x02, 0x39, 0x00, 0x00, 0x00
+	.word MOD57_021D74E0, MOD57_021D7714, MOD57_021D7944, SDK_OVERLAY_MODULE_57_ID
 
 	.global UNK_020F2C64
 UNK_020F2C64: ; 0x020F2C64
-	.byte 0xD1, 0xDF, 0x22, 0x02, 0x35, 0xE1, 0x22, 0x02, 0x5D, 0xE2, 0x22, 0x02, 0x50, 0x00, 0x00, 0x00
+	.word MOD80_0222DFD0, MOD80_0222E134, MOD80_0222E25C, SDK_OVERLAY_MODULE_80_ID
 
 	.global UNK_020F2C74
 UNK_020F2C74: ; 0x020F2C74
-	.byte 0x35, 0xDA, 0x22, 0x02, 0x7D, 0xDB, 0x22, 0x02, 0x51, 0xDC, 0x22, 0x02, 0x52, 0x00, 0x00, 0x00
+	.word MOD82_0222DA34, MOD82_0222DB7C, MOD82_0222DC50, SDK_OVERLAY_MODULE_82_ID
 
 	.global UNK_020F2C84
 UNK_020F2C84: ; 0x020F2C84
diff --git a/arm9/asm/unk_02058EE8.s b/arm9/asm/unk_02058EE8.s
index eb57352b..70e6414e 100644
--- a/arm9/asm/unk_02058EE8.s
+++ b/arm9/asm/unk_02058EE8.s
@@ -676,26 +676,46 @@ UNK_020F6984: ; 0x020F6984
 
 	.global UNK_020F69BC
 UNK_020F69BC: ; 0x020F69BC
-	.word 0x00000000, 0x020F6950, 0x00000001, 0x020F6678
-	.word 0x00000002, 0x020F669C, 0x00000003, 0x020F6684
-	.word 0x00000004, 0x020F66A8, 0x00000005, 0x020F6864
-	.word 0x00000006, 0x020F6824, 0x00000007, 0x020F6834
-	.word 0x00000008, 0x020F6854, 0x00000009, 0x020F66D8
-	.word 0x0000000A, 0x020F66C0, 0x0000000B, 0x020F68C4
-	.word 0x0000000C, 0x020F66B4, 0x0000000D, 0x020F6690
-	.word 0x0000000E, 0x020F67D4, 0x0000000F, 0x020F67C4
-	.word 0x00000010, 0x020F67A4, 0x00000011, 0x020F67B4
-	.word 0x00000012, 0x020F68A4, 0x00000013, 0x020F6784
-	.word 0x00000014, 0x020F66E4, 0x00000015, 0x020F68B4
-	.word 0x00000016, 0x020F67E4, 0x00000017, 0x020F67F4
-	.word 0x00000018, 0x020F6844, 0x00000019, 0x020F6874
-	.word 0x0000001A, 0x020F6804, 0x0000001B, 0x020F6704
-	.word 0x0000001C, 0x020F66F4, 0x0000001D, 0x020F6734
-	.word 0x0000001E, 0x020F6794, 0x0000001F, 0x020F6744
-	.word 0x00000020, 0x020F6814, 0x00000021, 0x020F6884
-	.word 0x00000022, 0x020F6714, 0x00000023, 0x020F6764
-	.word 0x00000024, 0x020F6774, 0x00000025, 0x020F6894
-	.word 0x00000026, 0x020F6914, 0x00000027, 0x00000000
+	.word 0x00000000, UNK_020F6950
+	.word 0x00000001, UNK_020F6678
+	.word 0x00000002, UNK_020F669C
+	.word 0x00000003, UNK_020F6684
+	.word 0x00000004, UNK_020F66A8
+	.word 0x00000005, UNK_020F6864
+	.word 0x00000006, UNK_020F6824
+	.word 0x00000007, UNK_020F6834
+	.word 0x00000008, UNK_020F6854
+	.word 0x00000009, UNK_020F66D8
+	.word 0x0000000A, UNK_020F66C0
+	.word 0x0000000B, UNK_020F68C4
+	.word 0x0000000C, UNK_020F66B4
+	.word 0x0000000D, UNK_020F6690
+	.word 0x0000000E, UNK_020F67D4
+	.word 0x0000000F, UNK_020F67C4
+	.word 0x00000010, UNK_020F67A4
+	.word 0x00000011, UNK_020F67B4
+	.word 0x00000012, UNK_020F68A4
+	.word 0x00000013, UNK_020F6784
+	.word 0x00000014, UNK_020F66E4
+	.word 0x00000015, UNK_020F68B4
+	.word 0x00000016, UNK_020F67E4
+	.word 0x00000017, UNK_020F67F4
+	.word 0x00000018, UNK_020F6844
+	.word 0x00000019, UNK_020F6874
+	.word 0x0000001A, UNK_020F6804
+	.word 0x0000001B, UNK_020F6704
+	.word 0x0000001C, UNK_020F66F4
+	.word 0x0000001D, UNK_020F6734
+	.word 0x0000001E, UNK_020F6794
+	.word 0x0000001F, UNK_020F6744
+	.word 0x00000020, UNK_020F6814
+	.word 0x00000021, UNK_020F6884
+	.word 0x00000022, UNK_020F6714
+	.word 0x00000023, UNK_020F6764
+	.word 0x00000024, UNK_020F6774
+	.word 0x00000025, UNK_020F6894
+	.word 0x00000026, UNK_020F6914
+	.word 0x00000027, 0x00000000
 
 	.global UNK_020F6AFC
 UNK_020F6AFC: ; 0x020F6AFC
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s
index d69aacdd..6feef167 100644
--- a/arm9/asm/unk_0205CE48.s
+++ b/arm9/asm/unk_0205CE48.s
@@ -1619,7 +1619,7 @@ FUN_0205DAAC: ; 0x0205DAAC
 	mov r0, #0x0
 	pop {r4, pc}
 	.balign 4
-_0205DAC8: .word 0x0224C721
+_0205DAC8: .word MOD06_0224C720
 
 	thumb_func_start FUN_0205DACC
 FUN_0205DACC: ; 0x0205DACC
diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s
index 95a710e9..df52b64f 100644
--- a/arm9/asm/unk_02089960.s
+++ b/arm9/asm/unk_02089960.s
@@ -143,13 +143,13 @@ FUN_02089A40: ; 0x02089A40
 	add r0, r4, #0x0
 	bl FUN_020168D0
 	ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID
-	ldr r1, _02089A68 ; =0x0223A360
+	ldr r1, _02089A68 ; =MOD83_0223A360
 	bl FUN_02000E7C
 	mov r0, #0x1
 	pop {r3-r5, pc}
 	nop
 _02089A64: .word SDK_OVERLAY_MODULE_83_ID
-_02089A68: .word 0x0223A360
+_02089A68: .word MOD83_0223A360
 
 	thumb_func_start FUN_02089A6C
 FUN_02089A6C: ; 0x02089A6C
diff --git a/arm9/asm/unk_0208A258.s b/arm9/asm/unk_0208A258.s
index 2e476eaf..21a8f91a 100644
--- a/arm9/asm/unk_0208A258.s
+++ b/arm9/asm/unk_0208A258.s
@@ -84,5 +84,5 @@ FUN_0208A2C4: ; 0x0208A2C4
 _0208A2F6:
 	pop {r4-r6, pc}
 	.balign 4
-_0208A2F8: .word 0x0223D4AD
+_0208A2F8: .word MOD06_0223D4AC
 _0208A2FC: .word 0x0000022F