From 901a83d249a511e45a79d3358bdbdf1a594013ab Mon Sep 17 00:00:00 2001 From: Fontbane Date: Mon, 22 Apr 2019 16:31:51 -0400 Subject: Fix some labels and include decorations.h Include decorations.h in shop.c Include decorations.h in event_scripts.s --- data/maps/Route115/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route115') diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index bedd9239e..7c5b63bcd 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -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 -- cgit v1.2.3