thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

THE MOVESET AUDIT

Browse source
This commit is contained in:
Misty 2024-08-26 03:00:23 -04:00
parent 1a43922f29
commit 756f9a23de
16 changed files with 2725 additions and 2142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/pokemon/base_stats/bittybat.asm
View file

@ -17,5 +17,5 @@
dn EGG_FLYING, EGG_FLYING ; egg groups dn EGG_FLYING, EGG_FLYING ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
; end ; end

2
data/pokemon/base_stats/bulbasaur.asm
View file

@ -17,5 +17,5 @@
dn EGG_MONSTER, EGG_PLANT ; egg groups dn EGG_MONSTER, EGG_PLANT ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
; end ; end

2
data/pokemon/base_stats/crobat.asm
View file

@ -17,5 +17,5 @@
dn EGG_FLYING, EGG_FLYING ; egg groups dn EGG_FLYING, EGG_FLYING ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY
; end ; end

2
data/pokemon/base_stats/golbat.asm
View file

@ -17,5 +17,5 @@
dn EGG_FLYING, EGG_FLYING ; egg groups dn EGG_FLYING, EGG_FLYING ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
; end ; end

2
data/pokemon/base_stats/grimer.asm
View file

@ -17,5 +17,5 @@
dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, SURF, FLAMETHROWER, THUNDERBOLT
; end ; end

2
data/pokemon/base_stats/ivysaur.asm
View file

@ -17,5 +17,5 @@
dn EGG_MONSTER, EGG_PLANT ; egg groups dn EGG_MONSTER, EGG_PLANT ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
; end ; end

2
data/pokemon/base_stats/mime_jr_.asm
View file

@ -17,5 +17,5 @@
dn EGG_NONE, EGG_NONE ; egg groups dn EGG_NONE, EGG_NONE ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT
; end ; end

2
data/pokemon/base_stats/muk.asm
View file

@ -17,5 +17,5 @@
dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, SURF, FLAMETHROWER, THUNDERBOLT
; end ; end

2
data/pokemon/base_stats/smujj.asm
View file

@ -17,5 +17,5 @@
dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, SURF, FLAMETHROWER, THUNDERBOLT
; end ; end

2
data/pokemon/base_stats/venusaur.asm
View file

@ -17,5 +17,5 @@
dn EGG_MONSTER, EGG_PLANT ; egg groups dn EGG_MONSTER, EGG_PLANT ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH
; end ; end

2
data/pokemon/base_stats/zubat.asm
View file

@ -17,5 +17,5 @@
dn EGG_FLYING, EGG_FLYING ; egg groups dn EGG_FLYING, EGG_FLYING ; egg groups
; tm/hm learnset ; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING
; end ; end

7
data/pokemon/egg_moves_johto.asm
View file

@ -261,6 +261,7 @@ SpinarakEggMoves:
dw SONICBOOM dw SONICBOOM
dw BATON_PASS dw BATON_PASS
dw PURSUIT dw PURSUIT
dw PIN_MISSILE
dw -1 ; end dw -1 ; end
ChinchouEggMoves: ChinchouEggMoves:
@ -394,6 +395,8 @@ YanmaEggMoves:
dw WHIRLWIND dw WHIRLWIND
dw REVERSAL dw REVERSAL
dw LEECH_LIFE dw LEECH_LIFE
dw CONFUSION
dw FLAIL
dw -1 ; end dw -1 ; end
WooperEggMoves: WooperEggMoves:
@ -481,6 +484,10 @@ QwilfishEggMoves:
ShuckleEggMoves: ShuckleEggMoves:
dw SWEET_SCENT dw SWEET_SCENT
dw MIST
dw MUD_SLAP
dw STRING_SHOT
dw ANCIENTPOWER
dw -1 ; end dw -1 ; end
HeracrossEggMoves: HeracrossEggMoves:

1
data/pokemon/egg_moves_kanto.asm
View file

@ -408,6 +408,7 @@ MachopEggMoves:
dw MEDITATE dw MEDITATE
dw ROLLING_KICK dw ROLLING_KICK
dw ENCORE dw ENCORE
dw BARRIER
dw -1 ; end dw -1 ; end
BellsproutEggMoves: BellsproutEggMoves:

2331
data/pokemon/evos_attacks_johto.asm
View file

File diff suppressed because it is too large Load diff

2415
data/pokemon/evos_attacks_kanto.asm
View file

File diff suppressed because it is too large Load diff

85
engine/pokemon/evolve.asm
View file

@ -291,7 +291,7 @@ EvolveAfterBattle_MasterLoop:
ld [wTempSpecies], a ld [wTempSpecies], a
xor a xor a
ld [wMonType], a ld [wMonType], a
call LearnEvolutionMove ; call LearnEvolutionMove
call LearnLevelMoves call LearnLevelMoves
ld a, [wTempSpecies] ld a, [wTempSpecies]
call SetSeenAndCaughtMon call SetSeenAndCaughtMon
@ -357,49 +357,50 @@ EvolveAfterBattle_MasterLoop:
; BUG: Does not take in the designated move correctly, resulting in strange behaviour usually seen when GetMoveIDFromIndex takes an 8-bit index. ; BUG: Does not take in the designated move correctly, resulting in strange behaviour usually seen when GetMoveIDFromIndex takes an 8-bit index.
; Comments proceeding ; Comments proceeding
LearnEvolutionMove: ; LearnEvolutionMove:
ld a, [wTempSpecies] ; ld a, [wTempSpecies]
ld [wCurPartySpecies], a ; ld [wCurPartySpecies], a
call GetPokemonIndexFromID ; call GetPokemonIndexFromID
ld b, h ; ld b, h
ld c, l ; ld c, l
ld hl, EvolutionMoves ; ld hl, EvolutionMoves
add hl, bc ; add hl, bc
add hl, bc ; add hl, bc
dec hl ; dec hl
dec hl ; dec hl
ld a, [hli] ; ld a, [hli]
ld h, [hl] ; ld h, [hl]
ld l, a ; Moves through the table by going up according to the Pokemon's ID, storing the equivalent move in hl. This is fine. ; ld l, a ; Moves through the table by going up according to the Pokemon's ID, storing the equivalent move in hl. This is fine.
or h ; hl == 0? ; or h ; hl == 0?
ret z ; ret z
call GetMoveIDFromIndex ; grabs what's in hl (the move) and converts it to 8-bit...or something like that. anyway, it should return in register a. ; call GetMoveIDFromIndex ; grabs what's in hl (the move) and converts it to 8-bit...or something like that. anyway, it should return in register a.
push hl ; I don't actually know why it does this. Removing it produces manmade horrors beyond my comprehension, so it isn't part of the current problem. ; push hl ; I don't actually know why it does this. Removing it produces manmade horrors beyond my comprehension, so it isn't part of the current problem.
ld d, a ; preserve a ; ld d, a ; preserve a
ld hl, wPartyMon1Moves ; ld hl, wPartyMon1Moves
ld a, [wCurPartyMon] ; ld a, [wCurPartyMon]
ld bc, PARTYMON_STRUCT_LENGTH ; ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes ; call AddNTimes
ld b, NUM_MOVES ; ld b, NUM_MOVES
.check_move ; .check_move
ld a, [hli] ; ld a, [hli]
cp d ; use preserved a to check if a move is there ; cp d ; use preserved a to check if a move is there
jr z, .has_move ; jr z, .has_move
dec b ; dec b
jr nz, .check_move ; jr nz, .check_move
ld a, d ; take the preserved a and reload ; ld a, d ; take the preserved a and reload
ld [wPutativeTMHMMove], a ; proceed to learn the move with adequate preprep ; ld [wPutativeTMHMMove], a ; proceed to learn the move with adequate preprep
ld [wNamedObjectIndex], a ; ld [wNamedObjectIndex], a
call GetMoveName ; call GetMoveName
call CopyName1 ; call CopyName1
predef LearnMove ; predef LearnMove
ld a, [wCurPartySpecies] ; ld a, [wCurPartySpecies]
ld [wTempSpecies], a ; ld [wTempSpecies], a
.has_move ; .has_move
pop hl ; pop hl
ret ; ret
; so wtf is going on ; so wtf is going on
UpdateSpeciesNameIfNotNicknamed: UpdateSpeciesNameIfNotNicknamed:
ld a, [wCurSpecies] ld a, [wCurSpecies]
push af push af