dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PewterCity_PokemonCenter_1F/scripts.inc
+13 -13
View File
@@ -1,45 +1,45 @@
PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760
PewterCity_PokemonCenter_1F_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
.byte 0
PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B
PewterCity_PokemonCenter_1F_OnTransition::
setrespawn SPAWN_PEWTER_CITY
end
PewterCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A76F
PewterCity_PokemonCenter_1F_EventScript_Nurse::
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
PewterCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A778
msgbox PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC
PewterCity_PokemonCenter_1F_EventScript_Gentleman::
msgbox PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC
end
PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781
PewterCity_PokemonCenter_1F_EventScript_Jigglypuff::
lock
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
release
end
PewterCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A798
msgbox PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC
PewterCity_PokemonCenter_1F_EventScript_Youngster::
msgbox PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC
end
PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: @ 816A7A1
PewterCity_PokemonCenter_1F_EventScript_GBAKid1::
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
PewterCity_PokemonCenter_1F_EventScript_GBAKid2::
msgbox PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid, MSGBOX_NPC
end
data/maps/PewterCity_PokemonCenter_1F/text.inc
+5 -5
View File
@@ -1,25 +1,25 @@
PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9
PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone::
.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::
.string "JIGGLYPUFF: Puu pupuu!$"
PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701
PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy::
.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::
.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::
.string "I'm trading POKéMON with that kid\n"
.string "there.\p"
.string "I had two PIKACHU, so I figured\n"