Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added moves to gyms

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-17 16:37:00 -07:00
1 parent 6544edb2d5
commit 49d1c7fa2a
2 files changed
+372 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/data/trainer_parties.h
+28 -7
View File
@@ -3490,9 +3490,9 @@ static const struct TrainerMonItemCustomMoves sParty_Roxanne1[] = {
{
.iv = 200,
.lvl = 16,
.species = SPECIES_LILEEP,
.species = SPECIES_ANORITH,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_MEGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_ACID, MOVE_ROCK_TOMB}
.moves = {MOVE_WATER_GUN, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_ROCK_TOMB}
}
};
@@ -3519,8 +3519,8 @@ static const struct TrainerMonItemCustomMoves sParty_Brawly1[] = {
.moves = {MOVE_ARM_THRUST, MOVE_NONE, MOVE_BATON_PASS, MOVE_BULK_UP}
},
{
.iv = 200,
.lvl = 21,
.iv = 100,
.lvl = 23,
.species = SPECIES_BRELOOM,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_BULLET_SEED, MOVE_THUNDER_PUNCH, MOVE_MACH_PUNCH, MOVE_BULK_UP}
@@ -3555,6 +3555,13 @@ static const struct TrainerMonItemCustomMoves sParty_Wattson1[] = {
.species = SPECIES_MANECTRIC,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_SHOCK_WAVE, MOVE_HOWL}
},
{
.iv = 250,
.lvl = 25,
.species = SPECIES_RAICHU,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_QUICK_ATTACK, MOVE_VOLT_SWITCH, MOVE_GRASS_KNOT, MOVE_DIG}
}
};
@@ -3586,20 +3593,27 @@ static const struct TrainerMonItemCustomMoves sParty_Flannery1[] = {
.species = SPECIES_TORKOAL,
.heldItem = ITEM_WHITE_HERB,
.moves = {MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_BODY_SLAM, MOVE_ATTRACT}
},
{
.iv = 250,
.lvl = 31,
.species = SPECIES_QUILAVA,
.heldItem = ITEM_CHESTO_BERRY,
.moves = {MOVE_FLAME_WHEEL, MOVE_AERIAL_ACE, MOVE_WILL_O_WISP, MOVE_REST}
}
};
static const struct TrainerMonItemCustomMoves sParty_Norman1[] = {
{
.iv = 200,
.lvl = 27,
.lvl = 29,
.species = SPECIES_SPINDA,
.heldItem = ITEM_NONE,
.moves = {MOVE_TEETER_DANCE, MOVE_PSYBEAM, MOVE_FACADE, MOVE_ENCORE}
},
{
.iv = 200,
.lvl = 27,
.lvl = 29,
.species = SPECIES_VIGOROTH,
.heldItem = ITEM_NONE,
.moves = {MOVE_SLASH, MOVE_FACADE, MOVE_ENCORE, MOVE_FEINT_ATTACK}
@@ -3613,10 +3627,17 @@ static const struct TrainerMonItemCustomMoves sParty_Norman1[] = {
},
{
.iv = 250,
.lvl = 31,
.lvl = 33,
.species = SPECIES_SLAKING,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_COUNTER, MOVE_YAWN, MOVE_FACADE, MOVE_FEINT_ATTACK}
},
{
.iv = 250,
.lvl = 33,
.species = SPECIES_EXPLOUD,
.heldItem = ITEM_SITRUS_BERRY,
.moves = {MOVE_ECHOED_VOICE, MOVE_REST, MOVE_SLEEP_TALK, MOVE_FACADE}
}
};
src/data/wild_encounters.json
+344 -36
View File
@@ -17,8 +17,8 @@
5,
10,
10,
5,
2
10,
5
]
},
{
@@ -12233,6 +12233,71 @@
{
"map": "MAP_ROUTE101WEST",
"base_label": "gRoute101West0",
"land_mons": {
"encounter_rate": 20,
"mons": [
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_CATERPIE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_CATERPIE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_SENTRET"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_SENTRET"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PICHU"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PICHU"
}
]
},
"water_mons": {
"encounter_rate": 4,
"mons": [
@@ -12317,69 +12382,312 @@
"species": "SPECIES_CORPHISH"
}
]
},
}
},
{
"map": "MAP_RUSTBORO_CITY_EAST",
"base_label": "gRustboroCityEast0",
"land_mons": {
"encounter_rate": 20,
"mons": [
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 2,
"max_level": 2,
"min_level": 6,
"max_level": 6,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_CATERPIE"
"min_level": 6,
"max_level": 6,
"species": "SPECIES_WHISMUR"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_CATERPIE"
"min_level": 6,
"max_level": 6,
"species": "SPECIES_NINCADA"
},
{
"min_level": 3,
"max_level": 3,
"min_level": 7,
"max_level": 7,
"species": "SPECIES_ABRA"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_NINCADA"
},
{
"min_level": 6,
"max_level": 6,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 8,
"max_level": 8,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"min_level": 8,
"max_level": 8,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_WURMPLE"
"min_level": 7,
"max_level": 7,
"species": "SPECIES_VULPIX"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
"min_level": 8,
"max_level": 8,
"species": "SPECIES_VULPIX"
}
]
},
"water_mons": {
"encounter_rate": 4,
"mons": [
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_WINGULL"
},
{
"min_level": 2,
"max_level": 2,
"min_level": 15,
"max_level": 25,
"species": "SPECIES_WINGULL"
},
{
"min_level": 15,
"max_level": 25,
"species": "SPECIES_WINGULL"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_PELIPPER"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_PELIPPER"
}
]
},
"fishing_mons": {
"encounter_rate": 30,
"mons": [
{
"min_level": 5,
"max_level": 10,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 5,
"max_level": 10,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 30,
"max_level": 35,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 20,
"max_level": 25,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 35,
"max_level": 40,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 40,
"max_level": 45,
"species": "SPECIES_MAGIKARP"
}
]
}
},
{
"map": "MAP_ROUTE116EXT",
"base_label": "gRoute116Ext0",
"land_mons": {
"encounter_rate": 20,
"mons": [
{
"min_level": 6,
"max_level": 6,
"species": "SPECIES_SENTRET"
},
{
"min_level": 2,
"max_level": 2,
"min_level": 6,
"max_level": 6,
"species": "SPECIES_WHISMUR"
},
{
"min_level": 6,
"max_level": 6,
"species": "SPECIES_NINCADA"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_ABRA"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_NINCADA"
},
{
"min_level": 6,
"max_level": 6,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 8,
"max_level": 8,
"species": "SPECIES_TAILLOW"
},
{
"min_level": 7,
"max_level": 7,
"species": "SPECIES_SENTRET"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PICHU"
"min_level": 8,
"max_level": 8,
"species": "SPECIES_SENTRET"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_PICHU"
"min_level": 7,
"max_level": 7,
"species": "SPECIES_VULPIX"
},
{
"min_level": 8,
"max_level": 8,
"species": "SPECIES_VULPIX"
}
]
},
"water_mons": {
"encounter_rate": 4,
"mons": [
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_WINGULL"
},
{
"min_level": 15,
"max_level": 25,
"species": "SPECIES_WINGULL"
},
{
"min_level": 15,
"max_level": 25,
"species": "SPECIES_WINGULL"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_PELIPPER"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_PELIPPER"
}
]
},
"fishing_mons": {
"encounter_rate": 30,
"mons": [
{
"min_level": 5,
"max_level": 10,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 5,
"max_level": 10,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 10,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 25,
"max_level": 30,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 30,
"max_level": 35,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 20,
"max_level": 25,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 35,
"max_level": 40,
"species": "SPECIES_MAGIKARP"
},
{
"min_level": 40,
"max_level": 45,
"species": "SPECIES_MAGIKARP"
}
]
}