ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 16:12:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Labels better

Browse Source
This commit is contained in:
Fontbane 2019-12-25 22:39:06 -05:00
parent 2e8c20d72f
commit 31b4656324
17 changed files with 174 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,32 +296,32 @@ LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
end end
LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TREECKO, LilycoveCity_Text_MayDefeat
goto LilycoveCity_EventScript_DefeatedMay goto LilycoveCity_EventScript_DefeatedMay
end end
LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TORCHIC, LilycoveCity_Text_MayDefeat
goto LilycoveCity_EventScript_DefeatedMay goto LilycoveCity_EventScript_DefeatedMay
end end
LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_LILYCOVE_MUDKIP, LilycoveCity_Text_MayDefeat
goto LilycoveCity_EventScript_DefeatedMay goto LilycoveCity_EventScript_DefeatedMay
end end
LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TREECKO, LilycoveCity_Text_BrendanDefeat
goto LilycoveCity_EventScript_DefeatedBrendan goto LilycoveCity_EventScript_DefeatedBrendan
end end
LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TORCHIC, LilycoveCity_Text_BrendanDefeat
goto LilycoveCity_EventScript_DefeatedBrendan goto LilycoveCity_EventScript_DefeatedBrendan
end end
LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_MUDKIP, LilycoveCity_Text_BrendanDefeat
goto LilycoveCity_EventScript_DefeatedBrendan goto LilycoveCity_EventScript_DefeatedBrendan
end end

4
data/maps/MagmaHideout_4F/scripts.inc
View File

@ -54,7 +54,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
waitmovement 0 waitmovement 0
msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT
closemessage closemessage
trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat trainerbattle_no_intro TRAINER_MAXIE_MAGMA_HIDEOUT, MagmaHideout_4F_Text_MaxieDefeat
msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT
closemessage closemessage
clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
@ -121,7 +121,7 @@ MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
end end
MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1 MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat trainerbattle_single TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
end end

2
data/maps/MauvilleCity/scripts.inc
View File

@ -204,7 +204,7 @@ MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
MauvilleCity_EventScript_BattleWally:: @ 81DF63A MauvilleCity_EventScript_BattleWally:: @ 81DF63A
msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
applymovement 6, Common_Movement_WalkInPlaceFastestRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT

4
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@ -337,11 +337,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152
return return
MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157
trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_MOSSDEEP, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
end end
MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166
trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_MOSSDEEP, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
end end
MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175

4
data/maps/MtChimney/scripts.inc
View File

@ -43,7 +43,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
applymovement 2, Common_Movement_Delay48 applymovement 2, Common_Movement_Delay48
waitmovement 0 waitmovement 0
msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat
msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
@ -415,7 +415,7 @@ MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065
end end
MtChimney_EventScript_Tabitha:: @ 822F06E MtChimney_EventScript_Tabitha:: @ 822F06E
trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat trainerbattle_single TRAINER_TABITHA_MT_CHIMNEY, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
end end

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

@ -61,32 +61,32 @@ Route103_EventScript_RivalBrendan:: @ 81EC434
end end
Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E
trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TREECKO, Route103_Text_MayDefeated
goto Route103_EventScript_AfterMayBattle goto Route103_EventScript_AfterMayBattle
end end
Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E
trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TORCHIC, Route103_Text_MayDefeated
goto Route103_EventScript_AfterMayBattle goto Route103_EventScript_AfterMayBattle
end end
Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE
trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_103_MUDKIP, Route103_Text_MayDefeated
goto Route103_EventScript_AfterMayBattle goto Route103_EventScript_AfterMayBattle
end end
Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE
trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TREECKO, Route103_Text_BrendanDefeated
goto Route103_EventScript_AfterBrendanBattle goto Route103_EventScript_AfterBrendanBattle
end end
Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE
trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TORCHIC, Route103_Text_BrendanDefeated
goto Route103_EventScript_AfterBrendanBattle goto Route103_EventScript_AfterBrendanBattle
end end
Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE
trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_MUDKIP, Route103_Text_BrendanDefeated
goto Route103_EventScript_AfterBrendanBattle goto Route103_EventScript_AfterBrendanBattle
end end

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

@ -167,19 +167,19 @@ Route104_EventScript_RestoreMusic:: @ 81ECE31
return return
Route104_EventScript_BattleMayTreecko:: @ 81ECE36 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated goto Route104_EventScript_MayDefeated
end end
Route104_EventScript_BattleMayTorchic:: @ 81ECE49 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated goto Route104_EventScript_MayDefeated
end end
Route104_EventScript_BattleMayMudkip:: @ 81ECE5C 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_MayDefeated goto Route104_EventScript_MayDefeated
end end
@ -237,19 +237,19 @@ Route104_EventScript_BrendanDefeated:: @ 81ECF38
end end
Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated goto Route104_EventScript_BrendanDefeated
end end
Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated goto Route104_EventScript_BrendanDefeated
end end
Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73 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 setflag FLAG_DEFEATED_RIVAL_ROUTE_104
goto Route104_EventScript_BrendanDefeated goto Route104_EventScript_BrendanDefeated
end end

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

@ -421,17 +421,17 @@ Route110_EventScript_MayBattle:: @ 81EF7EB
end end
Route110_EventScript_MayBattleTreecko:: @ 81EF81A Route110_EventScript_MayBattleTreecko:: @ 81EF81A
trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TREECKO, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated goto Route110_EventScript_MayDefeated
end end
Route110_EventScript_MayBattleTorchic:: @ 81EF82A Route110_EventScript_MayBattleTorchic:: @ 81EF82A
trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TORCHIC, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated goto Route110_EventScript_MayDefeated
end end
Route110_EventScript_MayBattleMudkip:: @ 81EF83A Route110_EventScript_MayBattleMudkip:: @ 81EF83A
trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated trainerbattle_no_intro TRAINER_MAY_ROUTE_110_MUDKIP, Route110_Text_MayDefeated
goto Route110_EventScript_MayDefeated goto Route110_EventScript_MayDefeated
end end
@ -451,17 +451,17 @@ Route110_EventScript_BrendanBattle:: @ 81EF865
end end
Route110_EventScript_BrendanBattleTreecko:: @ 81EF894 Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TREECKO, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated goto Route110_EventScript_BrendanDefeated
end end
Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4 Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TORCHIC, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated goto Route110_EventScript_BrendanDefeated
end end
Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4 Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_MUDKIP, Route110_Text_BrendanDefeated
goto Route110_EventScript_BrendanDefeated goto Route110_EventScript_BrendanDefeated
end end

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

@ -86,17 +86,17 @@ Route119_EventScript_BattleMay:: @ 81F450B
end end
Route119_EventScript_BattleMayTreecko:: @ 81F453A Route119_EventScript_BattleMayTreecko:: @ 81F453A
trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TREECKO, Route119_Text_MayDefeat
goto Route119_EventScript_DefeatedMay goto Route119_EventScript_DefeatedMay
end end
Route119_EventScript_BattleMayTorchic:: @ 81F454A Route119_EventScript_BattleMayTorchic:: @ 81F454A
trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TORCHIC, Route119_Text_MayDefeat
goto Route119_EventScript_DefeatedMay goto Route119_EventScript_DefeatedMay
end end
Route119_EventScript_BattleMayMudkip:: @ 81F455A Route119_EventScript_BattleMayMudkip:: @ 81F455A
trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_ROUTE_119_MUDKIP, Route119_Text_MayDefeat
goto Route119_EventScript_DefeatedMay goto Route119_EventScript_DefeatedMay
end end
@ -116,17 +116,17 @@ Route119_EventScript_BattleBrendan:: @ 81F4585
end end
Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4 Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TREECKO, Route119_Text_BrendanDefeat
goto Route119_EventScript_DefeatedBrendan goto Route119_EventScript_DefeatedBrendan
end end
Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4 Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TORCHIC, Route119_Text_BrendanDefeat
goto Route119_EventScript_DefeatedBrendan goto Route119_EventScript_DefeatedBrendan
end end
Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4 Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_MUDKIP, Route119_Text_BrendanDefeat
goto Route119_EventScript_DefeatedBrendan goto Route119_EventScript_DefeatedBrendan
end end

2
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@ -41,7 +41,7 @@ Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
end end
Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated trainerbattle_single TRAINER_SHELLY_WEATHER_INSTITUTE, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
end end

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

@ -896,19 +896,19 @@ RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
return return
RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_MayBrineyHint goto RustboroCity_EventScript_MayBrineyHint
end end
RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_MayBrineyHint goto RustboroCity_EventScript_MayBrineyHint
end end
RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101 RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_MayBrineyHint goto RustboroCity_EventScript_MayBrineyHint
end end
@ -960,19 +960,19 @@ RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
end end
RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5 RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_BrendanBrineyHint goto RustboroCity_EventScript_BrendanBrineyHint
end end
RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8 RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_BrendanBrineyHint goto RustboroCity_EventScript_BrendanBrineyHint
end end
RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat
setflag FLAG_DEFEATED_RIVAL_RUSTBORO setflag FLAG_DEFEATED_RIVAL_RUSTBORO
goto RustboroCity_EventScript_BrendanBrineyHint goto RustboroCity_EventScript_BrendanBrineyHint
end end

2
data/maps/SeafloorCavern_Room3/scripts.inc
View File

@ -2,7 +2,7 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937
.byte 0 .byte 0
SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938 SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat trainerbattle_single TRAINER_SHELLY_SEAFLOOR_CAVERN, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
end end

6
data/maps/VictoryRoad_1F/scripts.inc
View File

@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat trainerbattle_no_intro TRAINER_WALLY_VR_1, VictoryRoad_1F_Text_WallyEntranceDefeat
msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT
clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
copyobjectxytoperm 4 copyobjectxytoperm 4
@ -84,7 +84,7 @@ VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
@ This Wally appears and remains at the exit after the Hall of Fame is entered @ This Wally appears and remains at the exit after the Hall of Fame is entered
VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35 VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE compare VAR_RESULT, TRUE
goto_if_eq VictoryRoad_1F_EventScript_RematchWally goto_if_eq VictoryRoad_1F_EventScript_RematchWally
@ -92,7 +92,7 @@ VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
end end
VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat trainerbattle_rematch TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
end end

92
include/constants/opponents.h
View File

@ -33,8 +33,8 @@
#define TRAINER_FREDRICK 29 #define TRAINER_FREDRICK 29
#define TRAINER_MATT 30 #define TRAINER_MATT 30
#define TRAINER_ZANDER 31 #define TRAINER_ZANDER 31
#define TRAINER_SHELLY_1 32 #define TRAINER_SHELLY_WEATHER_INSTITUTE 32
#define TRAINER_SHELLY_2 33 #define TRAINER_SHELLY_SEAFLOOR_CAVERN 33
#define TRAINER_ARCHIE 34 #define TRAINER_ARCHIE 34
#define TRAINER_LEAH 35 #define TRAINER_LEAH 35
#define TRAINER_DAISY 36 #define TRAINER_DAISY 36
@ -515,30 +515,30 @@
#define TRAINER_CONOR 511 #define TRAINER_CONOR 511
#define TRAINER_EDWIN_1 512 #define TRAINER_EDWIN_1 512
#define TRAINER_HECTOR 513 #define TRAINER_HECTOR 513
#define TRAINER_TABITHA_1 514 #define TRAINER_TABITHA_MOSSDEEP 514
#define TRAINER_EDWIN_2 515 #define TRAINER_EDWIN_2 515
#define TRAINER_EDWIN_3 516 #define TRAINER_EDWIN_3 516
#define TRAINER_EDWIN_4 517 #define TRAINER_EDWIN_4 517
#define TRAINER_EDWIN_5 518 #define TRAINER_EDWIN_5 518
#define TRAINER_WALLY_1 519 #define TRAINER_WALLY_VR_1 519
#define TRAINER_BRENDAN_1 520 #define TRAINER_BRENDAN_ROUTE_103_MUDKIP 520
#define TRAINER_BRENDAN_2 521 #define TRAINER_BRENDAN_ROUTE_110_MUDKIP 521
#define TRAINER_BRENDAN_3 522 #define TRAINER_BRENDAN_ROUTE_119_MUDKIP 522
#define TRAINER_BRENDAN_4 523 #define TRAINER_BRENDAN_ROUTE_103_TREECKO 523
#define TRAINER_BRENDAN_5 524 #define TRAINER_BRENDAN_ROUTE_110_TREECKO 524
#define TRAINER_BRENDAN_6 525 #define TRAINER_BRENDAN_ROUTE_119_TREECKO 525
#define TRAINER_BRENDAN_7 526 #define TRAINER_BRENDAN_ROUTE_103_TORCHIC 526
#define TRAINER_BRENDAN_8 527 #define TRAINER_BRENDAN_ROUTE_110_TORCHIC 527
#define TRAINER_BRENDAN_9 528 #define TRAINER_BRENDAN_ROUTE_119_TORCHIC 528
#define TRAINER_MAY_1 529 #define TRAINER_MAY_ROUTE_103_MUDKIP 529
#define TRAINER_MAY_2 530 #define TRAINER_MAY_ROUTE_110_MUDKIP 530
#define TRAINER_MAY_3 531 #define TRAINER_MAY_ROUTE_119_MUDKIP 531
#define TRAINER_MAY_4 532 #define TRAINER_MAY_ROUTE_103_TREECKO 532
#define TRAINER_MAY_5 533 #define TRAINER_MAY_ROUTE_110_TREECKO 533
#define TRAINER_MAY_6 534 #define TRAINER_MAY_ROUTE_119_TREECKO 534
#define TRAINER_MAY_7 535 #define TRAINER_MAY_ROUTE_103_TORCHIC 535
#define TRAINER_MAY_8 536 #define TRAINER_MAY_ROUTE_110_TORCHIC 536
#define TRAINER_MAY_9 537 #define TRAINER_MAY_ROUTE_119_TORCHIC 537
#define TRAINER_ISAAC_1 538 #define TRAINER_ISAAC_1 538
#define TRAINER_DAVIS 539 #define TRAINER_DAVIS 539
#define TRAINER_MITCHELL 540 #define TRAINER_MITCHELL 540
@ -593,17 +593,17 @@
#define TRAINER_GRUNT_SPACE_CENTER_6 589 #define TRAINER_GRUNT_SPACE_CENTER_6 589
#define TRAINER_GRUNT_SPACE_CENTER_7 590 #define TRAINER_GRUNT_SPACE_CENTER_7 590
#define TRAINER_MACEY 591 #define TRAINER_MACEY 591
#define TRAINER_BRENDAN_10 592 #define TRAINER_BRENDAN_RUSTBORO_TREECKO 592
#define TRAINER_BRENDAN_11 593 #define TRAINER_BRENDAN_RUSTBORO_MUDKIP 593
#define TRAINER_PAXTON 594 #define TRAINER_PAXTON 594
#define TRAINER_ISABELLA 595 #define TRAINER_ISABELLA 595
#define TRAINER_GRUNT_WEATHER_INST_5 596 #define TRAINER_GRUNT_WEATHER_INST_5 596
#define TRAINER_TABITHA_2 597 #define TRAINER_TABITHA_MT_CHIMNEY 597
#define TRAINER_JONATHAN 598 #define TRAINER_JONATHAN 598
#define TRAINER_BRENDAN_12 599 #define TRAINER_BRENDAN_RUSTBORO_TORCHIC 599
#define TRAINER_MAY_10 600 #define TRAINER_MAY_RUSTBORO_MUDKIP 600
#define TRAINER_MAXIE_1 601 #define TRAINER_MAXIE_MAGMA_HIDEOUT 601
#define TRAINER_MAXIE_2 602 #define TRAINER_MAXIE_MT_CHIMNEY 602
#define TRAINER_TIANA 603 #define TRAINER_TIANA 603
#define TRAINER_HALEY_1 604 #define TRAINER_HALEY_1 604
#define TRAINER_JANICE 605 #define TRAINER_JANICE 605
@ -657,17 +657,17 @@
#define TRAINER_RILEY 653 #define TRAINER_RILEY 653
#define TRAINER_FLINT 654 #define TRAINER_FLINT 654
#define TRAINER_ASHLEY 655 #define TRAINER_ASHLEY 655
#define TRAINER_WALLY_2 656 #define TRAINER_WALLY_MAUVILLE 656
#define TRAINER_WALLY_3 657 #define TRAINER_WALLY_VR_2 657
#define TRAINER_WALLY_4 658 #define TRAINER_WALLY_VR_3 658
#define TRAINER_WALLY_5 659 #define TRAINER_WALLY_VR_4 659
#define TRAINER_WALLY_6 660 #define TRAINER_WALLY_VR_5 660
#define TRAINER_BRENDAN_13 661 #define TRAINER_BRENDAN_LILYCOVE_MUDKIP 661
#define TRAINER_BRENDAN_14 662 #define TRAINER_BRENDAN_LILYCOVE_TREECKO 662
#define TRAINER_BRENDAN_15 663 #define TRAINER_BRENDAN_LILYCOVE_TORCHIC 663
#define TRAINER_MAY_11 664 #define TRAINER_MAY_LILYCOVE_MUDKIP 664
#define TRAINER_MAY_12 665 #define TRAINER_MAY_LILYCOVE_TREECKO 665
#define TRAINER_MAY_13 666 #define TRAINER_MAY_LILYCOVE_TORCHIC 666
#define TRAINER_JONAH 667 #define TRAINER_JONAH 667
#define TRAINER_HENRY 668 #define TRAINER_HENRY 668
#define TRAINER_ROGER 669 #define TRAINER_ROGER 669
@ -733,9 +733,9 @@
#define TRAINER_GRUNT_MAGMA_HIDEOUT_14 729 #define TRAINER_GRUNT_MAGMA_HIDEOUT_14 729
#define TRAINER_GRUNT_MAGMA_HIDEOUT_15 730 #define TRAINER_GRUNT_MAGMA_HIDEOUT_15 730
#define TRAINER_GRUNT_MAGMA_HIDEOUT_16 731 #define TRAINER_GRUNT_MAGMA_HIDEOUT_16 731
#define TRAINER_TABITHA_3 732 #define TRAINER_TABITHA_MAGMA_HIDEOUT 732
#define TRAINER_DARCY 733 #define TRAINER_DARCY 733
#define TRAINER_MAXIE_3 734 #define TRAINER_MAXIE_MOSSDEEP 734
#define TRAINER_PETE 735 #define TRAINER_PETE 735
#define TRAINER_ISABELLE 736 #define TRAINER_ISABELLE 736
#define TRAINER_ANDRES_1 737 #define TRAINER_ANDRES_1 737
@ -769,8 +769,8 @@
#define TRAINER_MYLES 765 #define TRAINER_MYLES 765
#define TRAINER_PAT 766 #define TRAINER_PAT 766
#define TRAINER_CRISTIN_1 767 #define TRAINER_CRISTIN_1 767
#define TRAINER_MAY_14 768 #define TRAINER_MAY_RUSTBORO_TREECKO 768
#define TRAINER_MAY_15 769 #define TRAINER_MAY_RUSTBORO_TORCHIC 769
#define TRAINER_ROXANNE_2 770 #define TRAINER_ROXANNE_2 770
#define TRAINER_ROXANNE_3 771 #define TRAINER_ROXANNE_3 771
#define TRAINER_ROXANNE_4 772 #define TRAINER_ROXANNE_4 772
@ -854,8 +854,8 @@
#define TRAINER_EVERETT 850 #define TRAINER_EVERETT 850
#define TRAINER_RED 851 #define TRAINER_RED 851
#define TRAINER_LEAF 852 #define TRAINER_LEAF 852
#define TRAINER_BRENDAN_16 853 #define TRAINER_BRENDAN_PLACEHOLDER 853
#define TRAINER_MAY_16 854 #define TRAINER_MAY_PLACEHOLDER 854
#define TRAINERS_COUNT 855 #define TRAINERS_COUNT 855

2
src/battle_setup.c
View File

@ -305,7 +305,7 @@ const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] =
[REMATCH_TRENT] = REMATCH(TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5, ROUTE112), [REMATCH_TRENT] = REMATCH(TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5, ROUTE112),
[REMATCH_SAWYER] = REMATCH(TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5, MT_CHIMNEY), [REMATCH_SAWYER] = REMATCH(TRAINER_SAWYER_1, TRAINER_SAWYER_2, TRAINER_SAWYER_3, TRAINER_SAWYER_4, TRAINER_SAWYER_5, MT_CHIMNEY),
[REMATCH_KIRA_AND_DAN] = REMATCH(TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5, ABANDONED_SHIP_ROOMS2_1F), [REMATCH_KIRA_AND_DAN] = REMATCH(TRAINER_KIRA_AND_DAN_1, TRAINER_KIRA_AND_DAN_2, TRAINER_KIRA_AND_DAN_3, TRAINER_KIRA_AND_DAN_4, TRAINER_KIRA_AND_DAN_5, ABANDONED_SHIP_ROOMS2_1F),
[REMATCH_WALLY_3] = REMATCH(TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_WALLY_6, VICTORY_ROAD_1F), [REMATCH_WALLY_3] = REMATCH(TRAINER_WALLY_VR_2, TRAINER_WALLY_VR_3, TRAINER_WALLY_VR_4, TRAINER_WALLY_VR_5, TRAINER_WALLY_VR_5, VICTORY_ROAD_1F),
[REMATCH_ROXANNE] = REMATCH(TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5, RUSTBORO_CITY), [REMATCH_ROXANNE] = REMATCH(TRAINER_ROXANNE_1, TRAINER_ROXANNE_2, TRAINER_ROXANNE_3, TRAINER_ROXANNE_4, TRAINER_ROXANNE_5, RUSTBORO_CITY),
[REMATCH_BRAWLY] = REMATCH(TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5, DEWFORD_TOWN), [REMATCH_BRAWLY] = REMATCH(TRAINER_BRAWLY_1, TRAINER_BRAWLY_2, TRAINER_BRAWLY_3, TRAINER_BRAWLY_4, TRAINER_BRAWLY_5, DEWFORD_TOWN),
[REMATCH_WATTSON] = REMATCH(TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5, MAUVILLE_CITY), [REMATCH_WATTSON] = REMATCH(TRAINER_WATTSON_1, TRAINER_WATTSON_2, TRAINER_WATTSON_3, TRAINER_WATTSON_4, TRAINER_WATTSON_5, MAUVILLE_CITY),

22
src/data/trainer_parties.h
View File

@ -331,7 +331,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Zander[] = {
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_ShellyWeatherInstitute[] = {
{ {
.iv = 50, .iv = 50,
.lvl = 28, .lvl = 28,
@ -344,7 +344,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Shelly1[] = {
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Shelly2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_ShellySeafloorCavern[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 37, .lvl = 37,
@ -6678,7 +6678,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Hector[] = {
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha1[] = { static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMossdeep[] = {
{ {
.iv = 100, .iv = 100,
.lvl = 36, .lvl = 36,
@ -6748,7 +6748,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Edwin5[] = {
} }
}; };
static const struct TrainerMonNoItemCustomMoves sParty_Wally1[] = { static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = {
{ {
.iv = 150, .iv = 150,
.lvl = 44, .lvl = 44,
@ -7893,7 +7893,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntWeatherInst5[] = {
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMtChimney[] = {
{ {
.iv = 50, .iv = 50,
.lvl = 18, .lvl = 18,
@ -8743,7 +8743,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Ashley[] = {
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = { static const struct TrainerMonNoItemDefaultMoves sParty_WallyMauville[] = {
{ {
.iv = 30, .iv = 30,
.lvl = 16, .lvl = 16,
@ -8751,7 +8751,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Wally2[] = {
} }
}; };
static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = { static const struct TrainerMonNoItemCustomMoves sParty_WallyVR2[] = {
{ {
.iv = 150, .iv = 150,
.lvl = 47, .lvl = 47,
@ -8784,7 +8784,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally3[] = {
} }
}; };
static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = { static const struct TrainerMonNoItemCustomMoves sParty_WallyVR3[] = {
{ {
.iv = 150, .iv = 150,
.lvl = 50, .lvl = 50,
@ -8817,7 +8817,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally4[] = {
} }
}; };
static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = { static const struct TrainerMonNoItemCustomMoves sParty_WallyVR4[] = {
{ {
.iv = 150, .iv = 150,
.lvl = 53, .lvl = 53,
@ -8850,7 +8850,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally5[] = {
} }
}; };
static const struct TrainerMonNoItemCustomMoves sParty_Wally6[] = { static const struct TrainerMonNoItemCustomMoves sParty_WallyVR5[] = {
{ {
.iv = 150, .iv = 150,
.lvl = 56, .lvl = 56,
@ -9783,7 +9783,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_GruntMagmaHideout16[] =
} }
}; };
static const struct TrainerMonNoItemDefaultMoves sParty_Tabitha3[] = { static const struct TrainerMonNoItemDefaultMoves sParty_TabithaMagmaHideout[] = {
{ {
.iv = 75, .iv = 75,
.lvl = 26, .lvl = 26,

136
src/data/trainers.h
View File

@ -447,7 +447,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Zander}, .party = {.NoItemDefaultMoves = sParty_Zander},
}, },
[TRAINER_SHELLY_1] = [TRAINER_SHELLY_WEATHER_INSTITUTE] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN, .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@ -457,11 +457,11 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Shelly1), .partySize = ARRAY_COUNT(sParty_ShellyWeatherInstitute),
.party = {.NoItemDefaultMoves = sParty_Shelly1}, .party = {.NoItemDefaultMoves = sParty_ShellyWeatherInstitute},
}, },
[TRAINER_SHELLY_2] = [TRAINER_SHELLY_SEAFLOOR_CAVERN] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_AQUA_ADMIN, .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
@ -471,8 +471,8 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Shelly2), .partySize = ARRAY_COUNT(sParty_ShellySeafloorCavern),
.party = {.NoItemDefaultMoves = sParty_Shelly2}, .party = {.NoItemDefaultMoves = sParty_ShellySeafloorCavern},
}, },
[TRAINER_ARCHIE] = [TRAINER_ARCHIE] =
@ -7195,7 +7195,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Hector}, .party = {.NoItemDefaultMoves = sParty_Hector},
}, },
[TRAINER_TABITHA_1] = [TRAINER_TABITHA_MOSSDEEP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@ -7205,8 +7205,8 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
.partySize = ARRAY_COUNT(sParty_Tabitha1), .partySize = ARRAY_COUNT(sParty_TabithaMossdeep),
.party = {.NoItemDefaultMoves = sParty_Tabitha1}, .party = {.NoItemDefaultMoves = sParty_TabithaMossdeep},
}, },
[TRAINER_EDWIN_2] = [TRAINER_EDWIN_2] =
@ -7265,7 +7265,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Edwin5}, .party = {.NoItemDefaultMoves = sParty_Edwin5},
}, },
[TRAINER_WALLY_1] = [TRAINER_WALLY_VR_1] =
{ {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7275,11 +7275,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally1), .partySize = ARRAY_COUNT(sParty_WallyVR1),
.party = {.NoItemCustomMoves = sParty_Wally1}, .party = {.NoItemCustomMoves = sParty_WallyVR1},
}, },
[TRAINER_BRENDAN_1] = [TRAINER_BRENDAN_ROUTE_103_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7293,7 +7293,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Mudkip}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Mudkip},
}, },
[TRAINER_BRENDAN_2] = [TRAINER_BRENDAN_ROUTE_110_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7307,7 +7307,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Mudkip}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Mudkip},
}, },
[TRAINER_BRENDAN_3] = [TRAINER_BRENDAN_ROUTE_119_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7321,7 +7321,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Mudkip}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Mudkip},
}, },
[TRAINER_BRENDAN_4] = [TRAINER_BRENDAN_ROUTE_103_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7335,7 +7335,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Treecko}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Treecko},
}, },
[TRAINER_BRENDAN_5] = [TRAINER_BRENDAN_ROUTE_110_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7349,7 +7349,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Treecko}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Treecko},
}, },
[TRAINER_BRENDAN_6] = [TRAINER_BRENDAN_ROUTE_119_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7363,7 +7363,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Treecko}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Treecko},
}, },
[TRAINER_BRENDAN_7] = [TRAINER_BRENDAN_ROUTE_103_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7377,7 +7377,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute103Torchic}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute103Torchic},
}, },
[TRAINER_BRENDAN_8] = [TRAINER_BRENDAN_ROUTE_110_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7391,7 +7391,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute110Torchic}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute110Torchic},
}, },
[TRAINER_BRENDAN_9] = [TRAINER_BRENDAN_ROUTE_119_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7405,7 +7405,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRoute119Torchic}, .party = {.NoItemDefaultMoves = sParty_BrendanRoute119Torchic},
}, },
[TRAINER_MAY_1] = [TRAINER_MAY_ROUTE_103_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7419,7 +7419,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Mudkip}, .party = {.NoItemDefaultMoves = sParty_MayRoute103Mudkip},
}, },
[TRAINER_MAY_2] = [TRAINER_MAY_ROUTE_110_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7433,7 +7433,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Mudkip}, .party = {.NoItemDefaultMoves = sParty_MayRoute110Mudkip},
}, },
[TRAINER_MAY_3] = [TRAINER_MAY_ROUTE_119_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7447,7 +7447,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute119Mudkip}, .party = {.NoItemDefaultMoves = sParty_MayRoute119Mudkip},
}, },
[TRAINER_MAY_4] = [TRAINER_MAY_ROUTE_103_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7461,7 +7461,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Treecko}, .party = {.NoItemDefaultMoves = sParty_MayRoute103Treecko},
}, },
[TRAINER_MAY_5] = [TRAINER_MAY_ROUTE_110_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7475,7 +7475,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Treecko}, .party = {.NoItemDefaultMoves = sParty_MayRoute110Treecko},
}, },
[TRAINER_MAY_6] = [TRAINER_MAY_ROUTE_119_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7489,7 +7489,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute119Treecko}, .party = {.NoItemDefaultMoves = sParty_MayRoute119Treecko},
}, },
[TRAINER_MAY_7] = [TRAINER_MAY_ROUTE_103_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7503,7 +7503,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute103Torchic}, .party = {.NoItemDefaultMoves = sParty_MayRoute103Torchic},
}, },
[TRAINER_MAY_8] = [TRAINER_MAY_ROUTE_110_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -7517,7 +7517,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRoute110Torchic}, .party = {.NoItemDefaultMoves = sParty_MayRoute110Torchic},
}, },
[TRAINER_MAY_9] = [TRAINER_MAY_ROUTE_119_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -8287,7 +8287,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Macey}, .party = {.NoItemDefaultMoves = sParty_Macey},
}, },
[TRAINER_BRENDAN_10] = [TRAINER_BRENDAN_RUSTBORO_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -8301,7 +8301,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRustboroTreecko}, .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTreecko},
}, },
[TRAINER_BRENDAN_11] = [TRAINER_BRENDAN_RUSTBORO_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -8357,7 +8357,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5}, .party = {.NoItemDefaultMoves = sParty_GruntWeatherInst5},
}, },
[TRAINER_TABITHA_2] = [TRAINER_TABITHA_MT_CHIMNEY] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@ -8367,8 +8367,8 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Tabitha2), .partySize = ARRAY_COUNT(sParty_TabithaMtChimney),
.party = {.NoItemDefaultMoves = sParty_Tabitha2}, .party = {.NoItemDefaultMoves = sParty_TabithaMtChimney},
}, },
[TRAINER_JONATHAN] = [TRAINER_JONATHAN] =
@ -8385,7 +8385,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Jonathan}, .party = {.NoItemDefaultMoves = sParty_Jonathan},
}, },
[TRAINER_BRENDAN_12] = [TRAINER_BRENDAN_RUSTBORO_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -8399,7 +8399,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanRustboroTorchic}, .party = {.NoItemDefaultMoves = sParty_BrendanRustboroTorchic},
}, },
[TRAINER_MAY_10] = [TRAINER_MAY_RUSTBORO_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -8413,7 +8413,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRustboroMudkip}, .party = {.NoItemDefaultMoves = sParty_MayRustboroMudkip},
}, },
[TRAINER_MAXIE_1] = [TRAINER_MAXIE_MAGMA_HIDEOUT] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER, .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@ -8427,7 +8427,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MaxieMagmaHideout}, .party = {.NoItemDefaultMoves = sParty_MaxieMagmaHideout},
}, },
[TRAINER_MAXIE_2] = [TRAINER_MAXIE_MT_CHIMNEY] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER, .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@ -9183,7 +9183,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Ashley}, .party = {.NoItemDefaultMoves = sParty_Ashley},
}, },
[TRAINER_WALLY_2] = [TRAINER_WALLY_MAUVILLE] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9193,11 +9193,11 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally2), .partySize = ARRAY_COUNT(sParty_WallyMauville),
.party = {.NoItemDefaultMoves = sParty_Wally2}, .party = {.NoItemDefaultMoves = sParty_WallyMauville},
}, },
[TRAINER_WALLY_3] = [TRAINER_WALLY_VR_2] =
{ {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9207,11 +9207,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally3), .partySize = ARRAY_COUNT(sParty_WallyVR2),
.party = {.NoItemCustomMoves = sParty_Wally3}, .party = {.NoItemCustomMoves = sParty_WallyVR2},
}, },
[TRAINER_WALLY_4] = [TRAINER_WALLY_VR_3] =
{ {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9221,11 +9221,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally4), .partySize = ARRAY_COUNT(sParty_WallyVR3),
.party = {.NoItemCustomMoves = sParty_Wally4}, .party = {.NoItemCustomMoves = sParty_WallyVR3},
}, },
[TRAINER_WALLY_5] = [TRAINER_WALLY_VR_4] =
{ {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9235,11 +9235,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally5), .partySize = ARRAY_COUNT(sParty_WallyVR4),
.party = {.NoItemCustomMoves = sParty_Wally5}, .party = {.NoItemCustomMoves = sParty_WallyVR4},
}, },
[TRAINER_WALLY_6] = [TRAINER_WALLY_VR_5] =
{ {
.partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9249,11 +9249,11 @@ const struct Trainer gTrainers[] = {
.items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE}, .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.partySize = ARRAY_COUNT(sParty_Wally6), .partySize = ARRAY_COUNT(sParty_WallyVR5),
.party = {.NoItemCustomMoves = sParty_Wally6}, .party = {.NoItemCustomMoves = sParty_WallyVR5},
}, },
[TRAINER_BRENDAN_13] = [TRAINER_BRENDAN_LILYCOVE_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9267,7 +9267,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveMudkip}, .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveMudkip},
}, },
[TRAINER_BRENDAN_14] = [TRAINER_BRENDAN_LILYCOVE_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9281,7 +9281,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTreecko}, .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTreecko},
}, },
[TRAINER_BRENDAN_15] = [TRAINER_BRENDAN_LILYCOVE_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9295,7 +9295,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTorchic}, .party = {.NoItemDefaultMoves = sParty_BrendanLilycoveTorchic},
}, },
[TRAINER_MAY_11] = [TRAINER_MAY_LILYCOVE_MUDKIP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9309,7 +9309,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayLilycoveMudkip}, .party = {.NoItemDefaultMoves = sParty_MayLilycoveMudkip},
}, },
[TRAINER_MAY_12] = [TRAINER_MAY_LILYCOVE_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -9323,7 +9323,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayLilycoveTreecko}, .party = {.NoItemDefaultMoves = sParty_MayLilycoveTreecko},
}, },
[TRAINER_MAY_13] = [TRAINER_MAY_LILYCOVE_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -10247,7 +10247,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16}, .party = {.NoItemDefaultMoves = sParty_GruntMagmaHideout16},
}, },
[TRAINER_TABITHA_3] = [TRAINER_TABITHA_MAGMA_HIDEOUT] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_ADMIN, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
@ -10257,8 +10257,8 @@ const struct Trainer gTrainers[] = {
.items = {}, .items = {},
.doubleBattle = FALSE, .doubleBattle = FALSE,
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
.partySize = ARRAY_COUNT(sParty_Tabitha3), .partySize = ARRAY_COUNT(sParty_TabithaMagmaHideout),
.party = {.NoItemDefaultMoves = sParty_Tabitha3}, .party = {.NoItemDefaultMoves = sParty_TabithaMagmaHideout},
}, },
[TRAINER_DARCY] = [TRAINER_DARCY] =
@ -10275,7 +10275,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Darcy}, .party = {.NoItemDefaultMoves = sParty_Darcy},
}, },
[TRAINER_MAXIE_3] = [TRAINER_MAXIE_MOSSDEEP] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_MAGMA_LEADER, .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
@ -10751,7 +10751,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Cristin1}, .party = {.NoItemDefaultMoves = sParty_Cristin1},
}, },
[TRAINER_MAY_14] = [TRAINER_MAY_RUSTBORO_TREECKO] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -10765,7 +10765,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_MayRustboroTreecko}, .party = {.NoItemDefaultMoves = sParty_MayRustboroTreecko},
}, },
[TRAINER_MAY_15] = [TRAINER_MAY_RUSTBORO_TORCHIC] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_PKMN_TRAINER_3, .trainerClass = TRAINER_CLASS_PKMN_TRAINER_3,
@ -11941,7 +11941,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_Leaf}, .party = {.NoItemDefaultMoves = sParty_Leaf},
}, },
[TRAINER_BRENDAN_16] = [TRAINER_BRENDAN_PLACEHOLDER] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG, .trainerClass = TRAINER_CLASS_RS_PROTAG,
@ -11955,7 +11955,7 @@ const struct Trainer gTrainers[] = {
.party = {.NoItemDefaultMoves = sParty_BrendanLinkPlaceholder}, .party = {.NoItemDefaultMoves = sParty_BrendanLinkPlaceholder},
}, },
[TRAINER_MAY_16] = [TRAINER_MAY_PLACEHOLDER] =
{ {
.partyFlags = 0, .partyFlags = 0,
.trainerClass = TRAINER_CLASS_RS_PROTAG, .trainerClass = TRAINER_CLASS_RS_PROTAG,