Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 04:16:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2200 from mrgriffin/pret-implicit-waitstate

Browse Source 
Implicit waitstate for special/specialvars
This commit is contained in:
Martin Griffin
2026-04-21 15:54:10 +01:00
committed by GitHub
parent a09b745176 400788ddf6
commit 89ca861a3a
96 changed files with 132 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/scripts/berry_blender.inc
View File

@@ -300,7 +300,6 @@ BerryBlender_EventScript_DoBerryBlending:
copyvar VAR_0x8004, NUM_OPPONENTS
fadescreen FADE_TO_BLACK
special DoBerryBlending
waitstate
releaseall
end
@@ -565,7 +564,6 @@ BerryBlender_EventScript_TryDoLinkBlender:
message BerryBlender_Text_SearchingForFriends
waitmessage
special TryBerryBlenderLinkup
waitstate
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BerryBlender_EventScript_SpawnLinkPartners
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, BerryBlender_EventScript_CloseLinkNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, BerryBlender_EventScript_CloseLinkDifferentSelections
@@ -596,7 +594,6 @@ BerryBlender_EventScript_DoLinkBerryBlending:
removeobject 238
removeobject 237
special DoBerryBlending
waitstate
releaseall
end
@@ -689,12 +686,10 @@ BerryBlender_EventScript_TryJoinGroup:
BerryBlender_EventScript_TryBecomeLinkLeader:
special TryBecomeLinkLeader
waitstate
return
BerryBlender_EventScript_TryJoinLinkGroup:
special TryJoinLinkGroup
waitstate
return
BerryBlender_EventScript_LinkLeaderDecided:

2
data/scripts/berry_tree.inc
View File

@@ -39,7 +39,6 @@ BerryTree_EventScript_ChooseBerryToPlant::
fadescreen FADE_TO_BLACK
closemessage
special Bag_ChooseBerry
waitstate
goto_if_eq VAR_ITEM_ID, 0, BerryTree_EventScript_CancelPlanting
removeitem VAR_ITEM_ID
call BerryTree_EventScript_PlantBerry
@@ -165,7 +164,6 @@ BerryTree_EventScript_WaterBerry::
waitmessage
special ObjectEventInteractionWaterBerryTree
special DoWateringBerryTreeAnim
waitstate
message BerryTree_Text_PlantIsDelighted
waitmessage
waitbuttonpress

37
data/scripts/cable_club.inc
View File

@@ -327,7 +327,6 @@ CableClub_EventScript_TryEnterColosseum::
message gText_PleaseWaitForLink
waitmessage
special TryBattleLinkup
waitstate
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterColosseum
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, CableClub_EventScript_AbortLinkDifferentSelections
@@ -364,7 +363,6 @@ CableClub_EventScript_EnterColosseum::
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_2P, 6, 8
special DoCableClubWarp
waitstate
end
@ Unused
@@ -377,7 +375,6 @@ CableClub_EventScript_WarpTo4PColosseum::
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_4P, 5, 8
special DoCableClubWarp
waitstate
end
CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers::
@@ -421,7 +418,6 @@ CableClub_EventScript_TradeCenter::
message gText_PleaseWaitForLink
waitmessage
special TryTradeLinkup
waitstate
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterTradeCenter
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, CableClub_EventScript_AbortLinkDifferentSelections
@@ -457,7 +453,6 @@ CableClub_EventScript_EnterTradeCenter::
special SetCableClubWarp
setwarp MAP_TRADE_CENTER, 5, 8
special DoCableClubWarp
waitstate
end
CableClub_EventScript_CheckPartyTradeRequirements::
@@ -485,9 +480,7 @@ CableClub_EventScript_RecordCorner::
message gText_PleaseWaitForLink
waitmessage
special TryRecordMixLinkup
waitstate
special ValidateMixingGameLanguage
waitstate
goto_if_eq VAR_RESULT, LINKUP_FOREIGN_GAME, CableClub_EventScript_AbortLinkForeignGame
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterRecordCorner
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
@@ -522,7 +515,6 @@ CableClub_EventScript_EnterRecordCorner::
special SetCableClubWarp
setwarp MAP_RECORD_CORNER, 8, 9
special DoCableClubWarp
waitstate
end
CableClub_EventScript_AbortLinkPlayerNotReady::
@@ -571,7 +563,6 @@ MossdeepCity_GameCorner_1F_EventScript_AbortMinigame::
CableClub_EventScript_CableClubWarp::
special SetCableClubWarp
special DoCableClubWarp
waitstate
end
CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants::
@@ -665,53 +656,43 @@ EventScript_CableBoxResults::
EventScript_BattleColosseum_2P_PlayerSpot0::
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_2P_PlayerSpot1::
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_4P_PlayerSpot0::
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
goto_if_eq VAR_RESULT, 0, EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 0
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_4P_PlayerSpot1::
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
goto_if_eq VAR_RESULT, 0, EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 1
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_4P_PlayerSpot2::
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
goto_if_eq VAR_RESULT, 0, EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 2
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_4P_PlayerSpot3::
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
goto_if_eq VAR_RESULT, 0, EventScript_BattleColosseum_4P_CancelSpotTrigger
setvar VAR_0x8005, 3
special ColosseumPlayerSpotTriggered
waitstate
end
EventScript_BattleColosseum_4P_CancelSpotTrigger::
@@ -720,54 +701,46 @@ EventScript_BattleColosseum_4P_CancelSpotTrigger::
EventScript_TradeCenter_Chair0::
setvar VAR_0x8005, 0
special PlayerEnteredTradeSeat
waitstate
end
EventScript_TradeCenter_Chair1::
setvar VAR_0x8005, 1
special PlayerEnteredTradeSeat
waitstate
end
/* Never used */
EventScript_TradeCenter_Chair2::
setvar VAR_0x8005, 2
special PlayerEnteredTradeSeat
waitstate
end
/* Never used */
EventScript_TradeCenter_Chair3::
setvar VAR_0x8005, 3
special PlayerEnteredTradeSeat
waitstate
end
EventScript_RecordCenter_Spot0::
setvar VAR_0x8005, 0
special RecordMixingPlayerSpotTriggered
waitstate
goto_if_ne VAR_TEMP_RECORD_MIX_GIFT_ITEM, ITEM_NONE, RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot1::
setvar VAR_0x8005, 1
special RecordMixingPlayerSpotTriggered
waitstate
goto_if_ne VAR_TEMP_RECORD_MIX_GIFT_ITEM, ITEM_NONE, RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot2::
setvar VAR_0x8005, 2
special RecordMixingPlayerSpotTriggered
waitstate
goto_if_ne VAR_TEMP_RECORD_MIX_GIFT_ITEM, ITEM_NONE, RecordCorner_EventScript_ReceivedGiftItem
end
EventScript_RecordCenter_Spot3::
setvar VAR_0x8005, 3
special RecordMixingPlayerSpotTriggered
waitstate
goto_if_ne VAR_TEMP_RECORD_MIX_GIFT_ITEM, ITEM_NONE, RecordCorner_EventScript_ReceivedGiftItem
end
@@ -783,14 +756,12 @@ CableClub_EventScript_ReadTrainerCard::
msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
special Script_ShowLinkTrainerCard
waitstate
end
CableClub_EventScript_ReadTrainerCardColored::
msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
special Script_ShowLinkTrainerCard
waitstate
end
CableClub_EventScript_TooBusyToNotice::
@@ -847,7 +818,6 @@ EventScript_TerminateLink::
EventScript_DoLinkRoomExit::
special CleanupLinkRoomState
special ReturnFromLinkRoom
waitstate
end
CableClub_EventScript_UnionRoomAttendant::
@@ -1175,12 +1145,10 @@ CableClub_EventScript_TryJoinGroupXPlayers::
CableClub_EventScript_TryBecomeLinkLeader::
special TryBecomeLinkLeader
waitstate
return
CableClub_EventScript_TryJoinLinkGroup::
special TryJoinLinkGroup
waitstate
return
CableClub_EventScript_EnterWirelessLinkRoom::
@@ -1216,7 +1184,6 @@ EventScript_WirelessBoxResults::
goto_if_eq VAR_RESULT, FALSE, CableClub_EventScript_AdapterNotConnected
fadescreen FADE_TO_BLACK
special ShowWirelessCommunicationScreen
waitstate
msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT
releaseall
end
@@ -1314,7 +1281,6 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump::
fadescreen FADE_TO_BLACK
setvar VAR_0x8005, 0
special ChooseMonForWirelessMinigame
waitstate
goto_if_ge VAR_0x8004, PARTY_SIZE, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
call Common_EventScript_SaveGame
goto_if_eq VAR_RESULT, 0, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
@@ -1330,7 +1296,6 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking::
fadescreen FADE_TO_BLACK
setvar VAR_0x8005, 1
special ChooseMonForWirelessMinigame
waitstate
goto_if_ge VAR_0x8004, PARTY_SIZE, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
call Common_EventScript_SaveGame
goto_if_eq VAR_RESULT, 0, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
@@ -1410,13 +1375,11 @@ MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements::
MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords::
lockall
special ShowPokemonJumpRecords
waitstate
releaseall
end
MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords::
lockall
special ShowDodrioBerryPickingRecords
waitstate
releaseall
end

1
data/scripts/cave_hole.inc
View File

@@ -29,7 +29,6 @@ EventScript_FallDownHoleMtPyre::
playse SE_FALL
delay 60
special DoFallWarp
waitstate
end
Movement_SetInvisible:

1
data/scripts/contest_hall.inc
View File

@@ -312,7 +312,6 @@ ContestHall_EventScript_TryWaitForLink::
ContestHall_EventScript_WaitForLink::
special LinkContestWaitForConnection
waitstate
return
ContestHall_EventScript_ContestantWalkToCenter::

4
data/scripts/day_care.inc
View File

@@ -91,7 +91,6 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise::
msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, Route117_PokemonDayCare_EventScript_ComeAgain
specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
goto_if_eq VAR_RESULT, 0, Route117_PokemonDayCare_EventScript_OnlyOneAliveMon
@@ -165,7 +164,6 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon::
setvar VAR_0x8004, 0
goto_if_eq VAR_RESULT, DAYCARE_ONE_MON, Route117_PokemonDayCare_EventScript_CostPrompt
special ShowDaycareLevelMenu
waitstate
copyvar VAR_0x8004, VAR_RESULT
goto_if_eq VAR_RESULT, DAYCARE_EXITED_LEVEL_MENU, Route117_PokemonDayCare_EventScript_ComeAgain
goto Route117_PokemonDayCare_EventScript_CostPrompt
@@ -253,7 +251,6 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare::
@ Unused
Route117_PokemonDayCare_EventScript_UnusedRetrieveMon::
special ShowDaycareLevelMenu
waitstate
goto_if_eq VAR_RESULT, 2, Route117_PokemonDayCare_EventScript_ComeAgain
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
@@ -266,7 +263,6 @@ EventScript_EggHatch::
lockall
msgbox Text_EggHatchHuh, MSGBOX_DEFAULT
special EggHatch
waitstate
releaseall
end

5
data/scripts/field_poison.inc
View File

@@ -1,7 +1,6 @@
EventScript_FieldPoison::
lockall
special TryFieldPoisonWhiteOut
waitstate
goto_if_eq VAR_RESULT, FLDPSN_WHITEOUT, EventScript_FieldWhiteOut
goto_if_eq VAR_RESULT, FLDPSN_FRONTIER_WHITEOUT, EventScript_FrontierFieldWhiteOut
releaseall
@@ -12,11 +11,9 @@ EventScript_FieldWhiteOut::
waitmessage
waitbuttonpress
special Script_FadeOutMapMusic
waitstate
fadescreen FADE_TO_BLACK
call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter
special SetCB2WhiteOut
waitstate
end
EventScript_SetRespawnLavaridgePkmnCenter::
@@ -35,8 +32,6 @@ EventScript_FrontierFieldWhiteOut::
trainerhill_inchallenge
goto_if_eq VAR_RESULT, TRUE, TrainerHill_1F_EventScript_Lost
special Script_FadeOutMapMusic
waitstate
fadescreen FADE_TO_BLACK
special SetCB2WhiteOut
waitstate
end

6
data/scripts/lilycove_lady.inc
View File

@@ -67,7 +67,6 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem::
fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0
special Script_FavorLadyOpenBagMenu
waitstate
goto_if_eq VAR_RESULT, 0, LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem
goto_if_eq VAR_RESULT, 1, LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem
end
@@ -189,13 +188,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState::
LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion::
special QuizLadyShowQuizQuestion
waitstate
goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
end
LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer::
special QuizLadyGetPlayerAnswer
waitstate
goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
end
@@ -287,7 +284,6 @@ LilycoveCity_PokemonCenter_1F_EventScript_PickPrize::
fadescreen FADE_TO_BLACK
setvar VAR_RESULT, 0
special Script_QuizLadyOpenBagMenu
waitstate
goto_if_eq VAR_RESULT, 0, LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize
goto_if_eq VAR_RESULT, 1, LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz
end
@@ -306,7 +302,6 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz::
LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion::
fadescreen FADE_TO_BLACK
special QuizLadySetCustomQuestion
waitstate
goto_if_eq VAR_RESULT, 0, LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion
goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz
end
@@ -364,7 +359,6 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock::
LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock::
fadescreen FADE_TO_BLACK
special OpenPokeblockCaseForContestLady
waitstate
goto_if_eq VAR_RESULT, 0xFFFF, LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock
goto_if_ne VAR_RESULT, 0xFFFF, LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock
end

3
data/scripts/mauville_man.inc
View File

@@ -169,7 +169,6 @@ MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded::
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
special TraderMenuGetDecoration
waitstate
goto_if_eq VAR_0x8004, 0, MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor
goto_if_eq VAR_0x8004, 0xFFFF, MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor
msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO
@@ -204,7 +203,6 @@ MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor::
MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive::
msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT
special TraderShowDecorationMenu
waitstate
goto_if_eq VAR_0x8006, 0, MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor
goto_if_eq VAR_0x8006, 0xFFFF, MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse
special IsDecorationCategoryFull
@@ -803,7 +801,6 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller::
message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell
waitmessage
special StorytellerStoryListMenu
waitstate
goto_if_eq VAR_RESULT, 0, MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection
setvar VAR_0x8008, 1
special Script_StorytellerDisplayStory

1
data/scripts/move_tutors.inc
View File

@@ -260,7 +260,6 @@ MoveTutor_EventScript_ExplosionTaught::
MoveTutor_EventScript_OpenPartyMenu::
special ChooseMonForMoveTutor
waitstate
lock
faceplayer
return

4
data/scripts/pc.inc
View File

@@ -11,7 +11,6 @@ EventScript_PCMainMenu::
message gText_WhichPCShouldBeAccessed
waitmessage
special ScriptMenu_CreatePCMultichoice
waitstate
goto EventScript_AccessPC
end
@@ -28,7 +27,6 @@ EventScript_AccessPlayersPC::
playse SE_PC_LOGIN
msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
special PlayerPC
waitstate
goto EventScript_PCMainMenu
end
@@ -38,7 +36,6 @@ EventScript_AccessPokemonStorage::
call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
msgbox gText_StorageSystemOpened, MSGBOX_DEFAULT
special ShowPokemonStorageSystemPC
waitstate
goto EventScript_PCMainMenu
end
@@ -61,6 +58,5 @@ EventScript_AccessHallOfFame::
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
special AccessHallOfFamePC
waitstate
goto EventScript_AccessPC
end

1
data/scripts/pc_transfer.inc
View File

@@ -8,7 +8,6 @@ Common_EventScript_GetGiftMonPartySlot::
Common_EventScript_NameReceivedBoxMon::
fadescreen FADE_TO_BLACK
special ChangeBoxPokemonNickname
waitstate
lock
faceplayer
return

2
data/scripts/players_house.inc
View File

@@ -99,14 +99,12 @@ PlayersHouse_2F_EventScript_CheckWallClock::
incrementgamestat GAME_STAT_CHECKED_CLOCK
fadescreen FADE_TO_BLACK
special Special_ViewWallClock
waitstate
releaseall
end
PlayersHouse_2F_EventScript_SetWallClock::
fadescreen FADE_TO_BLACK
special StartWallClock
waitstate
return
PlayersHouse_2F_Movement_MomEntersMale:

1
data/scripts/record_mix.inc
View File

@@ -9,7 +9,6 @@ EventScript_MixRecordsPrompt::
EventScript_MixRecords::
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer
EventScript_EndMixRecords::

1
data/scripts/roulette.inc
View File

@@ -20,7 +20,6 @@ Roulette_EventScript_Table2::
Roulette_EventScript_Play::
special PlayRoulette
waitstate
end
Roulette_Text_PlayMinimumWagerIsX::

1
data/scripts/safari_zone.inc
View File

@@ -51,7 +51,6 @@ EventScript_PokeBlockFeeder::
SafariZone_EventScript_ChoosePokeblock::
fadescreen FADE_TO_BLACK
special OpenPokeblockCaseOnFeeder
waitstate
goto_if_ne VAR_RESULT, 0xFFFF, SafariZone_EventScript_PokeblockPlaced
#ifdef BUGFIX
releaseall @ Only gets called from EventScript_PokeBlockFeeder which uses lockall.

2
data/scripts/secret_base.inc
View File

@@ -158,7 +158,6 @@ SecretBase_EventScript_SetAsBase::
closemessage
setflag FLAG_RECEIVED_SECRET_POWER
special EnterNewlyCreatedSecretBase
waitstate
end
SecretBase_Movement_EnterBase:
@@ -641,7 +640,6 @@ SecretBase_EventScript_BattleTrainer::
setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
setvar VAR_0x8005, 0
special DoSpecialTrainerBattle
waitstate
call_if_eq VAR_RESULT, B_OUTCOME_DREW, SecretBase_EventScript_DrewSecretBaseBattle
call_if_eq VAR_RESULT, B_OUTCOME_WON, SecretBase_EventScript_WonSecretBaseBattle
call_if_eq VAR_RESULT, B_OUTCOME_LOST, SecretBase_EventScript_LostSecretBaseBattle

1
data/scripts/std_msgbox.inc
View File

@@ -45,5 +45,4 @@ EventScript_UnusedReturn:
Common_EventScript_SaveGame::
special SaveGame
waitstate
return

3
data/scripts/trainer_battle.inc
View File

@@ -4,7 +4,6 @@ EventScript_StartTrainerApproach::
EventScript_TrainerApproach::
special PlayTrainerEncounterMusic
special DoTrainerApproach
waitstate
goto EventScript_ShowTrainerIntroMsg
EventScript_TryDoNormalTrainerBattle::
@@ -60,7 +59,6 @@ EventScript_TryDoRematchBattle::
waitmessage
waitbuttonpress
special BattleSetup_StartRematchBattle
waitstate
releaseall
end
@@ -78,7 +76,6 @@ EventScript_TryDoDoubleRematchBattle::
waitmessage
waitbuttonpress
special BattleSetup_StartRematchBattle
waitstate
releaseall
end