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/VictoryRoad_2F/scripts.inc
+13 -13
View File
@@ -1,25 +1,25 @@
VictoryRoad_2F_MapScripts:: @ 8160F92
VictoryRoad_2F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad
.byte 0
VictoryRoad_2F_OnLoad:: @ 8160F98
VictoryRoad_2F_OnLoad::
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2
end
VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF
VictoryRoad_2F_EventScript_SetRockBarrier1::
setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1
setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1
return
VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2
VictoryRoad_2F_EventScript_SetRockBarrier2::
setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1
setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1
return
VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5
VictoryRoad_2F_EventScript_FloorSwitch1::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
@@ -33,11 +33,11 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5
releaseall
end
VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004
VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed::
releaseall
end
VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006
VictoryRoad_2F_EventScript_FloorSwitch2::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
@@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006
releaseall
end
VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035
VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed::
releaseall
end
VictoryRoad_2F_EventScript_Dawson:: @ 8161037
VictoryRoad_2F_EventScript_Dawson::
trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat
msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
end
VictoryRoad_2F_EventScript_Daisuke:: @ 816104E
VictoryRoad_2F_EventScript_Daisuke::
trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat
msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
end
VictoryRoad_2F_EventScript_Nelson:: @ 8161065
VictoryRoad_2F_EventScript_Nelson::
trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat
msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE
end
VictoryRoad_2F_EventScript_Gregory:: @ 816107C
VictoryRoad_2F_EventScript_Gregory::
trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat
msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE
end
VictoryRoad_2F_EventScript_Vincent:: @ 8161093
VictoryRoad_2F_EventScript_Vincent::
trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat
msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/VictoryRoad_2F/text.inc
+16 -16
View File
@@ -1,58 +1,58 @@
VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF
VictoryRoad_2F_Text_DawsonIntro::
.string "If you can get through here,\n"
.string "you can go meet the ELITE FOUR.$"
VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C
VictoryRoad_2F_Text_DawsonDefeat::
.string "No!\n"
.string "Unbelievable!$"
VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E
VictoryRoad_2F_Text_DawsonPostBattle::
.string "I can beat you when it comes to\n"
.string "knowledge about POKéMON!$"
VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877
VictoryRoad_2F_Text_DaisukeIntro::
.string "This here is VICTORY ROAD.\n"
.string "It's the final test for TRAINERS!$"
VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4
VictoryRoad_2F_Text_DaisukeDefeat::
.string "Atcho!$"
VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB
VictoryRoad_2F_Text_DaisukePostBattle::
.string "If you get stuck, try moving some\n"
.string "boulders around.$"
VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE
VictoryRoad_2F_Text_NelsonIntro::
.string "Ah, so you wish to challenge the\n"
.string "ELITE FOUR?$"
VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B
VictoryRoad_2F_Text_NelsonDefeat::
.string "You got me!$"
VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927
VictoryRoad_2F_Text_NelsonPostBattle::
.string "{RIVAL} also came through here.$"
VictoryRoad_2F_Text_VincentIntro:: @ 8174942
VictoryRoad_2F_Text_VincentIntro::
.string "Come on!\n"
.string "I'll whip you!$"
VictoryRoad_2F_Text_VincentDefeat:: @ 817495A
VictoryRoad_2F_Text_VincentDefeat::
.string "I got whipped!$"
VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969
VictoryRoad_2F_Text_VincentPostBattle::
.string "You earned the right to be on\n"
.string "VICTORY ROAD…$"
VictoryRoad_2F_Text_GregoryIntro:: @ 8174995
VictoryRoad_2F_Text_GregoryIntro::
.string "Is VICTORY ROAD too tough?$"
VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0
VictoryRoad_2F_Text_GregoryDefeat::
.string "Well done!$"
VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB
VictoryRoad_2F_Text_GregoryPostBattle::
.string "Many TRAINERS give up their\n"
.string "challenge here and go home.$"
@ Unused, old text for Moltres
VictoryRoad_2F_Text_Gyaoo:: @ 81749F3
VictoryRoad_2F_Text_Gyaoo::
.string "ギヤーオ！$"