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/ThreeIsland/scripts.inc
+45 -68
View File
@@ -15,8 +15,7 @@ ThreeIsland_MapScripts::
ThreeIsland_OnTransition::
setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND
call_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_EventScript_HideAntiBikers
compare VAR_MAP_SCENE_THREE_ISLAND, 4
call_if_eq ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers
call_if_eq VAR_MAP_SCENE_THREE_ISLAND, 4, ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers
end
ThreeIsland_EventScript_HideAntiBikers::
@@ -38,8 +37,7 @@ ThreeIsland_EventScript_Biker::
ThreeIsland_EventScript_AntiBiker1::
lock
goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, ThreeIsland_EventScript_AntiBiker1GotFullRestore
compare VAR_MAP_SCENE_THREE_ISLAND, 4
goto_if_eq ThreeIsland_EventScript_GiveFullRestore
goto_if_eq VAR_MAP_SCENE_THREE_ISLAND, 4, ThreeIsland_EventScript_GiveFullRestore
setvar VAR_TEMP_1, 0
call ThreeIsland_EventScript_BikerArgumentScene
release
@@ -56,9 +54,8 @@ ThreeIsland_EventScript_GiveFullRestore::
applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt
checkitemspace ITEM_FULL_RESTORE, 1
compare VAR_RESULT, FALSE
goto_if_eq ThreeIsland_EventScript_NoRoomForFullRestore
checkitemspace ITEM_FULL_RESTORE
goto_if_eq VAR_RESULT, FALSE, ThreeIsland_EventScript_NoRoomForFullRestore
msgreceiveditem ThreeIsland_Text_GivenFullRestore, ITEM_FULL_RESTORE
additem ITEM_FULL_RESTORE
setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER
@@ -72,81 +69,67 @@ ThreeIsland_EventScript_NoRoomForFullRestore::
end
ThreeIsland_EventScript_BikerArgumentScene::
compare VAR_TEMP_1, 1
call_if_eq ThreeIsland_EventScript_PlayerFaceLeft
compare VAR_TEMP_1, 2
call_if_eq ThreeIsland_EventScript_PlayerFaceLeft
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceLeft
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceLeft
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_GoBackToKanto
compare VAR_TEMP_1, 0
call_if_eq ThreeIsland_EventScript_PlayerFaceRight
compare VAR_TEMP_1, 1
call_if_eq ThreeIsland_EventScript_PlayerFaceRight
compare VAR_TEMP_1, 2
call_if_eq ThreeIsland_EventScript_PlayerFaceBiker
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker
applymovement LOCALID_BIKER1, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_BossIsOnHisWay
compare VAR_TEMP_1, 0
call_if_eq ThreeIsland_EventScript_PlayerFaceUp
compare VAR_TEMP_1, 1
call_if_eq ThreeIsland_EventScript_PlayerFaceUp
compare VAR_TEMP_1, 2
call_if_eq ThreeIsland_EventScript_PlayerFaceAntiBiker
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceUp
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceUp
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceAntiBiker
applymovement LOCALID_ANTIBIKER2, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_GetOffIslandNow
compare VAR_TEMP_1, 0
call_if_eq ThreeIsland_EventScript_PlayerFaceRight
compare VAR_TEMP_1, 1
call_if_eq ThreeIsland_EventScript_PlayerFaceRight
compare VAR_TEMP_1, 2
call_if_eq ThreeIsland_EventScript_PlayerFaceBiker
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PlayerFaceRight
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PlayerFaceBiker
applymovement LOCALID_BIKER3, ThreeIsland_Movement_SpeakLeft
waitmovement 0
msgbox ThreeIsland_Text_WhosGonnaMakeMe
return
ThreeIsland_EventScript_PlayerFaceUp::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
waitmovement 0
return
@ Unused
ThreeIsland_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceBiker::
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 9
goto_if_ge ThreeIsland_EventScript_PlayerFaceUp
goto_if_ge VAR_0x8004, 9, ThreeIsland_EventScript_PlayerFaceUp
goto ThreeIsland_EventScript_PlayerFaceRight
end
ThreeIsland_EventScript_PlayerFaceAntiBiker::
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8004, 9
goto_if_ge ThreeIsland_EventScript_PlayerFaceLeft
goto_if_ge VAR_0x8004, 9, ThreeIsland_EventScript_PlayerFaceLeft
goto ThreeIsland_EventScript_PlayerFaceUp
end
ThreeIsland_EventScript_AntiBiker2::
lock
compare VAR_MAP_SCENE_THREE_ISLAND, 4
goto_if_eq ThreeIsland_EventScript_AntiBiker2BikersGone
goto_if_eq VAR_MAP_SCENE_THREE_ISLAND, 4, ThreeIsland_EventScript_AntiBiker2BikersGone
setvar VAR_TEMP_1, 1
call ThreeIsland_EventScript_BikerArgumentScene
release
@@ -161,7 +144,7 @@ ThreeIsland_EventScript_AntiBiker2BikersGone::
ThreeIsland_EventScript_BikerBossIntroTrigger::
lockall
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight
waitmovement 0
msgbox ThreeIsland_Text_AreYouBossGoBackToKanto
@@ -220,8 +203,8 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
end
ThreeIsland_EventScript_BattleBikersScene::
textcolor 0
applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BIKER1, Movement_ExclamationMark
@@ -232,8 +215,7 @@ ThreeIsland_EventScript_BattleBikersScene::
waitmovement 0
playbgm MUS_ENCOUNTER_BOY, 0
msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone
goto_if_eq VAR_RESULT, NO, ThreeIsland_EventScript_LeaveBikersAlone
msgbox ThreeIsland_Text_Biker1Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER1
trainerbattle_no_intro TRAINER_BIKER_GOON, ThreeIsland_Text_Biker1Defeat
@@ -257,24 +239,19 @@ ThreeIsland_EventScript_BattleBikersScene::
msgbox ThreeIsland_Text_Biker3Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER3
trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_BIKER4, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER5, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER4, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER5, Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ThreeIsland_Text_Biker3PostBattle
closemessage
delay 45
compare VAR_TEMP_1, 0
call_if_eq ThreeIsland_EventScript_PaxtonApproachLeft
compare VAR_TEMP_1, 1
call_if_eq ThreeIsland_EventScript_PaxtonApproachMidLeft
compare VAR_TEMP_1, 2
call_if_eq ThreeIsland_EventScript_PaxtonApproachMid
compare VAR_TEMP_1, 3
call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight
compare VAR_TEMP_1, 4
call_if_eq ThreeIsland_EventScript_PaxtonApproachRight
call_if_eq VAR_TEMP_1, 0, ThreeIsland_EventScript_PaxtonApproachLeft
call_if_eq VAR_TEMP_1, 1, ThreeIsland_EventScript_PaxtonApproachMidLeft
call_if_eq VAR_TEMP_1, 2, ThreeIsland_EventScript_PaxtonApproachMid
call_if_eq VAR_TEMP_1, 3, ThreeIsland_EventScript_PaxtonApproachMidRight
call_if_eq VAR_TEMP_1, 4, ThreeIsland_EventScript_PaxtonApproachRight
playbgm MUS_ENCOUNTER_BOY, 0
msgbox ThreeIsland_Text_PaxtonIntro
setvar VAR_LAST_TALKED, LOCALID_PAXTON
@@ -295,33 +272,33 @@ ThreeIsland_EventScript_BattleBikersScene::
end
ThreeIsland_EventScript_PaxtonApproachLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMid::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight
waitmovement 0
@@ -348,7 +325,7 @@ ThreeIsland_Movement_BikerApproach::
ThreeIsland_Movement_Biker1ReturnToPack::
walk_up
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ThreeIsland_Movement_BikerSpeak::
@@ -358,7 +335,7 @@ ThreeIsland_Movement_BikerSpeak::
ThreeIsland_Movement_PaxtonApproachLeft::
walk_down
walk_left
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
ThreeIsland_Movement_PaxtonApproachMidLeft::
@@ -368,20 +345,20 @@ ThreeIsland_Movement_PaxtonApproachMidLeft::
ThreeIsland_Movement_PaxtonApproachMid::
walk_down
walk_down
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_Movement_PlayerFacePaxton::
delay_16
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
step_end
ThreeIsland_Movement_PaxtonApproachMidRight::
walk_down
walk_down
walk_right
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_Movement_PaxtonApproachRight::
@@ -389,7 +366,7 @@ ThreeIsland_Movement_PaxtonApproachRight::
walk_down
walk_right
walk_right
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
ThreeIsland_EventScript_Woman::