summaryrefslogtreecommitdiff
path: root/maps/Route40.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route40.asm')
-rw-r--r--maps/Route40.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 5e37a7bf5..4d58dfe98 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -76,13 +76,13 @@ TrainerSwimmermRandall:
Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
-PokefanMScript_0x1a61c7:
+Route40PokefanMScript:
special Mobile_DummyReturnFalse
iftrue .mobile
- jumptextfaceplayer UnknownText_0x1a646a
+ jumptextfaceplayer Route40PokefanMText
.mobile
- jumptextfaceplayer UnknownText_0x1a649b
+ jumptextfaceplayer Route40PokefanMText_Mobile
Route40Lass2Script:
jumptextfaceplayer Route40Lass2Text
@@ -241,14 +241,14 @@ Route40Lass1Text:
line "the sea."
done
-UnknownText_0x1a646a:
+Route40PokefanMText:
text "Hm! There's a big"
line "building up ahead!"
para "What is it?"
done
-UnknownText_0x1a649b:
+Route40PokefanMText_Mobile:
text "Hm! Look at all"
line "those serious-"
cont "looking trainers"
@@ -357,6 +357,6 @@ Route40_MapEvents:
object_event 7, 8, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Rock, -1
object_event 11, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40Lass1Script, -1
object_event 8, 10, SPRITE_BUENA, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY
- object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x1a61c7, -1
+ object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route40PokefanMScript, -1
object_event 13, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route40Lass2Script, -1
object_event 16, 9, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route40StandingYoungsterScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR