summaryrefslogtreecommitdiff
path: root/data/maps/SkyPillar_2F/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/SkyPillar_2F/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/SkyPillar_2F/scripts.inc')
-rw-r--r--data/maps/SkyPillar_2F/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index db7c7763c..dcbff3642 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -1,10 +1,10 @@
SkyPillar_2F_MapScripts:: @ 823962B
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327
- map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_OnTransition
+ map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650
.byte 0
-SkyPillar_2F_MapScript1_OnTransition: @ 823963B
+SkyPillar_2F_OnTransition: @ 823963B
compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_2F_EventScript_CleanFloor
copyvar VAR_ICE_STEP_COUNT, 0x1