diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 10:20:01 -0400 |
| commit | 4d8f66774e791bd6d30023b41fed7f2e00b0edac (patch) | |
| tree | 57c1ce5af4a512e2f24be3a363b406a3b61938ed /asm/fldeff_flash.s | |
| parent | a7b278ac2ddc0bb87530064585b47bbcabb3a157 (diff) | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
Merge branch 'master' into trainers
Diffstat (limited to 'asm/fldeff_flash.s')
| -rw-r--r-- | asm/fldeff_flash.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 4ce45b5c7..63067bb03 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -76,13 +76,13 @@ sub_80C9BB0: @ 80C9BB0 bl PlaySE ldr r0, _080C9BC8 @ =0x00000806 bl FlagSet - ldr r0, _080C9BCC @ =gUnknown_81BFB5F + ldr r0, _080C9BCC @ =EventScript_81BFB5F bl ScriptContext1_SetupScript pop {r0} bx r0 .align 2, 0 _080C9BC8: .4byte 0x00000806 -_080C9BCC: .4byte gUnknown_81BFB5F +_080C9BCC: .4byte EventScript_81BFB5F thumb_func_end sub_80C9BB0 thumb_func_start sub_80C9BD0 |