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

Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
parent 23d7c00c62 d6d5290099
commit 2b93687ade
1146 changed files with 40526 additions and 38156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+20 -20
View File
@@ -3,20 +3,20 @@
.equ LOCALID_LORELEI, 3
.equ LOCALID_ROCKET3, 4
FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
FourIsland_IcefallCave_Back_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
.byte 0
FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
FourIsland_IcefallCave_Back_OnTransition::
compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
end
FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94
FourIsland_IcefallCave_Back_EventScript_HideLorelei::
setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI
return
FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
lockall
textcolor 1
msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
@@ -62,7 +62,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
waitmessage
waitse
playmoncry SPECIES_LAPRAS, 2
playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER
waitbuttonpress
waitmoncry
applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
@@ -92,14 +92,14 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
releaseall
end
FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD
FourIsland_IcefallCave_Back_Movement_PlayerToRockets::
walk_up
walk_up
walk_right
walk_up
step_end
FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2
FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit::
delay_16
walk_in_place_fastest_left
delay_16
@@ -107,21 +107,21 @@ FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2
walk_in_place_fastest_down
step_end
FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8
FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown::
walk_in_place_down
step_end
FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA
FourIsland_IcefallCave_Back_Movement_UnusedPushRight::
lock_facing_direction
walk_right
unlock_facing_direction
step_end
FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE
FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat::
walk_in_place_fast_down
step_end
FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0
FourIsland_IcefallCave_Back_Movement_Rocket1Exit::
walk_right
walk_down
walk_fast_down
@@ -133,7 +133,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0
walk_fast_down
step_end
FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA
FourIsland_IcefallCave_Back_Movement_Rocket2Exit::
delay_16
walk_left
walk_down
@@ -146,7 +146,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA
walk_fast_down
step_end
FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05
FourIsland_IcefallCave_Back_Movement_Rocket3Exit::
delay_16
walk_down
delay_16
@@ -160,27 +160,27 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05
walk_fast_down
step_end
FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11
FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei::
delay_16
delay_8
walk_in_place_fastest_right
step_end
FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15
FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft::
walk_left
walk_left
step_end
FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18
FourIsland_IcefallCave_Back_Movement_LoreleiToRockets::
walk_left
walk_up
step_end
FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B
FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp::
walk_in_place_up
step_end
FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D
FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit::
delay_8
walk_in_place_fastest_right
delay_16
@@ -188,10 +188,10 @@ FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D
walk_in_place_fastest_down
step_end
FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23
FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer::
walk_right
step_end
FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25
FourIsland_IcefallCave_Back_EventScript_Lorelei::
msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC
end
data/maps/FourIsland_IcefallCave_Back/text.inc
+10 -10
View File
@@ -1,16 +1,16 @@
FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F
FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons::
.string "LORELEI: Keep your filthy hands\n"
.string "off the POKéMON in the cave!\p"
.string "Do as I say, or you'll have me to\n"
.string "answer to!$"
FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9
FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe::
.string "Aww, shut it, lady, and leave\n"
.string "us be.\p"
.string "Don't let your glasses get all\n"
.string "steamed up!$"
FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109
FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut::
.string "LORELEI: {PLAYER}?!\n"
.string "What are you doing here?\p"
.string "No, we can catch up later.\n"
@@ -22,15 +22,15 @@ FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109
.string "Are you ready?\n"
.string "You take that one, please!$"
FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B
FourIsland_IcefallCave_Back_Text_GruntIntro::
.string "W-what?!\p"
.string "Who says we can't do what we want\n"
.string "with the POKéMON we catch?$"
FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251
FourIsland_IcefallCave_Back_Text_GruntDefeat::
.string "We didn't plan on this!$"
FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269
FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons::
.string "LORELEI: Humph.\n"
.string "So despicably weak.\p"
.string "You!\n"
@@ -40,11 +40,11 @@ FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269
.string "I'm smashing your ring once and\n"
.string "for all!$"
FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF
FourIsland_IcefallCave_Back_Text_NotTellingYouThat::
.string "N-no way!\n"
.string "I'm not telling you that!$"
FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313
FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou::
.string "LORELEI: If you won't confess,\n"
.string "we'll deep-freeze you.\p"
.string "My LAPRAS is furious for what\n"
@@ -52,7 +52,7 @@ FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313
.string "Go, LAPRAS!\n"
.string "ICE BEAM…$"
FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399
FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland::
.string "Wawaah! Okay!\n"
.string "I'll talk!\p"
.string "The POKéMON are in the ROCKET\n"
@@ -63,7 +63,7 @@ FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399
.string "into the ROCKET WAREHOUSE!\p"
.string "Heheheheh!$"
FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457
FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful::
.string "{PLAYER}, thank you.\n"
.string "But this is awful…\p"
.string "I was born and raised here on\n"