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

6 more Pokemon!

Browse source 
Animon, Bellossom, Porygon2, Kingdra, Politoed and Slowking have been added fully.
This commit is contained in:
MementoMartha 2022-09-29 13:54:40 +01:00
parent 12495439ea
commit fece27f7c2
19 changed files with 264 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -39,7 +39,7 @@ New areas
QoL Enhancements QoL Enhancements
==== ====
- All 204 (current) Pokemon can be obtained without the use of trading or glitches. - All 210 (current) Pokemon can be obtained without the use of trading or glitches.
- This includes Mew! - This includes Mew!
- Fast text has no frame delay between text scrolling, doubling the scroll speed. It's also been made the default option, so you don't need to go into the Options menu for it. - Fast text has no frame delay between text scrolling, doubling the scroll speed. It's also been made the default option, so you don't need to go into the Options menu for it.
- Trainer DVs are perfect-15s. - Trainer DVs are perfect-15s.

6
constants/pokedex_constants.asm
View file

@ -54,6 +54,7 @@
const DEX_ODDISH ; 43 const DEX_ODDISH ; 43
const DEX_GLOOM ; 44 const DEX_GLOOM ; 44
const DEX_VILEPLUME ; 45 const DEX_VILEPLUME ; 45
const DEX_BELLOSSOM
const DEX_PARAS ; 46 const DEX_PARAS ; 46
const DEX_PARASECT ; 47 const DEX_PARASECT ; 47
const DEX_VENONAT ; 48 const DEX_VENONAT ; 48
@ -78,6 +79,7 @@
const DEX_POLIWAG ; 60 const DEX_POLIWAG ; 60
const DEX_POLIWHIRL ; 61 const DEX_POLIWHIRL ; 61
const DEX_POLIWRATH ; 62 const DEX_POLIWRATH ; 62
const DEX_POLITOED
const DEX_ABRA ; 63 const DEX_ABRA ; 63
const DEX_KADABRA ; 64 const DEX_KADABRA ; 64
const DEX_ALAKAZAM ; 65 const DEX_ALAKAZAM ; 65
@ -100,6 +102,7 @@
const DEX_RAPIDASH ; 78 const DEX_RAPIDASH ; 78
const DEX_SLOWPOKE ; 79 const DEX_SLOWPOKE ; 79
const DEX_SLOWBRO ; 80 const DEX_SLOWBRO ; 80
const DEX_SLOWKING
const DEX_MAGNEMITE ; 81 const DEX_MAGNEMITE ; 81
const DEX_MAGNETITE const DEX_MAGNETITE
const DEX_MAGNETON ; 82 const DEX_MAGNETON ; 82
@ -159,6 +162,7 @@
const DEX_OMEGA const DEX_OMEGA
const DEX_HORSEA ; 116 const DEX_HORSEA ; 116
const DEX_SEADRA ; 117 const DEX_SEADRA ; 117
const DEX_KINGDRA
const DEX_GYOPIN const DEX_GYOPIN
const DEX_GOLDEEN ; 118 const DEX_GOLDEEN ; 118
const DEX_SEAKING ; 119 const DEX_SEAKING ; 119
@ -184,6 +188,7 @@
const DEX_GYARADOS ; 130 const DEX_GYARADOS ; 130
const DEX_LAPRAS ; 131 const DEX_LAPRAS ; 131
const DEX_DITTO ; 132 const DEX_DITTO ; 132
const DEX_ANIMON
const DEX_EEVEE ; 133 const DEX_EEVEE ; 133
const DEX_VAPOREON ; 134 const DEX_VAPOREON ; 134
const DEX_JOLTEON ; 135 const DEX_JOLTEON ; 135
@ -194,6 +199,7 @@
const DEX_GLACEON const DEX_GLACEON
const DEX_SYLVEON const DEX_SYLVEON
const DEX_PORYGON ; 137 const DEX_PORYGON ; 137
const DEX_PORYGON2
const DEX_OMANYTE ; 138 const DEX_OMANYTE ; 138
const DEX_OMASTAR ; 139 const DEX_OMASTAR ; 139
const DEX_KABUTO ; 140 const DEX_KABUTO ; 140

61
constants/pokemon_constants.asm
View file

@ -197,23 +197,50 @@
const BELLSPROUT ; $BC const BELLSPROUT ; $BC
const WEEPINBELL ; $BD const WEEPINBELL ; $BD
const VICTREEBEL ; $BE const VICTREEBEL ; $BE
const MONJA ; $C1 (new) const MONJA ; $BF (new pokemon start here)
const PUDI ; $C4 (new) const PUDI ; $C0
const SCIZOR ; $C7 (new) const SCIZOR ; $C1
const RHYPERIOR ; $C8 (new) const RHYPERIOR ; $C2
const ESPEON ; $C9 (new) const ESPEON ; $C3
const UMBREON ; $CA (new) const UMBREON ; $C4
const LEAFEON ; $CB (new) const LEAFEON ; $C5
const GLACEON ; $CC (new) const GLACEON ; $C6
const SYLVEON ; $CD (new) const SYLVEON ; $C7
const LICKILICKY ; $CD (new) const LICKILICKY ; $C8
const TANGROWTH ; $CE (new) const TANGROWTH ; $C9
const KLEAVOR ; $CF (new) const KLEAVOR ; $CA
const TSUBOMITTO ; $D0 (new) const TSUBOMITTO ; $CB
const STEELIX ; $D1 (new) const STEELIX ; $CC
const BLISSEY ; $D2 (new) const BLISSEY ; $CD
const HITMONTOP ; $D3 (new) const HITMONTOP ; $CE
const CROBAT ; $D4 (new) const CROBAT ; $CF
const ANIMON ; $D0
const BELLOSSOM ; $D1
const PORYGON2 ; $D2
const KINGDRA ; $D3
const POLITOED ; $D4
const SLOWKING ; $D5
; const PARA ; $D6
; const HINAAZU ; $D7
; const BETOBEBII ; $D8
; const MAGNEZONE ; $D9
; const ELECTIVIRE ; $DA
; const MAGMORTAR ; $DB
; const PORYGONZ ; $DC
; const PERRSERKER ; $DD
; const SIRFETCHD ; $DE
; const MR_RIME ; $DF
; const PICHU ; $E0
; const CLEFFA ; $E1
; const IGGLYBUFF ; $E2
; const TYROGUE ; $E3
; const SMOOCHUM ; $E4
; const ELEKID ; $E5
; const MAGBY ; $E6
; const MIME_JR ; $E7
; const HAPPINY ; $E8
; const MUNCHLAX ; $E9
DEF NUM_POKEMON_INDEXES EQU const_value - 1 DEF NUM_POKEMON_INDEXES EQU const_value - 1

6
data/pokemon/base_stats.asm
View file

@ -50,6 +50,7 @@ INCLUDE "data/pokemon/base_stats/crobat.asm"
INCLUDE "data/pokemon/base_stats/oddish.asm" INCLUDE "data/pokemon/base_stats/oddish.asm"
INCLUDE "data/pokemon/base_stats/gloom.asm" INCLUDE "data/pokemon/base_stats/gloom.asm"
INCLUDE "data/pokemon/base_stats/vileplume.asm" INCLUDE "data/pokemon/base_stats/vileplume.asm"
INCLUDE "data/pokemon/base_stats/bellossom.asm"
INCLUDE "data/pokemon/base_stats/paras.asm" INCLUDE "data/pokemon/base_stats/paras.asm"
INCLUDE "data/pokemon/base_stats/parasect.asm" INCLUDE "data/pokemon/base_stats/parasect.asm"
INCLUDE "data/pokemon/base_stats/venonat.asm" INCLUDE "data/pokemon/base_stats/venonat.asm"
@ -74,6 +75,7 @@ INCLUDE "data/pokemon/base_stats/arcanine.asm"
INCLUDE "data/pokemon/base_stats/poliwag.asm" INCLUDE "data/pokemon/base_stats/poliwag.asm"
INCLUDE "data/pokemon/base_stats/poliwhirl.asm" INCLUDE "data/pokemon/base_stats/poliwhirl.asm"
INCLUDE "data/pokemon/base_stats/poliwrath.asm" INCLUDE "data/pokemon/base_stats/poliwrath.asm"
INCLUDE "data/pokemon/base_stats/politoed.asm"
INCLUDE "data/pokemon/base_stats/abra.asm" INCLUDE "data/pokemon/base_stats/abra.asm"
INCLUDE "data/pokemon/base_stats/kadabra.asm" INCLUDE "data/pokemon/base_stats/kadabra.asm"
INCLUDE "data/pokemon/base_stats/alakazam.asm" INCLUDE "data/pokemon/base_stats/alakazam.asm"
@ -96,6 +98,7 @@ INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm" INCLUDE "data/pokemon/base_stats/rapidash.asm"
INCLUDE "data/pokemon/base_stats/slowpoke.asm" INCLUDE "data/pokemon/base_stats/slowpoke.asm"
INCLUDE "data/pokemon/base_stats/slowbro.asm" INCLUDE "data/pokemon/base_stats/slowbro.asm"
INCLUDE "data/pokemon/base_stats/slowking.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm" INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm" INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm" INCLUDE "data/pokemon/base_stats/magneton.asm"
@ -155,6 +158,7 @@ INCLUDE "data/pokemon/base_stats/gyaoon.asm"
INCLUDE "data/pokemon/base_stats/omega.asm" INCLUDE "data/pokemon/base_stats/omega.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm" INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/gyopin.asm" INCLUDE "data/pokemon/base_stats/gyopin.asm"
INCLUDE "data/pokemon/base_stats/goldeen.asm" INCLUDE "data/pokemon/base_stats/goldeen.asm"
INCLUDE "data/pokemon/base_stats/seaking.asm" INCLUDE "data/pokemon/base_stats/seaking.asm"
@ -180,6 +184,7 @@ INCLUDE "data/pokemon/base_stats/magikarp.asm"
INCLUDE "data/pokemon/base_stats/gyarados.asm" INCLUDE "data/pokemon/base_stats/gyarados.asm"
INCLUDE "data/pokemon/base_stats/lapras.asm" INCLUDE "data/pokemon/base_stats/lapras.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm" INCLUDE "data/pokemon/base_stats/ditto.asm"
INCLUDE "data/pokemon/base_stats/animon.asm"
INCLUDE "data/pokemon/base_stats/eevee.asm" INCLUDE "data/pokemon/base_stats/eevee.asm"
INCLUDE "data/pokemon/base_stats/vaporeon.asm" INCLUDE "data/pokemon/base_stats/vaporeon.asm"
INCLUDE "data/pokemon/base_stats/jolteon.asm" INCLUDE "data/pokemon/base_stats/jolteon.asm"
@ -190,6 +195,7 @@ INCLUDE "data/pokemon/base_stats/leafeon.asm"
INCLUDE "data/pokemon/base_stats/glaceon.asm" INCLUDE "data/pokemon/base_stats/glaceon.asm"
INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/sylveon.asm"
INCLUDE "data/pokemon/base_stats/porygon.asm" INCLUDE "data/pokemon/base_stats/porygon.asm"
INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/omanyte.asm" INCLUDE "data/pokemon/base_stats/omanyte.asm"
INCLUDE "data/pokemon/base_stats/omastar.asm" INCLUDE "data/pokemon/base_stats/omastar.asm"
INCLUDE "data/pokemon/base_stats/kabuto.asm" INCLUDE "data/pokemon/base_stats/kabuto.asm"

22
data/pokemon/base_stats/kingdra.asm
View file

@ -1,24 +1,24 @@
db DEX_KINGDRA ; pokedex id db DEX_KINGDRA ; pokedex id
db 55, 65, 95, 85, 95 db 75, 95, 95, 85, 95
; hp atk def spd spc ; hp atk def spd spc
db WATER, WATER ; type db WATER, DRAGON ; type
db 75 ; catch rate db 45 ; catch rate
db 155 ; base exp db 207 ; base exp
INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/kingdra.pic", 0, 1 ; sprite dimensions
dw SeadraPicFront, SeadraPicBack dw KingdraPicFront, KingdraPicBack
db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset
tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \
ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, DRAGON_RAGE, \
DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \
SUBSTITUTE, SURF REST, SUBSTITUTE, SURF
; end ; end
db BANK(SeadraPicFront) db BANK(KingdraPicFront)
assert BANK(SeadraPicFront) == BANK(SeadraPicBack) assert BANK(KingdraPicFront) == BANK(KingdraPicBack)

12
data/pokemon/base_stats/porygon2.asm
View file

@ -1,14 +1,14 @@
db DEX_PORYGON2 ; pokedex id db DEX_PORYGON2 ; pokedex id
db 65, 60, 70, 40, 75 db 85, 80, 90, 60, 95
; hp atk def spd spc ; hp atk def spd spc
db NORMAL, NORMAL ; type db NORMAL, NORMAL ; type
db 45 ; catch rate db 45 ; catch rate
db 130 ; base exp db 180 ; base exp
INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/porygon2.pic", 0, 1 ; sprite dimensions
dw PorygonPicFront, PorygonPicBack dw Porygon2PicFront, Porygon2PicBack
db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
@ -21,5 +21,5 @@
TRI_ATTACK, SUBSTITUTE, FLASH TRI_ATTACK, SUBSTITUTE, FLASH
; end ; end
db BANK(PorygonPicFront) db BANK(Porygon2PicFront)
assert BANK(PorygonPicFront) == BANK(PorygonPicBack) assert BANK(Porygon2PicFront) == BANK(Porygon2PicBack)

26
data/pokemon/cries.asm
View file

@ -213,4 +213,30 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Blissey mon_cry SFX_CRY_00, $00, $00 ; Blissey
mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop
mon_cry SFX_CRY_1D, $01, $B1 ; Crobat mon_cry SFX_CRY_1D, $01, $B1 ; Crobat
mon_cry SFX_CRY_0E, $50, $FF ; Animon
mon_cry SFX_CRY_00, $00, $00 ; Bellossom
mon_cry SFX_CRY_00, $00, $00 ; Porygon2
mon_cry SFX_CRY_00, $00, $00 ; Kingdra
mon_cry SFX_CRY_00, $00, $00 ; Politoed
mon_cry SFX_CRY_00, $00, $00 ; Slowking
; 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 ; Magnezone
; mon_cry SFX_CRY_00, $00, $00 ; Electivire
; mon_cry SFX_CRY_00, $00, $00 ; Magmortar
; mon_cry SFX_CRY_00, $00, $00 ; Porygon-Z
; mon_cry SFX_CRY_00, $00, $00 ; Perrserker
; mon_cry SFX_CRY_00, $00, $00 ; Sirfetch'd
; mon_cry SFX_CRY_00, $00, $00 ; Mr. Rime
; mon_cry SFX_CRY_00, $00, $00 ; Pichu
; mon_cry SFX_CRY_00, $00, $00 ; Cleffa
; mon_cry SFX_CRY_00, $00, $00 ; Igglybuff
; mon_cry SFX_CRY_00, $00, $00 ; Tyrogue
; mon_cry SFX_CRY_00, $00, $00 ; Smoochum
; mon_cry SFX_CRY_00, $00, $00 ; Elekid
; mon_cry SFX_CRY_00, $00, $00 ; Magby
; mon_cry SFX_CRY_00, $00, $00 ; Mime Jr.
; mon_cry SFX_CRY_00, $00, $00 ; Happiny
; mon_cry SFX_CRY_00, $00, $00 ; Munchlax
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES

36
data/pokemon/dex_entries.asm
View file

@ -207,6 +207,12 @@ PokedexEntryPointers:
dw BlisseyDexEntry dw BlisseyDexEntry
dw HitmontopDexEntry dw HitmontopDexEntry
dw CrobatDexEntry dw CrobatDexEntry
dw AnimonDexEntry
dw BellossomDexEntry
dw Porygon2DexEntry
dw KingdraDexEntry
dw PolitoedDexEntry
dw SlowkingDexEntry
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES
; string: species name ; string: species name
@ -1635,7 +1641,7 @@ MonjaDexEntry:
text_far _MonjaDexEntry text_far _MonjaDexEntry
text_end text_end
SteelixDexEntry: SteelixDexEntry:
db "IRON SNAKE@" db "IRON SNAKE@"
db 30,2 db 30,2
dw 8820 dw 8820
@ -1662,4 +1668,32 @@ CrobatDexEntry:
dw 1650 dw 1650
text_far _CrobatDexEntry text_far _CrobatDexEntry
text_end text_end
Porygon2DexEntry:
db "VIRTUAL@"
db 2,0
dw 720
text_far _Porygon2DexEntry
text_end
KingdraDexEntry:
db "DRAGON@"
db 5,11
dw 3350
text_far _KingdraDexEntry
text_end
PolitoedDexEntry:
db "FROG@"
db 3,7
dw 750
text_far _PolitoedDexEntry
text_end
SlowkingDexEntry:
db "ROYAL@"
db 6,7
dw 1750
text_far _SlowkingDexEntry
text_end

6
data/pokemon/dex_order.asm
View file

@ -207,4 +207,10 @@ PokedexOrder:
db DEX_BLISSEY db DEX_BLISSEY
db DEX_HITMONTOP db DEX_HITMONTOP
db DEX_CROBAT db DEX_CROBAT
db DEX_ANIMON
db DEX_BELLOSSOM
db DEX_PORYGON2
db DEX_KINGDRA
db DEX_POLITOED
db DEX_SLOWKING
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES

76
data/pokemon/evos_moves.asm
View file

@ -210,11 +210,17 @@ EvosMovesPointerTable:
dw BlisseyEvosMoves dw BlisseyEvosMoves
dw HitmontopEvosMoves dw HitmontopEvosMoves
dw CrobatEvosMoves dw CrobatEvosMoves
dw AnimonEvosMoves
dw BellossomEvosMoves
dw Porygon2EvosMoves
dw KingdraEvosMoves
dw PolitoedEvosMoves
dw SlowkingEvosMoves
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves: RhydonEvosMoves:
; Evolutions ; Evolutions
db EV_ITEM, MOON_STONE, 1, RHYPERIOR ; Protector isn't added yet ~M db EV_TRADE, 1, RHYPERIOR
db 0 db 0
; Learnset ; Learnset
db 30, STOMP db 30, STOMP
@ -646,6 +652,7 @@ PidgeyEvosMoves:
SlowpokeEvosMoves: SlowpokeEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 37, SLOWBRO db EV_LEVEL, 37, SLOWBRO
db EV_TRADE, 1, SLOWKING
db 0 db 0
; Learnset ; Learnset
db 18, DISABLE db 18, DISABLE
@ -1123,6 +1130,7 @@ ZapdosEvosMoves:
DittoEvosMoves: DittoEvosMoves:
; Evolutions ; Evolutions
db EV_TRADE, 1, ANIMON
db 0 db 0
; Learnset ; Learnset
db 0 db 0
@ -1330,6 +1338,7 @@ HorseaEvosMoves:
SeadraEvosMoves: SeadraEvosMoves:
; Evolutions ; Evolutions
db EV_TRADE, 1, KINGDRA
db 0 db 0
; Learnset ; Learnset
db 19, SMOKESCREEN db 19, SMOKESCREEN
@ -1539,6 +1548,7 @@ ParasEvosMoves:
PoliwhirlEvosMoves: PoliwhirlEvosMoves:
; Evolutions ; Evolutions
db EV_ITEM, WATER_STONE, 1, POLIWRATH db EV_ITEM, WATER_STONE, 1, POLIWRATH
db EV_TRADE, 1, POLITOED
db 0 db 0
; Learnset ; Learnset
db 16, HYPNOSIS db 16, HYPNOSIS
@ -2216,7 +2226,8 @@ GeodudeEvosMoves:
db 0 db 0
PorygonEvosMoves: PorygonEvosMoves:
; Evolutions ; Evolutions
db EV_TRADE, 1, PORYGON2
db 0 db 0
; Learnset ; Learnset
db 23, PSYBEAM db 23, PSYBEAM
@ -2395,6 +2406,7 @@ OddishEvosMoves:
GloomEvosMoves: GloomEvosMoves:
; Evolutions ; Evolutions
db EV_ITEM, LEAF_STONE, 1, VILEPLUME db EV_ITEM, LEAF_STONE, 1, VILEPLUME
db EV_ITEM, SUN_STONE, 1, BELLOSSOM
db 0 db 0
; Learnset ; Learnset
db 15, POISONPOWDER db 15, POISONPOWDER
@ -2668,3 +2680,63 @@ CrobatEvosMoves:
db 43, HAZE db 43, HAZE
db 50, AGILITY db 50, AGILITY
db 0 db 0
AnimonEvosMoves:
; Evolutions
db 0
; Learnset
db 30, MIST
db 40, LIGHT_SCREEN
db 50, REFLECT
db 0
BellossomEvosMoves:
; Evolutions
db 0
; Learnset
db 15, POISONPOWDER
db 17, STUN_SPORE
db 19, SLEEP_POWDER
db 0
Porygon2EvosMoves:
; Evolutions
db 0
; Learnset
db 23, PSYBEAM
db 28, RECOVER
db 35, AGILITY
db 42, TRI_ATTACK
db 45, DEFENSE_CURL
db 0
KingdraEvosMoves:
; Evolutions
db 0
; Learnset
db 19, SMOKESCREEN
db 24, LEER
db 30, WATER_GUN
db 32, PIN_MISSILE
db 36, QUICK_ATTACK
db 41, AGILITY
db 52, HYDRO_PUMP
db 0
PolitoedEvosMoves:
; Evolutions
db 0
; Learnset
db 0
SlowkingEvosMoves:
; Evolutions
db 0
; Learnset
db 18, DISABLE
db 22, HEADBUTT
db 27, GROWL
db 33, WATER_GUN
db 44, AMNESIA
db 55, PSYCHIC_M
db 0

30
data/pokemon/menu_icons.asm
View file

@ -50,6 +50,7 @@ MonPartyData:
nybble ICON_GRASS ; Oddish nybble ICON_GRASS ; Oddish
nybble ICON_GRASS ; Gloom nybble ICON_GRASS ; Gloom
nybble ICON_GRASS ; Vileplume nybble ICON_GRASS ; Vileplume
nybble ICON_GRASS ; Bellossom
nybble ICON_BUG ; Paras nybble ICON_BUG ; Paras
nybble ICON_BUG ; Parasect nybble ICON_BUG ; Parasect
nybble ICON_BUG ; Venonat nybble ICON_BUG ; Venonat
@ -74,6 +75,7 @@ MonPartyData:
nybble ICON_MON ; Poliwag nybble ICON_MON ; Poliwag
nybble ICON_MON ; Poliwhirl nybble ICON_MON ; Poliwhirl
nybble ICON_MON ; Poliwrath nybble ICON_MON ; Poliwrath
nybble ICON_MON ; Politoed
nybble ICON_MON ; Abra nybble ICON_MON ; Abra
nybble ICON_MON ; Kadabra nybble ICON_MON ; Kadabra
nybble ICON_MON ; Alakazam nybble ICON_MON ; Alakazam
@ -96,12 +98,13 @@ MonPartyData:
nybble ICON_QUADRUPED ; Rapidash nybble ICON_QUADRUPED ; Rapidash
nybble ICON_QUADRUPED ; Slowpoke nybble ICON_QUADRUPED ; Slowpoke
nybble ICON_MON ; Slowbro nybble ICON_MON ; Slowbro
nybble ICON_MON ; Slowking
nybble ICON_BALL ; Magnemite nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton nybble ICON_BALL ; Magneton
nybble ICON_BALL ; Barunda nybble ICON_BALL ; Barunda
nybble ICON_BIRD ; Farfetch'd nybble ICON_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu nybble ICON_BIRD ; Madaamu
nybble ICON_WATER ; Blastyke nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise nybble ICON_WATER ; Blastoise
nybble ICON_BIRD ; Doduo nybble ICON_BIRD ; Doduo
@ -126,15 +129,15 @@ MonPartyData:
nybble ICON_WATER ; Kingler nybble ICON_WATER ; Kingler
nybble ICON_BALL ; Voltorb nybble ICON_BALL ; Voltorb
nybble ICON_BALL ; Electrode nybble ICON_BALL ; Electrode
nybble ICON_GRASS ; Cactus nybble ICON_GRASS ; Cactus
nybble ICON_MON ; Crocky nybble ICON_MON ; Crocky
nybble ICON_QUADRUPED ; Deer nybble ICON_QUADRUPED ; Deer
nybble ICON_GRASS ; Exeggcute nybble ICON_GRASS ; Exeggcute
nybble ICON_GRASS ; Exeggutor nybble ICON_GRASS ; Exeggutor
nybble ICON_MON ; Cubone nybble ICON_MON ; Cubone
nybble ICON_MON ; Marowak nybble ICON_MON ; Marowak
nybble ICON_MON ; Guardia nybble ICON_MON ; Guardia
nybble ICON_MON ; Kangaskhan nybble ICON_MON ; Kangaskhan
nybble ICON_MON ; Hitmonlee nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop nybble ICON_MON ; Hitmontop
@ -150,20 +153,21 @@ MonPartyData:
nybble ICON_GRASS ; Monja nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth nybble ICON_GRASS ; Tangrowth
nybble ICON_MON ; Decilla nybble ICON_MON ; Decilla
nybble ICON_MON ; Gyaoon nybble ICON_MON ; Gyaoon
nybble ICON_MON ; Omega nybble ICON_MON ; Omega
nybble ICON_WATER ; Horsea nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra nybble ICON_WATER ; Seadra
nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Gyopin nybble ICON_WATER ; Gyopin
nybble ICON_WATER ; Goldeen nybble ICON_WATER ; Goldeen
nybble ICON_WATER ; Seaking nybble ICON_WATER ; Seaking
nybble ICON_MON ; Skimper nybble ICON_MON ; Skimper
nybble ICON_MON ; Bawligua nybble ICON_MON ; Bawligua
nybble ICON_MON ; Cryithan nybble ICON_MON ; Cryithan
nybble ICON_HELIX ; Staryu nybble ICON_HELIX ; Staryu
nybble ICON_HELIX ; Starmie nybble ICON_HELIX ; Starmie
nybble ICON_WATER ; Jagg nybble ICON_WATER ; Jagg
nybble ICON_MON ; Mr.Mime nybble ICON_MON ; Mr.Mime
nybble ICON_BUG ; Scyther nybble ICON_BUG ; Scyther
nybble ICON_BUG ; Scizor nybble ICON_BUG ; Scizor
@ -180,6 +184,7 @@ MonPartyData:
nybble ICON_SNAKE ; Gyarados nybble ICON_SNAKE ; Gyarados
nybble ICON_WATER ; Lapras nybble ICON_WATER ; Lapras
nybble ICON_MON ; Ditto nybble ICON_MON ; Ditto
nybble ICON_MON ; Animon
nybble ICON_QUADRUPED ; Eevee nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon nybble ICON_QUADRUPED ; Jolteon
@ -190,6 +195,7 @@ MonPartyData:
nybble ICON_QUADRUPED ; Glaceon nybble ICON_QUADRUPED ; Glaceon
nybble ICON_QUADRUPED ; Sylveon nybble ICON_QUADRUPED ; Sylveon
nybble ICON_MON ; Porygon nybble ICON_MON ; Porygon
nybble ICON_MON ; Porygon2
nybble ICON_HELIX ; Omanyte nybble ICON_HELIX ; Omanyte
nybble ICON_HELIX ; Omastar nybble ICON_HELIX ; Omastar
nybble ICON_HELIX ; Kabuto nybble ICON_HELIX ; Kabuto

6
data/pokemon/names.asm
View file

@ -207,5 +207,11 @@ MonsterNames::
db "BLISSEY@@@" db "BLISSEY@@@"
db "HITMONTOP@" db "HITMONTOP@"
db "CROBAT@@@@" db "CROBAT@@@@"
db "ANIMON@@@@"
db "BELLOSSOM@"
db "PORYGON2@@"
db "KINGDRA@@@"
db "POLITOED@@"
db "SLOWKING@@"
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES

6
data/pokemon/palettes.asm
View file

@ -51,6 +51,7 @@ MonsterPalettes:
db PAL_GREENMON ; ODDISH db PAL_GREENMON ; ODDISH
db PAL_REDMON ; GLOOM db PAL_REDMON ; GLOOM
db PAL_REDMON ; VILEPLUME db PAL_REDMON ; VILEPLUME
db PAL_PURPLEMON ; BELLOSSOM
db PAL_REDMON ; PARAS db PAL_REDMON ; PARAS
db PAL_REDMON ; PARASECT db PAL_REDMON ; PARASECT
db PAL_PURPLEMON ; VENONAT db PAL_PURPLEMON ; VENONAT
@ -75,6 +76,7 @@ MonsterPalettes:
db PAL_BLUEMON ; POLIWAG db PAL_BLUEMON ; POLIWAG
db PAL_BLUEMON ; POLIWHIRL db PAL_BLUEMON ; POLIWHIRL
db PAL_BLUEMON ; POLIWRATH db PAL_BLUEMON ; POLIWRATH
db PAL_GREENMON ; POLITOED
db PAL_YELLOWMON ; ABRA db PAL_YELLOWMON ; ABRA
db PAL_YELLOWMON ; KADABRA db PAL_YELLOWMON ; KADABRA
db PAL_YELLOWMON ; ALAKAZAM db PAL_YELLOWMON ; ALAKAZAM
@ -97,6 +99,7 @@ MonsterPalettes:
db PAL_REDMON ; RAPIDASH db PAL_REDMON ; RAPIDASH
db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWPOKE
db PAL_PINKMON ; SLOWBRO db PAL_PINKMON ; SLOWBRO
db PAL_PINKMON ; SLOWKING
db PAL_GREYMON ; MAGNEMITE db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON db PAL_GREYMON ; MAGNETON
@ -156,6 +159,7 @@ MonsterPalettes:
db PAL_GREYMON ; OMEGA db PAL_GREYMON ; OMEGA
db PAL_CYANMON ; HORSEA db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA db PAL_CYANMON ; SEADRA
db PAL_CYANMON ; KINGDRA
db PAL_REDMON ; GYOPIN db PAL_REDMON ; GYOPIN
db PAL_REDMON ; GOLDEEN db PAL_REDMON ; GOLDEEN
db PAL_REDMON ; SEAKING db PAL_REDMON ; SEAKING
@ -181,6 +185,7 @@ MonsterPalettes:
db PAL_BLUEMON ; GYARADOS db PAL_BLUEMON ; GYARADOS
db PAL_CYANMON ; LAPRAS db PAL_CYANMON ; LAPRAS
db PAL_PURPLEMON ; DITTO db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; ANIMON
db PAL_BROWNMON ; EEVEE db PAL_BROWNMON ; EEVEE
db PAL_CYANMON ; VAPOREON db PAL_CYANMON ; VAPOREON
db PAL_YELLOWMON ; JOLTEON db PAL_YELLOWMON ; JOLTEON
@ -191,6 +196,7 @@ MonsterPalettes:
db PAL_CYANMON ; GLACEON db PAL_CYANMON ; GLACEON
db PAL_MEWMON ; SYLVEON db PAL_MEWMON ; SYLVEON
db PAL_MEWMON ; PORYGON db PAL_MEWMON ; PORYGON
db PAL_MEWMON ; PORYGON2
db PAL_BLUEMON ; OMANYTE db PAL_BLUEMON ; OMANYTE
db PAL_BLUEMON ; OMASTAR db PAL_BLUEMON ; OMASTAR
db PAL_BROWNMON ; KABUTO db PAL_BROWNMON ; KABUTO

12
data/trainers/parties.asm
View file

@ -301,7 +301,7 @@ BurglarData:
; Mansion B1F ; Mansion B1F
db 34, GROWLITHE, PONYTA, 0 db 34, GROWLITHE, PONYTA, 0
; Victory Road - BIG SHOT ; Victory Road - BIG SHOT
db $FF, 47, DITTO, 47, MADAAMU, 50, CRYITHAN, 50, GUARDIA, 50, TANGROWTH, 53, GYARADOS, 0 db $FF, 47, ANIMON, 47, MADAAMU, 50, CRYITHAN, 50, GUARDIA, 50, TANGROWTH, 53, GYARADOS, 0
EngineerData: EngineerData:
; Unused - used in celadon university ; Unused - used in celadon university
@ -648,7 +648,7 @@ BrockData:
MistyData: MistyData:
db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0 db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
; db $FF, 66, GOLDUCK, 67, PENDRAKEN, 67, JABETTA, 66, JAGG, 67, BLASTOISE, 70, STARMIE, 0 ; db $FF, 66, STARMIE, 67, PENDRAKEN, 67, JABETTA, 66, JAGG, 67, BLASTOISE, 70, GYARADOS, 0
LtSurgeData: LtSurgeData:
db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0 db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
@ -658,7 +658,7 @@ LtSurgeData:
ErikaData: ErikaData:
db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0 db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
; db $FF, 66, CACTUS, 67, VILEPLUME, 67, VICTREEBEL, 66, DEER, 67, LEAFEON, 70, TANGROWTH, 0 ; db $FF, 66, CACTUS, 67, BELLOSSOM, 67, VICTREEBEL, 66, DEER, 67, LEAFEON, 70, TANGROWTH, 0
KogaData: KogaData:
db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0 db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0
@ -671,9 +671,9 @@ BlaineData:
; db $FF, 66, MAGMAR, 67, NINETALES, 67, RAPIDASH, 66, FLAREON, 67, ARCANINE, 70, MOLTRES, 0 ; db $FF, 66, MAGMAR, 67, NINETALES, 67, RAPIDASH, 66, FLAREON, 67, ARCANINE, 70, MOLTRES, 0
SabrinaData: SabrinaData:
db $FF, 39, HYPNO, 40, MR_MIME, 39, SLOWBRO, 40, JYNX, 43, ALAKAZAM, 0 db $FF, 39, JYNX, 40, MR_MIME, 39, SLOWKING, 40, HYPNO, 43, ALAKAZAM, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
; db $FF, 66, JYNX, 67, HYPNO, 67, MR_MIME, 66, SLOWBRO, 67, EXEGGUTOR, 70, ALAKAZAM, 0 ; db $FF, 66, JYNX, 67, HYPNO, 67, MR_MIME, 66, SLOWKING, 67, EXEGGUTOR, 70, ALAKAZAM, 0
GentlemanData: GentlemanData:
; SS Anne 1F Rooms ; SS Anne 1F Rooms
@ -755,4 +755,4 @@ AgathaData:
db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0 db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
LanceData: LanceData:
db $FF, 58, CROCKY, 57, GYARADOS, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0 db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0

14
gfx/pics.asm
View file

@ -489,4 +489,16 @@ BlisseyPicBack:: INCBIN "gfx/pokemon/back/blisseyb.pic"
HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic" HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic"
HitmontopPicBack:: INCBIN "gfx/pokemon/back/hitmontopb.pic" HitmontopPicBack:: INCBIN "gfx/pokemon/back/hitmontopb.pic"
CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic" CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic"
CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic" CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic"
AnimonPicFront:: INCBIN "gfx/pokemon/front/animon.pic"
AnimonPicBack:: INCBIN "gfx/pokemon/back/animonb.pic"
BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic"
BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic"
Porygon2PicFront:: INCBIN "gfx/pokemon/front/porygon2.pic"
Porygon2PicBack:: INCBIN "gfx/pokemon/back/porygon2b.pic"
KingdraPicFront:: INCBIN "gfx/pokemon/front/kingdra.pic"
KingdraPicBack:: INCBIN "gfx/pokemon/back/kingdrab.pic"
PolitoedPicFront:: INCBIN "gfx/pokemon/front/politoed.pic"
PolitoedPicBack:: INCBIN "gfx/pokemon/back/politoedb.pic"
SlowkingPicFront:: INCBIN "gfx/pokemon/front/slowking.pic"
SlowkingPicBack:: INCBIN "gfx/pokemon/back/slowkingb.pic"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 561 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 603 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 658 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 488 B