summaryrefslogtreecommitdiff
path: root/maps/CinnabarIsland.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CinnabarIsland.asm')
-rw-r--r--maps/CinnabarIsland.asm15
1 files changed, 9 insertions, 6 deletions
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 77c1ae2f2..6823bc8a7 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -1,3 +1,6 @@
+const_value set 2
+ const CINNABARISLAND_BLUE
+
CinnabarIsland_MapScriptHeader:
.MapTriggers:
db 0
@@ -14,13 +17,13 @@ CinnabarIsland_MapScriptHeader:
CinnabarIslandBlue:
faceplayer
- loadfont
+ opentext
writetext CinnabarIslandBlueText
+ waitbutton
closetext
- loadmovesprites
playsound SFX_WARP_TO
- applymovement $2, CinnabarIslandBlueTeleport
- disappear $2
+ applymovement CINNABARISLAND_BLUE, CinnabarIslandBlueTeleport
+ disappear CINNABARISLAND_BLUE
clearevent EVENT_VIRIDIAN_GYM_BLUE
end
@@ -33,7 +36,7 @@ CinnabarIslandSign:
CinnabarIslandPokeCenterSign:
jumpstd pokecentersign
-MapCinnabarIslandSignpostItem3:
+CinnabarIslandHiddenRareCandy:
dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
CinnabarIslandBlueTeleport:
@@ -142,7 +145,7 @@ CinnabarIsland_MapEventHeader:
signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign
signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign
signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign
- signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3
+ signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy
.PersonEvents:
db 1