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

+2 -2
View File
@@ -1,10 +1,10 @@
Route116_MapScripts:: @ 81F2C0C
map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_OnTransition
map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
.byte 0
Route116_MapScript1_OnTransition: @ 81F2C1C
Route116_OnTransition: @ 81F2C1C
call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
call_if_eq Route116_EventScript_273D13