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

Merge branch 'master' into document-gyms2

Browse Source
This commit is contained in:
GriffinR
2019-10-16 04:22:34 -04:00
committed by GitHub
parent 20fa13616f 60a592a2c3
commit b4a9298205
361 changed files with 10599 additions and 11080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PetalburgCity_Gym/scripts.inc
+31 -31
View File
@@ -91,14 +91,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitGym
waitmovement 0
playse SE_KAIDAN
removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT
setvar VAR_PETALBURG_GYM_STATE, 2
@@ -229,7 +229,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
end
PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
@@ -237,20 +237,20 @@ PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31
PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43
applymovement 10, PetalburgCity_Gym_Movement_WallyArriveNorth
waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
waitmovement 0
@@ -275,45 +275,45 @@ PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7
applymovement 1, Common_Movement_WalkInPlaceUp
applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6
applymovement 1, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13
applymovement 1, Common_Movement_WalkInPlaceRight
applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 8204D29
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -323,7 +323,7 @@ PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 8204D34
return
PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 8204D3F
applymovement 10, Common_Movement_WalkInPlaceDown
applymovement 10, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -352,7 +352,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_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
@@ -506,47 +506,47 @@ PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
end
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC
applymovement 11, Common_Movement_WalkInPlaceUp
applymovement 11, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7
applymovement 11, Common_Movement_WalkInPlaceRight
applymovement 11, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2
applymovement 11, Common_Movement_WalkInPlaceLeft
applymovement 11, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement 1, Common_Movement_WalkInPlaceLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
return
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041
applymovement 11, PetalburgCity_Gym_Movement_WallysUncleExitNorth
applymovement 1, Common_Movement_WalkInPlaceDown
applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
waitmovement 0
return