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,5 +1,5 @@
Route129_MapScripts:: @ 81F7284
map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2
.byte 0
@@ -11,7 +11,7 @@ Route129_MapScript1_1F7294: @ 81F7294
call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East
end
Route129_MapScript1_OnTransition: @ 81F72AB
Route129_OnTransition: @ 81F72AB
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route129_EventScript_273D13
compare VAR_RAYQUAZA_STATE, 4