diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-24 01:42:52 +0800 |
| commit | 1dc0b25c1e58e422883e16ce7fb4f6bea1e9a0bb (patch) | |
| tree | 867d72df6ebe9b2d1f3ff72503879640322ec224 /asm/fldeff_flash.s | |
| parent | 9a53686a4eb595c288758486af5fea9b7805283f (diff) | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
Merge branch 'master' into battle
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 |