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-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+19 -30
View File
@@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer::
FiveIsland_RocketWarehouse_EventScript_Admin2Trigger::
lockall
applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFasterLeft
waitmovement 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
releaseall
@@ -84,8 +84,7 @@ FiveIsland_RocketWarehouse_EventScript_Admin2::
FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
getplayerxy PLAYER_X_POS, PLAYER_Y_POS
compare PLAYER_X_POS, 24
call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
closemessage
fadescreen FADE_TO_BLACK
@@ -101,7 +100,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
end
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -118,38 +117,28 @@ FiveIsland_RocketWarehouse_EventScript_Admin1::
FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
getplayerxy PLAYER_X_POS, PLAYER_Y_POS
specialvar VAR_RESULT, GetPlayerFacingDirection
compare VAR_RESULT, DIR_NORTH
call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
call_if_eq VAR_RESULT, DIR_NORTH, FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle
closemessage
compare PLAYER_X_POS, 24
call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
compare PLAYER_X_POS, 25
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
compare PLAYER_X_POS, 26
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
compare PLAYER_X_POS, 27
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
call_if_eq PLAYER_X_POS, 25, FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
call_if_eq PLAYER_X_POS, 26, FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
call_if_eq PLAYER_X_POS, 27, FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
playse SE_PIN
call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
special DrawWholeMapView
waitse
compare PLAYER_X_POS, 24
call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
compare PLAYER_X_POS, 25
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
compare PLAYER_X_POS, 26
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
compare PLAYER_X_POS, 27
call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
call_if_le PLAYER_X_POS, 24, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
call_if_eq PLAYER_X_POS, 25, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
call_if_eq PLAYER_X_POS, 26, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
call_if_eq PLAYER_X_POS, 27, FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough
release
end
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
compare PLAYER_X_POS, 27
goto_if_eq EventScript_Return
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
goto_if_eq PLAYER_X_POS, 27, EventScript_Return
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -164,27 +153,27 @@ FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch::
return
FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterDown
waitmovement 0
return
FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar::
walk_right
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch::
walk_right
walk_in_place_fastest_up
walk_in_place_faster_up
step_end