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

remove test changes

Browse Source
This commit is contained in:
DizzyEggg 2023-03-08 13:41:08 +01:00
parent 51c8edd825
commit bf4735e87c
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/scripts/debug.inc
View File

@ -55,7 +55,6 @@ Debug_FlagsNotSetMessage_Text:
.string "'include/constants/overworld{UNDERSCORE}config.h'!$"
Debug_Script_1::
multi_fixed_2_vs_2 TRAINER_ROXANNE_2, Debug_FlagsNotSetMessage_Text, TRAINER_ROXANNE_3, Debug_FlagsNotSetMessage_Text, TRAINER_ROXANNE_4, 0
end
Debug_Script_2::

32
src/data/trainer_parties.h
View File

@ -10301,31 +10301,31 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = {
static const struct TrainerMonItemCustomMoves sParty_Roxanne2[] = {
{
.iv = 255,
.lvl = 100,
.species = SPECIES_BEEDRILL,
.heldItem = 0,
.moves = {MOVE_FLING}
.lvl = 32,
.species = SPECIES_GOLEM,
.heldItem = ITEM_NONE,
.moves = {MOVE_PROTECT, MOVE_ROLLOUT, MOVE_MAGNITUDE, MOVE_EXPLOSION}
},
{
.iv = 255,
.lvl = 100,
.lvl = 35,
.species = SPECIES_KABUTO,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_SWORDS_DANCE, MOVE_ICE_BEAM, MOVE_SURF, MOVE_ROCK_SLIDE}
},
{
.iv = 255,
.lvl = 100,
.species = SPECIES_THUNDURUS,
.lvl = 35,
.species = SPECIES_ONIX,
.heldItem = ITEM_NONE,
.moves = {MOVE_THUNDER, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
.moves = {MOVE_IRON_TAIL, MOVE_EXPLOSION, MOVE_ROAR, MOVE_ROCK_SLIDE}
},
{
.iv = 255,
.lvl = 99,
.species = SPECIES_SABLEYE,
.lvl = 37,
.species = SPECIES_NOSEPASS,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_DARK_PULSE, MOVE_IRON_HEAD}
.moves = {MOVE_DOUBLE_TEAM, MOVE_EXPLOSION, MOVE_PROTECT, MOVE_ROCK_SLIDE}
}
};
@ -10333,8 +10333,8 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = {
{
.iv = 255,
.lvl = 37,
.species = SPECIES_MANECTRIC,
.heldItem = ITEM_MANECTITE,
.species = SPECIES_OMANYTE,
.heldItem = ITEM_NONE,
.moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF}
},
{
@ -10370,9 +10370,9 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne3[] = {
static const struct TrainerMonItemCustomMoves sParty_Roxanne4[] = {
{
.iv = 255,
.lvl = 100,
.species = SPECIES_GARDEVOIR,
.heldItem = ITEM_GARDEVOIRITE,
.lvl = 42,
.species = SPECIES_OMASTAR,
.heldItem = ITEM_NONE,
.moves = {MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_ROCK_SLIDE, MOVE_SURF}
},
{