summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/PlayersHouse1F.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index de60497a2..1e8f5e1c9 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -182,17 +182,17 @@ NeighborScript:
turnobject PLAYERSHOUSE1F_POKEFAN_F, RIGHT
end
-TVScript:
- jumptext TVText
+PlayersHouse1FTVScript:
+ jumptext PlayersHouse1FTVText
-StoveScript:
- jumptext StoveText
+PlayersHouse1FStoveScript:
+ jumptext PlayersHouse1FStoveText
-SinkScript:
- jumptext SinkText
+PlayersHouse1FSinkScript:
+ jumptext PlayersHouse1FSinkText
-FridgeScript:
- jumptext FridgeText
+PlayersHouse1FFridgeScript:
+ jumptext PlayersHouse1FFridgeText
MomTurnsTowardPlayerMovement:
turn_head RIGHT
@@ -351,20 +351,20 @@ NeighborText:
line "#MON!"
done
-StoveText:
+PlayersHouse1FStoveText:
text "Mom's specialty!"
para "CINNABAR VOLCANO"
line "BURGER!"
done
-SinkText:
+PlayersHouse1FSinkText:
text "The sink is spot-"
line "less. Mom likes it"
cont "clean."
done
-FridgeText:
+PlayersHouse1FFridgeText:
text "Let's see what's"
line "in the fridge…"
@@ -372,7 +372,7 @@ FridgeText:
line "tasty LEMONADE!"
done
-TVText:
+PlayersHouse1FTVText:
text "There's a movie on"
line "TV: Stars dot the"
@@ -396,10 +396,10 @@ PlayersHouse1F_MapEvents:
coord_event 9, 4, SCENE_DEFAULT, MeetMomRightScript
db 4 ; bg events
- bg_event 0, 1, BGEVENT_READ, StoveScript
- bg_event 1, 1, BGEVENT_READ, SinkScript
- bg_event 2, 1, BGEVENT_READ, FridgeScript
- bg_event 4, 1, BGEVENT_READ, TVScript
+ bg_event 0, 1, BGEVENT_READ, PlayersHouse1FStoveScript
+ bg_event 1, 1, BGEVENT_READ, PlayersHouse1FSinkScript
+ bg_event 2, 1, BGEVENT_READ, PlayersHouse1FFridgeScript
+ bg_event 4, 1, BGEVENT_READ, PlayersHouse1FTVScript
db 5 ; object events
object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1