summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/asm/unk_020377F0.s16
-rw-r--r--arm9/asm/unk_02058EE8.s40
-rw-r--r--arm9/asm/unk_0205CE48.s2
-rw-r--r--arm9/asm/unk_0208A258.s2
-rw-r--r--arm9/global.inc26
5 files changed, 56 insertions, 30 deletions
diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s
index 7d27a313..278cd8fa 100644
--- a/arm9/asm/unk_020377F0.s
+++ b/arm9/asm/unk_020377F0.s
@@ -36,35 +36,35 @@ 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, 0x00000046
.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, 0x00000054
.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, 0x00000055
.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, 0x0000003A
.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, 0x00000040
.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, 0x00000010
.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, 0x00000039
.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, 0x00000050
.global UNK_020F2C74
UNK_020F2C74: ; 0x020F2C74
diff --git a/arm9/asm/unk_02058EE8.s b/arm9/asm/unk_02058EE8.s
index eb57352b..8b128a44 100644
--- a/arm9/asm/unk_02058EE8.s
+++ b/arm9/asm/unk_02058EE8.s
@@ -676,26 +676,26 @@ 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, 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
.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_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
diff --git a/arm9/global.inc b/arm9/global.inc
index 47c24fe9..147eafb2 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -6467,6 +6467,7 @@
.extern MOD06_0223CD7C
.extern MOD06_0223CDB8
.extern MOD06_0223D3D0
+.extern MOD06_0223D4AC
.extern MOD06_0223DFB4
.extern MOD06_02240790
.extern MOD06_022407CC
@@ -6663,6 +6664,7 @@
.extern MOD06_0224C6E8
.extern MOD06_0224C6F4
.extern MOD06_0224C700
+.extern MOD06_0224C720
.extern MOD06_0224C8C8
.extern MOD06_0224C8E8
.extern MOD06_0224CA58
@@ -6852,6 +6854,9 @@
.extern MOD15_021D74E0
.extern MOD15_021D7558
.extern MOD15_021D7608
+.extern MOD16_021D74E0
+.extern MOD16_021D7588
+.extern MOD16_021D7614
.extern MOD16_021EEF0C
.extern MOD16_021EEF84
.extern MOD16_021EEF98
@@ -7108,6 +7113,12 @@
.extern MOD56_02212164
.extern MOD56_02212240
.extern MOD56_0221244C
+.extern MOD57_021D74E0
+.extern MOD57_021D7714
+.extern MOD57_021D7944
+.extern MOD58_021D9A20
+.extern MOD58_021D9B8C
+.extern MOD58_021D9BF0
.extern MOD59_021D74E0
.extern MOD59_021D7564
.extern MOD59_021D76C0
@@ -7129,6 +7140,9 @@
.extern MOD62_02230F3C
.extern MOD62_02230F70
.extern MOD62_02230F80
+.extern MOD64_021D74E0
+.extern MOD64_021D7640
+.extern MOD64_021D76F4
.extern MOD65_021D74E0
.extern MOD65_021D7524
.extern MOD65_021D753C
@@ -7139,6 +7153,9 @@
.extern MOD68_021D75D8
.extern MOD68_021D762C
.extern MOD69_0222EC60
+.extern MOD70_021D74E0
+.extern MOD70_021D758C
+.extern MOD70_021D755C
.extern MOD71_0222D5C0
.extern MOD71_0222D9C8
.extern MOD71_0222E438
@@ -7174,10 +7191,19 @@
.extern MOD79_02213D80
.extern MOD79_02213DBC
.extern MOD79_02213E24
+.extern MOD80_0222DFD0
+.extern MOD80_0222E134
+.extern MOD80_0222E25C
.extern MOD81_02237E40
.extern MOD81_02238004
.extern MOD81_02238064
.extern MOD83_0223A360
+.extern MOD84_021D74E0
+.extern MOD84_021D7748
+.extern MOD84_021D76A4
+.extern MOD85_021D74E0
+.extern MOD85_021D75A0
+.extern MOD85_021D7644
.extern MTX_Concat33
.extern MTX_Concat43
.extern MTX_Concat44