dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-01-08 05:51:49 -05:00
committed by GitHub
parent ef67f2d33b 8b1595ebc3
commit 635267ce32
27 changed files with 850 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data/maps/Route104/scripts.inc
View File

@@ -167,19 +167,19 @@ Route104_EventScript_RestoreMusic:: @ 81ECE31
return
Route104_EventScript_BattleMayTreecko:: @ 81ECE36
trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, Route104_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated
end
Route104_EventScript_BattleMayTorchic:: @ 81ECE49
trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, Route104_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated
end
Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, Route104_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated
end
@@ -237,19 +237,19 @@ Route104_EventScript_BrendanDefeated:: @ 81ECF38
end
Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, Route104_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated
end
Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, Route104_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated
end
Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, Route104_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated
end