summaryrefslogtreecommitdiff
path: root/data/maps/RustboroCity
diff options
context:
space:
mode:
authorFontbane <fontbane@gmail.com>2019-04-22 16:31:51 -0400
committerhuderlem <huderlem@gmail.com>2019-04-22 17:23:59 -0500
commit901a83d249a511e45a79d3358bdbdf1a594013ab (patch)
tree116f0c20df7f8e46d47905318caef0c95714972b /data/maps/RustboroCity
parent6cf06d5f95c8404e0e97210f62c40b0059d24d41 (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/RustboroCity')
-rw-r--r--data/maps/RustboroCity/scripts.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 6df6019f4..e72496ff3 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,9 +1,9 @@
RustboroCity_MapScripts:: @ 81E06BD
- map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_OnTransition
+ map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B
.byte 0
-RustboroCity_MapScript1_OnTransition: @ 81E06C8
+RustboroCity_OnTransition: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY
call Common_EventScript_SetupRivalGender
compare VAR_RUSTBORO_STATE, 6