summaryrefslogtreecommitdiff
path: root/maps/CianwoodCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CianwoodCity.asm')
-rw-r--r--maps/CianwoodCity.asm42
1 files changed, 28 insertions, 14 deletions
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 6bb1daada..e52c7aa58 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -1,3 +1,17 @@
+const_value set 2
+ const CIANWOODCITY_STANDING_YOUNGSTER
+ const CIANWOODCITY_POKEFAN_M
+ const CIANWOODCITY_LASS
+ const CIANWOODCITY_ROCK1
+ const CIANWOODCITY_ROCK2
+ const CIANWOODCITY_ROCK3
+ const CIANWOODCITY_ROCK4
+ const CIANWOODCITY_ROCK5
+ const CIANWOODCITY_ROCK6
+ const CIANWOODCITY_POKEFAN_F
+ const CIANWOODCITY_SUPER_NERD
+ const CIANWOODCITY_SUICUNE
+
CianwoodCity_MapScriptHeader:
.MapTriggers:
db 2
@@ -23,7 +37,7 @@ CianwoodCity_MapScriptHeader:
setevent EVENT_EUSINE_IN_BURNED_TOWER
checkevent EVENT_FOUGHT_EUSINE
iffalse UnknownScript_0x1a001d
- disappear $c
+ disappear CIANWOODCITY_SUPER_NERD
UnknownScript_0x1a001d:
return
@@ -32,12 +46,12 @@ UnknownScript_0x1a001e:
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- applymovement $d, MovementData_0x1a00da
+ applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
spriteface PLAYER, DOWN
pause 15
playsound SFX_WARP_FROM
- applymovement $d, MovementData_0x1a00e0
- disappear $d
+ applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
+ disappear CIANWOODCITY_SUICUNE
pause 10
dotrigger $0
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
@@ -46,25 +60,25 @@ UnknownScript_0x1a001e:
iftrue .Done
setevent EVENT_FOUGHT_EUSINE
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
- appear $c
- applymovement $c, MovementData_0x1a00e7
+ appear CIANWOODCITY_SUPER_NERD
+ applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00e7
loadfont
writetext UnknownText_0x1a0433
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1a05a1, 0
setlasttalked $c
- loadtrainer MYSTICALMAN, EUSINE
+ scriptedtrainerdata MYSTICALMAN, EUSINE
startbattle
reloadmapmusic
returnafterbattle
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
loadfont
writetext UnknownText_0x1a05c3
+ waitbutton
closetext
- loadmovesprites
- applymovement $c, MovementData_0x1a00ec
- disappear $c
+ applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec
+ disappear CIANWOODCITY_SUPER_NERD
pause 20
special Special_RotatePalettesRightMusic
playmapmusic
@@ -82,8 +96,8 @@ PokefanFScript_0x1a0084:
checkevent EVENT_BEAT_CHUCK
iftrue UnknownScript_0x1a009c
writetext UnknownText_0x1a0163
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a009c:
@@ -96,9 +110,9 @@ UnknownScript_0x1a009c:
keeptextopen
UnknownScript_0x1a00ad:
writetext UnknownText_0x1a0277
- closetext
+ waitbutton
UnknownScript_0x1a00b1:
- loadmovesprites
+ closetext
end
StandingYoungsterScript_0x1a00b3: