diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /asm/script.s | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/script.s')
| -rw-r--r-- | asm/script.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/script.s b/asm/script.s index e625b5625..1b49440d6 100644 --- a/asm/script.s +++ b/asm/script.s @@ -368,8 +368,8 @@ _08098EF2: bx r1 thumb_func_end script_env_2_run_current_script - thumb_func_start script_env_1_execute_new_script -script_env_1_execute_new_script: @ 8098EF8 + thumb_func_start ScriptContext1_SetupScript +ScriptContext1_SetupScript: @ 8098EF8 push {r4,r5,lr} adds r5, r0, 0 ldr r4, =gUnknown_03000E40 @@ -388,7 +388,7 @@ script_env_1_execute_new_script: @ 8098EF8 pop {r0} bx r0 .pool - thumb_func_end script_env_1_execute_new_script + thumb_func_end ScriptContext1_SetupScript thumb_func_start script_env_2_set_ctx_paused script_env_2_set_ctx_paused: @ 8098F30 @@ -442,7 +442,7 @@ mapheader_get_tagged_pointer: @ 8098F88 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, =gUnknown_02037318 + ldr r0, =gMapHeader ldr r2, [r0, 0x8] cmp r2, 0 beq _08098F9C @@ -598,7 +598,7 @@ mapheader_run_first_tag2_script_list_match: @ 809907C bl mapheader_get_first_match_from_tagged_ptr_list cmp r0, 0 beq _08099090 - bl script_env_1_execute_new_script + bl ScriptContext1_SetupScript movs r0, 0x1 b _08099092 _08099090: |