summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-14 21:52:58 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-06-14 21:52:58 -0400
commit5a8dc2b1039b7bac86a195c757037ac68cc71162 (patch)
tree76eb9c4fb3699eec4ba9aae00e6b5bdc80e94806
parentcf9f4a1745f4e0a805094bce2fa819a0fb7adaea (diff)
Sync PlayersHouse1F labels with pokecrystal
-rw-r--r--maps/PlayersHouse1F.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index b9b109ed..69f8e367 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -119,17 +119,17 @@ MomScript:
closetext
end
-TVMovieScript:
- jumptext TVMovieText
+PlayersHouse1FTVScript:
+ jumptext PlayersHouse1FTVText
-StoveScript:
- jumptext StoveText
+PlayersHouse1FStoveScript:
+ jumptext PlayersHouse1FStoveText
-SinkScript:
- jumptext SinkText
+PlayersHouse1FSinkScript:
+ jumptext PlayersHouse1FSinkText
-FridgeScript:
- jumptext FridgeText
+PlayersHouse1FFridgeScript:
+ jumptext PlayersHouse1FFridgeText
PlayersHouseDownstairsMovement:
step DOWN
@@ -255,20 +255,20 @@ ImBehindYouText:
line "the way!"
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…"
@@ -276,7 +276,7 @@ FridgeText:
line "tasty LEMONADE!"
done
-TVMovieText:
+PlayersHouse1FTVText:
text "There's a movie on"
line "TV: Stars dot the"
@@ -298,10 +298,10 @@ PlayersHouse1F_MapEvents:
db 0 ; coord events
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, TVMovieScript
+ 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 4 ; object events
object_event 7, 3, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript, EVENT_PLAYERS_HOUSE_MOM_1