thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-08 09:05:38 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lots of new trainer classes & pics, port kep cries

Browse source 
This adds Tohjo Giovanni, Archer, Ariana, Prof. Blue, and fixes various bugs with my last commit. Also fixes the bug with Chris's img not having an embedded palette.

I also ported over all the KEP cries that are available as a bunch were incomplete or seemingly being remade.

Next step is to integrate much of this.
This commit is contained in:
Llinos Evans 2024-07-25 02:18:19 +01:00
parent 2a1e28d3c9
commit 37980e84d0
31 changed files with 392 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

266
data/trainers/parties_new_classes.asm
View file

@ -80,7 +80,7 @@ PainterGroup:
SoldierGroup:
next_list_item ; SOLDIER (1)
db "PEPPINO@", TRAINERTYPE_NORMAL
db "WIART@", TRAINERTYPE_NORMAL
db 23
dw FORRETRESS
db -1 ; end
@ -267,15 +267,15 @@ LassGroup:
db 43
dw NIDOQUEEN ; From the Yellow Lass
db NO_ITEM
db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT
dw BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT
db 43
dw GOROTORA ; Basically the beta Pikaclone counterpart, right?
db NO_ITEM
db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT
dw THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT
db 45
dw PIKACHU ; And a pipe bomb.
db LIGHT_BALL
db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
dw THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
db -1 ; end
end_list_items
@ -286,27 +286,27 @@ WalkerGroup:
db 60
dw TOGEKISS
db PINK_BOW
db EXTREMESPEED, MIRROR_MOVE, SAFEGUARD, HIDDEN_POWER ; HP Water
dw EXTREMESPEED, MIRROR_MOVE, SAFEGUARD, HIDDEN_POWER ; HP Water
db 60
dw LUXWAN
db STICK
db FURY_CUTTER, SLASH, DRILL_PECK, THUNDERBOLT
dw FURY_CUTTER, SLASH, DRILL_PECK, THUNDERBOLT
db 60
dw CARETORKER
db LEFTOVERS
db SOFTBOILED, DRILL_PECK, HEAL_BELL, WHIRLWIND ; Drill Peck should be Dazzling Gleam!
dw SOFTBOILED, DRILL_PECK, HEAL_BELL, WHIRLWIND ; Drill Peck should be Dazzling Gleam!
db 60
dw DODRIO
db POLKADOT_BOW
db FLAIL, DRILL_PECK, AGILITY, ENDURE
dw FLAIL, DRILL_PECK, AGILITY, ENDURE
db 60
dw AERODACTYL ; Progenitor of Birds in Tajiri lore!
db MIRACLEBERRY
db ROCK_HEAD, WING_ATTACK, EARTHQUAKE, FIRE_BLAST
dw ROCK_HEAD, WING_ATTACK, EARTHQUAKE, FIRE_BLAST
db 60
dw SKARMORY
db NO_ITEM ; Fire-type damage reduction item here please!
db STEEL_WING, DRILL_PECK, PURSUIT, LEER
dw STEEL_WING, DRILL_PECK, PURSUIT, LEER
db -1 ; end
end_list_items
@ -316,27 +316,27 @@ LoreleiGroup:
db 60
dw CLOYSTER
db MINT_BERRY
db SPIKES, ICE_BEAM, SURF, EXPLOSION
dw SPIKES, ICE_BEAM, SURF, EXPLOSION
db 60
dw SNEASEL ; WEAVILE
db PRZCUREBERRY
db BEAT_UP, SLASH, ICE_BEAM, SWAGGER
dw BEAT_UP, SLASH, ICE_BEAM, SWAGGER
db 60
dw JYNX
db NO_ITEM
db LOVELY_KISS, PSYCHIC_M, PERISH_SONG, THIEF
dw LOVELY_KISS, PSYCHIC_M, PERISH_SONG, THIEF
db 60
dw LUXWAN ; BUNBERG
db MIRACLEBERRY
db SYNTHESIS, ICE_BEAM, RAZOR_LEAF, PRESENT ; funny,,,,,
dw SYNTHESIS, ICE_BEAM, RAZOR_LEAF, PRESENT ; funny,,,,,
db 60
dw NINETALES ; NINETALESA
db FAIRY_FEATHER
db ICE_BEAM, CONFUSE_RAY, HIDDEN_POWER, NO_MOVE ; DAZZLING_GLEAM please! also, HP Electric
dw ICE_BEAM, CONFUSE_RAY, HIDDEN_POWER, NO_MOVE ; DAZZLING_GLEAM please! also, HP Electric
db 60
dw LAPRAS
db NEVERMELTICE
db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
dw THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
db -1 ; end
end_list_items
@ -346,27 +346,27 @@ XXXGroup: ; South Man
db 60
dw BALUMBA
db MIRACLEBERRY
db HYPNOSIS, GUST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
dw HYPNOSIS, GUST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
db 60
dw SYLVEON
db PRZCUREBERRY
db QUICK_ATTACK, GROWTH, LIGHT_SCREEN, NO_MOVE ; Dazzling Gleam pls!
dw QUICK_ATTACK, GROWTH, LIGHT_SCREEN, NO_MOVE ; Dazzling Gleam pls!
db 60
dw MIMEAR
db MAGNET
db LOVELY_KISS, THUNDERBOLT, PRESENT, NO_MOVE ; Dazzling Gleam pls!
dw LOVELY_KISS, THUNDERBOLT, PRESENT, NO_MOVE ; Dazzling Gleam pls!
db 60
dw WEEZING ; WEEZINGG
db NO_ITEM ; Ground-type reducing item
db SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
dw SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
db 60
dw PHANDARIN
db PSNCUREBERRY
db SHADOW_BALL, BODY_SLAM, PURSUIT, NO_MOVE ; Dazzling Gleam pls!
dw SHADOW_BALL, BODY_SLAM, PURSUIT, NO_MOVE ; Dazzling Gleam pls!
db 60
dw GRANBO
db FAIRY_FEATHER
db NO_MOVE, NO_MOVE, NO_MOVE, NO_MOVE ; Dazzling Gleam pls!
dw SURF, NO_MOVE, NO_MOVE, NO_MOVE ; Dazzling Gleam pls!
db -1 ; end
end_list_items
@ -376,27 +376,27 @@ ImposterOakGroup:
db 60
dw TAUROS
db POLKADOT_BOW
db BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
dw BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
db 60
dw EXEGGUTOR
db MIRACLE_SEED
db SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
db 60
dw ARCANINE
db MINT_BERRY
db FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
dw FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
db 60
dw GYARADOS
db MYSTIC_WATER
db HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
db 60
dw HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
db 55 ; Lower-levelled because Oak ran out of the stolen gym Pokemon!
dw WEEZING
db NO_ITEM
db SLUDGE_BOMB, THUNDERBOLT, EXPLOSION, FIRE_BLAST
db 60
db BERRY
dw SLUDGE_BOMB, THUNDERBOLT, EXPLOSION, FIRE_BLAST
db 55
dw GENGAR
db NO_ITEM
db HYPNOSIS, DREAM_EATER, SHADOW_BALL, EXPLOSION ; An inept set designed to illustrate that Impostor Oak isn't actually very competent.
db BERRY
dw HYPNOSIS, DREAM_EATER, SHADOW_BALL, EXPLOSION ; An inept set designed to illustrate that Impostor Oak isn't actually very competent.
db -1 ; end
end_list_items
@ -406,27 +406,51 @@ AgathaGroup:
db 60
dw KITSEN
db NO_ITEM
db HYPNOSIS, THIEF, NIGHTMARE, DESTINY_BOND ; rude
dw HYPNOSIS, THIEF, NIGHTMARE, DESTINY_BOND ; rude
db 60
dw PRIMEAPE ; ANNIHILAPE
db SCOPE_LENS ; hahahahaha
db CROSS_CHOP, ROCK_HEAD, SHADOW_BALL, FOCUS_ENERGY
dw CROSS_CHOP, ROCK_HEAD, SHADOW_BALL, FOCUS_ENERGY
db 60
dw MAROWAK ; MAROWAKA
db THICK_CLUB
db EARTHQUAKE, BONEMERANG, SHADOW_BALL, SWORDS_DANCE
dw EARTHQUAKE, BONEMERANG, SHADOW_BALL, SWORDS_DANCE
db 60
dw MISMAGIUS
db PRZCUREBERRY
db THUNDERBOLT, PERISH_SONG, MEAN_LOOK, PROTECT ; also rude
dw THUNDERBOLT, PERISH_SONG, MEAN_LOOK, PROTECT ; also rude
db 60
dw GENGAR
db MAGNET ; psychic damage-reducing item?
db CONFUSE_RAY, THUNDERBOLT, GIGA_DRAIN, PSYCHIC_M
dw CONFUSE_RAY, THUNDERBOLT, GIGA_DRAIN, PSYCHIC_M
db 60
dw DOKUROAR
db HARD_STONE
db ROCK_SLASH, SHADOW_BALL, EARTHQUAKE, HIDDEN_POWER ; HP Fighting
dw ROCK_SLASH, SHADOW_BALL, EARTHQUAKE, HIDDEN_POWER ; HP Fighting
db -1 ; end
end_list_items
Giovanni1Group:
next_list_item
db "GIOVANNI@", TRAINERTYPE_MOVES
db 50
dw BEEDRILL
dw SWORDS_DANCE, TWINEEDLE, GIGA_DRAIN, SLUDGE_BOMB
db 50
dw HONCHKROW
dw FAINT_ATTACK, DRILL_PECK, NIGHT_SHADE, PURSUIT
db 50
dw NIDOKING
dw ICE_BEAM, EARTHQUAKE, ROCK_SLIDE, HORN_DRILL
db 50
dw NIDOQUEEN
dw THUNDERBOLT, EARTHQUAKE, BODY_SLAM, FIRE_BLAST
db 50
dw KANGASKHAN
dw BODY_SLAM, EARTHQUAKE, ENDURE, REVERSAL ; Oh the siren call of this strat...I should give it Attract to punish high-DV players, but it's just so fucking funny
db 50
dw PERSIAN
dw BITE, SLASH, THUNDERBOLT, HYPNOSIS ; Bite over Faint Attack because it has the same BP and flinches.
db -1 ; end
end_list_items
@ -438,27 +462,27 @@ LeaderGiovanniGroup: ; since he uses different sprites
db 60
dw GLIGAR ; GLISCOR
db SHARP_BEAK
db EARTHQUAKE, WING_ATTACK, SWORDS_DANCE, SANDSTORM
dw EARTHQUAKE, WING_ATTACK, SWORDS_DANCE, SANDSTORM
db 60
dw DONPHAN ; TRAMPEL
db LEFTOVERS
db BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
dw BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
db 60
dw NIDOQUEEN
db MYSTIC_WATER
db SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
dw SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
db 60
dw MAROWAK ; GUARDIA
db THICK_CLUB
db SWORDS_DANCE, EARTHQUAKE, BONEMERANG, BODY_SLAM
dw SWORDS_DANCE, EARTHQUAKE, BONEMERANG, BODY_SLAM
db 60
dw NIDOKING
db NEVERMELTICE
db THUNDERBOLT, ICE_BEAM, EARTHQUAKE, BODY_SLAM
dw THUNDERBOLT, ICE_BEAM, EARTHQUAKE, BODY_SLAM
db 60
dw RHYDON ; RHYPERIOR
db SOFT_SAND
db EARTHQUAKE, ROCK_SLIDE, BODY_SLAM, ROAR
dw EARTHQUAKE, ROCK_SLIDE, BODY_SLAM, ROAR
db -1 ; end
end_list_items
@ -468,27 +492,27 @@ GreenGroup:
db 60
dw HITMONCHAN
db MIRACLEBERRY
db MACH_PUNCH, MIND_READER, DYNAMICPUNCH, PURSUIT
dw MACH_PUNCH, MIND_READER, DYNAMICPUNCH, PURSUIT
db 60
dw JOLTEON
db MINT_BERRY
db THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
dw THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
db 60
dw LAPRAS
db MYSTIC_WATER
db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
dw THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
db 60
dw AERODACTYL
db BURNT_BERRY
db ROCK_HEAD, WING_ATTACK, FIRE_BLAST, EARTHQUAKE
dw ROCK_HEAD, WING_ATTACK, FIRE_BLAST, EARTHQUAKE
db 60
dw GYARADOS
db NO_ITEM ; electric damage-reducing item
db THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
dw THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
db 60
dw VENUSAUR
db MIRACLE_SEED
db GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
dw GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
db -1 ; end
end_list_items
@ -499,22 +523,152 @@ KurtGroup:
db "KURT@", TRAINERTYPE_MOVES
db 50
dw PARASECT
db SPORE, GIGA_DRAIN, SLASH, ROCK_SLASH
dw SPORE, GIGA_DRAIN, SLASH, ROCK_SLASH
db 50
dw SANDSLASH
db SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, BODY_SLAM
dw SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, BODY_SLAM
db 50
dw BELLOSSOM
db SLEEP_POWDER, GROWTH, PETAL_DANCE, SYNTHESIS
dw SLEEP_POWDER, GROWTH, PETAL_DANCE, SYNTHESIS
db 50
dw MUK
db SLUDGE_BOMB, EXPLOSION, FIRE_BLAST, THUNDERBOLT
dw SLUDGE_BOMB, EXPLOSION, FIRE_BLAST, THUNDERBOLT
db 50
dw GRANBULL
db HEAL_BELL, TAKE_DOWN, CURSE, SHADOW_BALL
dw HEAL_BELL, TAKE_DOWN, CURSE, SHADOW_BALL
db 50
dw SLOWBRO
db SURF, PSYCHIC_M, ICE_BEAM, EARTHQUAKE
dw SURF, PSYCHIC_M, ICE_BEAM, EARTHQUAKE
db -1 ; end
end_list_items
ArianaGroup:
next_list_item
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw ARBOK
db 30
dw HONCHKROW
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw HONCHKROW
db 30
dw SNEASEL
db 30
dw JUNGELA
db -1 ; end
end_list_items
ArcherGroup:
next_list_item
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMAR
db 30
dw GOLBAT
db 30
dw HOUNDOOM
db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMORTAR
db 30
dw GOLBAT
db 30
dw WEEZING
db 30
dw HOUNDOOM
db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMORTAR
db 30
dw GOLBAT
db 30
dw WEEZING
db 30
dw PILOSWINE ; MAMOSWINE
db 30
dw HOUNDOOM
db -1 ; end
end_list_items
ProfBlueGroup:
next_list_item
db "BLUE@", TRAINERTYPE_ITEM_MOVES
db 70
dw UMBREON
db LEFTOVERS
dw MEAN_LOOK, BATON_PASS, MOONLIGHT, CURSE
db 70
dw HERACROSS
db BLACKBELT_I
dw ENDURE, REVERSAL, MEGAHORN, FLAIL
db 70
dw TYRANITAR
db HARD_STONE
dw EARTHQUAKE, ROCK_SLASH, PURSUIT, ICE_BEAM
db 70
dw ARCANINE
db MIRACLEBERRY
dw FIRE_BLAST, EXTREMESPEED, BODY_SLAM, CRUNCH
db 70
dw BLASTOISE
db MYSTIC_WATER
dw HYDRO_PUMP, ICE_BEAM, MIRROR_COAT, EARTHQUAKE
db 70
dw ELECTIVIRE
db MAGNET
dw THUNDERBOLT, CROSS_CHOP, EARTHQUAKE, THIEF
db -1 ; end
end_list_items