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/FourIsland_IcefallCave_Back/scripts.inc
+19 -20
View File
@@ -8,8 +8,7 @@ FourIsland_IcefallCave_Back_MapScripts::
.byte 0
FourIsland_IcefallCave_Back_OnTransition::
compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
call_if_eq VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1, FourIsland_IcefallCave_Back_EventScript_HideLorelei
end
FourIsland_IcefallCave_Back_EventScript_HideLorelei::
@@ -18,27 +17,27 @@ FourIsland_IcefallCave_Back_EventScript_HideLorelei::
FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
lockall
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
waitmovement 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
closemessage
playse SE_PIN
applymovement LOCALID_LORELEI, Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_LORELEI, Movement_Delay48
waitmovement 0
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
closemessage
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
waitmovement 0
delay 35
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
@@ -48,17 +47,17 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
waitmovement 0
playbgm MUS_ENCOUNTER_ROCKET, 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
setvar VAR_LAST_TALKED, LOCALID_ROCKET3
trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
waitmovement 0
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
waitmessage
waitse
@@ -67,7 +66,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
waitmoncry
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
waitmovement 0
textcolor 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
closemessage
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
@@ -82,9 +81,9 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
delay 50
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor 1
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
@@ -101,10 +100,10 @@ FourIsland_IcefallCave_Back_Movement_PlayerToRockets::
FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit::
delay_16
walk_in_place_fastest_left
walk_in_place_faster_left
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown::
@@ -163,7 +162,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit::
FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei::
delay_16
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
step_end
FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft::
@@ -182,10 +181,10 @@ FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp::
FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit::
delay_8
walk_in_place_fastest_right
walk_in_place_faster_right
delay_16
delay_16
walk_in_place_fastest_down
walk_in_place_faster_down
step_end
FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer::