summaryrefslogtreecommitdiff
path: root/maps/Route39.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route39.asm')
-rw-r--r--maps/Route39.asm64
1 files changed, 32 insertions, 32 deletions
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 5f7d33279..1ab22b0d7 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -11,7 +11,7 @@ const_value set 2
const ROUTE39_POKEFAN_F2
Route39_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -26,9 +26,9 @@ Route39Miltank:
end
TrainerPokefanmDerek1:
- trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script
+ trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script
-PokefanmDerek1Script:
+.Script:
writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
end_if_just_battled
opentext
@@ -105,34 +105,34 @@ PackIsFull:
end
TrainerPokefanfRuth:
- trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript
+ trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
-PokefanfRuthScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x1a5db2
+ writetext PokefanfRuthAfterBattleText
waitbutton
closetext
end
TrainerSailorEugene:
- trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript
+ trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
-SailorEugeneScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x1a5c4d
+ writetext SailorEugeneAfterBattleText
waitbutton
closetext
end
TrainerPsychicNorman:
- trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript
+ trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
-PsychicNormanScript:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x1a5e57
+ writetext PsychicNormanAfterBattleText
waitbutton
closetext
end
@@ -199,7 +199,7 @@ SailorEugeneBeatenText:
text "Awaaargh!"
done
-UnknownText_0x1a5c4d:
+SailorEugeneAfterBattleText:
text "My #MON were"
line "caught and raised"
cont "overseas."
@@ -245,7 +245,7 @@ PokefanfRuthBeatenText:
line "losing."
done
-UnknownText_0x1a5db2:
+PokefanfRuthAfterBattleText:
text "Do you know about"
line "baby #MON?"
@@ -269,7 +269,7 @@ PsychicNormanBeatenText:
line "have potential."
done
-UnknownText_0x1a5e57:
+PsychicNormanAfterBattleText:
text "You know how #-"
line "MON have different"
cont "abilities?"
@@ -353,25 +353,25 @@ Route39_MapEventHeader:
warp_def $3, $1, 1, ROUTE_39_BARN
warp_def $3, $5, 1, ROUTE_39_FARMHOUSE
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 4
- signpost 31, 5, SIGNPOST_READ, Route39TrainerTips
- signpost 5, 9, SIGNPOST_READ, MoomooFarmSign
- signpost 7, 15, SIGNPOST_READ, Route39Sign
- signpost 13, 5, SIGNPOST_ITEM, Route39HiddenNugget
+ bg_event 31, 5, BGEVENT_READ, Route39TrainerTips
+ bg_event 5, 9, BGEVENT_READ, MoomooFarmSign
+ bg_event 7, 15, BGEVENT_READ, Route39Sign
+ bg_event 13, 5, BGEVENT_ITEM, Route39HiddenNugget
-.PersonEvents:
+.ObjectEvents:
db 10
- person_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSailorEugene, -1
- person_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
- person_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
- person_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
- person_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
- person_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
- person_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, Route39Miltank, -1
- person_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerPsychicNorman, -1
- person_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
- person_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1
+ object_event SPRITE_SAILOR, 29, 13, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
+ object_event SPRITE_POKEFAN_M, 22, 10, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
+ object_event SPRITE_POKEFAN_F, 19, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
+ object_event SPRITE_TAUROS, 12, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+ object_event SPRITE_TAUROS, 11, 6, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+ object_event SPRITE_TAUROS, 15, 4, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+ object_event SPRITE_TAUROS, 13, 8, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
+ object_event SPRITE_STANDING_YOUNGSTER, 7, 13, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
+ object_event SPRITE_FRUIT_TREE, 3, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
+ object_event SPRITE_POKEFAN_F, 22, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1