summaryrefslogtreecommitdiff
path: root/data/maps/MarineCave_End/scripts.inc
diff options
context:
space:
mode:
authorFontbane <fontbane@gmail.com>2019-04-22 16:31:51 -0400
committerhuderlem <huderlem@gmail.com>2019-04-22 17:23:59 -0500
commit901a83d249a511e45a79d3358bdbdf1a594013ab (patch)
tree116f0c20df7f8e46d47905318caef0c95714972b /data/maps/MarineCave_End/scripts.inc
parent6cf06d5f95c8404e0e97210f62c40b0059d24d41 (diff)
Fix some labels and include decorations.h
Include decorations.h in shop.c Include decorations.h in event_scripts.s
Diffstat (limited to 'data/maps/MarineCave_End/scripts.inc')
-rw-r--r--data/maps/MarineCave_End/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index e3f5d4c49..be3a6a57b 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -1,6 +1,6 @@
MarineCave_End_MapScripts:: @ 823AFDF
map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA
- map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_OnTransition
+ map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition
.byte 0
MarineCave_End_MapScript1_23AFEA: @ 823AFEA
@@ -14,7 +14,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4
removeobject 1
return
-MarineCave_End_MapScript1_OnTransition: @ 823B008
+MarineCave_End_OnTransition: @ 823B008
call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012
end