summaryrefslogtreecommitdiff
path: root/maps/Route24.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route24.asm')
-rw-r--r--maps/Route24.asm11
1 files changed, 7 insertions, 4 deletions
diff --git a/maps/Route24.asm b/maps/Route24.asm
index b828c9e89..ab73faccb 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,3 +1,6 @@
+const_value set 2
+ const ROUTE24_ROCKET
+
Route24_MapScriptHeader:
.MapTriggers:
db 0
@@ -10,10 +13,10 @@ RocketScript_0x1adbfa:
playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
writetext UnknownText_0x1adc2e
+ waitbutton
closetext
- loadmovesprites
winlosstext UnknownText_0x1add67, -1
- loadtrainer GRUNTM, 31
+ scriptedtrainerdata GRUNTM, 31
startbattle
reloadmapmusic
returnafterbattle
@@ -23,11 +26,11 @@ RocketScript_0x1adbfa:
keeptextopen
special Special_RotatePalettesRightMusic
writetext UnknownText_0x1adee1
+ waitbutton
closetext
- loadmovesprites
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
- disappear $2
+ disappear ROUTE24_ROCKET
pause 25
special Special_FadeInQuickly
playmapmusic