summaryrefslogtreecommitdiff
path: root/maps/VermilionMagnetTrainSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VermilionMagnetTrainSpeechHouse.asm')
-rw-r--r--maps/VermilionMagnetTrainSpeechHouse.asm38
1 files changed, 16 insertions, 22 deletions
diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm
index d41c66c1f..d76778627 100644
--- a/maps/VermilionMagnetTrainSpeechHouse.asm
+++ b/maps/VermilionMagnetTrainSpeechHouse.asm
@@ -1,23 +1,20 @@
-VermilionMagnetTrainSpeechHouse_MapScriptHeader: ; 0x191eb5
- ; trigger count
+VermilionMagnetTrainSpeechHouse_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x191eb7
-PokefanFScript_0x191eb7: ; 0x191eb7
+PokefanFScript_0x191eb7:
jumptextfaceplayer UnknownText_0x191ec0
-; 0x191eba
-YoungsterScript_0x191eba: ; 0x191eba
+YoungsterScript_0x191eba:
jumptextfaceplayer UnknownText_0x191f16
-; 0x191ebd
VermilionMagnetTrainSpeechHouseBookshelf:
jumpstd picturebookshelf
-UnknownText_0x191ec0: ; 0x191ec0
+UnknownText_0x191ec0:
text "Do you know about"
line "the MAGNET TRAIN?"
@@ -25,34 +22,31 @@ UnknownText_0x191ec0: ; 0x191ec0
line "that goes to GOL-"
cont "DENROD in JOHTO."
done
-; 0x191f16
-UnknownText_0x191f16: ; 0x191f16
+UnknownText_0x191f16:
text "I want to go to"
line "SAFFRON to see"
cont "the MAGNET TRAIN."
done
-; 0x191f48
-VermilionMagnetTrainSpeechHouse_MapEventHeader: ; 0x191f48
+VermilionMagnetTrainSpeechHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY
warp_def $7, $3, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 1, 0, $0, VermilionMagnetTrainSpeechHouseBookshelf
- signpost 1, 1, $0, VermilionMagnetTrainSpeechHouseBookshelf
+ signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf
+ signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, $ffff
- person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, $ffff
-; 0x191f7c
+ person_event SPRITE_POKEFAN_F, 7, 6, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanFScript_0x191eb7, -1
+ person_event SPRITE_YOUNGSTER, 7, 4, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x191eba, -1