diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 795c3fabe..647927050 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,15 +1,15 @@ .set LOCALID_NURSE, 1 -BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 +BattleFrontier_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904 +BattleFrontier_PokemonCenter_1F_OnTransition: setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST end -BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908 +BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: setvar VAR_0x800B, LOCALID_NURSE call Common_EventScript_PkmnCenterNurse waitmessage @@ -17,19 +17,19 @@ BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908 release end -BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916 +BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F +BattleFrontier_PokemonCenter_1F_EventScript_Man:: msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928 +BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC end -BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931 +BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: lock faceplayer waitse @@ -39,7 +39,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931 release end -BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944 +BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: .string "There was someone here using a \n" .string "POKéMON I've never seen before.\p" .string "I never learned about it at\n" @@ -47,15 +47,15 @@ BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944 .string "I wonder where you can catch POKéMON\n" .string "like that.$" -BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB +BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: .string "Okay! Next stop, the BATTLE ARENA!\n" .string "I'd better get the right POKéMON from\l" .string "the PC Storage System.$" -BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B +BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: .string "Giggle… I'm going to go through every\n" .string "challenge with just this baby!$" -BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90 +BattleFrontier_PokemonCenter_1F_Text_Skitty: .string "SKITTY: Mya myaaah!$" |