summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/modules/05/asm/module_05.s71
1 files changed, 46 insertions, 25 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index ee6cce23..a9e38101 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -34289,7 +34289,7 @@ _021E7DD2:
MOD05_021E7DD8: ; 0x021E7DD8
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x48
- ldr r4, _021E7E94 ; =0x021F7878
+ ldr r4, _021E7E94 ; =UNK05_021F7878
str r2, [sp, #0xc]
str r3, [sp, #0x10]
add r6, r0, #0
@@ -34380,7 +34380,7 @@ _021E7E86:
add sp, #0x48
pop {r3, r4, r5, r6, r7, pc}
nop
-_021E7E94: .word 0x021F7878
+_021E7E94: .word UNK05_021F7878
_021E7E98: .word 0x00000F33
thumb_func_start MOD05_021E7E9C
@@ -34645,7 +34645,7 @@ _021E8058: .word UNK05_021F786C
MOD05_021E805C: ; 0x021E805C
push {r3, r4, r5, r6, r7, lr}
sub sp, #0x38
- ldr r4, _021E80F4 ; =0x021F789C
+ ldr r4, _021E80F4 ; =UNK05_021F789C
str r0, [sp, #8]
str r1, [sp, #0xc]
add r3, sp, #0x14
@@ -34719,7 +34719,7 @@ _021E80E4:
add sp, #0x38
pop {r3, r4, r5, r6, r7, pc}
nop
-_021E80F4: .word 0x021F789C
+_021E80F4: .word UNK05_021F789C
thumb_func_start MOD05_021E80F8
MOD05_021E80F8: ; 0x021E80F8
@@ -35183,8 +35183,8 @@ MOD05_021E8410: ; 0x021E8410
bl String_dtor
mov r0, #1
str r0, [sp, #0x10]
- ldr r0, _021E84EC ; =0x021F78D4
- ldr r7, _021E84F0 ; =0x021F78C4
+ ldr r0, _021E84EC ; =UNK05_021F78D4
+ ldr r7, _021E84F0 ; =UNK05_021F78C4
str r0, [sp, #0xc]
_021E8460:
ldr r0, [sp, #0xc]
@@ -35252,8 +35252,8 @@ _021E84D6:
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
-_021E84EC: .word 0x021F78D4
-_021E84F0: .word 0x021F78C4
+_021E84EC: .word UNK05_021F78D4
+_021E84F0: .word UNK05_021F78C4
thumb_func_start MOD05_021E84F4
MOD05_021E84F4: ; 0x021E84F4
@@ -35714,7 +35714,7 @@ MOD05_021E8860: ; 0x021E8860
add r1, r7, #0
mov r2, #4
bl MIi_CpuClear32
- ldr r6, _021E88BC ; =0x021F78E4
+ ldr r6, _021E88BC ; =UNK05_021F78E4
add r3, sp, #0
mov r2, #5
_021E889E:
@@ -35733,7 +35733,7 @@ _021E889E:
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
.balign 4, 0
-_021E88BC: .word 0x021F78E4
+_021E88BC: .word UNK05_021F78E4
thumb_func_start MOD05_021E88C0
MOD05_021E88C0: ; 0x021E88C0
@@ -42946,7 +42946,7 @@ _021EC3B4: .word 0x00007FFF
thumb_func_start MOD05_021EC3B8
MOD05_021EC3B8: ; 0x021EC3B8
push {r4, lr}
- ldr r2, _021EC3D4 ; =0x021F7910
+ ldr r2, _021EC3D4 ; =UNK05_021F7910
add r4, r0, #0
add r0, r1, #0
mov r1, #4
@@ -42958,7 +42958,7 @@ MOD05_021EC3B8: ; 0x021EC3B8
_021EC3D0:
pop {r4, pc}
nop
-_021EC3D4: .word 0x021F7910
+_021EC3D4: .word UNK05_021F7910
thumb_func_start MOD05_021EC3D8
MOD05_021EC3D8: ; 0x021EC3D8
@@ -64469,7 +64469,7 @@ UNK05_021F7758: ; 0x021F7758
.global UNK05_021F77BC
UNK05_021F77BC: ; 0x021F77BC
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00 ;short
+ .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00 ;short?
.byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
.byte 0x01, 0x00, 0x01, 0x00, 0x3C, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x3C, 0x00, 0x01, 0x00
.byte 0x00, 0x00, 0x01, 0x00, 0x3C, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x3C, 0x00, 0x01, 0x00
@@ -64479,32 +64479,53 @@ UNK05_021F77BC: ; 0x021F77BC
.global UNK05_021F7824
UNK05_021F7824: ; 0x021F7824
- .word 0x00000001, 0x0000000C, 0x00000044, 0x021E79A9 ;pointer
- .word 0x021E7A6D, 0x021E7A09, 0x021E7A89
+ .word 0x00000001, 0x0000000C, 0x00000044, MOD05_021E79A8
+ .word MOD05_021E7A6C, MOD05_021E7A08, MOD05_021E7A88
.global UNK05_021F7840
UNK05_021F7840: ; 0x021F7840
- .word 0x00000044, 0x021E7B09, 0x021E7A6D, 0x021E7B79 ;pointer
- .word 0x021E7A89
+ .word 0x00000044, MOD05_021E7B08, MOD05_021E7A6C, MOD05_021E7B78
+ .word MOD05_021E7A88
.global UNK05_021F7854
UNK05_021F7854: ; 0x021F7854
- .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 ;word
+ .word 0x00000000, 0x00000001, 0x00000000, 0x00000000
+ .word 0x00000000, 0x00000002
.global UNK05_021F786C
UNK05_021F786C: ; 0x021F786C
- .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+ .word 0x00001000, 0x00001000, 0x00001000
+
+ .global UNK05_021F7878
+UNK05_021F7878: ; 0x021F7878
+ .byte 0x00, 0x10, 0x00, 0x00 ;word
.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
+
+ .global UNK05_021F789C
+UNK05_021F789C: ; 0x021F789C
+ .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ;word
.byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x10, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00
- .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x10, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
+
+ .global UNK05_021F78C4
+UNK05_021F78C4: ; 0x021F78C4
+ .byte 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global UNK05_021F78D4
+UNK05_021F78D4: ; 0x021F78D4
+ .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
+
+ .global UNK05_021F78E4
+UNK05_021F78E4: ; 0x021F78E4
+ .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0xDC, 0x05, 0x00, 0x00, 0x0F, 0x41, 0x0E, 0x00, 0xDC, 0x05, 0x00, 0x00
+ .byte 0x04, 0x00, 0x00, 0x00
+
+ .global UNK05_021F7910
+UNK05_021F7910: ; 0x021F7910
+ .byte 0xDC, 0x05, 0x00, 0x00, 0x0F, 0x41, 0x0E, 0x00, 0xDC, 0x05, 0x00, 0x00
.byte 0x0F, 0x42, 0x12, 0x00, 0xDC, 0x05, 0x00, 0x00, 0x0F, 0x43, 0x13, 0x00, 0xDC, 0x05, 0x00, 0x00
.byte 0x0F, 0x44, 0x14, 0x00, 0xB8, 0x0B, 0x00, 0x00, 0x1E, 0x45, 0x15, 0x00, 0x00, 0x00, 0x0B, 0x00
.byte 0x3E, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x4A, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0C, 0x00