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

OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA

Browse Source
This commit is contained in:
GriffinR
2024-10-14 22:48:30 -04:00
parent a2e408cf4e
commit 4dc5c47799
75 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -246,7 +246,7 @@ CeladonCity_GameCorner_EventScript_SlotMachine::
goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
setfieldeffectargument 0, OBJ_EVENT_ID_PLAYER
setfieldeffectargument 0, LOCALID_PLAYER
.ifdef BUGFIX
setfieldeffectargument 1, MAP_NUM(MAP_CELADON_CITY_GAME_CORNER)
setfieldeffectargument 2, MAP_GROUP(MAP_CELADON_CITY_GAME_CORNER)
data/maps/CeruleanCity/scripts.inc
+4 -4
View File
@@ -85,13 +85,13 @@ CeruleanCity_EventScript_RivalCharmander::
return
CeruleanCity_EventScript_RivalStartExit::
applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit
waitmovement 0
return
CeruleanCity_EventScript_RivalStartExitRight::
applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
applymovement LOCALID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight
applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight
waitmovement 0
return
@@ -206,7 +206,7 @@ CeruleanCity_EventScript_GruntTriggerTop::
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
@@ -216,7 +216,7 @@ CeruleanCity_EventScript_GruntTriggerBottom::
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
data/maps/CinnabarIsland/scripts.inc
+7 -7
View File
@@ -124,7 +124,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1::
CinnabarIsland_EventScript_BillApproachPlayer2::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -162,7 +162,7 @@ CinnabarIsland_Movement_BillExitToPokeCenter::
step_end
CinnabarIsland_EventScript_BillReturnToPokeCenter::
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor
waitmovement 0
opendoor 14, 11
@@ -212,7 +212,7 @@ CinnabarIsland_EventScript_SailToOneIsland::
CinnabarIsland_EventScript_ApproachShore::
applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ApproachShore
waitmovement 0
return
@@ -229,13 +229,13 @@ CinnabarIsland_EventScript_BoatArriveExitedPokeCenter::
CinnabarIsland_EventScript_BoardBoat::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat
waitmovement 0
return
CinnabarIsland_EventScript_BoardBoatExitedPokeCenter::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore
waitmovement 0
return
@@ -313,12 +313,12 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore::
@ Triggered when VAR_TEMP_1 is 0
CinnabarIsland_EventScript_GymDoorLocked::
lockall
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox CinnabarIsland_Text_DoorIsLocked
closemessage
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor
applymovement LOCALID_PLAYER, CinnabarIsland_Movement_ForcePlayerFromDoor
waitmovement 0
releaseall
end
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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_QuinnApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
waitmovement 0
return
@@ -343,13 +343,13 @@ CinnabarIsland_Gym_EventScript_BattleAvery::
end
CinnabarIsland_Gym_EventScript_AveryApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_AveryApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
applymovement LOCALID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery
applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachRight
waitmovement 0
return
@@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
end
CinnabarIsland_Gym_EventScript_RamonApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_RamonApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DerekApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DustyApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_ZacApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
waitmovement 0
return
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -53,19 +53,19 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill::
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast
waitmovement 0
return
CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest::
applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit
applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
applymovement LOCALID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest
waitmovement 0
return
data/maps/FiveIsland_MemorialPillar/scripts.inc
+1 -1
View File
@@ -57,7 +57,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 45
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -10,7 +10,7 @@ FiveIsland_ResortGorgeous_OnWarp::
.2byte 0
FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
FiveIsland_ResortGorgeous_OnFrame::
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+3 -3
View File
@@ -68,14 +68,14 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -83,7 +83,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+2 -2
View File
@@ -100,7 +100,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
end
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
data/maps/FourIsland/scripts.inc
+1 -1
View File
@@ -41,7 +41,7 @@ FourIsland_EventScript_RivalScene::
waitmovement 0
msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
closemessage
applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
applymovement LOCALID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
data/maps/FourIsland_IcefallCave_1F/scripts.inc
+1 -1
View File
@@ -19,7 +19,7 @@ FourIsland_IcefallCave_1F_OnFrame::
FourIsland_IcefallCave_1F_EventScript_FallDownHole::
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
applymovement LOCALID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+3 -3
View File
@@ -42,7 +42,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
delay 35
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
waitmovement 0
applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
waitmovement 0
@@ -70,7 +70,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
closemessage
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
applymovement LOCALID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
@@ -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, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+10 -10
View File
@@ -12,11 +12,11 @@ FuchsiaCity_SafariZone_Entrance_OnFrame::
FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter
waitmovement 0
msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit2
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -29,7 +29,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn::
textcolor NPC_TEXT_COLOR_MALE
msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -44,7 +44,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly::
goto_if_eq VAR_RESULT, NO, FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone
msgbox FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls
closemessage
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_Exit
waitmovement 0
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
@@ -54,7 +54,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly::
FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone::
msgbox FuchsiaCity_SafariZone_Entrance_Text_GoodLuck
closemessage
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter
waitmovement 0
warp MAP_SAFARI_ZONE_CENTER, 26, 30
waitstate
@@ -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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
showmoneybox 0, 0
msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
@@ -134,17 +134,17 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone::
end
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight::
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight
waitmovement 0
return
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid::
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid
waitmovement 0
return
FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft::
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft
waitmovement 0
return
@@ -165,7 +165,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney::
FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack::
closemessage
hidemoneybox
applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
applymovement LOCALID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack
waitmovement 0
releaseall
end
data/maps/IndigoPlateau_Exterior/scripts.inc
+7 -7
View File
@@ -34,13 +34,13 @@ IndigoPlateau_Exterior_EventScript_Credits::
special SpawnCameraObject
addobject LOCALID_RIVAL
applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
waitmovement 0
closedoor 11, 6
waitdooranim
@ Rival runs off
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
waitmovement 0
delay 100
@@ -56,23 +56,23 @@ IndigoPlateau_Exterior_EventScript_Credits::
delay 160
@ Oak looks at player, then walks off
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
waitmovement 0
delay 100
@ Player begin to leave
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
waitmovement 0
delay 155
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
waitmovement 0
delay 90
@ Player runs off
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
applymovement LOCALID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
waitmovement 0
@ Reset the map state and roll the credits
data/maps/NavelRock_Summit/scripts.inc
+2 -2
View File
@@ -42,7 +42,7 @@ NavelRock_Summit_EventScript_HoOh::
setvar VAR_0x8005, 35 @ Delay
special LoopWingFlapSound
applymovement LOCALID_HO_OH, Movement_HoOhAppear
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanUp
applymovement LOCALID_CAMERA, Movement_CameraPanUp
waitmovement 0
delay 50
setweather 0
@@ -55,7 +55,7 @@ NavelRock_Summit_EventScript_HoOh::
setvar VAR_0x8004, 3 @ Num loops
setvar VAR_0x8005, 35 @ Delay
special LoopWingFlapSound
applymovement OBJ_EVENT_ID_CAMERA, Movement_CameraPanDown
applymovement LOCALID_CAMERA, Movement_CameraPanDown
applymovement LOCALID_HO_OH, Movement_HoOhApproach
waitmovement 0
special RemoveCameraObject
data/maps/OneIsland/scripts.inc
+3 -3
View File
@@ -16,17 +16,17 @@ OneIsland_OnFrame::
OneIsland_EventScript_EnterOneIslandFirstTime::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor
applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerExitHarbor
waitmovement 0
msgbox OneIsland_Text_BillLetsGoSeeCelio
closemessage
applymovement LOCALID_BILL, OneIsland_Movement_BillWalkToPokeCenter
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerWalkToPokeCenter
waitmovement 0
opendoor 14, 5
waitdooranim
applymovement LOCALID_BILL, OneIsland_Movement_BillEnterPokeCenter
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
applymovement LOCALID_PLAYER, OneIsland_Movement_PlayerEnterPokeCenter
waitmovement 0
closedoor 14, 5
waitdooranim
data/maps/OneIsland_Harbor/scripts.inc
+2 -2
View File
@@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp::
.2byte 0
OneIsland_Harbor_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
OneIsland_Harbor_OnFrame::
@@ -18,7 +18,7 @@ OneIsland_Harbor_OnFrame::
OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
applymovement LOCALID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor
waitmovement 0
setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2
warp MAP_ONE_ISLAND, 12, 18
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+13 -13
View File
@@ -59,11 +59,11 @@ OneIsland_PokemonCenter_1F_OnFrame::
OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
playse SE_PIN
applymovement LOCALID_CELIO, Common_Movement_ExclamationMark
@@ -75,12 +75,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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
@@ -97,7 +97,7 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer
msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM
@@ -450,7 +450,7 @@ 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, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
@@ -463,7 +463,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 10
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 15
msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
@@ -473,12 +473,12 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
delay 15
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime
closemessage
delay 25
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit
waitmovement 0
playse SE_EXIT
@@ -492,22 +492,22 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
end
OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop::
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop
waitmovement 0
return
OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop::
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop
waitmovement 0
return
OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom::
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom
waitmovement 0
return
OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom::
applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom
applymovement LOCALID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom
waitmovement 0
return
data/maps/PalletTown/scripts.inc
+8 -8
View File
@@ -62,13 +62,13 @@ PalletTown_EventScript_OakRatingScene::
msgbox PalletTown_Text_CaughtXImpressiveFollowMe
closemessage
playbgm MUS_FOLLOW_ME, 0
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
waitmovement 0
opendoor 16, 13
waitdooranim
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -190,10 +190,10 @@ PalletTown_EventScript_OakTrigger::
waitmessage
delay 85
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
applymovement LOCALID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
delay 30
addobject LOCALID_PROF_OAK
@@ -208,7 +208,7 @@ PalletTown_EventScript_OakTrigger::
opendoor 16, 13
waitdooranim
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -234,13 +234,13 @@ PalletTown_EventScript_OakEnterRight::
PalletTown_EventScript_OakLeadPlayerToLabLeft::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
waitmovement 0
return
PalletTown_EventScript_OakLeadPlayerToLabRight::
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
applymovement LOCALID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
waitmovement 0
return
@@ -422,7 +422,7 @@ PalletTown_EventScript_TrainerTips::
PalletTown_EventScript_SignLadyTrigger::
lockall
applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
releaseall
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ PalletTown_PlayersHouse_2F_OnWarp::
.2byte 0
PalletTown_PlayersHouse_2F_FirstWarpIn::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+26 -26
View File
@@ -51,7 +51,7 @@ PalletTown_ProfessorOaksLab_OnWarp::
.2byte 0
PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PalletTown_ProfessorOaksLab_OnFrame::
@@ -69,7 +69,7 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene
end
@@ -131,7 +131,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -141,7 +141,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -156,12 +156,12 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -172,14 +172,14 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth::
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
return
@@ -213,7 +213,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
setobjectxyperm LOCALID_PROF_OAK, 6, 3
setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
@@ -266,7 +266,7 @@ PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
waitmovement 0
releaseall
end
@@ -298,7 +298,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
@@ -490,19 +490,19 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle::
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
waitmovement LOCALID_RIVAL
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight::
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
waitmovement LOCALID_RIVAL
return
@@ -703,7 +703,7 @@ PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth::
PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
waitmovement 0
return
@@ -735,14 +735,14 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth::
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
waitmovement LOCALID_PROF_OAK
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast::
applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
waitmovement LOCALID_PROF_OAK
return
@@ -958,7 +958,7 @@ PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
setobjectxyperm LOCALID_RIVAL, 5, 10
addobject LOCALID_RIVAL
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -967,7 +967,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
@@ -992,7 +992,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1001,31 +1001,31 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth::
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
@@ -1036,7 +1036,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit::
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/PewterCity/scripts.inc
+17 -17
View File
@@ -31,30 +31,30 @@ PewterCity_EventScript_GymGuide::
end
PewterCity_EventScript_WalkToGymEast::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymEast
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymEast
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymWest::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymWest
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymWest
waitmovement 0
return
@ Unused
PewterCity_EventScript_WalkToGymNorth::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymNorth
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymNorth
waitmovement 0
return
@@ -303,7 +303,7 @@ PewterCity_EventScript_GymGuideTrigger::
PewterCity_EventScript_WalkToGymTop::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymTop
waitmovement 0
return
@@ -311,7 +311,7 @@ PewterCity_EventScript_WalkToGymTop::
PewterCity_EventScript_WalkToGymMid::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymMid
waitmovement 0
return
@@ -319,7 +319,7 @@ PewterCity_EventScript_WalkToGymMid::
PewterCity_EventScript_WalkToGymBottom::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymBottom
waitmovement 0
return
@@ -328,7 +328,7 @@ PewterCity_EventScript_WalkToGymBottom::
PewterCity_EventScript_WalkToGymRight::
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideWalkToGymRight
waitmovement 0
return
@@ -458,25 +458,25 @@ PewterCity_EventScript_MuseumGuide::
PewterCity_EventScript_LeadToMuseumNorth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumSouth::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumWest::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest
waitmovement 0
return
PewterCity_EventScript_LeadToMuseumEast::
applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
applymovement LOCALID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast
waitmovement 0
return
@@ -740,7 +740,7 @@ PewterCity_EventScript_AideApproachPlayer0::
PewterCity_EventScript_AideApproachPlayer1::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/PewterCity_Museum_1F/scripts.inc
+8 -8
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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -66,7 +66,7 @@ PewterCity_Museum_1F_EventScript_EntranceTrigger::
msgbox PewterCity_Museum_1F_Text_ComeAgain
closemessage
hidemoneybox
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
waitmovement 0
releaseall
end
@@ -89,17 +89,17 @@ PewterCity_Museum_1F_EventScript_TryPayForTicket::
end
PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft
applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft
waitmovement 0
return
PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid
applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid
waitmovement 0
return
PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight::
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight
applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight
waitmovement 0
return
@@ -107,7 +107,7 @@ PewterCity_Museum_1F_EventScript_NotEnoughMoney::
msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney
closemessage
hidemoneybox
applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
applymovement LOCALID_PLAYER, PewterCity_Museum_1F_Movement_ForcePlayerExit
waitmovement 0
releaseall
end
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ PokemonLeague_AgathasRoom_OnWarp::
.2byte 0
PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_AgathasRoom_OnFrame::
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp::
.2byte 0
PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_BrunosRoom_OnFrame::
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+4 -4
View File
@@ -39,7 +39,7 @@ PokemonLeague_ChampionsRoom_OnWarp::
.2byte 0
PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_ChampionsRoom_OnFrame::
@@ -50,7 +50,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
lockall
textcolor NPC_TEXT_COLOR_MALE
setflag FLAG_TEMP_2
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
waitmovement 0
delay 20
call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro
@@ -70,7 +70,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
addobject LOCALID_PROF_OAK
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
closemessage
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
waitmovement 0
@@ -90,7 +90,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
closemessage
delay 13
applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
applymovement LOCALID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
waitmovement 0
setvar VAR_TEMP_1, 1
warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 5, 12
data/maps/PokemonLeague_HallOfFame/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ PokemonLeague_HallOfFame_OnWarp::
.2byte 0
PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_HallOfFame_OnFrame::
@@ -20,16 +20,16 @@ PokemonLeague_HallOfFame_OnFrame::
PokemonLeague_HallOfFame_EventScript_EnterRoom::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
applymovement LOCALID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
waitmovement 0
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
closemessage
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
data/maps/PokemonLeague_LancesRoom/scripts.inc
+2 -2
View File
@@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp::
.2byte 0
PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_LancesRoom_OnFrame::
@@ -39,7 +39,7 @@ PokemonLeague_LancesRoom_OnFrame::
PokemonLeague_LancesRoom_EventScript_EnterRoom::
lockall
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor
applymovement LOCALID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor
waitmovement 0
setflag FLAG_TEMP_2
call PokemonLeague_LancesRoom_EventScript_SetEntryClosed
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ PokemonLeague_LoreleisRoom_OnWarp::
.2byte 0
PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
PokemonLeague_LoreleisRoom_OnFrame::
data/maps/PokemonTower_2F/scripts.inc
+2 -2
View File
@@ -48,13 +48,13 @@ PokemonTower_2F_EventScript_Rival::
PokemonTower_2F_EventScript_RivalFacePlayerRight::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonTower_2F_EventScript_RivalFacePlayerDown::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/PokemonTower_6F/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ PokemonTower_6F_EventScript_MarowakGhost::
waitstate
special QuestLog_CutRecording
goto_if_eq VAR_RESULT, FALSE, PokemonTower_6F_EventScript_DefeatedMarowakGhost @ VAR_RESULT set by CB2_EndMarowakBattle
applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
applymovement LOCALID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
waitmovement 0
releaseall
end
data/maps/Route16_NorthEntrance_1F/scripts.inc
+6 -6
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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
@@ -58,28 +58,28 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger::
call_if_eq VAR_0x8008, 4, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom
msgbox Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight
applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkRight
waitmovement 0
releaseall
end
Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop::
applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp
applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp
waitmovement 0
return
Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid::
applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2
applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2
waitmovement 0
return
Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3
applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3
waitmovement 0
return
Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4
applymovement LOCALID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4
waitmovement 0
return
data/maps/Route18_EastEntrance_1F/scripts.inc
+6 -6
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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
@@ -58,28 +58,28 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger::
call_if_eq VAR_0x8008, 4, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom
msgbox Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight
applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkRight
waitmovement 0
releaseall
end
Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop::
applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp
applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp
waitmovement 0
return
Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid::
applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2
applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2
waitmovement 0
return
Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3
applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3
waitmovement 0
return
Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4
applymovement LOCALID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4
waitmovement 0
return
data/maps/Route22/scripts.inc
+2 -2
View File
@@ -55,7 +55,7 @@ Route22_EventScript_EarlyRivalApproach::
Route22_EventScript_EarlyRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
@@ -205,7 +205,7 @@ Route22_EventScript_LateRivalApproach::
Route22_EventScript_LateRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
applymovement LOCALID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
data/maps/Route24/scripts.inc
+2 -2
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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET
@@ -74,7 +74,7 @@ Route24_EventScript_RocketMotionToPlayer::
Route24_EventScript_NoRoomForNuggetTrigger::
msgbox Route24_Text_YouDontHaveAnyRoom
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
applymovement LOCALID_PLAYER, Route24_Movement_WalkDown
waitmovement 0
call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketWalkBackToPos
release
data/maps/Route25_SeaCottage/scripts.inc
+2 -2
View File
@@ -159,7 +159,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator::
clearflag BILL_IN_TELEPORTER
setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE
special SpawnCameraObject
applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters
applymovement LOCALID_CAMERA, Route25_SeaCottage_Movement_CameraPanToTeleporters
waitmovement 0
delay 35
playse SE_PIN
@@ -194,7 +194,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator::
applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter
waitmovement 0
waitfanfare
applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters
applymovement LOCALID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters
waitmovement 0
playse SE_CONTEST_CURTAIN_FALL
closedoor 3, 3
data/maps/Route5_SouthEntrance/scripts.inc
+5 -5
View File
@@ -25,12 +25,12 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight::
Route5_SouthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry
applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
@@ -52,17 +52,17 @@ Route5_SouthEntrance_EventScript_GuardDrinkTea::
end
Route5_SouthEntrance_EventScript_WalkToGuardLeft::
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft
applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft
waitmovement 0
return
Route5_SouthEntrance_EventScript_WalkToGuardMid::
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid
applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid
waitmovement 0
return
Route5_SouthEntrance_EventScript_WalkToGuardRight::
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight
applymovement LOCALID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight
waitmovement 0
return
data/maps/Route6_NorthEntrance/scripts.inc
+5 -5
View File
@@ -25,12 +25,12 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight::
Route6_NorthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry
applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
@@ -52,17 +52,17 @@ Route6_NorthEntrance_EventScript_GuardDrinkTea::
end
Route6_NorthEntrance_EventScript_WalkToGuardLeft::
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft
applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft
waitmovement 0
return
Route6_NorthEntrance_EventScript_WalkToGuardMid::
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid
applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid
waitmovement 0
return
Route6_NorthEntrance_EventScript_WalkToGuardRight::
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight
applymovement LOCALID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight
waitmovement 0
return
data/maps/Route7_EastEntrance/scripts.inc
+5 -5
View File
@@ -25,12 +25,12 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom::
Route7_EastEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry
applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
@@ -52,17 +52,17 @@ Route7_EastEntrance_EventScript_GuardDrinkTea::
end
Route7_EastEntrance_WalkToGuardTop::
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop
applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop
waitmovement 0
return
Route7_EastEntrance_WalkToGuardMid::
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid
applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid
waitmovement 0
return
Route7_EastEntrance_WalkToGuardBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom
applymovement LOCALID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom
waitmovement 0
return
data/maps/Route8_WestEntrance/scripts.inc
+5 -5
View File
@@ -25,12 +25,12 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom::
Route8_WestEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry
applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
@@ -64,17 +64,17 @@ Route8_WestEntrance_EventScript_GuardDrinkTea::
end
Route8_WestEntrance_EventScript_WalkToGuardTop::
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop
applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop
waitmovement 0
return
Route8_WestEntrance_EventScript_WalkToGuardMid::
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid
applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid
waitmovement 0
return
Route8_WestEntrance_EventScript_WalkToGuardBottom::
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom
applymovement LOCALID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom
waitmovement 0
return
data/maps/SSAnne_2F_Corridor/scripts.inc
+2 -2
View File
@@ -59,12 +59,12 @@ SSAnne_2F_Corridor_EventScript_RivalApproachLeft::
SSAnne_2F_Corridor_EventScript_RivalApproachMid::
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid
waitmovement 0
return
SSAnne_2F_Corridor_EventScript_RivalApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
applymovement LOCALID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight
applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight
waitmovement 0
return
data/maps/SSAnne_Exterior/scripts.inc
+3 -3
View File
@@ -23,7 +23,7 @@ SSAnne_Exterior_ExitSSAnne::
special DoSSAnneDepartureCutscene
waitstate
removeobject LOCALID_SS_ANNE
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_Exit
applymovement LOCALID_PLAYER, SSAnne_Exterior_Movement_Exit
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 2
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
@@ -33,12 +33,12 @@ SSAnne_Exterior_ExitSSAnne::
end
SSAnne_Exterior_WalkDown::
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown
applymovement LOCALID_PLAYER, SSAnne_Exterior_Movement_WalkDown
waitmovement 0
return
SSAnne_Exterior_WalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
closemessage
applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
data/maps/SeafoamIslands_B3F/scripts.inc
+2 -2
View File
@@ -49,12 +49,12 @@ SeafoamIslands_B3F_EventScript_AddBoulderPresent::
return
SeafoamIslands_B3F_EventScript_RideCurrentFar::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar
applymovement LOCALID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar
waitmovement 0
return
SeafoamIslands_B3F_EventScript_RideCurrentClose::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose
applymovement LOCALID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose
waitmovement 0
return
data/maps/SeafoamIslands_B4F/scripts.inc
+5 -5
View File
@@ -60,7 +60,7 @@ SeafoamIslands_B4F_OnWarp::
.2byte 0
SeafoamIslands_B4F_EventScript_WarpInOnCurrent::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
special ForcePlayerToStartSurfing
end
@@ -72,7 +72,7 @@ SeafoamIslands_B4F_OnFrame::
@ The current the player is forced in on from B3F
SeafoamIslands_B4F_EventScript_EnterOnCurrent::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent
applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent
waitmovement 0
setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 0
releaseall
@@ -104,12 +104,12 @@ SeafoamIslands_B4F_EventScript_AddBoulderPresent::
return
SeafoamIslands_B4F_EventScript_RideCurrentFar::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar
applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar
waitmovement 0
return
SeafoamIslands_B4F_EventScript_RideCurrentClose::
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose
applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose
waitmovement 0
return
@@ -142,7 +142,7 @@ SeafoamIslands_B4F_Movement_RideCurrentClose::
@ Triggers blocking re-entry to B3F
SeafoamIslands_B4F_EventScript_UpwardCurrent::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp
applymovement LOCALID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp
waitmovement 0
releaseall
end
data/maps/SevenIsland_House_Room1/scripts.inc
+5 -5
View File
@@ -34,12 +34,12 @@ SevenIsland_House_Room1_OnFrame::
SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
waitmovement 0
applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
waitmovement 0
copyobjectxytoperm LOCALID_OLD_WOMAN
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_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
@@ -124,19 +124,19 @@ SevenIsland_House_Room1_EventScript_ChooseParty::
SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth
applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth
waitmovement 0
return
SevenIsland_House_Room1_EventScript_EnterBattleRoomEast::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast
applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast
waitmovement 0
return
SevenIsland_House_Room1_EventScript_EnterBattleRoomWest::
applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest
applymovement LOCALID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest
waitmovement 0
return
data/maps/SevenIsland_House_Room2/scripts.inc
+2 -2
View File
@@ -13,7 +13,7 @@ SevenIsland_House_Room2_OnFrame::
SevenIsland_House_Room2_EventScript_BattleVisitingTrainer::
lockall
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom
applymovement LOCALID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom
waitmovement 0
special BufferEReaderTrainerGreeting
msgbox gStringVar4
@@ -27,7 +27,7 @@ SevenIsland_House_Room2_EventScript_BattleVisitingTrainer::
call_if_eq VAR_RESULT, 2, SevenIsland_House_Room2_EventScript_BattleLost
closemessage
special HealPlayerParty
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom
applymovement LOCALID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom
waitmovement 0
special LoadPlayerParty
setvar VAR_TEMP_1, 1
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+2 -2
View File
@@ -23,7 +23,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
call_if_ne VAR_FACING, DIR_SOUTH, SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
delay 30
playbgm MUS_SCHOOL, 0
applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
applymovement LOCALID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
waitmovement 0
fadedefaultbgm
delay 30
@@ -34,7 +34,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
end
SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/SilphCo_11F/scripts.inc
+1 -1
View File
@@ -85,7 +85,7 @@ SilphCo_11F_EventScript_BattleGiovanni::
SilphCo_11F_EventScript_GiovanniApproachLeft::
applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft
applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni
applymovement LOCALID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni
waitmovement 0
return
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, Common_Movement_ExclamationMark
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox SilphCo_7F_Text_RivalWhatKeptYou
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+12 -12
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, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -102,51 +102,51 @@ 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, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth::
applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth::
applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast::
applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest::
applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
waitmovement 0
return
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -34,7 +34,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene::
waitmovement 0
msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere
closemessage
applymovement OBJ_EVENT_ID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit
applymovement LOCALID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit
waitmovement 0
fadedefaultbgm
data/maps/ThreeIsland/scripts.inc
+8 -8
View File
@@ -95,23 +95,23 @@ ThreeIsland_EventScript_BikerArgumentScene::
return
ThreeIsland_EventScript_PlayerFaceUp::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@ Unused
ThreeIsland_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceLeft::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceRight::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -286,20 +286,20 @@ ThreeIsland_EventScript_PaxtonApproachMidLeft::
ThreeIsland_EventScript_PaxtonApproachMid::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidRight::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachRight::
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight
waitmovement 0
return
@@ -307,7 +307,7 @@ ThreeIsland_EventScript_PaxtonApproachRight::
ThreeIsland_EventScript_LeaveBikersAlone::
msgbox ThreeIsland_Text_ThatsSmart
closemessage
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers
applymovement LOCALID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers
waitmovement 0
applymovement LOCALID_BIKER1, ThreeIsland_Movement_Biker1ReturnToPack
waitmovement 0
data/maps/TrainerTower_Elevator/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ TrainerTower_Elevator_EventScript_SelectLobby::
setvar VAR_ELEVATOR_FLOOR, 3
special CloseElevatorCurrentFloorWindow
delay 25
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
applymovement LOCALID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
waitmovement 0
warp MAP_TRAINER_TOWER_LOBBY, 17, 8
waitstate
data/maps/TrainerTower_Lobby/scripts.inc
+8 -8
View File
@@ -19,8 +19,8 @@ TrainerTower_Lobby_OnResume::
goto_if_eq VAR_RESULT, FALSE, TrainerTower_Lobby_OnResumeEnd
@ Never reached, above always FALSE
setvar VAR_TEMP_0, 0
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
setobjectxy LOCALID_PLAYER, 9, 7
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
TrainerTower_Lobby_OnResumeEnd::
end
@@ -52,7 +52,7 @@ TrainerTower_Lobby_OnFrame::
TrainerTower_Lobby_EventScript_ExitElevator::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
waitmovement 0
setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1
special DrawWholeMapView
@@ -78,7 +78,7 @@ TrainerTower_Lobby_EventScript_Enter::
TrainerTower_Lobby_EventScript_LostChallenge::
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor NPC_TEXT_COLOR_FEMALE
msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain
goto TrainerTower_Lobby_EventScript_ExitChallenge
@@ -87,12 +87,12 @@ TrainerTower_Lobby_EventScript_LostChallenge::
TrainerTower_Lobby_EventScript_ExitChallengeSpeakToReceptionist::
lock
faceplayer
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor NPC_TEXT_COLOR_FEMALE
msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
TrainerTower_Lobby_EventScript_ExitChallenge::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
waitmovement 0
setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
release
@@ -148,7 +148,7 @@ TrainerTower_Lobby_Mart_Items::
TrainerTower_Lobby_EventScript_EntryTrigger::
lockall
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
textcolor NPC_TEXT_COLOR_FEMALE
msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
ttower_getnumfloors
@@ -197,7 +197,7 @@ TrainerTower_Lobby_EventScript_BeginChallenge::
TrainerTower_Lobby_EventScript_DeclineChallenge::
msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
applymovement LOCALID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
waitmovement 0
releaseall
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+3 -3
View File
@@ -26,7 +26,7 @@ TwoIsland_JoyfulGameCorner_OnWarp::
.2byte 0
TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth::
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
turnobject LOCALID_PLAYER, DIR_NORTH
end
TwoIsland_JoyfulGameCorner_OnFrame::
@@ -65,13 +65,13 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
waitmovement 0
applymovement LOCALID_DADDY, TwoIsland_JoyfulGameCorner_Movement_DaddyApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle
closemessage
playse SE_RS_DOOR
waitse
applymovement OBJ_EVENT_ID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy
applymovement LOCALID_PLAYER, TwoIsland_JoyfulGameCorner_Movement_PlayerFaceDaddy
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
addobject LOCALID_BIKER
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -11,7 +11,7 @@ VermilionCity_OnFrame::
VermilionCity_EventScript_ExitSSAnne::
lockall
applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne
applymovement LOCALID_PLAYER, VermilionCity_Movement_ExitSSAnne
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 3
releaseall
@@ -192,7 +192,7 @@ VermilionCity_EventScript_ExitedTicketCheck::
VermilionCity_EventScript_CheckTicket::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_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,12 +43,12 @@ ViridianCity_EventScript_TryUnlockGym::
ViridianCity_EventScript_GymDoorLocked::
lockall
textcolor NPC_TEXT_COLOR_NEUTRAL
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox ViridianCity_Text_GymDoorsAreLocked
closemessage
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_JumpDownLedge
applymovement LOCALID_PLAYER, ViridianCity_Movement_JumpDownLedge
waitmovement 0
releaseall
end
@@ -194,7 +194,7 @@ ViridianCity_EventScript_RoadBlocked::
textcolor NPC_TEXT_COLOR_MALE
msgbox ViridianCity_Text_ThisIsPrivateProperty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown
applymovement LOCALID_PLAYER, ViridianCity_Movement_WalkDown
waitmovement 0
releaseall
end
@@ -208,7 +208,7 @@ ViridianCity_EventScript_TutorialTriggerLeft::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
@@ -219,7 +219,7 @@ ViridianCity_EventScript_TutorialTriggerRight::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
data/maps/ViridianCity_Mart/scripts.inc
+1 -1
View File
@@ -26,7 +26,7 @@ ViridianCity_Mart_EventScript_ParcelScene::
msgbox ViridianCity_Mart_Text_YouCameFromPallet
closemessage
applymovement LOCALID_CLERK, ViridianCity_Mart_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter
applymovement LOCALID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter
waitmovement 0
msgbox ViridianCity_Mart_Text_TakeThisToProfOak
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
data/scripts/cable_club.inc
+22 -22
View File
@@ -108,7 +108,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom::
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
@@ -131,7 +131,7 @@ CableClub_EventScript_PlayerExitTradeCenter::
setvar VAR_CABLE_CLUB_STATE, 0
textcolor NPC_TEXT_COLOR_FEMALE
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -154,7 +154,7 @@ CableClub_EventScript_PlayerExitUnionRoom::
setvar VAR_CABLE_CLUB_STATE, 0
textcolor NPC_TEXT_COLOR_FEMALE
goto_if_eq VAR_0x8007, 0, CableClub_EventScript_PlayerExitLinkRoom
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerFaceAttendantRight
applymovement LOCALID_PLAYER, Movement_PlayerFaceAttendantRight
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceLeft
waitmovement 0
@@ -167,25 +167,25 @@ CableClub_EventScript_TrainerCardDataOverwritten::
playse SE_PIN
message CableClub_Text_HopeToSeeYouAgain
waitmessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
applymovement VAR_0x8007, Movement_AttendantFaceDown
waitmovement 0
return
CableClub_EventScript_PlayerExitLinkRoom::
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerExitLinkRoom
waitmovement 0
return
CableClub_EventScript_Tutorial::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachCounter
applymovement LOCALID_PLAYER, Movement_PlayerApproachCounter
waitmovement 0
delay 30
msgbox CableClub_Text_ExplainWirelessClubFirstTime
@@ -297,13 +297,13 @@ CableClub_EventScript_EnterColosseum::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -316,7 +316,7 @@ CableClub_EventScript_EnterColosseum::
@ Unused
CableClub_EventScript_PlayerApproachLinkRoomRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomRight
waitmovement 0
return
@@ -395,13 +395,13 @@ CableClub_EventScript_EnterTradeCenter::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -783,13 +783,13 @@ CableClub_EventScript_EnterUnionRoom::
delay 60
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
@@ -1060,13 +1060,13 @@ CableClub_EventScript_EnterWirelessLinkRoom::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomLeft
applymovement LOCALID_PLAYER, Movement_PlayerApproachLinkRoomLeft
waitmovement 0
opendoor 9, 1
waitdooranim
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterLinkRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
closedoor 9, 1
waitdooranim
release
@@ -1244,9 +1244,9 @@ CableClub_EventScript_EnterMinigame::
applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
waitmovement 0
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerEnterMinigameRoom
applymovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
hideobjectat LOCALID_PLAYER, 0
release
waitstate
end
data/scripts/hole.inc
+2 -2
View File
@@ -11,7 +11,7 @@ EventScript_FixCrackedGround::
EventScript_FallDownHole::
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60
@@ -23,7 +23,7 @@ EventScript_FallDownHole::
EventScript_DoFallWarp::
lockall
delay 20
applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
applymovement LOCALID_PLAYER, Movement_SetInvisible
waitmovement 0
playse SE_FALL
delay 60
data/scripts/pokemon_league.inc
+4 -4
View File
@@ -1,5 +1,5 @@
PokemonLeague_EventScript_OpenDoor::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
applymovement LOCALID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
call PokemonLeague_EventScript_SetDoorOpen
@@ -8,7 +8,7 @@ PokemonLeague_EventScript_OpenDoor::
return
PokemonLeague_EventScript_EnterRoom::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp5
applymovement LOCALID_PLAYER, Common_Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
playse SE_UNLOCK
@@ -26,13 +26,13 @@ PokemonLeague_EventScript_PreventExit::
textcolor NPC_TEXT_COLOR_MALE
msgbox Text_VoiceRangOutDontRunAway
closemessage
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn
applymovement LOCALID_PLAYER, PokemonLeague_Movement_ForcePlayerIn
waitmovement 0
releaseall
end
PokemonLeague_EventScript_OpenDoorLance::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
applymovement LOCALID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
data/scripts/route23.inc
+2 -2
View File
@@ -172,7 +172,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger::
playse SE_BOO
msgbox Text_CantLetYouPass
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement LOCALID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
@@ -185,7 +185,7 @@ Route23_EventScript_MissingBadgeTrigger::
waitbuttonpress
closemessage
waitse
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement LOCALID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
data/scripts/seagallop.inc
+1 -1
View File
@@ -118,7 +118,7 @@ EventScript_CancelSail::
VermilionCity_EventScript_WalkUpPier::
closemessage
applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection
applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp
applymovement LOCALID_PLAYER, VermilionCity_Movement_WalkUp
waitmovement 0
releaseall
end
data/scripts/trainer_tower.inc
+1 -1
View File
@@ -362,7 +362,7 @@ TrainerTower_EventScript_IneligibleForDoubleBattle::
playse SE_DING_DONG
msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble
closemessage
applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack
applymovement LOCALID_PLAYER, TrainerTower_Movement_PushPlayerBack
waitmovement 0
releaseall
end
src/event_object_lock.c
+2 -2
View File
@@ -86,7 +86,7 @@ void FreezeObjects_WaitForPlayerAndSelected(void)
void ClearPlayerHeldMovementAndUnfreezeObjectEvents(void)
{
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
@@ -97,7 +97,7 @@ void UnionRoom_UnlockPlayerAndChatPartner(void)
u8 objectEventId;
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
objectEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
objectEventId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
src/event_object_movement.c
+4 -4
View File
@@ -1257,7 +1257,7 @@ u8 GetFirstInactiveObjectEventId(void)
u8 GetObjectEventIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroupId)
{
if (localId < OBJ_EVENT_ID_PLAYER)
if (localId < LOCALID_PLAYER)
{
return GetObjectEventIdByLocalIdAndMapInternal(localId, mapNum, mapGroupId);
}
@@ -6776,7 +6776,7 @@ static bool8 MovementAction_FacePlayer_Step0(struct ObjectEvent *objectEvent, st
{
u8 playerObjectId;
if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId))
if (!TryGetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0, &playerObjectId))
{
FaceDirection(objectEvent, sprite, GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y));
}
@@ -6788,7 +6788,7 @@ static bool8 MovementAction_FaceAwayPlayer_Step0(struct ObjectEvent *objectEvent
{
u8 playerObjectId;
if (!TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0, &playerObjectId))
if (!TryGetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0, &playerObjectId))
{
FaceDirection(objectEvent, sprite, GetOppositeDirection(GetDirectionToFace(objectEvent->currentCoords.x, objectEvent->currentCoords.y, gObjectEvents[playerObjectId].currentCoords.x, gObjectEvents[playerObjectId].currentCoords.y)));
}
@@ -8691,7 +8691,7 @@ static void DoFlaggedGroundEffects(struct ObjectEvent *objEvent, struct Sprite *
{
u8 i;
if (objEvent->localId == OBJ_EVENT_ID_CAMERA && objEvent->invisible)
if (objEvent->localId == LOCALID_CAMERA && objEvent->invisible)
return;
for (i = 0; i < NELEMS(sGroundEffectFuncs); i++, flags >>= 1)
src/field_control_avatar.c
+3 -3
View File
@@ -414,7 +414,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil
else
objectEventId = GetObjectEventIdByPosition(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->elevation);
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER)
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER)
return NULL;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
@@ -435,14 +435,14 @@ static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8
const u8 *script;
objectEventId = GetObjectEventIdByPosition(position->x, position->y, position->elevation);
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER)
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER)
{
if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE)
return NULL;
// Look for an object event on the other side of the counter.
objectEventId = GetObjectEventIdByPosition(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->elevation);
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER)
if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == LOCALID_PLAYER)
return NULL;
}
src/field_fadetransition.c
+8 -8
View File
@@ -351,7 +351,7 @@ static void Task_ExitDoor(u8 taskId)
{
PlayerGetDestCoords(&task->data[12], &task->data[13]);
SetPlayerVisibility(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 8;
}
break;
@@ -366,7 +366,7 @@ static void Task_ExitDoor(u8 taskId)
case 9:
if (FieldFadeTransitionBackgroundEffectIsFinished() && walkrun_is_standing_still() && !FieldIsDoorAnimationRunning() && !FuncIsActiveTask(Task_BarnDoorWipe))
{
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]);
task->data[0] = 4;
}
break;
@@ -375,7 +375,7 @@ static void Task_ExitDoor(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
SetPlayerVisibility(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_DOWN);
task->data[0] = 2;
}
break;
@@ -383,7 +383,7 @@ static void Task_ExitDoor(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*x, *y);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]);
task->data[0] = 3;
}
break;
@@ -417,7 +417,7 @@ static void Task_ExitNonAnimDoor(u8 taskId)
if (FieldFadeTransitionBackgroundEffectIsFinished())
{
SetPlayerVisibility(TRUE);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
task->data[0] = 2;
}
break;
@@ -754,8 +754,8 @@ static void Task_DoorWarp(u8 taskId)
case 1:
if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
{
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
ObjectEventClearHeldMovementIfActive(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]);
ObjectEventSetHeldMovement(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)], MOVEMENT_ACTION_WALK_NORMAL_UP);
task->data[0] = 2;
}
break;
@@ -763,7 +763,7 @@ static void Task_DoorWarp(u8 taskId)
if (walkrun_is_standing_still())
{
task->data[1] = FieldAnimateDoorClose(*xp, *yp - 1);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0)]);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0)]);
SetPlayerVisibility(FALSE);
task->data[0] = 3;
}
src/field_player_avatar.c
+1 -1
View File
@@ -1289,7 +1289,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
u8 objectEventId;
struct ObjectEvent *objectEvent;
playerObjEventTemplate.localId = OBJ_EVENT_ID_PLAYER;
playerObjEventTemplate.localId = LOCALID_PLAYER;
playerObjEventTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_GFX_NORMAL, gender);
playerObjEventTemplate.x = x - 7;
playerObjEventTemplate.y = y - 7;
src/field_specials.c
+2 -2
View File
@@ -317,7 +317,7 @@ void AnimatePcTurnOff()
void SpawnCameraObject(void)
{
u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET, 3);
u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 8, LOCALID_CAMERA, gSaveBlock1Ptr->pos.x + MAP_OFFSET, gSaveBlock1Ptr->pos.y + MAP_OFFSET, 3);
gObjectEvents[objectEventId].invisible = TRUE;
CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
}
@@ -325,7 +325,7 @@ void SpawnCameraObject(void)
void RemoveCameraObject(void)
{
CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
RemoveObjectEventByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
void BufferEReaderTrainerName(void)
src/quest_log.c
+1 -1
View File
@@ -1340,7 +1340,7 @@ void SaveQuestLogData(void)
void QL_UpdateObject(struct Sprite *sprite)
{
struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]];
if (objectEvent->localId == OBJ_EVENT_ID_PLAYER)
if (objectEvent->localId == LOCALID_PLAYER)
{
if (sMovementScripts[0][0] != MOVEMENT_ACTION_NONE)
{
src/scrcmd.c
+2 -2
View File
@@ -1232,7 +1232,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext * ctx)
u8 playerObjectId;
HideFieldMessageBox();
playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
playerObjectId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
@@ -1246,7 +1246,7 @@ bool8 ScrCmd_release(struct ScriptContext * ctx)
HideFieldMessageBox();
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
playerObjectId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0);
playerObjectId = GetObjectEventIdByLocalIdAndMap(LOCALID_PLAYER, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[playerObjectId]);
ScriptMovement_UnfreezeObjectEvents();
UnfreezeObjectEvents();
src/script_movement.c
+1 -1
View File
@@ -84,7 +84,7 @@ bool8 ScriptMovement_TryAddNewMovement(u8 taskId, u8 objEventId, const u8 *movem
return FALSE;
}
}
moveScrId = GetMovementScriptIdFromObjectEventId(taskId, OBJ_EVENT_ID_PLAYER);
moveScrId = GetMovementScriptIdFromObjectEventId(taskId, LOCALID_PLAYER);
if (moveScrId == OBJECT_EVENTS_COUNT)
{
return TRUE;
src/trainer_see.c
+4 -4
View File
@@ -449,7 +449,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru
{
int specialObjectId;
task->tData5 = 0;
specialObjectId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 7, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
specialObjectId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 7, LOCALID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
gObjectEvents[specialObjectId].invisible = TRUE;
CameraObjectSetFollowedObjectId(gObjectEvents[specialObjectId].spriteId);
task->tFuncId++;
@@ -459,7 +459,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
u8 specialObjectId;
TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
TryGetObjectEventIdByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId]))
return FALSE;
@@ -482,7 +482,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru
static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj)
{
u8 specialObjectId;
TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
TryGetObjectEventIdByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
return FALSE;
@@ -498,7 +498,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st
else
{
CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
RemoveObjectEventByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
RemoveObjectEventByLocalIdAndMap(LOCALID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
task->tData5 = 0;
task->tFuncId = 2;
}