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

@@ -1,6 +1,6 @@
SouthernIsland_Interior_MapScripts:: @ 8242A45
map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50
map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition
.byte 0
SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
@@ -14,7 +14,7 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
removeobject 2
return
SouthernIsland_Interior_MapScript1_OnTransition: @ 8242A6E
SouthernIsland_Interior_OnTransition: @ 8242A6E
compare VAR_ROAMER_POKEMON, 0
call_if_eq SouthernIsland_Interior_EventScript_242A8A
compare VAR_ROAMER_POKEMON, 0