summaryrefslogtreecommitdiff
path: root/maps/Route24.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route24.asm')
-rw-r--r--maps/Route24.asm43
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/Route24.asm b/maps/Route24.asm
index fb59d08f5..4275c53a5 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -1,19 +1,18 @@
-Route24_MapScriptHeader: ; 0x1adbf8
- ; trigger count
+Route24_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1adbfa
-RocketScript_0x1adbfa: ; 0x1adbfa
+RocketScript_0x1adbfa:
faceplayer
playmusic MUSIC_ROCKET_ENCOUNTER
loadfont
writetext UnknownText_0x1adc2e
closetext
loadmovesprites
- winlosstext UnknownText_0x1add67, $ffff
+ winlosstext UnknownText_0x1add67, -1
loadtrainer GRUNTM, 31
startbattle
reloadmapmusic
@@ -26,16 +25,15 @@ RocketScript_0x1adbfa: ; 0x1adbfa
writetext UnknownText_0x1adee1
closetext
loadmovesprites
- special Function8c0b6
- special Functiond91
+ special Special_FadeBlackQuickly
+ special Special_ReloadSpritesNoPalettes
disappear $2
pause 25
- special Function8c0ab
+ special Special_FadeInQuickly
playmapmusic
end
-; 0x1adc2e
-UnknownText_0x1adc2e: ; 0x1adc2e
+UnknownText_0x1adc2e:
text "Hey, kid! Me am a"
line "TEAM ROCKET member"
cont "kind of guy!"
@@ -63,9 +61,8 @@ UnknownText_0x1adc2e: ; 0x1adc2e
para "Hey, kid! Battle"
line "begin we do!"
done
-; 0x1add67
-UnknownText_0x1add67: ; 0x1add67
+UnknownText_0x1add67:
text "Ayieeeh! No, no,"
line "no, believe it I"
cont "can't!"
@@ -74,9 +71,8 @@ UnknownText_0x1add67: ; 0x1add67
line "be you! Match I am"
cont "not to you!"
done
-; 0x1addc0
-UnknownText_0x1addc0: ; 0x1addc0
+UnknownText_0x1addc0:
text "OK. Tell you mine"
line "secret will I."
@@ -104,9 +100,8 @@ UnknownText_0x1addc0: ; 0x1addc0
para "friends, yes. Will"
line "revenge they are."
done
-; 0x1adee1
-UnknownText_0x1adee1: ; 0x1adee1
+UnknownText_0x1adee1:
text "…"
para "You say what? TEAM"
@@ -119,22 +114,20 @@ UnknownText_0x1adee1: ; 0x1adee1
line "do what now on"
cont "from, me?"
done
-; 0x1adf50
-Route24_MapEventHeader: ; 0x1adf50
+Route24_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 0
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, $076c
-; 0x1adf63
+ person_event SPRITE_ROCKET, 11, 12, OW_DOWN | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET