diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-14 15:07:16 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-14 15:07:16 +0200 |
| commit | 84936b4260f2864fe143415c6ca92e4b1704e4fe (patch) | |
| tree | fded752e2492313082f6c61c930036c0d0a03b2d /data/maps | |
| parent | 145df4906326488874b3f75ef96f99e85b18f2a0 (diff) | |
| parent | 0c1d33da4f6db7b90913586a39ed60ea2b13f39e (diff) | |
Merge branch 'master' into apprentice
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 2b07b7ea4..e0f2c3c5e 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7 BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 setvar VAR_0x8004, 9 - message OldaleTown_PokemonCenter_2F_Text_278091 + message gText_PleaseWaitForLink waitmessage setvar VAR_0x8005, 0 special sub_80B2DA4 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 0052f09aa..36bfc422a 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 - special sub_80F94E8 + special ReducePlayerPartyToThree setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 652ac791a..36d0edd3a 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty - special sub_80F94E8 + special ReducePlayerPartyToThree msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 closemessage compare VAR_FACING, 2 |