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/overworld.s | |
| parent | a7b278ac2ddc0bb87530064585b47bbcabb3a157 (diff) | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
Merge branch 'master' into trainers
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 9bcd95eab..bd5ab7500 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -6964,13 +6964,13 @@ sub_8058214: @ 8058214 thumb_func_start sub_8058230 sub_8058230: @ 8058230 push {lr} - ldr r0, _08058240 @ =gUnknown_81BB9F0 + ldr r0, _08058240 @ =EventScript_1BB9F0 bl ScriptContext1_SetupScript bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_08058240: .4byte gUnknown_81BB9F0 +_08058240: .4byte EventScript_1BB9F0 thumb_func_end sub_8058230 thumb_func_start sub_8058244 |