summaryrefslogtreecommitdiff
path: root/arm9/modules/18/asm/module_18.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/18/asm/module_18.s')
-rw-r--r--arm9/modules/18/asm/module_18.s70
1 files changed, 35 insertions, 35 deletions
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index a37cfb8a..bc34aa28 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -1756,7 +1756,7 @@ MOD18_0223A3D4: ; 0x0223A3D4
ldr r0, [r0]
str r4, [r0, #4]
ldr r0, _0223A4D0 ; =MOD18_0223C6CC
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
bl MOD18_0223D638
add r1, r4, #0
bl MOD18_0224DBB0
@@ -1974,7 +1974,7 @@ _0223A5F8:
bl FUN_0201E08C
mov r0, #0
add r1, r0, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
ldr r0, _0223A648 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0, #4]
@@ -2247,7 +2247,7 @@ _0223A844:
bl FUN_0201BD70
cmp r0, #0
bne _0223A922
- ldr r0, _0223AB08 ; =UNK_021C48F8
+ ldr r0, _0223AB08 ; =gMain + 0x40
ldrh r0, [r0, #0x20]
cmp r0, #0
bne _0223A86C
@@ -2326,7 +2326,7 @@ _0223A8E4:
ldr r0, [r4, #0x4c]
sub r0, r0, #1
str r0, [r4, #0x4c]
- ldr r0, _0223AB08 ; =UNK_021C48F8
+ ldr r0, _0223AB08 ; =gMain + 0x40
ldrh r0, [r0, #0x20]
cmp r0, #0
bne _0223A924
@@ -2380,7 +2380,7 @@ _0223A958:
bl FUN_0201BD70
cmp r0, #0
bne _0223AA5A
- ldr r0, _0223AB08 ; =UNK_021C48F8
+ ldr r0, _0223AB08 ; =gMain + 0x40
ldrh r0, [r0, #0x20]
cmp r0, #0
bne _0223A98A
@@ -2558,7 +2558,7 @@ _0223AAF2:
.align 2, 0
_0223AB00: .word 0x00000621
_0223AB04: .word MOD18_02251380
-_0223AB08: .word UNK_021C48F8
+_0223AB08: .word gMain + 0x40
_0223AB0C: .word gMain
_0223AB10: .word 0x000005E3
_0223AB14: .word 0x000003D9
@@ -2665,7 +2665,7 @@ _0223ABDC:
bl FUN_0201BD70
cmp r0, #0
bne _0223AC10
- ldr r0, _0223AC1C ; =UNK_021C48F8
+ ldr r0, _0223AC1C ; =gMain + 0x40
ldrh r0, [r0, #0x20]
cmp r0, #0
bne _0223AC04
@@ -2685,7 +2685,7 @@ _0223AC10:
.align 2, 0
_0223AC14: .word MOD18_02251380
_0223AC18: .word 0x000006A1
-_0223AC1C: .word UNK_021C48F8
+_0223AC1C: .word gMain + 0x40
_0223AC20: .word gMain
thumb_func_end MOD18_0223A64C
@@ -5595,7 +5595,7 @@ MOD18_0223C1F0: ; 0x0223C1F0
mov r1, #0
strb r1, [r2, r0]
_0223C216:
- ldr r1, _0223C340 ; =UNK_021C48F8
+ ldr r1, _0223C340 ; =gMain + 0x40
ldrh r0, [r1, #0x20]
cmp r0, #0
beq _0223C29A
@@ -5673,7 +5673,7 @@ _0223C29A:
bl FUN_020054C8
_0223C2AC:
ldr r0, _0223C338 ; =0x02251380
- ldr r2, _0223C340 ; =UNK_021C48F8
+ ldr r2, _0223C340 ; =gMain + 0x40
ldr r3, [r0]
ldr r4, _0223C33C ; =0x000009E5
ldr r0, [r3, #4]
@@ -5741,7 +5741,7 @@ _0223C332:
.align 2, 0
_0223C338: .word MOD18_02251380
_0223C33C: .word 0x000009E5
-_0223C340: .word UNK_021C48F8
+_0223C340: .word gMain + 0x40
_0223C344: .word 0x000009E4
_0223C348: .word 0x000009E7
_0223C34C: .word 0x000009E8
@@ -8588,7 +8588,7 @@ MOD18_0223D8F4: ; 0x0223D8F4
mov r0, #0
pop {r3, pc}
_0223D912:
- ldr r1, _0223D9DC ; =UNK_021C48F8
+ ldr r1, _0223D9DC ; =gMain + 0x40
ldrh r1, [r1, #0x20]
cmp r1, #0
beq _0223D9BA
@@ -8625,7 +8625,7 @@ _0223D950:
pop {r3, pc}
_0223D962:
ldr r3, _0223D9D4 ; =0x02251388
- ldr r2, _0223D9DC ; =UNK_021C48F8
+ ldr r2, _0223D9DC ; =gMain + 0x40
ldr r3, [r3]
ldrh r1, [r2, #0x1c]
ldr r3, [r3, #0xc]
@@ -8644,7 +8644,7 @@ _0223D962:
strh r1, [r0]
ldr r1, [sp, #4]
strh r1, [r0, #2]
- ldr r1, _0223D9DC ; =UNK_021C48F8
+ ldr r1, _0223D9DC ; =gMain + 0x40
ldr r0, _0223D9D4 ; =0x02251388
ldrh r3, [r1, #0x1c]
ldr r2, [r0]
@@ -8682,7 +8682,7 @@ _0223D9CC:
nop
_0223D9D4: .word MOD18_02251388
_0223D9D8: .word 0x00000146
-_0223D9DC: .word UNK_021C48F8
+_0223D9DC: .word gMain + 0x40
thumb_func_end MOD18_0223D8F4
thumb_func_start MOD18_0223D9E0
@@ -14808,7 +14808,7 @@ _0224079E:
add sp, #0x1c
pop {r3, r4, pc}
_022407DE:
- ldr r1, _02240894 ; =UNK_021C48F8
+ ldr r1, _02240894 ; =gMain + 0x40
ldrh r0, [r1, #0x22]
cmp r0, #0
beq _02240816
@@ -14892,7 +14892,7 @@ _02240884: .word MOD18_022513A0
_02240888: .word 0x00000B3B
_0224088C: .word MOD18_022500A8
_02240890: .word 0x00000661
-_02240894: .word UNK_021C48F8
+_02240894: .word gMain + 0x40
thumb_func_end MOD18_02240658
thumb_func_start MOD18_02240898
@@ -18413,7 +18413,7 @@ _022423E6:
mov r0, #1
pop {r4, r5, r6, r7, pc}
_022423F4:
- ldr r0, _02242580 ; =UNK_021C48F8
+ ldr r0, _02242580 ; =gMain + 0x40
ldrh r0, [r0, #0x20]
cmp r0, #0
beq _022424C4
@@ -18429,14 +18429,14 @@ _0224240A:
ldr r0, [r0]
cmp r0, #0
bne _022424B6
- ldr r0, _02242580 ; =UNK_021C48F8
+ ldr r0, _02242580 ; =gMain + 0x40
ldrh r0, [r0, #0x1e]
lsl r1, r0, #0xc
ldr r0, [r4, #0x48]
sub r0, r1, r0
str r0, [sp, #0xc]
asr r7, r0, #0x1f
- ldr r0, _02242580 ; =UNK_021C48F8
+ ldr r0, _02242580 ; =gMain + 0x40
ldrh r0, [r0, #0x1c]
lsl r1, r0, #0xc
ldr r0, [r4, #0x44]
@@ -18611,7 +18611,7 @@ _02242570:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
-_02242580: .word UNK_021C48F8
+_02242580: .word gMain + 0x40
_02242584: .word 0x00000000
_02242588: .word MOD18_022500C0
_0224258C: .word 0x00000626
@@ -19324,7 +19324,7 @@ _02242B0E:
str r2, [r4, r0]
b _02242E6C
_02242B22:
- ldr r1, _02242D78 ; =UNK_021C48F8
+ ldr r1, _02242D78 ; =gMain + 0x40
ldrh r2, [r1, #0x20]
cmp r2, #0
beq _02242BD2
@@ -19612,7 +19612,7 @@ _02242D68: .word MOD18_022513A0
_02242D6C: .word 0x0000065E
_02242D70: .word 0x0000065D
_02242D74: .word 0x00000B3B
-_02242D78: .word UNK_021C48F8
+_02242D78: .word gMain + 0x40
_02242D7C: .word 0x00000627
_02242D80: .word 0x0000062A
_02242D84:
@@ -45740,7 +45740,7 @@ MOD18_0224FC18: ; 0x0224FC18
add r5, r1, #0
str r0, [sp]
add r0, #0x88
- ldr r1, _0224FCD4 ; =UNK_021C48F8
+ ldr r1, _0224FCD4 ; =gMain + 0x40
ldr r6, [r0]
ldrh r0, [r1, #0x1c]
ldrh r1, [r1, #0x1e]
@@ -45825,7 +45825,7 @@ _0224FCCE:
add sp, #0x24
pop {r4, r5, r6, r7, pc}
nop
-_0224FCD4: .word UNK_021C48F8
+_0224FCD4: .word gMain + 0x40
thumb_func_end MOD18_0224FC18
thumb_func_start MOD18_0224FCD8
@@ -45834,7 +45834,7 @@ MOD18_0224FCD8: ; 0x0224FCD8
sub sp, #0x1c
add r4, r1, #0
add r0, #0x88
- ldr r1, _0224FD6C ; =UNK_021C48F8
+ ldr r1, _0224FD6C ; =gMain + 0x40
ldr r5, [r0]
ldrh r0, [r1, #0x1c]
add r6, r2, #0
@@ -45902,7 +45902,7 @@ _0224FD66:
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
nop
-_0224FD6C: .word UNK_021C48F8
+_0224FD6C: .word gMain + 0x40
thumb_func_end MOD18_0224FCD8
thumb_func_start MOD18_0224FD70
@@ -45910,7 +45910,7 @@ MOD18_0224FD70: ; 0x0224FD70
push {r3, r4, r5, lr}
add r3, r0, #0
mov r0, #0
- ldr r4, _0224FDD0 ; =UNK_021C48F8
+ ldr r4, _0224FDD0 ; =gMain + 0x40
str r0, [r2]
ldrh r5, [r4, #0x20]
cmp r5, #0
@@ -45959,7 +45959,7 @@ _0224FDC0:
_0224FDCE:
pop {r3, r4, r5, pc}
.align 2, 0
-_0224FDD0: .word UNK_021C48F8
+_0224FDD0: .word gMain + 0x40
_0224FDD4: .word gMain
_0224FDD8: .word 0x000004F8
thumb_func_end MOD18_0224FD70
@@ -45969,7 +45969,7 @@ MOD18_0224FDDC: ; 0x0224FDDC
push {r3, r4, r5, lr}
add r3, r0, #0
mov r0, #0
- ldr r4, _0224FE40 ; =UNK_021C48F8
+ ldr r4, _0224FE40 ; =gMain + 0x40
str r0, [r2]
ldrh r5, [r4, #0x20]
cmp r5, #0
@@ -46020,7 +46020,7 @@ _0224FE30:
_0224FE3E:
pop {r3, r4, r5, pc}
.align 2, 0
-_0224FE40: .word UNK_021C48F8
+_0224FE40: .word gMain + 0x40
_0224FE44: .word gMain
_0224FE48: .word 0x000004F8
thumb_func_end MOD18_0224FDDC
@@ -46030,7 +46030,7 @@ MOD18_0224FE4C: ; 0x0224FE4C
push {r4, lr}
add r3, r0, #0
mov r0, #0
- ldr r4, _0224FE88 ; =UNK_021C48F8
+ ldr r4, _0224FE88 ; =gMain + 0x40
str r0, [r2]
ldrh r4, [r4, #0x20]
cmp r4, #0
@@ -46058,7 +46058,7 @@ _0224FE80:
str r0, [r3, r1]
pop {r4, pc}
nop
-_0224FE88: .word UNK_021C48F8
+_0224FE88: .word gMain + 0x40
_0224FE8C: .word gMain
_0224FE90: .word 0x000004F8
thumb_func_end MOD18_0224FE4C
@@ -46068,7 +46068,7 @@ MOD18_0224FE94: ; 0x0224FE94
push {r3, r4, r5, lr}
add r3, r0, #0
mov r0, #0
- ldr r4, _0224FEF4 ; =UNK_021C48F8
+ ldr r4, _0224FEF4 ; =gMain + 0x40
str r0, [r2]
ldrh r5, [r4, #0x20]
cmp r5, #0
@@ -46117,7 +46117,7 @@ _0224FEE4:
_0224FEF2:
pop {r3, r4, r5, pc}
.align 2, 0
-_0224FEF4: .word UNK_021C48F8
+_0224FEF4: .word gMain + 0x40
_0224FEF8: .word gMain
_0224FEFC: .word 0x000004F8
thumb_func_end MOD18_0224FE94