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,10 +1,10 @@
Route114_MapScripts:: @ 81F252F
map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578
.byte 0
Route114_MapScript1_OnTransition: @ 81F253F
Route114_OnTransition: @ 81F253F
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route114_EventScript_273D13
compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH