diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 3204d1781e80..18225256f3ce 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1675,11 +1675,13 @@ .macro moverotatingtileobjects puzzleNumber:req .byte SCR_OP_MOVEROTATINGTILEOBJECTS .2byte \puzzleNumber + waitmovement .endm @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Updates the facing direction of all objects on the puzzle tiles .macro turnrotatingtileobjects .byte SCR_OP_TURNROTATINGTILEOBJECTS + waitmovement .endm @ For the rotating tile puzzles in Mossdeep Gym / Trick House Room 7. Allocates memory for the puzzle objects. @@ -1992,3 +1994,9 @@ setvar VAR_0x8006, \item special CreateEnemyEventMon .endm + + @ Applies a movement to an object and waits for it to finish. + .macro applywaitmovement localId:req, movements:req, map + applymovement \localId, \movements, \map + waitmovement + .endm diff --git a/data/event_scripts.s b/data/event_scripts.s index a6bd29347cda..13b71989b257 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -750,8 +750,7 @@ Common_EventScript_StopBrineysBoatMusic:: @ Below could be split as ferry.inc aside from the Rusturf tunnel script Common_EventScript_FerryDepart:: delay 60 - applymovement VAR_0x8004, Movement_FerryDepart - waitmovement 0 + applywaitmovement VAR_0x8004, Movement_FerryDepart return Movement_FerryDepart: @@ -787,12 +786,10 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: EventScript_UnusedBoardFerry:: delay 30 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp showplayer delay 30 - applymovement LOCALID_PLAYER, Movement_UnusedBoardFerry - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_UnusedBoardFerry delay 30 return diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index dab7a4d5366b..7765cdd7987f 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -14,10 +14,8 @@ AquaHideout_B2F_EventScript_MattNoticePlayer:: lockall setvar VAR_0x8008, LOCALID_AQUA_HIDEOUT_MATT playse SE_PIN - applymovement VAR_0x8008, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8008, Common_Movement_FacePlayer setvar VAR_TEMP_1, 1 releaseall end @@ -31,11 +29,9 @@ AquaHideout_B2F_EventScript_Matt:: AquaHideout_B2F_EventScript_SubmarineEscape:: setvar VAR_0x8008, LOCALID_AQUA_HIDEOUT_MATT setvar VAR_0x8009, LOCALID_AQUA_HIDEOUT_SUBMARINE - applymovement VAR_0x8008, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_WalkInPlaceFasterLeft delay 20 - applymovement VAR_0x8008, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FacePlayer msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, Common_Movement_WalkInPlaceFasterLeft @@ -43,8 +39,7 @@ AquaHideout_B2F_EventScript_SubmarineEscape:: waitmovement 0 removeobject VAR_0x8009 delay 20 - applymovement VAR_0x8008, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FacePlayer msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 90a846fceae5..84b6ed0a5f73 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -39,8 +39,7 @@ BattleFrontier_BattleArenaBattleRoom_OnFrame: BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: lockall showobjectat LOCALID_ARENA_BATTLE_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - applymovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter frontier_get FRONTIER_DATA_BATTLE_NUM goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers applymovement LOCALID_ARENA_BATTLE_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown @@ -52,16 +51,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: tower_setopponent addobject LOCALID_ARENA_BATTLE_OPPONENT - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter applymovement LOCALID_ARENA_BATTLE_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_M_BELLY_DRUM waitse waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward applymovement LOCALID_ARENA_BATTLE_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_M_BELLY_DRUM waitse @@ -69,8 +66,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: arena_gettrainername msgbox BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward applymovement LOCALID_ARENA_BATTLE_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_M_BELLY_DRUM waitse @@ -270,8 +266,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: waitmovement 0 msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong applymovement LOCALID_ARENA_BATTLE_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown playse SE_M_BELLY_DRUM waitse @@ -279,10 +274,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT closemessage addobject LOCALID_ARENA_BATTLE_OPPONENT - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter - waitmovement 0 - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward switch VAR_TEMP_F case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver @@ -292,12 +285,10 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer msgbox BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter msgbox BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver:: msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT @@ -309,8 +300,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner frontier_getsymbols goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol @@ -326,12 +316,10 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer msgbox BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter msgbox BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold:: msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT @@ -343,8 +331,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner frontier_getsymbols goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon - applymovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong - waitmovement 0 + applywaitmovement LOCALID_ARENA_BATTLE_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index 9b0a1d55ac8b..89cff15710f7 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -12,13 +12,10 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: applymovement LOCALID_ARENA_CORRIDOR_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor waitmovement 0 - applymovement LOCALID_ARENA_CORRIDOR_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer - waitmovement 0 + applywaitmovement LOCALID_ARENA_CORRIDOR_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN - applymovement LOCALID_ARENA_CORRIDOR_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor - waitmovement 0 + applywaitmovement LOCALID_ARENA_CORRIDOR_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor setvar VAR_0x8006, 0 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 7, 5 waitstate diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index e03104020d17..2efe6d16cb26 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -44,8 +44,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: lockall call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum call_if_eq VAR_RESULT, DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat - applymovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown - waitmovement 0 + applywaitmovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown call BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome, MSGBOX_DEFAULT closemessage @@ -88,20 +87,16 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: playse SE_M_ENCORE2 call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround delay 60 - applymovement LOCALID_DOME_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter - waitmovement 0 - applymovement LOCALID_DOME_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft - waitmovement 0 + applywaitmovement LOCALID_DOME_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter + applywaitmovement LOCALID_DOME_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft delay 180 - applymovement LOCALID_DOME_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit - waitmovement 0 + applywaitmovement LOCALID_DOME_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit goto_if_eq VAR_TEMP_2, DRAW_TUCKER, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent @ Tucker always wins on a draw dome_compareseeds switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: - applymovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown - waitmovement 0 + applywaitmovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown dome_getopponentname call_if_eq VAR_TEMP_2, NO_DRAW, BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon call_if_eq VAR_TEMP_2, DRAW_TRAINER, BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw @@ -133,8 +128,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw:: return BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: - applymovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown - waitmovement 0 + applywaitmovement LOCALID_DOME_ANNOUNCER, Common_Movement_WalkInPlaceDown call_if_eq VAR_TEMP_2, NO_DRAW, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon call_if_eq VAR_TEMP_2, DRAW_TRAINER, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw playse SE_M_ENCORE2 @@ -152,8 +146,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: waitstate BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: - applymovement LOCALID_DOME_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience - waitmovement 0 + applywaitmovement LOCALID_DOME_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience frontier_get FRONTIER_DATA_LVL_MODE switch VAR_RESULT case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney @@ -382,8 +375,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: frontier_getsymbols goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney closemessage - applymovement LOCALID_DOME_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_DOME_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol @@ -410,8 +402,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: frontier_getsymbols goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney closemessage - applymovement LOCALID_DOME_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_DOME_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index bab3816d267c..2f196693532f 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -227,15 +227,13 @@ BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge:: BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor - applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor waitdooranim call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor - applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor waitdooranim diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 3b8249b18015..407dc5a1711d 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -20,8 +20,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE setvar VAR_TEMP_0, 1 - applymovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter lockall BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage @@ -147,14 +146,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: dome_setopponent msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DOME_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor - waitmovement 0 + applywaitmovement LOCALID_DOME_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor opendoor 5, 1 waitdooranim - applymovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor closedoor 5, 1 waitdooranim warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 9, 5 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 4a5346ec942f..085db8dd8a9a 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -69,8 +69,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: removeobject LOCALID_FACTORY_BATTLE_OPPONENT setobjectxyperm LOCALID_FACTORY_BATTLE_OPPONENT, 7, 1 addobject LOCALID_FACTORY_BATTLE_OPPONENT - applymovement LOCALID_FACTORY_BATTLE_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_FACTORY_BATTLE_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: goto_if_ne VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland palace_getopponentintro @@ -130,8 +129,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FACTORY_BATTLE_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland - waitmovement 0 + applywaitmovement LOCALID_FACTORY_BATTLE_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol waitmessage @@ -156,8 +154,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland msgbox BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass, MSGBOX_DEFAULT waitmessage - applymovement LOCALID_FACTORY_BATTLE_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland - waitmovement 0 + applywaitmovement LOCALID_FACTORY_BATTLE_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland playfanfare MUS_OBTAIN_SYMBOL message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine waitmessage diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 07962bed2a9d..c417def08711 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -64,12 +64,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: waitse msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FACTORY_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall - waitmovement 0 + applywaitmovement LOCALID_FACTORY_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FACTORY_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer - waitmovement 0 + applywaitmovement LOCALID_FACTORY_PRE_BATTLE_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow, MSGBOX_DEFAULT closemessage delay 16 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index fb0c8a34111d..4a08699bc46b 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -39,21 +39,18 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: showobjectat LOCALID_PALACE_BATTLE_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM frontier_get FRONTIER_DATA_BATTLE_NUM goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge - applymovement LOCALID_PALACE_BATTLE_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge - waitmovement 0 + applywaitmovement LOCALID_PALACE_BATTLE_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge applymovement LOCALID_PALACE_BATTLE_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown setvar VAR_TEMP_2, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: - applymovement LOCALID_PALACE_BATTLE_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom - waitmovement 0 + applywaitmovement LOCALID_PALACE_BATTLE_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: tower_setopponent addobject LOCALID_PALACE_BATTLE_OPPONENT - applymovement LOCALID_PALACE_BATTLE_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_PALACE_BATTLE_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter palace_getopponentintro msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -71,8 +68,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT switch VAR_RESULT case 7, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon - applymovement LOCALID_PALACE_BATTLE_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit - waitmovement 0 + applywaitmovement LOCALID_PALACE_BATTLE_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit removeobject LOCALID_PALACE_BATTLE_OPPONENT applymovement LOCALID_PALACE_BATTLE_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_PALACE_BATTLE_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 5d2db019ce88..521b78d8f01c 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -19,8 +19,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT closemessage releaseall - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99 call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10 diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc index e847f1f6af20..57658b79b480 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc @@ -9,8 +9,7 @@ BattleFrontier_BattlePikeRoomFinal_OnFrame: BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: delay 16 - applymovement LOCALID_PIKE_FINAL_ROOM_ATTENDANT, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_FINAL_ROOM_ATTENDANT, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON lockall msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc index 67e73442016f..a8c23a704ba6 100644 --- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc @@ -24,8 +24,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: lockall delay 16 - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -43,8 +42,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost:: end BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle:: - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit end BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @@ -53,8 +51,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: msgbox BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer, MSGBOX_DEFAULT waitmessage closemessage - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -69,10 +66,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: end BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit - waitmovement 0 - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer lock faceplayer msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT @@ -82,15 +77,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT closemessage release - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit end BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: delay 22 lockall - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer pike_prequeenheal switch VAR_RESULT case 0, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal @@ -122,8 +115,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: delay 4 call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen waitse - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter pike_getbrainstatus switch VAR_RESULT case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold @@ -180,10 +172,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: end BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 pike_get PIKE_DATA_WIN_STREAK addvar VAR_RESULT, 1 pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT @@ -213,8 +203,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: lockall delay 16 - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth waitmessage playfanfare MUS_HEAL @@ -222,8 +211,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: special HealPlayerParty msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit releaseall end @@ -239,14 +227,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1 pike_gettrainerintro 0 msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 pike_gettrainerintro 1 msgbox gStringVar4, MSGBOX_DEFAULT closemessage @@ -259,21 +245,16 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: end BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 - waitmovement 0 - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit - waitmovement 0 - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp end BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: lockall message BattleFrontier_BattlePikeRoomNormal_Text_WatchOut - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer pike_getstatusmon copyvar VAR_0x8004, VAR_RESULT call_if_eq VAR_0x8004, PIKE_STATUSMON_KIRLIA, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack @@ -296,10 +277,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: call_if_eq VAR_RESULT, PIKE_STATUS_SLEEP, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis pike_flashscreen waitstate - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon - waitmovement 0 - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC waitse playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL waitmoncry @@ -325,10 +304,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: call_if_eq VAR_RESULT, PIKE_STATUS_BURN, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp pike_flashscreen waitstate - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon - waitmovement 0 - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC waitse playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL waitmoncry @@ -375,8 +352,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: closemessage - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2 setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 special DoSpecialTrainerBattle @@ -553,8 +529,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT closemessage release - applymovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit end BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon:: @@ -578,8 +553,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: msgbox BattleFrontier_BattlePikeRoomNormal_Text_Silence, MSGBOX_DEFAULT closemessage release - applymovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight - waitmovement 0 + applywaitmovement LOCALID_PIKE_ROOM_NPC_2, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight end BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 1baed386ba0e..9255f75308a2 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -158,13 +158,11 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: end BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: - applymovement LOCALID_PIKE_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PIKE_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer lockall msgbox BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent, MSGBOX_DEFAULT releaseall - applymovement LOCALID_PIKE_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos - waitmovement 0 + applywaitmovement LOCALID_PIKE_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos setvar VAR_TEMP_5, 255 end diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index da64f6a1d2f4..bcf44c3fbe29 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -200,8 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge:: BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: lockall - applymovement LOCALID_PYRAMID_LOBBY_HINT_GIVER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_PYRAMID_LOBBY_HINT_GIVER, Common_Movement_FacePlayer msgbox BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_GiveHint msgbox BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot, MSGBOX_DEFAULT @@ -380,10 +379,8 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: waitse msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PYRAMID_LOBBY_ATTENDANT, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel - waitmovement 0 + applywaitmovement LOCALID_PYRAMID_LOBBY_ATTENDANT, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel return BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 8709fb51e258..67051a984e9a 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -70,12 +70,9 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: goto_if_ne VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PYRAMID_TOP_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop - waitmovement 0 - applymovement LOCALID_PYRAMID_TOP_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath - waitmovement 0 + applywaitmovement LOCALID_PYRAMID_TOP_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop + applywaitmovement LOCALID_PYRAMID_TOP_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid waitmessage playfanfare MUS_OBTAIN_B_POINTS @@ -108,20 +105,17 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech special SpawnCameraObject - applymovement LOCALID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp - waitmovement 0 + applywaitmovement LOCALID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer msgbox BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver end BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: - applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle @@ -145,20 +139,17 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech special SpawnCameraObject - applymovement LOCALID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp - waitmovement 0 + applywaitmovement LOCALID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT closemessage frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH - applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer msgbox BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold end BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: - applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 7450c49f990f..0e16d33ffdd1 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -18,14 +18,11 @@ BattleFrontier_BattleTowerBattleRoom_OnFrame: BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: setvar VAR_TEMP_0, 1 - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter frontier_get FRONTIER_DATA_BATTLE_NUM goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant setvar VAR_TEMP_2, 1 frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent @@ -33,8 +30,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: tower_setopponent addobject LOCALID_TOWER_BATTLE_OPPONENT - applymovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter tower_getopponentintro 0 msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -53,15 +49,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: tower_setbattlewon switch VAR_RESULT case 7, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon - applymovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit removeobject LOCALID_TOWER_BATTLE_OPPONENT frontier_getbrainstatus call_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT playfanfare MUS_HEAL waitfanfare @@ -121,10 +114,8 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: closemessage - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle - waitmovement 0 - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @@ -189,20 +180,15 @@ BattleFrontier_EventScript_IncrementWinStreak:: return BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter - waitmovement 0 - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_2, Common_Movement_WalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_2, Common_Movement_WalkInPlaceLeft playse SE_PIN - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, Common_Movement_ExclamationMark + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, Common_Movement_Delay48 applymovement LOCALID_TOWER_BATTLE_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant waitmovement 0 - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit return BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @@ -233,13 +219,10 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: call BattleFrontier_EventScript_SetBrainObjectGfx closemessage - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle - waitmovement 0 - applymovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle + applywaitmovement LOCALID_TOWER_BATTLE_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos addobject LOCALID_TOWER_BATTLE_OPPONENT - applymovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter - waitmovement 0 + applywaitmovement LOCALID_TOWER_BATTLE_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter switch VAR_TEMP_F case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index 320e33fe916f..e83ad522527d 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -68,13 +68,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink tower_getopponentintro 0 delay 15 - applymovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft msgbox gStringVar4, MSGBOX_DEFAULT waitmessage tower_getopponentintro 1 - applymovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft msgbox gStringVar4, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle @@ -82,14 +80,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: tower_getopponentintro 0 delay 15 - applymovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft messageautoscroll gStringVar4 waitmessage delay 48 tower_getopponentintro 1 - applymovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_TOWER_MULTI_BATTLE_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft messageautoscroll gStringVar4 waitmessage delay 48 diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc index 920f912a9ee4..ee7b92c14a24 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc @@ -57,13 +57,10 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: lockall - applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom - waitmovement 0 - applymovement LOCALID_TOWER_PARTNER_ROOM_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom + applywaitmovement LOCALID_TOWER_PARTNER_ROOM_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit copyobjectxytoperm LOCALID_TOWER_PARTNER_ROOM_ATTENDANT - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT special HealPlayerParty setvar VAR_TEMP_1, 1 @@ -98,8 +95,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge:: BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner, MSGBOX_DEFAULT closemessage - applymovement LOCALID_TOWER_PARTNER_ROOM_ATTENDANT, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_TOWER_PARTNER_ROOM_ATTENDANT, Common_Movement_WalkInPlaceFasterUp opendoor 10, 1 waitdooranim call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator @@ -197,13 +193,11 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner:: end BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit:: - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit return BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth:: - applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth return BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit: diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 7d9befafb1cc..61b160988d79 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -192,8 +192,7 @@ BattleFrontier_Lounge3_EventScript_FatMan:: BattleFrontier_Lounge3_EventScript_FaceOriginalDirection:: closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 8d637193e054..2f1b554f7daf 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -34,8 +34,7 @@ BattleFrontier_Mart_EventScript_OldMan:: BattleFrontier_Mart_EventScript_OldWoman:: lock - applymovement LOCALID_FRONTIER_MART_OLD_WOMAN, Common_Movement_FaceDown - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_MART_OLD_WOMAN, Common_Movement_FaceDown msgbox BattleFrontier_Mart_Text_ProteinMakeNiceGift, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 987bd380bb15..d8212c9b9e06 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -106,8 +106,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: faceplayer waitse playse SE_SUDOWOODO_SHAKE - applymovement LOCALID_FRONTIER_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake release end @@ -117,8 +116,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: special DoWateringBerryTreeAnim waitse playse SE_SUDOWOODO_SHAKE - applymovement LOCALID_FRONTIER_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT closemessage waitse diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index 378c1d662436..787125483607 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -60,8 +60,7 @@ BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination:: BattleFrontier_OutsideWest_EventScript_BoardFerry:: closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 30 hideobjectat LOCALID_FRONTIER_FERRY_ATTENDANT, MAP_BATTLE_FRONTIER_OUTSIDE_WEST setvar VAR_0x8004, LOCALID_FRONTIER_SS_TIDAL @@ -104,8 +103,7 @@ BattleFrontier_OutsideWest_EventScript_Fisherman2:: faceplayer message BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere waitmessage - applymovement LOCALID_FRONTIER_FISHERMAN_2, Common_Movement_FaceAwayPlayer - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_FISHERMAN_2, Common_Movement_FaceAwayPlayer waitbuttonpress release end @@ -125,11 +123,9 @@ BattleFrontier_OutsideWest_EventScript_Maniac2:: end BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: - applymovement LOCALID_FRONTIER_MANIAC_1, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_MANIAC_1, Common_Movement_WalkInPlaceFasterRight msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT - applymovement LOCALID_FRONTIER_MANIAC_2, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_MANIAC_2, Common_Movement_WalkInPlaceFasterLeft msgbox BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons, MSGBOX_DEFAULT closemessage delay 25 @@ -152,8 +148,7 @@ BattleFrontier_OutsideWest_EventScript_Camper:: end BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: - applymovement LOCALID_FRONTIER_CAMPER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_CAMPER, Common_Movement_WalkInPlaceFasterUp return BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory:: @@ -173,23 +168,19 @@ BattleFrontier_OutsideWest_EventScript_Girl:: end BattleFrontier_OutsideWest_EventScript_GirlShudderNorth:: - applymovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderNorth - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderNorth return BattleFrontier_OutsideWest_EventScript_GirlShudderSouth:: - applymovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderSouth - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderSouth return BattleFrontier_OutsideWest_EventScript_GirlShudderWest:: - applymovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderWest - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderWest return BattleFrontier_OutsideWest_EventScript_GirlShudderEast:: - applymovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderEast - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderEast return BattleFrontier_OutsideWest_Movement_GirlShudderNorth: @@ -289,8 +280,7 @@ BattleFrontier_OutsideWest_EventScript_Man4:: faceplayer msgbox BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FRONTIER_MAN_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_MAN_4, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index 2ea3b92e07b1..53929904955e 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -15,14 +15,11 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: lockall setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1 playse SE_PIN - applymovement LOCALID_FRONTIER_RECEPTION_GREETER, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_FRONTIER_RECEPTION_GREETER, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_RECEPTION_GREETER, Common_Movement_ExclamationMark + applywaitmovement LOCALID_FRONTIER_RECEPTION_GREETER, Common_Movement_Delay48 msgbox BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter goto BattleFrontier_ReceptionGate_EventScript_ScottScene end @@ -56,8 +53,7 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: waitmovement 0 msgbox BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FRONTIER_RECEPTION_SCOTT, BattleFrontier_ReceptionGate_Movement_ScottExit - waitmovement 0 + applywaitmovement LOCALID_FRONTIER_RECEPTION_SCOTT, BattleFrontier_ReceptionGate_Movement_ScottExit removeobject LOCALID_FRONTIER_RECEPTION_SCOTT releaseall end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 8a818222b70d..e35aa1c8d3e5 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -147,8 +147,7 @@ BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: call_if_eq VAR_FACING, DIR_EAST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast call_if_eq VAR_FACING, DIR_WEST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT - applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_FacePlayer msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT goto_if_eq VAR_SCOTT_STATE, 13, BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints goto_if_ge VAR_SCOTT_STATE, 9, BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints @@ -190,23 +189,19 @@ BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: end BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: - applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterUp return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: - applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterDown return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: - applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterRight return BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: - applymovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SCOTTS_HOUSE_SCOTT, Common_Movement_WalkInPlaceFasterLeft return BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 36f4d11efb3d..c60930318d33 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -73,8 +73,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: playbgm MUS_RG_ENCOUNTER_DEOXYS, FALSE waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK addobject LOCALID_BIRTH_ISLAND_DEOXYS - applymovement LOCALID_BIRTH_ISLAND_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach - waitmovement 0 + applywaitmovement LOCALID_BIRTH_ISLAND_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach waitse playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 988d11716bc1..ec3484417676 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -8,8 +8,7 @@ BirthIsland_Harbor_EventScript_Sailor:: goto_if_eq VAR_RESULT, NO, BirthIsland_Harbor_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 30 hideobjectat LOCALID_BIRTH_ISLAND_SAILOR, MAP_BIRTH_ISLAND_HARBOR setvar VAR_0x8004, LOCALID_BIRTH_ISLAND_SS_TIDAL diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 14dda1ad82d5..d566a99d8432 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -6,17 +6,13 @@ CaveOfOrigin_B1F_EventScript_Wallace:: faceplayer msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_WalkInPlaceFasterUp delay 60 playse SE_PIN - applymovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_Delay48 delay 30 - applymovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_CAVE_OF_ORIGIN_WALLACE, Common_Movement_FacePlayer message CaveOfOrigin_B1F_Text_WhereIsRayquaza waitmessage goto CaveOfOrigin_B1F_EventScript_WheresRayquaza diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 40873ff668f6..9d1b7474f01d 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -113,11 +113,9 @@ DewfordTown_EventScript_SailToPetalburg:: call EventScript_BackupMrBrineyLocation setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 setobjectsubpriority LOCALID_PLAYER, MAP_DEWFORD_TOWN, 0 - applymovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat removeobject LOCALID_DEWFORD_BRINEY - applymovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat - waitmovement 0 + applywaitmovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat hideobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement LOCALID_DEWFORD_BOAT, DewfordTown_Movement_SailToPetalburg @@ -125,8 +123,7 @@ DewfordTown_EventScript_SailToPetalburg:: waitmovement 0 showobjectat LOCALID_PLAYER, MAP_ROUTE104 call Common_EventScript_StopBrineysBoatMusic - applymovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg - waitmovement 0 + applywaitmovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatPetalburg showobjectat LOCALID_PLAYER, MAP_ROUTE104 clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO @@ -145,11 +142,9 @@ DewfordTown_EventScript_SailToSlateport:: call EventScript_BackupMrBrineyLocation setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 setobjectsubpriority LOCALID_PLAYER, MAP_DEWFORD_TOWN, 1 - applymovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_BRINEY, DewfordTown_Movement_BrineyBoardBoat removeobject LOCALID_DEWFORD_BRINEY - applymovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat - waitmovement 0 + applywaitmovement LOCALID_PLAYER, DewfordTown_Movement_PlayerBoardBoat hideobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN call Common_EventScript_PlayBrineysBoatMusic applymovement LOCALID_DEWFORD_BOAT, DewfordTown_Movement_SailToSlateport @@ -157,13 +152,11 @@ DewfordTown_EventScript_SailToSlateport:: waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat LOCALID_PLAYER, MAP_ROUTE109 - applymovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatSlateport - waitmovement 0 + applywaitmovement LOCALID_PLAYER, DewfordTown_Movement_ExitBoatSlateport setobjectxyperm LOCALID_ROUTE109_BRINEY, 21, 26 addobject LOCALID_ROUTE109_BRINEY setobjectsubpriority LOCALID_ROUTE109_BRINEY, MAP_ROUTE109, 0 - applymovement LOCALID_ROUTE109_BRINEY, DewfordTown_Movement_BrineyExitBoat - waitmovement 0 + applywaitmovement LOCALID_ROUTE109_BRINEY, DewfordTown_Movement_BrineyExitBoat clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY addobject LOCALID_ROUTE109_BOAT clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 87fa85440d1c..21f19eb6ece8 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -50,8 +50,7 @@ DewfordTown_Hall_EventScript_ExpertM:: call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEWFORD_HALL_EXPERT_M, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_HALL_EXPERT_M, Common_Movement_WalkInPlaceFasterUp release end @@ -61,8 +60,7 @@ DewfordTown_Hall_EventScript_Twin:: call Common_EventScript_BufferTrendyPhrase msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEWFORD_HALL_TWIN, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_HALL_TWIN, Common_Movement_WalkInPlaceFasterUp release end @@ -186,24 +184,21 @@ DewfordTown_Hall_EventScript_DontMovePlayer1:: return DewfordTown_Hall_EventScript_DebateReact1:: - applymovement LOCALID_DEWFORD_HALL_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_HALL_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactWest goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_DontMovePlayer2 end DewfordTown_Hall_EventScript_PlayerReactWest:: goto_if_eq VAR_FACING, DIR_EAST, DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return DewfordTown_Hall_EventScript_DontMovePlayer2:: return DewfordTown_Hall_EventScript_DebateReact2:: - applymovement LOCALID_DEWFORD_HALL_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_HALL_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactNorthSouth goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_PlayerReactEast end @@ -214,19 +209,16 @@ DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: return DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return DewfordTown_Hall_EventScript_PlayerReactEast:: goto_if_eq VAR_FACING, DIR_WEST, DewfordTown_Hall_EventScript_DontMovePlayer1 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index dd41b8461781..362a539d82ea 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -22,11 +22,9 @@ EverGrandeCity_ChampionsRoom_OnFrame: EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkUp4 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkUp4 delay 40 - applymovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace - waitmovement 0 + applywaitmovement LOCALID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_Wallace releaseall @@ -74,10 +72,8 @@ EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF @@ -87,10 +83,8 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, Common_Movement_Delay48 call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF @@ -99,18 +93,14 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: closemessage addobject LOCALID_CHAMPIONS_ROOM_BIRCH - applymovement LOCALID_CHAMPIONS_ROOM_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT call ProfBirch_EventScript_RatePokedex msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT - applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterUp delay 20 - applymovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_WALLACE, Common_Movement_WalkInPlaceFasterDown msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT closemessage delay 30 @@ -120,8 +110,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT checkplayergender call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations @@ -145,15 +134,12 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: return EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: - applymovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth - waitmovement 0 + applywaitmovement LOCALID_CHAMPIONS_ROOM_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth return EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 0bdd84765886..3f2c5c92583c 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -46,13 +46,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: end EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: - applymovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth - waitmovement 0 + applywaitmovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth return EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: - applymovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit - waitmovement 0 + applywaitmovement LOCALID_EVER_GRANDE_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit return EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 86c4dc93c2c6..272c389dacbe 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -72,13 +72,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: end EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: - applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight return EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: - applymovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft return EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @@ -88,12 +86,10 @@ EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: end EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection releaseall end diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 4c064c5856af..1c86e815e5f4 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -35,15 +35,13 @@ FallarborTown_BattleTentBattleRoom_OnFrame: FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom:: lockall showobjectat LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM - applymovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter frontier_get FRONTIER_DATA_BATTLE_NUM goto_if_ne VAR_RESULT, 0, FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: tower_setopponent addobject LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT - applymovement LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter applymovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump playse SE_M_BELLY_DRUM waitse @@ -80,13 +78,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT switch VAR_RESULT case 3, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon - applymovement LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentExit - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentExit removeobject LOCALID_FALLARBOR_TENT_BATTLE_OPPONENT - applymovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer - waitmovement 0 - applymovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant msgbox BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty @@ -122,10 +117,8 @@ FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: closemessage - applymovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos - waitmovement 0 - applymovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle goto FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter waitstate @@ -164,10 +157,8 @@ FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: end FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge:: - applymovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer - waitmovement 0 - applymovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer + applywaitmovement LOCALID_FALLARBOR_TENT_BATTLE_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant goto FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge end diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc index 721567c167dc..4fb56ac3209b 100644 --- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc +++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc @@ -3,8 +3,7 @@ FallarborTown_MoveRelearnersHouse_MapScripts:: FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: lockall - applymovement LOCALID_MOVE_RELEARNER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MOVE_RELEARNER, Common_Movement_FacePlayer goto_if_set FLAG_TEMP_1, FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove msgbox FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor, MSGBOX_DEFAULT setflag FLAG_TEMP_1 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index c9d4c04fa8dd..40f851afce17 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -35,14 +35,12 @@ FallarborTown_PokemonCenter_1F_EventScript_Lanette:: end FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: - applymovement LOCALID_FALLARBOR_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: - applymovement LOCALID_FALLARBOR_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest - waitmovement 0 + applywaitmovement LOCALID_FALLARBOR_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited end diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 13d37f471058..5865c2a8fb45 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -23,8 +23,7 @@ FarawayIsland_Entrance_EventScript_Sailor:: goto_if_eq VAR_RESULT, NO, FarawayIsland_Entrance_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 30 hideobjectat LOCALID_FARAWAY_ISLAND_SAILOR, MAP_FARAWAY_ISLAND_ENTRANCE setvar VAR_0x8004, LOCALID_FARAWAY_ISLAND_SS_TIDAL diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index aa6a4e4e7892..c2149854e778 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -51,12 +51,9 @@ FarawayIsland_Interior_OnFrame: FarawayIsland_Interior_EventScript_FindMew:: lockall playse SE_PIN - applymovement LOCALID_FARAWAY_ISLAND_MEW, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_FARAWAY_ISLAND_MEW, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewMoveAndHide - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, Common_Movement_ExclamationMark + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, Common_Movement_Delay48 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewMoveAndHide copyobjectxytoperm LOCALID_FARAWAY_ISLAND_MEW setvar VAR_TEMP_1, 1 releaseall @@ -113,8 +110,7 @@ FarawayIsland_Interior_Movement_MewFloatUpEast: FarawayIsland_Interior_EventScript_Mew:: lock faceplayer - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewAppear - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewAppear setvar VAR_0x8004, 0 special SetMewAboveGrass message FarawayIsland_Interior_Text_Mew @@ -152,23 +148,19 @@ FarawayIsland_Interior_EventScript_PlayerOrMewRan:: end FarawayIsland_Interior_EventScript_FoundMewNorth:: - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpNorth - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpNorth return FarawayIsland_Interior_EventScript_FoundMewSouth:: - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpSouth - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpSouth return FarawayIsland_Interior_EventScript_FoundMewWest:: - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpWest - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpWest return FarawayIsland_Interior_EventScript_FoundMewEast:: - applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpEast - waitmovement 0 + applywaitmovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpEast return FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index f1694aaa84c0..07602b725483 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -70,14 +70,12 @@ FortreeCity_EventScript_AskUseDevonScope:: FortreeCity_EventScript_UseDevonScope:: msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Movement_KecleonAppears - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_KecleonAppears waitse playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER delay 40 waitmoncry - applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 8b104945715e..7bcfdf17111a 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -14,22 +14,19 @@ FortreeCity_House4_EventScript_Boy:: closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - applymovement LOCALID_FORTREE_HOUSE_WINGULL, FortreeCity_House4_Movement_WingullExit - waitmovement 0 + applywaitmovement LOCALID_FORTREE_HOUSE_WINGULL, FortreeCity_House4_Movement_WingullExit removeobject LOCALID_FORTREE_HOUSE_WINGULL releaseall end FortreeCity_House4_EventScript_WingullOnErrand:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_WingullReturned:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT giveitem ITEM_MENTAL_HERB goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull @@ -38,8 +35,7 @@ FortreeCity_House4_EventScript_WingullReturned:: end FortreeCity_House4_EventScript_ReceivedMentalHerb:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 68d8b829dbc9..f519a31441d9 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -32,8 +32,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: end GraniteCave_StevensRoom_EventScript_StevenExitNorth:: - applymovement LOCALID_GRANITE_CAVE_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit - waitmovement 0 + applywaitmovement LOCALID_GRANITE_CAVE_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit return GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 76cd9527b16f..44ecd666e89b 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -67,28 +67,22 @@ JaggedPass_EventScript_MagmaHideoutGuard:: goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_GuardDefeated waitse playse SE_PIN - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_Delay48 + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FacePlayer msgbox JaggedPass_Text_GruntIntro, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_JAGGED_PASS, JaggedPass_Text_GruntDefeat setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FaceOriginalDirection releaseall end JaggedPass_EventScript_GuardDefeated:: - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FacePlayer msgbox JaggedPass_Text_GoWhereverYouWant, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_GUARD, Common_Movement_FaceOriginalDirection releaseall end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 2ba3f1cb21cc..1ca009ed6b9b 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -97,42 +97,32 @@ LavaridgeTown_EventScript_PlayBrendanMusic:: return LavaridgeTown_EventScript_RivalNoticePlayer:: - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterUp playse SE_PIN - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 return LavaridgeTown_EventScript_RivalExitHerbShop:: opendoor 12, 15 waitdooranim addobject LOCALID_LAVARIDGE_RIVAL - applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalExitHerbShop closedoor 12, 15 waitdooranim - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_WalkInPlaceFasterLeft playse SE_PIN - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_LAVARIDGE_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return LavaridgeTown_EventScript_RivalApproachPlayer1:: - applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1 return LavaridgeTown_EventScript_RivalApproachPlayer2:: - applymovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2 return LavaridgeTown_EventScript_RivalExit1:: @@ -142,8 +132,7 @@ LavaridgeTown_EventScript_RivalExit1:: return LavaridgeTown_EventScript_RivalExit2:: - applymovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2 - waitmovement 0 + applywaitmovement LOCALID_LAVARIDGE_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2 return LavaridgeTown_Movement_RivalExit2: diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 0424202355ec..534acdec7608 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -196,11 +196,9 @@ LilycoveCity_EventScript_WailmerTrainerGrunt:: lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox LilycoveCity_Text_GetLostMessingUpTraining, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection setflag FLAG_MET_WAILMER_TRAINER releaseall end @@ -378,8 +376,7 @@ LilycoveCity_EventScript_BrendanBattleFrontier:: LilycoveCity_EventScript_RivalFlyAway:: closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index b1c59c892275..57b0abaff42f 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -26,8 +26,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestMC:: faceplayer msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_MC, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_MC, Common_Movement_FaceOriginalDirection release end @@ -36,8 +35,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestJudge:: faceplayer msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_JUDGE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_JUDGE, Common_Movement_FaceOriginalDirection release end @@ -46,8 +44,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant1:: faceplayer msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_CONTESTANT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_CONTESTANT_1, Common_Movement_FaceOriginalDirection release end @@ -56,8 +53,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant2:: faceplayer msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_CONTESTANT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_CONTESTANT_2, Common_Movement_FaceOriginalDirection release end @@ -66,8 +62,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant3:: faceplayer msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_CONTESTANT_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_CONTESTANT_3, Common_Movement_FaceOriginalDirection release end @@ -76,8 +71,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant4:: faceplayer msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_CONTESTANT_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_CONTESTANT_4, Common_Movement_FaceOriginalDirection release end @@ -90,8 +84,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: faceplayer msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_AUDIENCE_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_AUDIENCE_2, Common_Movement_FaceOriginalDirection release end @@ -100,8 +93,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: faceplayer msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_AUDIENCE_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_AUDIENCE_3, Common_Movement_FaceOriginalDirection release end @@ -110,8 +102,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: faceplayer msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SMART_AUDIENCE_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SMART_AUDIENCE_4, Common_Movement_FaceOriginalDirection release end @@ -120,8 +111,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestMC:: faceplayer msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_MC, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_MC, Common_Movement_FaceOriginalDirection release end @@ -130,8 +120,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: faceplayer msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_JUDGE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_JUDGE, Common_Movement_FaceOriginalDirection release end @@ -140,8 +129,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant1:: faceplayer msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_CONTESTANT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_CONTESTANT_1, Common_Movement_FaceOriginalDirection release end @@ -150,8 +138,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant2:: faceplayer msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_CONTESTANT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_CONTESTANT_2, Common_Movement_FaceOriginalDirection release end @@ -160,8 +147,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant3:: faceplayer msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_CONTESTANT_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_CONTESTANT_3, Common_Movement_FaceOriginalDirection release end @@ -170,8 +156,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant4:: faceplayer msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_CONTESTANT_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_CONTESTANT_4, Common_Movement_FaceOriginalDirection release end @@ -180,8 +165,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: faceplayer msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_AUDIENCE_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_AUDIENCE_1, Common_Movement_FaceOriginalDirection release end @@ -190,8 +174,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: faceplayer msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_AUDIENCE_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_AUDIENCE_2, Common_Movement_FaceOriginalDirection release end @@ -200,8 +183,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: faceplayer msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BEAUTY_AUDIENCE_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_BEAUTY_AUDIENCE_3, Common_Movement_FaceOriginalDirection release end @@ -210,8 +192,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestMC:: faceplayer msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_MC, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_MC, Common_Movement_FaceOriginalDirection release end @@ -220,8 +201,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestJudge:: faceplayer msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_JUDGE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_JUDGE, Common_Movement_FaceOriginalDirection release end @@ -230,8 +210,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant1:: faceplayer msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_CONTESTANT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_CONTESTANT_1, Common_Movement_FaceOriginalDirection release end @@ -240,8 +219,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant2:: faceplayer msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_CONTESTANT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_CONTESTANT_2, Common_Movement_FaceOriginalDirection release end @@ -250,8 +228,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant3:: faceplayer msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_CONTESTANT_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_CONTESTANT_3, Common_Movement_FaceOriginalDirection release end @@ -260,19 +237,16 @@ LilycoveCity_ContestHall_EventScript_CuteContestant4:: faceplayer msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_CONTESTANT_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_CONTESTANT_4, Common_Movement_FaceOriginalDirection release end LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: lockall - applymovement LOCALID_CUTE_AUDIENCE_1, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_CUTE_AUDIENCE_1, Common_Movement_FacePlayer msgbox LilycoveCity_ContestHall_Text_MyChildIsInContest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_AUDIENCE_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_AUDIENCE_1, Common_Movement_FaceOriginalDirection delay 25 msgbox LilycoveCity_ContestHall_Text_ComeOnDear, MSGBOX_DEFAULT releaseall @@ -283,8 +257,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: faceplayer msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_AUDIENCE_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_AUDIENCE_2, Common_Movement_FaceOriginalDirection release end @@ -293,8 +266,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: faceplayer msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CUTE_AUDIENCE_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_CUTE_AUDIENCE_3, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 723b21f4c2f3..89504d9360f2 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -37,8 +37,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: addobject LOCALID_CONTEST_LOBBY_ARTIST applymovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer waitmovement LOCALID_CONTEST_LOBBY_ARTIST - applymovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceArtist msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall fadescreen FADE_TO_BLACK @@ -57,8 +56,7 @@ LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon call_if_eq VAR_RESULT, TRUE, LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon - applymovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistExit removeobject LOCALID_CONTEST_LOBBY_ARTIST call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag @@ -70,8 +68,7 @@ LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: goto_if_eq VAR_RESULT, YES, LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistExit setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject LOCALID_CONTEST_LOBBY_ARTIST releaseall @@ -80,13 +77,10 @@ LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: incrementgamestat GAME_STAT_RECEIVED_RIBBONS special BufferContestWinnerMonName - applymovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit playse SE_PIN - applymovement LOCALID_CONTEST_LOBBY_ARTIST, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_ARTIST, Common_Movement_ExclamationMark + applywaitmovement LOCALID_CONTEST_LOBBY_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT @@ -207,8 +201,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: addobject LOCALID_CONTEST_LOBBY_LINK_ARTIST applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer waitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST - applymovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall fadescreen FADE_TO_BLACK @@ -225,8 +218,7 @@ LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar VAR_RESULT, GiveMonArtistRibbon call_if_eq VAR_RESULT, TRUE, LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon - applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistExit removeobject LOCALID_CONTEST_LOBBY_LINK_ARTIST call LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons call LilycoveCity_ContestLobby_EventScript_SetPaintingFlag @@ -238,8 +230,7 @@ LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: goto_if_eq VAR_RESULT, YES, LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink msgbox LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs, MSGBOX_DEFAULT closemessage - applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistExit setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject LOCALID_CONTEST_LOBBY_LINK_ARTIST releaseall @@ -249,13 +240,10 @@ LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag FLAG_SYS_RIBBON_GET special BufferContestWinnerMonName - applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit playse SE_PIN - applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, Common_Movement_ExclamationMark + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_ARTIST, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT playfanfare MUS_OBTAIN_ITEM msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT @@ -398,23 +386,19 @@ LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall:: LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: lockall - applymovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_WallShadow, TRUE setmetatile 12, 3, METATILE_Contest_FloorShadow, TRUE special DrawWholeMapView - applymovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter playse SE_BRIDGE_WALK setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, TRUE setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, TRUE special DrawWholeMapView delay 20 - applymovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer - waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer + applywaitmovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist msgbox LilycoveCity_ContestLobby_Text_ComeThroughHere, MSGBOX_DEFAULT closemessage applymovement LOCALID_CONTEST_LOBBY_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall @@ -605,8 +589,7 @@ LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -885,23 +868,19 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: waitmessage delay 20 closemessage - applymovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_WallShadow, TRUE setmetatile 17, 3, METATILE_Contest_FloorShadow, TRUE special DrawWholeMapView - applymovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter playse SE_BRIDGE_WALK setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, TRUE setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, TRUE special DrawWholeMapView delay 20 - applymovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer - waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist - waitmovement 0 + applywaitmovement LOCALID_CONTEST_LOBBY_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer + applywaitmovement LOCALID_PLAYER, LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist messageautoscroll LilycoveCity_ContestLobby_Text_ComeThroughHere waitmessage delay 20 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index a6ef6760eaed..b4502ce12c8a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -6,53 +6,43 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted msgbox LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot, MSGBOX_DEFAULT - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer msgbox LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer msgbox LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FacePlayer msgbox LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_FaceOriginalDirection releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: lockall playse SE_PIN - applymovement LOCALID_MOTEL_OWNER, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MOTEL_OWNER, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MOTEL_OWNER, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV applymovement LOCALID_MOTEL_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer waitmovement 0 - applymovement LOCALID_MOTEL_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn - waitmovement 0 + applywaitmovement LOCALID_MOTEL_OWNER, LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn release end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index f10e97918092..a01a95ffe0a9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -110,8 +110,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: special CloseDeptStoreElevatorWindow closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown waitse special MoveElevator setflag FLAG_TEMP_2 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 32b5f592f837..7ca9ea86e7bf 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -20,16 +20,14 @@ LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT - applymovement LOCALID_LOTTERY_CLERK, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_LOTTERY_CLERK, Common_Movement_WalkInPlaceFasterRight playse SE_PC_ON special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 special EndLotteryCornerComputerEffect delay 10 - applymovement LOCALID_LOTTERY_CLERK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_LOTTERY_CLERK, Common_Movement_FacePlayer goto_if_eq VAR_0x8004, 0, LilycoveCity_DepartmentStore_1F_EventScript_NoMatch incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY call_if_eq VAR_0x8006, 0, LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index e761b445911a..a2472b5c48af 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -117,8 +117,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: LilycoveCity_DepartmentStore_5F_EventScript_Woman:: lockall - applymovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 0, LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 4, LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal goto LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather @@ -133,8 +132,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_DEPARTMENT_STORE_STAIRS_WOMAN, Common_Movement_WalkInPlaceFasterUp releaseall end diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 6127c624a796..24428568ea08 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -225,13 +225,10 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: call LilycoveCity_Harbor_EventScript_GetEventTicketSailor msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT closemessage - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp playse SE_PIN - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_ExclamationMark + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_Delay48 call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast addobject LOCALID_LILYCOVE_HARBOR_BRINEY @@ -298,13 +295,11 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT closemessage - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp delay 30 removeobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR delay 30 - applymovement LOCALID_LILYCOVE_HARBOR_ATTENDANT, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_ATTENDANT, Common_Movement_WalkInPlaceFasterDown showobjectat LOCALID_LILYCOVE_HARBOR_ATTENDANT, MAP_LILYCOVE_CITY_HARBOR delay 30 msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT @@ -312,20 +307,17 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: end LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR delay 30 - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_FacePlayer return LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp delay 30 removeobject LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth @@ -384,8 +376,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: LilycoveCity_Harbor_EventScript_BoardFerry:: msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp delay 30 hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth @@ -397,13 +388,11 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: return LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: - applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast return LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: - applymovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth return LilycoveCity_Harbor_EventScript_ExitSailSelect:: @@ -438,13 +427,11 @@ LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: end LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth:: - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth return LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast:: - applymovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayEast - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayEast return LilycoveCity_Harbor_Movement_SailorOutOfWayNorth: @@ -461,23 +448,19 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: step_end LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: - applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft return LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: - applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown return LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: - applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterDown return LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: - applymovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_HARBOR_BRINEY, Common_Movement_WalkInPlaceFasterLeft return LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 57e68047326a..99b0ac0143dc 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -14,16 +14,14 @@ LilycoveCity_House3_EventScript_PokefanF:: goto_if_eq VAR_RESULT, NO, LilycoveCity_House3_EventScript_DeclinePokeblockLearn msgbox LilycoveCity_House3_Text_ExplainPokeblocks, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -32,8 +30,7 @@ LilycoveCity_House3_EventScript_Man:: faceplayer msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index 052e1e4f3f24..f8856e7eb210 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -32,8 +32,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN - applymovement LOCALID_MUSEUM_1F_CURATOR, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs - waitmovement 0 + applywaitmovement LOCALID_MUSEUM_1F_CURATOR, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs removeobject LOCALID_MUSEUM_1F_CURATOR switch VAR_FACING case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth @@ -43,24 +42,21 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: lockall - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 11, 8 waitstate end @@ -149,8 +145,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: faceplayer msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MUSEUM_1F_ARTIST_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MUSEUM_1F_ARTIST_2, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 1ac10a401698..dee0f5504242 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -66,15 +66,11 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall, MSGBOX_SIGN - applymovement LOCALID_MUSEUM_2F_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall - waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall - waitmovement 0 + applywaitmovement LOCALID_MUSEUM_2F_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall + applywaitmovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall msgbox LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall, MSGBOX_SIGN - applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer - waitmovement 0 - applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft - waitmovement 0 + applywaitmovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer + applywaitmovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN #ifdef UBFIX setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1 @@ -111,8 +107,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: end LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: - applymovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MUSEUM_2F_CURATOR, Common_Movement_FacePlayer msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT applymovement LOCALID_MUSEUM_2F_CURATOR, LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall msgbox LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests, MSGBOX_DEFAULT diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 033e63b988bd..0c8362818f20 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -3,8 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: lockall - applymovement LOCALID_MOVE_DELETER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MOVE_DELETER, Common_Movement_FacePlayer msgbox LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove, MSGBOX_YESNO switch VAR_RESULT case YES, LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 2248c04786fe..d98179855cab 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -11,21 +11,16 @@ LilycoveCity_PokemonTrainerFanClub_OnFrame: LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall - applymovement LOCALID_TRAINER_FAN_CLUB_LASS, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_TRAINER_FAN_CLUB_LASS, Common_Movement_WalkInPlaceFasterDown msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT applymovement LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer applymovement LOCALID_TRAINER_FAN_CLUB_MAN, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT - applymovement LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer - waitmovement 0 + applywaitmovement LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement LOCALID_TRAINER_FAN_CLUB_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 6a2c6af41bb1..7009fbb42a41 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -132,18 +132,15 @@ LittlerootTown_EventScript_StepOffTruckFemale:: LittlerootTown_EventScript_GoInsideWithMom:: delay 15 playse SE_LEDGE - applymovement LOCALID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck opendoor VAR_0x8004, VAR_0x8005 waitdooranim addobject LOCALID_LITTLEROOT_MOM - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitHouse - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitHouse closedoor VAR_0x8004, VAR_0x8005 waitdooranim delay 10 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerAtTruck - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerAtTruck msgbox LittlerootTown_Text_OurNewHomeLetsGoInside, MSGBOX_DEFAULT closemessage applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachDoor @@ -205,8 +202,7 @@ LittlerootTown_Movement_PlayerStepOffTruck: LittlerootTown_EventScript_BeginDexUpgradeScene:: lockall playse SE_PIN - applymovement LOCALID_LITTLEROOT_BIRCH, Common_Movement_ExclamationMark - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_BIRCH, Common_Movement_ExclamationMark delay 80 msgbox LittlerootTown_Text_BirchSomethingToShowYouAtLab, MSGBOX_DEFAULT closemessage @@ -263,8 +259,7 @@ LittlerootTown_EventScript_GoSaveBirch:: special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage - applymovement LOCALID_LITTLEROOT_TWIN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, Common_Movement_FaceOriginalDirection setvar VAR_LITTLEROOT_TOWN_STATE, 2 release end @@ -282,11 +277,9 @@ LittlerootTown_EventScript_GoodLuck:: LittlerootTown_EventScript_NeedPokemonTriggerLeft:: lockall - applymovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinApproachPlayerLeft - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinApproachPlayerLeft call LittlerootTown_EventScript_DangerousWithoutPokemon - applymovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinReturnLeft - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinReturnLeft releaseall end @@ -340,11 +333,9 @@ LittlerootTown_Movement_PushPlayerBackFromRoute: LittlerootTown_EventScript_NeedPokemonTriggerRight:: lockall - applymovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinApproachPlayerRight - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinApproachPlayerRight call LittlerootTown_EventScript_DangerousWithoutPokemon - applymovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinReturnRight - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, LittlerootTown_Movement_TwinReturnRight releaseall end @@ -374,15 +365,12 @@ LittlerootTown_Movement_TwinReturnRight: LittlerootTown_EventScript_GoSaveBirchTrigger:: lockall - applymovement LOCALID_LITTLEROOT_TWIN, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft special GetPlayerBigGuyGirlString msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT closemessage - applymovement LOCALID_LITTLEROOT_TWIN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_TWIN, Common_Movement_FaceOriginalDirection setvar VAR_LITTLEROOT_TOWN_STATE, 2 releaseall end @@ -495,13 +483,11 @@ LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: return LittlerootTown_EventScript_MomNoticePlayerMale:: - applymovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterRight return LittlerootTown_EventScript_MomNoticePlayerFemale:: - applymovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterLeft return LittlerootTown_EventScript_MomApproachPlayerMale:: @@ -523,73 +509,53 @@ LittlerootTown_EventScript_MomApproachPlayerFemale:: return LittlerootTown_EventScript_MomApproachPlayer0:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayer0 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayer0 return LittlerootTown_EventScript_MomApproachPlayer1:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayer1 return LittlerootTown_EventScript_MomApproachPlayerMale2:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale2 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale2 return LittlerootTown_EventScript_MomApproachPlayerMale3:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale3 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale3 return LittlerootTown_EventScript_MomApproachPlayerMale4:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale4 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale4 return LittlerootTown_EventScript_MomApproachPlayerMale5:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale5 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerMale5 return LittlerootTown_EventScript_MomApproachPlayerFemale2:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale2 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale2 return LittlerootTown_EventScript_MomApproachPlayerFemale3:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale3 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale3 return LittlerootTown_EventScript_MomApproachPlayerFemale4:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale4 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale4 return LittlerootTown_EventScript_MomApproachPlayerFemale5:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale5 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomApproachPlayerFemale5 return LittlerootTown_EventScript_MomReturnHomeMale:: @@ -611,106 +577,88 @@ LittlerootTown_EventScript_MomReturnHomeFemale:: return LittlerootTown_EventScript_MomReturnHome0:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHome0 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHome0 return LittlerootTown_EventScript_MomReturnHome1:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHome1 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHome1 return LittlerootTown_EventScript_MomReturnHomeMale2:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale2 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale2 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeMale3:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale3 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale3 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeMale4:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale4 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale4 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeMale5:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale5 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeMale5 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeFemale2:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale2 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale2 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeFemale3:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale3 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale3 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeFemale4:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale4 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale4 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_MomReturnHomeFemale5:: - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale5 - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomReturnHomeFemale5 opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim @@ -873,12 +821,10 @@ LittlerootTown_EventScript_Mom:: call_if_eq VAR_RESULT, MALE, LittlerootTown_EventScript_SetHomeDoorCoordsMale call_if_eq VAR_RESULT, FEMALE, LittlerootTown_EventScript_SetHomeDoorCoordsFemale call LittlerootTown_EventScript_GiveRunningShoes - applymovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, Common_Movement_WalkInPlaceFasterUp opendoor VAR_0x8009, VAR_0x800A waitdooranim - applymovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor - waitmovement 0 + applywaitmovement LOCALID_LITTLEROOT_MOM, LittlerootTown_Movement_MomExitThroughDoor hideobjectat LOCALID_LITTLEROOT_MOM, MAP_LITTLEROOT_TOWN closedoor VAR_0x8009, VAR_0x800A waitdooranim diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 3b544fdf2d63..771ae66ebbd5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -87,10 +87,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: lockall playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_Delay48 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft applymovement LOCALID_RIVALS_HOUSE_1F_MOM, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach waitmovement 0 @@ -114,8 +112,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: lockall setvar VAR_0x8004, LOCALID_PLAYERS_HOUSE_1F_MOM setvar VAR_0x8005, MALE - applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft goto PlayersHouse_1F_EventScript_MomGoSeeRoom end @@ -143,10 +140,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: addobject LOCALID_RIVALS_HOUSE_1F_RIVAL delay 30 playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_Delay48 call_if_ne VAR_0x8008, 1, LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan playbgm MUS_ENCOUNTER_BRENDAN, TRUE call_if_eq VAR_0x8008, 0, LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0 @@ -171,23 +166,19 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: end LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1 return LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2 return LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 2463d4933734..6a9e24efe99e 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -56,13 +56,10 @@ LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: delay 10 addobject LOCALID_RIVALS_HOUSE_2F_RIVAL - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_Delay48 delay 10 playbgm MUS_ENCOUNTER_BRENDAN, TRUE call_if_eq VAR_FACING, DIR_NORTH, LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth @@ -79,10 +76,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: end LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth @@ -91,10 +86,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: return LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth @@ -103,10 +96,8 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: return LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest @@ -115,14 +106,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: return LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast return LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 6a7b6644b9e9..9dda6fd07caa 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -86,10 +86,8 @@ LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: lockall playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_1F_MOM, Common_Movement_Delay48 applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_RIVALS_HOUSE_1F_MOM, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach waitmovement 0 @@ -147,8 +145,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: lockall setvar VAR_0x8004, LOCALID_PLAYERS_HOUSE_1F_MOM setvar VAR_0x8005, FEMALE - applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_WalkInPlaceFasterRight goto PlayersHouse_1F_EventScript_MomGoSeeRoom end @@ -176,10 +173,8 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: addobject LOCALID_RIVALS_HOUSE_1F_RIVAL delay 30 playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, Common_Movement_Delay48 call_if_ne VAR_0x8008, 1, LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay playbgm MUS_ENCOUNTER_MAY, TRUE call_if_eq VAR_0x8008, 0, LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0 @@ -204,23 +199,19 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: end LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0 return LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1 return LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: - applymovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_1F_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2 return LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 98f1a8b66a47..12094bbde43e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -55,13 +55,10 @@ LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: delay 10 addobject LOCALID_RIVALS_HOUSE_2F_RIVAL - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters playse SE_PIN - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, Common_Movement_Delay48 delay 10 playbgm MUS_ENCOUNTER_MAY, TRUE call_if_eq VAR_FACING, DIR_NORTH, LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth @@ -78,10 +75,8 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: end LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth @@ -90,10 +85,8 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: return LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth @@ -102,21 +95,16 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: return LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest return LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: - applymovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RIVALS_HOUSE_2F_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast @@ -252,8 +240,7 @@ RivalsHouse_2F_EventScript_Brendan:: end RivalsHouse_2F_EventScript_RivalPostLilycove:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer checkplayergender call_if_eq VAR_RESULT, MALE, RivalsHouse_2F_EventScript_MayPostLilycove call_if_eq VAR_RESULT, FEMALE, RivalsHouse_2F_EventScript_BrendanPostLilycove diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 76fda0f323f0..eeb3a390bc9b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -143,8 +143,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: lockall - applymovement LOCALID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex end @@ -163,8 +162,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: delay 30 msgbox LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BIRCHS_LAB_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes delay 20 playse SE_CLICK delay 10 @@ -183,8 +181,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: playse SE_PC_ON waitse delay 20 - applymovement LOCALID_BIRCHS_LAB_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex applymovement LOCALID_BIRCHS_LAB_RIVAL, Common_Movement_WalkInPlaceFasterUp applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -249,8 +246,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: lockall - applymovement LOCALID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter msgbox LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon, MSGBOX_DEFAULT setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5 releaseall @@ -289,8 +285,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: release goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter - applymovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight showmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime @@ -300,8 +295,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: release goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter - applymovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight showmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime @@ -311,8 +305,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: release goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter - applymovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_BIRCH, Common_Movement_WalkInPlaceFasterRight showmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime @@ -508,10 +501,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BIRCHS_LAB_RIVAL, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_BIRCHS_LAB_RIVAL, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight checkplayergender call_if_eq VAR_RESULT, MALE, LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls call_if_eq VAR_RESULT, FEMALE, LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index d534e7dbb88d..483d2cd64722 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -15,15 +15,13 @@ MagmaHideout_4F_EventScript_Maxie:: playfanfare MUS_AWAKEN_LEGEND playse SE_ORB special DoOrbEffect - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp delay 150 removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON_SLEEPING addobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON waitstate delay 60 - applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonApproach - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonApproach special FadeOutOrbEffect setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -31,8 +29,7 @@ MagmaHideout_4F_EventScript_Maxie:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonExit - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_4F_GROUDON, MagmaHideout_4F_Movement_GroudonExit removeobject LOCALID_MAGMA_HIDEOUT_4F_GROUDON delay 4 setvar VAR_0x8004, 2 @ vertical pan @@ -42,15 +39,12 @@ MagmaHideout_4F_EventScript_Maxie:: special ShakeCamera waitstate delay 30 - applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, MagmaHideout_4F_Movement_MaxieLookAround msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight delay 30 - applymovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAGMA_HIDEOUT_4F_MAXIE, Common_Movement_FacePlayer msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_MAXIE_MAGMA_HIDEOUT, MagmaHideout_4F_Text_MaxieDefeat diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 1ac6c65147ea..80fd224332ac 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -24,10 +24,8 @@ MarineCave_End_EventScript_ShowKyogre:: MarineCave_End_EventScript_Kyogre:: lockall - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 - applymovement LOCALID_MARINE_CAVE_KYOGRE, MarineCave_End_Movement_KyogreApproach - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp + applywaitmovement LOCALID_MARINE_CAVE_KYOGRE, MarineCave_End_Movement_KyogreApproach waitse playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index ddaf0a1e9369..3258f7d89308 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -70,34 +70,28 @@ MauvilleCity_EventScript_WallysUncle:: goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally msgbox MauvilleCity_Text_UncleHesTooPeppy, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection release end MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT closemessage - applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection release end MauvilleCity_EventScript_Wally:: lockall goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyWeCanBeatAnyone, MSGBOX_DEFAULT - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer playse SE_PIN - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_Delay48 msgbox MauvilleCity_Text_WallyWillYouBattleMe, MSGBOX_YESNO goto MauvilleCity_EventScript_BattleWallyPrompt end @@ -116,8 +110,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth:: applymovement LOCALID_MAUVILLE_WALLY, MauvilleCity_Movement_WallyExitNorth1 applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth1 waitmovement 0 - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight delay 30 applymovement LOCALID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerNorth @@ -136,11 +129,9 @@ MauvilleCity_EventScript_WallyAndUncleExitEast:: applymovement LOCALID_MAUVILLE_WALLY, MauvilleCity_Movement_WallyExitEast1 applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast1 waitmovement 0 - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight delay 30 - applymovement LOCALID_MAUVILLE_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerEast - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerEast msgbox MauvilleCity_Text_UncleVisitUsSometime, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast2 @@ -160,8 +151,7 @@ MauvilleCity_EventScript_DefeatedWally:: setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL call_if_eq VAR_FACING, DIR_NORTH, MauvilleCity_EventScript_ScottApproachPlayerNorth call_if_eq VAR_FACING, DIR_EAST, MauvilleCity_EventScript_ScottApproachPlayerEast - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT closemessage addvar VAR_SCOTT_STATE, 1 @@ -173,15 +163,13 @@ MauvilleCity_EventScript_DefeatedWally:: MauvilleCity_EventScript_ScottApproachPlayerNorth:: addobject LOCALID_MAUVILLE_SCOTT - applymovement LOCALID_MAUVILLE_SCOTT, MauvilleCity_Movement_ScottApproachPlayerNorth - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_SCOTT, MauvilleCity_Movement_ScottApproachPlayerNorth return MauvilleCity_EventScript_ScottApproachPlayerEast:: setobjectxyperm LOCALID_MAUVILLE_SCOTT, 12, 13 addobject LOCALID_MAUVILLE_SCOTT - applymovement LOCALID_MAUVILLE_SCOTT, MauvilleCity_Movement_ScottApproachPlayerEast - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_SCOTT, MauvilleCity_Movement_ScottApproachPlayerEast return MauvilleCity_EventScript_ScottExitNorth:: @@ -199,14 +187,11 @@ MauvilleCity_EventScript_ScottExitEast:: MauvilleCity_EventScript_BattleWally:: msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_WalkInPlaceFasterRight msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT return @@ -217,8 +202,7 @@ MauvilleCity_EventScript_DeclineWallyBattle:: end MauvilleCity_EventScript_WallyRequestBattleAgain:: - applymovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MAUVILLE_WALLY, Common_Movement_FacePlayer msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO goto MauvilleCity_EventScript_BattleWallyPrompt end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index c9e425be73d5..e09d61bf3a8f 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -482,8 +482,7 @@ MauvilleCity_GameCorner_EventScript_Man:: MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 193e0c04ce14..480e085d3536 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -13,10 +13,8 @@ MauvilleCity_House2_EventScript_Woman:: MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: playse SE_PIN - applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_LAST_TALKED, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_ExclamationMark + applywaitmovement VAR_LAST_TALKED, Common_Movement_Delay48 msgbox MauvilleCity_House2_Text_TradeHarborMailForCoinCase, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, MauvilleCity_House2_EventScript_AcceptTrade goto_if_eq VAR_RESULT, NO, MauvilleCity_House2_EventScript_DeclineTrade diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index e41c6a631122..e3d4998486f5 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -16,25 +16,20 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: lockall playbgm MUS_ENCOUNTER_MAGMA, FALSE - applymovement LOCALID_PLAYER, Common_Movement_FaceDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceDown delay 30 - applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceDown msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT closemessage applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp waitmovement 0 playse SE_PIN - applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_ExclamationMark + applywaitmovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, Common_Movement_Delay48 msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT closemessage - applymovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_MAGMA_GRUNT_1, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft @@ -60,19 +55,16 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: waitmovement 0 removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_1 removeobject LOCALID_METEOR_FALLS_MAGMA_GRUNT_2 - applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT closemessage applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie applymovement LOCALID_METEOR_FALLS_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie waitmovement 0 msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT - applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterDown msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT - applymovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_ARCHIE, Common_Movement_WalkInPlaceFasterLeft msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT closemessage applymovement LOCALID_METEOR_FALLS_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieExit diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index de24d35124c8..fc566fb5a2c9 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -6,12 +6,9 @@ MeteorFalls_StevensCave_EventScript_Steven:: goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated waitse playse SE_PIN - applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_ExclamationMark + applywaitmovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_Delay48 + applywaitmovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT @@ -20,8 +17,7 @@ MeteorFalls_StevensCave_EventScript_Steven:: end MeteorFalls_StevensCave_EventScript_Defeated:: - applymovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_METEOR_FALLS_STEVEN, Common_Movement_FacePlayer msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 0d19067e3f46..f22824ce9ee0 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -75,8 +75,7 @@ MossdeepCity_EventScript_VisitedMossdeep:: MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: lockall - applymovement LOCALID_MOSSDEEP_MAXIE, MossdeepCity_Movement_MaxieGestureToSpaceCenter - waitmovement 0 + applywaitmovement LOCALID_MOSSDEEP_MAXIE, MossdeepCity_Movement_MaxieGestureToSpaceCenter applymovement LOCALID_MOSSDEEP_GRUNT_1, MossdeepCity_Movement_GruntFaceSpaceCenter applymovement LOCALID_MOSSDEEP_GRUNT_2, MossdeepCity_Movement_GruntFaceSpaceCenter applymovement LOCALID_MOSSDEEP_GRUNT_3, MossdeepCity_Movement_GruntFaceSpaceCenter @@ -216,8 +215,7 @@ MossdeepCity_EventScript_Man:: lock faceplayer msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 8ff582e34d66..a51d5cf51674 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -114,8 +114,7 @@ MossdeepCity_Gym_EventScript_Switch1:: lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Right, FALSE setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Down, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -129,8 +128,7 @@ MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: MossdeepCity_Gym_EventScript_ClearSwitch1:: clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Left, FALSE setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Up, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -140,8 +138,7 @@ MossdeepCity_Gym_EventScript_Switch2:: lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Right, FALSE setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Down, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -149,8 +146,7 @@ MossdeepCity_Gym_EventScript_Switch2:: MossdeepCity_Gym_EventScript_ClearSwitch2:: clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Down, FALSE setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Up, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -160,8 +156,7 @@ MossdeepCity_Gym_EventScript_Switch3:: lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Left, FALSE setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Down, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -169,8 +164,7 @@ MossdeepCity_Gym_EventScript_Switch3:: MossdeepCity_Gym_EventScript_ClearSwitch3:: clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Right, FALSE setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Up, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -180,8 +174,7 @@ MossdeepCity_Gym_EventScript_Switch4:: lockall goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4 setflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Up, FALSE setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Down, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -189,8 +182,7 @@ MossdeepCity_Gym_EventScript_Switch4:: MossdeepCity_Gym_EventScript_ClearSwitch4:: clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - applymovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Right, FALSE setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Up, TRUE goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed @@ -310,9 +302,7 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 0 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -322,9 +312,7 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 1 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -334,9 +322,7 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 2 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -346,9 +332,7 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 3 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -358,9 +342,7 @@ MossdeepCity_Gym_EventScript_RedFloorSwitch:: playse SE_REPEL initrotatingtilepuzzle FALSE moverotatingtileobjects 4 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 0317753560c3..bb9aa4b754e3 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -26,13 +26,11 @@ MossdeepCity_House2_EventScript_Wingull:: end MossdeepCity_House2_EventScript_WingullExitNorth:: - applymovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitNorth - waitmovement 0 + applywaitmovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitNorth return MossdeepCity_House2_EventScript_WingullExitWest:: - applymovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitEast - waitmovement 0 + applywaitmovement LOCALID_MOSSDEEP_HOUSE_WINGULL, MossdeepCity_House2_Movement_WingullExitEast return MossdeepCity_House2_Movement_WingullExitNorth: diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 0ed531ba4b6f..22d3e9c222fc 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -53,8 +53,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: call_if_eq VAR_RESULT, 0, MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet call_if_ge VAR_RESULT, 1, MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -73,8 +72,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: call_if_eq VAR_RESULT, 0, MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma call_if_ge VAR_RESULT, 1, MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight release end @@ -96,8 +94,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight release end @@ -126,15 +123,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight release end MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight release end @@ -169,16 +164,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -186,8 +179,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Steven:: lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -227,8 +219,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: #else case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast #endif - applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2 release end @@ -239,8 +230,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: end MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: - applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1 release end @@ -248,8 +238,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ Functionally unused by mistake. The movement is handled anyway after the switch (see above) @ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3 MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: - applymovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_1F_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 27fb57b105bf..12ffd8ffded4 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -30,16 +30,13 @@ MossdeepCity_SpaceCenter_2F_OnFrame: MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: playse SE_PIN - applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_ExclamationMark + applywaitmovement LOCALID_PLAYER, Common_Movement_Delay48 msgbox MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts msgbox MossdeepCity_SpaceCenter_2F_Text_GoodAnswer, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit - waitmovement 0 + applywaitmovement LOCALID_PLAYER, MossdeepCity_SpaceCenter_2F_Movement_PlayerExit warp MAP_MOSSDEEP_CITY_SPACE_CENTER_1F, 13, 1 waitstate releaseall @@ -52,20 +49,15 @@ MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat - applymovement LOCALID_SPACE_CENTER_GRUNT_5, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_GRUNT_5, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat - applymovement LOCALID_SPACE_CENTER_GRUNT_6, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_GRUNT_6, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat - applymovement LOCALID_SPACE_CENTER_GRUNT_7, MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_GRUNT_7, MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 2 copyobjectxytoperm LOCALID_SPACE_CENTER_GRUNT_6 copyobjectxytoperm LOCALID_SPACE_CENTER_GRUNT_7 @@ -165,8 +157,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: lock faceplayer msgbox MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -187,14 +178,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_Steven:: playse SE_NOT_EFFECTIVE switch VAR_FACING case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth - applymovement LOCALID_SPACE_CENTER_2F_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFight - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_2F_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFight releaseall end MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth:: - applymovement LOCALID_SPACE_CENTER_2F_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth - waitmovement 0 + applywaitmovement LOCALID_SPACE_CENTER_2F_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth releaseall end @@ -223,20 +212,17 @@ MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: step_end MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer msgbox MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown releaseall end MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown special SavePlayerParty fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index cf69bfe8a29f..a7a1167ff698 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -27,15 +27,11 @@ MossdeepCity_StevensHouse_OnFrame: MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: lockall - applymovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_WalkInPlaceFasterLeft playse SE_PIN - applymovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_STEVENS_HOUSE_STEVEN, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_ExclamationMark + applywaitmovement LOCALID_STEVENS_HOUSE_STEVEN, Common_Movement_Delay48 + applywaitmovement LOCALID_STEVENS_HOUSE_STEVEN, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT giveitem ITEM_HM_DIVE setflag FLAG_RECEIVED_HM_DIVE @@ -43,8 +39,7 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT closemessage delay 20 - applymovement LOCALID_STEVENS_HOUSE_STEVEN, MossdeepCity_StevensHouse_Movement_StevenReturn - waitmovement 0 + applywaitmovement LOCALID_STEVENS_HOUSE_STEVEN, MossdeepCity_StevensHouse_Movement_StevenReturn setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT setvar VAR_STEVENS_HOUSE_STATE, 2 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index ff202923352f..cdc83f9ce9c5 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -17,8 +17,7 @@ MtChimney_EventScript_Archie:: call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieBusyFighting closemessage - applymovement LOCALID_MT_CHIMNEY_ARCHIE, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_ARCHIE, Common_Movement_FaceOriginalDirection setflag FLAG_EVIL_LEADER_PLEASE_STOP release end @@ -35,13 +34,10 @@ MtChimney_EventScript_Maxie:: lockall playbgm MUS_ENCOUNTER_MAGMA, FALSE msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT - applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_FacePlayer playse SE_PIN - applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MT_CHIMNEY_MAXIE, Common_Movement_Delay48 msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT @@ -58,8 +54,7 @@ MtChimney_EventScript_Maxie:: addobject LOCALID_MT_CHIMNEY_ARCHIE call_if_eq VAR_FACING, DIR_EAST, MtChimney_EventScript_ArchieApproachPlayerEast call_if_eq VAR_FACING, DIR_NORTH, MtChimney_EventScript_ArchieApproachPlayerNorth - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT closemessage call_if_eq VAR_FACING, DIR_EAST, MtChimney_EventScript_ArchieExitEast @@ -74,23 +69,19 @@ MtChimney_EventScript_Maxie:: end MtChimney_EventScript_ArchieApproachPlayerEast:: - applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast return MtChimney_EventScript_ArchieApproachPlayerNorth:: - applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth return MtChimney_EventScript_ArchieExitEast:: - applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitEast - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitEast return MtChimney_EventScript_ArchieExitNorth:: - applymovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitNorth - waitmovement 0 + applywaitmovement LOCALID_MT_CHIMNEY_ARCHIE, MtChimney_Movement_ArchieExitNorth return MtChimney_EventScript_LavaCookieLady:: diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 7b0ca2d3a118..e0633944c390 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -31,10 +31,8 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: MtPyre_Summit_EventScript_TeamAquaExits:: playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterDown delay 50 call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_ArchieFacePlayer0 call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_ArchieFacePlayer1 @@ -64,8 +62,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: end MtPyre_Summit_EventScript_ArchieFacePlayer0:: - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer0 - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer0 return @ Archie is already facing player @@ -73,27 +70,21 @@ MtPyre_Summit_EventScript_ArchieFacePlayer1:: return MtPyre_Summit_EventScript_ArchieFacePlayer2:: - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer2 - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer2 return MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: - applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: - applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer1 return MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: - applymovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return MtPyre_Summit_Movement_OldLadyApproachPlayer0: @@ -196,17 +187,14 @@ MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: end MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp delay 60 call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_ArchieMaxieBeginExit0 call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_ArchieMaxieBeginExit1 call_if_eq VAR_0x8008, 2, MtPyre_Summit_EventScript_ArchieMaxieBeginExit2 playse SE_PIN - applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MT_PYRE_SUMMIT_MAXIE, Common_Movement_Delay48 delay 30 call_if_eq VAR_0x8008, 0, MtPyre_Summit_EventScript_MaxieApproachPlayer0 call_if_eq VAR_0x8008, 1, MtPyre_Summit_EventScript_MaxieApproachPlayer1 @@ -272,24 +260,21 @@ MtPyre_Summit_EventScript_MaxieApproachArchie0:: applymovement LOCALID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0 waitmovement 0 - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight return MtPyre_Summit_EventScript_MaxieApproachArchie1:: applymovement LOCALID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1 waitmovement 0 - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight return MtPyre_Summit_EventScript_MaxieApproachArchie2:: applymovement LOCALID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement LOCALID_MT_PYRE_SUMMIT_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2 waitmovement 0 - applymovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_MT_PYRE_SUMMIT_ARCHIE, Common_Movement_WalkInPlaceFasterRight return MtPyre_Summit_Movement_PlayerFaceMaxie0: diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index fb12688e3264..fa9c1a39d857 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -8,8 +8,7 @@ NavelRock_Harbor_EventScript_Sailor:: goto_if_eq VAR_RESULT, NO, NavelRock_Harbor_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 30 hideobjectat LOCALID_NAVEL_ROCK_SAILOR, MAP_NAVEL_ROCK_HARBOR setvar VAR_0x8004, LOCALID_NAVEL_ROCK_SS_TIDAL diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 3b0395386f6e..4c070c729259 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -22,8 +22,7 @@ NewMauville_Entrance_OnTransition: NewMauville_Entrance_EventScript_Door:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY goto_if_eq VAR_RESULT, FALSE, NewMauville_Entrance_EventScript_DontOpenDoor diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index a127cd07be55..dca4c841e753 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -193,8 +193,7 @@ OldaleTown_EventScript_FootprintsMan:: goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath msgbox OldaleTown_Text_DiscoveredFootprints, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FOOTPRINTS_MAN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_FOOTPRINTS_MAN, Common_Movement_FaceOriginalDirection release end @@ -205,8 +204,7 @@ OldaleTown_EventScript_BlockedPath:: waitmovement 0 msgbox OldaleTown_Text_WaitDontComeInHere, MSGBOX_DEFAULT closemessage - applymovement LOCALID_FOOTPRINTS_MAN, OldaleTown_Movement_ReturnToOriginalPosition - waitmovement 0 + applywaitmovement LOCALID_FOOTPRINTS_MAN, OldaleTown_Movement_ReturnToOriginalPosition releaseall end @@ -217,38 +215,31 @@ OldaleTown_EventScript_NotBlockingPath:: OldaleTown_EventScript_Rival:: lockall - applymovement LOCALID_OLDALE_RIVAL, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, Common_Movement_FacePlayer setvar VAR_0x8009, 0 goto OldaleTown_EventScript_ShowRivalMessage end OldaleTown_EventScript_RivalTrigger1:: lockall - applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer1 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer1 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage end OldaleTown_EventScript_RivalTrigger2:: lockall - applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer2 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer2 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage end OldaleTown_EventScript_RivalTrigger3:: lockall - applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer3 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalApproachPlayer3 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight setvar VAR_0x8009, 1 goto OldaleTown_EventScript_ShowRivalMessage end @@ -273,8 +264,7 @@ OldaleTown_EventScript_RivalFinish:: closemessage call_if_eq VAR_0x8009, 0, OldaleTown_EventScript_DoExitMovement1 call_if_eq VAR_0x8009, 1, OldaleTown_EventScript_DoExitMovement2 - applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit removeobject LOCALID_OLDALE_RIVAL setvar VAR_OLDALE_RIVAL_STATE, 2 setflag FLAG_HIDE_OLDALE_TOWN_RIVAL @@ -283,8 +273,7 @@ OldaleTown_EventScript_RivalFinish:: OldaleTown_EventScript_DoExitMovement1:: goto_if_ne VAR_FACING, DIR_SOUTH, OldaleTown_EventScript_DoExitMovement2 - applymovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit - waitmovement 0 + applywaitmovement LOCALID_OLDALE_RIVAL, OldaleTown_Movement_RivalExit return OldaleTown_EventScript_DoExitMovement2:: diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 62a85cddbdc3..2987ef35c86f 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -84,8 +84,7 @@ PetalburgCity_EventScript_Boy:: faceplayer msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_BOY, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_BOY, Common_Movement_FaceOriginalDirection release end @@ -258,14 +257,11 @@ PetalburgCity_EventScript_ShowGymToPlayer3:: end PetalburgCity_EventScript_ShowGymToPlayer:: - applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, Common_Movement_FacePlayer playbgm MUS_FOLLOW_ME, FALSE playse SE_PIN - applymovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_GYM_BOY, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark + applywaitmovement LOCALID_GYM_BOY, Common_Movement_Delay48 call_if_eq VAR_0x8008, 0, PetalburgCity_EventScript_BoyApproachPlayer0 call_if_eq VAR_0x8008, 1, PetalburgCity_EventScript_BoyApproachPlayer1 call_if_eq VAR_0x8008, 2, PetalburgCity_EventScript_BoyApproachPlayer2 @@ -282,36 +278,28 @@ PetalburgCity_EventScript_ShowGymToPlayer:: waitmovement 0 msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT closemessage - applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkAway - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkAway fadedefaultbgm releaseall end PetalburgCity_EventScript_BoyApproachPlayer0:: - applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_EventScript_BoyApproachPlayer1:: - applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer1 return PetalburgCity_EventScript_BoyApproachPlayer2:: - applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return PetalburgCity_EventScript_BoyApproachPlayer3:: - applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return PetalburgCity_EventScript_LeadPlayerToGym0:: @@ -528,27 +516,20 @@ PetalburgCity_EventScript_Scott3:: end PetalburgCity_EventScript_Scott:: - applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft playse SE_PIN - applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_SCOTT, Common_Movement_ExclamationMark + applywaitmovement LOCALID_PETALBURG_SCOTT, Common_Movement_Delay48 + applywaitmovement LOCALID_PETALBURG_SCOTT, PetalburgCity_Movement_ScottApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight setvar VAR_SCOTT_STATE, 1 msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterRight delay 30 msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_SCOTT, Common_Movement_WalkInPlaceFasterLeft delay 30 msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT closemessage diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 9565baecbbfb..f484869c5fd9 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -85,8 +85,7 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: removeobject LOCALID_PETALBURG_GYM_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY delay 30 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT setvar VAR_PETALBURG_GYM_STATE, 2 releaseall @@ -198,8 +197,7 @@ PetalburgCity_Gym_EventScript_WallyArriveSouth:: return PetalburgCity_Gym_EventScript_WallyArriveNorth:: - applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight waitmovement 0 @@ -238,8 +236,7 @@ PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: return PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterUp return PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @@ -261,33 +258,27 @@ PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: return PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight return PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_Gym_EventScript_WallyFacePlayer:: - applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_FacePlayer return PetalburgCity_Gym_EventScript_WallyFaceDown:: - applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_Gym_EventScript_NormanNoBadges:: @@ -315,8 +306,7 @@ PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: - applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown return PetalburgCity_Gym_EventScript_NormanFaceDoorWest:: @@ -420,13 +410,10 @@ PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: goto PetalburgCity_Gym_EventScript_WallysDadArrives PetalburgCity_Gym_EventScript_WallysDadArrives:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym playse SE_PIN - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_ExclamationMark + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_Delay48 delay 10 call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth call_if_eq VAR_0x8008, 2, PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast @@ -453,39 +440,33 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: end PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp return PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight return PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterLeft waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 return PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: - applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown waitmovement 0 diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 14cf1aabb4be..61a462f1516b 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -4,31 +4,24 @@ PetalburgWoods_MapScripts:: PetalburgWoods_EventScript_DevonResearcherLeft:: lockall call PetalburgWoods_EventScript_DevonResearcherIntro - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft - waitmovement 0 - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachPlayer msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff call PetalburgWoods_EventScript_DevonResearcherPostBattle applymovement LOCALID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitLeft @@ -39,32 +32,24 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: PetalburgWoods_EventScript_DevonResearcherRight:: lockall call PetalburgWoods_EventScript_DevonResearcherIntro - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaEntrance msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight - waitmovement 0 - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaBackOff call PetalburgWoods_EventScript_DevonResearcherPostBattle applymovement LOCALID_PLAYER, PetalburgWoods_Movement_WatchResearcherLeave applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherExitRight @@ -73,8 +58,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: end PetalburgWoods_EventScript_DevonResearcherIntro:: - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherLookAround - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherLookAround msgbox PetalburgWoods_Text_NotAOneToBeFound, MSGBOX_DEFAULT closemessage return @@ -82,11 +66,9 @@ PetalburgWoods_EventScript_DevonResearcherIntro:: PetalburgWoods_EventScript_DevonResearcherPostBattle:: msgbox PetalburgWoods_Text_YouveGotSomeNerve, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaRunAway - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_GRUNT, PetalburgWoods_Movement_AquaRunAway removeobject LOCALID_PETALBURG_WOODS_GRUNT - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT giveitem ITEM_GREAT_BALL goto_if_eq VAR_RESULT, FALSE, PetalburgWoods_EventScript_BagFull @@ -100,8 +82,7 @@ PetalburgWoods_EventScript_BagFull:: PetalburgWoods_EventScript_DevonResearcherFinish:: msgbox PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro, MSGBOX_DEFAULT - applymovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherStartExit - waitmovement 0 + applywaitmovement LOCALID_PETALBURG_WOODS_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherStartExit msgbox PetalburgWoods_Text_ICantBeWastingTime, MSGBOX_DEFAULT closemessage return diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 3cc5209df678..c548d98c8557 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -30,8 +30,7 @@ Route101_EventScript_StartBirchRescue:: applymovement LOCALID_ROUTE101_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchRunInCircles waitmovement 0 - applymovement LOCALID_ROUTE101_BIRCH, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE101_BIRCH, Common_Movement_WalkInPlaceFasterRight applymovement LOCALID_ROUTE101_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchFaceZigzagoon waitmovement 0 @@ -45,8 +44,7 @@ Route101_EventScript_PreventExitSouth:: lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route101_Movement_PreventExitSouth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route101_Movement_PreventExitSouth releaseall end @@ -54,8 +52,7 @@ Route101_EventScript_PreventExitWest:: lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route101_Movement_PreventExitWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route101_Movement_PreventExitWest releaseall end @@ -63,8 +60,7 @@ Route101_EventScript_PreventExitNorth:: lockall msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route101_Movement_PreventExitNorth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route101_Movement_PreventExitNorth releaseall end @@ -223,11 +219,9 @@ Route101_EventScript_BirchsBag:: fadescreen FADE_TO_BLACK removeobject LOCALID_ROUTE101_ZIGZAGOON setobjectxy LOCALID_PLAYER, 6, 13 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft special ChooseStarter - applymovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_ROUTE101_BIRCH, Route101_Movement_BirchApproachPlayer msgbox Route101_Text_YouSavedMe, MSGBOX_DEFAULT special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 941d464c37e0..637db1dd1c34 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -28,12 +28,9 @@ Route103_EventScript_RivalMay:: msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_MAY, TRUE - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_FacePlayer - waitmovement 0 - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_FacePlayer + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_Delay48 msgbox Route103_Text_MayLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_StartMayBattleTreecko @@ -45,12 +42,9 @@ Route103_EventScript_RivalBrendan:: msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT closemessage playbgm MUS_ENCOUNTER_BRENDAN, TRUE - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_FacePlayer - waitmovement 0 - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_ROUTE103_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_FacePlayer + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_ROUTE103_RIVAL, Common_Movement_Delay48 msgbox Route103_Text_BrendanLetsBattle, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_StartBrendanBattleTreecko @@ -112,8 +106,7 @@ Route103_EventScript_RivalExitFacingNorth:: applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExitFacingNorth1 waitmovement 0 playse SE_LEDGE - applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExitFacingNorth2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExitFacingNorth2 goto Route103_EventScript_RivalEnd end @@ -122,17 +115,14 @@ Route103_EventScript_RivalExitFacingEastOrWest:: applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit1 waitmovement 0 playse SE_LEDGE - applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit2 goto Route103_EventScript_RivalEnd end Route103_EventScript_RivalExitFacingSouth:: - applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit1 playse SE_LEDGE - applymovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE103_RIVAL, Route103_Movement_RivalExit2 goto Route103_EventScript_RivalEnd end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index e2c66a837cd1..f0451fd7150f 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -41,8 +41,7 @@ Route104_EventScript_DontSetRivalPos:: Route104_EventScript_Rival:: lockall setvar VAR_0x8008, 1 - applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_ROUTE104_RIVAL, Common_Movement_FacePlayer goto Route104_EventScript_RivalEncounter Route104_EventScript_RivalTrigger:: @@ -50,23 +49,18 @@ Route104_EventScript_RivalTrigger:: setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_ROUTE104_STATE, 2 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp delay 10 addobject LOCALID_ROUTE104_RIVAL clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement LOCALID_PLAYER, Route104_Movement_PlayerBackUp - waitmovement 0 - applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalExitBrineysCottage - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route104_Movement_PlayerBackUp + applywaitmovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalExitBrineysCottage delay 20 setvar VAR_0x8008, 0 call RustboroCity_EventScript_PlayRivalMusic playse SE_PIN - applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_ROUTE104_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_ROUTE104_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_ROUTE104_RIVAL, Common_Movement_Delay48 goto Route104_EventScript_RivalEncounter @ Unused, shares script with Rustboro encounter instead @@ -108,8 +102,7 @@ Route104_EventScript_MayEncounter:: msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer copyobjectxytoperm LOCALID_ROUTE104_RIVAL msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleMay @@ -194,8 +187,7 @@ Route104_EventScript_BrendanEncounter:: msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_ROUTE104_RIVAL, Route104_Movement_RivalApproachPlayer copyobjectxytoperm LOCALID_ROUTE104_RIVAL msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route104_EventScript_BattleBrendan @@ -345,11 +337,9 @@ Route104_EventScript_Girl2:: Route104_EventScript_SailToDewford:: setobjectsubpriority LOCALID_ROUTE104_BRINEY, MAP_ROUTE104, 0 setobjectsubpriority LOCALID_PLAYER, MAP_ROUTE104, 0 - applymovement LOCALID_ROUTE104_BRINEY, Route104_Movement_BrineyBoardBoat - waitmovement 0 + applywaitmovement LOCALID_ROUTE104_BRINEY, Route104_Movement_BrineyBoardBoat removeobject LOCALID_ROUTE104_BRINEY - applymovement LOCALID_PLAYER, Route104_Movement_PlayerBoardBoat - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route104_Movement_PlayerBoardBoat hideobjectat LOCALID_PLAYER, MAP_ROUTE104 call Common_EventScript_PlayBrineysBoatMusic goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall @@ -383,18 +373,15 @@ Route104_EventScript_SailToDewfordDadCalls:: Route104_EventScript_ArriveInDewford:: delay 50 - applymovement LOCALID_PLAYER, Route104_Movement_PlayerExitBoat - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route104_Movement_PlayerExitBoat call Common_EventScript_StopBrineysBoatMusic showobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN - applymovement LOCALID_PLAYER, Route104_Movement_PlayerMoveForBriney - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route104_Movement_PlayerMoveForBriney setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8 addobject LOCALID_DEWFORD_BRINEY setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - applymovement LOCALID_DEWFORD_BRINEY, Route104_Movement_BrineyExitBoat - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_BRINEY, Route104_Movement_BrineyExitBoat addobject LOCALID_DEWFORD_BOAT clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN call Common_EventScript_StopBrineysBoatMusic diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 88b802a8e76b..f008616c44c4 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -8,8 +8,7 @@ Route109_EventScript_StartDepartForDewford:: call EventScript_BackupMrBrineyLocation setobjectsubpriority LOCALID_ROUTE109_BRINEY, MAP_ROUTE109, 0 setobjectsubpriority LOCALID_PLAYER, MAP_ROUTE109, 0 - applymovement LOCALID_ROUTE109_BRINEY, Route109_Movement_BrineyEnterBoat - waitmovement 0 + applywaitmovement LOCALID_ROUTE109_BRINEY, Route109_Movement_BrineyEnterBoat removeobject LOCALID_ROUTE109_BRINEY switch VAR_FACING case DIR_SOUTH, Route109_EventScript_EnterBoatSouth @@ -18,20 +17,17 @@ Route109_EventScript_StartDepartForDewford:: end Route109_EventScript_EnterBoatSouth:: - applymovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatSouth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatSouth goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatEast:: - applymovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatEast - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatEast goto Route109_EventScript_DoSailToDewford end Route109_EventScript_EnterBoatWest:: - applymovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route109_Movement_PlayerEnterBoatWest goto Route109_EventScript_DoSailToDewford end @@ -44,15 +40,13 @@ Route109_EventScript_DoSailToDewford:: delay 50 call Common_EventScript_StopBrineysBoatMusic showobjectat LOCALID_PLAYER, MAP_DEWFORD_TOWN - applymovement LOCALID_PLAYER, Route109_Movement_PlayerExitBoat - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route109_Movement_PlayerExitBoat addobject LOCALID_DEWFORD_BOAT clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setobjectxyperm LOCALID_DEWFORD_BRINEY, 12, 8 addobject LOCALID_DEWFORD_BRINEY setobjectsubpriority LOCALID_DEWFORD_BRINEY, MAP_DEWFORD_TOWN, 0 - applymovement LOCALID_DEWFORD_BRINEY, Route109_Movement_BrineyExitBoat - waitmovement 0 + applywaitmovement LOCALID_DEWFORD_BRINEY, Route109_Movement_BrineyExitBoat clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat LOCALID_ROUTE109_BOAT, MAP_ROUTE109 @@ -321,8 +315,7 @@ Route109_EventScript_SandCastleBoy:: faceplayer msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -335,16 +328,14 @@ Route109_EventScript_SoftSandGirl:: giveitem ITEM_SOFT_SAND goto_if_eq VAR_RESULT, 0, Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection setflag FLAG_RECEIVED_SOFT_SAND release end Route109_EventScript_AlreadyReceivedSoftSand:: msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 984595a82c98..36a7810b3c4c 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -31,8 +31,7 @@ Route110_EventScript_AquaGrunt1:: lock faceplayer msgbox Route110_Text_WeCantTalkAboutAquaActivities, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -40,8 +39,7 @@ Route110_EventScript_AquaGrunt2:: lock faceplayer msgbox Route110_Text_KickUpARuckus, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -49,8 +47,7 @@ Route110_EventScript_AquaGrunt3:: lock faceplayer msgbox Route110_Text_MyFirstJobInAqua, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -58,8 +55,7 @@ Route110_EventScript_AquaGrunt4:: lock faceplayer msgbox Route110_Text_AquaActionsBringSmiles, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -299,8 +295,7 @@ Route110_EventScript_Alyssa:: Route110_EventScript_CyclingChallengeEnd:: lockall - applymovement LOCALID_CHALLENGE_BIKER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_CHALLENGE_BIKER, Common_Movement_WalkInPlaceFasterRight call Route110_EventScript_CyclingChallengeResults releaseall end @@ -373,12 +368,9 @@ Route110_EventScript_RivalScene:: checkplayergender call_if_eq VAR_RESULT, MALE, Route110_EventScript_PlayMayMusic call_if_eq VAR_RESULT, FEMALE, Route110_EventScript_PlayBrendanMusic - applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 - applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_ROUTE110_RIVAL, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL, Common_Movement_WalkInPlaceFasterDown + applywaitmovement LOCALID_ROUTE110_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_ROUTE110_RIVAL, Common_Movement_Delay48 delay 30 call_if_eq VAR_0x8008, 1, Route110_EventScript_RivalApproachPlayer1 call_if_eq VAR_0x8008, 2, Route110_EventScript_RivalApproachPlayer2 @@ -482,33 +474,27 @@ Route110_EventScript_RivalExit:: end Route110_EventScript_RivalApproachPlayer1:: - applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer1 return Route110_EventScript_RivalApproachPlayer2:: - applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer2 return Route110_EventScript_RivalApproachPlayer3:: - applymovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer3 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL, Route110_Movement_RivalApproachPlayer3 return Route110_EventScript_RivalExit1:: - applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit1 return Route110_EventScript_RivalExit2:: - applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit2 return Route110_EventScript_RivalExit3:: - applymovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit3 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_RIVAL_ON_BIKE, Route110_Movement_RivalExit3 return Route110_EventScript_MoveRival1:: @@ -592,13 +578,10 @@ Route110_EventScript_BirchScene4:: Route110_EventScript_BirchScene:: addobject LOCALID_ROUTE110_BIRCH - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchEntrance - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchEntrance playse SE_PIN - applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Common_Movement_ExclamationMark + applywaitmovement LOCALID_ROUTE110_BIRCH, Common_Movement_Delay48 call_if_eq VAR_0x8008, 1, Route110_EventScript_BirchApproachPlayer1 call_if_eq VAR_0x8008, 2, Route110_EventScript_BirchApproachPlayer2 call_if_eq VAR_0x8008, 3, Route110_EventScript_BirchApproachPlayer3 @@ -606,14 +589,11 @@ Route110_EventScript_BirchScene:: msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT closemessage delay 20 - applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterLeft delay 10 - applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterRight delay 20 - applymovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Common_Movement_WalkInPlaceFasterDown delay 30 msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT closemessage @@ -636,43 +616,35 @@ Route110_EventScript_BirchScene:: end Route110_EventScript_BirchApproachPlayer1:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer1 return Route110_EventScript_BirchApproachPlayer2:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer2 return Route110_EventScript_BirchApproachPlayer3:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer3 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer3 return Route110_EventScript_BirchApproachPlayer4:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer4 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchApproachPlayer4 return Route110_EventScript_BirchExit1:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit1 return Route110_EventScript_BirchExit2:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit2 return Route110_EventScript_BirchExit3:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit3 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit3 return Route110_EventScript_BirchExit4:: - applymovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit4 - waitmovement 0 + applywaitmovement LOCALID_ROUTE110_BIRCH, Route110_Movement_BirchExit4 return Route110_Movement_BirchEntrance: diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index cc3a867f8b86..979941eaa24a 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -35,8 +35,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_OnMachBike:: Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter releaseall end diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 1f88b6e27c66..f0554360cc09 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -20,8 +20,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter releaseall end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index e3b4660dad79..76aea40d8dfd 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -149,8 +149,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: delay 30 msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT closemessage - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_FacePlayer delay 30 msgbox Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent, MSGBOX_DEFAULT setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 @@ -177,11 +176,9 @@ Route110_TrickHouseEnd_EventScript_GiveBlueTent:: return Route110_TrickHouseEnd_EventScript_TrickMasterExit:: - applymovement LOCALID_TRICK_MASTER_END, Route110_TrickHouse_Movement_TrickMasterSpin - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Route110_TrickHouse_Movement_TrickMasterSpin playse SE_M_EXPLOSION - applymovement LOCALID_TRICK_MASTER_END, Route110_TrickHouse_Movement_TrickMasterJumpAway - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Route110_TrickHouse_Movement_TrickMasterJumpAway removeobject LOCALID_TRICK_MASTER_END addvar VAR_TRICK_HOUSE_LEVEL, 1 return @@ -199,41 +196,33 @@ Route110_TrickHouseEnd_EventScript_NoRoomForTent:: return Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterDown return Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterUp return Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterLeft return Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_WalkInPlaceFasterRight return Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: lockall turnobject LOCALID_TRICK_MASTER_END, DIR_WEST playse SE_PIN - applymovement LOCALID_TRICK_MASTER_END, Common_Movement_ExclamationMark - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Common_Movement_ExclamationMark delay 20 - applymovement LOCALID_TRICK_MASTER_END, Route110_TrickHouseEnd_Movement_TrickMasterSurprise - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER_END, Route110_TrickHouseEnd_Movement_TrickMasterSurprise playse SE_M_EXPLOSION - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom delay 4 turnobject LOCALID_TRICK_MASTER_END, DIR_EAST releaseall diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 93daa17b0b89..2ed70be705bb 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -203,11 +203,9 @@ Route110_TrickHouseEntrance_EventScript_BeginChallenge:: msgbox Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse, MSGBOX_DEFAULT closemessage delay 20 - applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin playse SE_M_EXPLOSION - applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway removeobject LOCALID_TRICK_MASTER setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 0 @@ -229,10 +227,8 @@ Route110_TrickHouseEntrance_EventScript_TrickMaster:: Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: playse SE_PIN - applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_ExclamationMark + applywaitmovement LOCALID_PLAYER, Common_Movement_Delay48 call_if_eq VAR_TRICK_HOUSE_LEVEL, 0, Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk call_if_eq VAR_TRICK_HOUSE_LEVEL, 1, Route110_TrickHouseEntrance_EventScript_FoundBehindTree call_if_eq VAR_TRICK_HOUSE_LEVEL, 2, Route110_TrickHouseEntrance_EventScript_FoundInDresser @@ -309,22 +305,17 @@ Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT closemessage - applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer playse SE_PIN - applymovement LOCALID_TRICK_MASTER, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_TRICK_MASTER, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_ExclamationMark + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_Delay48 msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT - applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp releaseall end Route110_TrickHouseEntrance_EventScript_GiveReward:: - applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT goto_if_eq VAR_TRICK_HOUSE_LEVEL, 1, Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward goto_if_eq VAR_TRICK_HOUSE_LEVEL, 2, Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward @@ -394,14 +385,12 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: Route110_TrickHouseEntrance_EventScript_GotReward:: setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3 - applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp releaseall end Route110_TrickHouseEntrance_EventScript_MechadollReward:: - applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_ChooseTent goto_if_eq VAR_RESULT, TRUE, Route110_TrickHouseEntrance_EventScript_ReceivedTent @@ -427,13 +416,10 @@ Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: Route110_TrickHouseEntrance_EventScript_ReceivedTent:: msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT closemessage - applymovement LOCALID_TRICK_MASTER, Route110_TrickHousePuzzle5_Movement_MechadollShake - waitmovement 0 - applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Route110_TrickHousePuzzle5_Movement_MechadollShake + applywaitmovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin playse SE_M_EXPLOSION - applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway - waitmovement 0 + applywaitmovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway removeobject LOCALID_TRICK_MASTER setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5 @@ -465,10 +451,8 @@ Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, FALSE special DrawWholeMapView delay 20 - applymovement LOCALID_PLAYER, Common_Movement_WalkUp - waitmovement 0 - applymovement LOCALID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkUp + applywaitmovement LOCALID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom switch VAR_TRICK_HOUSE_LEVEL case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1 case 1, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2 diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index c59dad2e5719..fd7661daf205 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -24,8 +24,7 @@ Route110_TrickHousePuzzle5_EventScript_FoundScroll:: Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: lockall - applymovement LOCALID_MECHADOLL_1, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Common_Movement_FacePlayer goto_if_eq VAR_TEMP_1, 1, Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate @@ -33,8 +32,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: lockall - applymovement LOCALID_MECHADOLL_2, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Common_Movement_FacePlayer goto_if_eq VAR_TEMP_2, 1, Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate @@ -42,8 +40,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: lockall - applymovement LOCALID_MECHADOLL_3, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Common_Movement_FacePlayer goto_if_eq VAR_TEMP_3, 1, Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate @@ -51,8 +48,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: lockall - applymovement LOCALID_MECHADOLL_4, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Common_Movement_FacePlayer goto_if_eq VAR_TEMP_4, 1, Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate @@ -60,8 +56,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: lockall - applymovement LOCALID_MECHADOLL_5, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Common_Movement_FacePlayer goto_if_eq VAR_TEMP_5, 1, Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate @@ -210,10 +205,8 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, LOCALID_MECHADOLL_1 playse SE_PIN - applymovement LOCALID_MECHADOLL_1, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MECHADOLL_1, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MECHADOLL_1, Common_Movement_Delay48 call_if_eq VAR_TEMP_9, 1, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 call_if_eq VAR_TEMP_9, 2, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 call_if_eq VAR_TEMP_9, 3, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 @@ -230,10 +223,8 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, LOCALID_MECHADOLL_2 playse SE_PIN - applymovement LOCALID_MECHADOLL_2, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MECHADOLL_2, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MECHADOLL_2, Common_Movement_Delay48 call_if_eq VAR_TEMP_9, 1, Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1 call_if_eq VAR_TEMP_9, 2, Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2 call_if_eq VAR_TEMP_9, 3, Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3 @@ -251,10 +242,8 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, LOCALID_MECHADOLL_3 playse SE_PIN - applymovement LOCALID_MECHADOLL_3, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MECHADOLL_3, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MECHADOLL_3, Common_Movement_Delay48 call_if_eq VAR_TEMP_9, 1, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 call_if_eq VAR_TEMP_9, 2, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 call_if_eq VAR_TEMP_9, 3, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 @@ -271,10 +260,8 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, LOCALID_MECHADOLL_4 playse SE_PIN - applymovement LOCALID_MECHADOLL_4, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MECHADOLL_4, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MECHADOLL_4, Common_Movement_Delay48 call_if_eq VAR_TEMP_9, 1, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1 call_if_eq VAR_TEMP_9, 2, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2 call_if_eq VAR_TEMP_9, 3, Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3 @@ -291,10 +278,8 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, LOCALID_MECHADOLL_5 playse SE_PIN - applymovement LOCALID_MECHADOLL_5, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_MECHADOLL_5, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Common_Movement_ExclamationMark + applywaitmovement LOCALID_MECHADOLL_5, Common_Movement_Delay48 msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Intro, MSGBOX_DEFAULT random 3 switch VAR_RESULT @@ -538,253 +523,203 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight1 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight1 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight2 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight2 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight3 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight3 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight4 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight4 return Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5:: - applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5:: - applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5:: - applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5:: - applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight5 return Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5:: - applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight5 - waitmovement 0 + applywaitmovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight5 return Route110_TrickHousePuzzle5_Movement_WalkLeft1: diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 45f4e8d0f12b..0f99061d388d 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -229,9 +229,7 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 0 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -241,9 +239,7 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 1 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -253,9 +249,7 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 2 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -265,9 +259,7 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 3 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end @@ -278,9 +270,7 @@ Route110_TrickHousePuzzle7_EventScript_RedButton:: playse SE_REPEL initrotatingtilepuzzle TRUE moverotatingtileobjects 4 - waitmovement 0 turnrotatingtileobjects - waitmovement 0 freerotatingtilepuzzle end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 6ce2ff3d08be..73bed78440de 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -204,23 +204,19 @@ Route111_EventScript_PreventRouteAccess:: end Route111_EventScript_PushUpFromRoute:: - applymovement LOCALID_PLAYER, Route111_Movement_PushUpFromRoute - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_PushUpFromRoute return Route111_EventScript_PushDownFromRoute:: - applymovement LOCALID_PLAYER, Route111_Movement_PushDownFromRoute - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_PushDownFromRoute return Route111_EventScript_PushLeftFromRoute:: - applymovement LOCALID_PLAYER, Route111_Movement_PushLeftFromRoute - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_PushLeftFromRoute return Route111_EventScript_PushRightFromRoute:: - applymovement LOCALID_PLAYER, Route111_Movement_PushRightFromRoute - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_PushRightFromRoute return Route111_Movement_PushUpFromRoute: @@ -265,67 +261,53 @@ Route111_EventScript_Victor:: Route111_EventScript_BattleWinstrates:: msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat - applymovement LOCALID_ROUTE111_VICTOR, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICTOR, Common_Movement_WalkInPlaceFasterUp call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE111_VICTOR, Route111_Movement_WinstrateEnterHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICTOR, Route111_Movement_WinstrateEnterHouse removeobject LOCALID_ROUTE111_VICTOR call Route111_EventScript_CloseWinstrateDoor - applymovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate call Route111_EventScript_OpenWinstrateDoor addobject LOCALID_ROUTE111_VICTORIA - applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateExitHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateExitHouse call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat - applymovement LOCALID_ROUTE111_VICTORIA, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICTORIA, Common_Movement_WalkInPlaceFasterUp call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateEnterHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICTORIA, Route111_Movement_WinstrateEnterHouse removeobject LOCALID_ROUTE111_VICTORIA call Route111_EventScript_CloseWinstrateDoor - applymovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate call Route111_EventScript_OpenWinstrateDoor addobject LOCALID_ROUTE111_VIVI - applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateExitHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateExitHouse call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat - applymovement LOCALID_ROUTE111_VIVI, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VIVI, Common_Movement_WalkInPlaceFasterUp call Route111_EventScript_OpenWinstrateDoor msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateEnterHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VIVI, Route111_Movement_WinstrateEnterHouse removeobject LOCALID_ROUTE111_VIVI call Route111_EventScript_CloseWinstrateDoor - applymovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route111_Movement_WaitForNextWinstrate call Route111_EventScript_OpenWinstrateDoor addobject LOCALID_ROUTE111_VICKY - applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateExitHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateExitHouse call Route111_EventScript_CloseWinstrateDoor msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE111_VICKY, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICKY, Common_Movement_WalkInPlaceFasterUp call Route111_EventScript_OpenWinstrateDoor - applymovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateEnterHouse - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_VICKY, Route111_Movement_WinstrateEnterHouse removeobject LOCALID_ROUTE111_VICKY call Route111_EventScript_CloseWinstrateDoor release @@ -415,12 +397,10 @@ Route111_EventScript_HikerMirageTowerVisible:: Route111_EventScript_RockSmashTipFatMan:: lockall - applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FacePlayer msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_ROUTE111_ROCK_SMASH_MAN, Common_Movement_FaceOriginalDirection releaseall end diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 4f44241cf98b..71f823b1d2dc 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -51,8 +51,7 @@ Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: closemessage - applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 73e229532f40..0bb39da88501 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -10,37 +10,29 @@ Route112_OnTransition: Route112_EventScript_MagmaGrunts:: lockall delay 40 - applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight delay 20 msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection delay 40 - applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft delay 20 msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection delay 40 - applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_WalkInPlaceFasterRight delay 20 msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_1, Common_Movement_FaceOriginalDirection delay 40 - applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft delay 20 msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_ROUTE112_GRUNT_2, Common_Movement_FaceOriginalDirection releaseall end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 617ff90d19a6..d24bad2d6995 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -68,13 +68,11 @@ Route116_EventScript_GiveRepeatBall:: end Route116_EventScript_DevonEmployeeExit:: - applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit return Route116_EventScript_DevonEmployeeExitEast:: - applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast return Route116_EventScript_TryGiveRepeatBallAgain:: @@ -192,13 +190,11 @@ Route116_EventScript_GlassesManExit:: end Route116_EventScript_GlassesManExitNormal:: - applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit return Route116_EventScript_GlassesManExitEast:: - applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast return Route116_Movement_GlassesManExit: diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 3ea728d365b5..82836c73c5f8 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -62,35 +62,29 @@ Route118_EventScript_RouteSign119:: Route118_EventScript_StevenTrigger0:: lockall setvar VAR_0x8008, 0 - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 - applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge0 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp + applywaitmovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge0 goto Route118_EventScript_StevenTrigger end Route118_EventScript_StevenTrigger1:: lockall setvar VAR_0x8008, 1 - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp goto Route118_EventScript_StevenTrigger end Route118_EventScript_StevenTrigger2:: lockall setvar VAR_0x8008, 2 - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 - applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge2 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp + applywaitmovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenApproachLedge2 goto Route118_EventScript_StevenTrigger end Route118_EventScript_StevenTrigger:: playse SE_LEDGE - applymovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenJumpLedge - waitmovement 0 + applywaitmovement LOCALID_ROUTE118_STEVEN, Route118_Movement_StevenJumpLedge delay 30 msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT closemessage diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index d218fb60dc91..2bb8a631beaa 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -45,8 +45,7 @@ Route119_EventScript_RivalEncounter:: delay 65 call_if_eq VAR_TEMP_1, 1, Route119_EventScript_RivalEnter1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_RivalEnter2 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown delay 30 call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetRivalPos1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetRivalPos2 @@ -149,8 +148,7 @@ Route119_EventScript_RivalExitScottArrive:: call_if_eq VAR_TEMP_1, 1, Route119_EventScript_SetScottPos1 call_if_eq VAR_TEMP_1, 2, Route119_EventScript_SetScottPos2 addobject LOCALID_ROUTE119_SCOTT - applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottEnter - waitmovement 0 + applywaitmovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottEnter addvar VAR_SCOTT_STATE, 1 msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT closemessage @@ -169,23 +167,19 @@ Route119_EventScript_SetScottPos2:: return Route119_EventScript_ScottExit1:: - applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit1 return Route119_EventScript_ScottExit2:: - applymovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE119_SCOTT, Route119_Movement_ScottExit2 return Route119_EventScript_RivalEnter1:: - applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1 - waitmovement 0 + applywaitmovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1 return Route119_EventScript_RivalEnter2:: - applymovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2 - waitmovement 0 + applywaitmovement LOCALID_ROUTE119_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2 return Route119_EventScript_RivalExit1:: @@ -439,8 +433,7 @@ Route119_EventScript_BridgeAquaGrunt1:: faceplayer msgbox Route119_Text_StayAwayFromWeatherInstitute, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -449,8 +442,7 @@ Route119_EventScript_BridgeAquaGrunt2:: faceplayer msgbox Route119_Text_DontGoNearWeatherInstitute, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index ce5e44d07707..7435e6666cd2 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -53,10 +53,8 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: msgbox Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy, MSGBOX_DEFAULT closemessage playse SE_PIN - applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_ExclamationMark + applywaitmovement LOCALID_WEATHER_INSTITUTE_2F_SHELLY, Common_Movement_Delay48 msgbox Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 @@ -70,11 +68,9 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: removeobject LOCALID_WEATHER_INSTITUTE_2F_SHELLY removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_4 removeobject LOCALID_WEATHER_INSTITUTE_2F_GRUNT_3 - applymovement LOCALID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition fadescreen FADE_FROM_BLACK - applymovement LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer copyobjectxytoperm LOCALID_WEATHER_INSTITUTE_2F_SCIENTIST goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index c3162ecd9d15..1d03f405f618 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -177,15 +177,12 @@ Route120_EventScript_StevenBattleKecleon:: closemessage call_if_eq VAR_FACING, DIR_NORTH, Route120_EventScript_PlayerApproachKecleonNorth call_if_eq VAR_FACING, DIR_WEST, Route120_EventScript_PlayerApproachKecleonWest - applymovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterLeft delay 20 msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT closemessage - applymovement LOCALID_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 - applymovement LOCALID_BRIDGE_KECLEON, Movement_KecleonAppears - waitmovement 0 + applywaitmovement LOCALID_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFasterRight + applywaitmovement LOCALID_BRIDGE_KECLEON, Movement_KecleonAppears waitse playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER delay 40 @@ -219,8 +216,7 @@ Route120_EventScript_StevenGiveDeconScope:: setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_ROUTE120_STEVEN, Common_Movement_WalkInPlaceFasterDown delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT @@ -236,13 +232,11 @@ Route120_EventScript_StevenGiveDeconScope:: end Route120_EventScript_PlayerApproachKecleonNorth:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return Route120_EventScript_PlayerApproachKecleonWest:: - applymovement LOCALID_PLAYER, Route120_Movement_ApproachKecleonWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route120_Movement_ApproachKecleonWest return Route120_Movement_ApproachKecleonWest: diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index beb9e3a91dbb..d6603d1cae16 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -16,8 +16,7 @@ Route121_EventScript_SafariZoneSign:: Route121_EventScript_AquaGruntsMoveOut:: lockall playbgm MUS_ENCOUNTER_AQUA, FALSE - applymovement LOCALID_ROUTE121_GRUNT_2, Common_Movement_WalkInPlaceRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE121_GRUNT_2, Common_Movement_WalkInPlaceRight msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT closemessage applymovement LOCALID_ROUTE121_GRUNT_1, Route121_Movement_Grunt1Exit diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 0fb6411406e6..5fad7ec443d9 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -8,8 +8,7 @@ Route121_SafariZoneEntrance_OnFrame: Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: lockall - applymovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -45,8 +44,7 @@ Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp showmoneybox 0, 0 msgbox Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone @@ -71,8 +69,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT closemessage hidemoneybox - applymovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone special EnterSafariMode setvar VAR_SAFARI_ZONE_STATE, 2 clearflag FLAG_GOOD_LUCK_SAFARI_ZONE @@ -105,8 +102,7 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: closemessage hidemoneybox - applymovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter releaseall end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 06a75d87c480..c7f90155b85a 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -14,24 +14,18 @@ Route128_OnFrame: Route128_EventScript_KyogreAwakenedScene:: lockall delay 20 - applymovement LOCALID_ROUTE128_ARCHIE, Route128_Movement_ArchieLookAround - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_ARCHIE, Route128_Movement_ArchieLookAround msgbox Route128_Text_ArchieWhatHappened, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE128_ARCHIE, Route128_Movement_ArchieBackUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_ARCHIE, Route128_Movement_ArchieBackUp msgbox Route128_Text_ArchieIOnlyWanted, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE128_MAXIE, Route128_Movement_MaxieApproachArchie - waitmovement 0 - applymovement LOCALID_ROUTE128_ARCHIE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_MAXIE, Route128_Movement_MaxieApproachArchie + applywaitmovement LOCALID_ROUTE128_ARCHIE, Common_Movement_WalkInPlaceFasterUp msgbox Route128_Text_MaxieDoYouUnderstandNow, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE128_MAXIE, Route128_Movement_MaxieApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_MAXIE, Route128_Movement_MaxieApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT closemessage applymovement LOCALID_ROUTE128_ARCHIE, Route128_Movement_ArchieRunLeft @@ -51,22 +45,18 @@ Route128_EventScript_KyogreAwakenedScene:: dofieldeffect FLDEFF_NPCFLY_OUT waitfieldeffect FLDEFF_NPCFLY_OUT addobject LOCALID_ROUTE128_STEVEN - applymovement LOCALID_ROUTE128_STEVEN, Route128_Movement_StevenApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_STEVEN, Route128_Movement_StevenApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT closemessage applymovement LOCALID_ROUTE128_STEVEN, Route128_Movement_StevenWalkUp applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT - applymovement LOCALID_ROUTE128_STEVEN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_STEVEN, Common_Movement_WalkInPlaceFasterDown msgbox Route128_Text_StevenImGoingToSootopolis, MSGBOX_DEFAULT closemessage - applymovement LOCALID_ROUTE128_STEVEN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_ROUTE128_STEVEN, Common_Movement_WalkInPlaceFasterDown delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index f156bfa5b72e..784fb489dbdb 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -31,27 +31,20 @@ RustboroCity_OnFrame: RustboroCity_EventScript_ScientistAddMatchCall:: lockall setvar VAR_ROUTE104_STATE, 1 - applymovement LOCALID_PLAYER, RustboroCity_Movement_PlayerWalkDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, RustboroCity_Movement_PlayerWalkDown playse SE_EXIT delay 10 addobject LOCALID_RUSTBORO_SCIENTIST - applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer playse SE_PIN - applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 - applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistWalkInPlaceDown msgbox RustboroCity_Text_DevelopedNewPokenavFeature, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL - applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterLeft playse SE_CLICK delay 10 playse SE_CLICK @@ -60,8 +53,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: delay 10 playse SE_CLICK delay 20 - applymovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, Common_Movement_WalkInPlaceFasterDown msgbox RustboroCity_Text_AddedMatchCallPleaseCallMrStone, MSGBOX_DEFAULT closemessage delay 20 @@ -89,8 +81,7 @@ RustboroCity_EventScript_MatchCallTutorial:: delay 20 msgbox RustboroCity_Text_IdBetterGetBackToWork, MSGBOX_DEFAULT closemessage - applymovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistLeave - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_SCIENTIST, RustboroCity_Movement_ScientistLeave playse SE_EXIT removeobject LOCALID_RUSTBORO_SCIENTIST setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST @@ -218,8 +209,7 @@ RustboroCity_EventScript_LittleBoy:: lock faceplayer msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT - applymovement LOCALID_RUSTBORO_LITTLE_BOY, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_LITTLE_BOY, Common_Movement_FaceOriginalDirection release end @@ -227,8 +217,7 @@ RustboroCity_EventScript_LittleGirl:: lock faceplayer msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT - applymovement LOCALID_RUSTBORO_LITTLE_GIRL, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_LITTLE_GIRL, Common_Movement_FaceOriginalDirection release end @@ -285,15 +274,12 @@ RustboroCity_EventScript_StolenGoodsScene:: playbgm MUS_ENCOUNTER_AQUA, FALSE addobject LOCALID_RUSTBORO_GRUNT addobject LOCALID_RUSTBORO_DEVON_EMPLOYEE - applymovement LOCALID_RUSTBORO_GRUNT, RustboroCity_Movement_GruntEscape - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_GRUNT, RustboroCity_Movement_GruntEscape removeobject LOCALID_RUSTBORO_GRUNT - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1 - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt1 msgbox RustboroCity_Text_WaitDontTakeMyGoods, MSGBOX_DEFAULT closemessage - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2 - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeChaseGrunt2 fadedefaultbgm removeobject LOCALID_RUSTBORO_DEVON_EMPLOYEE setobjectxyperm LOCALID_RUSTBORO_DEVON_EMPLOYEE, 30, 10 @@ -322,34 +308,28 @@ RustboroCity_EventScript_YouGotItThankYou:: @ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions RustboroCity_EventScript_EmployeeApproachUp:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp return @ Unused, see above RustboroCity_EventScript_EmployeeApproachLeft:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft return @ Unused, see above RustboroCity_EventScript_EmployeeApproachRight:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight return @ Unused, see above RustboroCity_EventScript_EmployeeApproachDown:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown return @ Unused, similar movement to the above scripts RustboroCity_EventScript_EmployeeApproachPlayerFar:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return @ Unused @@ -507,53 +487,36 @@ RustboroCity_EventScript_EmployeeAskToGetGoods:: @ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods RustboroCity_EventScript_EmployeeFacePlayerUp1:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return RustboroCity_EventScript_EmployeeFacePlayerLeft1:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_FaceRight - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceRight return RustboroCity_EventScript_EmployeeFacePlayerDown1:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return RustboroCity_EventScript_EmployeeApproachPlayerDown1:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return RustboroCity_Movement_EmployeeApproachPlayerDown: @@ -609,70 +572,49 @@ RustboroCity_EventScript_BagFull:: return RustboroCity_EventScript_EmployeeFacePlayerUp2:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return RustboroCity_EventScript_EmployeeFacePlayerLeft2:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterRight playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_FaceLeft - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceLeft return RustboroCity_EventScript_EmployeeFacePlayerDown2:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return RustboroCity_EventScript_EmployeeApproachPlayerDown2:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerDown + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp return RustboroCity_EventScript_EmployeeFacePlayerRight:: - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterLeft playse SE_PIN - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_DEVON_EMPLOYEE, Common_Movement_Delay48 return RustboroCity_EventScript_Rival:: lockall call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_FacePlayer goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_PlayRivalMusic:: @@ -692,129 +634,89 @@ RustboroCity_EventScript_PlayBrendanMusic:: RustboroCity_EventScript_RivalTrigger0:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer0 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger1:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer1 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer1 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger2:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer2 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer2 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger3:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer3 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer3 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger4:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer4 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer4 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger5:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer5 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer5 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger6:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer6 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer6 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalTrigger7:: lockall call RustboroCity_EventScript_PlayRivalMusic - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_WalkInPlaceFasterDown playse SE_PIN - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer7 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTBORO_RIVAL, Common_Movement_Delay48 + applywaitmovement LOCALID_RUSTBORO_RIVAL, RustboroCity_Movement_RivalApproachPlayer7 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp goto RustboroCity_EventScript_RivalEncounter RustboroCity_EventScript_RivalEncounter:: diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index bd796aab6f55..d76510791cc5 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -71,10 +71,8 @@ RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: closemessage playse SE_PIN - applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark + applywaitmovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_Delay48 msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil checkitem ITEM_CLAW_FOSSIL @@ -94,10 +92,8 @@ RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: closemessage playse SE_PIN - applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark + applywaitmovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_Delay48 msgbox RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil checkitem ITEM_ROOT_FOSSIL diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 91b1ad522249..c4472204fb69 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -29,11 +29,9 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: lockall msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen - waitmovement 0 + applywaitmovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen delay 80 - applymovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer - waitmovement 0 + applywaitmovement LOCALID_DEVON_CORP_3F_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT closemessage playbgm MUS_FOLLOW_ME, FALSE @@ -153,8 +151,7 @@ RustboroCity_DevonCorp_3F_EventScript_MrStone:: goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_GiveExpShare msgbox RustboroCity_DevonCorp_3F_Text_CountingOnYou, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -165,16 +162,14 @@ RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_ExplainExpShare, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index ebc244d93a23..dba6f5decca3 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -50,8 +50,7 @@ RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry2, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda msgbox RustboroCity_Flat1_2F_Text_OhShesLaughing, MSGBOX_DEFAULT - applymovement LOCALID_WALDAS_DAD, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_WALDAS_DAD, Common_Movement_FacePlayer msgbox RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 8a409d49b3fd..4dc5e16d1887 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -84,27 +84,23 @@ RustboroCity_PokemonSchool_EventScript_Teacher:: giveitem ITEM_QUICK_CLAW goto_if_eq VAR_RESULT, 0, Common_EventScript_ShowBagIsFull closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown setflag FLAG_RECEIVED_QUICK_CLAW release end RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast return RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: - applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest return RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index de77c5a996a3..2e0df19b969a 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -22,8 +22,7 @@ RusturfTunnel_EventScript_Wanda:: faceplayer msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -34,16 +33,14 @@ RusturfTunnel_EventScript_WandasBoyfriend:: setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_WhyCantTheyKeepDigging, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end RusturfTunnel_EventScript_AlreadySpokenTo:: msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end @@ -82,28 +79,23 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: applymovement LOCALID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown return RusturfTunnel_EventScript_BoyfriendApproachWanda3:: applymovement LOCALID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda waitmovement 0 - applymovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDA, Common_Movement_WalkInPlaceFasterDown return RusturfTunnel_EventScript_FaceWandasBoyfriend1:: - applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_WalkInPlaceFasterUp + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return RusturfTunnel_EventScript_FaceWandasBoyfriend2:: - applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight return RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @@ -111,8 +103,7 @@ RusturfTunnel_EventScript_FaceWandasBoyfriend3:: RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: closemessage - applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer return RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @@ -130,10 +121,8 @@ RusturfTunnel_EventScript_WandaAndBoyfriendExit:: RusturfTunnel_EventScript_WandasBoyfriendNotice:: playse SE_PIN - applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_ExclamationMark + applywaitmovement LOCALID_RUSTURF_TUNNEL_WANDAS_BF, Common_Movement_Delay48 return RusturfTunnel_Movement_WandaExit1: @@ -310,14 +299,12 @@ RusturfTunnel_EventScript_Grunt:: removeobject LOCALID_RUSTURF_TUNNEL_GRUNT delay 50 addobject LOCALID_RUSTURF_TUNNEL_BRINEY - applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko1 - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko1 applymovement LOCALID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, RusturfTunnel_Movement_BrineyApproachPeeko2 waitmovement 0 msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT - applymovement LOCALID_RUSTURF_TUNNEL_BRINEY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_RUSTURF_TUNNEL_BRINEY, Common_Movement_FacePlayer message RusturfTunnel_Text_ThankYouLetsGoHomePeeko waitmessage waitse diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index c36fb3b83b6d..7055615c9a07 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -184,10 +184,8 @@ SSTidalCorridor_EventScript_TrainerNotDefeated:: SSTidalCorridor_EventScript_ScottScene:: lockall - applymovement LOCALID_SS_TIDAL_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SS_TIDAL_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT closemessage applymovement LOCALID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit @@ -197,8 +195,7 @@ SSTidalCorridor_EventScript_ScottScene:: playse SE_EXIT waitse removeobject LOCALID_SS_TIDAL_SCOTT - applymovement LOCALID_SS_TIDAL_EXIT_SAILOR, SSTidalCorridor_Movement_SailorReturn - waitmovement 0 + applywaitmovement LOCALID_SS_TIDAL_EXIT_SAILOR, SSTidalCorridor_Movement_SailorReturn delay 30 setflag FLAG_MET_SCOTT_ON_SS_TIDAL setvar VAR_SS_TIDAL_SCOTT_STATE, 1 diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 446175add683..f750cb9a3c23 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -9,10 +9,8 @@ SafariZone_South_OnFrame: SafariZone_South_EventScript_EnterSafariZone:: lockall - applymovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerEnter - waitmovement 0 - applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_ExitAttendantBlockDoor - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerEnter + applywaitmovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_ExitAttendantBlockDoor setobjectxyperm LOCALID_SAFARI_EXIT_ATTENDANT, 32, 34 setvar VAR_SAFARI_ZONE_STATE, 0 releaseall @@ -72,18 +70,14 @@ SafariZone_South_EventScript_ExitEarly:: end SafariZone_South_EventScript_ExitEarlyNorth:: - applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantNorth - waitmovement 0 - applymovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerExitNorth - waitmovement 0 + applywaitmovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantNorth + applywaitmovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerExitNorth goto SafariZone_South_EventScript_Exit end SafariZone_South_EventScript_ExitEarlyEast:: - applymovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantEast - waitmovement 0 - applymovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerExitEast - waitmovement 0 + applywaitmovement LOCALID_SAFARI_EXIT_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantEast + applywaitmovement LOCALID_PLAYER, SafariZone_South_Movement_PlayerExitEast goto SafariZone_South_EventScript_Exit end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 05bf490e7d4c..324fb700602b 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -12,10 +12,8 @@ SeafloorCavern_Entrance_EventScript_Grunt:: goto_if_eq VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1, SeafloorCavern_Entrance_EventScript_GruntSpeechShort waitse playse SE_PIN - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_ExclamationMark + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_Delay48 delay 20 call_if_eq VAR_FACING, DIR_WEST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest call_if_eq VAR_FACING, DIR_EAST, SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast @@ -25,8 +23,7 @@ SeafloorCavern_Entrance_EventScript_Grunt:: copyobjectxytoperm LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp releaseall end @@ -36,24 +33,20 @@ SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: call_if_eq VAR_FACING, DIR_NORTH, SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth msgbox SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterUp releaseall end SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterLeft return SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterRight return SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: - applymovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, Common_Movement_WalkInPlaceFasterDown return SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 48cc55b0e8be..cb05c2eb0407 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -7,24 +7,18 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: setvar VAR_0x8005, LOCALID_SEAFLOOR_CAVERN_MAXIE setvar VAR_0x8006, LOCALID_SEAFLOOR_CAVERN_GRUNT_1 setvar VAR_0x8007, LOCALID_SEAFLOOR_CAVERN_GRUNT_2 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 - applymovement LOCALID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp + applywaitmovement LOCALID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 playbgm MUS_ENCOUNTER_AQUA, FALSE msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft + applywaitmovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer msgbox SeafloorCavern_Room9_Text_ArchieSoItWasYou, MSGBOX_DEFAULT - applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp msgbox SeafloorCavern_Room9_Text_ArchieBeholdKyogre, MSGBOX_DEFAULT - applymovement VAR_0x8004, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_FacePlayer msgbox SeafloorCavern_Room9_Text_ArchieYouMustDisappear, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_ArchieDefeat msgbox SeafloorCavern_Room9_Text_ArchieWithThisRedOrb, MSGBOX_DEFAULT @@ -50,8 +44,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: addobject LOCALID_SEAFLOOR_CAVERN_KYOGRE waitstate delay 60 - applymovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreApproach - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreApproach special FadeOutOrbEffect setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -59,8 +52,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreExit - waitmovement 0 + applywaitmovement LOCALID_SEAFLOOR_CAVERN_KYOGRE, SeafloorCavern_Room9_Movement_KyogreExit removeobject LOCALID_SEAFLOOR_CAVERN_KYOGRE delay 4 setvar VAR_0x8004, 2 @ vertical pan @@ -76,18 +68,15 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: setvar VAR_0x8007, LOCALID_SEAFLOOR_CAVERN_GRUNT_2 msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieListenMessage - waitmovement 0 + applywaitmovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieListenMessage msgbox SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_WalkInPlaceFasterDown msgbox SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 @@ -97,14 +86,11 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_MagmaGruntArrive applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieArrive waitmovement 0 - applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft msgbox SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x8004, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8004, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8004, Common_Movement_Delay48 msgbox SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 8a5eccc62456..105fea2fe1ed 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -32,10 +32,8 @@ SkyPillar_Outside_OnFrame: SkyPillar_Outside_EventScript_WallaceScene:: lockall - applymovement LOCALID_SKY_PILLAR_WALLACE, SkyPillar_Outside_Movement_WallaceApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SKY_PILLAR_WALLACE, SkyPillar_Outside_Movement_WallaceApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox SkyPillar_Outside_Text_OpenedDoorToSkyPillar, MSGBOX_DEFAULT closemessage delay 30 @@ -58,14 +56,11 @@ SkyPillar_Outside_EventScript_WallaceScene:: special ShakeCamera waitstate delay 20 - applymovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterLeft delay 10 - applymovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterRight delay 20 - applymovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SKY_PILLAR_WALLACE, Common_Movement_WalkInPlaceFasterDown delay 30 msgbox SkyPillar_Outside_Text_SituationGettingWorse, MSGBOX_DEFAULT closemessage diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 37e23c161cf5..be55eb8d7507 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -87,14 +87,11 @@ SkyPillar_Top_EventScript_RanFromRayquaza2:: SkyPillar_Top_EventScript_AwakenRayquaza:: lockall fadeoutbgm 1 - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp special SpawnCameraObject - applymovement LOCALID_CAMERA, SkyPillar_Top_Movement_CameraPanUp - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SkyPillar_Top_Movement_CameraPanUp special RemoveCameraObject - applymovement LOCALID_RAYQUAZA_SLEEPING, SkyPillar_Top_Movement_RayquazaStir - waitmovement 0 + applywaitmovement LOCALID_RAYQUAZA_SLEEPING, SkyPillar_Top_Movement_RayquazaStir waitse playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER setvar VAR_0x8004, 1 @ vertical pan @@ -112,16 +109,14 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: special ShakeCamera waitstate waitmoncry - applymovement LOCALID_RAYQUAZA_SLEEPING, SkyPillar_Top_Movement_RayquazaFlyOff - waitmovement 0 + applywaitmovement LOCALID_RAYQUAZA_SLEEPING, SkyPillar_Top_Movement_RayquazaFlyOff removeobject LOCALID_RAYQUAZA_SLEEPING msgbox SkyPillar_Top_Text_RayquazaFlewOff, MSGBOX_DEFAULT closemessage delay 20 fadeinbgm 1 special SpawnCameraObject - applymovement LOCALID_CAMERA, SkyPillar_Top_Movement_CameraPanDown - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SkyPillar_Top_Movement_CameraPanDown special RemoveCameraObject setvar VAR_SOOTOPOLIS_CITY_STATE, 5 setvar VAR_SKY_PILLAR_STATE, 1 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 00f02b6cede1..524a0c307981 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -58,12 +58,10 @@ SlateportCity_EventScript_ScottScene:: waitmovement 0 msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterLeft delay 60 msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT - applymovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_SCOTT, Common_Movement_WalkInPlaceFasterRight msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT closemessage delay 30 @@ -75,8 +73,7 @@ SlateportCity_EventScript_ScottScene:: setflag FLAG_ENABLE_SCOTT_MATCH_CALL msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExit - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_SCOTT, SlateportCity_Movement_ScottExit removeobject LOCALID_SLATEPORT_SCOTT setobjectxyperm LOCALID_SLATEPORT_SCOTT, 10, 12 setobjectmovementtype LOCALID_SLATEPORT_SCOTT, MOVEMENT_TYPE_FACE_DOWN @@ -347,8 +344,7 @@ SlateportCity_EventScript_AquaGrunt1:: faceplayer msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_1, Common_Movement_FaceOriginalDirection release end @@ -357,8 +353,7 @@ SlateportCity_EventScript_AquaGrunt2:: faceplayer msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_2, Common_Movement_FaceOriginalDirection release end @@ -367,8 +362,7 @@ SlateportCity_EventScript_AquaGrunt3:: faceplayer msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_3, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_3, Common_Movement_FaceOriginalDirection release end @@ -377,8 +371,7 @@ SlateportCity_EventScript_AquaGrunt4:: faceplayer msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_4, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_4, Common_Movement_FaceOriginalDirection release end @@ -387,8 +380,7 @@ SlateportCity_EventScript_AquaGrunt5:: faceplayer msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_5, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_5, Common_Movement_FaceOriginalDirection release end @@ -397,8 +389,7 @@ SlateportCity_EventScript_AquaGrunt6:: faceplayer msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_6, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_6, Common_Movement_FaceOriginalDirection release end @@ -407,8 +398,7 @@ SlateportCity_EventScript_AquaGrunt7:: faceplayer msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_7, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_7, Common_Movement_FaceOriginalDirection release end @@ -417,8 +407,7 @@ SlateportCity_EventScript_AquaGrunt8:: faceplayer msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_8, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_8, Common_Movement_FaceOriginalDirection release end @@ -426,32 +415,22 @@ SlateportCity_EventScript_AquaGrunt9:: lock faceplayer playse SE_PIN - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_ExclamationMark + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_Delay48 msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt - waitmovement 0 - applymovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FacePlayer + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, SlateportCity_Movement_DelayAquaGrunt + applywaitmovement LOCALID_SLATEPORT_GRUNT_9, Common_Movement_FaceOriginalDirection release end @@ -469,8 +448,7 @@ SlateportCity_EventScript_AquaGrunt11:: faceplayer msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GRUNT_11, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GRUNT_11, Common_Movement_FaceOriginalDirection release end @@ -547,11 +525,9 @@ SlateportCity_EventScript_CaptStern:: msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_GABBY, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_GABBY, Common_Movement_WalkInPlaceFasterRight delay 10 - applymovement LOCALID_SLATEPORT_TY, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_TY, Common_Movement_WalkInPlaceFasterDown delay 25 applymovement LOCALID_SLATEPORT_CAPT_STERN, SlateportCity_Movement_SternWatchGabbyAndTyExit applymovement LOCALID_PLAYER, SlateportCity_Movement_PlayerFaceStern @@ -561,8 +537,7 @@ SlateportCity_EventScript_CaptStern:: removeobject LOCALID_SLATEPORT_GABBY removeobject LOCALID_SLATEPORT_TY msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT - applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT playbgm MUS_ENCOUNTER_AQUA, FALSE msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT @@ -572,16 +547,12 @@ SlateportCity_EventScript_CaptStern:: applymovement LOCALID_SLATEPORT_RICH_BOY, Common_Movement_QuestionMark applymovement LOCALID_SLATEPORT_MAN_1, SlateportCity_Movement_ManConcern waitmovement 0 - applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterDown msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT playse SE_PIN - applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_Delay48 - waitmovement 0 - applymovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_ExclamationMark + applywaitmovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_Delay48 + applywaitmovement LOCALID_SLATEPORT_CAPT_STERN, Common_Movement_WalkInPlaceFasterUp msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT closemessage @@ -863,8 +834,7 @@ SlateportCity_EventScript_NotEnoughBerryPowder:: SlateportCity_EventScript_ScottBattleTentScene:: lockall - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp opendoor 10, 12 waitdooranim addobject LOCALID_SLATEPORT_SCOTT diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 286ee2b89eae..12e15f2380fa 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -42,14 +42,12 @@ SlateportCity_BattleTentBattleRoom_OnFrame: .2byte 0 SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: - applymovement LOCALID_SLATEPORT_TENT_BATTLE_PLAYER, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_TENT_BATTLE_PLAYER, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter factory_setopponentgfx setobjectxyperm LOCALID_SLATEPORT_TENT_BATTLE_OPPONENT, 5, 1 removeobject LOCALID_SLATEPORT_TENT_BATTLE_OPPONENT addobject LOCALID_SLATEPORT_TENT_BATTLE_OPPONENT - applymovement LOCALID_SLATEPORT_TENT_BATTLE_OPPONENT, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_TENT_BATTLE_OPPONENT, SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter battletent_getopponentintro lockall msgbox gStringVar4, MSGBOX_DEFAULT diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index d0c90a8b7a89..1b222b1fd16c 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -38,8 +38,7 @@ SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SLATEPORT_TENT_CORRIDOR_ATTENDANT, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_TENT_CORRIDOR_ATTENDANT, Common_Movement_WalkInPlaceFasterUp opendoor 2, 1 waitdooranim applymovement LOCALID_SLATEPORT_TENT_CORRIDOR_ATTENDANT, SlateportCity_BattleTentCorridor_Movement_AttendantExit diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 52fd04ec65fd..f96e15dd2022 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -41,14 +41,12 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: lockall setvar VAR_0x8008, 3 - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp goto SlateportCity_Harbor_EventScript_AquaEscapeScene end SlateportCity_Harbor_EventScript_AquaEscapeScene:: - applymovement LOCALID_SLATEPORT_HARBOR_ARCHIE, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_HARBOR_ARCHIE, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_SLATEPORT_HARBOR_GRUNT, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -78,24 +76,18 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: end SlateportCity_Harbor_EventScript_SternApproachPlayer0:: - applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer0 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown return SlateportCity_Harbor_EventScript_SternApproachPlayer1:: - applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer1 - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer1 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return SlateportCity_Harbor_EventScript_SternApproachPlayer:: - applymovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_SLATEPORT_HARBOR_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return SlateportCity_Harbor_Movement_AquaBoardSub: @@ -221,8 +213,7 @@ SlateportCity_Harbor_EventScript_ChooseNewDestination:: SlateportCity_Harbor_EventScript_BoardFerry:: msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp delay 30 hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR call_if_eq VAR_FACING, DIR_NORTH, SlateportCity_Harbor_EventScript_BoardFerryNorth @@ -239,13 +230,11 @@ SlateportCity_Harbor_EventScript_CancelDestinationSelect:: end SlateportCity_Harbor_EventScript_BoardFerryEast:: - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast return SlateportCity_Harbor_EventScript_BoardFerryNorth:: - applymovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth return SlateportCity_Harbor_Movement_BoardFerryEast: @@ -291,8 +280,7 @@ SlateportCity_Harbor_EventScript_CaptStern:: goto_if_eq VAR_SLATEPORT_HARBOR_STATE, 2, SlateportCity_Harbor_EventScript_WhyStealSubmarine msgbox SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 08c8c41ff165..035fc0fcfc44 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -7,15 +7,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee end @@ -25,8 +23,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: goto_if_eq VAR_RESULT, YES, SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee closemessage hidemoneybox - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter releaseall end @@ -47,8 +44,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT closemessage hidemoneybox - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter releaseall end @@ -144,10 +140,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: faceplayer delay 8 playse SE_PIN - applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_ExclamationMark - waitmovement 0 - applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_ExclamationMark + applywaitmovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, Common_Movement_Delay48 msgbox SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis, MSGBOX_DEFAULT giveitem ITEM_TM_THIEF goto_if_eq VAR_RESULT, 0, SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief @@ -168,8 +162,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: end SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: - applymovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index dbc6307d8d58..ec275dc1696c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -8,11 +8,9 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: closemessage playbgm MUS_ENCOUNTER_AQUA, TRUE addobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1 - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter addobject LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2 - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach waitmovement 0 @@ -23,21 +21,17 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: msgbox SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle call_if_eq VAR_FACING, DIR_SOUTH, SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth call_if_eq VAR_FACING, DIR_WEST, SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_1, SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat msgbox SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated - waitmovement 0 - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle msgbox SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_MUSEUM_2, SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat - applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_1, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_OCEANIC_MUSEUM_2F_GRUNT_2, Common_Movement_WalkInPlaceFasterUp waitmovement 0 @@ -50,8 +44,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong, MSGBOX_DEFAULT closemessage - applymovement LOCALID_OCEANIC_MUSEUM_2F_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_ARCHIE, SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer msgbox SlateportCity_OceanicMuseum_2F_Text_ArchieWarning, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY @@ -63,8 +56,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: fadescreen FADE_FROM_BLACK delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs, MSGBOX_DEFAULT setvar VAR_0x8004, ITEM_DEVON_GOODS call Common_EventScript_PlayerHandedOverTheItem @@ -90,23 +82,19 @@ SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: return SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: - applymovement LOCALID_OCEANIC_MUSEUM_2F_CAPT_STERN, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_OCEANIC_MUSEUM_2F_CAPT_STERN, Common_Movement_WalkInPlaceFasterLeft return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth return SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: - applymovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest return SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth: @@ -262,8 +250,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 3b50428614ca..c7c108286bd6 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -198,10 +198,8 @@ SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: playse SE_PIN - applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_LAST_TALKED, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_ExclamationMark + applywaitmovement VAR_LAST_TALKED, Common_Movement_Delay48 msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT giveitem ITEM_SOOTHE_BELL goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index cf2752fd2ce8..14dad660668f 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -8,44 +8,37 @@ SlateportCity_SternsShipyard_1F_EventScript_Dock:: goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_GoFindStern msgbox SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails, MSGBOX_DEFAULT - applymovement LOCALID_DOCK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FacePlayer msgbox SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DOCK, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FaceOriginalDirection setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA releaseall end SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: - applymovement LOCALID_DOCK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FacePlayer msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: - applymovement LOCALID_DOCK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FacePlayer msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: - applymovement LOCALID_DOCK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FacePlayer msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT closemessage - applymovement LOCALID_DOCK, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FaceOriginalDirection releaseall end SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: - applymovement LOCALID_DOCK, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_DOCK, Common_Movement_FacePlayer msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index de9149644a76..a9fd8dd47770 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -179,8 +179,7 @@ SootopolisCity_EventScript_StartLegendariesScene:: SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: delay 60 special SpawnCameraObject - applymovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter special RemoveCameraObject delay 60 fadescreenspeed FADE_TO_BLACK, 8 @@ -278,8 +277,7 @@ SootopolisCity_Movement_PanBackToPokeCenter: SootopolisCity_EventScript_LegendariesSceneFromDive:: delay 60 special SpawnCameraObject - applymovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromDive - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromDive special RemoveCameraObject delay 60 fadescreenspeed FADE_TO_BLACK, 8 @@ -466,8 +464,7 @@ SootopolisCity_EventScript_StartRayquazaScene:: SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: delay 60 special SpawnCameraObject - applymovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter special RemoveCameraObject delay 60 fadescreenspeed FADE_TO_BLACK, 8 @@ -479,8 +476,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: special Script_DoRayquazaScene playse SE_THUNDER special SpawnCameraObject - applymovement LOCALID_CAMERA, SootopolisCity_Movement_PanUp - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SootopolisCity_Movement_PanUp waitse playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER setvar VAR_0x8004, 1 @ vertical pan @@ -500,8 +496,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: waitmoncry setweather WEATHER_NONE doweather - applymovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff removeobject LOCALID_SOOTOPOLIS_RAYQUAZA special WaitWeather clearflag FLAG_SYS_WEATHER_CTRL @@ -517,8 +512,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: SootopolisCity_EventScript_RayquazaSceneFromDive:: delay 60 special SpawnCameraObject - applymovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromDive - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SootopolisCity_Movement_PanToActionFromDive special RemoveCameraObject delay 60 fadescreenspeed FADE_TO_BLACK, 8 @@ -551,8 +545,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: waitmoncry setweather WEATHER_NONE doweather - applymovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_RAYQUAZA, SootopolisCity_Movement_RayquazaFlyOff removeobject LOCALID_SOOTOPOLIS_RAYQUAZA special WaitWeather clearflag FLAG_SYS_WEATHER_CTRL @@ -690,8 +683,7 @@ SootopolisCity_EventScript_Kiri:: goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_KiriRayquaza msgbox SootopolisCity_Text_BigPokemonFighting, MSGBOX_DEFAULT closemessage - applymovement LOCALID_KIRI, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_KIRI, Common_Movement_FaceOriginalDirection release end @@ -747,13 +739,11 @@ SootopolisCity_EventScript_KiriLikeSeasonBornIn:: SootopolisCity_EventScript_Woman2:: lockall - applymovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Woman2Rayquaza msgbox SootopolisCity_Text_WeatherWentWild, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_WOMAN_2, Common_Movement_FaceOriginalDirection releaseall end @@ -788,8 +778,7 @@ SootopolisCity_EventScript_Woman1:: SootopolisCity_EventScript_Woman1Legendaries:: msgbox SootopolisCity_Text_GiganticPokemonFight, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_WOMAN_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_WOMAN_1, Common_Movement_FaceOriginalDirection release end @@ -805,15 +794,13 @@ SootopolisCity_EventScript_Woman1Rayquaza:: SootopolisCity_EventScript_NinjaBoy:: lockall - applymovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_NinjaBoyRayquaza goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_NinjaBoyNormal goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_NinjaBoyNormal msgbox SootopolisCity_Text_ThisIsWicked, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_NINJA_BOY, Common_Movement_FaceOriginalDirection release end @@ -829,16 +816,14 @@ SootopolisCity_EventScript_NinjaBoyRayquaza:: SootopolisCity_EventScript_Boy1:: lockall - applymovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy1Rayquaza goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_Boy1GameClear goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_Boy1Normal goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_Boy1Normal msgbox SootopolisCity_Text_GiantPokemonSuddenlyAppeared, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BOY_1, Common_Movement_FaceOriginalDirection release end @@ -871,8 +856,7 @@ EventScript_ClosedSootopolisDoor:: SootopolisCity_EventScript_Steven:: lockall - applymovement LOCALID_SOOTOPOLIS_STEVEN, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_STEVEN, Common_Movement_FacePlayer call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_StevenHelpWallace goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 3, SootopolisCity_EventScript_StevenHelpedWallace @@ -908,16 +892,14 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: applymovement LOCALID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin waitmovement 0 delay 120 - applymovement LOCALID_SOOTOPOLIS_EXPERT, SootopolisCity_Movement_ExpertMoveAside - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_EXPERT, SootopolisCity_Movement_ExpertMoveAside applymovement LOCALID_SOOTOPOLIS_STEVEN, SootopolisCity_Movement_StevenArriveCaveEntrance applymovement LOCALID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance waitmovement 0 msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT closemessage setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN - applymovement LOCALID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 9, 20 waitstate end @@ -1200,13 +1182,11 @@ SootopolisCity_Movement_PlayerEnterCaveOfOrigin: SootopolisCity_EventScript_Boy2:: lockall - applymovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy2Rayquaza msgbox SootopolisCity_Text_TwoPokemonArentAngry, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BOY_2, Common_Movement_FaceOriginalDirection releaseall end @@ -1221,31 +1201,26 @@ SootopolisCity_EventScript_BlackBelt:: goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_BlackBeltRayquaza msgbox SootopolisCity_Text_GoRedAndBlueMon, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer msgbox SootopolisCity_Text_DoYouKnowMonNames, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FaceOriginalDirection releaseall end SootopolisCity_EventScript_BlackBeltRayquaza:: - applymovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_BLACK_BELT, Common_Movement_FacePlayer msgbox SootopolisCity_Text_GreenOneSettlesThings, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_Girl:: lockall - applymovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_GirlRayquaza msgbox SootopolisCity_Text_SootopolisWillBeWrecked, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_GIRL, Common_Movement_FaceOriginalDirection releaseall end @@ -1257,13 +1232,11 @@ SootopolisCity_EventScript_GirlRayquaza:: SootopolisCity_EventScript_Maniac:: lockall - applymovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FacePlayer goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_ManiacRayquaza msgbox SootopolisCity_Text_SeeingLegendWithOwnEyes, MSGBOX_DEFAULT closemessage - applymovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_MANIAC, Common_Movement_FaceOriginalDirection releaseall end @@ -1295,15 +1268,13 @@ SootopolisCity_EventScript_GiveWaterfall:: end SootopolisCity_EventScript_WallaceMoveFromGym:: - applymovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGym - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGym copyobjectxytoperm LOCALID_SOOTOPOLIS_WALLACE setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1 return SootopolisCity_EventScript_WallaceMoveFromGymWest:: - applymovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGymWest - waitmovement 0 + applywaitmovement LOCALID_SOOTOPOLIS_WALLACE, SootopolisCity_Movement_WallaceMoveFromGymWest copyobjectxytoperm LOCALID_SOOTOPOLIS_WALLACE setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2 return diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index 22fae5922c3c..797114d483c8 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -67,8 +67,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: SootopolisCity_Gym_1F_EventScript_FallThroughIce:: lockall delay 20 - applymovement LOCALID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce playse SE_FALL delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 2be1db02500a..72c6f77c8cc4 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -29,13 +29,10 @@ SootopolisCity_MysteryEventsHouse_1F_OnFrame: SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: lockall - applymovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs - waitmovement 0 - applymovement LOCALID_MYSTERY_EVENTS_OLD_MAN, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs + applywaitmovement LOCALID_MYSTERY_EVENTS_OLD_MAN, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer copyobjectxytoperm LOCALID_MYSTERY_EVENTS_OLD_MAN - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp call_if_eq VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment call_if_eq VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment call_if_eq VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 6b890c50d602..7b8092400224 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -13,8 +13,7 @@ SootopolisCity_MysteryEventsHouse_B1F_OnFrame: SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: lockall - applymovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement special CopyEReaderTrainerGreeting msgbox gStringVar4, MSGBOX_DEFAULT closemessage @@ -26,8 +25,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: call_if_eq VAR_RESULT, B_OUTCOME_LOST, SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost closemessage special HealPlayerParty - applymovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement special LoadPlayerParty setvar VAR_TEMP_1, 1 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 3, 1 diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index f6d8436dbe73..4c5a27f86f09 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -13,8 +13,7 @@ SouthernIsland_Exterior_EventScript_Sailor:: goto_if_eq VAR_RESULT, NO, SouthernIsland_Exterior_EventScript_AsYouLike msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown delay 30 hideobjectat LOCALID_SOUTHERN_ISLAND_SAILOR, MAP_SOUTHERN_ISLAND_EXTERIOR setvar VAR_0x8004, LOCALID_SOUTHERN_ISLAND_SS_TIDAL @@ -30,13 +29,11 @@ SouthernIsland_Exterior_EventScript_AsYouLike:: end Ferry_EventScript_DepartIslandSouth:: - applymovement LOCALID_PLAYER, Ferry_Movement_DepartIslandBoardSouth - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Ferry_Movement_DepartIslandBoardSouth return Ferry_EventScript_DepartIslandWest:: - applymovement LOCALID_PLAYER, Ferry_Movement_DepartIslandBoardWest - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Ferry_Movement_DepartIslandBoardWest return Ferry_Movement_DepartIslandBoardSouth: diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 115b5aa832c2..c82fadd77772 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -57,8 +57,7 @@ SouthernIsland_Interior_EventScript_Lati:: setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS setflag FLAG_TEMP_2 special SpawnCameraObject - applymovement LOCALID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp - waitmovement 0 + applywaitmovement LOCALID_CAMERA, SouthernIsland_Interior_Movement_CameraPanUp delay 50 waitse playmoncry VAR_TEMP_4, CRY_MODE_NORMAL diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index 5450db70a34d..69ed07316688 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -24,10 +24,8 @@ TerraCave_End_EventScript_ShowGroudon:: TerraCave_End_EventScript_Groudon:: lockall - applymovement LOCALID_PLAYER, Common_Movement_FaceUp - waitmovement 0 - applymovement LOCALID_TERRA_CAVE_GROUDON, TerraCave_End_Movement_GroudonApproach - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_FaceUp + applywaitmovement LOCALID_TERRA_CAVE_GROUDON, TerraCave_End_Movement_GroudonApproach waitse playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index ef09d746254b..561b72929197 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -10,30 +10,24 @@ TrainerHill_Elevator_EventScript_Attendant:: end TrainerHill_Elevator_EventScript_ExitToRoof:: - applymovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof releaseall warp MAP_TRAINER_HILL_ROOF, 15, 5 waitstate end TrainerHill_Elevator_EventScript_EnterElevator:: - applymovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant - waitmovement 0 - applymovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFacePlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant + applywaitmovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFacePlayer lockall msgbox TrainerHill_Elevator_Text_ReturnToReception, MSGBOX_YESNO goto_if_eq VAR_RESULT, NO, TrainerHill_Elevator_EventScript_ExitToRoof releaseall - applymovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFaceDown - waitmovement 0 - applymovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator - waitmovement 0 + applywaitmovement LOCALID_TRAINER_HILL_ELEVATOR_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFaceDown + applywaitmovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator call TrainerHill_Elevator_EventScript_MoveElevator delay 25 - applymovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator warp MAP_TRAINER_HILL_ENTRANCE, 17, 8 waitstate end diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 1eb2985ca151..8ca1d6b51055 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -57,8 +57,7 @@ TrainerHill_Entrance_OnFrame: TrainerHill_Entrance_EventScript_ExitElevator:: lockall - applymovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, TRUE special DrawWholeMapView playse SE_CLICK @@ -165,8 +164,7 @@ TrainerHill_Entrance_EventScript_CancelEntry:: setvar VAR_TEMP_5, 0 msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter releaseall end @@ -187,8 +185,7 @@ TrainerHill_Entrance_EventScript_SaveFailed:: TrainerHill_Entrance_EventScript_Closed:: msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter releaseall end diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 1e115e676275..2629bc628fab 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,15 +12,13 @@ VerdanturfTown_EventScript_Twin:: faceplayer goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen msgbox VerdanturfTown_Text_ManTryingToDigTunnel, MSGBOX_DEFAULT - applymovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection release end VerdanturfTown_EventScript_TwinTunnelOpen:: msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT - applymovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection - waitmovement 0 + applywaitmovement LOCALID_VERDANTURF_TWIN, Common_Movement_FaceOriginalDirection release end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 8caf65eebcb9..0a2f91a926b7 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -34,15 +34,13 @@ VerdanturfTown_BattleTentBattleRoom_OnFrame: VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom:: showobjectat LOCALID_VERDANTURF_TENT_BATTLE_PLAYER, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM - applymovement LOCALID_VERDANTURF_TENT_BATTLE_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter - waitmovement 0 + applywaitmovement LOCALID_VERDANTURF_TENT_BATTLE_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter frontier_get FRONTIER_DATA_BATTLE_NUM goto_if_ne VAR_RESULT, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: tower_setopponent addobject LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT - applymovement LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter - waitmovement 0 + applywaitmovement LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter battletent_getopponentintro msgbox gStringVar4, MSGBOX_DEFAULT waitmessage @@ -61,8 +59,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT switch VAR_RESULT case 3, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon - applymovement LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit - waitmovement 0 + applywaitmovement LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit removeobject LOCALID_VERDANTURF_TENT_BATTLE_OPPONENT applymovement LOCALID_VERDANTURF_TENT_BATTLE_ATTENDANT, Common_Movement_WalkInPlaceFasterDown applymovement LOCALID_VERDANTURF_TENT_BATTLE_PLAYER, Common_Movement_WalkInPlaceFasterUp diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 3b16f26d9094..2f3ca7cbac4a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -21,8 +21,7 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger1:: lockall setvar VAR_0x8008, 1 addobject LOCALID_VICTORY_ROAD_ENTRANCE_WALLY - applymovement LOCALID_VICTORY_ROAD_ENTRANCE_WALLY, VictoryRoad_1F_Movement_WallyApproachPlayer1 - waitmovement 0 + applywaitmovement LOCALID_VICTORY_ROAD_ENTRANCE_WALLY, VictoryRoad_1F_Movement_WallyApproachPlayer1 goto VictoryRoad_1F_EventScript_WallyEntranceBattle end @@ -30,14 +29,12 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger2:: lockall setvar VAR_0x8008, 2 addobject LOCALID_VICTORY_ROAD_ENTRANCE_WALLY - applymovement LOCALID_VICTORY_ROAD_ENTRANCE_WALLY, VictoryRoad_1F_Movement_WallyApproachPlayer2 - waitmovement 0 + applywaitmovement LOCALID_VICTORY_ROAD_ENTRANCE_WALLY, VictoryRoad_1F_Movement_WallyApproachPlayer2 goto VictoryRoad_1F_EventScript_WallyEntranceBattle end VictoryRoad_1F_EventScript_WallyEntranceBattle:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_WALLY_VR_1, VictoryRoad_1F_Text_WallyEntranceDefeat msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 246922f7f27e..19987f84084f 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -207,15 +207,13 @@ Apprentice_EventScript_SetHideFlags: Apprentice_EventScript_LeaveNorth: apprentice_shouldleave goto_if_eq VAR_0x8004, FALSE, Apprentice_EventScript_DontMove @ VAR_0x8004 always TRUE here - applymovement LOCALID_APPRENTICE, Apprentice_Movement_LeaveNorth - waitmovement 0 + applywaitmovement LOCALID_APPRENTICE, Apprentice_Movement_LeaveNorth end Apprentice_EventScript_Leave: apprentice_shouldleave goto_if_eq VAR_0x8004, FALSE, Apprentice_EventScript_DontMove @ VAR_0x8004 always TRUE here - applymovement LOCALID_APPRENTICE, Apprentice_Movement_Leave - waitmovement 0 + applywaitmovement LOCALID_APPRENTICE, Apprentice_Movement_Leave end Apprentice_EventScript_Gone: diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc index c39b255eca5c..46ccac63f517 100644 --- a/data/scripts/battle_pike.inc +++ b/data/scripts/battle_pike.inc @@ -106,16 +106,14 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: end BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL, 4, 7 waitstate end BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS, 4, 19 waitstate @@ -172,15 +170,13 @@ BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: return BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 2, 7 return BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: - applymovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer - waitmovement 0 + applywaitmovement LOCALID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer call BattleFrontier_BattlePike_EventScript_CloseCurtain warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10 return diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index f935dd79afb8..700c937ca9f8 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -238,8 +238,7 @@ BerryBlender_EventScript_BerryBlender1:: lockall goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent setvar NUM_OPPONENTS, 1 - applymovement LOCALID_BLEND_MASTER, BerryBlender_Movement_BlendLeaderWalkInPlace - waitmovement 0 + applywaitmovement LOCALID_BLEND_MASTER, BerryBlender_Movement_BlendLeaderWalkInPlace msgbox BerryBlender_Text_WantToMakePokeblocks, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, BerryBlender_EventScript_TryUseBerryBlender1 goto BerryBlender_EventScript_DeclineBlender1 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 7ff99da9e451..430a66e53243 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -136,12 +136,9 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom - applymovement VAR_0x8007, Movement_AttendantFaceLeft - waitmovement 0 - applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom - waitmovement 0 - applymovement VAR_0x8007, Movement_AttendantFaceDown - waitmovement 0 + applywaitmovement VAR_0x8007, Movement_AttendantFaceLeft + applywaitmovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom + applywaitmovement VAR_0x8007, Movement_AttendantFaceDown return CableClub_EventScript_ExitTradeCenter:: @@ -158,10 +155,8 @@ CableClub_EventScript_PlayerExitTradeCenter:: special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom - applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight - waitmovement 0 - applymovement VAR_0x8007, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight + applywaitmovement VAR_0x8007, Movement_AttendantFaceLeft call CableClub_EventScript_TrainerCardDataOverwritten return @@ -178,11 +173,9 @@ CableClub_EventScript_ExitRecordCorner:: CableClub_EventScript_PlayerExitRecordCorner:: special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom goto_if_eq VAR_0x8007, 0, CableClub_EventScript_ExitRecordCornerRet - applymovement VAR_0x8007, Movement_AttendantFaceDown - waitmovement 0 + applywaitmovement VAR_0x8007, Movement_AttendantFaceDown CableClub_EventScript_ExitRecordCornerRet:: return @@ -199,10 +192,8 @@ CableClub_EventScript_ExitUnionRoom:: CableClub_EventScript_PlayerExitUnionRoom:: setvar VAR_CABLE_CLUB_STATE, 0 goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom - applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight - waitmovement 0 - applymovement VAR_0x8007, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight + applywaitmovement VAR_0x8007, Movement_AttendantFaceLeft call CableClub_EventScript_TrainerCardDataOverwritten return @@ -213,25 +204,20 @@ CableClub_EventScript_TrainerCardDataOverwritten:: delay 60 message CableClub_Text_HopeToSeeYouAgain waitmessage - applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom - waitmovement 0 - applymovement VAR_0x8007, Movement_AttendantFaceDown - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom + applywaitmovement VAR_0x8007, Movement_AttendantFaceDown return CableClub_EventScript_PlayerExitLinkRoom:: - applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom return CableClub_EventScript_Tutorial:: lockall - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox CableClub_Text_FirstTimeRightThisWay, MSGBOX_DEFAULT closemessage - applymovement LOCALID_PLAYER, CableClub_Movement_PlayerApproachCounter - waitmovement 0 + applywaitmovement LOCALID_PLAYER, CableClub_Movement_PlayerApproachCounter delay 30 msgbox CableClub_Text_ExplainWirelessClubFirstTime, MSGBOX_DEFAULT setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 2 @@ -346,15 +332,12 @@ CableClub_EventScript_EnterColosseum:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft closemessage - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft opendoor 9, 1 waitdooranim - applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom hideplayer closedoor 9, 1 waitdooranim @@ -367,8 +350,7 @@ CableClub_EventScript_EnterColosseum:: @ Unused CableClub_EventScript_PlayerApproachLinkRoomRight:: - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomRight return CableClub_EventScript_WarpTo4PColosseum:: @@ -437,15 +419,12 @@ CableClub_EventScript_EnterTradeCenter:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft closemessage - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft opendoor 9, 1 waitdooranim - applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom hideplayer closedoor 9, 1 waitdooranim @@ -499,15 +478,12 @@ CableClub_EventScript_EnterRecordCorner:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft closemessage - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft opendoor 9, 1 waitdooranim - applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom hideplayer closedoor 9, 1 waitdooranim @@ -864,14 +840,11 @@ CableClub_EventScript_EnterUnionRoom:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft opendoor 5, 1 waitdooranim - applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom hideplayer closedoor 5, 1 waitdooranim @@ -1161,15 +1134,12 @@ CableClub_EventScript_EnterWirelessLinkRoom:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft closemessage - applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft opendoor 9, 1 waitdooranim - applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom hideplayer closedoor 9, 1 waitdooranim @@ -1340,11 +1310,9 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: special DrawWholeMapView playse SE_CLICK delay 60 - applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_AttendantFaceLeft closemessage - applymovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom hideplayer release waitstate diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc index 1624d759f28c..0fa3724549e5 100644 --- a/data/scripts/cave_hole.inc +++ b/data/scripts/cave_hole.inc @@ -13,8 +13,7 @@ CaveHole_FixCrackedGround: EventScript_FallDownHole:: lockall delay 20 - applymovement LOCALID_PLAYER, Movement_SetInvisible - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_SetInvisible playse SE_FALL delay 60 warphole MAP_UNDEFINED @@ -24,8 +23,7 @@ EventScript_FallDownHole:: EventScript_FallDownHoleMtPyre:: lockall delay 20 - applymovement LOCALID_PLAYER, Movement_SetInvisible - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Movement_SetInvisible playse SE_FALL delay 60 special DoFallWarp diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a1025354c428..adc80c2e81a0 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -185,10 +185,8 @@ ContestHall_EventScript_DoContest:: special LinkContestTryShowWirelessIndicator setvar VAR_0x8006, 0 lockall - applymovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4FaceUp - waitmovement 0 - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkDown - waitmovement 0 + applywaitmovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4FaceUp + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkDown releaseall call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_GetContestRankStringId @@ -263,8 +261,7 @@ ContestHall_EventScript_ContestGettingStarted:: bufferstdstring STR_VAR_3, VAR_0x8009 call ContestHall_EventScript_GettingStarted lockall - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCBackUp - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_MCBackUp releaseall return @@ -324,8 +321,7 @@ ContestHall_EventScript_ContestantWalkToCenter:: ContestHall_EventScript_Player1WalkToCenter:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement LOCALID_CONTESTANT_1, ContestHall_Movement_Player1WalkToCenter - waitmovement 0 + applywaitmovement LOCALID_CONTESTANT_1, ContestHall_Movement_Player1WalkToCenter releaseall setvar VAR_0x800B, LOCALID_CONTESTANT_1 return @@ -333,8 +329,7 @@ ContestHall_EventScript_Player1WalkToCenter:: ContestHall_EventScript_Player2WalkToCenter:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement LOCALID_CONTESTANT_2, ContestHall_Movement_Player2WalkToCenter - waitmovement 0 + applywaitmovement LOCALID_CONTESTANT_2, ContestHall_Movement_Player2WalkToCenter releaseall setvar VAR_0x800B, LOCALID_CONTESTANT_2 return @@ -342,8 +337,7 @@ ContestHall_EventScript_Player2WalkToCenter:: ContestHall_EventScript_Player3WalkToCenter:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement LOCALID_CONTESTANT_3, ContestHall_Movement_Player3WalkToCenter - waitmovement 0 + applywaitmovement LOCALID_CONTESTANT_3, ContestHall_Movement_Player3WalkToCenter releaseall setvar VAR_0x800B, LOCALID_CONTESTANT_3 return @@ -351,8 +345,7 @@ ContestHall_EventScript_Player3WalkToCenter:: ContestHall_EventScript_Player4WalkToCenter:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4WalkToCenter - waitmovement 0 + applywaitmovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4WalkToCenter releaseall setvar VAR_0x800B, LOCALID_CONTESTANT_4 return @@ -362,16 +355,14 @@ ContestHall_EventScript_ShowContestMonPic:: addvar VAR_0x8006, 1 buffernumberstring STR_VAR_2, VAR_0x8006 lockall - applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 releaseall call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_CheckIfContestWithRSPlayer addobject LOCALID_CONTEST_POKEBALL playse SE_LEDGE lockall - applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_ContestantDelay32 releaseall addvar VAR_0x8006, -1 playse SE_BALL_OPEN @@ -396,10 +387,8 @@ ContestHall_EventScript_AudienceVote:: playse SE_M_ENCORE2 waitmessage call ContestHall_EventScript_AudienceLookAround - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge2 - waitmovement 0 - applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeFaceMC - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge2 + applywaitmovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeFaceMC delay 20 applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_FaceContestants @@ -442,23 +431,20 @@ ContestHall_EventScript_VotingUnderWayLink:: ContestHall_EventScript_AudienceReactToContestant:: call ContestHall_EventScript_TryWaitForLink - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookLeft - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookLeft playse SE_M_ENCORE2 call ContestHall_EventScript_VObjectAudienceLookAround applymovement LOCALID_CONTEST_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight applymovement LOCALID_CONTEST_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown applymovement LOCALID_CONTEST_AUDIENCE_3, ContestHall_Movement_AudienceMemberLookRight waitmovement 0 - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookRight - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_AudienceMemberLookRight applymovement LOCALID_CONTEST_AUDIENCE_6, ContestHall_Movement_AudienceMemberLookLeft applymovement LOCALID_CONTEST_AUDIENCE_7, ContestHall_Movement_AudienceMemberLookDown applymovement LOCALID_CONTEST_AUDIENCE_1, ContestHall_Movement_AudienceMemberLookUp applymovement LOCALID_CONTEST_AUDIENCE_4, ContestHall_Movement_AudienceMemberLookLeft waitmovement 0 - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCLookAtJudge - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_MCLookAtJudge applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCWalkInPlaceDown applymovement LOCALID_CONTEST_JUDGE, ContestHall_Movement_JudgeLookAtMC waitmovement 0 @@ -716,39 +702,34 @@ ContestHall_EventScript_ContestantReturn:: ContestHall_EventScript_Player1WalkBack:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, ContestHall_Movement_Player1WalkBack - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_Player1WalkBack releaseall return ContestHall_EventScript_Player2WalkBack:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, ContestHall_Movement_Player2WalkBack - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_Player2WalkBack releaseall return ContestHall_EventScript_Player3WalkBack:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, ContestHall_Movement_Player3WalkBack - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_Player3WalkBack releaseall return ContestHall_EventScript_Player4WalkBack:: call ContestHall_EventScript_TryWaitForLink lockall - applymovement VAR_0x800B, ContestHall_Movement_Player4WalkBack - waitmovement 0 + applywaitmovement VAR_0x800B, ContestHall_Movement_Player4WalkBack releaseall return ContestHall_EventScript_DoContestAppeals:: lockall - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants2 - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants2 call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_LetsAppeal waitmessage @@ -800,14 +781,12 @@ ContestHall_EventScript_ContestResults:: call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_ThankYouForAppeals call ContestHall_EventScript_TryWaitForLink - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_MCFaceJudge call ContestHall_EventScript_JudgeLooksReady call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_WeWillDeclareWinner call ContestHall_EventScript_TryWaitForLink - applymovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants - waitmovement 0 + applywaitmovement LOCALID_CONTEST_MC, ContestHall_Movement_FaceContestants closemessage releaseall special LinkContestTryHideWirelessIndicator @@ -897,8 +876,7 @@ ContestHall_EventScript_CongratulateWinner:: buffernumberstring STR_VAR_2, VAR_0x8005 addvar VAR_0x8005, -1 call ContestHall_EventScript_CongratsWinner - applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp - waitmovement 0 + applywaitmovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp playse SE_M_ENCORE2 setvar VAR_TEMP_1, 0 return @@ -1078,29 +1056,25 @@ ContestHall_EventScript_WinnerApproachForPrize:: ContestHall_EventScript_Player1ApproachForPrize:: lockall - applymovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize - waitmovement 0 + applywaitmovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize releaseall return ContestHall_EventScript_Player2ApproachForPrize:: lockall - applymovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize - waitmovement 0 + applywaitmovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize releaseall return ContestHall_EventScript_Player3ApproachForPrize:: lockall - applymovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize - waitmovement 0 + applywaitmovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize releaseall return ContestHall_EventScript_Player4ApproachForPrize:: lockall - applymovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize - waitmovement 0 + applywaitmovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 13b940ca7433..fd4ab3b7720e 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -184,8 +184,7 @@ Route117_PokemonDayCare_EventScript_CheckEnoughMoney:: end Route117_PokemonDayCare_EventScript_RetrieveMon:: - applymovement LOCALID_DAYCARE_LADY, Route117_PokemonDayCare_Movement_RetrieveDaycareMon - waitmovement 0 + applywaitmovement LOCALID_DAYCARE_LADY, Route117_PokemonDayCare_Movement_RetrieveDaycareMon specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 playse SE_SHOP diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc index 1d1f7ab3eb52..65edca2dcd54 100644 --- a/data/scripts/elite_four.inc +++ b/data/scripts/elite_four.inc @@ -1,6 +1,5 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: - applymovement LOCALID_PLAYER, Common_Movement_Delay32 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_Delay32 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, FALSE setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, FALSE @@ -18,8 +17,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: return PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: - applymovement LOCALID_PLAYER, Common_Movement_WalkUp6 - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkUp6 playse SE_TRUCK_DOOR setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, TRUE diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 3e99fc08e2d4..2e1d843f0fc0 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -25,8 +25,7 @@ EventScript_UseCut:: end EventScript_CutTreeDown:: - applymovement VAR_LAST_TALKED, Movement_CutTreeDown - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_CutTreeDown removeobject VAR_LAST_TALKED releaseall end @@ -84,8 +83,7 @@ EventScript_UseRockSmash:: end EventScript_SmashRock:: - applymovement VAR_LAST_TALKED, Movement_SmashRock - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_SmashRock removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState goto_if_eq VAR_RESULT, TRUE, EventScript_EndSmash diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 06e1010589e4..5c5b3f666066 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,8 +215,7 @@ GabbyAndTy_EventScript_FirstInterview:: end GabbyAndTy_EventScript_FacePlayerNorth:: - applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown - waitmovement 0 + applywaitmovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown return GabbyAndTy_EventScript_FacePlayerSouth:: diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index 634551902664..06ebb898c2cb 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -63,10 +63,8 @@ EventScript_AskUseDevonScope:: EventScript_BattleKecleon:: msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT closemessage - applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer - waitmovement 0 - applymovement VAR_LAST_TALKED, Movement_KecleonAppears - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Common_Movement_FacePlayer + applywaitmovement VAR_LAST_TALKED, Movement_KecleonAppears waitse playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER delay 40 diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 270795bfdf58..a348717b369d 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -378,11 +378,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ VAR_0x8004 here is the return value from GivePokeblockToContestLady LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: - applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon delay 60 - applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady delay 60 waitse playmoncry VAR_0x8005, CRY_MODE_NORMAL @@ -394,12 +392,10 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ VAR_0x8004 here is the return value from GivePokeblockToContestLady LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock:: - applymovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump delay 60 LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: - applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer - waitmovement 0 + applywaitmovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer delay 60 goto_if_eq VAR_0x8004, 0, LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock goto_if_eq VAR_0x8004, 1, LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 64ccdfa77e55..8df5848f2a3d 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -33,12 +33,10 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: return EventScript_PkmnCenterNurse_TakeAndHealPkmn:: - applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x800B, Common_Movement_WalkInPlaceFasterLeft dofieldeffect FLDEFF_POKECENTER_HEAL waitfieldeffect FLDEFF_POKECENTER_HEAL - applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterDown - waitmovement 0 + applywaitmovement VAR_0x800B, Common_Movement_WalkInPlaceFasterDown special HealPlayerParty return @@ -56,16 +54,14 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: goto_if_eq VAR_0x8004, 1, EventScript_PkmnCenterNurse_ReturnPkmn2 message gText_RestoredPkmnToFullHealth waitmessage - applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow - waitmovement 0 + applywaitmovement VAR_0x800B, Movement_PkmnCenterNurse_Bow message gText_WeHopeToSeeYouAgain return EventScript_PkmnCenterNurse_ReturnPkmn2:: message gText_ThankYouForWaiting waitmessage - applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow - waitmovement 0 + applywaitmovement VAR_0x800B, Movement_PkmnCenterNurse_Bow message gText_WeHopeToSeeYouAgain2 return @@ -75,8 +71,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: setflag FLAG_NURSE_UNION_ROOM_REMINDER message CableClub_Text_PlayerIsWaiting waitmessage - applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow - waitmovement 0 + applywaitmovement VAR_0x800B, Movement_PkmnCenterNurse_Bow message gText_WeHopeToSeeYouAgain return @@ -96,10 +91,8 @@ EventScript_PkmnCenterNurse_GoldCard:: setflag FLAG_NURSE_MENTIONS_GOLD_CARD msgbox gText_WelcomeCutShort, MSGBOX_DEFAULT playse SE_PIN - applymovement VAR_0x800B, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x800B, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x800B, Common_Movement_ExclamationMark + applywaitmovement VAR_0x800B, Common_Movement_Delay48 msgbox gText_NoticesGoldCard, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, EventScript_PkmnCenterNurse_GoldCardHealPkmn message gText_WeHopeToSeeYouAgain2 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 238bc3f6af06..8d0745930356 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -4,8 +4,7 @@ PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: PlayersHouse_1F_EventScript_EnterHouseMovingIn:: msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT - applymovement VAR_0x8004, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8004, Common_Movement_FacePlayer call_if_eq VAR_0x8005, MALE, PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale call_if_eq VAR_0x8005, FEMALE, PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT @@ -18,13 +17,11 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: end PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return PlayersHouse_1F_Movement_PlayerWalkIn: @@ -72,27 +69,21 @@ PlayersHouse_2F_EventScript_WallClock:: PlayersHouse_2F_EventScript_MomComesUpstairsMale:: setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM addobject VAR_0x8008 - applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale - waitmovement 0 + applywaitmovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale return PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: setvar VAR_0x8008, LOCALID_PLAYERS_HOUSE_2F_MOM addobject VAR_0x8008 - applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale - waitmovement 0 + applywaitmovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale return PlayersHouse_2F_EventScript_CheckWallClock:: @@ -143,68 +134,53 @@ PlayersHouse_1F_EventScript_SetWatchedBroadcast:: end PlayersHouse_1F_EventScript_PetalburgGymReportMale:: - applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_0x8005, Common_Movement_WalkInPlaceFasterRight call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale - waitmovement 0 - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale - waitmovement 0 + applywaitmovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale - waitmovement 0 + applywaitmovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: - applymovement VAR_0x8005, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x8005, Common_Movement_WalkInPlaceFasterLeft call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale - waitmovement 0 - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale - waitmovement 0 + applywaitmovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale call PlayersHouse_1F_EventScript_WatchGymBroadcast - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_1, 1 - applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale - waitmovement 0 + applywaitmovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale goto PlayersHouse_1F_EventScript_SetWatchedBroadcast end PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: playse SE_PIN - applymovement VAR_0x8005, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8005, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x8005, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8005, Common_Movement_Delay48 msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT closemessage return PlayersHouse_1F_EventScript_WatchGymBroadcast:: - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp - waitmovement 0 + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT fadedefaultbgm special TurnOffTVScreen @@ -420,13 +396,10 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: call_if_eq VAR_RESULT, FEMALE, PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_PlayerEnterRoomMale call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_PlayerEnterRoomFemale - applymovement VAR_0x8009, Common_Movement_FacePlayer - waitmovement 0 + applywaitmovement VAR_0x8009, Common_Movement_FacePlayer playse SE_PIN - applymovement VAR_0x8009, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8009, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x8009, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8009, Common_Movement_Delay48 delay 20 call_if_eq VAR_0x8008, MALE, PlayersHouse_1F_EventScript_DadApproachPlayerMale call_if_eq VAR_0x8008, FEMALE, PlayersHouse_1F_EventScript_DadApproachPlayerFemale @@ -496,27 +469,21 @@ PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: return PlayersHouse_1F_EventScript_DadApproachPlayerMale:: - applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale - waitmovement 0 + applywaitmovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale return PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: - applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale - waitmovement 0 + applywaitmovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale return PlayersHouse_1F_EventScript_MomApproachDadMale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale - waitmovement 0 - applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale + applywaitmovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale return PlayersHouse_1F_EventScript_MomApproachDadFemale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale - waitmovement 0 - applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale + applywaitmovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale return PlayersHouse_1F_EventScript_DadExitsMale:: @@ -534,65 +501,49 @@ PlayersHouse_1F_EventScript_DadExitsFemale:: return PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale return PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale - waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale + applywaitmovement VAR_0x800A, Common_Movement_WalkInPlaceFasterLeft return PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: - applymovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale - waitmovement 0 - applymovement VAR_0x800A, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement LOCALID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale + applywaitmovement VAR_0x800A, Common_Movement_WalkInPlaceFasterRight return PlayersHouse_1F_EventScript_MomApproachPlayerMale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale return PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale return PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight return PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: - applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale - waitmovement 0 - applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft - waitmovement 0 + applywaitmovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale + applywaitmovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft return PlayersHouse_1F_Movement_DadApproachPlayerMale: diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index 849b25a46a30..a4d54e499f2a 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -16,13 +16,10 @@ EventScript_Questionnaire:: Questionnaire_EventScript_PlayerInputMysteryEventPhrase:: goto_if_unset FLAG_SYS_POKEDEX_GET, Questionnaire_EventScript_ThankYou goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Questionnaire_EventScript_ThankYou - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FaceDown playse SE_PIN - applymovement VAR_0x8008, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8008, Common_Movement_Delay48 msgbox Questionnaire_Text_YouKnowThoseWordsEvent, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_EVENT_ENABLE msgbox Questionnaire_Text_YouCanAccessMysteryEvent, MSGBOX_DEFAULT @@ -32,13 +29,10 @@ Questionnaire_EventScript_PlayerInputMysteryEventPhrase:: Questionnaire_EventScript_PlayerInputMysteryGiftPhrase:: goto_if_unset FLAG_SYS_POKEDEX_GET, Questionnaire_EventScript_ThankYou goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Questionnaire_EventScript_ThankYou - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FaceDown playse SE_PIN - applymovement VAR_0x8008, Common_Movement_ExclamationMark - waitmovement 0 - applymovement VAR_0x8008, Common_Movement_Delay48 - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_ExclamationMark + applywaitmovement VAR_0x8008, Common_Movement_Delay48 msgbox Questionnaire_Text_YouKnowThoseWordsGift, MSGBOX_DEFAULT setflag FLAG_SYS_MYSTERY_GIFT_ENABLE msgbox Questionnaire_Text_YouCanAccessMysteryGift, MSGBOX_DEFAULT @@ -50,8 +44,7 @@ Questionnaire_EventScript_Release:: end Questionnaire_EventScript_ThankYou:: - applymovement VAR_0x8008, Common_Movement_FaceDown - waitmovement 0 + applywaitmovement VAR_0x8008, Common_Movement_FaceDown msgbox Questionnaire_Text_ThankYou, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index fafeb644bd87..6cc5027cf6da 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -144,8 +144,7 @@ SecretBase_EventScript_InitSecretBase:: end SecretBase_EventScript_FirstEntrance:: - applymovement LOCALID_PLAYER, SecretBase_Movement_EnterBase - waitmovement 0 + applywaitmovement LOCALID_PLAYER, SecretBase_Movement_EnterBase setvar VAR_INIT_SECRET_BASE, 1 msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, SecretBase_EventScript_SetAsBase diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 58ddc8ce5511..aad3bc5aaa2f 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -57,13 +57,11 @@ Route111_EventScript_GiveSecretPower:: end Route111_EventScript_SecretPowerManExit:: - applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit return Route111_EventScript_SecretPowerManExitNorth:: - applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth return Route111_EventScript_NoRoomForSecretPower:: diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index e31353380702..809ae833fd85 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -9,8 +9,7 @@ EventScript_TrainerApproach:: EventScript_TryDoNormalTrainerBattle:: lock faceplayer - applymovement VAR_LAST_TALKED, Movement_RevealTrainer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_RevealTrainer specialvar VAR_RESULT, GetTrainerFlag goto_if_ne VAR_RESULT, FALSE, EventScript_NoNormalTrainerBattle special PlayTrainerEncounterMusic @@ -43,8 +42,7 @@ EventScript_NoDoubleTrainerBattle:: gotopostbattlescript EventScript_DoNoIntroTrainerBattle:: - applymovement VAR_LAST_TALKED, Movement_RevealTrainer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_RevealTrainer special PlayTrainerEncounterMusic dotrainerbattle gotopostbattlescript @@ -90,8 +88,7 @@ EventScript_NotEnoughMonsForDoubleRematchBattle:: end EventScript_RevealTrainer:: - applymovement VAR_LAST_TALKED, Movement_RevealTrainer - waitmovement 0 + applywaitmovement VAR_LAST_TALKED, Movement_RevealTrainer return Movement_RevealTrainer: