thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dugtrio-A and Ninetales-A!

Browse source
This commit is contained in:
MementoMartha 2023-04-08 14:59:04 +01:00
parent 8b95d592ec
commit 4baf396498
18 changed files with 127 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/pokemon/base_stats.asm
View file

@ -71,7 +71,7 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
INCLUDE "data/pokemon/base_stats/mikon.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
INCLUDE "data/pokemon/base_stats/ninetales.asm"
; INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
INCLUDE "data/pokemon/base_stats/pudi.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
@ -114,7 +114,7 @@ INCLUDE "data/pokemon/base_stats/kadabra.asm"
INCLUDE "data/pokemon/base_stats/alakazam.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
INCLUDE "data/pokemon/base_stats/dugtrio.asm"
; INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
INCLUDE "data/pokemon/base_stats/dugtrioa.asm"
INCLUDE "data/pokemon/base_stats/wiglett.asm"
INCLUDE "data/pokemon/base_stats/wugtrio.asm"
INCLUDE "data/pokemon/base_stats/onix.asm"

8
data/pokemon/base_stats/ninetalesa.asm
View file

@ -14,10 +14,10 @@
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \
BIDE, BLIZZARD, SWIFT, SKULL_BASH, REST, \
SUBSTITUTE, ICE_BEAM
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, \
BLIZZARD, HYPER_BEAM, RAGE, DIG, MIMIC, \
DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKULL_BASH, \
REST, SUBSTITUTE
; end
db BANK(NinetalesAPicFront)

4
data/pokemon/cries.asm
View file

@ -243,8 +243,8 @@ CryData::
mon_cry SFX_CRY_22, $20, $FF ; Raticate-A
mon_cry SFX_CRY_09, $EE, $08 ; Raichu-A
mon_cry SFX_CRY_00, $FF, $FF ; Sandslash-A
; mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
; mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
mon_cry SFX_CRY_24, $88, $60 ; Ninetales-A
mon_cry SFX_CRY_0B, $2A, $10 ; Dugtrio-A
mon_cry SFX_CRY_19, $99, $FF ; Persian-A
mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G

16
data/pokemon/dex_entries.asm
View file

@ -237,6 +237,8 @@ PokedexEntryPointers:
dw RaticateADexEntry
dw RaichuADexEntry
dw SandslashADexEntry
dw NinetalesADexEntry
dw DugtrioADexEntry
dw PersianADexEntry
dw GolemADexEntry
dw RapidashGDexEntry
@ -1898,6 +1900,20 @@ SandslashADexEntry:
text_far _SandslashADexEntry
text_end
NinetalesADexEntry:
db "FOX@"
db 3,7
dw 440
text_far _NinetalesADexEntry
text_end
DugtrioADexEntry:
db "MOLE@"
db 2,4
dw 1470
text_far _DugtrioADexEntry
text_end
PersianADexEntry:
db "CLASSY CAT@"
db 3,7

2
data/pokemon/dex_order.asm
View file

@ -237,6 +237,8 @@ PokedexOrder:
db DEX_RATICATE_A
db DEX_RAICHU_A
db DEX_SANDSLASH_A
db DEX_NINETALES_A
db DEX_DUGTRIO_A
db DEX_PERSIAN_A
db DEX_GOLEM_A
db DEX_RAPIDASH_G

56
data/pokemon/evos_moves.asm
View file

@ -99,7 +99,6 @@ EvosMovesPointerTable:
dw MikonEvosMoves
dw VulpixEvosMoves
dw NinetalesEvosMoves
;dw NinetalesAEvosMoves
dw PikachuEvosMoves
dw RaichuEvosMoves
dw RibbitoEvosMoves
@ -135,7 +134,6 @@ EvosMovesPointerTable:
dw DodrioEvosMoves
dw PrimeapeEvosMoves
dw DugtrioEvosMoves
;DugtrioAEvosMoves
dw VenomothEvosMoves
dw DewgongEvosMoves
dw PurakkusuEvosMoves
@ -258,6 +256,8 @@ EvosMovesPointerTable:
dw RaticateAEvosMoves
dw RaichuAEvosMoves
dw SandslashAEvosMoves
dw NinetalesAEvosMoves
dw DugtrioAEvosMoves
dw PersianAEvosMoves
dw GolemAEvosMoves
dw RapidashGEvosMoves
@ -1311,20 +1311,6 @@ NinetalesEvosMoves:
; Learnset
db 0
;NinetalesAEvosMoves: ; vulpix-alola learnset
; Evolutions
; db 0
; Learnset
; db 7, ROAR
; db 12, CONFUSE_RAY
; db 23, FEINT_ATTACK
; db 28, AURORA_BEAM
; db 36, ICE_BEAM
; db 38, DAZZLE_GLEAM
; db 42, BLIZZARD
; db 46, CHARM
; db 0
PikachuEvosMoves:
; Evolutions
db EV_ITEM, THUNDER_STONE, 1, RAICHU
@ -1740,18 +1726,6 @@ DugtrioEvosMoves:
db 47, EARTHQUAKE
db 0
;DugtrioAEvosMoves:
; Evolutions
; db 0
; Learnset
; db 6, GROWL
; db 20, SLASH
; db 31, DIG
; db 35, IRON_HEAD
; db 39, EARTHQUAKE
; db 43, FISSURE
; db 0
VenomothEvosMoves:
; Evolutions
db 0
@ -3193,6 +3167,32 @@ SandslashAEvosMoves:
db 45, BLIZZARD
db 0
NinetalesAEvosMoves: ; vulpix-alola learnset
; Evolutions
db 0
; Learnset
db 7, ROAR
db 12, CONFUSE_RAY
db 23, FEINT_ATTACK
db 28, AURORA_BEAM
db 36, ICE_BEAM
db 38, DAZZLE_GLEAM
db 42, BLIZZARD
db 46, CHARM
db 0
DugtrioAEvosMoves:
; Evolutions
db 0
; Learnset
db 6, GROWL
db 20, SLASH
db 31, DIG
db 35, IRON_HEAD
db 39, EARTHQUAKE
db 43, FISSURE
db 0
PersianAEvosMoves:
; Evolutions
db 0

4
data/pokemon/menu_icons.asm
View file

@ -71,7 +71,7 @@ MonPartyData:
nybble ICON_QUADRUPED ; Mikon
nybble ICON_QUADRUPED ; Vulpix
nybble ICON_QUADRUPED ; Ninetales
; nybble ICON_QUADRUPED ; Ninetales-A
nybble ICON_QUADRUPED ; Ninetales-A
nybble ICON_QUADRUPED ; Pudi
nybble ICON_QUADRUPED ; Growlithe
nybble ICON_QUADRUPED ; Arcanine
@ -114,7 +114,7 @@ MonPartyData:
nybble ICON_MON ; Alakazam
nybble ICON_MON ; Diglett
nybble ICON_MON ; Dugtrio
; nybble ICON_MON ; Dugtrio-A
nybble ICON_MON ; Dugtrio-A
nybble ICON_WATER ; Wiglett
nybble ICON_WATER ; Wugtrio
nybble ICON_SNAKE ; Onix

4
data/pokemon/names.asm
View file

@ -87,7 +87,6 @@ MonsterNames::
db "MIKON@@@@@"
db "VULPIX@@@@"
db "NINETALES@"
; db "NINETALESA"
db "PIKACHU@@@"
db "RAICHU@@@@"
db "RIBBITO@@@"
@ -123,7 +122,6 @@ MonsterNames::
db "DODRIO@@@@"
db "PRIMEAPE@@"
db "DUGTRIO@@@"
; db "DUGTRIO-A@"
db "VENOMOTH@@"
db "DEWGONG@@@"
db "PURAKKUSU@"
@ -246,6 +244,8 @@ MonsterNames::
db "RATICATE-A"
db "RAICHU-A@@"
db "SANDSLASHA"
db "NINETALESA"
db "DUGTRIO-A@"
db "PERSIAN-A@"
db "GOLEM-A@@@"
db "RAPIDASH-G"

32
data/pokemon/new_dex_text.asm
View file

@ -858,25 +858,25 @@ _SandslashADexEntry::
next "frostbite"
dex
;_NinetalesADexEntry::
; text "Once thought to"
; next "be a deity, it"
; next "appears to lost"
_NinetalesADexEntry::
text "Once thought to"
next "be a deity, it"
next "appears to lost"
; page "mountain climbers"
; next "to guide them away"
; next "from its home"
; dex
page "mountain climbers"
next "to guide them away"
next "from its home"
dex
;_DugtrioADexEntry::
; text "DUGTRIO's hair"
; next "and whiskers are"
; next "made of metal."
_DugtrioADexEntry:: ; revised to add more info
text "The metal whiskers"
next "on its heads help"
next "protect it from"
; page "They provide it"
; next "with protection"
; next "from attacks"
; dex
page "attacks, and can"
next "sense sounds from"
next "many miles away"
dex
_PersianADexEntry::
text "Its round face"

4
data/pokemon/palettes.asm
View file

@ -72,7 +72,7 @@ MonsterPalettes:
db PAL_REDMON ; MIKON
db PAL_REDMON ; VULPIX
db PAL_YELLOWMON ; NINETALES
; db PAL_CYANMON ; NINETALES_A
db PAL_CYANMON ; NINETALES_A
db PAL_REDMON ; PUDI
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
@ -115,7 +115,7 @@ MonsterPalettes:
db PAL_YELLOWMON ; ALAKAZAM
db PAL_BROWNMON ; DIGLETT
db PAL_BROWNMON ; DUGTRIO
; db PAL_BROWNMON ; DUGTRIO_A
db PAL_BROWNMON ; DUGTRIO_A
db PAL_PINKMON ; WIGLETT
db PAL_PINKMON ; WUGTRIO
db PAL_GREYMON ; ONIX