summaryrefslogtreecommitdiff
path: root/asm/script.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-03 22:50:17 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-03 22:50:17 +0200
commit5afd2d5bfb1ec117d80898d9ad1c2529d28a091c (patch)
treec930fe4733b8ae2bc02940ae6a35fbf73f933aca /asm/script.s
parentd09f39e97167fa10d51adbcd8b5d1f5e2cf73e1e (diff)
begin new save.c, label lots of things
Diffstat (limited to 'asm/script.s')
-rw-r--r--asm/script.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/script.s b/asm/script.s
index be0a0ff8c..e625b5625 100644
--- a/asm/script.s
+++ b/asm/script.s
@@ -411,9 +411,9 @@ script_env_2_enable_and_set_ctx_running: @ 8098F3C
.pool
thumb_func_end script_env_2_enable_and_set_ctx_running
- thumb_func_start script_env_2_execute_new_script
-@ void script_env_2_execute_new_script(void *script_ptr)
-script_env_2_execute_new_script: @ 8098F50
+ thumb_func_start ScriptContext2_RunNewScript
+@ void ScriptContext2_RunNewScript(void *script_ptr)
+ScriptContext2_RunNewScript: @ 8098F50
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gUnknown_03000EB8
@@ -435,7 +435,7 @@ _08098F68:
pop {r0}
bx r0
.pool
- thumb_func_end script_env_2_execute_new_script
+ thumb_func_end ScriptContext2_RunNewScript
thumb_func_start mapheader_get_tagged_pointer
mapheader_get_tagged_pointer: @ 8098F88
@@ -484,7 +484,7 @@ mapheader_run_script_by_tag: @ 8098FC8
bl mapheader_get_tagged_pointer
cmp r0, 0
beq _08098FDA
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
_08098FDA:
pop {r0}
bx r0
@@ -616,7 +616,7 @@ mapheader_run_first_tag4_script_list_match: @ 8099098
bl mapheader_get_first_match_from_tagged_ptr_list
cmp r0, 0
beq _080990A8
- bl script_env_2_execute_new_script
+ bl ScriptContext2_RunNewScript
_080990A8:
pop {r0}
bx r0