mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack
This commit is contained in:
commit
149d9d6f4b
|
@ -148,6 +148,7 @@
|
|||
const DEX_WEEZING ; 110
|
||||
const DEX_RHYHORN ; 111
|
||||
const DEX_RHYDON ; 112
|
||||
const DEX_RHYPERIOR
|
||||
const DEX_CHANSEY ; 113
|
||||
const DEX_MONJA
|
||||
const DEX_TANGELA ; 114
|
||||
|
|
|
@ -144,6 +144,7 @@ INCLUDE "data/pokemon/base_stats/koffing.asm"
|
|||
INCLUDE "data/pokemon/base_stats/weezing.asm"
|
||||
INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
|
||||
INCLUDE "data/pokemon/base_stats/rhydon.asm"
|
||||
INCLUDE "data/pokemon/base_stats/rhyperior.asm"
|
||||
INCLUDE "data/pokemon/base_stats/chansey.asm"
|
||||
INCLUDE "data/pokemon/base_stats/monja.asm"
|
||||
INCLUDE "data/pokemon/base_stats/tangela.asm"
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
db DEX_RHYDON ; pokedex id
|
||||
db DEX_RHYPERIOR ; pokedex id
|
||||
|
||||
db 115, 140, 130, 50, 55
|
||||
; hp atk def spd spc
|
||||
|
||||
db GROUND, ROCK ; type
|
||||
db 60 ; catch rate
|
||||
db 204 ; base exp
|
||||
db 30 ; catch rate
|
||||
db 217 ; base exp
|
||||
|
||||
INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions
|
||||
dw RhydonPicFront, RhydonPicBack
|
||||
INCBIN "gfx/pokemon/front/rhyperior.pic", 0, 1 ; sprite dimensions
|
||||
dw RhyperiorPicFront, RhyperiorPicBack
|
||||
|
||||
db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset
|
||||
db GROWTH_SLOW ; growth rate
|
||||
|
@ -23,5 +23,5 @@
|
|||
SURF, STRENGTH
|
||||
; end
|
||||
|
||||
db BANK(RhydonPicFront)
|
||||
assert BANK(RhydonPicFront) == BANK(RhydonPicBack)
|
||||
db BANK(RhyperiorPicFront)
|
||||
assert BANK(RhyperiorPicFront) == BANK(RhyperiorPicBack)
|
||||
|
|
|
@ -212,7 +212,8 @@ EvosMovesPointerTable:
|
|||
|
||||
RhydonEvosMoves:
|
||||
; Evolutions
|
||||
db EV_TRADE, 1, RHYPERIOR
|
||||
db EV_ITEM, MOON_STONE, 1, RHYPERIOR ; Protector isn't added yet ~M
|
||||
db 0
|
||||
; Learnset
|
||||
db 30, STOMP
|
||||
db 35, TAIL_WHIP
|
||||
|
|
|
@ -144,6 +144,7 @@ MonPartyData:
|
|||
nybble ICON_MON ; Weezing
|
||||
nybble ICON_QUADRUPED ; Rhyhorn
|
||||
nybble ICON_MON ; Rhydon
|
||||
nybble ICON_MON ; Rhyperior
|
||||
nybble ICON_FAIRY ; Chansey
|
||||
nybble ICON_GRASS ; Monja
|
||||
nybble ICON_GRASS ; Tangela
|
||||
|
|
|
@ -145,6 +145,7 @@ MonsterPalettes:
|
|||
db PAL_PURPLEMON ; WEEZING
|
||||
db PAL_GREYMON ; RHYHORN
|
||||
db PAL_GREYMON ; RHYDON
|
||||
db PAL_BROWNMON ; RHYPERIOR
|
||||
db PAL_PINKMON ; CHANSEY
|
||||
db PAL_BLUEMON ; MONJA
|
||||
db PAL_BLUEMON ; TANGELA
|
||||
|
|
|
@ -129,7 +129,7 @@ IF DEF(_DEBUG)
|
|||
ret
|
||||
|
||||
DebugSetPokedexEntries:
|
||||
ld b, wPokedexOwnedEnd - wPokedexOwned - 1
|
||||
ld b, wPokedexOwnedEnd - wPokedexOwned
|
||||
ld a, %11111111
|
||||
.loop
|
||||
ld [hli], a
|
||||
|
|
|
@ -467,6 +467,8 @@ BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic"
|
|||
BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic"
|
||||
ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic"
|
||||
ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic"
|
||||
RhyperiorPicFront:: INCBIN "gfx/pokemon/front/rhyperior.pic"
|
||||
RhyperiorPicBack:: INCBIN "gfx/pokemon/back/rhyperiorb.pic"
|
||||
|
||||
FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic"
|
||||
FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"
|
||||
|
|
BIN
gfx/pokemon/back/rhyperiorb.png
Normal file
BIN
gfx/pokemon/back/rhyperiorb.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 563 B |
BIN
gfx/pokemon/front/rhyperior.png
Normal file
BIN
gfx/pokemon/front/rhyperior.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 831 B |
Loading…
Reference in a new issue