Skip to content

Commit

Permalink
More Bugfixes/QoL changes (#177)
Browse files Browse the repository at this point in the history
Co-authored-by: Kris Johnson <[email protected]>
  • Loading branch information
WarriorGallade and KrisXV authored Apr 22, 2024
1 parent df4f4f7 commit c6006d8
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 10 deletions.
22 changes: 13 additions & 9 deletions data/mods/gen9ssb/moves.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
gen: 9,
pp: 5,
priority: 0,
flags: {},
flags: {protect: 1},
onPrepareHit(target, source, move) {
this.add('-anim', source, 'Trick Room', target);
this.add('-anim', source, 'Clangerous Soul', source);
Expand Down Expand Up @@ -3528,7 +3528,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
},
secondary: null,
target: "self",
type: "grass",
type: "Grass",
},

// MyPearl
Expand Down Expand Up @@ -3838,15 +3838,19 @@ export const Moves: {[k: string]: ModdedMoveData} = {
this.add('-anim', source, 'Jet Punch', target);
this.add('-anim', source, 'Flare Blitz', target);
},
secondary: {
chance: 100,
status: 'brn',
self: {
boosts: {
atk: 1,
secondaries: [
{
chance: 100,
status: 'brn',
}, {
chance: 100,
self: {
boosts: {
atk: 1,
},
},
},
},
],
target: "normal",
type: "Water",
},
Expand Down
115 changes: 114 additions & 1 deletion data/mods/gen9ssb/pokedex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Marble Phantasm"},
},

// Artemis
genesect: {
inherit: true,
abilities: {0: "Supervised Learning"},
},

// Arya
trapinch: {
inherit: true,
Expand Down Expand Up @@ -136,6 +142,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Magic Guard"},
},

// blazeofvictory
sylveon: {
inherit: true,
abilities: {0: "Prismatic Lens"},
},

// Blitz
chiyu: {
inherit: true,
Expand Down Expand Up @@ -258,6 +270,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Flash Fire"},
},

// EasyOnTheHills
snorlax: {
inherit: true,
abilities: {0: "Immunity"},
},

// Elliot
sinistea: {
inherit: true,
Expand Down Expand Up @@ -292,7 +310,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
// Felucia
vespiquen: {
inherit: true,
abilities: {0: "Regenerator"},
abilities: {0: "Mountaineer"},
},

// Froggeh
Expand Down Expand Up @@ -407,6 +425,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Fortifying Frost"},
},

// Kalalokki
flamigo: {
inherit: true,
abilities: {0: "Scrappy"},
},

// Karthik
staraptor: {
inherit: true,
Expand Down Expand Up @@ -581,7 +605,21 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Harambe Hit"},
},

// MyPearl
latios: {
inherit: true,
abilities: {0: "Eon Call"},
},
latias: {
inherit: true,
abilities: {0: "Eon Call"},
},

// Ney
banette: {
inherit: true,
abilities: {0: "Insomnia"},
},
banettemega: {
inherit: true,
abilities: {0: "Prankster Plus"},
Expand Down Expand Up @@ -657,6 +695,18 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Prankster"},
},

// ptoad
politoed: {
inherit: true,
abilities: {0: "Drizzle"},
},

// Pulse_kS
hydreigon: {
inherit: true,
abilities: {0: "Not Orichalcum Pulse"},
},

// PYRO
kingambit: {
inherit: true,
Expand All @@ -669,6 +719,24 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Fancy Scarf"},
},

// quziel
chromera: {
inherit: true,
abilities: {0: "High Performance Computing"},
},

// R8
chansey: {
inherit: true,
abilities: {0: "Anti-Pelau"},
},

// Rainshaft
xerneas: {
inherit: true,
abilities: {0: "Rainy's Aura"},
},

// Ransei
audinomega: {
inherit: true,
Expand Down Expand Up @@ -702,6 +770,16 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Water Absorb"},
},

// SexyMalasada
typhlosion: {
inherit: true,
abilities: {0: "Ancestry Ritual"},
},
typhlosionhisui: {
inherit: true,
abilities: {0: "Ancestry Ritual"},
},

// sharp_claw
sneasel: {
inherit: true,
Expand All @@ -715,6 +793,10 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
},

// Siegfried
ampharos: {
inherit: true,
abilities: {0: "Static"},
},
ampharosmega: {
inherit: true,
abilities: {0: "Magical Mystery Charge"},
Expand All @@ -734,6 +816,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Spikes of Wrath"},
},

// snake
fidgit: {
inherit: true,
abilities: {0: "Persistent"},
},

// Soft Flex
magnezone: {
inherit: true,
Expand Down Expand Up @@ -777,6 +865,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Stinky"},
},

// Teclis
gallade: {
inherit: true,
abilities: {0: "Sharpness"},
},

// Tenshi
sandshrew: {
inherit: true,
Expand Down Expand Up @@ -941,6 +1035,18 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "See No Evil, Hear No Evil, Speak No Evil"},
},

// Vistar
zeraora: {
inherit: true,
abilities: {0: "Prankster"},
},

// vmnunes
shayminsky: {
inherit: true,
abilities: {0: "Wild Growth"},
},

// WarriorGallade
tropius: {
inherit: true,
Expand Down Expand Up @@ -987,6 +1093,7 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
weedle: {
inherit: true,
baseStats: {hp: 100, atk: 90, def: 100, spa: 35, spd: 90, spe: 100},
abilities: {0: "Water Bubble"},
},

// Zarel
Expand All @@ -999,6 +1106,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
abilities: {0: "Tempo Change"},
},

// zee
lilliganthisui: {
inherit: true,
abilities: {0: "Chlorophyll"},
},

// zoro
umbreon: {
inherit: true,
Expand Down

0 comments on commit c6006d8

Please sign in to comment.