diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/FourIsland_PokemonCenter_1F | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/FourIsland_PokemonCenter_1F')
| -rw-r--r-- | data/maps/FourIsland_PokemonCenter_1F/scripts.inc | 14 | ||||
| -rw-r--r-- | data/maps/FourIsland_PokemonCenter_1F/text.inc | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index cc4cb5ffa..4ee8e33c1 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA - map_script 3, FourIsland_PokemonCenter_1F_MapScript1_171BF5 - map_script 5, FourIsland_PokemonCenter_1F_MapScript2_1BC05C + map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FourIsland_PokemonCenter_1F_MapScript1_171BF5:: @ 8171BF5 +FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 setrespawn SPAWN_FOUR_ISLAND end FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9 lock faceplayer - call EventScript_1A6578 + call EventScript_PkmnCenterNurse release end FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02 - msgbox gUnknown_81A3627, 2 + msgbox gUnknown_81A3627, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B - msgbox gUnknown_81A3697, 2 + msgbox gUnknown_81A3697, MSGBOX_NPC end FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14 - msgbox gUnknown_81A3734, 2 + msgbox gUnknown_81A3734, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 59beaf443..954aabd96 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -Text_1A3505:: @ 81A3505 +Text_BodySlamTeach:: @ 81A3505 .string "Ready?\n" .string "Boing!\p" .string "We're having a BODY SLAM match\n" @@ -8,15 +8,15 @@ Text_1A3505:: @ 81A3505 .string "How about I teach BODY SLAM to\n" .string "a POKéMON of yours instead?$" -Text_1A35C7:: @ 81A35C7 +Text_BodySlamDeclined:: @ 81A35C7 .string "Come again!\n" .string "Boing!$" -Text_1A35DA:: @ 81A35DA +Text_BodySlamWhichMon:: @ 81A35DA .string "Which POKéMON wants to learn how\n" .string "to BODY SLAM?$" -Text_1A3609:: @ 81A3609 +Text_BodySlamTaught:: @ 81A3609 .string "Boioing!$" Text_1A3612:: @ 81A3612 |