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

Adds in the rest of the regional forms

Browse source 
Also, need to fix an issue with the dex.
This commit is contained in:
MementoMartha 2023-04-09 16:56:30 +01:00
parent bbec5a4256
commit 3d7d98c894
22 changed files with 375 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

14
data/pokemon/base_stats.asm
View file

@ -144,9 +144,9 @@ INCLUDE "data/pokemon/base_stats/krabby.asm"
INCLUDE "data/pokemon/base_stats/kingler.asm"
INCLUDE "data/pokemon/base_stats/slowpoke.asm"
INCLUDE "data/pokemon/base_stats/slowbro.asm"
; INCLUDE "data/pokemon/base_stats/slowbrog.asm"
INCLUDE "data/pokemon/base_stats/slowbrog.asm"
INCLUDE "data/pokemon/base_stats/slowking.asm"
; INCLUDE "data/pokemon/base_stats/slowkingg.asm"
INCLUDE "data/pokemon/base_stats/slowkingg.asm"
INCLUDE "data/pokemon/base_stats/puchikoon.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm"
@ -168,10 +168,10 @@ INCLUDE "data/pokemon/base_stats/guardia.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/muka.asm"
INCLUDE "data/pokemon/base_stats/muka.asm"
INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm"
; INCLUDE "data/pokemon/base_stats/weezingg.asm"
INCLUDE "data/pokemon/base_stats/weezingg.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
@ -207,9 +207,9 @@ INCLUDE "data/pokemon/base_stats/purakkusu.asm"
INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/trampel.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
; INCLUDE "data/pokemon/base_stats/taurosp.asm"
; INCLUDE "data/pokemon/base_stats/taurospa.asm"
; INCLUDE "data/pokemon/base_stats/taurospb.asm"
INCLUDE "data/pokemon/base_stats/taurosp.asm"
INCLUDE "data/pokemon/base_stats/taurospa.asm"
INCLUDE "data/pokemon/base_stats/taurospb.asm"
INCLUDE "data/pokemon/base_stats/chansey.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/skimper.asm"

3
data/pokemon/base_stats/muka.asm
View file

@ -20,4 +20,5 @@
; end
db BANK(MukAPicFront)
assert BANK(MukAPicFront) == BANK(MukAPicBack)
assert BANK(MukAPicFront) == BANK(MukAPicBack)

2
data/pokemon/base_stats/slowbrog.asm
View file

@ -1,6 +1,6 @@
db DEX_SLOWBRO_G ; pokedex id
db 95, 100, 95, 30, 70
db 95, 100, 95, 30, 70
; hp atk def spd spc
db POISON, PSYCHIC_TYPE ; type

4
data/pokemon/base_stats/slowkingg.asm
View file

@ -1,10 +1,10 @@
db DEX_SLOWKING_G ; pokedex id
db 95, 65, 80, 30, 110
db 95, 65, 80, 30, 110
; hp atk def spd spc
db POISON, PSYCHIC_TYPE ; type
db 75 ; catch rate
db 70 ; catch rate
db 164 ; base exp
INCBIN "gfx/pokemon/front/slowkingg.pic", 0, 1 ; sprite dimensions

2
data/pokemon/base_stats/taurosp.asm
View file

@ -7,7 +7,7 @@
db 45 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/taurosp.pic", 0, 1 ; sprite dimensions
INCBIN "gfx/pokemon/front/taurospcombat.pic", 0, 1 ; sprite dimensions
dw TaurosPPicFront, TaurosPPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

2
data/pokemon/base_stats/taurospa.asm
View file

@ -7,7 +7,7 @@
db 45 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/taurospa.pic", 0, 1 ; sprite dimensions
INCBIN "gfx/pokemon/front/taurospaqua.pic", 0, 1 ; sprite dimensions
dw TaurosPAPicFront, TaurosPAPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

2
data/pokemon/base_stats/taurospb.asm
View file

@ -7,7 +7,7 @@
db 45 ; catch rate
db 211 ; base exp
INCBIN "gfx/pokemon/front/taurospb.pic", 0, 1 ; sprite dimensions
INCBIN "gfx/pokemon/front/taurospblaze.pic", 0, 1 ; sprite dimensions
dw TaurosPBPicFront, TaurosPBPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

3
data/pokemon/base_stats/weezingg.asm
View file

@ -20,4 +20,5 @@
; end
db BANK(WeezingGPicFront)
assert BANK(WeezingGPicFront) == BANK(WeezingGPicBack)
assert BANK(WeezingGPicFront) == BANK(WeezingGPicBack)

26
data/pokemon/cries.asm
View file

@ -187,9 +187,9 @@ CryData::
mon_cry SFX_CRY_1D, $20, $40 ; Wartortle
mon_cry SFX_CRY_04, $00, $80 ; Charizard
mon_cry SFX_CRY_1D, $00, $80 ; Totartle
mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil)
mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil)
mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost)
mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G
mon_cry SFX_CRY_08, $DD, $01 ; Oddish
mon_cry SFX_CRY_08, $AA, $40 ; Gloom
mon_cry SFX_CRY_23, $22, $FF ; Vileplume
@ -248,17 +248,17 @@ CryData::
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
; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G
mon_cry SFX_CRY_12, $FF, $FF ; Weezing-G
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
mon_cry SFX_CRY_00, $00, $00 ; MissingNo.
mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil)
mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil)
mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost)
assert_table_length NUM_POKEMON_INDEXES

68
data/pokemon/dex_entries.asm
View file

@ -181,9 +181,9 @@ PokedexEntryPointers:
dw WartortleDexEntry
dw CharizardDexEntry
dw TotartleDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw ArticunoGDexEntry
dw ZapdosGDexEntry
dw MoltresGDexEntry
dw OddishDexEntry
dw GloomDexEntry
dw VileplumeDexEntry
@ -242,11 +242,18 @@ PokedexEntryPointers:
dw PersianADexEntry
dw GolemADexEntry
dw RapidashGDexEntry
dw SlowbroGDexEntry
dw SlowkingGDexEntry
dw MukADexEntry
dw ExeggutorADexEntry
dw MarowakADexEntry
dw ArticunoGDexEntry
dw ZapdosGDexEntry
dw MoltresGDexEntry
dw WeezingGDexEntry
dw TaurosPDexEntry
dw TaurosPADexEntry
dw TaurosPBDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
assert_table_length NUM_POKEMON_INDEXES
@ -1934,6 +1941,27 @@ RapidashGDexEntry:
dw 1760
text_far _RapidashGDexEntry
text_end
SlowbroGDexEntry:
db "HERMITCRAB@"
db 5,3
dw 1550
text_far _SlowbroGDexEntry
text_end
SlowkingGDexEntry:
db "HEXPERT@"
db 5,11
dw 1750
text_far _SlowkingGDexEntry
text_end
MukADexEntry:
db "SLUDGE@"
db 3,3
dw 1150
text_far _MukADexEntry
text_end
ExeggutorADexEntry:
db "COCONUT@"
@ -1949,6 +1977,34 @@ MarowakADexEntry:
text_far _MarowakADexEntry
text_end
WeezingGDexEntry:
db "POISON GAS@"
db 9,10
dw 350
text_far _WeezingGDexEntry
text_end
TaurosPDexEntry:
db "WILD BULL@"
db 4,7
dw 2530
text_far _TaurosPDexEntry
text_end
TaurosPADexEntry:
db "WILD BULL@"
db 4,7
dw 2420
text_far _TaurosPADexEntry
text_end
TaurosPBDexEntry:
db "WILD BULL@"
db 4,7
dw 1870
text_far _TaurosPBDexEntry
text_end
ArticunoGDexEntry:
db "CRUEL@"
db 5,7

19
data/pokemon/dex_order.asm
View file

@ -181,9 +181,9 @@ PokedexOrder:
db DEX_WARTORTLE
db DEX_CHARIZARD
db DEX_TOTARTLE
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db DEX_ARTICUNO_G
db DEX_ZAPDOS_G
db DEX_MOLTRES_G
db DEX_ODDISH
db DEX_GLOOM
db DEX_VILEPLUME
@ -242,10 +242,17 @@ PokedexOrder:
db DEX_PERSIAN_A
db DEX_GOLEM_A
db DEX_RAPIDASH_G
db DEX_SLOWBRO_G
db DEX_SLOWKING_G
db DEX_MUK_A
db DEX_EXEGGUTOR_A
db DEX_MAROWAK_A
db DEX_ARTICUNO_G
db DEX_ZAPDOS_G
db DEX_MOLTRES_G
db DEX_WEEZING_G
db DEX_TAUROS_P
db DEX_TAUROS_PA
db DEX_TAUROS_PB
db DEX_MISSINGNO
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
assert_table_length NUM_POKEMON_INDEXES

254
data/pokemon/evos_moves.asm
View file

@ -20,7 +20,6 @@ EvosMovesPointerTable:
dw VoltorbEvosMoves
dw NidokingEvosMoves
dw SlowbroEvosMoves
;dw SlowbroGEvosMoves
dw IvysaurEvosMoves
dw ExeggutorEvosMoves
dw LickitungEvosMoves
@ -73,9 +72,6 @@ EvosMovesPointerTable:
dw SeelEvosMoves
dw DiglettEvosMoves
dw TaurosEvosMoves
;dw TaurosPEvosMoves
;dw TaurosPBEvosMoves
;dw TaurosPAEvosMoves
dw TrampelEvosMoves
dw CrockyEvosMoves
dw BlottleEvosMoves
@ -152,7 +148,6 @@ EvosMovesPointerTable:
dw KonyaEvosMoves
dw OmegaEvosMoves
dw MukEvosMoves
;dw MukAEvosMoves
dw DecillaEvosMoves
dw KinglerEvosMoves
dw CloysterEvosMoves
@ -160,7 +155,6 @@ EvosMovesPointerTable:
dw ElectrodeEvosMoves
dw ClefableEvosMoves
dw WeezingEvosMoves
;dw WeezingGEvosMoves
dw PersianEvosMoves
dw MarowakEvosMoves
dw GuardiaEvosMoves
@ -199,9 +193,9 @@ EvosMovesPointerTable:
dw WartortleEvosMoves
dw CharizardEvosMoves
dw TotartleEvosMoves
dw FossilKabutopsEvosMoves
dw FossilAerodactylEvosMoves
dw MonGhostEvosMoves
dw ArticunoGEvosMoves
dw ZapdosGEvosMoves
dw MoltresGEvosMoves
dw OddishEvosMoves
dw GloomEvosMoves
dw VileplumeEvosMoves
@ -231,7 +225,6 @@ EvosMovesPointerTable:
dw KingdraEvosMoves
dw PolitoedEvosMoves
dw SlowkingEvosMoves
;dw SlowkingGEvosMoves
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw ParaEvosMoves
@ -261,12 +254,19 @@ EvosMovesPointerTable:
dw PersianAEvosMoves
dw GolemAEvosMoves
dw RapidashGEvosMoves
dw SlowbroGEvosMoves
dw SlowkingGEvosMoves
dw MukAEvosMoves
dw ExeggutorAEvosMoves
dw MarowakAEvosMoves
dw ArticunoGEvosMoves
dw ZapdosGEvosMoves
dw MoltresGEvosMoves
dw WeezingGEvosMoves
dw TaurosPEvosMoves
dw TaurosPAEvosMoves
dw TaurosPBEvosMoves
dw MissingNoEvosMoves
dw FossilKabutopsEvosMoves
dw FossilAerodactylEvosMoves
dw MonGhostEvosMoves
assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves:
@ -365,18 +365,6 @@ SlowbroEvosMoves:
db 55, PSYCHIC_M
db 0
;SlowbroGEvosMoves:
; Evolutions
; db 0
; Learnset
; db 8, ACID
; db 14, CONFUSION
; db 22, DISABLE
; db 30, HEADBUTT
; db 38, AMNESIA
; db 42, PSYCHIC_M
; db 0
IvysaurEvosMoves:
; Evolutions
db EV_LEVEL, 32, VENUSAUR
@ -1001,39 +989,6 @@ TaurosEvosMoves:
db 51, TAKE_DOWN
db 0
;TaurosPEvosMoves:
; Evolutions
; db 0
; Learnset
; db 21, ROLLING_KICK
; db 28, TAIL_WHIP
; db 35, LEER
; db 44, RAGE
; db 51, JUMP_KICK
; db 0
;TaurosPBEvosMoves:
; Evolutions
; db 0
; Learnset
; db 21, LOW_KICK
; db 28, TAIL_WHIP
; db 35, LEER
; db 44, RAGE
; db 51, FIRE_SPIN
; db 0
;TaurosPAEvosMoves:
; Evolutions
; db 0
; Learnset
; db 21, LOW_KICK
; db 28, TAIL_WHIP
; db 35, LEER
; db 44, RAGE
; db 51, HYDRO_PUMP
; db 0
TrampelEvosMoves:
; Evolutions
db 0
@ -1929,20 +1884,6 @@ MukEvosMoves:
db 60, ACID_ARMOR
db 0
;MukAEvosMoves:
; Evolutions
; db 0
; Learnset
; db 6, HARDEN
; db 12, MINIMIZE
; db 18, DISABLE
; db 24, BRUTAL_SWING
; db 30, SCREECH
; db 36, NIGHT_SLASH
; db 42, ACID_ARMOR
; db 48, SLUDGE
; db 0
DecillaEvosMoves:
; Evolutions
db EV_LEVEL, 40, GYAOON
@ -2013,18 +1954,6 @@ WeezingEvosMoves:
db 53, EXPLOSION
db 0
;WeezingGEvosMoves:
; Evolutions
; db 0
; Learnset
; db 32, SLUDGE
; db 37, SMOKESCREEN
; db 40, SELFDESTRUCT
; db 43, DAZZLE_GLEAM
; db 49, HAZE
; db 53, EXPLOSION
; db 0
PersianEvosMoves:
; Evolutions
db 0
@ -2481,23 +2410,46 @@ TotartleEvosMoves:
db 54, LEER
db 60, PETAL_DANCE
db 0
FossilKabutopsEvosMoves:
ArticunoGEvosMoves:
; Evolutions
db 0
; Learnset
db 40, REFLECT
db 45, HYPNOSIS
db 51, PSYBEAM
db 55, AGILITY
db 60, LIGHT_SCREEN
db 65, RECOVER
db 70, DREAM_EATER
db 0
FossilAerodactylEvosMoves:
ZapdosGEvosMoves:
; Evolutions
db 0
; Learnset
db 40, DOUBLE_KICK
db 45, LIGHT_SCREEN
db 51, LOW_KICK
db 55, AGILITY
db 58, JUMP_KICK
db 62, DRILL_PECK
db 66, ROLLING_KICK
db 70, HI_JUMP_KICK
db 0
MonGhostEvosMoves:
MoltresGEvosMoves:
; Evolutions
db 0
; Learnset
db 40, BITE ; Fake Tears
db 45, WING_ATTACK
db 51, BRUTAL_SWING
db 55, AGILITY
db 58, FEINT_ATTACK
db 62, AMNESIA ; Nasty Plot
db 66, NIGHT_SLASH ; False Surrender
db 70, SKY_ATTACK
db 0
OddishEvosMoves:
@ -2853,18 +2805,6 @@ SlowkingEvosMoves:
db 55, PSYCHIC_M
db 0
;SlowkingGEvosMoves:
; Evolutions
; db 0
; Learnset
; db 8, ACID
; db 14, CONFUSION
; db 22, DISABLE
; db 30, HEADBUTT
; db 38, AMNESIA
; db 42, PSYCHIC_M
; db 0
ElectivireEvosMoves:
; Evolutions
db 0
@ -3232,6 +3172,44 @@ RapidashGEvosMoves:
db 52, DAZZLE_GLEAM
db 55, PSYCHIC_M
db 0
SlowbroGEvosMoves:
; Evolutions
db 0
; Learnset
db 8, ACID
db 14, CONFUSION
db 22, DISABLE
db 30, HEADBUTT
db 38, AMNESIA
db 42, PSYCHIC_M
db 0
SlowkingGEvosMoves:
; Evolutions
db 0
; Learnset
db 8, ACID
db 14, CONFUSION
db 22, DISABLE
db 30, HEADBUTT
db 38, AMNESIA
db 42, PSYCHIC_M
db 0
MukAEvosMoves:
; Evolutions
db 0
; Learnset
db 6, HARDEN
db 12, MINIMIZE
db 18, DISABLE
db 24, BRUTAL_SWING
db 30, SCREECH
db 36, NIGHT_SLASH
db 42, ACID_ARMOR
db 48, SLUDGE
db 0
ExeggutorAEvosMoves:
; Evolutions
@ -3256,46 +3234,50 @@ MarowakAEvosMoves:
db 46, BONEMERANG
db 55, FLAMETHROWER
db 0
ArticunoGEvosMoves:
WeezingGEvosMoves:
; Evolutions
db 0
; Learnset
db 40, REFLECT
db 45, HYPNOSIS
db 51, PSYBEAM
db 55, AGILITY
db 60, LIGHT_SCREEN
db 65, RECOVER
db 70, DREAM_EATER
db 32, SLUDGE
db 37, SMOKESCREEN
db 40, SELFDESTRUCT
db 43, DAZZLE_GLEAM
db 49, HAZE
db 53, EXPLOSION
db 0
ZapdosGEvosMoves:
TaurosPEvosMoves:
; Evolutions
db 0
; Learnset
db 40, DOUBLE_KICK
db 45, LIGHT_SCREEN
db 51, LOW_KICK
db 55, AGILITY
db 58, JUMP_KICK
db 62, DRILL_PECK
db 66, ROLLING_KICK
db 70, HI_JUMP_KICK
db 21, ROLLING_KICK
db 28, TAIL_WHIP
db 35, LEER
db 44, RAGE
db 51, JUMP_KICK
db 0
MoltresGEvosMoves:
TaurosPAEvosMoves:
; Evolutions
db 0
; Learnset
db 40, BITE ; Fake Tears
db 45, WING_ATTACK
db 51, BRUTAL_SWING
db 55, AGILITY
db 58, FEINT_ATTACK
db 62, AMNESIA ; Nasty Plot
db 66, NIGHT_SLASH ; False Surrender
db 70, SKY_ATTACK
db 21, LOW_KICK
db 28, TAIL_WHIP
db 35, LEER
db 44, RAGE
db 51, HYDRO_PUMP
db 0
TaurosPBEvosMoves:
; Evolutions
db 0
; Learnset
db 21, LOW_KICK
db 28, TAIL_WHIP
db 35, LEER
db 44, RAGE
db 51, FIRE_SPIN
db 0
MissingNoEvosMoves:
@ -3303,3 +3285,21 @@ MissingNoEvosMoves:
db 0
; Learnset
db 0
FossilKabutopsEvosMoves:
; Evolutions
db 0
; Learnset
db 0
FossilAerodactylEvosMoves:
; Evolutions
db 0
; Learnset
db 0
MonGhostEvosMoves:
; Evolutions
db 0
; Learnset
db 0

15
data/pokemon/menu_icons.asm
View file

@ -144,9 +144,9 @@ MonPartyData:
nybble ICON_WATER ; Kingler
nybble ICON_QUADRUPED ; Slowpoke
nybble ICON_MON ; Slowbro
; nybble ICON_MON ; Slowbro-G
nybble ICON_MON ; Slowbro-G
nybble ICON_MON ; Slowking
; nybble ICON_MON ; Slowking-G
nybble ICON_MON ; Slowking-G
nybble ICON_QUADRUPED ; Puchikoon
nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash
@ -168,10 +168,10 @@ MonPartyData:
nybble ICON_MON ; Betobebii
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
; nybble ICON_MON ; Muk-A
nybble ICON_MON ; Muk-A
nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing
; nybble ICON_MON ; Weezing-G
nybble ICON_MON ; Weezing-G
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_MON ; Ditto
@ -207,16 +207,15 @@ MonPartyData:
nybble ICON_MON ; Kangaskhan
nybble ICON_MON ; Trampel
nybble ICON_QUADRUPED ; Tauros
; nybble ICON_QUADRUPED ; Tauros-P
; nybble ICON_QUADRUPED ; Tauros-PA
; nybble ICON_QUADRUPED ; Tauros-PB
nybble ICON_QUADRUPED ; Tauros-P
nybble ICON_QUADRUPED ; Tauros-PA
nybble ICON_QUADRUPED ; Tauros-PB
nybble ICON_FAIRY ; Chansey
nybble ICON_FAIRY ; Blissey
nybble ICON_MON ; Skimper
nybble ICON_MON ; Bawligua
nybble ICON_MON ; Cryithan
nybble ICON_MON ; Mr.Mime
; nybble ICON_MON ; Mr.Mime-G
nybble ICON_MON ; Mr.Rime
nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu

26
data/pokemon/names.asm
View file

@ -8,7 +8,6 @@ MonsterNames::
db "VOLTORB@@@"
db "NIDOKING@@"
db "SLOWBRO@@@"
; "SLOWBRO-G@"
db "IVYSAUR@@@"
db "EXEGGUTOR@"
db "LICKITUNG@"
@ -61,9 +60,6 @@ MonsterNames::
db "SEEL@@@@@@"
db "DIGLETT@@@"
db "TAUROS@@@@"
; db "TAUROS-P@@"
; db "TAUROS-PB@"
; db "TAUROS-PA@"
db "TRAMPEL@@@"
db "CROCKY@@@@"
db "BLOTTLE@@@"
@ -140,7 +136,6 @@ MonsterNames::
db "KONYA@@@@@"
db "OMEGA@@@@@"
db "MUK@@@@@@@"
; db "MUK-A@@@@@"
db "DECILLA@@@"
db "KINGLER@@@"
db "CLOYSTER@@"
@ -148,7 +143,6 @@ MonsterNames::
db "ELECTRODE@"
db "CLEFABLE@@"
db "WEEZING@@@"
; db "WEEZING-G@"
db "PERSIAN@@@"
db "MAROWAK@@@"
db "GUARDIA@@@"
@ -187,9 +181,9 @@ MonsterNames::
db "WARTORTLE@"
db "CHARIZARD@"
db "TOTARTLE@@"
db "MISSINGNO."
db "MISSINGNO."
db "MISSINGNO."
db "ARTICUNO-G"
db "ZAPDOS-G@@"
db "MOLTRES-G@"
db "ODDISH@@@@"
db "GLOOM@@@@@"
db "VILEPLUME@"
@ -219,7 +213,6 @@ MonsterNames::
db "KINGDRA@@@"
db "POLITOED@@"
db "SLOWKING@@"
; db "SLOWKING-G"
db "ELECTIVIRE"
db "MAGMORTAR@"
db "PARA@@@@@@"
@ -249,11 +242,18 @@ MonsterNames::
db "PERSIAN-A@"
db "GOLEM-A@@@"
db "RAPIDASH-G"
db "SLOWBRO-G@"
db "SLOWKING-G"
db "MUK-A@@@@@"
db "EXEGGUTORA"
db "MAROWAK-A@"
db "ARTICUNO-G"
db "ZAPDOS-G@@"
db "MOLTRES-G@"
db "WEEZING-G@"
db "TAUROS-P@@"
db "TAUROS-PA@"
db "TAUROS-PB@"
db "MISSINGNO."
db "MISSINGNO."
db "MISSINGNO."
db "MISSINGNO."
assert_table_length NUM_POKEMON_INDEXES

112
data/pokemon/new_dex_text.asm
View file

@ -908,35 +908,35 @@ _RapidashGDexEntry::
next "break concrete"
dex
;_SlowbroGDexEntry::
; text "The SHELLDER that"
; next "bit SLOWBRO has"
; next "made it poisonous."
_SlowbroGDexEntry::
text "The SHELLDER that"
next "bit SLOWBRO has"
next "made it poisonous."
; para "SHELLDER's tongue"
; next "can be squeezed"
; next "to spit poison"
; dex
page "SHELLDER's tongue"
next "can be squeezed"
next "to spit poison"
dex
;_SlowkingGDexEntry::
; text "The SHELLDER that"
; next "bit SLOWBRO has"
; next "assumed control."
_SlowkingGDexEntry::
text "The SHELLDER that"
next "bit SLOWKING has"
next "assumed control."
; page "Mumbling eerie"
; next "spells, it makes"
; next "strange POTIONs"
; dex
page "Mumbling eerie"
next "spells, it makes"
next "strange POTIONs"
dex
;_MukADexEntry::
; text "Over 100 kinds"
; next "of poison make"
; next "up its body."
_MukADexEntry::
text "Over 100 kinds"
next "of poison make"
next "up its body."
; page "While friendly,"
; next "it must be fed"
; next "a lot of trash"
; dex
page "While friendly,"
next "it must be fed"
next "a lot of trash"
dex
_ExeggutorADexEntry::
text "Strong sunlight"
@ -958,45 +958,45 @@ _MarowakADexEntry::
next "cherished bone"
dex
;_WeezingGDexEntry::
; text "It is better at"
; next "taking in air"
; next "than WEEZING in" ; referencing shield kantonian weezing
_WeezingGDexEntry::
text "It is better at"
next "taking in air"
next "than WEEZING in" ; referencing shield kantonian weezing
; page "KANTO. Its body"
; next "is copied when"
; next "building factories" ; referencing this: https://ibb.co/ZM2714Q - PLA takes place before RB
; dex
page "KANTO. Its body"
next "is copied when"
next "building factories" ; referencing this: https://ibb.co/ZM2714Q - PLA takes place before RB
dex
;_TaurosPDexEntry::
; text "Known as the"
; next "Combat Breed,"
; next "this TAUROS uses"
_TaurosPDexEntry::
text "Known as the"
next "Combat Breed,"
next "this TAUROS uses"
; page "its thick muscles"
; next "to overwhelm its"
; next "opponents"
; dex
page "its thick muscles"
next "to overwhelm its"
next "opponents"
dex
;_TaurosPBDexEntry::
; text "Known as the"
; next "Blaze Breed,"
; next "this TAUROS can"
_TaurosPBDexEntry::
text "Known as the"
next "Blaze Breed,"
next "this TAUROS can"
; page "expel hot air"
; next "from its nostrils"
; next "and heat its horns"
; dex
page "expel hot air from"
next "its nostrils and"
next "heat up its horns"
dex
;_TaurosPADexEntry::
; text "Known as the"
; next "Aqua Breed,"
; next "this TAUROS can"
_TaurosPADexEntry::
text "Known as the"
next "Aqua Breed,"
next "this TAUROS can"
; page "shoot water at"
; next "high pressure from"
; next "its horns"
; dex
page "shoot water at"
next "high pressure from"
next "its horns"
dex
_MissingNoDexEntry::
text "This is a newly"

16
data/pokemon/palettes.asm
View file

@ -129,7 +129,7 @@ MonsterPalettes:
db PAL_CYANMON ; TENTACOOL
db PAL_CYANMON ; TENTACRUEL
db PAL_BROWNMON ; TOEDSCOOL
db PAL_YELLOWMON ; TOEDSCRUEL - Yellow doesn't really look right...
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
@ -145,9 +145,9 @@ MonsterPalettes:
db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE
db PAL_PINKMON ; SLOWBRO
; db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PINKMON ; SLOWKING
; db PAL_PURPLEMON ; SLOWKING_G
db PAL_PURPLEMON ; SLOWKING_G
db PAL_REDMON ; PUCHIKOON
db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH
@ -169,10 +169,10 @@ MonsterPalettes:
db PAL_PURPLEMON ; BETOBEBII
db PAL_PURPLEMON ; GRIMER
db PAL_PURPLEMON ; MUK
; db PAL_GREENMON ; MUK_A
db PAL_GREENMON ; MUK_A
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
; db PAL_GREYMON ; WEEZING_G
db PAL_GREYMON ; WEEZING_G
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_PURPLEMON ; DITTO
@ -208,9 +208,9 @@ MonsterPalettes:
db PAL_BROWNMON ; KANGASKHAN
db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS
; db PAL_GREYMON ; TAUROS_P
; db PAL_BLUEMON ; TAUROS_PA
; db PAL_REDMON ; TAUROS_PB
db PAL_GREYMON ; TAUROS_P
db PAL_BLUEMON ; TAUROS_PA
db PAL_REDMON ; TAUROS_PB
db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY
db PAL_CYANMON ; SKIMPER