dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into field_map_obj

Browse Source
This commit is contained in:
PikalaxALT
2017-09-13 19:29:19 -04:00
parent c2e31f0618 78009a835f
commit 64ffa8f963
221 changed files with 152332 additions and 152431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/fldeff_80F9BCC.s
+10 -10
View File
@@ -648,7 +648,7 @@ sub_80FA0DC: @ 80FA0DC
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275A86
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -769,7 +769,7 @@ sub_80FA1D8: @ 80FA1D8
push {lr}
movs r1, 0x37
bl FieldEffectStop
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80FA1D8
@@ -783,7 +783,7 @@ sub_80FA1E8: @ 80FA1E8
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275ADF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -942,7 +942,7 @@ sub_80FA33C: @ 80FA33C
push {lr}
movs r1, 0x38
bl FieldEffectStop
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80FA33C
@@ -956,7 +956,7 @@ sub_80FA34C: @ 80FA34C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275B38
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@@ -1077,7 +1077,7 @@ sub_80FA448: @ 80FA448
push {lr}
movs r1, 0x39
bl FieldEffectStop
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80FA448
@@ -1195,7 +1195,7 @@ _080FA540:
bl CurrentMapDrawMetatileAt
movs r0, 0x3D
bl FieldEffectActiveListRemove
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
b _080FA574
@@ -1801,7 +1801,7 @@ _080FAA5E:
sub_80FAA7C: @ 80FAA7C
push {r4,lr}
sub sp, 0x4
bl script_env_2_enable
bl ScriptContext2_Enable
mov r4, sp
adds r4, 0x2
mov r0, sp
@@ -2012,7 +2012,7 @@ sub_80FAC68: @ 80FAC68
push {lr}
movs r1, 0x34
bl FieldEffectStop
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80FAC68
@@ -2414,7 +2414,7 @@ sub_80FAFD4: @ 80FAFD4
bl SetPlayerAvatarTransitionFlags
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
bl EnableBothScriptContexts
pop {r4}
pop {r0}
bx r0