Fix some labels and include decorations.h

Include decorations.h in shop.c

Include decorations.h in event_scripts.s
This commit is contained in:
Fontbane
2019-04-22 16:31:51 -04:00
committed by huderlem
parent 6cf06d5f95
commit 901a83d249
150 changed files with 282 additions and 296 deletions

View File

@@ -1,10 +1,10 @@
SkyPillar_4F_MapScripts:: @ 8239671
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696
.byte 0
SkyPillar_4F_MapScript1_OnTransition: @ 8239681
SkyPillar_4F_OnTransition: @ 8239681
compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_4F_EventScript_CleanFloor
copyvar VAR_ICE_STEP_COUNT, 0x1