summaryrefslogtreecommitdiff
path: root/arm9/modules/63
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/63')
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s14
-rw-r--r--arm9/modules/63/asm/mod63_021D8890.s18
2 files changed, 16 insertions, 16 deletions
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index 09884c1e..df0624f9 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -19,7 +19,7 @@ MOD63_021D74E0: ; 0x021D74E0
ldr r1, _021D758C ; =0x04000050
strh r0, [r1]
add r1, r0, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
mov r0, #0
add r1, r0, #0
bl FUN_02015F34
@@ -68,7 +68,7 @@ MOD63_021D74E0: ; 0x021D74E0
bl MOD63_021D7880
ldr r0, _021D7598 ; =MOD63_021D782C
add r1, r4, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
bl FUN_0201E788
mov r0, #1
pop {r4, pc}
@@ -355,7 +355,7 @@ MOD63_021D77B4: ; 0x021D77B4
mov r0, #0
add r1, r0, #0
ldr r4, [r6]
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
add r0, r6, #0
bl MOD63_021D78B0
add r0, r6, #0
@@ -1028,7 +1028,7 @@ _021D7C52:
mov r0, #0x10
orr r0, r1
strh r0, [r2]
- ldr r0, _021D7D70 ; =gUnk021C4918
+ ldr r0, _021D7D70 ; =gMain + 0x60
mov r1, #1
strb r1, [r0, #5]
bl FUN_0201E7A0
@@ -1043,7 +1043,7 @@ _021D7D60: .word 0x04000060
_021D7D64: .word 0xFFFFCFFF
_021D7D68: .word 0x00007FFF
_021D7D6C: .word 0x0000010E
-_021D7D70: .word gUnk021C4918
+_021D7D70: .word gMain + 0x60
thumb_func_end MOD63_021D7C18
thumb_func_start MOD63_021D7D74
@@ -1853,7 +1853,7 @@ MOD63_021D8360: ; 0x021D8360
ldr r0, _021D83A0 ; =0x0000CFDF
and r0, r1
strh r0, [r2]
- ldr r0, _021D83A4 ; =gUnk021C4918
+ ldr r0, _021D83A4 ; =gMain + 0x60
strb r3, [r0, #5]
bl FUN_0201E7A0
mov r0, #1
@@ -1861,7 +1861,7 @@ MOD63_021D8360: ; 0x021D8360
.align 2, 0
_021D839C: .word 0x04000050
_021D83A0: .word 0x0000CFDF
-_021D83A4: .word gUnk021C4918
+_021D83A4: .word gMain + 0x60
thumb_func_end MOD63_021D8360
thumb_func_start MOD63_021D83A8
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index 7940564f..9c8b1d22 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -574,7 +574,7 @@ MOD63_021D8D10: ; 0x021D8D10
bl FUN_0200E3A0
mov r0, #0
add r1, r0, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
mov r0, #0
add r1, r0, #0
bl FUN_02015F34
@@ -604,7 +604,7 @@ MOD63_021D8D10: ; 0x021D8D10
str r1, [r4, #8]
lsl r0, r0, #2
strb r1, [r4, r0]
- ldr r0, _021D8D94 ; =gUnk021C4918
+ ldr r0, _021D8D94 ; =gMain + 0x60
strb r1, [r0, #5]
bl FUN_0201E7A0
bl GetLCRNGSeed
@@ -615,7 +615,7 @@ MOD63_021D8D10: ; 0x021D8D10
pop {r4, pc}
.align 2, 0
_021D8D90: .word 0x00007FFF
-_021D8D94: .word gUnk021C4918
+_021D8D94: .word gMain + 0x60
thumb_func_end MOD63_021D8D10
thumb_func_start MOD63_021D8D98
@@ -826,7 +826,7 @@ MOD63_021D8F0C: ; 0x021D8F0C
str r0, [r4, #0x2c]
ldr r0, _021D8F34 ; =MOD63_021D8CA8
add r1, r4, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
mov r0, #1
strb r0, [r4, #0x1a]
pop {r4, pc}
@@ -1192,7 +1192,7 @@ MOD63_021D9234: ; 0x021D9234
add r4, r0, #0
mov r0, #0
add r1, r0, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
ldrb r0, [r4, #0x1a]
cmp r0, #0
beq _021D9286
@@ -1544,7 +1544,7 @@ MOD63_021D9498: ; 0x021D9498
ldr r0, [r5, #0xc]
mov r1, #1
str r0, [r5, #0x40]
- ldr r0, _021D9588 ; =gUnk021C4918
+ ldr r0, _021D9588 ; =gMain + 0x60
strb r1, [r0, #5]
bl FUN_0201E7A0
ldr r6, _021D958C ; =MOD63_021DBDE8
@@ -1595,7 +1595,7 @@ _021D950C:
bl FUN_020B8390
ldr r0, _021D95A4 ; =MOD63_021D8CB0
add r1, r5, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
mov r0, #0x10
mov r1, #1
mov r2, #2
@@ -1606,7 +1606,7 @@ _021D950C:
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
-_021D9588: .word gUnk021C4918
+_021D9588: .word gMain + 0x60
_021D958C: .word MOD63_021DBDE8
_021D9590: .word MOD63_021DBAD0
_021D9594: .word 0x00004210
@@ -1728,7 +1728,7 @@ _021D965E:
_021D9690:
mov r0, #0
add r1, r0, #0
- bl FUN_02015F10
+ bl Main_SetVBlankIntrCB
pop {r4, r5, r6, pc}
nop
_021D969C: .word 0xFFFF1FFF