dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Continue adding local IDs to map.json files

Browse Source
This commit is contained in:
GriffinR
2024-10-12 09:59:56 -04:00
parent a2a3255bdd
commit cb66ea6653
169 changed files with 1233 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
data/maps/PetalburgCity_Gym/scripts.inc
View File

@@ -1,7 +1,3 @@
.set LOCALID_NORMAN, 1
.set LOCALID_WALLY, 10
.set LOCALID_WALLYS_DAD, 11
PetalburgCity_Gym_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition
@@ -46,11 +42,11 @@ PetalburgCity_Gym_OnTransition:
end
PetalburgCity_Gym_EventScript_MoveWallyToEntrance::
setobjectxyperm LOCALID_WALLY, 5, 108
setobjectxyperm LOCALID_PETALBURG_GYM_WALLY, 5, 108
return
PetalburgCity_Gym_EventScript_MoveNormanToEntrance::
setobjectxyperm LOCALID_NORMAN, 4, 107
setobjectxyperm LOCALID_PETALBURG_GYM_NORMAN, 4, 107
return
PetalburgCity_Gym_EventScript_CheckNormanForRematch::
@@ -58,7 +54,7 @@ PetalburgCity_Gym_EventScript_CheckNormanForRematch::
specialvar VAR_RESULT, IsTrainerReadyForRematch
goto_if_eq VAR_RESULT, TRUE, PetalburgCity_Gym_EventScript_DontMoveNormanToFront
goto_if_eq VAR_PETALBURG_GYM_STATE, 8, PetalburgCity_Gym_EventScript_DontMoveNormanToFront
setobjectxyperm LOCALID_NORMAN, 4, 107
setobjectxyperm LOCALID_PETALBURG_GYM_NORMAN, 4, 107
return
PetalburgCity_Gym_EventScript_DontMoveNormanToFront::
@@ -83,10 +79,10 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial::
msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitGym
waitmovement 0
playse SE_EXIT
removeobject LOCALID_WALLY
removeobject LOCALID_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
@@ -144,7 +140,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorialEast::
end
PetalburgCity_Gym_EventScript_BeginWallyTutorial::
addobject LOCALID_WALLY
addobject LOCALID_PETALBURG_GYM_WALLY
playse SE_DOOR
call_if_eq VAR_0x8008, 0, PetalburgCity_Gym_EventScript_WallyArriveSouth
call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_WallyArriveNorth
@@ -182,7 +178,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial::
call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth
call_if_eq VAR_0x8008, 2, PetalburgCity_Gym_EventScript_ExitGymWithWallyWest
call_if_eq VAR_0x8008, 3, PetalburgCity_Gym_EventScript_ExitGymWithWallyEast
removeobject LOCALID_WALLY
removeobject LOCALID_PETALBURG_GYM_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM
setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_CITY_STATE, 2
@@ -196,101 +192,101 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial::
end
PetalburgCity_Gym_EventScript_WallyArriveSouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveNorth::
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth
waitmovement 0
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveWestEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallySouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth::
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyWest::
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyEast::
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitEast
applymovement LOCALID_PETALBURG_GYM_WALLY, PetalburgCity_Gym_Movement_WallyExitEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerWest::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallySouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyWest::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyFacePlayer::
applymovement LOCALID_WALLY, Common_Movement_FacePlayer
applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_FacePlayer
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyFaceDown::
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_WALLY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -319,7 +315,7 @@ PetalburgCity_Gym_EventScript_NormanFaceDoorSouth::
@ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX
PetalburgCity_Gym_EventScript_NormanFaceDoorNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -397,7 +393,7 @@ PetalburgCity_Gym_EventScript_NormanBattle::
delay 40
playse SE_DOOR
delay 10
addobject LOCALID_WALLYS_DAD
addobject LOCALID_PETALBURG_GYM_WALLYS_DAD
switch VAR_FACING
case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth
case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest
@@ -424,12 +420,12 @@ PetalburgCity_Gym_EventScript_WallysDadArrivesWest::
goto PetalburgCity_Gym_EventScript_WallysDadArrives
PetalburgCity_Gym_EventScript_WallysDadArrives::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
waitmovement 0
playse SE_PIN
applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_Delay48
waitmovement 0
delay 10
call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth
@@ -448,7 +444,7 @@ PetalburgCity_Gym_EventScript_WallysDadArrives::
call_if_eq VAR_0x8008, 1, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth
call_if_eq VAR_0x8008, 2, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast
call_if_eq VAR_0x8008, 3, PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest
removeobject LOCALID_WALLYS_DAD
removeobject LOCALID_PETALBURG_GYM_WALLYS_DAD
setvar VAR_PETALBURG_CITY_STATE, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
warp MAP_PETALBURG_CITY, 15, 8
@@ -457,59 +453,59 @@ PetalburgCity_Gym_EventScript_WallysDadArrives::
end
PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
applymovement LOCALID_PETALBURG_GYM_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
applymovement LOCALID_PETALBURG_GYM_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest
waitmovement 0
return