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/Route22/scripts.inc
+28 -28
View File
@@ -1,29 +1,29 @@
.set LOCALID_RIVAL, 1
Route22_MapScripts:: @ 816828B
Route22_MapScripts::
.byte 0
Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
Route22_EventScript_EarlyRivalTriggerTop::
lockall
setvar VAR_TEMP_1, 0
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
Route22_EventScript_EarlyRivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 25, 5
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
Route22_EventScript_EarlyRivalTriggerBottom::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 25, 5
goto Route22_EventScript_EarlyRival
end
Route22_EventScript_EarlyRival:: @ 81682BE
Route22_EventScript_EarlyRival::
textcolor 0
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
@@ -57,35 +57,35 @@ Route22_EventScript_EarlyRival:: @ 81682BE
releaseall
end
Route22_EventScript_EarlyRivalApproach:: @ 8168350
Route22_EventScript_EarlyRivalApproach::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach
waitmovement 0
return
Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
Route22_EventScript_EarlyRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
Route22_EventScript_EarlyRivalSquirtle::
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
Route22_EventScript_EarlyRivalBulbasaur::
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
Route22_EventScript_EarlyRivalCharmander:: @ 816838B
Route22_EventScript_EarlyRivalCharmander::
trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
return
Route22_EventScript_EarlyRivalExit:: @ 816839A
Route22_EventScript_EarlyRivalExit::
applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit
waitmovement 0
return
Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
Route22_EventScript_EarlyRivalExitBottom::
applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom
waitmovement 0
return
@@ -100,7 +100,7 @@ Route22_Movement_UnusedRivalExit:: @ 8
walk_right
step_end
Route22_Movement_EarlyRivalExit:: @ 81683B8
Route22_Movement_EarlyRivalExit::
walk_down
walk_right
walk_right
@@ -115,7 +115,7 @@ Route22_Movement_EarlyRivalExit:: @ 81683B8
walk_down
step_end
Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
Route22_Movement_EarlyRivalExitBottom::
walk_right
walk_right
walk_right
@@ -129,7 +129,7 @@ Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
walk_down
step_end
Route22_Movement_RivalApproach:: @ 81683D1
Route22_Movement_RivalApproach::
walk_right
walk_right
walk_right
@@ -139,7 +139,7 @@ Route22_Movement_RivalApproach:: @ 81683D1
walk_right
step_end
Route22_Movement_RivalApproachBottom:: @ 81683D9
Route22_Movement_RivalApproachBottom::
walk_right
walk_right
walk_right
@@ -151,7 +151,7 @@ Route22_Movement_RivalApproachBottom:: @ 81683D9
walk_in_place_fastest_down
step_end
Route22_Movement_PlayerFaceRival:: @ 81683E3
Route22_Movement_PlayerFaceRival::
delay_16
delay_16
delay_16
@@ -163,27 +163,27 @@ Route22_Movement_PlayerFaceRival:: @ 81683E3
walk_in_place_fastest_up
step_end
Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
Route22_EventScript_LateRivalTriggerTop::
lockall
setvar VAR_TEMP_1, 0
goto Route22_EventScript_LateRival
end
Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
Route22_EventScript_LateRivalTriggerMid::
lockall
setvar VAR_TEMP_1, 1
setobjectxyperm LOCALID_RIVAL, 25, 5
goto Route22_EventScript_LateRival
end
Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
Route22_EventScript_LateRivalTriggerBottom::
lockall
setvar VAR_TEMP_1, 2
setobjectxyperm LOCALID_RIVAL, 25, 5
goto Route22_EventScript_LateRival
end
Route22_EventScript_LateRival:: @ 816841F
Route22_EventScript_LateRival::
textcolor 0
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
@@ -213,30 +213,30 @@ Route22_EventScript_LateRival:: @ 816841F
releaseall
end
Route22_EventScript_LateRivalApproach:: @ 816849C
Route22_EventScript_LateRivalApproach::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach
waitmovement 0
return
Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
Route22_EventScript_LateRivalApproachBottom::
applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom
applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
waitmovement 0
return
Route22_EventScript_LateRivalSquirtle:: @ 81684B9
Route22_EventScript_LateRivalSquirtle::
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
return
Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
Route22_EventScript_LateRivalBulbasaur::
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
return
Route22_EventScript_LateRivalCharmander:: @ 81684CF
Route22_EventScript_LateRivalCharmander::
trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
return
Route22_Movement_LateRivalExit:: @ 81684DA
Route22_Movement_LateRivalExit::
walk_left
walk_left
walk_left
@@ -246,6 +246,6 @@ Route22_Movement_LateRivalExit:: @ 81684DA
walk_left
step_end
Route22_EventScript_LeagueGateSign:: @ 81684E2
Route22_EventScript_LeagueGateSign::
msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
end
data/maps/Route22/text.inc
+9 -9
View File
@@ -1,4 +1,4 @@
Route22_Text_EarlyRivalIntro:: @ 8188890
Route22_Text_EarlyRivalIntro::
.string "{RIVAL}: Hey! {PLAYER}!\p"
.string "You're off to the POKéMON LEAGUE?\n"
.string "Forget about it!\p"
@@ -9,11 +9,11 @@ Route22_Text_EarlyRivalIntro:: @ 8188890
.string "By the way, did your POKéMON get\n"
.string "any stronger?$"
Route22_Text_EarlyRivalDefeat:: @ 8188959
Route22_Text_EarlyRivalDefeat::
.string "Awww!\n"
.string "You just lucked out!$"
Route22_Text_EarlyRivalPostBattle:: @ 8188974
Route22_Text_EarlyRivalPostBattle::
.string "I heard the POKéMON LEAGUE is\n"
.string "crawling with tough TRAINERS.\p"
.string "I have to figure out how to get\n"
@@ -22,14 +22,14 @@ Route22_Text_EarlyRivalPostBattle:: @ 8188974
.string "move on!$"
@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!"
Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07
Route22_Text_RivalShouldCatchSomeMons::
.string "{RIVAL}“なんだ？\n"
.string "ポケモン　2ひきも\l"
.string "もってるの　なぜか　だって？\p"
.string "おまえも\n"
.string "つかまえれば　いい　じゃん！$"
Route22_Text_LateRivalIntro:: @ 8188A3C
Route22_Text_LateRivalIntro::
.string "{RIVAL}: What? {PLAYER}!\n"
.string "What a surprise to see you here!\p"
.string "So you're going to the POKéMON\n"
@@ -40,11 +40,11 @@ Route22_Text_LateRivalIntro:: @ 8188A3C
.string "warm-up for the POKéMON LEAGUE!\p"
.string "Come on!$"
Route22_Text_LateRivalDefeat:: @ 8188B08
Route22_Text_LateRivalDefeat::
.string "What!?\p"
.string "I was just careless, you!$"
Route22_Text_LateRivalPostBattle:: @ 8188B29
Route22_Text_LateRivalPostBattle::
.string "That loosened me up.\n"
.string "I'm ready for the POKéMON LEAGUE!\p"
.string "{PLAYER}, you need more practice.\p"
@@ -52,7 +52,7 @@ Route22_Text_LateRivalPostBattle:: @ 8188B29
.string "I'm out of here. Smell ya!$"
@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!"
Route22_Text_LateRivalVictory:: @ 8188BAF
Route22_Text_LateRivalVictory::
.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
.string "それで　がんばってるのかよ！\l"
.string "おれの　さいのうに　くらべりゃ\l"
@@ -60,7 +60,7 @@ Route22_Text_LateRivalVictory:: @ 8188BAF
.string "もっと　れんしゅう　こいよ！\n"
.string "あははーッ！$"
Route22_Text_LeagueGateSign:: @ 8188BFF
Route22_Text_LeagueGateSign::
.string "POKéMON LEAGUE\n"
.string "Front Gate$"