summaryrefslogtreecommitdiff
path: root/maps/SproutTower3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SproutTower3F.asm')
-rw-r--r--maps/SproutTower3F.asm49
1 files changed, 29 insertions, 20 deletions
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index c8a1216a8..d81ad7013 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -1,3 +1,12 @@
+const_value set 2
+ const SPROUTTOWER3F_SAGE1
+ const SPROUTTOWER3F_SAGE2
+ const SPROUTTOWER3F_SAGE3
+ const SPROUTTOWER3F_SAGE4
+ const SPROUTTOWER3F_POKE_BALL1
+ const SPROUTTOWER3F_POKE_BALL2
+ const SPROUTTOWER3F_SILVER
+
SproutTower3F_MapScriptHeader:
.MapTriggers:
db 2
@@ -27,30 +36,30 @@ UnknownScript_0x184947:
playsound SFX_ELEVATOR
earthquake 79
applymovement PLAYER, MovementData_0x184a1d
- applymovement $8, MovementData_0x184a22
+ applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22
loadfont
writetext UnknownText_0x184a27
+ waitbutton
closetext
- loadmovesprites
- showemote EMOTE_SHOCK, $8, 15
- spriteface $8, DOWN
+ showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
+ spriteface SPROUTTOWER3F_SILVER, DOWN
pause 15
- applymovement $8, MovementData_0x184a24
+ applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
playmusic MUSIC_RIVAL_ENCOUNTER
loadfont
writetext UnknownText_0x184aec
+ waitbutton
closetext
- loadmovesprites
- spriteface $8, UP
+ spriteface SPROUTTOWER3F_SILVER, UP
loadfont
writetext UnknownText_0x184bc8
pause 15
- loadmovesprites
+ closetext
playsound SFX_WARP_TO
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
- disappear $8
- waitbutton
+ disappear SPROUTTOWER3F_SILVER
+ waitsfx
special Special_FadeInQuickly
dotrigger $1
special RestartMapMusic
@@ -62,10 +71,10 @@ SageLiScript:
checkevent EVENT_GOT_HM05_FLASH
iftrue UnknownScript_0x1849d1
writetext SageLiSeenText
+ waitbutton
closetext
- loadmovesprites
winlosstext SageLiBeatenText, 0
- loadtrainer SAGE, LI
+ scriptedtrainerdata SAGE, LI
startbattle
returnafterbattle
loadfont
@@ -75,47 +84,47 @@ SageLiScript:
setevent EVENT_GOT_HM05_FLASH
setevent EVENT_BEAT_SAGE_LI
writetext UnknownText_0x184d13
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1849d1:
writetext UnknownText_0x184d88
+ waitbutton
closetext
- loadmovesprites
end
TrainerSageJin:
trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript
SageJinScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x184dfa
+ waitbutton
closetext
- loadmovesprites
end
TrainerSageTroy:
trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript
SageTroyScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x184ea4
+ waitbutton
closetext
- loadmovesprites
end
TrainerSageNeal:
trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript
SageNealScript:
- talkaftercancel
+ end_if_just_battled
loadfont
writetext UnknownText_0x184f12
+ waitbutton
closetext
- loadmovesprites
end
MapSproutTower3FSignpost3Script: