From 75c7e67f00465b99550cd9bc69dec29d2166fe92 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jun 2022 19:02:11 -0400 Subject: [PATCH] Fix Museum_1F -> PokemonCenter_1F text --- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 10 +++++----- data/maps/PewterCity_PokemonCenter_1F/text.inc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 8cd8c3415..967257e90 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -15,7 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A76F end PewterCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A778 - msgbox PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 @@ -23,7 +23,7 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 faceplayer fadeoutbgm 0 playbgm MUS_JIGGLYPUFF, 0 - message PewterCity_Museum_1F_Text_Jigglypuff + message PewterCity_PokemonCenter_1F_Text_Jigglypuff waitmessage delay 455 playbgm MUS_POKE_CENTER, 1 @@ -31,15 +31,15 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A798 - msgbox PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: @ 816A7A1 lock - msgbox PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu + msgbox PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu release end PewterCity_PokemonCenter_1F_EventScript_GBAKid2:: @ 816A7AC - msgbox PewterCity_Museum_1F_Text_TradingPikachuWithKid, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid, MSGBOX_NPC end diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc index ebcfae41f..05c38cca1 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/text.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc @@ -1,25 +1,25 @@ -PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 +PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 .string "What!?\p" .string "TEAM ROCKET is at MT. MOON?\n" .string "Huh?\p" .string "I'm on the phone!\n" .string "Scram!$" -PewterCity_Museum_1F_Text_Jigglypuff:: @ 81916EA +PewterCity_PokemonCenter_1F_Text_Jigglypuff:: @ 81916EA .string "JIGGLYPUFF: Puu pupuu!$" -PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 +PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 .string "Yawn!\p" .string "When JIGGLYPUFF sings, POKéMON get\n" .string "drowsy…\p" .string "…Me, too…\n" .string "Snore…$" -PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 +PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 .string "I really want a PIKACHU, so I'm\n" .string "trading my CLEFAIRY for one.$" -PewterCity_Museum_1F_Text_TradingPikachuWithKid:: @ 8191780 +PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid:: @ 8191780 .string "I'm trading POKéMON with that kid\n" .string "there.\p" .string "I had two PIKACHU, so I figured\n"