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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:31:04 -04:00
committed by GitHub
parent ab56ac41a1 ccd527b782
commit 0400ee2124
353 changed files with 20156 additions and 19152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CinnabarIsland_Gym/scripts.inc
+10 -10
View File
@@ -271,13 +271,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
end
CinnabarIsland_Gym_EventScript_QuinnApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_QuinnApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
waitmovement 0
return
@@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
end
CinnabarIsland_Gym_EventScript_RamonApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_RamonApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_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, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DerekApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_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, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DustyApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_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, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_ZacApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
waitmovement 0
return