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

Finished adding Rhyperior

Browse source
This commit is contained in:
MementoMartha 2022-09-01 10:16:49 +01:00
parent 1893b4c7cf
commit 20b6899169
14 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/pokedex_constants.asm
View file

@ -148,6 +148,7 @@
const DEX_WEEZING ; 110 const DEX_WEEZING ; 110
const DEX_RHYHORN ; 111 const DEX_RHYHORN ; 111
const DEX_RHYDON ; 112 const DEX_RHYDON ; 112
const DEX_RHYPERIOR
const DEX_CHANSEY ; 113 const DEX_CHANSEY ; 113
const DEX_MONJA const DEX_MONJA
const DEX_TANGELA ; 114 const DEX_TANGELA ; 114
@ -200,6 +201,5 @@
const DEX_DRAGONITE ; 149 const DEX_DRAGONITE ; 149
const DEX_MEWTWO ; 150 const DEX_MEWTWO ; 150
const DEX_MEW ; 151 const DEX_MEW ; 151
const DEX_RHYPERIOR
DEF NUM_POKEMON EQU const_value - 1 DEF NUM_POKEMON EQU const_value - 1

2
constants/pokemon_constants.asm
View file

@ -206,7 +206,7 @@
const BETOBEBII ; $C5 (new) const BETOBEBII ; $C5 (new)
const BELLOSSOM ; $C6 (new) const BELLOSSOM ; $C6 (new)
const SCIZOR ; $C7 (new) const SCIZOR ; $C7 (new)
const RHYPERIOR ; $C8 (test) const RHYPERIOR ; $C8
DEF NUM_POKEMON_INDEXES EQU const_value - 1 DEF NUM_POKEMON_INDEXES EQU const_value - 1

2
data/pokemon/base_stats.asm
View file

@ -144,6 +144,7 @@ INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm"
INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm"
INCLUDE "data/pokemon/base_stats/rhydon.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/chansey.asm"
INCLUDE "data/pokemon/base_stats/monja.asm" INCLUDE "data/pokemon/base_stats/monja.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm" INCLUDE "data/pokemon/base_stats/tangela.asm"
@ -196,5 +197,4 @@ INCLUDE "data/pokemon/base_stats/dragonair.asm"
INCLUDE "data/pokemon/base_stats/dragonite.asm" INCLUDE "data/pokemon/base_stats/dragonite.asm"
INCLUDE "data/pokemon/base_stats/mewtwo.asm" INCLUDE "data/pokemon/base_stats/mewtwo.asm"
INCLUDE "data/pokemon/base_stats/mew.asm" INCLUDE "data/pokemon/base_stats/mew.asm"
INCLUDE "data/pokemon/base_stats/rhyperior.asm"
assert_table_length NUM_POKEMON assert_table_length NUM_POKEMON

14
data/pokemon/base_stats/rhyperior.asm
View file

@ -1,14 +1,14 @@
db DEX_RHYDON ; pokedex id db DEX_RHYPERIOR ; pokedex id
db 115, 140, 130, 50, 55 db 115, 140, 130, 50, 55
; hp atk def spd spc ; hp atk def spd spc
db GROUND, ROCK ; type db GROUND, ROCK ; type
db 60 ; catch rate db 30 ; catch rate
db 204 ; base exp db 217 ; base exp
INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/rhyperior.pic", 0, 1 ; sprite dimensions
dw RhydonPicFront, RhydonPicBack dw RhyperiorPicFront, RhyperiorPicBack
db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset
db GROWTH_SLOW ; growth rate db GROWTH_SLOW ; growth rate
@ -23,5 +23,5 @@
SURF, STRENGTH SURF, STRENGTH
; end ; end
db BANK(RhydonPicFront) db BANK(RhyperiorPicFront)
assert BANK(RhydonPicFront) == BANK(RhydonPicBack) assert BANK(RhyperiorPicFront) == BANK(RhyperiorPicBack)

2
data/pokemon/cries.asm
View file

@ -205,5 +205,5 @@ CryData::
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished) mon_cry SFX_CRY_00, $00, $00 ; Bellossom (unfinished)
mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished) mon_cry SFX_CRY_00, $00, $00 ; Scizor (unfinished)
mon_cry SFX_CRY_00, $00, $00 ; Rhyperior (test) mon_cry SFX_CRY_03, $0D, $FF ; Rhyperior
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES

6
data/pokemon/dex_entries.asm
View file

@ -1552,9 +1552,9 @@ ScizorDexEntry:
text_end text_end
RhyperiorDexEntry: RhyperiorDexEntry:
db "TEST@" db "DRILL@"
db 5,11 db 7,10
dw 5000 dw 6240
text_far _RhyperiorDexEntry text_far _RhyperiorDexEntry
text_end text_end

1
data/pokemon/evos_moves.asm
View file

@ -207,6 +207,7 @@ EvosMovesPointerTable:
RhydonEvosMoves: RhydonEvosMoves:
; Evolutions ; Evolutions
db EV_ITEM, MOON_STONE, 1, RHYPERIOR ; Protector isn't added yet ~M
db 0 db 0
; Learnset ; Learnset
db 30, STOMP db 30, STOMP

2
data/pokemon/menu_icons.asm
View file

@ -144,6 +144,7 @@ MonPartyData:
nybble ICON_MON ; Weezing nybble ICON_MON ; Weezing
nybble ICON_QUADRUPED ; Rhyhorn nybble ICON_QUADRUPED ; Rhyhorn
nybble ICON_MON ; Rhydon nybble ICON_MON ; Rhydon
nybble ICON_MON ; Rhyperior
nybble ICON_FAIRY ; Chansey nybble ICON_FAIRY ; Chansey
nybble ICON_GRASS ; Monja nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela nybble ICON_GRASS ; Tangela
@ -196,5 +197,4 @@ MonPartyData:
nybble ICON_SNAKE ; Dragonite nybble ICON_SNAKE ; Dragonite
nybble ICON_MON ; Mewtwo nybble ICON_MON ; Mewtwo
nybble ICON_MON ; Mew nybble ICON_MON ; Mew
nybble ICON_MON ; Rhyperior
end_nybble_array NUM_POKEMON end_nybble_array NUM_POKEMON

12
data/pokemon/new_dex_text.asm
View file

@ -449,13 +449,13 @@ _BellossomDexEntry::
dex dex
_RhyperiorDexEntry:: _RhyperiorDexEntry::
text "This is a newly" text "It launches rocks"
next "discovered" next "from the holes"
next "#MON. It is" next "in its palms."
page "currently under" page "On rare occasions,"
next "investigation. No" next "it can even fire"
next "info is available" next "out GEODUDE"
dex dex
_MissingNoDexEntry:: _MissingNoDexEntry::

2
data/pokemon/palettes.asm
View file

@ -145,6 +145,7 @@ MonsterPalettes:
db PAL_PURPLEMON ; WEEZING db PAL_PURPLEMON ; WEEZING
db PAL_GREYMON ; RHYHORN db PAL_GREYMON ; RHYHORN
db PAL_GREYMON ; RHYDON db PAL_GREYMON ; RHYDON
db PAL_BROWNMON ; RHYPERIOR
db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; CHANSEY
db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA db PAL_BLUEMON ; TANGELA
@ -197,5 +198,4 @@ MonsterPalettes:
db PAL_BROWNMON ; DRAGONITE db PAL_BROWNMON ; DRAGONITE
db PAL_MEWMON ; MEWTWO db PAL_MEWMON ; MEWTWO
db PAL_MEWMON ; MEW db PAL_MEWMON ; MEW
db PAL_GREYMON ; RHYPERIOR
assert_table_length NUM_POKEMON + 1 assert_table_length NUM_POKEMON + 1

2
engine/debug/debug_party.asm
View file

@ -129,7 +129,7 @@ IF DEF(_DEBUG)
ret ret
DebugSetPokedexEntries: DebugSetPokedexEntries:
ld b, wPokedexOwnedEnd - wPokedexOwned - 1 ld b, wPokedexOwnedEnd - wPokedexOwned
ld a, %11111111 ld a, %11111111
.loop .loop
ld [hli], a ld [hli], a

2
gfx/pics.asm
View file

@ -467,6 +467,8 @@ BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic"
BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic" BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic"
ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic"
ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.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" FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic"
FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic"

BIN
gfx/pokemon/back/rhyperiorb.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 563 B

BIN
gfx/pokemon/front/rhyperior.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 831 B