address issues

3 files changed, 52 insertions, 29 deletions

diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 278cd8fa..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
-	.word MOD70_021D74E0, MOD70_021D758C, MOD70_021D755C, 0x00000046
+	.word MOD70_021D74E0, MOD70_021D758C, MOD70_021D755C, SDK_OVERLAY_MODULE_70_ID
 
 	.global UNK_020F2C04
 UNK_020F2C04: ; 0x020F2C04
-	.word MOD84_021D74E0, MOD84_021D7748, MOD84_021D76A4, 0x00000054
+	.word MOD84_021D74E0, MOD84_021D7748, MOD84_021D76A4, SDK_OVERLAY_MODULE_84_ID
 
 	.global UNK_020F2C14
 UNK_020F2C14: ; 0x020F2C14
-	.word MOD85_021D74E0, MOD85_021D75A0, MOD85_021D7644, 0x00000055
+	.word MOD85_021D74E0, MOD85_021D75A0, MOD85_021D7644, SDK_OVERLAY_MODULE_85_ID
 
 	.global UNK_020F2C24
 UNK_020F2C24: ; 0x020F2C24
-	.word MOD58_021D9A20, MOD58_021D9B8C, MOD58_021D9BF0, 0x0000003A
+	.word MOD58_021D9A20, MOD58_021D9B8C, MOD58_021D9BF0, SDK_OVERLAY_MODULE_58_ID
 
 	.global UNK_020F2C34
 UNK_020F2C34: ; 0x020F2C34
-	.word MOD64_021D74E0, MOD64_021D7640, MOD64_021D76F4, 0x00000040
+	.word MOD64_021D74E0, MOD64_021D7640, MOD64_021D76F4, SDK_OVERLAY_MODULE_64_ID
 
 	.global UNK_020F2C44
 UNK_020F2C44: ; 0x020F2C44
-	.word MOD16_021D74E0, MOD16_021D7588, MOD16_021D7614, 0x00000010
+	.word MOD16_021D74E0, MOD16_021D7588, MOD16_021D7614, SDK_OVERLAY_MODULE_16_ID
 
 	.global UNK_020F2C54
 UNK_020F2C54: ; 0x020F2C54
-	.word MOD57_021D74E0, MOD57_021D7714, MOD57_021D7944, 0x00000039
+	.word MOD57_021D74E0, MOD57_021D7714, MOD57_021D7944, SDK_OVERLAY_MODULE_57_ID
 
 	.global UNK_020F2C64
 UNK_020F2C64: ; 0x020F2C64
-	.word MOD80_0222DFD0, MOD80_0222E134, MOD80_0222E25C, 0x00000050
+	.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 8b128a44..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, UNK_020F6950, 0x00000001, UNK_020F6678
-	.word 0x00000002, UNK_020F669C, 0x00000003, UNK_020F6684
-	.word 0x00000004, UNK_020F66A8, 0x00000005, UNK_020F6864
-	.word 0x00000006, UNK_020F6824, 0x00000007, UNK_020F6834
-	.word 0x00000008, UNK_020F6854, 0x00000009, UNK_020F66D8
-	.word 0x0000000A, UNK_020F66C0, 0x0000000B, UNK_020F68C4
-	.word 0x0000000C, UNK_020F66B4, 0x0000000D, UNK_020F6690
-	.word 0x0000000E, UNK_020F67D4, 0x0000000F, UNK_020F67C4
-	.word 0x00000010, UNK_020F67A4, 0x00000011, UNK_020F67B4
-	.word 0x00000012, UNK_020F68A4, 0x00000013, UNK_020F6784
-	.word 0x00000014, UNK_020F66E4, 0x00000015, UNK_020F68B4
-	.word 0x00000016, UNK_020F67E4, 0x00000017, UNK_020F67F4
-	.word 0x00000018, UNK_020F6844, 0x00000019, UNK_020F6874
-	.word 0x0000001A, UNK_020F6804, 0x0000001B, UNK_020F6704
-	.word 0x0000001C, UNK_020F66F4, 0x0000001D, UNK_020F6734
-	.word 0x0000001E, UNK_020F6794, 0x0000001F, UNK_020F6744
-	.word 0x00000020, UNK_020F6814, 0x00000021, UNK_020F6884
-	.word 0x00000022, UNK_020F6714, 0x00000023, UNK_020F6764
-	.word 0x00000024, UNK_020F6774, 0x00000025, UNK_020F6894
-	.word 0x00000026, UNK_020F6914, 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/global.inc b/arm9/global.inc
index 147eafb2..a96989ba 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7197,6 +7197,9 @@
 .extern MOD81_02237E40
 .extern MOD81_02238004
 .extern MOD81_02238064
+.extern MOD82_0222DA34
+.extern MOD82_0222DB7C
+.extern MOD82_0222DC50
 .extern MOD83_0223A360
 .extern MOD84_021D74E0
 .extern MOD84_021D7748