dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered into sync-b-anim

Browse Source
This commit is contained in:
GriffinR
2022-08-19 11:30:00 -04:00
parent 219a38578a 56f8b1a47c
commit b3590324b8
94 changed files with 3593 additions and 3316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+4 -4
View File
@@ -1175,16 +1175,16 @@ EventScript_ReleaseEnd::
@ Unused
EventScript_DelayedLookAround::
lockall
applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft
applymovement VAR_0x8004, Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFastestUp
applymovement VAR_0x8004, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFastestRight
applymovement VAR_0x8004, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFastestDown
applymovement VAR_0x8004, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
releaseall
data/maps/CeruleanCity/scripts.inc
+8 -8
View File
@@ -99,17 +99,17 @@ CeruleanCity_EventScript_RivalStartExitRight::
CeruleanCity_Movement_PlayerWatchRivalExit::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
CeruleanCity_Movement_PlayerWatchRivalExitRight::
delay_16
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
CeruleanCity_Movement_RivalEnter::
@@ -204,9 +204,9 @@ CeruleanCity_EventScript_NoRoomForTM28::
CeruleanCity_EventScript_GruntTriggerTop::
lockall
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
@@ -214,9 +214,9 @@ CeruleanCity_EventScript_GruntTriggerTop::
CeruleanCity_EventScript_GruntTriggerBottom::
lockall
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
data/maps/CinnabarIsland/scripts.inc
+8 -8
View File
@@ -107,12 +107,12 @@ CinnabarIsland_EventScript_BillScene::
end
CinnabarIsland_EventScript_BillFacePlayer1::
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
waitmovement 0
return
CinnabarIsland_EventScript_BillFacePlayer2::
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -124,7 +124,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1::
CinnabarIsland_EventScript_BillApproachPlayer2::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -175,13 +175,13 @@ CinnabarIsland_EventScript_BillReturnToPokeCenter::
CinnabarIsland_Movement_PlayerWatchBillExit::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
CinnabarIsland_Movement_BillApproachDoor::
delay_16
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
CinnabarIsland_Movement_BillReEnterPokeCenter::
@@ -272,7 +272,7 @@ CinnabarIsland_Movement_BillFaceBoat::
delay_16
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
CinnabarIsland_Movement_ApproachShore::
@@ -295,7 +295,7 @@ CinnabarIsland_Movement_PlayerBoardBoat::
walk_right
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
delay_4
walk_right
delay_4
@@ -313,7 +313,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore::
@ Triggered when VAR_TEMP_1 is 0
CinnabarIsland_EventScript_GymDoorLocked::
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox CinnabarIsland_Text_DoorIsLocked
data/maps/CinnabarIsland_Gym/scripts.inc
+12 -12
View File
@@ -271,13 +271,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
end
CinnabarIsland_Gym_EventScript_QuinnApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_QuinnApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
waitmovement 0
return
@@ -363,13 +363,13 @@ CinnabarIsland_Gym_Movement_AveryApproachLeft::
CinnabarIsland_Gym_Movement_AveryApproachRight::
walk_up
walk_up
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
CinnabarIsland_Gym_Movement_PlayerFaceAvery::
delay_16
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
CinnabarIsland_Gym_EventScript_Quiz3Left::
@@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
end
CinnabarIsland_Gym_EventScript_RamonApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_RamonApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight
waitmovement 0
return
@@ -496,13 +496,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek::
end
CinnabarIsland_Gym_EventScript_DerekApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DerekApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight
waitmovement 0
return
@@ -568,13 +568,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty::
end
CinnabarIsland_Gym_EventScript_DustyApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DustyApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight
waitmovement 0
return
@@ -640,13 +640,13 @@ CinnabarIsland_Gym_EventScript_BattleZac::
end
CinnabarIsland_Gym_EventScript_ZacApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_ZacApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
waitmovement 0
return
data/maps/FiveIsland_LostCave_Room10/scripts.inc
+2 -2
View File
@@ -54,9 +54,9 @@ FiveIsland_LostCave_Room10_Movement_SelphyWander::
delay_16
walk_right
delay_16
walk_in_place_fastest_up
walk_in_place_faster_up
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FiveIsland_LostCave_Room10_Movement_SelphyApproach::
data/maps/FiveIsland_MemorialPillar/scripts.inc
+4 -4
View File
@@ -13,7 +13,7 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan::
waitmovement 0
delay 45
msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix
release
@@ -54,10 +54,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
removeitem ITEM_LEMONADE
msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade
closemessage
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestRight
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 45
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
@@ -69,7 +69,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
FiveIsland_MemorialPillar_EventScript_ReceivedTM42::
msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
waitmovement 0
setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
return
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
closemessage
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
waitmovement 0
opendoor 39, 8
waitdooranim
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+8 -8
View File
@@ -44,7 +44,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestUp
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -65,25 +65,25 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
end
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -114,13 +114,13 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth::
walk_down
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth::
walk_left
walk_left
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast::
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+8 -8
View File
@@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer::
FiveIsland_RocketWarehouse_EventScript_Admin2Trigger::
lockall
applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFasterLeft
waitmovement 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
releaseall
@@ -100,7 +100,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
end
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -138,7 +138,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
goto_if_eq PLAYER_X_POS, 27, EventScript_Return
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -153,27 +153,27 @@ FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch::
return
FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterDown
waitmovement 0
return
FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar::
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch::
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
data/maps/FourIsland/scripts.inc
+2 -2
View File
@@ -29,7 +29,7 @@ FourIsland_OnFrame::
FourIsland_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
@@ -67,7 +67,7 @@ FourIsland_Movement_RivalExit::
FourIsland_Movement_PlayerWatchRivalExit::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
FourIsland_EventScript_DaycareMan::
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+9 -9
View File
@@ -27,17 +27,17 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
playse SE_PIN
applymovement LOCALID_LORELEI, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_LORELEI, Movement_Delay48
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
closemessage
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 35
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
@@ -81,7 +81,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
delay 50
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
@@ -100,10 +100,10 @@ FourIsland_IcefallCave_Back_Movement_PlayerToRockets::
FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit::
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown::
@@ -162,7 +162,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit::
FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft::
@@ -181,10 +181,10 @@ FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp::
FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit::
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer::
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -100,7 +100,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft::
FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone::
textcolor NPC_TEXT_COLOR_MALE
msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
showmoneybox 0, 0
msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
data/maps/IndigoPlateau_Exterior/scripts.inc
+7 -7
View File
@@ -103,12 +103,12 @@ IndigoPlateau_Exterior_Movement_PlayerExitBuilding::
IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave::
delay_16
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave::
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
delay_16
delay_16
@@ -120,7 +120,7 @@ IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave::
delay_16
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
IndigoPlateau_Exterior_Movement_PlayerBeginLeave::
@@ -133,7 +133,7 @@ IndigoPlateau_Exterior_Movement_PlayerBeginLeave::
step_end
IndigoPlateau_Exterior_Movement_PlayerTurnAround::
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay::
@@ -144,7 +144,7 @@ IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay::
step_end
IndigoPlateau_Exterior_Movement_PlayerFaceLeague::
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
IndigoPlateau_Exterior_Movement_RivalLeave::
@@ -162,7 +162,7 @@ IndigoPlateau_Exterior_Movement_RivalExitBuilding::
step_end
IndigoPlateau_Exterior_Movement_OakLeave::
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
delay_16
delay_16
@@ -173,7 +173,7 @@ IndigoPlateau_Exterior_Movement_OakLeave::
delay_16
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
delay_16
walk_down
walk_down
data/maps/MtEmber_Exterior/scripts.inc
+2 -2
View File
@@ -95,14 +95,14 @@ MtEmber_Exterior_EventScript_RocketPasswordScene::
waitmovement 0
waitbuttonpress
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFastestDown
applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_GRUNT1, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_GRUNT1, Movement_Delay48
waitmovement 0
applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFastestDown
applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFasterDown
waitmovement 0
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn
data/maps/MtMoon_B2F/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ MtMoon_B2F_EventScript_ShowFossils::
MtMoon_B2F_EventScript_MiguelTrigger::
lockall
applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight
applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFasterRight
waitmovement 0
call MtMoon_B2F_EventScript_BattleMiguel
releaseall
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+31 -31
View File
@@ -63,46 +63,46 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
playse SE_PIN
applymovement LOCALID_CELIO, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_CELIO, Movement_Delay48
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestRight
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp
call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive
msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer
msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM
additem ITEM_METEORITE
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis
giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM
@@ -112,9 +112,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
setflag FLAG_SYS_SEVII_MAP_123
msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
waitmovement 0
setflag FLAG_SYS_PC_STORAGE_DISABLED
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -152,7 +152,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio::
walk_right
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio::
@@ -163,7 +163,7 @@ OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio::
walk_right
walk_right
walk_up
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
@ Unused
@@ -174,7 +174,7 @@ Movement_170E8F::
@ Unused
Movement_170E91::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
OneIsland_PokemonCenter_1F_EventScript_Nurse::
@@ -344,7 +344,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby::
OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby::
msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway
applymovement LOCALID_CELIO, Movement_FacePlayer
@@ -367,7 +367,7 @@ OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine::
step_end
OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine::
walk_in_place_fastest_up
walk_in_place_faster_up
walk_in_place_up
delay_16
walk_in_place_up
@@ -450,30 +450,30 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom
delay 10
msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot
msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 10
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 15
msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 15
applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime
closemessage
@@ -514,7 +514,7 @@ OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom::
OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop::
walk_right
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop::
@@ -524,14 +524,14 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop::
OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom::
walk_right
walk_up
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom::
walk_right
walk_up
walk_up
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
@ Unused
@@ -539,7 +539,7 @@ Movement_17131F::
delay_16
delay_16
delay_4
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
@ Unused
data/maps/PalletTown/scripts.inc
+9 -9
View File
@@ -113,7 +113,7 @@ PalletTown_Movement_OakWalkToPlayersDoor::
walk_left
walk_left
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_Movement_OakExit::
@@ -148,7 +148,7 @@ PalletTown_Movement_OakWalkToLabFromHouse::
walk_right
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_Movement_PlayerWalkToLabFromHouse::
@@ -190,7 +190,7 @@ PalletTown_EventScript_OakTrigger::
waitmessage
delay 85
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark
@@ -290,7 +290,7 @@ PalletTown_Movement_OakWalkToLabLeft::
walk_down
walk_to_lab
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_Movement_OakWalkToLabRight::
@@ -298,7 +298,7 @@ PalletTown_Movement_OakWalkToLabRight::
walk_left
walk_to_lab
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_Movement_OakEnterLab::
@@ -381,12 +381,12 @@ PalletTown_EventScript_SignLadyJustShowedSign::
PalletTown_Movement_SignLadyMoveOutOfWayRight::
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PalletTown_Movement_SignLadyMoveOutOfWayLeft::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PalletTown_EventScript_FatMan::
@@ -421,8 +421,8 @@ PalletTown_EventScript_TrainerTips::
PalletTown_EventScript_SignLadyTrigger::
lockall
applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
releaseall
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+45 -45
View File
@@ -140,7 +140,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -150,18 +150,18 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -191,7 +191,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest::
PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk::
walk_up
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
delay_16
delay_4
step_end
@@ -215,7 +215,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
waitmovement 0
clearflag FLAG_DONT_TRANSITION_MUSIC
savebgm MUS_DUMMY
@@ -296,9 +296,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
@@ -540,17 +540,17 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid::
PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight::
delay_16
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PalletTown_ProfessorOaksLab_EventScript_Rival::
@@ -644,7 +644,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
delay 40
msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
waitmovement 0
removeobject LOCALID_POKEDEX_1
delay 10
@@ -715,7 +715,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest::
PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver::
@@ -754,20 +754,20 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest::
PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast::
delay_16
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk::
delay_16
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk::
walk_up
walk_left
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth::
@@ -775,7 +775,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth::
walk_left
walk_up
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls::
@@ -872,27 +872,27 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedWest::
@ Unused
Movement_1699AC::
walk_left
walk_in_place_fastest_down
walk_in_place_faster_down
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
delay_8
walk_in_place_fastest_down
walk_in_place_faster_down
delay_8
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
delay_8
walk_in_place_fastest_down
walk_in_place_faster_down
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
delay_8
walk_left
step_end
@@ -966,7 +966,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -975,7 +975,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -984,7 +984,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -992,8 +992,8 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1001,26 +1001,26 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1036,24 +1036,24 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit::
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest::
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth::
walk_in_place_fastest_down
walk_in_place_faster_down
delay_16
delay_16
delay_16
delay_16
delay_16
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PalletTown_ProfessorOaksLab_Movement_RivalEnter::
@@ -1206,7 +1206,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle::
walk_right
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur::
@@ -1214,7 +1214,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur::
walk_right
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PalletTown_ProfessorOaksLab_EventScript_SquirtleBall::
data/maps/PalletTown_RivalsHouse/scripts.inc
+1 -1
View File
@@ -136,7 +136,7 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap::
closemessage
checkitemspace ITEM_TOWN_MAP
goto_if_eq VAR_RESULT, FALSE, PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight
applymovement LOCALID_DAISY, Movement_WalkInPlaceFasterRight
waitmovement 0
removeobject LOCALID_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
data/maps/PewterCity/scripts.inc
+22 -22
View File
@@ -169,7 +169,7 @@ PewterCity_Movement_PlayerWaitForGuideEast::
delay_16
delay_16
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PewterCity_Movement_PlayerWalkToGymEast::
@@ -206,14 +206,14 @@ PewterCity_Movement_PlayerWalkToGymNorth::
PewterCity_Movement_GuideMoveToLeadEast::
walk_down
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
walk_in_place_up
step_end
PewterCity_Movement_GuideWalkToGymEast::
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideMoveToLeadWest::
@@ -227,7 +227,7 @@ PewterCity_Movement_GuideWalkToGymWest::
walk_left
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideMoveToLeadNorth::
@@ -241,7 +241,7 @@ PewterCity_Movement_GuideWalkToGymNorth::
walk_left
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GymGuideExit::
@@ -368,7 +368,7 @@ PewterCity_Movement_PlayerWalkToGymRight::
PewterCity_Movement_GuideMoveToLeadTop::
walk_left
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
walk_in_place_right
step_end
@@ -395,14 +395,14 @@ PewterCity_Movement_GuideApproachPlayerRight::
PewterCity_Movement_GuideWalkToGymTop::
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymMid::
walk_left
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymBottom::
@@ -410,7 +410,7 @@ PewterCity_Movement_GuideWalkToGymBottom::
walk_left
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymRight::
@@ -425,7 +425,7 @@ PewterCity_Movement_GuideWalkToGymRight::
walk_up
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_EventScript_Lass::
@@ -541,13 +541,13 @@ PewterCity_Movement_PlayerWalkToMuseumNorth::
walk_up
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumNorth::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumSouth::
@@ -556,7 +556,7 @@ PewterCity_Movement_PlayerWalkToMuseumSouth::
walk_left
walk_to_museum_south
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumSouth::
@@ -564,33 +564,33 @@ PewterCity_Movement_GuideWalkToMuseumSouth::
walk_up
walk_to_museum_south
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumWest::
walk_left
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumWest::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumEast::
walk_right
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumEast::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_MuseumGuideExit::
@@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
return
PewterCity_EventScript_AideNoticePlayer::
applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown
applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -740,7 +740,7 @@ PewterCity_EventScript_AideApproachPlayer0::
PewterCity_EventScript_AideApproachPlayer1::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -748,7 +748,7 @@ PewterCity_EventScript_AideApproachPlayer2::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -756,7 +756,7 @@ PewterCity_EventScript_AideApproachPlayer3::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/PewterCity_Gym/text.inc
+1 -1
View File
@@ -16,7 +16,7 @@ PewterCity_Gym_Text_BrockIntro::
@ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle
@ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise
@ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists.
@ unused array after that, sFlickerArray. Perhaps that's the reason why said array exists.
PewterCity_Gym_Text_BrockDefeat::
.string "I took you for granted, and so\n"
.string "I lost.\p"
data/maps/PewterCity_Museum_1F/scripts.inc
+3 -3
View File
@@ -37,7 +37,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber::
PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -45,7 +45,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
lockall
setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -53,7 +53,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
lockall
setvar VAR_TEMP_1, 2
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+3 -3
View File
@@ -100,16 +100,16 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno::
end
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestRight
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterRight
waitmovement 0
return
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+7 -7
View File
@@ -78,12 +78,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
specialvar VAR_RESULT, GetStarterSpecies
bufferspeciesname STR_VAR_1, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
@@ -177,7 +177,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerExit::
PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter::
delay_8
walk_in_place_fastest_down
walk_in_place_faster_down
delay_16
delay_16
delay_16
@@ -185,7 +185,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PokemonLeague_ChampionsRoom_Movement_OakEnter::
@@ -199,7 +199,7 @@ PokemonLeague_ChampionsRoom_Movement_OakEnter::
walk_left
walk_up
walk_up
walk_in_place_fastest_down
walk_in_place_faster_down
delay_16
step_end
@@ -225,5 +225,5 @@ PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
data/maps/PokemonLeague_HallOfFame/scripts.inc
+4 -4
View File
@@ -22,14 +22,14 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
waitmovement 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
data/maps/PokemonLeague_LancesRoom/scripts.inc
+2 -2
View File
@@ -158,10 +158,10 @@ PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight::
PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight::
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
data/maps/PokemonTower_2F/scripts.inc
+6 -6
View File
@@ -47,14 +47,14 @@ PokemonTower_2F_EventScript_Rival::
end
PokemonTower_2F_EventScript_RivalFacePlayerRight::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonTower_2F_EventScript_RivalFacePlayerDown::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -88,7 +88,7 @@ PokemonTower_2F_Movement_RivalExitRight::
walk_down
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
PokemonTower_2F_Movement_RivalExitDown::
@@ -99,5 +99,5 @@ PokemonTower_2F_Movement_RivalExitDown::
walk_down
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
data/maps/PokemonTower_7F/scripts.inc
+1 -1
View File
@@ -100,7 +100,7 @@ PokemonTower_7F_Movement_Grunt1ExitLeft::
walk_right
walk_down
walk_down
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PokemonTower_7F_EventScript_Grunt2::
data/maps/Route16_NorthEntrance_1F/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger::
textcolor NPC_TEXT_COLOR_MALE
msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
data/maps/Route18_EastEntrance_1F/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger::
textcolor NPC_TEXT_COLOR_MALE
msgbox Route18_EastEntrance_1F_Text_ExcuseMe
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
data/maps/Route22/scripts.inc
+2 -2
View File
@@ -139,7 +139,7 @@ Route22_Movement_RivalApproachBottom::
walk_right
walk_right
walk_right
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
Route22_Movement_PlayerFaceRival::
@@ -151,7 +151,7 @@ Route22_Movement_PlayerFaceRival::
delay_16
delay_16
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
Route22_EventScript_LateRivalTriggerTop::
data/maps/Route24/scripts.inc
+3 -3
View File
@@ -40,7 +40,7 @@ Route24_EventScript_RocketTrigger::
textcolor NPC_TEXT_COLOR_MALE
call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketApproachPlayer
call_if_eq VAR_TEMP_1, 1, Route24_EventScript_RocketMotionToPlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET
@@ -67,7 +67,7 @@ Route24_EventScript_RocketApproachPlayer::
return
Route24_EventScript_RocketMotionToPlayer::
applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_ROCKET, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -91,7 +91,7 @@ Route24_Movement_RocketApproachPlayer::
Route24_Movement_RocketWalkBackToPos::
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
Route24_Movement_WalkDown::
data/maps/Route25_SeaCottage/scripts.inc
+1 -1
View File
@@ -137,7 +137,7 @@ Route25_SeaCottage_Movement_BillWalkToTeleporterSouth::
walk_up
walk_up
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
Route25_SeaCottage_Movement_BillEnterTeleporter::
data/maps/Route5_SouthEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight::
Route5_SouthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
data/maps/Route6_NorthEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight::
Route6_NorthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
data/maps/Route7_EastEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom::
Route7_EastEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
data/maps/Route8_WestEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom::
Route8_WestEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
data/maps/SSAnne_2F_Corridor/scripts.inc
+4 -4
View File
@@ -28,7 +28,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger::
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
delay 10
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft
@@ -101,7 +101,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid::
@@ -109,7 +109,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid::
delay_16
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SSAnne_2F_Corridor_Movement_RivalApproachLeft::
@@ -123,7 +123,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid::
walk_down
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SSAnne_2F_Corridor_Movement_RivalApproachRight::
data/maps/SSAnne_Exterior/scripts.inc
+1 -1
View File
@@ -38,7 +38,7 @@ SSAnne_Exterior_WalkDown::
return
SSAnne_Exterior_WalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/SaffronCity_Dojo/scripts.inc
+4 -4
View File
@@ -6,7 +6,7 @@ SaffronCity_Dojo_MapScripts::
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterLeft
waitmovement 0
releaseall
end
@@ -14,7 +14,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterRight
waitmovement 0
releaseall
end
@@ -25,7 +25,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall::
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
showmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONLEE
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
@@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall::
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
showmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONCHAN
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+5 -5
View File
@@ -19,7 +19,7 @@ SaffronCity_PokemonTrainerFanClub_OnFrame::
SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark
@@ -30,7 +30,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
closemessage
applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
@@ -50,7 +50,7 @@ SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer::
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer::
delay_8
walk_in_place_fastest_down
walk_in_place_faster_down
walk_down
walk_down
walk_down
@@ -71,7 +71,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer::
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer::
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
@ Unused, leftover from RS
@@ -80,7 +80,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer::
walk_fast_up
walk_fast_up
walk_fast_right
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
SaffronCity_PokemonTrainerFanClub_OnTransition::
data/maps/SevenIsland_House_Room1/scripts.inc
+4 -4
View File
@@ -39,7 +39,7 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
waitmovement 0
copyobjectxytoperm LOCALID_OLD_WOMAN
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_BattleWonComment
call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_BattleLostComment
@@ -67,7 +67,7 @@ SevenIsland_House_Room1_Movement_PlayerReEnterRoom::
SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer::
walk_right
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
SevenIsland_House_Room1_EventScript_OldWoman::
@@ -160,12 +160,12 @@ SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest::
SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight::
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SevenIsland_House_Room1_EventScript_Box::
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+5 -5
View File
@@ -34,7 +34,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
end
SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -60,13 +60,13 @@ SevenIsland_SevaultCanyon_House_Movement_ChanseyDance::
delay_16
walk_in_place_down
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
delay_4
walk_in_place_fastest_up
walk_in_place_faster_up
delay_4
walk_in_place_fastest_left
walk_in_place_faster_left
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
delay_4
step_end
data/maps/SilphCo_11F/scripts.inc
+3 -3
View File
@@ -61,7 +61,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight::
SilphCo_11F_EventScript_BattleGiovanni::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 25
msgbox SilphCo_11F_Text_GiovanniIntro
@@ -99,7 +99,7 @@ SilphCo_11F_Movement_GiovanniApproachLeft::
walk_down
walk_down
walk_down
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
SilphCo_11F_Movement_GiovanniApproachRight::
@@ -114,7 +114,7 @@ SilphCo_11F_Movement_PlayerFaceGiovanni::
delay_16
delay_8
delay_4
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
@ Unused
data/maps/SilphCo_7F/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ SilphCo_7F_EventScript_RivalScene::
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Movement_Delay48
waitmovement 0
msgbox SilphCo_7F_Text_RivalWhatKeptYou
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+11 -11
View File
@@ -60,22 +60,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
@ Lots of redundant scripts below
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -102,28 +102,28 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest::
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -154,13 +154,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest::
SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft::
walk_up
walk_up
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow::
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft::
@@ -216,7 +216,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn::
SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit::
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage::
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -22,7 +22,7 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
@@ -61,7 +61,7 @@ SixIsland_PokemonCenter_1F_Movement_RivalExit::
SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
SixIsland_PokemonCenter_1F_EventScript_Nurse::
data/maps/ThreeIsland/scripts.inc
+19 -19
View File
@@ -95,23 +95,23 @@ ThreeIsland_EventScript_BikerArgumentScene::
return
ThreeIsland_EventScript_PlayerFaceUp::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@ Unused
ThreeIsland_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -204,7 +204,7 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
ThreeIsland_EventScript_BattleBikersScene::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BIKER1, Movement_ExclamationMark
@@ -239,10 +239,10 @@ ThreeIsland_EventScript_BattleBikersScene::
msgbox ThreeIsland_Text_Biker3Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER3
trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER4, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER5, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ThreeIsland_Text_Biker3PostBattle
closemessage
@@ -272,33 +272,33 @@ ThreeIsland_EventScript_BattleBikersScene::
end
ThreeIsland_EventScript_PaxtonApproachLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMid::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight
waitmovement 0
@@ -325,7 +325,7 @@ ThreeIsland_Movement_BikerApproach::
ThreeIsland_Movement_Biker1ReturnToPack::
walk_up
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ThreeIsland_Movement_BikerSpeak::
@@ -335,7 +335,7 @@ ThreeIsland_Movement_BikerSpeak::
ThreeIsland_Movement_PaxtonApproachLeft::
walk_down
walk_left
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
ThreeIsland_Movement_PaxtonApproachMidLeft::
@@ -345,20 +345,20 @@ ThreeIsland_Movement_PaxtonApproachMidLeft::
ThreeIsland_Movement_PaxtonApproachMid::
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_Movement_PlayerFacePaxton::
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ThreeIsland_Movement_PaxtonApproachMidRight::
walk_down
walk_down
walk_right
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_Movement_PaxtonApproachRight::
@@ -366,7 +366,7 @@ ThreeIsland_Movement_PaxtonApproachRight::
walk_down
walk_right
walk_right
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_EventScript_Woman::
data/maps/ThreeIsland_BerryForest/scripts.inc
+3 -3
View File
@@ -48,11 +48,11 @@ ThreeIsland_BerryForest_EventScript_NoRoomForBerry::
return
ThreeIsland_BerryForest_Movement_LostelleLookAround::
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
delay_8
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ThreeIsland_BerryForest_EventScript_WelcomeSign::
data/maps/TrainerTower_Elevator/scripts.inc
+1 -1
View File
@@ -70,7 +70,7 @@ TrainerTower_Elevator_EventScript_MoveElevator::
return
TrainerTower_Elevator_Movement_ExitElevator::
walk_in_place_fastest_down
walk_in_place_faster_down
delay_16
walk_down
walk_right
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+11 -11
View File
@@ -43,7 +43,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
special BufferBigGuyOrBigGirlString
msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
closemessage
applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFastestDown
applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFasterDown
waitmovement 0
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
releaseall
@@ -56,7 +56,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
closemessage
applymovement LOCALID_DADDY, Movement_WalkInPlaceFastestDown
applymovement LOCALID_DADDY, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DADDY, Movement_ExclamationMark
@@ -65,7 +65,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
waitmovement 0
applymovement LOCALID_DADDY, Movement_171527
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle
closemessage
@@ -78,12 +78,12 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland
applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt
msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing
closemessage
applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_EXIT
removeobject LOCALID_BIKER
@@ -101,7 +101,7 @@ Movement_171520::
walk_right
walk_right
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
delay_16
step_end
@@ -109,20 +109,20 @@ Movement_171527::
walk_down
walk_down
walk_down
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
Movement_17152C::
walk_left
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
TwoIsland_JoyfulGameCorner_Movement_BikerLookAround::
walk_in_place_fastest_left
walk_in_place_faster_left
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
TwoIsland_JoyfulGameCorner_EventScript_InfoMan::
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -191,8 +191,8 @@ VermilionCity_EventScript_ExitedTicketCheck::
VermilionCity_EventScript_CheckTicket::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger
msgbox VermilionCity_Text_DoYouHaveATicket
data/maps/ViridianCity/scripts.inc
+5 -5
View File
@@ -43,7 +43,7 @@ ViridianCity_EventScript_TryUnlockGym::
ViridianCity_EventScript_GymDoorLocked::
lockall
textcolor NPC_TEXT_COLOR_NEUTRAL
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox ViridianCity_Text_GymDoorsAreLocked
@@ -206,9 +206,9 @@ ViridianCity_Movement_WalkDown::
ViridianCity_EventScript_TutorialTriggerLeft::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
@@ -217,9 +217,9 @@ ViridianCity_EventScript_TutorialTriggerLeft::
ViridianCity_EventScript_TutorialTriggerRight::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
data/maps/ViridianCity_Mart/scripts.inc
+3 -3
View File
@@ -21,7 +21,7 @@ ViridianCity_Mart_OnFrame::
ViridianCity_Mart_EventScript_ParcelScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown
applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ViridianCity_Mart_Text_YouCameFromPallet
closemessage
@@ -40,7 +40,7 @@ ViridianCity_Mart_Movement_ApproachCounter::
walk_up
walk_up
walk_up
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ViridianCity_Mart_Movement_FacePlayer::
@@ -48,7 +48,7 @@ ViridianCity_Mart_Movement_FacePlayer::
delay_16
delay_16
delay_16
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ViridianCity_Mart_EventScript_Clerk::
data/maps/ViridianCity_School/scripts.inc
+2 -2
View File
@@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass::
faceplayer
msgbox ViridianCity_School_Text_TryingToMemorizeNotes
closemessage
applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
waitmovement 0
release
end
@@ -36,7 +36,7 @@ ViridianCity_School_EventScript_Notebook::
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookFourthPage
applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes
data/scripts/cable_club.inc
+1 -1
View File
@@ -181,7 +181,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
CableClub_EventScript_Tutorial::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay
closemessage
data/scripts/movement.inc
+8 -8
View File
@@ -25,20 +25,20 @@ Movement_FaceOriginalDirection::
face_original_direction
step_end
Movement_WalkInPlaceFastestLeft::
walk_in_place_fastest_left
Movement_WalkInPlaceFasterLeft::
walk_in_place_faster_left
step_end
Movement_WalkInPlaceFastestUp::
walk_in_place_fastest_up
Movement_WalkInPlaceFasterUp::
walk_in_place_faster_up
step_end
Movement_WalkInPlaceFastestRight::
walk_in_place_fastest_right
Movement_WalkInPlaceFasterRight::
walk_in_place_faster_right
step_end
Movement_WalkInPlaceFastestDown::
walk_in_place_fastest_down
Movement_WalkInPlaceFasterDown::
walk_in_place_faster_down
step_end
Movement_FaceRight::
data/scripts/pkmn_center_nurse.inc
+2 -2
View File
@@ -19,11 +19,11 @@ EventScript_PkmnCenterNurse_HealPkmn::
end
EventScript_PkmnCenterNurse_TakeAndHealPkmn::
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterDown
waitmovement 0
special HealPlayerParty
return
data/scripts/route23.inc
+3 -3
View File
@@ -114,7 +114,7 @@ Route23_EventScript_RecognizeBadge::
Route23_EventScript_BadgeGuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft
applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft
waitmovement 0
switch VAR_TEMP_1
case 1, Route23_EventScript_CheckBoulderBadgeTrigger
@@ -173,7 +173,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger::
msgbox Text_CantLetYouPass
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
@@ -186,7 +186,7 @@ Route23_EventScript_MissingBadgeTrigger::
closemessage
waitse
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFastestDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
data/scripts/white_out.inc
+1 -1
View File
@@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg::
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown
applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox Text_HadQuiteAnExperienceTakeRest
call EventScript_OutOfCenterPartyHeal