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,6 +1,6 @@
SkyPillar_Top_MapScripts:: @ 82396B8
map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713
.byte 0
@@ -15,7 +15,7 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2
removeobject VAR_LAST_TALKED
return
SkyPillar_Top_MapScript1_OnTransition: @ 82396E6
SkyPillar_Top_OnTransition: @ 82396E6
compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_Top_EventScript_2396FD
compare VAR_SKY_PILLAR_STATE, 2