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 @@
SootopolisCity_MapScripts:: @ 81E565C
map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB
@@ -31,7 +31,7 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5
setmetatile 31, 32, 592, 1
return
SootopolisCity_MapScript1_OnTransition: @ 81E56EF
SootopolisCity_OnTransition: @ 81E56EF
setflag FLAG_VISITED_SOOTOPOLIS_CITY
compare VAR_RAYQUAZA_STATE, 1
call_if_eq SootopolisCity_EventScript_1E5781