diff options
| author | Fontbane <fontbane@gmail.com> | 2019-04-22 16:31:51 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-22 17:23:59 -0500 |
| commit | 901a83d249a511e45a79d3358bdbdf1a594013ab (patch) | |
| tree | 116f0c20df7f8e46d47905318caef0c95714972b /data/maps/Route115 | |
| parent | 6cf06d5f95c8404e0e97210f62c40b0059d24d41 (diff) | |
Fix some labels and include decorations.h
Include decorations.h in shop.c
Include decorations.h in event_scripts.s
Diffstat (limited to 'data/maps/Route115')
| -rw-r--r-- | data/maps/Route115/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |