summaryrefslogtreecommitdiff
path: root/maps/FuchsiaBillSpeechHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FuchsiaBillSpeechHouse.asm')
-rw-r--r--maps/FuchsiaBillSpeechHouse.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm
index 7abec5a1e..3a0758a39 100644
--- a/maps/FuchsiaBillSpeechHouse.asm
+++ b/maps/FuchsiaBillSpeechHouse.asm
@@ -3,25 +3,25 @@ const_value set 2
const FUCHSIABILLSPEECHHOUSE_YOUNGSTER
FuchsiaBillSpeechHouse_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
db 0
-PokefanFScript_0x1963bd:
- jumptextfaceplayer UnknownText_0x1963c3
+FuchsiaBillSpeechHousePokefanFScript:
+ jumptextfaceplayer FuchsiaBillSpeechHousePokefanFText
-YoungsterScript_0x1963c0:
- jumptextfaceplayer UnknownText_0x1963f9
+FuchsiaBillSpeechHouseYoungsterScript:
+ jumptextfaceplayer FuchsiaBillSpeechHouseYoungsterText
-UnknownText_0x1963c3:
+FuchsiaBillSpeechHousePokefanFText:
text "My grandpa is at "
line "my brother BILL's"
cont "on CERULEAN CAPE."
done
-UnknownText_0x1963f9:
+FuchsiaBillSpeechHouseYoungsterText:
text "I saw these weird,"
line "slow #MON on"
cont "CYCLING ROAD."
@@ -36,13 +36,13 @@ FuchsiaBillSpeechHouse_MapEventHeader:
warp_def $7, $2, 4, FUCHSIA_CITY
warp_def $7, $3, 4, FUCHSIA_CITY
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 0
-.PersonEvents:
+.ObjectEvents:
db 2
- person_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x1963bd, -1
- person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x1963c0, -1
+ object_event SPRITE_POKEFAN_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHousePokefanFScript, -1
+ object_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FuchsiaBillSpeechHouseYoungsterScript, -1