Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union
This commit is contained in:
GriffinR
@@ -1,18 +1,18 @@
|
||||
VictoryRoad_3F_MapScripts:: @ 81610AA
|
||||
VictoryRoad_3F_MapScripts::
|
||||
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad
|
||||
.byte 0
|
||||
|
||||
VictoryRoad_3F_OnLoad:: @ 81610B0
|
||||
VictoryRoad_3F_OnLoad::
|
||||
compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
|
||||
call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC
|
||||
VictoryRoad_3F_EventScript_SetRockBarrier::
|
||||
setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1
|
||||
setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1
|
||||
return
|
||||
|
||||
VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF
|
||||
VictoryRoad_3F_EventScript_FloorSwitch::
|
||||
lockall
|
||||
compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
|
||||
goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed
|
||||
@@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF
|
||||
releaseall
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101
|
||||
VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed::
|
||||
releaseall
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_George:: @ 8161103
|
||||
VictoryRoad_3F_EventScript_George::
|
||||
trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat
|
||||
msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_Colby:: @ 816111A
|
||||
VictoryRoad_3F_EventScript_Colby::
|
||||
trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat
|
||||
msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_Caroline:: @ 8161131
|
||||
VictoryRoad_3F_EventScript_Caroline::
|
||||
trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat
|
||||
msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_Alexa:: @ 8161148
|
||||
VictoryRoad_3F_EventScript_Alexa::
|
||||
trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat
|
||||
msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_Ray:: @ 816115F
|
||||
VictoryRoad_3F_EventScript_Ray::
|
||||
trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons
|
||||
msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
VictoryRoad_3F_EventScript_Tyra:: @ 816117A
|
||||
VictoryRoad_3F_EventScript_Tyra::
|
||||
trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons
|
||||
msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Text_DoubleEdgeTeach:: @ 81749F9
|
||||
Text_DoubleEdgeTeach::
|
||||
.string "You should be proud of yourself,\n"
|
||||
.string "having battled your way through\l"
|
||||
.string "VICTORY ROAD so courageously.\p"
|
||||
@@ -7,94 +7,94 @@ Text_DoubleEdgeTeach:: @ 81749F9
|
||||
.string "Would you like me to teach that\n"
|
||||
.string "technique?$"
|
||||
|
||||
Text_DoubleEdgeDeclined:: @ 8174ABC
|
||||
Text_DoubleEdgeDeclined::
|
||||
.string "I'll teach you the technique\n"
|
||||
.string "anytime.$"
|
||||
|
||||
Text_DoubleEdgeWhichMon:: @ 8174AE2
|
||||
Text_DoubleEdgeWhichMon::
|
||||
.string "Which POKéMON should I teach\n"
|
||||
.string "DOUBLE-EDGE?$"
|
||||
|
||||
Text_DoubleEdgeTaught:: @ 8174B0C
|
||||
Text_DoubleEdgeTaught::
|
||||
.string "Keep that drive going for the\n"
|
||||
.string "POKéMON LEAGUE!\p"
|
||||
.string "Take a run at them and knock 'em\n"
|
||||
.string "out!$"
|
||||
|
||||
VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60
|
||||
VictoryRoad_3F_Text_GeorgeIntro::
|
||||
.string "I heard rumors of a child prodigy.$"
|
||||
|
||||
VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83
|
||||
VictoryRoad_3F_Text_GeorgeDefeat::
|
||||
.string "The rumors were true!$"
|
||||
|
||||
VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99
|
||||
VictoryRoad_3F_Text_GeorgePostBattle::
|
||||
.string "So, it was you who beat GIOVANNI\n"
|
||||
.string "of TEAM ROCKET?$"
|
||||
|
||||
VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA
|
||||
VictoryRoad_3F_Text_AlexaIntro::
|
||||
.string "TRAINERS live to seek stronger\n"
|
||||
.string "opponents.$"
|
||||
|
||||
VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4
|
||||
VictoryRoad_3F_Text_AlexaDefeat::
|
||||
.string "Oh!\n"
|
||||
.string "So strong!$"
|
||||
|
||||
VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03
|
||||
VictoryRoad_3F_Text_AlexaPostBattle::
|
||||
.string "By fighting tough battles, you get\n"
|
||||
.string "stronger.$"
|
||||
|
||||
VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30
|
||||
VictoryRoad_3F_Text_CarolineIntro::
|
||||
.string "I'll show you just how good you\n"
|
||||
.string "are. Not!$"
|
||||
|
||||
VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A
|
||||
VictoryRoad_3F_Text_CarolineDefeat::
|
||||
.string "I'm furious!$"
|
||||
|
||||
VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67
|
||||
VictoryRoad_3F_Text_CarolinePostBattle::
|
||||
.string "You showed me just how good\n"
|
||||
.string "I was…$"
|
||||
|
||||
VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A
|
||||
VictoryRoad_3F_Text_ColbyIntro::
|
||||
.string "Only the chosen can pass here!$"
|
||||
|
||||
VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9
|
||||
VictoryRoad_3F_Text_ColbyDefeat::
|
||||
.string "I don't believe it!$"
|
||||
|
||||
VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD
|
||||
VictoryRoad_3F_Text_ColbyPostBattle::
|
||||
.string "All TRAINERS here are headed to\n"
|
||||
.string "the POKéMON LEAGUE.\p"
|
||||
.string "Don't let down your guard.$"
|
||||
|
||||
VictoryRoad_3F_Text_RayIntro:: @ 8174D0C
|
||||
VictoryRoad_3F_Text_RayIntro::
|
||||
.string "RAY: Together, the two of us are\n"
|
||||
.string "destined for greatness!$"
|
||||
|
||||
VictoryRoad_3F_Text_RayDefeat:: @ 8174D45
|
||||
VictoryRoad_3F_Text_RayDefeat::
|
||||
.string "RAY: Ludicrous!\n"
|
||||
.string "This can't be!$"
|
||||
|
||||
VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64
|
||||
VictoryRoad_3F_Text_RayPostBattle::
|
||||
.string "RAY: You've beaten us.\n"
|
||||
.string "Greatness remains elusive…$"
|
||||
|
||||
VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96
|
||||
VictoryRoad_3F_Text_RayNotEnoughMons::
|
||||
.string "RAY: Together, the two of us are\n"
|
||||
.string "striving for the pinnacle.\p"
|
||||
.string "We need you to bring two POKéMON\n"
|
||||
.string "into battle with us.$"
|
||||
|
||||
VictoryRoad_3F_Text_TyraIntro:: @ 8174E08
|
||||
VictoryRoad_3F_Text_TyraIntro::
|
||||
.string "TYRA: We're trying to become\n"
|
||||
.string "champions together.$"
|
||||
|
||||
VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39
|
||||
VictoryRoad_3F_Text_TyraDefeat::
|
||||
.string "TYRA: Oh, but…$"
|
||||
|
||||
VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48
|
||||
VictoryRoad_3F_Text_TyraPostBattle::
|
||||
.string "TYRA: You've taught me that power\n"
|
||||
.string "can be infinite in shape and form.$"
|
||||
|
||||
VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D
|
||||
VictoryRoad_3F_Text_TyraNotEnoughMons::
|
||||
.string "TYRA: You can't battle with us if\n"
|
||||
.string "you have only one POKéMON.$"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user