summaryrefslogtreecommitdiff
path: root/maps/VioletCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletCity.asm')
-rw-r--r--maps/VioletCity.asm32
1 files changed, 21 insertions, 11 deletions
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 248e3e564..1dea698bc 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,3 +1,13 @@
+const_value set 2
+ const VIOLETCITY_FISHER
+ const VIOLETCITY_LASS
+ const VIOLETCITY_SUPER_NERD
+ const VIOLETCITY_GRAMPS
+ const VIOLETCITY_YOUNGSTER
+ const VIOLETCITY_FRUIT_TREE
+ const VIOLETCITY_POKE_BALL1
+ const VIOLETCITY_POKE_BALL2
+
VioletCity_MapScriptHeader:
.MapTriggers:
db 0
@@ -13,7 +23,7 @@ VioletCity_MapScriptHeader:
return
FisherScript_0x1a83bb:
- applymovement $2, MovementData_0x1a8465
+ applymovement VIOLETCITY_FISHER, MovementData_0x1a8465
faceplayer
loadfont
writetext UnknownText_0x1a8473
@@ -23,31 +33,31 @@ FisherScript_0x1a83bb:
UnknownScript_0x1a83cb:
writetext UnknownText_0x1a84ac
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a83d1:
writetext UnknownText_0x1a84cb
+ waitbutton
closetext
- loadmovesprites
playmusic MUSIC_SHOW_ME_AROUND
- follow $2, PLAYER
- applymovement $2, MovementData_0x1a842a
+ follow VIOLETCITY_FISHER, PLAYER
+ applymovement VIOLETCITY_FISHER, MovementData_0x1a842a
spriteface PLAYER, UP
- applymovement $2, MovementData_0x1a8465
+ applymovement VIOLETCITY_FISHER, MovementData_0x1a8465
stopfollow
special RestartMapMusic
loadfont
writetext UnknownText_0x1a84f9
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x1a8465
- applymovement $2, MovementData_0x1a8463
+ applymovement VIOLETCITY_FISHER, MovementData_0x1a8465
+ applymovement VIOLETCITY_FISHER, MovementData_0x1a8463
playsound SFX_ENTER_DOOR
- disappear $2
+ disappear VIOLETCITY_FISHER
clearevent EVENT_EARLS_ACADEMY_EARL
- waitbutton
+ waitsfx
end
LassScript_0x1a8403: