summaryrefslogtreecommitdiff
path: root/asm/script_menu.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/script_menu.s')
-rw-r--r--asm/script_menu.s34
1 files changed, 17 insertions, 17 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 0562b9aeb..6c5e6d2bd 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -371,7 +371,7 @@ _080E20EC:
bl sub_80E2A78
adds r0, r6, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080E20FC:
pop {r4-r6}
pop {r0}
@@ -477,7 +477,7 @@ _080E21B8:
_080E21BA:
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080E21C4:
pop {r4}
pop {r0}
@@ -668,7 +668,7 @@ _080E2350:
bl sub_80E2A78
adds r0, r4, 0
bl DestroyTask
- bl script_env_2_enable_and_set_ctx_running
+ bl EnableBothScriptContexts
_080E2360:
pop {r4,r5}
pop {r0}
@@ -761,7 +761,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB198
movs r0, 0x31
str r0, [sp]
@@ -770,7 +770,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
- bl Print
+ bl PrintTextOnWindow
b _080E247A
.pool
_080E2448:
@@ -795,7 +795,7 @@ _080E2448:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
- bl Print
+ bl PrintTextOnWindow
_080E247A:
ldr r0, =0x000008ab
bl FlagGet
@@ -813,7 +813,7 @@ _080E247A:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
- bl Print
+ bl PrintTextOnWindow
b _080E24C6
.pool
_080E24B0:
@@ -826,7 +826,7 @@ _080E24B0:
adds r0, r6, 0
movs r1, 0x1
adds r3, r7, 0
- bl Print
+ bl PrintTextOnWindow
_080E24C6:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EB183
@@ -1228,7 +1228,7 @@ _080E2802:
adds r0, r6, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1687,7 +1687,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB264
movs r0, 0x19
str r0, [sp]
@@ -1696,7 +1696,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB26C
movs r0, 0x29
str r0, [sp]
@@ -1705,7 +1705,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB270
movs r0, 0x39
str r0, [sp]
@@ -1714,7 +1714,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
movs r0, 0x49
@@ -1724,7 +1724,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB279
movs r0, 0x59
str r0, [sp]
@@ -1733,7 +1733,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB27E
movs r0, 0x69
str r0, [sp]
@@ -1742,7 +1742,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
ldr r2, =gUnknown_085EB285
movs r0, 0x79
str r0, [sp]
@@ -1751,7 +1751,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0x1
movs r3, 0x8
- bl Print
+ bl PrintTextOnWindow
movs r0, 0x10
str r0, [sp]
movs r0, 0x8