summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_020372D4.s4
-rw-r--r--arm9/global.inc3
-rw-r--r--arm9/modules/07/asm/module_07.s4
-rw-r--r--arm9/modules/08/asm/module_08.s4
-rw-r--r--arm9/modules/11/asm/module_11.s4
-rw-r--r--arm9/modules/12/asm/module_12.s16
-rw-r--r--arm9/modules/16/asm/module_16.s4
-rw-r--r--arm9/modules/17/asm/module_17.s4
-rw-r--r--arm9/modules/62/asm/module_62.s4
-rw-r--r--arm9/modules/63/asm/module_63.s431
-rw-r--r--arm9/modules/64/asm/module_64.s4
-rw-r--r--arm9/modules/81/asm/module_81.s8
-rw-r--r--arm9/src/main.c4
13 files changed, 327 insertions, 167 deletions
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/global.inc b/arm9/global.inc
index 141184c6..2a8b1bd9 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7666,7 +7666,7 @@
.extern UNK05_021F9080
.extern UNK05_021F9194
.extern UNK05_021F9494
-.extern UNK63_021DBAB8
+.extern MOD63_021DBAB8
.extern UNK_020FB6F8
.extern UNK_020FB704
.extern UNK_020FB710
@@ -7674,6 +7674,7 @@
.extern UNK_020FB740
.extern UNK_020FB764
.extern UNK_020FD144
+.extern UNK_021064B8
.extern UNK_021064C0
.extern UNK_021C8ECC
.extern UNK_021C8ED0
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 35785b87..f3a76d4a 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3155,7 +3155,7 @@ _0221380C: .word 0x00000B58
thumb_func_start MOD07_02213810
MOD07_02213810: ; 0x02213810
push {r4, lr}
- ldr r3, _02213830 ; =0x021064B8
+ ldr r3, _02213830 ; =UNK_021064B8
mov r2, #0
ldr r3, [r3]
blx r3
@@ -3169,7 +3169,7 @@ _02213828:
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02213830: .word 0x021064B8
+_02213830: .word UNK_021064B8
thumb_func_start MOD07_02213834
MOD07_02213834: ; 0x02213834
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 15a22bf2..d0fcc19c 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -8072,7 +8072,7 @@ _02215A66:
thumb_func_start MOD08_02215A68
MOD08_02215A68: ; 0x02215A68
push {r4, lr}
- ldr r3, _02215A80 ; =0x021064B8
+ ldr r3, _02215A80 ; =UNK_021064B8
mov r2, #0
ldr r3, [r3]
blx r3
@@ -8082,7 +8082,7 @@ MOD08_02215A68: ; 0x02215A68
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02215A80: .word 0x021064B8
+_02215A80: .word UNK_021064B8
thumb_func_start MOD08_02215A84
MOD08_02215A84: ; 0x02215A84
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index f1edf86b..338eaadb 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -3061,7 +3061,7 @@ _0222EFD8: .word FUN_020223BC
thumb_func_start MOD11_0222EFDC
MOD11_0222EFDC: ; 0x0222EFDC
push {r3, r4, r5, lr}
- ldr r3, _0222F014 ; =0x021064B8
+ ldr r3, _0222F014 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -3087,7 +3087,7 @@ _0222F00C:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222F014: .word 0x021064B8
+_0222F014: .word UNK_021064B8
_0222F018: .word UNK_021064C0
thumb_func_start MOD11_0222F01C
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 6dd1c9cf..d8814351 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -744,7 +744,7 @@ MOD12_0222DC80: ; 0x0222DC80
thumb_func_start MOD12_0222DCAC
MOD12_0222DCAC: ; 0x0222DCAC
push {r3, r4, r5, lr}
- ldr r3, _0222DCE4 ; =0x021064B8
+ ldr r3, _0222DCE4 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -770,7 +770,7 @@ _0222DCDC:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222DCE4: .word 0x021064B8
+_0222DCE4: .word UNK_021064B8
_0222DCE8: .word UNK_021064C0
thumb_func_start MOD12_0222DCEC
@@ -3999,7 +3999,7 @@ MOD12_0222F6B4: ; 0x0222F6B4
thumb_func_start MOD12_0222F6E0
MOD12_0222F6E0: ; 0x0222F6E0
push {r3, r4, r5, lr}
- ldr r3, _0222F718 ; =0x021064B8
+ ldr r3, _0222F718 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -4025,7 +4025,7 @@ _0222F710:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222F718: .word 0x021064B8
+_0222F718: .word UNK_021064B8
_0222F71C: .word UNK_021064C0
thumb_func_start MOD12_0222F720
@@ -6350,7 +6350,7 @@ MOD12_02230A40: ; 0x02230A40
thumb_func_start MOD12_02230A60
MOD12_02230A60: ; 0x02230A60
push {r4, lr}
- ldr r3, _02230A78 ; =0x021064B8
+ ldr r3, _02230A78 ; =UNK_021064B8
mov r2, #0
ldr r3, [r3]
blx r3
@@ -6360,7 +6360,7 @@ MOD12_02230A60: ; 0x02230A60
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_02230A78: .word 0x021064B8
+_02230A78: .word UNK_021064B8
thumb_func_start MOD12_02230A7C
MOD12_02230A7C: ; 0x02230A7C
@@ -42062,7 +42062,7 @@ _02241B08: .word 0x00000133
thumb_func_start MOD12_02241B0C
MOD12_02241B0C: ; 0x02241B0C
push {r3, r4, r5, lr}
- ldr r3, _02241B44 ; =0x021064B8
+ ldr r3, _02241B44 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -42088,7 +42088,7 @@ _02241B3C:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_02241B44: .word 0x021064B8
+_02241B44: .word UNK_021064B8
_02241B48: .word UNK_021064C0
thumb_func_start MOD12_02241B4C
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 60746d6a..d7f81901 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -3545,7 +3545,7 @@ MOD16_021D8F9C: ; 0x021D8F9C
mov r1, #0x55
lsl r1, r1, #2
str r0, [r5, r1]
- ldr r3, _021D9030 ; =0x021064B8
+ ldr r3, _021D9030 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -3607,7 +3607,7 @@ _021D9004:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D9030: .word 0x021064B8
+_021D9030: .word UNK_021064B8
_021D9034: .word UNK_021064C0
_021D9038: .word 0x7FFF0000
_021D903C: .word 0xFFFF0000
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 14fa98ad..e680ca83 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -1914,7 +1914,7 @@ MOD17_021D82E4: ; 0x021D82E4
add r6, r3, #0
bl FUN_02006D98
str r0, [r5, #0x20]
- ldr r3, _021D833C ; =0x021064B8
+ ldr r3, _021D833C ; =UNK_021064B8
mov r1, #0
ldr r3, [r3]
add r0, r4, #0
@@ -1948,7 +1948,7 @@ MOD17_021D82E4: ; 0x021D82E4
str r0, [r5, #0x24]
pop {r4, r5, r6, pc}
nop
-_021D833C: .word 0x021064B8
+_021D833C: .word UNK_021064B8
_021D8340: .word UNK_021064C0
_021D8344: .word 0x7FFF0000
_021D8348: .word 0xFFFF0000
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 82a2dd26..d1aa6be9 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -1826,7 +1826,7 @@ _0222E35C: .word 0x04000580
thumb_func_start MOD62_0222E360
MOD62_0222E360: ; 0x0222E360
push {r3, r4, r5, lr}
- ldr r3, _0222E398 ; =0x021064B8
+ ldr r3, _0222E398 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -1852,7 +1852,7 @@ _0222E390:
bl FUN_02012CC8
pop {r3, r4, r5, pc}
nop
-_0222E398: .word 0x021064B8
+_0222E398: .word UNK_021064B8
_0222E39C: .word UNK_021064C0
thumb_func_end MOD62_0222E360
diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s
index c35a7bc6..e7b2dde0 100644
--- a/arm9/modules/63/asm/module_63.s
+++ b/arm9/modules/63/asm/module_63.s
@@ -386,7 +386,7 @@ _021D780A:
mov r0, #0
bl FUN_0200415C
ldr r0, _021D7824 ; =SDK_OVERLAY_MODULE_63_ID
- ldr r1, _021D7828 ; =MOD63_UNK_021DBE18
+ ldr r1, _021D7828 ; =MOD63_021DBE18
bl FUN_02000E7C
_021D7818:
mov r0, #1
@@ -395,7 +395,7 @@ _021D7818:
_021D781C: .word UNK_020FF3D4
_021D7820: .word UNK_020FF368
_021D7824: .word SDK_OVERLAY_MODULE_63_ID
-_021D7828: .word MOD63_UNK_021DBE18
+_021D7828: .word MOD63_021DBE18
thumb_func_end MOD63_021D77B4
thumb_func_start MOD63_021D782C
@@ -2765,7 +2765,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
ldr r0, [r4]
bl FUN_02016B94
add r3, sp, #0x8c
- ldr r5, _021D8BBC ; =0x021DBB6C
+ ldr r5, _021D8BBC ; =MOD63_021DBB6C
str r0, [r4, #0xc]
add r2, r3, #0
ldmia r5!, {r0, r1}
@@ -2778,7 +2778,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
lsl r2, r2, #0x1a
ldr r1, [r2]
ldr r0, _021D8BC0 ; =0xC7FFFFFF
- ldr r5, _021D8BC4 ; =0x021DBCF8
+ ldr r5, _021D8BC4 ; =MOD63_021DBCF8
and r1, r0
lsl r0, r2, #1
orr r0, r1
@@ -2797,7 +2797,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
ldr r0, [r4, #0xc]
mov r3, #0
bl FUN_02016C18
- ldr r5, _021D8BC8 ; =0x021DBD14
+ ldr r5, _021D8BC8 ; =MOD63_021DBD14
add r3, sp, #0x54
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -2812,7 +2812,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
ldr r0, [r4, #0xc]
mov r3, #1
bl FUN_02016C18
- ldr r5, _021D8BCC ; =0x021DBD30
+ ldr r5, _021D8BCC ; =MOD63_021DBD30
add r3, sp, #0x38
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -2827,7 +2827,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
ldr r0, [r4, #0xc]
mov r3, #1
bl FUN_02016C18
- ldr r5, _021D8BD0 ; =0x021DBBA8
+ ldr r5, _021D8BD0 ; =MOD63_021DBBA8
add r3, sp, #0x1c
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -2842,7 +2842,7 @@ MOD63_021D8ADC: ; 0x021D8ADC
ldr r0, [r4, #0xc]
add r3, r1, #0
bl FUN_02016C18
- ldr r5, _021D8BD4 ; =0x021DBBE0
+ ldr r5, _021D8BD4 ; =MOD63_021DBBE0
add r3, sp, #0
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -2863,13 +2863,13 @@ MOD63_021D8ADC: ; 0x021D8ADC
add sp, #0x9c
pop {r4, r5, pc}
nop
-_021D8BBC: .word 0x021DBB6C
+_021D8BBC: .word MOD63_021DBB6C
_021D8BC0: .word 0xC7FFFFFF
-_021D8BC4: .word 0x021DBCF8
-_021D8BC8: .word 0x021DBD14
-_021D8BCC: .word 0x021DBD30
-_021D8BD0: .word 0x021DBBA8
-_021D8BD4: .word 0x021DBBE0
+_021D8BC4: .word MOD63_021DBCF8
+_021D8BC8: .word MOD63_021DBD14
+_021D8BCC: .word MOD63_021DBD30
+_021D8BD0: .word MOD63_021DBBA8
+_021D8BD4: .word MOD63_021DBBE0
thumb_func_end MOD63_021D8ADC
thumb_func_start MOD63_021D8BD8
@@ -2887,7 +2887,7 @@ MOD63_021D8BD8: ; 0x021D8BD8
add r3, r1, #0
bl FUN_02022318
str r0, [r4, #0x10]
- ldr r3, _021D8C18 ; =0x021064B8
+ ldr r3, _021D8C18 ; =UNK_021064B8
mov r0, #2
mov r1, #0
ldr r3, [r3]
@@ -2904,7 +2904,7 @@ MOD63_021D8BD8: ; 0x021D8BD8
pop {r4, pc}
nop
_021D8C14: .word MOD63_021D8C20
-_021D8C18: .word 0x021064B8
+_021D8C18: .word UNK_021064B8
_021D8C1C: .word UNK_021064C0
thumb_func_end MOD63_021D8BD8
@@ -2943,7 +2943,7 @@ MOD63_021D8C20: ; 0x021D8C20
mov r1, #0x20
orr r1, r2
strh r1, [r0]
- ldr r0, _021D8C98 ; =0x021DBB5C
+ ldr r0, _021D8C98 ; =MOD63_021DBB5C
bl G3X_SetEdgeColorTable
mov r0, #0
add r1, r0, #0
@@ -2964,7 +2964,7 @@ MOD63_021D8C20: ; 0x021D8C20
_021D8C8C: .word 0x04000008
_021D8C90: .word 0xFFFFCFFD
_021D8C94: .word 0x0000CFFB
-_021D8C98: .word 0x021DBB5C
+_021D8C98: .word MOD63_021DBB5C
_021D8C9C: .word 0x00007FFF
_021D8CA0: .word 0xBFFF0000
_021D8CA4: .word 0x04000580
@@ -3211,13 +3211,13 @@ MOD63_021D8E68: ; 0x021D8E68
mov r0, #0x4c
bl FUN_020168D0
ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID
- ldr r1, _021D8E98 ; =UNK63_021DBAB8
+ ldr r1, _021D8E98 ; =MOD63_021DBAB8
bl FUN_02000E7C
mov r0, #1
pop {r3, r4, r5, pc}
.align 2, 0
_021D8E94: .word SDK_OVERLAY_MODULE_63_ID
-_021D8E98: .word UNK63_021DBAB8
+_021D8E98: .word MOD63_021DBAB8
thumb_func_end MOD63_021D8E68
thumb_func_start MOD63_021D8E9C
@@ -4017,8 +4017,8 @@ MOD63_021D9498: ; 0x021D9498
ldr r0, _021D9588 ; =gUnk021C4918
strb r1, [r0, #5]
bl FUN_0201E7A0
- ldr r6, _021D958C ; =0x021DBDE8
- ldr r7, _021D9590 ; =0x021DBAD0
+ ldr r6, _021D958C ; =MOD63_021DBDE8
+ ldr r7, _021D9590 ; =MOD63_021DBAD0
mov r4, #0
_021D950C:
mov r0, #0xc
@@ -4077,8 +4077,8 @@ _021D950C:
pop {r3, r4, r5, r6, r7, pc}
nop
_021D9588: .word gUnk021C4918
-_021D958C: .word 0x021DBDE8
-_021D9590: .word 0x021DBAD0
+_021D958C: .word MOD63_021DBDE8
+_021D9590: .word MOD63_021DBAD0
_021D9594: .word 0x00004210
_021D9598: .word 0x0000318A
_021D959C: .word 0x00004A52
@@ -4208,7 +4208,7 @@ _021D969C: .word 0xFFFF1FFF
MOD63_021D96A0: ; 0x021D96A0
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x28
- ldr r3, _021D980C ; =0x021DBB2C
+ ldr r3, _021D980C ; =MOD63_021DBB2C
add r2, sp, #0x18
add r5, r0, #0
ldmia r3!, {r0, r1}
@@ -4369,7 +4369,7 @@ _021D96F8:
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
-_021D980C: .word 0x021DBB2C
+_021D980C: .word MOD63_021DBB2C
thumb_func_end MOD63_021D96A0
thumb_func_start MOD63_021D9810
@@ -4411,7 +4411,7 @@ _021D9840:
mov r7, #0
str r0, [sp, #0x10]
_021D9862:
- ldr r1, _021D9964 ; =0x021DBB90
+ ldr r1, _021D9964 ; =MOD63_021DBB90
lsl r2, r7, #2
ldr r1, [r1, r2]
mov r0, #0x58
@@ -4488,7 +4488,7 @@ _021D98BC:
mov r0, #0x4c
bl FUN_0201EB64
add r3, sp, #0x20
- ldr r4, _021D9968 ; =0x021DBAE4
+ ldr r4, _021D9968 ; =MOD63_021DBAE4
str r0, [r5, #0x44]
ldmia r4!, {r0, r1}
add r2, r3, #0
@@ -4503,12 +4503,12 @@ _021D98BC:
ldr r3, _021D9970 ; =0x000005C1
str r0, [sp, #8]
add r0, r2, #0
- ldr r2, _021D9974 ; =0x021DBB80
+ ldr r2, _021D9974 ; =MOD63_021DBB80
bl FUN_0201ECA8
ldr r0, _021D9978 ; =0x00000981
ldr r1, [r5, #0x44]
bl FUN_0201EEF0
- ldr r4, _021D997C ; =0x021DBB08
+ ldr r4, _021D997C ; =MOD63_021DBB08
add r3, sp, #0x14
ldmia r4!, {r0, r1}
add r2, r3, #0
@@ -4525,20 +4525,20 @@ _021D98BC:
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_021D9964: .word 0x021DBB90
-_021D9968: .word 0x021DBAE4
+_021D9964: .word MOD63_021DBB90
+_021D9968: .word MOD63_021DBAE4
_021D996C: .word 0x0029AEC1
_021D9970: .word 0x000005C1
-_021D9974: .word 0x021DBB80
+_021D9974: .word MOD63_021DBB80
_021D9978: .word 0x00000981
-_021D997C: .word 0x021DBB08
+_021D997C: .word MOD63_021DBB08
thumb_func_end MOD63_021D9810
thumb_func_start MOD63_021D9980
MOD63_021D9980: ; 0x021D9980
push {r4, r5, r6, r7, lr}
sub sp, #0x3c
- ldr r4, _021D99E4 ; =0x021DBD4C
+ ldr r4, _021D99E4 ; =MOD63_021DBD4C
add r5, r0, #0
add r3, sp, #0x18
mov r2, #4
@@ -4550,7 +4550,7 @@ _021D998C:
ldr r0, [r4]
add r2, sp, #0xc
str r0, [r3]
- ldr r3, _021D99E8 ; =0x021DBAFC
+ ldr r3, _021D99E8 ; =MOD63_021DBAFC
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
ldr r0, [r3]
@@ -4585,8 +4585,8 @@ _021D99BE:
add sp, #0x3c
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_021D99E4: .word 0x021DBD4C
-_021D99E8: .word 0x021DBAFC
+_021D99E4: .word MOD63_021DBD4C
+_021D99E8: .word MOD63_021DBAFC
thumb_func_end MOD63_021D9980
thumb_func_start MOD63_021D99EC
@@ -5268,7 +5268,7 @@ _021D9F70:
ldr r0, _021DA078 ; =0x000004AB
cmp r5, r0
bne _021DA074
- ldr r5, _021DA084 ; =0x021DBAD8
+ ldr r5, _021DA084 ; =MOD63_021DBAD8
add r3, sp, #0x38
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -5283,9 +5283,9 @@ _021D9F70:
ldr r3, _021DA07C ; =0x000005C1
str r0, [sp, #8]
add r0, r2, #0
- ldr r2, _021DA08C ; =0x021DBB80
+ ldr r2, _021DA08C ; =MOD63_021DBB80
bl FUN_0201ECA8
- ldr r5, _021DA090 ; =0x021DBB20
+ ldr r5, _021DA090 ; =MOD63_021DBB20
add r3, sp, #0x2c
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -5295,7 +5295,7 @@ _021D9F70:
ldr r1, [r4, #0x44]
add r0, r2, #0
bl FUN_0201EF70
- ldr r2, _021DA094 ; =0x021DBAC8
+ ldr r2, _021DA094 ; =MOD63_021DBAC8
add r1, sp, #0xc
ldrh r3, [r2]
add r0, sp, #0xc
@@ -5324,7 +5324,7 @@ _021D9FE2:
ldr r3, _021DA098 ; =0x0000057D
cmp r5, r3
bne _021DA074
- ldr r6, _021DA09C ; =0x021DBB14
+ ldr r6, _021DA09C ; =MOD63_021DBB14
add r5, sp, #0x20
ldmia r6!, {r0, r1}
add r2, r5, #0
@@ -5339,12 +5339,12 @@ _021D9FE2:
add r3, #0x44
str r0, [sp, #8]
add r0, r2, #0
- ldr r2, _021DA08C ; =0x021DBB80
+ ldr r2, _021DA08C ; =MOD63_021DBB80
bl FUN_0201ECA8
ldr r0, _021DA07C ; =0x000005C1
ldr r1, [r4, #0x44]
bl FUN_0201EEF0
- ldr r5, _021DA0A0 ; =0x021DBAF0
+ ldr r5, _021DA0A0 ; =MOD63_021DBAF0
add r3, sp, #0x14
ldmia r5!, {r0, r1}
add r2, r3, #0
@@ -5386,14 +5386,14 @@ _021DA074:
_021DA078: .word 0x000004AB
_021DA07C: .word 0x000005C1
_021DA080: .word 0x0000FFE0
-_021DA084: .word 0x021DBAD8
+_021DA084: .word MOD63_021DBAD8
_021DA088: .word 0x0029AEC1
-_021DA08C: .word 0x021DBB80
-_021DA090: .word 0x021DBB20
-_021DA094: .word 0x021DBAC8
+_021DA08C: .word MOD63_021DBB80
+_021DA090: .word MOD63_021DBB20
+_021DA094: .word MOD63_021DBAC8
_021DA098: .word 0x0000057D
-_021DA09C: .word 0x021DBB14
-_021DA0A0: .word 0x021DBAF0
+_021DA09C: .word MOD63_021DBB14
+_021DA0A0: .word MOD63_021DBAF0
_021DA0A4: .word 0x00000618
thumb_func_end MOD63_021D9F38
@@ -6020,14 +6020,14 @@ MOD63_021DA5A0: ; 0x021DA5A0
cmp r0, #0
beq _021DA630
ldrb r3, [r4, #1]
- ldr r0, _021DA634 ; =0x021DBF40
+ ldr r0, _021DA634 ; =MOD63_021DBF40
ldrb r1, [r4, #3]
ldrb r0, [r0, r3]
cmp r1, r0
blo _021DA614
mov r1, #0
str r1, [sp]
- ldr r6, _021DA638 ; =0x021DBF48
+ ldr r6, _021DA638 ; =MOD63_021DBF48
ldr r0, [r5, #0x14]
ldrb r3, [r6, r3]
mov r2, #1
@@ -6037,7 +6037,7 @@ MOD63_021DA5A0: ; 0x021DA5A0
mov r0, #0x20
str r0, [sp]
ldrb r6, [r4, #1]
- ldr r3, _021DA63C ; =0x021DBF44
+ ldr r3, _021DA63C ; =MOD63_021DBF44
ldr r0, [r5, #0x14]
ldrb r3, [r3, r6]
mov r1, #0
@@ -6050,7 +6050,7 @@ MOD63_021DA5A0: ; 0x021DA5A0
ldr r0, [r5, #0x14]
mov r1, #1
ldrb r5, [r4, #1]
- ldr r3, _021DA63C ; =0x021DBF44
+ ldr r3, _021DA63C ; =MOD63_021DBF44
add r2, r1, #0
ldrb r3, [r3, r5]
lsl r3, r3, #0x1c
@@ -6073,7 +6073,7 @@ _021DA618:
ldrb r0, [r4, #1]
cmp r0, #0
bne _021DA630
- ldr r0, _021DA634 ; =0x021DBF40
+ ldr r0, _021DA634 ; =MOD63_021DBF40
ldrb r1, [r4, #3]
ldrb r0, [r0]
cmp r1, r0
@@ -6085,16 +6085,16 @@ _021DA630:
add sp, #4
pop {r3, r4, r5, r6, pc}
.align 2, 0
-_021DA634: .word 0x021DBF40
-_021DA638: .word 0x021DBF48
-_021DA63C: .word 0x021DBF44
+_021DA634: .word MOD63_021DBF40
+_021DA638: .word MOD63_021DBF48
+_021DA63C: .word MOD63_021DBF44
thumb_func_end MOD63_021DA5A0
thumb_func_start MOD63_021DA640
MOD63_021DA640: ; 0x021DA640
push {r4, lr}
sub sp, #0x10
- ldr r4, _021DA66C ; =0x021DBE4C
+ ldr r4, _021DA66C ; =MOD63_021DBE4C
add r3, sp, #0
add r2, r3, #0
ldmia r4!, {r0, r1}
@@ -6111,7 +6111,7 @@ MOD63_021DA640: ; 0x021DA640
add sp, #0x10
pop {r4, pc}
.align 2, 0
-_021DA66C: .word 0x021DBE4C
+_021DA66C: .word MOD63_021DBE4C
thumb_func_end MOD63_021DA640
thumb_func_start MOD63_021DA670
@@ -6217,7 +6217,7 @@ MOD63_021DA6E8: ; 0x021DA6E8
mov r1, #0
lsl r2, r2, #0x14
bl FUN_02008D24
- ldr r4, _021DAA00 ; =0x021DBE28
+ ldr r4, _021DAA00 ; =MOD63_021DBE28
mov r7, #0
add r6, r5, #0
_021DA73C:
@@ -6552,7 +6552,7 @@ _021DA9DC:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_021DA9FC: .word 0xFFCFFFEF
-_021DAA00: .word 0x021DBE28
+_021DAA00: .word MOD63_021DBE28
thumb_func_end MOD63_021DA6E8
thumb_func_start MOD63_021DAA04
@@ -6602,7 +6602,7 @@ _021DAA32:
MOD63_021DAA5C: ; 0x021DAA5C
push {r4, r5, r6, r7, lr}
sub sp, #0xa4
- ldr r3, _021DABC0 ; =0x021DBE5C
+ ldr r3, _021DABC0 ; =MOD63_021DBE5C
add r5, r0, #0
ldmia r3!, {r0, r1}
add r2, sp, #0x38
@@ -6611,7 +6611,7 @@ MOD63_021DAA5C: ; 0x021DAA5C
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
- ldr r3, _021DABC4 ; =0x021DBE74
+ ldr r3, _021DABC4 ; =MOD63_021DBE74
add r2, sp, #0x20
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
@@ -6619,7 +6619,7 @@ MOD63_021DAA5C: ; 0x021DAA5C
stmia r2!, {r0, r1}
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
- ldr r3, _021DABC8 ; =0x021DBE8C
+ ldr r3, _021DABC8 ; =MOD63_021DBE8C
add r2, sp, #8
ldmia r3!, {r0, r1}
stmia r2!, {r0, r1}
@@ -6762,9 +6762,9 @@ _021DAB58:
add sp, #0xa4
pop {r4, r5, r6, r7, pc}
nop
-_021DABC0: .word 0x021DBE5C
-_021DABC4: .word 0x021DBE74
-_021DABC8: .word 0x021DBE8C
+_021DABC0: .word MOD63_021DBE5C
+_021DABC4: .word MOD63_021DBE74
+_021DABC8: .word MOD63_021DBE8C
thumb_func_end MOD63_021DAA5C
thumb_func_start MOD63_021DABCC
@@ -6967,13 +6967,13 @@ MOD63_021DAD18: ; 0x021DAD18
add r7, r0, #0
cmp r6, #0
bne _021DAD44
- ldr r0, _021DAD64 ; =0x021DBFA0
+ ldr r0, _021DAD64 ; =MOD63_021DBFA0
add r1, r7, #0
mov r2, #0x20
bl GX_LoadOBJPltt
pop {r3, r4, r5, r6, r7, pc}
_021DAD44:
- ldr r0, _021DAD68 ; =0x021DBF64
+ ldr r0, _021DAD68 ; =MOD63_021DBF64
ldr r0, [r0, r4]
lsl r0, r0, #4
add r1, r5, r0
@@ -6987,15 +6987,15 @@ _021DAD44:
bl GX_LoadOBJPltt
pop {r3, r4, r5, r6, r7, pc}
nop
-_021DAD64: .word 0x021DBFA0
-_021DAD68: .word 0x021DBF64
+_021DAD64: .word MOD63_021DBFA0
+_021DAD68: .word MOD63_021DBF64
thumb_func_end MOD63_021DAD18
thumb_func_start MOD63_021DAD6C
MOD63_021DAD6C: ; 0x021DAD6C
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x30
- ldr r3, _021DAE44 ; =0x021DBE40
+ ldr r3, _021DAE44 ; =MOD63_021DBE40
add r2, sp, #0x18
str r0, [sp]
str r1, [sp, #4]
@@ -7003,7 +7003,7 @@ MOD63_021DAD6C: ; 0x021DAD6C
str r2, [sp, #8]
stmia r2!, {r0, r1}
ldr r0, [r3]
- ldr r3, _021DAE48 ; =0x021DBE34
+ ldr r3, _021DAE48 ; =MOD63_021DBE34
str r0, [r2]
ldmia r3!, {r0, r1}
add r2, sp, #0xc
@@ -7033,7 +7033,7 @@ _021DAD98:
stmia r3!, {r0, r1}
ldr r0, [r6]
str r0, [r3]
- ldr r0, _021DAE50 ; =0x021DBF4C
+ ldr r0, _021DAE50 ; =MOD63_021DBF4C
ldr r1, [sp, #0x24]
ldr r0, [r0, r7]
sub r0, r1, r0
@@ -7077,7 +7077,7 @@ _021DADF0:
stmia r3!, {r0, r1}
ldr r0, [r6]
str r0, [r3]
- ldr r0, _021DAE58 ; =0x021DBF58
+ ldr r0, _021DAE58 ; =MOD63_021DBF58
ldr r1, [sp, #0x24]
ldr r0, [r0, r7]
sub r0, r1, r0
@@ -7101,19 +7101,19 @@ _021DAE3E:
add sp, #0x30
pop {r3, r4, r5, r6, r7, pc}
nop
-_021DAE44: .word 0x021DBE40
-_021DAE48: .word 0x021DBE34
+_021DAE44: .word MOD63_021DBE40
+_021DAE48: .word MOD63_021DBE34
_021DAE4C: .word 0x000005C8
-_021DAE50: .word 0x021DBF4C
+_021DAE50: .word MOD63_021DBF4C
_021DAE54: .word 0x000005E6
-_021DAE58: .word 0x021DBF58
+_021DAE58: .word MOD63_021DBF58
thumb_func_end MOD63_021DAD6C
thumb_func_start MOD63_021DAE5C
MOD63_021DAE5C: ; 0x021DAE5C
push {r4, lr}
sub sp, #0x10
- ldr r4, _021DAE88 ; =0x021DBEAC
+ ldr r4, _021DAE88 ; =MOD63_021DBEAC
add r3, sp, #0
add r2, r3, #0
ldmia r4!, {r0, r1}
@@ -7130,7 +7130,7 @@ MOD63_021DAE5C: ; 0x021DAE5C
add sp, #0x10
pop {r4, pc}
.align 2, 0
-_021DAE88: .word 0x021DBEAC
+_021DAE88: .word MOD63_021DBEAC
thumb_func_end MOD63_021DAE5C
thumb_func_start MOD63_021DAE8C
@@ -7361,7 +7361,7 @@ MOD63_021DAFEC: ; 0x021DAFEC
add r1, r7, #4
mov r2, #0x4c
bl FUN_02008C9C
- ldr r4, _021DB104 ; =0x021DBEBC
+ ldr r4, _021DB104 ; =MOD63_021DBEBC
str r0, [r7]
mov r6, #0
add r5, r7, #0
@@ -7453,7 +7453,7 @@ _021DB040:
nop
_021DB0FC: .word 0xFFCFFFEF
_021DB100: .word 0x04001000
-_021DB104: .word 0x021DBEBC
+_021DB104: .word MOD63_021DBEBC
thumb_func_end MOD63_021DAFEC
thumb_func_start MOD63_021DB108
@@ -7891,7 +7891,7 @@ _021DB44C:
thumb_func_start MOD63_021DB450
MOD63_021DB450: ; 0x021DB450
push {r4, lr}
- ldr r3, _021DB470 ; =0x021064B8
+ ldr r3, _021DB470 ; =UNK_021064B8
mov r2, #0
ldr r3, [r3]
blx r3
@@ -7905,7 +7905,7 @@ _021DB468:
lsr r0, r0, #0xd
pop {r4, pc}
nop
-_021DB470: .word 0x021064B8
+_021DB470: .word UNK_021064B8
thumb_func_end MOD63_021DB450
thumb_func_start MOD63_021DB474
@@ -7938,7 +7938,7 @@ MOD63_021DB498: ; 0x021DB498
MOD63_021DB49C: ; 0x021DB49C
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
- ldr r3, _021DB56C ; =0x021DBECC
+ ldr r3, _021DB56C ; =MOD63_021DBECC
add r5, r0, #0
ldmia r3!, {r0, r1}
add r2, sp, #0x10
@@ -7947,7 +7947,7 @@ MOD63_021DB49C: ; 0x021DB49C
str r0, [r2]
mov r0, #0x4c
bl FUN_02006D98
- ldr r7, _021DB570 ; =0x021DBEF0
+ ldr r7, _021DB570 ; =MOD63_021DBEF0
str r0, [r5]
mov r4, #0
_021DB4BA:
@@ -8029,8 +8029,8 @@ _021DB4BA:
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
nop
-_021DB56C: .word 0x021DBECC
-_021DB570: .word 0x021DBEF0
+_021DB56C: .word MOD63_021DBECC
+_021DB570: .word MOD63_021DBEF0
_021DB574: .word 0x000003FF
_021DB578: .word MOD63_021DB450
_021DB57C: .word MOD63_021DB474
@@ -8138,7 +8138,7 @@ _021DB5FA:
add r0, r0, #1
strb r0, [r5]
_021DB63C:
- ldr r2, _021DB708 ; =0x021DBED8
+ ldr r2, _021DB708 ; =MOD63_021DBED8
lsl r3, r6, #3
ldr r2, [r2, r3]
add r0, r4, #0
@@ -8158,7 +8158,7 @@ _021DB658:
bl FUN_02013440
lsl r0, r6, #2
str r0, [sp, #4]
- ldr r1, _021DB70C ; =0x021DBF08
+ ldr r1, _021DB70C ; =MOD63_021DBF08
lsl r6, r6, #3
ldr r3, [sp, #4]
add r7, r4, #4
@@ -8167,7 +8167,7 @@ _021DB658:
ldr r2, _021DB710 ; =MOD63_021DB940
ldr r3, [r7, r3]
bl FUN_020133AC
- ldr r1, _021DB714 ; =0x021DBF0C
+ ldr r1, _021DB714 ; =MOD63_021DBF0C
ldr r3, [sp, #4]
ldr r0, [r4, #0x18]
ldr r1, [r1, r6]
@@ -8183,7 +8183,7 @@ _021DB690:
bl FUN_020133C8
cmp r0, #0
bne _021DB6FC
- ldr r0, _021DB718 ; =0x021DBEC0
+ ldr r0, _021DB718 ; =MOD63_021DBEC0
lsl r1, r6, #2
ldr r0, [r0, r1]
cmp r7, r0
@@ -8202,7 +8202,7 @@ _021DB690:
strb r0, [r5]
b _021DB6FC
_021DB6BE:
- ldr r2, _021DB71C ; =0x021DBEDC
+ ldr r2, _021DB71C ; =MOD63_021DBEDC
lsl r3, r6, #3
ldr r2, [r2, r3]
blx r2
@@ -8239,12 +8239,12 @@ _021DB6FC:
pop {r3, r4, r5, r6, r7, pc}
nop
_021DB704: .word 0x0400004A
-_021DB708: .word 0x021DBED8
-_021DB70C: .word 0x021DBF08
+_021DB708: .word MOD63_021DBED8
+_021DB70C: .word MOD63_021DBF08
_021DB710: .word MOD63_021DB940
-_021DB714: .word 0x021DBF0C
-_021DB718: .word 0x021DBEC0
-_021DB71C: .word 0x021DBEDC
+_021DB714: .word MOD63_021DBF0C
+_021DB718: .word MOD63_021DBEC0
+_021DB71C: .word MOD63_021DBEDC
thumb_func_end MOD63_021DB5CC
thumb_func_start MOD63_021DB720
@@ -8630,18 +8630,52 @@ MOD63_021DBA90: ; 0x021DBA90
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
- .global UNK63_021DBAB8
-UNK63_021DBAB8: ; 0x021DBAB8
+ .global MOD63_021DBAB8
+MOD63_021DBAB8: ; 0x021DBAB8
.word MOD63_021D74E0, MOD63_021D759C, MOD63_021D77B4, 0xFFFFFFFF
- ; 0x021DBAC8
+ .global MOD63_021DBAC8
+MOD63_021DBAC8: ; 0x021DBAC8
.byte 0x00, 0x00, 0x80, 0xF6, 0x00, 0x00, 0x00, 0x00
- .byte 0x18, 0x4B, 0x00, 0x00, 0x42, 0x30, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0xE4, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
- .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xFF
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBAD0
+MOD63_021DBAD0: ; 0x021DBAD0
+ .byte 0x18, 0x4B, 0x00, 0x00, 0x42, 0x30, 0xFF, 0x7F
+
+ .global MOD63_021DBAD8
+MOD63_021DBAD8: ; 0x021DBAD8
+ .byte 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0xE4, 0xFF
+
+ .global MOD63_021DBAE4
+MOD63_021DBAE4: ; 0x021DBAE4
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00
+
+ .global MOD63_021DBAF0
+MOD63_021DBAF0: ; 0x021DBAF0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBAFC
+MOD63_021DBAFC: ; 0x021DBAFC
+ .byte 0x00, 0x10, 0x00, 0x00
+ .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+
+ .global MOD63_021DBB08
+MOD63_021DBB08: ; 0x021DBB08
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBB14
+MOD63_021DBB14: ; 0x021DBB14
+ .byte 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xFF
+
+ .global MOD63_021DBB20
+MOD63_021DBB20: ; 0x021DBB20
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBB2C
+MOD63_021DBB2C: ; 0x021DBB2C
+ .byte 0x1D, 0x00, 0x00, 0x00
.byte 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00
.global MOD63_021DBB3C
@@ -8652,12 +8686,30 @@ MOD63_021DBB3C: ; 0x021DBB3C
.global MOD63_021DBB4C
MOD63_021DBB4C: ; 0x021DBB4C
.byte 0x01, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x10
- .byte 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x01, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBB5C
+MOD63_021DBB5C: ; 0x021DBB5C
+ .byte 0x00, 0x00, 0x84, 0x10
+ .byte 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10
+
+ .global MOD63_021DBB6C
+MOD63_021DBB6C: ; 0x021DBB6C
+ .byte 0x01, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xAE, 0x29, 0x00
+
+ .global MOD63_021DBB80
+MOD63_021DBB80: ; 0x021DBB80
.byte 0x02, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBB90
+MOD63_021DBB90: ; 0x021DBB90
.byte 0x40, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00
- .byte 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBBA8
+MOD63_021DBBA8: ; 0x021DBBA8
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x17, 0x03, 0x00, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -8665,6 +8717,9 @@ MOD63_021DBB4C: ; 0x021DBB4C
MOD63_021DBBC4: ; 0x021DBBC4
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBBE0
+MOD63_021DBBE0: ; 0x021DBBE0
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -8716,12 +8771,27 @@ MOD63_021DBCC0: ; 0x021DBCC0
MOD63_021DBCDC: ; 0x021DBCDC
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBCF8
+MOD63_021DBCF8: ; 0x021DBCF8
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, 0x00, 0x03, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBD14
+MOD63_021DBD14: ; 0x021DBD14
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x19, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBD30
+MOD63_021DBD30: ; 0x021DBD30
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x04, 0x01, 0x1B, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+ .byte 0x04, 0x01, 0x1B, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBD4C
+MOD63_021DBD4C: ; 0x021DBD4C
+ .byte 0x00, 0x10, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
@@ -8741,41 +8811,130 @@ MOD63_021DBD98: ; 0x021DBD98
MOD63_021DBDC0: ; 0x021DBDC0
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xF8, 0xFF, 0xFF, 0x24, 0xF2, 0xFF, 0xFF
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBDE8
+MOD63_021DBDE8: ; 0x021DBDE8
+ .byte 0x05, 0xF8, 0xFF, 0xFF, 0x24, 0xF2, 0xFF, 0xFF
.byte 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
- .global MOD63_UNK_021DBE18
-MOD63_UNK_021DBE18: ; 0x021DBE18
+ .global MOD63_021DBE18
+MOD63_021DBE18: ; 0x021DBE18
.word MOD63_021D8D10, MOD63_021D8D98, MOD63_021D8E68, 0xFFFFFFFF
- .byte 0x05, 0x05, 0x05, 0x05, 0x4C, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
- .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x4C, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00
+
+ .global MOD63_021DBE28
+MOD63_021DBE28: ; 0x021DBE28
+ .byte 0x05, 0x05, 0x05, 0x05, 0x4C, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE34
+MOD63_021DBE34: ; 0x021DBE34
+ .byte 0x06, 0x00, 0x00, 0x00
+ .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE40
+MOD63_021DBE40: ; 0x021DBE40
+ .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
+ .byte 0x05, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE4C
+MOD63_021DBE4C: ; 0x021DBE4C
+ .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x4C, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE5C
+MOD63_021DBE5C: ; 0x021DBE5C
+ .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
+ .byte 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE74
+MOD63_021DBE74: ; 0x021DBE74
+ .byte 0x08, 0x01, 0x00, 0x00
.byte 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00
- .byte 0xE0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00
+ .byte 0xE0, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBE8C
+MOD63_021DBE8C: ; 0x021DBE8C
+ .byte 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00
.byte 0xE0, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00
- .byte 0x4C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x4C, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00, 0xCE, 0x07, 0x00, 0x00
- .byte 0xA8, 0x08, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x89, 0x01, 0x00, 0x00
- .byte 0x21, 0xB7, 0x1D, 0x02, 0x85, 0xB7, 0x1D, 0x02, 0xD1, 0xB7, 0x1D, 0x02, 0x39, 0xB8, 0x1D, 0x02
- .byte 0x85, 0xB8, 0x1D, 0x02, 0xE9, 0xB8, 0x1D, 0x02, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00
+ .byte 0x4C, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBEAC
+MOD63_021DBEAC: ; 0x021DBEAC
+ .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x4C, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBEBC
+MOD63_021DBEBC: ; 0x021DBEBC
+ .byte 0x01, 0x01, 0x01, 0x01
+
+ .global MOD63_021DBEC0
+MOD63_021DBEC0: ; 0x021DBEC0
+ .byte 0x03, 0x07, 0x00, 0x00, 0xCE, 0x07, 0x00, 0x00
+ .byte 0xA8, 0x08, 0x00, 0x00
+
+ .global MOD63_021DBECC
+MOD63_021DBECC: ; 0x021DBECC
+ .byte 0x83, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x89, 0x01, 0x00, 0x00
+
+ .global MOD63_021DBED8
+MOD63_021DBED8: ; 0x021DBED8
+ .word MOD63_021DB720
+
+ .global MOD63_021DBEDC
+MOD63_021DBEDC: ; 0x021DBEDC
+ .word MOD63_021DB784, MOD63_021DB7D0, MOD63_021DB838, MOD63_021DB884
+ .word MOD63_021DB8E8
+
+ .global MOD63_021DBEF0
+MOD63_021DBEF0: ; 0x021DBEF0
+ .byte 0x80, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBF08
+MOD63_021DBF08: ; 0x021DBF08
+ .byte 0x04, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBF0C
+MOD63_021DBF0C: ; 0x021DBF0C
+ .byte 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.section .data
- ; 0x021DBF40
- .byte 0x08, 0x06, 0x06, 0x04, 0x05, 0x04, 0x03, 0x01, 0x08, 0x07, 0x06, 0x00, 0x00, 0x60, 0x00, 0x00
- .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00
- .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+
+ .global MOD63_021DBF40
+MOD63_021DBF40: ; 0x021DBF40
+ .byte 0x08, 0x06, 0x06, 0x04
+
+ .global MOD63_021DBF44
+MOD63_021DBF44: ; 0x021DBF44
+ .byte 0x05, 0x04, 0x03, 0x01
+
+ .global MOD63_021DBF48
+MOD63_021DBF48: ; 0x021DBF48
+ .byte 0x08, 0x07, 0x06, 0x00
+
+ .global MOD63_021DBF4C
+MOD63_021DBF4C: ; 0x021DBF4C
+ .byte 0x00, 0x60, 0x00, 0x00
+ .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00
+
+ .global MOD63_021DBF58
+MOD63_021DBF58: ; 0x021DBF58
+ .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00
+ .byte 0x00, 0x58, 0x00, 0x00
+
+ .global MOD63_021DBF64
+MOD63_021DBF64: ; 0x021DBF64
+ .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.section .bss
- ; 0x021DBFA0
+
+ .global MOD63_021DBFA0
+MOD63_021DBFA0: ; 0x021DBFA0
.space 0x20
diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s
index 712c854b..361e1dfa 100644
--- a/arm9/modules/64/asm/module_64.s
+++ b/arm9/modules/64/asm/module_64.s
@@ -741,7 +741,7 @@ MOD64_021D7B04: ; 0x021D7B04
mov r1, #2
lsl r1, r1, #8
str r0, [r5, r1]
- ldr r3, _021D7BA4 ; =0x021064B8
+ ldr r3, _021D7BA4 ; =UNK_021064B8
lsl r0, r1, #6
mov r1, #0
ldr r3, [r3]
@@ -808,7 +808,7 @@ _021D7B8E:
blt _021D7B8E
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D7BA4: .word 0x021064B8
+_021D7BA4: .word UNK_021064B8
_021D7BA8: .word UNK_021064C0
_021D7BAC: .word 0x7FFF0000
_021D7BB0: .word 0xFFFF0000
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index 7fee2ada..bf838d07 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -2735,7 +2735,7 @@ MOD81_022392D8: ; 0x022392D8
lsl r0, r0, #0xe
mov r1, #1
bl FUN_020AEDF4
- ldr r3, _02239394 ; =0x021064B8
+ ldr r3, _02239394 ; =UNK_021064B8
mov r0, #1
mov r1, #0
ldr r3, [r3]
@@ -2774,7 +2774,7 @@ _02239384: .word 0xFFFFCFFD
_02239388: .word 0x0000CFFB
_0223938C: .word 0x04000540
_02239390: .word 0xBFFF0000
-_02239394: .word 0x021064B8
+_02239394: .word UNK_021064B8
_02239398: .word UNK_021064C0
_0223939C: .word 0x7FFF0000
_022393A0: .word 0xFFFF0000
@@ -9787,7 +9787,7 @@ MOD81_0223CAC4: ; 0x0223CAC4
lsl r0, r0, #0xe
mov r1, #1
bl FUN_020AEDF4
- ldr r3, _0223CB80 ; =0x021064B8
+ ldr r3, _0223CB80 ; =UNK_021064B8
mov r0, #1
mov r1, #0
ldr r3, [r3]
@@ -9826,7 +9826,7 @@ _0223CB70: .word 0xFFFFCFFD
_0223CB74: .word 0x0000CFFB
_0223CB78: .word 0x04000540
_0223CB7C: .word 0xBFFF0000
-_0223CB80: .word 0x021064B8
+_0223CB80: .word UNK_021064B8
_0223CB84: .word UNK_021064C0
_0223CB88: .word 0x7FFF0000
_0223CB8C: .word 0xFFFF0000
diff --git a/arm9/src/main.c b/arm9/src/main.c
index 874ea224..dbd9e22a 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -48,7 +48,7 @@ extern void FUN_020222C4(void);
extern void FUN_0200A318(void);
extern void FUN_0200E2D8(void);
-extern struct Unk21DBE18 MOD63_UNK_021DBE18;
+extern struct Unk21DBE18 MOD63_021DBE18;
extern struct Unk21DBE18 MOD52_021D76C8;
extern u8 SDK_STATIC_BSS_START[];
@@ -88,7 +88,7 @@ THUMB_FUNC void NitroMain(void)
{
case 0:
gBacklightTop.unk1C = 0;
- FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_UNK_021DBE18);
+ FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18);
break;
case 1:
gBacklightTop.unk1C = 1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 09:50:59 +0000