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

Add local object event ids for referenced objects

Browse Source
This commit is contained in:
GriffinR
2020-06-21 01:56:57 -04:00
parent 46f4a4bbf7
commit fac6288156
192 changed files with 2857 additions and 2205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_Gym/scripts.inc
+53 -49
View File
@@ -1,3 +1,7 @@
.set LOCALID_NORMAN, 1
.set LOCALID_WALLY, 10
.set LOCALID_WALLYS_UNCLE, 11
PetalburgCity_Gym_MapScripts:: @ 8204889
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition
@@ -46,11 +50,11 @@ PetalburgCity_Gym_OnTransition: @ 820492D
end
PetalburgCity_Gym_EventScript_MoveWallyToEntrance:: @ 820494D
setobjectxyperm 10, 5, 108
setobjectxyperm LOCALID_WALLY, 5, 108
return
PetalburgCity_Gym_EventScript_MoveNormanToEntrance:: @ 8204955
setobjectxyperm 1, 4, 107
setobjectxyperm LOCALID_NORMAN, 4, 107
return
PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D
@@ -60,7 +64,7 @@ PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D
goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront
compare VAR_PETALBURG_GYM_STATE, 8
goto_if_eq PetalburgCity_Gym_EventScript_DontMoveNormanToFront
setobjectxyperm 1, 4, 107
setobjectxyperm LOCALID_NORMAN, 4, 107
return
PetalburgCity_Gym_EventScript_DontMoveNormanToFront:: @ 8204985
@@ -85,10 +89,10 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym
waitmovement 0
playse SE_KAIDAN
removeobject 10
removeobject LOCALID_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -146,7 +150,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: @ 8204AA1
end
PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
addobject 10 @ Wally
addobject LOCALID_WALLY
playse SE_DOOR
compare VAR_0x8008, 0
call_if_eq PetalburgCity_Gym_EventScript_WallyArriveSouth
@@ -208,7 +212,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyWest
compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast
removeobject 10
removeobject LOCALID_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
setvar VAR_PETALBURG_GYM_STATE, 1
setvar VAR_PETALBURG_CITY_STATE, 2
@@ -222,101 +226,101 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
end
PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyArrive
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43
applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth
waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyArrive
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91
applymovement 10, PetalburgCity_Gym_Movement_WallyExitNorth
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3
applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5
applymovement 10, PetalburgCity_Gym_Movement_WallyExitEast
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7
applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 8204D29
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 8204D34
applymovement 10, Common_Movement_FacePlayer
applymovement LOCALID_WALLY, Common_Movement_FacePlayer
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 8204D3F
applymovement 10, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -345,7 +349,7 @@ PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ 8204D72
@ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX
PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: @ 8204D73
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -397,7 +401,7 @@ PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17
PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
giveitem ITEM_ENIGMA_BERRY
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
release
@@ -429,7 +433,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
delay 40
playse SE_DOOR
delay 10
addobject 11 @ Wallys Uncle
addobject LOCALID_WALLYS_UNCLE
switch VAR_FACING
case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth
case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest
@@ -438,7 +442,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
giveitem ITEM_TM42
compare VAR_RESULT, 0
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_BagIsFull
setflag FLAG_RECEIVED_TM42
msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT
@@ -457,12 +461,12 @@ PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09
goto PetalburgCity_Gym_EventScript_WallysUncleArrives
PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleEnterGym
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleEnterGym
waitmovement 0
playse SE_PIN
applymovement 11, Common_Movement_ExclamationMark
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_ExclamationMark
waitmovement 0
applymovement 11, Common_Movement_Delay48
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_Delay48
waitmovement 0
delay 10
compare VAR_0x8008, 1
@@ -490,7 +494,7 @@ PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast
compare VAR_0x8008, 3
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest
removeobject 11
removeobject LOCALID_WALLYS_UNCLE
setvar VAR_PETALBURG_CITY_STATE, 4
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
warp MAP_PETALBURG_CITY, 255, 15, 8
@@ -499,59 +503,59 @@ PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
end
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC
applymovement 11, Common_Movement_WalkInPlaceFastestUp
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7
applymovement 11, Common_Movement_WalkInPlaceFastestRight
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2
applymovement 11, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitNorth
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitEast
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitEast
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitWest
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest
waitmovement 0
return