diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /asm/field_screen_effect.s | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'asm/field_screen_effect.s')
| -rw-r--r-- | asm/field_screen_effect.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 079abee2c..f8c0970c9 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -985,25 +985,25 @@ _0807F5B6: bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5CC @ =gUnknown_81A8D97 + ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal bl ScriptContext1_SetupScript b _0807F5E4 .align 2, 0 -_0807F5CC: .4byte gUnknown_81A8D97 +_0807F5CC: .4byte EventScript_AfterWhiteOutHeal _0807F5D0: bl sub_807E418 cmp r0, 0x1 bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5EC @ =gUnknown_81A8DD8 + ldr r0, _0807F5EC @ =EventScript_MomHeal bl ScriptContext1_SetupScript _0807F5E4: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0807F5EC: .4byte gUnknown_81A8DD8 +_0807F5EC: .4byte EventScript_MomHeal thumb_func_end sub_807F45C thumb_func_start sub_807F5F0 |