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_1F/scripts.inc
+8 -8
View File
@@ -1,23 +1,23 @@
VictoryRoad_1F_MapScripts:: @ 8160F05
VictoryRoad_1F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition
.byte 0
VictoryRoad_1F_OnLoad:: @ 8160F10
VictoryRoad_1F_OnLoad::
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier
end
VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C
VictoryRoad_1F_EventScript_SetRockBarrier::
setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1
setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1
return
VictoryRoad_1F_OnTransition:: @ 8160F2F
VictoryRoad_1F_OnTransition::
setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F
end
VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33
VictoryRoad_1F_EventScript_FloorSwitch::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
@@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33
releaseall
end
VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62
VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed::
releaseall
end
VictoryRoad_1F_EventScript_Naomi:: @ 8160F64
VictoryRoad_1F_EventScript_Naomi::
trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat
msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
end
VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B
VictoryRoad_1F_EventScript_Rolando::
trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat
msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE
end
data/maps/VictoryRoad_1F/text.inc
+6 -6
View File
@@ -1,22 +1,22 @@
VictoryRoad_1F_Text_NaomiIntro:: @ 8174710
VictoryRoad_1F_Text_NaomiIntro::
.string "I wonder if you are good enough\n"
.string "for me?$"
VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738
VictoryRoad_1F_Text_NaomiDefeat::
.string "I lost out…$"
VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744
VictoryRoad_1F_Text_NaomiPostBattle::
.string "I never wanted to lose to anybody,\n"
.string "especially to a younger kid…$"
VictoryRoad_1F_Text_RolandoIntro:: @ 8174784
VictoryRoad_1F_Text_RolandoIntro::
.string "I can see you're good.\n"
.string "Let me see exactly how good!$"
VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8
VictoryRoad_1F_Text_RolandoDefeat::
.string "I had a chance…$"
VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8
VictoryRoad_1F_Text_RolandoPostBattle::
.string "Tch!\n"
.string "I concede, you are better than I!$"