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/PewterCity/scripts.inc
+47 -68
View File
@@ -19,8 +19,7 @@ PewterCity_EventScript_GymGuide::
msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe
closemessage
playbgm MUS_FOLLOW_ME, 0
compare VAR_FACING, DIR_EAST
call_if_eq PewterCity_EventScript_WalkToGymEast
call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_WalkToGymEast
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
@@ -170,7 +169,7 @@ PewterCity_Movement_PlayerWaitForGuideEast::
delay_16
delay_16
delay_4
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
PewterCity_Movement_PlayerWalkToGymEast::
@@ -207,14 +206,14 @@ PewterCity_Movement_PlayerWalkToGymNorth::
PewterCity_Movement_GuideMoveToLeadEast::
walk_down
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
walk_in_place_up
step_end
PewterCity_Movement_GuideWalkToGymEast::
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideMoveToLeadWest::
@@ -228,7 +227,7 @@ PewterCity_Movement_GuideWalkToGymWest::
walk_left
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideMoveToLeadNorth::
@@ -242,7 +241,7 @@ PewterCity_Movement_GuideWalkToGymNorth::
walk_left
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GymGuideExit::
@@ -284,16 +283,13 @@ PewterCity_EventScript_GymGuideTriggerRight::
end
PewterCity_EventScript_GymGuideTrigger::
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe
closemessage
playbgm MUS_FOLLOW_ME, 0
compare VAR_TEMP_1, 0
call_if_eq PewterCity_EventScript_WalkToGymTop
compare VAR_TEMP_1, 1
call_if_eq PewterCity_EventScript_WalkToGymMid
compare VAR_TEMP_1, 2
call_if_eq PewterCity_EventScript_WalkToGymBottom
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_WalkToGymTop
call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_WalkToGymMid
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_WalkToGymBottom
msgbox PewterCity_Text_GoTakeOnBrock
closemessage
applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GymGuideExit
@@ -372,7 +368,7 @@ PewterCity_Movement_PlayerWalkToGymRight::
PewterCity_Movement_GuideMoveToLeadTop::
walk_left
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
walk_in_place_right
step_end
@@ -399,14 +395,14 @@ PewterCity_Movement_GuideApproachPlayerRight::
PewterCity_Movement_GuideWalkToGymTop::
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymMid::
walk_left
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymBottom::
@@ -414,7 +410,7 @@ PewterCity_Movement_GuideWalkToGymBottom::
walk_left
walk_to_gym
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_Movement_GuideWalkToGymRight::
@@ -429,7 +425,7 @@ PewterCity_Movement_GuideWalkToGymRight::
walk_up
walk_to_gym_alt
walk_right
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
PewterCity_EventScript_Lass::
@@ -440,20 +436,15 @@ PewterCity_EventScript_MuseumGuide::
lock
faceplayer
msgbox PewterCity_Text_DidYouCheckOutMuseum, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq PewterCity_EventScript_CheckedOutMuseum
goto_if_eq VAR_RESULT, YES, PewterCity_EventScript_CheckedOutMuseum
msgbox PewterCity_Text_ReallyYouHaveToGo
closemessage
delay 10
playbgm MUS_FOLLOW_ME, 0
compare VAR_FACING, DIR_NORTH
call_if_eq PewterCity_EventScript_LeadToMuseumNorth
compare VAR_FACING, DIR_SOUTH
call_if_eq PewterCity_EventScript_LeadToMuseumSouth
compare VAR_FACING, DIR_WEST
call_if_eq PewterCity_EventScript_LeadToMuseumWest
compare VAR_FACING, DIR_EAST
call_if_eq PewterCity_EventScript_LeadToMuseumEast
call_if_eq VAR_FACING, DIR_NORTH, PewterCity_EventScript_LeadToMuseumNorth
call_if_eq VAR_FACING, DIR_SOUTH, PewterCity_EventScript_LeadToMuseumSouth
call_if_eq VAR_FACING, DIR_WEST, PewterCity_EventScript_LeadToMuseumWest
call_if_eq VAR_FACING, DIR_EAST, PewterCity_EventScript_LeadToMuseumEast
msgbox PewterCity_Text_ThisIsTheMuseum
closemessage
delay 10
@@ -550,13 +541,13 @@ PewterCity_Movement_PlayerWalkToMuseumNorth::
walk_up
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumNorth::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumSouth::
@@ -565,7 +556,7 @@ PewterCity_Movement_PlayerWalkToMuseumSouth::
walk_left
walk_to_museum_south
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumSouth::
@@ -573,33 +564,33 @@ PewterCity_Movement_GuideWalkToMuseumSouth::
walk_up
walk_to_museum_south
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumWest::
walk_left
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumWest::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_PlayerWalkToMuseumEast::
walk_right
walk_to_museum
delay_8
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_GuideWalkToMuseumEast::
walk_to_museum
walk_left
walk_in_place_fastest_up
walk_in_place_faster_up
step_end
PewterCity_Movement_MuseumGuideExit::
@@ -631,8 +622,7 @@ PewterCity_EventScript_BugCatcher::
lock
faceplayer
msgbox PewterCity_Text_DoYouKnowWhatImDoing, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq PewterCity_EventScript_KnowWhatTheyreDoing
goto_if_eq VAR_RESULT, YES, PewterCity_EventScript_KnowWhatTheyreDoing
msgbox PewterCity_Text_SprayingRepelToKeepWildMonsOut
release
end
@@ -695,13 +685,10 @@ PewterCity_EventScript_RunningShoesAideTriggerBottom::
end
PewterCity_EventScript_AideGiveRunningShoes::
textcolor 0
compare VAR_TEMP_1, 1
call_if_eq PewterCity_EventScript_AideNoticePlayer
compare VAR_TEMP_1, 2
call_if_eq PewterCity_EventScript_AideNoticePlayer
compare VAR_TEMP_1, 3
call_if_eq PewterCity_EventScript_AideNoticePlayer
textcolor NPC_TEXT_COLOR_MALE
call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideNoticePlayer
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideNoticePlayer
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
waitse
playse SE_PIN
applymovement LOCALID_AIDE, Movement_ExclamationMark
@@ -709,16 +696,12 @@ PewterCity_EventScript_AideGiveRunningShoes::
applymovement LOCALID_AIDE, Movement_Delay48
waitmovement 0
msgbox PewterCity_Text_OhPlayer
compare VAR_TEMP_1, 0
call_if_eq PewterCity_EventScript_AideApproachPlayer0
compare VAR_TEMP_1, 1
call_if_eq PewterCity_EventScript_AideApproachPlayer1
compare VAR_TEMP_1, 2
call_if_eq PewterCity_EventScript_AideApproachPlayer2
compare VAR_TEMP_1, 3
call_if_eq PewterCity_EventScript_AideApproachPlayer3
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideApproachPlayer1
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideApproachPlayer2
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideApproachPlayer3
msgbox PewterCity_Text_AskedToDeliverThis
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
playfanfare MUS_OBTAIN_KEY_ITEM
message PewterCity_Text_ReceivedRunningShoesFromAide
waitmessage
@@ -731,16 +714,12 @@ PewterCity_EventScript_AideGiveRunningShoes::
call EventScript_RestorePrevTextColor
msgbox PewterCity_Text_MustBeGoingBackToLab
closemessage
compare VAR_TEMP_1, 0
call_if_eq PewterCity_EventScript_AideExit0
compare VAR_TEMP_1, 1
call_if_eq PewterCity_EventScript_AideExit1
compare VAR_TEMP_1, 2
call_if_eq PewterCity_EventScript_AideExit2
compare VAR_TEMP_1, 3
call_if_eq PewterCity_EventScript_AideExit3
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideExit0
call_if_eq VAR_TEMP_1, 1, PewterCity_EventScript_AideExit1
call_if_eq VAR_TEMP_1, 2, PewterCity_EventScript_AideExit2
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideExit3
delay 30
textcolor 3
textcolor NPC_TEXT_COLOR_NEUTRAL
msgbox PewterCity_Text_RunningShoesLetterFromMom
closemessage
removeobject LOCALID_AIDE
@@ -749,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
return
PewterCity_EventScript_AideNoticePlayer::
applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown
applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -761,7 +740,7 @@ PewterCity_EventScript_AideApproachPlayer0::
PewterCity_EventScript_AideApproachPlayer1::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -769,7 +748,7 @@ PewterCity_EventScript_AideApproachPlayer2::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -777,7 +756,7 @@ PewterCity_EventScript_AideApproachPlayer3::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return