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/Route24/scripts.inc
+15 -15
View File
@@ -1,9 +1,9 @@
.equ LOCALID_ROCKET, 1
Route24_MapScripts:: @ 816861F
Route24_MapScripts::
.byte 0
Route24_EventScript_Rocket:: @ 8168620
Route24_EventScript_Rocket::
lock
faceplayer
compare VAR_MAP_SCENE_ROUTE24, 1
@@ -16,29 +16,29 @@ Route24_EventScript_Rocket:: @ 8168620
release
end
Route24_EventScript_NoRoomForNugget:: @ 816864C
Route24_EventScript_NoRoomForNugget::
msgbox Route24_Text_YouDontHaveAnyRoom
release
end
Route24_EventScript_RocketPostBattle:: @ 8168656
Route24_EventScript_RocketPostBattle::
msgbox Route24_Text_YoudBecomeTopRocketLeader
release
end
Route24_EventScript_RocketTriggerLeft:: @ 8168660
Route24_EventScript_RocketTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
goto Route24_EventScript_RocketTrigger
end
Route24_EventScript_RocketTriggerRight:: @ 816866C
Route24_EventScript_RocketTriggerRight::
lockall
setvar VAR_TEMP_1, 1
goto Route24_EventScript_RocketTrigger
end
Route24_EventScript_RocketTrigger:: @ 8168678
Route24_EventScript_RocketTrigger::
textcolor 0
compare VAR_TEMP_1, 0
call_if_eq Route24_EventScript_RocketApproachPlayer
@@ -54,7 +54,7 @@ Route24_EventScript_RocketTrigger:: @ 8168678
releaseall
end
Route24_EventScript_BattleRocket:: @ 81686B9
Route24_EventScript_BattleRocket::
giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET
message Route24_Text_JoinTeamRocket
waitmessage
@@ -66,17 +66,17 @@ Route24_EventScript_BattleRocket:: @ 81686B9
setvar VAR_MAP_SCENE_ROUTE24, 1
return
Route24_EventScript_RocketApproachPlayer:: @ 81686FD
Route24_EventScript_RocketApproachPlayer::
applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer
waitmovement 0
return
Route24_EventScript_RocketMotionToPlayer:: @ 8168708
Route24_EventScript_RocketMotionToPlayer::
applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
Route24_EventScript_NoRoomForNuggetTrigger::
msgbox Route24_Text_YouDontHaveAnyRoom
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown
@@ -86,20 +86,20 @@ Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713
release
end
Route24_EventScript_RocketWalkBackToPos:: @ 8168733
Route24_EventScript_RocketWalkBackToPos::
applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos
waitmovement 0
return
Route24_Movement_RocketApproachPlayer:: @ 816873E
Route24_Movement_RocketApproachPlayer::
walk_left
step_end
Route24_Movement_RocketWalkBackToPos:: @ 8168740
Route24_Movement_RocketWalkBackToPos::
walk_right
walk_in_place_fastest_left
step_end
Route24_Movement_WalkDown:: @ 8168743
Route24_Movement_WalkDown::
walk_down
step_end
data/maps/Route24/text.inc
+24 -24
View File
@@ -1,16 +1,16 @@
Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C
Route24_Text_JustEarnedFabulousPrize::
.string "Congratulations! You beat our\n"
.string "five contest TRAINERS!\p"
.string "You just earned a fabulous prize!$"
Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93
Route24_Text_ReceivedNuggetFromMysteryTrainer::
.string "{PLAYER} received a NUGGET\n"
.string "from the mystery TRAINER!$"
Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2
Route24_Text_YouDontHaveAnyRoom::
.string "You don't have any room!$"
Route24_Text_JoinTeamRocket:: @ 8188CDB
Route24_Text_JoinTeamRocket::
.string "By the way, how would you like to\n"
.string "join TEAM ROCKET?\p"
.string "We're a group of professional\n"
@@ -23,78 +23,78 @@ Route24_Text_JoinTeamRocket:: @ 8188CDB
.string "I'll make you an offer you can't\n"
.string "refuse!$"
Route24_Text_RocketDefeat:: @ 8188DDC
Route24_Text_RocketDefeat::
.string "Arrgh!\n"
.string "You are good!$"
Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1
Route24_Text_YoudBecomeTopRocketLeader::
.string "With your ability, you'd become\n"
.string "a top leader in TEAM ROCKET.\p"
.string "Come on, think of the opportunity!\n"
.string "Don't let this chance go to waste.$"
Route24_Text_ShaneIntro:: @ 8188E74
Route24_Text_ShaneIntro::
.string "I saw your feat from the grass!$"
Route24_Text_ShaneDefeat:: @ 8188E94
Route24_Text_ShaneDefeat::
.string "I thought not!$"
Route24_Text_ShanePostBattle:: @ 8188EA3
Route24_Text_ShanePostBattle::
.string "I hid because the people on the\n"
.string "bridge frightened me.$"
Route24_Text_EthanIntro:: @ 8188ED9
Route24_Text_EthanIntro::
.string "Okay! I'm No. 5!\n"
.string "I'll stomp you!$"
Route24_Text_EthanDefeat:: @ 8188EFA
Route24_Text_EthanDefeat::
.string "Whoa!\n"
.string "Too much!$"
Route24_Text_EthanPostBattle:: @ 8188F0A
Route24_Text_EthanPostBattle::
.string "I did my best. I have no regrets!$"
Route24_Text_ReliIntro:: @ 8188F2C
Route24_Text_ReliIntro::
.string "I'm No. 4!\n"
.string "Getting tired?$"
Route24_Text_ReliDefeat:: @ 8188F46
Route24_Text_ReliDefeat::
.string "I lost, too!$"
Route24_Text_ReliPostBattle:: @ 8188F53
Route24_Text_ReliPostBattle::
.string "I did my best, so I've no regrets!$"
Route24_Text_TimmyIntro:: @ 8188F76
Route24_Text_TimmyIntro::
.string "Here's No. 3!\n"
.string "I won't be easy!$"
Route24_Text_TimmyDefeat:: @ 8188F95
Route24_Text_TimmyDefeat::
.string "Ow!\n"
.string "Stomped flat!$"
Route24_Text_TimmyPostBattle:: @ 8188FA7
Route24_Text_TimmyPostBattle::
.string "I did my best. I have no regrets!$"
Route24_Text_AliIntro:: @ 8188FC9
Route24_Text_AliIntro::
.string "I'm second!\n"
.string "Now it's serious!$"
Route24_Text_AliDefeat:: @ 8188FE7
Route24_Text_AliDefeat::
.string "How could I lose?$"
Route24_Text_AliPostBattle:: @ 8188FF9
Route24_Text_AliPostBattle::
.string "I did my best. I have no regrets!$"
Route24_Text_CaleIntro:: @ 818901B
Route24_Text_CaleIntro::
.string "People call this the NUGGET\n"
.string "BRIDGE!\p"
.string "Beat us five TRAINERS and win\n"
.string "a fabulous prize!\p"
.string "Think you got what it takes?$"
Route24_Text_CaleDefeat:: @ 818908C
Route24_Text_CaleDefeat::
.string "Whoo!\n"
.string "Good stuff!$"
Route24_Text_CalePostBattle:: @ 818909E
Route24_Text_CalePostBattle::
.string "I did my best. I have no regrets!$"