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 authored and huderlem committed 2019-04-22 17:23:59 -05:00
1 parent 6cf06d5f95
commit 901a83d249
150 files changed
+282 -296

No files matched your search

+2 -2
View File
@@ -1,8 +1,8 @@
SlateportCity_Harbor_MapScripts:: @ 820C97D
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_OnTransition
.byte 0
SlateportCity_Harbor_MapScript1_OnTransition: @ 820C983
SlateportCity_Harbor_OnTransition: @ 820C983
setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
setvar VAR_TEMP_1, 0
compare VAR_SLATEPORT_HARBOR_STATE, 1