thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-11 07:44:47 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/plaguevonkarma/kep-hack

Browse source
This commit is contained in:
emaskyesmogon 2022-10-01 13:02:15 -06:00
parent ec4f56c735 8ff7b19ead
commit 4a5d936e1b
12 changed files with 80 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/pokedex_constants.asm
View file

@ -115,12 +115,12 @@
; const DEX_SIRFETCHD
const DEX_BLASTYKE
const DEX_BLASTOISE
; const DEX_HINAAZU
const DEX_HINAAZU
const DEX_DODUO ; 84
const DEX_DODRIO ; 85
const DEX_SEEL ; 86
const DEX_DEWGONG ; 87
; const DEX_BETOBEBII
const DEX_BETOBEBII
const DEX_GRIMER ; 88
const DEX_MUK ; 89
const DEX_SHELLDER ; 90

4
constants/pokemon_constants.asm
View file

@ -223,8 +223,8 @@
const ELECTIVIRE ; $D6
const MAGMORTAR ; $D7
const PARA ; $D8
; const HINAAZU ; $D9
; const BETOBEBII ; $DA
const HINAAZU ; $D9
const BETOBEBII ; $DA
; const MAGNEZONE ; $DB
; const PORYGONZ ; $DC
; const PERRSERKER ; $DD

2
data/pokemon/base_stats.asm
View file

@ -108,10 +108,12 @@ INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/madaamu.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/hinaazu.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"
INCLUDE "data/pokemon/base_stats/dewgong.asm"
INCLUDE "data/pokemon/base_stats/betobebii.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm"
INCLUDE "data/pokemon/base_stats/muk.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"

4
data/pokemon/cries.asm
View file

@ -222,8 +222,8 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Electivire
mon_cry SFX_CRY_00, $00, $00 ; Magmortar
mon_cry SFX_CRY_1E, $79, $40 ; Para
; mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
; mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
mon_cry SFX_CRY_00, $00, $00 ; Hinaazu
mon_cry SFX_CRY_05, $FF, $40 ; Betobebii
; mon_cry SFX_CRY_00, $00, $00 ; Magnezone
; mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
; mon_cry SFX_CRY_00, $00, $00 ; Perrserker

18
data/pokemon/dex_entries.asm
View file

@ -216,6 +216,8 @@ PokedexEntryPointers:
dw ElectivireDexEntry
dw MagmortarDexEntry
dw ParaDexEntry
dw HinaazuDexEntry
dw BetobebiiDexEntry
assert_table_length NUM_POKEMON_INDEXES
; string: species name
@ -1719,4 +1721,18 @@ ParaDexEntry:
db 0,8
dw 40
text_far _ParaDexEntry
text_end
text_end
BetobebiiDexEntry:
db "SLUDGE@"
db 1,0
dw 200
text_far _BetobebiiDexEntry
text_end
HinaazuDexEntry:
db "BIRD NEST@"
db 1,4
dw 200
text_far _HinaazuDexEntry
text_end

2
data/pokemon/dex_order.asm
View file

@ -216,4 +216,6 @@ PokedexOrder:
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_PARA
db DEX_HINAAZU
db DEX_BETOBEBII
assert_table_length NUM_POKEMON_INDEXES

29
data/pokemon/evos_moves.asm
View file

@ -219,6 +219,8 @@ EvosMovesPointerTable:
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw ParaEvosMoves
dw HinaazuEvosMoves
dw BetobebiiEvosMoves
assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves:
@ -2773,4 +2775,31 @@ ParaEvosMoves:
db 21, SPORE
db 25, GROWTH
db 29, SLASH
db 0
HinaazuEvosMoves:
; Evolutions
db EV_LEVEL, 18, DODUO
db 0
; Learnset
db 5, QUICK_ATTACK
db 11, FURY_ATTACK
db 20, DRILL_PECK
db 23, RAGE
db 27, TRI_ATTACK
db 32, AGILITY
db 0
BetobebiiEvosMoves:
; Evolutions
db EV_LEVEL, 20, GRIMER
db 0
; Learnset
db 13, POISON_GAS
db 16, ACID
db 19, MINIMIZE
db 22, SLUDGE
db 28, HARDEN
db 33, SCREECH
db 37, ACID_ARMOR
db 0

2
data/pokemon/menu_icons.asm
View file

@ -108,10 +108,12 @@ MonPartyData:
nybble ICON_BIRD ; Madaamu
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_BIRD ; Hinaazu
nybble ICON_BIRD ; Doduo
nybble ICON_BIRD ; Dodrio
nybble ICON_WATER ; Seel
nybble ICON_WATER ; Dewgong
nybble ICON_MON ; Betobebii
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
nybble ICON_HELIX ; Shellder

2
data/pokemon/names.asm
View file

@ -216,5 +216,7 @@ MonsterNames::
db "ELECTIVIRE"
db "MAGMORTAR@"
db "PARA@@@@@@"
db "HINAAZU@@@"
db "BETOBEBII@"
assert_table_length NUM_POKEMON_INDEXES

24
data/pokemon/new_dex_text.asm
View file

@ -399,13 +399,13 @@ _ParaDexEntry::
dex
_HinaazuDexEntry::
text "This is a newly"
next "discovered"
next "#MON. It is"
text "One of the three"
next "heads is withdrawn"
next "upon evolution."
page "currently under"
next "investigation. No"
next "info is available"
page "It grows back in"
next "as the angriest"
next "head of DODRIO"
dex
_PudiDexEntry::
@ -419,13 +419,13 @@ _PudiDexEntry::
dex
_BetobebiiDexEntry::
text "This is a newly"
next "discovered"
next "#MON. It is"
text "Though it has a"
next "cute appearance,"
next "it constantly"
page "currently under"
next "investigation. No"
next "info is available"
page "emits an foul"
next "odor that deters"
next "anyone around it"
dex
_ScizorDexEntry::

2
data/pokemon/palettes.asm
View file

@ -109,10 +109,12 @@ MonsterPalettes:
db PAL_BROWNMON ; MADAAMU
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_BROWNMON ; HINAAZU
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_BLUEMON ; SEEL
db PAL_BLUEMON ; DEWGONG
db PAL_PURPLEMON ; HINAAZU
db PAL_PURPLEMON ; GRIMER
db PAL_PURPLEMON ; MUK
db PAL_PURPLEMON ; SHELLDER

8
gfx/pics.asm
View file

@ -506,5 +506,9 @@ ElectivirePicFront:: INCBIN "gfx/pokemon/front/electivire.pic"
ElectivirePicBack:: INCBIN "gfx/pokemon/back/electivireb.pic"
MagmortarPicFront:: INCBIN "gfx/pokemon/front/magmortar.pic"
MagmortarPicBack:: INCBIN "gfx/pokemon/back/magmortarb.pic"
ParaPicFront:: INCBIN "gfx/pokemon/front/para.pic"
ParaPicBack:: INCBIN "gfx/pokemon/back/parab.pic"
ParaPicFront:: INCBIN "gfx/pokemon/front/para.pic"
ParaPicBack:: INCBIN "gfx/pokemon/back/parab.pic"
HinaazuPicFront:: INCBIN "gfx/pokemon/front/hinaazu.pic"
HinaazuPicBack:: INCBIN "gfx/pokemon/back/hinaazub.pic"
BetobebiiPicFront:: INCBIN "gfx/pokemon/front/betobebii.pic"
BetobebiiPicBack:: INCBIN "gfx/pokemon/back/betobebiib.pic"