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 @@
Route115_MapScripts:: @ 81F2920
map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930
map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969
.byte 0
@@ -11,7 +11,7 @@ Route115_MapScript1_1F2930: @ 81F2930
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East
end
Route115_MapScript1_OnTransition: @ 81F2947
Route115_OnTransition: @ 81F2947
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route115_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST