From 079310c70baecd11bd72ab493ee012f483ea2bf9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 31 Oct 2019 17:06:06 -0400 Subject: Finish decomp of wild_encounter --- data/event_scripts.s | 4 ++-- data/specials.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index a3943d494..eb2c8ed60 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10397,7 +10397,7 @@ EventScript_1BE06F:: @ 81BE06F applymovement VAR_LAST_TALKED, Movement_1BE08F waitmovement 0 removeobject VAR_LAST_TALKED - special Special_RockSmashEncounter + special ScrSpecial_RockSmashWildEncounter compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1BE08D waitstate @@ -11731,7 +11731,7 @@ EventScript_81BFB5F:: @ 81BFB5F setflashradius 0 end -EventScript_1BFB65:: @ 81BFB65 +EventScript_RepelWoreOff:: @ 81BFB65 msgbox Text_1BFB6E, 3 end diff --git a/data/specials.inc b/data/specials.inc index 516b5f768..9da9bdfc7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -179,7 +179,7 @@ gSpecials:: @ 815FD60 def_special sub_8113510 def_special sub_81130A8 def_special sub_8113530 - def_special Special_RockSmashEncounter + def_special ScrSpecial_RockSmashWildEncounter def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 -- cgit v1.2.3