summaryrefslogtreecommitdiff
path: root/maps/Route6.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route6.asm')
-rw-r--r--maps/Route6.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route6.asm b/maps/Route6.asm
index 583398c9b..abf56e013 100644
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -11,9 +11,9 @@ Route6_MapScriptHeader:
db 0
TrainerPokefanmRex:
- trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript
+ trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
-PokefanmRexScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmRexAfterBattleText
@@ -22,9 +22,9 @@ PokefanmRexScript:
end
TrainerPokefanmAllan:
- trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript
+ trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
-PokefanmAllanScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmAllanAfterBattleText
@@ -32,13 +32,13 @@ PokefanmAllanScript:
closetext
end
-PokefanMScript_0x1ad951:
- jumptextfaceplayer UnknownText_0x1ad957
+Route6PokefanMScript:
+ jumptextfaceplayer Route6PokefanMText
Route6UndergroundPathSign:
jumptext Route6UndergroundPathSignText
-UnknownText_0x1ad957:
+Route6PokefanMText:
text "The road is closed"
line "until the problem"
@@ -109,6 +109,6 @@ Route6_MapEventHeader:
.PersonEvents:
db 3
- person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
+ person_event SPRITE_POKEFAN_M, 4, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_SCRIPT, 2, Route6PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
person_event SPRITE_POKEFAN_M, 12, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmRex, -1
person_event SPRITE_POKEFAN_M, 12, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_TRAINER, 0, TrainerPokefanmAllan, -1