aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarIsland.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CinnabarIsland.asm')
-rw-r--r--data/maps/objects/CinnabarIsland.asm18
1 files changed, 11 insertions, 7 deletions
diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm
index f3ca64fb..739d5d75 100644
--- a/data/maps/objects/CinnabarIsland.asm
+++ b/data/maps/objects/CinnabarIsland.asm
@@ -1,3 +1,7 @@
+ object_const_def
+ const_export CINNABARISLAND_GIRL
+ const_export CINNABARISLAND_GAMBLER
+
CinnabarIsland_Object:
db $43 ; border block
@@ -9,14 +13,14 @@ CinnabarIsland_Object:
warp_event 15, 11, CINNABAR_MART, 1
def_bg_events
- bg_event 9, 5, 3 ; CinnabarIslandText3
- bg_event 16, 11, 4 ; MartSignText
- bg_event 12, 11, 5 ; PokeCenterSignText
- bg_event 9, 11, 6 ; CinnabarIslandText6
- bg_event 13, 3, 7 ; CinnabarIslandText7
+ bg_event 9, 5, TEXT_CINNABARISLAND_SIGN
+ bg_event 16, 11, TEXT_CINNABARISLAND_MART_SIGN
+ bg_event 12, 11, TEXT_CINNABARISLAND_POKECENTER_SIGN
+ bg_event 9, 11, TEXT_CINNABARISLAND_POKEMONLAB_SIGN
+ bg_event 13, 3, TEXT_CINNABARISLAND_GYM_SIGN
def_object_events
- object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
- object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
+ object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, TEXT_CINNABARISLAND_GIRL
+ object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, TEXT_CINNABARISLAND_GAMBLER
def_warps_to CINNABAR_ISLAND