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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
constants/pokedex_constants.asm
View file

@ -149,9 +149,9 @@
const DEX_KINGLER ; 99 (142) const DEX_KINGLER ; 99 (142)
const DEX_SLOWPOKE ; 79 (143) const DEX_SLOWPOKE ; 79 (143)
const DEX_SLOWBRO ; 80 (144) const DEX_SLOWBRO ; 80 (144)
; const DEX_SLOWBRO_G ; (145) const DEX_SLOWBRO_G ; (145)
const DEX_SLOWKING ; (146) const DEX_SLOWKING ; (146)
; const DEX_SLOWKING_G ; (147) const DEX_SLOWKING_G ; (147)
const DEX_PUCHIKOON ; (148) const DEX_PUCHIKOON ; (148)
const DEX_PONYTA ; 77 (149) const DEX_PONYTA ; 77 (149)
const DEX_RAPIDASH ; 78 (150) const DEX_RAPIDASH ; 78 (150)
@ -173,10 +173,10 @@
const DEX_BETOBEBII ; (166) const DEX_BETOBEBII ; (166)
const DEX_GRIMER ; 88 (167) const DEX_GRIMER ; 88 (167)
const DEX_MUK ; 89 (168) const DEX_MUK ; 89 (168)
; const DEX_MUK_A ; (169) const DEX_MUK_A ; (169)
const DEX_KOFFING ; 109 (170) const DEX_KOFFING ; 109 (170)
const DEX_WEEZING ; 110 (171) const DEX_WEEZING ; 110 (171)
; const DEX_WEEZING_G ; (172) const DEX_WEEZING_G ; (172)
const DEX_BLASTYKE ; (173) const DEX_BLASTYKE ; (173)
const DEX_BLASTOISE ; 9 (174) const DEX_BLASTOISE ; 9 (174)
const DEX_DITTO ; 132 (175) const DEX_DITTO ; 132 (175)
@ -212,9 +212,9 @@
const DEX_KANGASKHAN ; 115 (205) const DEX_KANGASKHAN ; 115 (205)
const DEX_TRAMPEL ; (206) const DEX_TRAMPEL ; (206)
const DEX_TAUROS ; 128 (207) const DEX_TAUROS ; 128 (207)
; const DEX_TAUROS_P ; (208) const DEX_TAUROS_P ; (208)
; const DEX_TAUROS_PA ; (209) const DEX_TAUROS_PA ; (209)
; const DEX_TAUROS_PB ; (210) const DEX_TAUROS_PB ; (210)
const DEX_CHANSEY ; 113 (211) const DEX_CHANSEY ; 113 (211)
const DEX_BLISSEY ; (212) const DEX_BLISSEY ; (212)
const DEX_SKIMPER ; (213) const DEX_SKIMPER ; (213)

28
constants/pokemon_constants.asm
View file

@ -188,9 +188,9 @@
const WARTORTLE ; $B3 const WARTORTLE ; $B3
const CHARIZARD ; $B4 const CHARIZARD ; $B4
const TOTARTLE ; $B5 (new) const TOTARTLE ; $B5 (new)
const FOSSIL_KABUTOPS ; $B6 (missingno.) const ARTICUNO_G ; $B6 (new)
const FOSSIL_AERODACTYL ; $B7 (missingno.) const ZAPDOS_G ; $FD (new)
const MON_GHOST ; $B8 (missingno.) const MOLTRES_G ; $FE (new)
const ODDISH ; $B9 const ODDISH ; $B9
const GLOOM ; $BA const GLOOM ; $BA
const VILEPLUME ; $BB const VILEPLUME ; $BB
@ -249,19 +249,19 @@
const PERSIAN_A ; $F0 const PERSIAN_A ; $F0
const GOLEM_A ; $F1 const GOLEM_A ; $F1
const RAPIDASH_G ; $F2 const RAPIDASH_G ; $F2
; const SLOWBRO_G ; $F3 const SLOWBRO_G ; $F3
; const SLOWKING_G ; $F4 const SLOWKING_G ; $F4
; const MUK_A ; $F5 const MUK_A ; $F5
const EXEGGUTOR_A ; $F6 const EXEGGUTOR_A ; $F6
const MAROWAK_A ; $F7 const MAROWAK_A ; $F7
; const WEEZING_G ; $F8 const WEEZING_G ; $F8
; const TAUROS_P ; $F9 const TAUROS_P ; $F9
; const TAUROS_PA ; $FA const TAUROS_PA ; $FA
; const TAUROS_PB ; $FB const TAUROS_PB ; $FB
const ARTICUNO_G ; $FC const MISSINGNO ; $FC
const ZAPDOS_G ; $FD const FOSSIL_KABUTOPS ; $FD (was B6)
const MOLTRES_G ; $FE const FOSSIL_AERODACTYL ; $FE (was B7)
const MISSINGNO ; $FF (need to make sure we can still put something here) const MON_GHOST ; $FF (was B8, need to make sure we can still put something here)
DEF NUM_POKEMON_INDEXES EQU const_value - 1 DEF NUM_POKEMON_INDEXES EQU const_value - 1

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/kingler.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/slowbrog.asm" INCLUDE "data/pokemon/base_stats/slowbrog.asm"
INCLUDE "data/pokemon/base_stats/slowking.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/puchikoon.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm" INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.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/betobebii.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm" INCLUDE "data/pokemon/base_stats/grimer.asm"
INCLUDE "data/pokemon/base_stats/muk.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/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.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/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm" INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/ditto.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/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/trampel.asm" INCLUDE "data/pokemon/base_stats/trampel.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm" INCLUDE "data/pokemon/base_stats/tauros.asm"
; INCLUDE "data/pokemon/base_stats/taurosp.asm" INCLUDE "data/pokemon/base_stats/taurosp.asm"
; INCLUDE "data/pokemon/base_stats/taurospa.asm" INCLUDE "data/pokemon/base_stats/taurospa.asm"
; INCLUDE "data/pokemon/base_stats/taurospb.asm" INCLUDE "data/pokemon/base_stats/taurospb.asm"
INCLUDE "data/pokemon/base_stats/chansey.asm" INCLUDE "data/pokemon/base_stats/chansey.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm" INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/skimper.asm" INCLUDE "data/pokemon/base_stats/skimper.asm"

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

@ -21,3 +21,4 @@
db BANK(MukAPicFront) 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 DEX_SLOWBRO_G ; pokedex id
db 95, 100, 95, 30, 70 db 95, 100, 95, 30, 70
; hp atk def spd spc ; hp atk def spd spc
db POISON, PSYCHIC_TYPE ; type 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 DEX_SLOWKING_G ; pokedex id
db 95, 65, 80, 30, 110 db 95, 65, 80, 30, 110
; hp atk def spd spc ; hp atk def spd spc
db POISON, PSYCHIC_TYPE ; type db POISON, PSYCHIC_TYPE ; type
db 75 ; catch rate db 70 ; catch rate
db 164 ; base exp db 164 ; base exp
INCBIN "gfx/pokemon/front/slowkingg.pic", 0, 1 ; sprite dimensions 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 45 ; catch rate
db 211 ; base exp 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 dw TaurosPPicFront, TaurosPPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset 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 45 ; catch rate
db 211 ; base exp 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 dw TaurosPAPicFront, TaurosPAPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset 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 45 ; catch rate
db 211 ; base exp 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 dw TaurosPBPicFront, TaurosPBPicBack
db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset

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

@ -21,3 +21,4 @@
db BANK(WeezingGPicFront) 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_1D, $20, $40 ; Wartortle
mon_cry SFX_CRY_04, $00, $80 ; Charizard mon_cry SFX_CRY_04, $00, $80 ; Charizard
mon_cry SFX_CRY_1D, $00, $80 ; Totartle mon_cry SFX_CRY_1D, $00, $80 ; Totartle
mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil) mon_cry SFX_CRY_09, $80, $40 ; Articuno-G
mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil) mon_cry SFX_CRY_18, $FF, $80 ; Zapdos-G
mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost) mon_cry SFX_CRY_09, $F8, $40 ; Moltres-G
mon_cry SFX_CRY_08, $DD, $01 ; Oddish mon_cry SFX_CRY_08, $DD, $01 ; Oddish
mon_cry SFX_CRY_08, $AA, $40 ; Gloom mon_cry SFX_CRY_08, $AA, $40 ; Gloom
mon_cry SFX_CRY_23, $22, $FF ; Vileplume 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_19, $99, $FF ; Persian-A
mon_cry SFX_CRY_12, $E0, $40 ; Golem-A mon_cry SFX_CRY_12, $E0, $40 ; Golem-A
mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G mon_cry SFX_CRY_25, $20, $C0 ; Rapidash-G
; mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G mon_cry SFX_CRY_1F, $00, $80 ; Slowbro-G
; mon_cry SFX_CRY_00, $00, $00 ; Slowking-G mon_cry SFX_CRY_00, $00, $00 ; Slowking-G
; mon_cry SFX_CRY_07, $EF, $FF ; Muk-A mon_cry SFX_CRY_07, $EF, $FF ; Muk-A
mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A mon_cry SFX_CRY_0D, $00, $80 ; Exeggutor-A
mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A mon_cry SFX_CRY_08, $4F, $60 ; Marowak-A
; mon_cry SFX_CRY_12, $FF, $FF ; Weezing-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-P
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
; mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB 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_00, $00, $00 ; MissingNo. 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 assert_table_length NUM_POKEMON_INDEXES

68
data/pokemon/dex_entries.asm
View file

@ -181,9 +181,9 @@ PokedexEntryPointers:
dw WartortleDexEntry dw WartortleDexEntry
dw CharizardDexEntry dw CharizardDexEntry
dw TotartleDexEntry dw TotartleDexEntry
dw MissingNoDexEntry dw ArticunoGDexEntry
dw MissingNoDexEntry dw ZapdosGDexEntry
dw MissingNoDexEntry dw MoltresGDexEntry
dw OddishDexEntry dw OddishDexEntry
dw GloomDexEntry dw GloomDexEntry
dw VileplumeDexEntry dw VileplumeDexEntry
@ -242,11 +242,18 @@ PokedexEntryPointers:
dw PersianADexEntry dw PersianADexEntry
dw GolemADexEntry dw GolemADexEntry
dw RapidashGDexEntry dw RapidashGDexEntry
dw SlowbroGDexEntry
dw SlowkingGDexEntry
dw MukADexEntry
dw ExeggutorADexEntry dw ExeggutorADexEntry
dw MarowakADexEntry dw MarowakADexEntry
dw ArticunoGDexEntry dw WeezingGDexEntry
dw ZapdosGDexEntry dw TaurosPDexEntry
dw MoltresGDexEntry dw TaurosPADexEntry
dw TaurosPBDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry dw MissingNoDexEntry
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES
@ -1935,6 +1942,27 @@ RapidashGDexEntry:
text_far _RapidashGDexEntry text_far _RapidashGDexEntry
text_end 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: ExeggutorADexEntry:
db "COCONUT@" db "COCONUT@"
db 35,9 db 35,9
@ -1949,6 +1977,34 @@ MarowakADexEntry:
text_far _MarowakADexEntry text_far _MarowakADexEntry
text_end 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: ArticunoGDexEntry:
db "CRUEL@" db "CRUEL@"
db 5,7 db 5,7

19
data/pokemon/dex_order.asm
View file

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

250
data/pokemon/evos_moves.asm
View file

@ -20,7 +20,6 @@ EvosMovesPointerTable:
dw VoltorbEvosMoves dw VoltorbEvosMoves
dw NidokingEvosMoves dw NidokingEvosMoves
dw SlowbroEvosMoves dw SlowbroEvosMoves
;dw SlowbroGEvosMoves
dw IvysaurEvosMoves dw IvysaurEvosMoves
dw ExeggutorEvosMoves dw ExeggutorEvosMoves
dw LickitungEvosMoves dw LickitungEvosMoves
@ -73,9 +72,6 @@ EvosMovesPointerTable:
dw SeelEvosMoves dw SeelEvosMoves
dw DiglettEvosMoves dw DiglettEvosMoves
dw TaurosEvosMoves dw TaurosEvosMoves
;dw TaurosPEvosMoves
;dw TaurosPBEvosMoves
;dw TaurosPAEvosMoves
dw TrampelEvosMoves dw TrampelEvosMoves
dw CrockyEvosMoves dw CrockyEvosMoves
dw BlottleEvosMoves dw BlottleEvosMoves
@ -152,7 +148,6 @@ EvosMovesPointerTable:
dw KonyaEvosMoves dw KonyaEvosMoves
dw OmegaEvosMoves dw OmegaEvosMoves
dw MukEvosMoves dw MukEvosMoves
;dw MukAEvosMoves
dw DecillaEvosMoves dw DecillaEvosMoves
dw KinglerEvosMoves dw KinglerEvosMoves
dw CloysterEvosMoves dw CloysterEvosMoves
@ -160,7 +155,6 @@ EvosMovesPointerTable:
dw ElectrodeEvosMoves dw ElectrodeEvosMoves
dw ClefableEvosMoves dw ClefableEvosMoves
dw WeezingEvosMoves dw WeezingEvosMoves
;dw WeezingGEvosMoves
dw PersianEvosMoves dw PersianEvosMoves
dw MarowakEvosMoves dw MarowakEvosMoves
dw GuardiaEvosMoves dw GuardiaEvosMoves
@ -199,9 +193,9 @@ EvosMovesPointerTable:
dw WartortleEvosMoves dw WartortleEvosMoves
dw CharizardEvosMoves dw CharizardEvosMoves
dw TotartleEvosMoves dw TotartleEvosMoves
dw FossilKabutopsEvosMoves dw ArticunoGEvosMoves
dw FossilAerodactylEvosMoves dw ZapdosGEvosMoves
dw MonGhostEvosMoves dw MoltresGEvosMoves
dw OddishEvosMoves dw OddishEvosMoves
dw GloomEvosMoves dw GloomEvosMoves
dw VileplumeEvosMoves dw VileplumeEvosMoves
@ -231,7 +225,6 @@ EvosMovesPointerTable:
dw KingdraEvosMoves dw KingdraEvosMoves
dw PolitoedEvosMoves dw PolitoedEvosMoves
dw SlowkingEvosMoves dw SlowkingEvosMoves
;dw SlowkingGEvosMoves
dw ElectivireEvosMoves dw ElectivireEvosMoves
dw MagmortarEvosMoves dw MagmortarEvosMoves
dw ParaEvosMoves dw ParaEvosMoves
@ -261,12 +254,19 @@ EvosMovesPointerTable:
dw PersianAEvosMoves dw PersianAEvosMoves
dw GolemAEvosMoves dw GolemAEvosMoves
dw RapidashGEvosMoves dw RapidashGEvosMoves
dw SlowbroGEvosMoves
dw SlowkingGEvosMoves
dw MukAEvosMoves
dw ExeggutorAEvosMoves dw ExeggutorAEvosMoves
dw MarowakAEvosMoves dw MarowakAEvosMoves
dw ArticunoGEvosMoves dw WeezingGEvosMoves
dw ZapdosGEvosMoves dw TaurosPEvosMoves
dw MoltresGEvosMoves dw TaurosPAEvosMoves
dw TaurosPBEvosMoves
dw MissingNoEvosMoves dw MissingNoEvosMoves
dw FossilKabutopsEvosMoves
dw FossilAerodactylEvosMoves
dw MonGhostEvosMoves
assert_table_length NUM_POKEMON_INDEXES assert_table_length NUM_POKEMON_INDEXES
RhydonEvosMoves: RhydonEvosMoves:
@ -365,18 +365,6 @@ SlowbroEvosMoves:
db 55, PSYCHIC_M db 55, PSYCHIC_M
db 0 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: IvysaurEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 32, VENUSAUR db EV_LEVEL, 32, VENUSAUR
@ -1001,39 +989,6 @@ TaurosEvosMoves:
db 51, TAKE_DOWN db 51, TAKE_DOWN
db 0 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: TrampelEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
@ -1929,20 +1884,6 @@ MukEvosMoves:
db 60, ACID_ARMOR db 60, ACID_ARMOR
db 0 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: DecillaEvosMoves:
; Evolutions ; Evolutions
db EV_LEVEL, 40, GYAOON db EV_LEVEL, 40, GYAOON
@ -2013,18 +1954,6 @@ WeezingEvosMoves:
db 53, EXPLOSION db 53, EXPLOSION
db 0 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: PersianEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
@ -2482,22 +2411,45 @@ TotartleEvosMoves:
db 60, PETAL_DANCE db 60, PETAL_DANCE
db 0 db 0
FossilKabutopsEvosMoves: ArticunoGEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; 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 db 0
FossilAerodactylEvosMoves: ZapdosGEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; 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 db 0
MonGhostEvosMoves: MoltresGEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; 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 db 0
OddishEvosMoves: OddishEvosMoves:
@ -2853,18 +2805,6 @@ SlowkingEvosMoves:
db 55, PSYCHIC_M db 55, PSYCHIC_M
db 0 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: ElectivireEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
@ -3233,6 +3173,44 @@ RapidashGEvosMoves:
db 55, PSYCHIC_M db 55, PSYCHIC_M
db 0 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: ExeggutorAEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
@ -3257,45 +3235,49 @@ MarowakAEvosMoves:
db 55, FLAMETHROWER db 55, FLAMETHROWER
db 0 db 0
ArticunoGEvosMoves: WeezingGEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 40, REFLECT db 32, SLUDGE
db 45, HYPNOSIS db 37, SMOKESCREEN
db 51, PSYBEAM db 40, SELFDESTRUCT
db 55, AGILITY db 43, DAZZLE_GLEAM
db 60, LIGHT_SCREEN db 49, HAZE
db 65, RECOVER db 53, EXPLOSION
db 70, DREAM_EATER
db 0 db 0
ZapdosGEvosMoves: TaurosPEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 40, DOUBLE_KICK db 21, ROLLING_KICK
db 45, LIGHT_SCREEN db 28, TAIL_WHIP
db 51, LOW_KICK db 35, LEER
db 55, AGILITY db 44, RAGE
db 58, JUMP_KICK db 51, JUMP_KICK
db 62, DRILL_PECK
db 66, ROLLING_KICK
db 70, HI_JUMP_KICK
db 0 db 0
MoltresGEvosMoves: TaurosPAEvosMoves:
; Evolutions ; Evolutions
db 0 db 0
; Learnset ; Learnset
db 40, BITE ; Fake Tears db 21, LOW_KICK
db 45, WING_ATTACK db 28, TAIL_WHIP
db 51, BRUTAL_SWING db 35, LEER
db 55, AGILITY db 44, RAGE
db 58, FEINT_ATTACK db 51, HYDRO_PUMP
db 62, AMNESIA ; Nasty Plot db 0
db 66, NIGHT_SLASH ; False Surrender
db 70, SKY_ATTACK 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 db 0
MissingNoEvosMoves: MissingNoEvosMoves:
@ -3303,3 +3285,21 @@ MissingNoEvosMoves:
db 0 db 0
; Learnset ; Learnset
db 0 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_WATER ; Kingler
nybble ICON_QUADRUPED ; Slowpoke nybble ICON_QUADRUPED ; Slowpoke
nybble ICON_MON ; Slowbro nybble ICON_MON ; Slowbro
; nybble ICON_MON ; Slowbro-G nybble ICON_MON ; Slowbro-G
nybble ICON_MON ; Slowking nybble ICON_MON ; Slowking
; nybble ICON_MON ; Slowking-G nybble ICON_MON ; Slowking-G
nybble ICON_QUADRUPED ; Puchikoon nybble ICON_QUADRUPED ; Puchikoon
nybble ICON_QUADRUPED ; Ponyta nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash nybble ICON_QUADRUPED ; Rapidash
@ -168,10 +168,10 @@ MonPartyData:
nybble ICON_MON ; Betobebii nybble ICON_MON ; Betobebii
nybble ICON_MON ; Grimer nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk nybble ICON_MON ; Muk
; nybble ICON_MON ; Muk-A nybble ICON_MON ; Muk-A
nybble ICON_MON ; Koffing nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing nybble ICON_MON ; Weezing
; nybble ICON_MON ; Weezing-G nybble ICON_MON ; Weezing-G
nybble ICON_WATER ; Blastyke nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise nybble ICON_WATER ; Blastoise
nybble ICON_MON ; Ditto nybble ICON_MON ; Ditto
@ -207,16 +207,15 @@ MonPartyData:
nybble ICON_MON ; Kangaskhan nybble ICON_MON ; Kangaskhan
nybble ICON_MON ; Trampel nybble ICON_MON ; Trampel
nybble ICON_QUADRUPED ; Tauros nybble ICON_QUADRUPED ; Tauros
; nybble ICON_QUADRUPED ; Tauros-P nybble ICON_QUADRUPED ; Tauros-P
; nybble ICON_QUADRUPED ; Tauros-PA nybble ICON_QUADRUPED ; Tauros-PA
; nybble ICON_QUADRUPED ; Tauros-PB nybble ICON_QUADRUPED ; Tauros-PB
nybble ICON_FAIRY ; Chansey nybble ICON_FAIRY ; Chansey
nybble ICON_FAIRY ; Blissey nybble ICON_FAIRY ; Blissey
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_MON ; Mr.Mime nybble ICON_MON ; Mr.Mime
; nybble ICON_MON ; Mr.Mime-G
nybble ICON_MON ; Mr.Rime nybble ICON_MON ; Mr.Rime
nybble ICON_MON ; Jynx nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu nybble ICON_MON ; Buu

26
data/pokemon/names.asm
View file

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

112
data/pokemon/new_dex_text.asm
View file

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

16
data/pokemon/palettes.asm
View file

@ -129,7 +129,7 @@ MonsterPalettes:
db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACOOL
db PAL_CYANMON ; TENTACRUEL db PAL_CYANMON ; TENTACRUEL
db PAL_BROWNMON ; TOEDSCOOL 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 ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON db PAL_GREYMON ; MAGNETON
@ -145,9 +145,9 @@ MonsterPalettes:
db PAL_REDMON ; KINGLER db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWPOKE
db PAL_PINKMON ; SLOWBRO db PAL_PINKMON ; SLOWBRO
; db PAL_PURPLEMON ; SLOWBRO_G db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PINKMON ; SLOWKING db PAL_PINKMON ; SLOWKING
; db PAL_PURPLEMON ; SLOWKING_G db PAL_PURPLEMON ; SLOWKING_G
db PAL_REDMON ; PUCHIKOON db PAL_REDMON ; PUCHIKOON
db PAL_REDMON ; PONYTA db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH db PAL_REDMON ; RAPIDASH
@ -169,10 +169,10 @@ MonsterPalettes:
db PAL_PURPLEMON ; BETOBEBII db PAL_PURPLEMON ; BETOBEBII
db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; GRIMER
db PAL_PURPLEMON ; MUK db PAL_PURPLEMON ; MUK
; db PAL_GREENMON ; MUK_A db PAL_GREENMON ; MUK_A
db PAL_PURPLEMON ; KOFFING db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING db PAL_PURPLEMON ; WEEZING
; db PAL_GREYMON ; WEEZING_G db PAL_GREYMON ; WEEZING_G
db PAL_CYANMON ; BLASTYKE db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE db PAL_CYANMON ; BLASTOISE
db PAL_PURPLEMON ; DITTO db PAL_PURPLEMON ; DITTO
@ -208,9 +208,9 @@ MonsterPalettes:
db PAL_BROWNMON ; KANGASKHAN db PAL_BROWNMON ; KANGASKHAN
db PAL_GREYMON ; TRAMPEL db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS db PAL_BROWNMON ; TAUROS
; db PAL_GREYMON ; TAUROS_P db PAL_GREYMON ; TAUROS_P
; db PAL_BLUEMON ; TAUROS_PA db PAL_BLUEMON ; TAUROS_PA
; db PAL_REDMON ; TAUROS_PB db PAL_REDMON ; TAUROS_PB
db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY db PAL_PINKMON ; BLISSEY
db PAL_CYANMON ; SKIMPER db PAL_CYANMON ; SKIMPER

46
data/trainers/scaled_parties.asm
View file

@ -11,15 +11,15 @@ BrockData:
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame) db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame)
MistyData: MistyData:
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1 db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2 db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3 db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, STARMIE, 0 ; 4 db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, STARMIE, 0 ; 4
db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5 db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6 db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0 ; 7 (unused) db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0 ; 7 (unused)
db $FF, 66, STARMIE, 67, VAPOREON, 67, GOLDUCK, 66, TOTARTLE, 67, JAGG, 70, GYARADOS, 0 ; 8 (postgame) db $FF, 66, STARMIE, 67, VAPOREON, 67, TAUROS_PA, 66, TOTARTLE, 67, GOLDUCK, 70, GYARADOS, 0 ; 8 (postgame)
LtSurgeData: LtSurgeData:
db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges
@ -52,18 +52,18 @@ KogaData:
db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5 db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
db $FF, 44, TENTACRUEL, 45, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6 db $FF, 44, TENTACRUEL, 45, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
db $FF, 46, TENTACRUEL, 46, NIDOKING, 47, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 db $FF, 46, TENTACRUEL, 46, NIDOKING, 47, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7
db $FF, 66, TENTACRUEL, 67, NIDOKING, 66, TSUBOMITTO, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame) db $FF, 66, TSUBOMITTO, 67, NIDOKING, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
BlaineData: BlaineData:
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused?) db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused?)
db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1
db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2 db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2
db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0 ; 3 db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0 ; 3
db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0 ; 4 db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0 ; 4
db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5 db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6 db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6
db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused) db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused)
db $FF, 66, NINETALES, 67, RAPIDASH, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame) db $FF, 66, NINETALES, 67, TAUROS_PB, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
SabrinaData: SabrinaData:
db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges
@ -85,9 +85,9 @@ GiovanniData: ; is not scaled as he is always fought last
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0 db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0
LoreleiData: LoreleiData:
db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, MR_RIME, 55, BUU, 56, LAPRAS, 0 db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, BUU, 56, LAPRAS, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
db $FF, 74, DEWGONG, 73, CLOYSTER, 74, GLACEON, 75, MR_RIME, 75, LAPRAS, 76, ARTICUNO, 0 db $FF, 74, DEWGONG, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 76, ARTICUNO, 0
BrunoData: BrunoData:
db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0 db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
@ -102,7 +102,7 @@ AgathaData:
LanceData: LanceData:
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0 db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0
; post-game rematch team (currently unused) ; post-game rematch team (currently unused)
db $FF, 78, CROCKY, 77, KINGDRA, 77, AERODACTYL, 79, EXEGGUTOR_A, 79, CRYITHAN, 82, DRAGONITE, 0 db $FF, 78, CROCKY, 77, KINGDRA, 77, EXEGGUTOR_A, 79, AERODACTYL, 79, CRYITHAN, 82, DRAGONITE, 0
YujirouData: ; was unused juggler YujirouData: ; was unused juggler
db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0 db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0
@ -120,7 +120,7 @@ BlackbeltData:
db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 6 db 46, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, 0 ; 6
db 49, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7 db 49, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7
db 53, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8 db 53, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8
db 67, MACHAMP, ANNIHILAPE, POLIWRATH, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet db 67, MACHAMP, ANNIHILAPE, TAUROS_P, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet
; Fighting Dojo Trainers ; Fighting Dojo Trainers
db 31, CHEEP, CHEEP, JABETTA, 0 db 31, CHEEP, CHEEP, JABETTA, 0
db 32, MACHOKE, MACHAMP, 0 db 32, MACHOKE, MACHAMP, 0

2
engine/menus/pokedex.asm
View file

@ -199,7 +199,7 @@ HandlePokedexListMenu:
call PlaceString call PlaceString
; find the highest pokedex number among the pokemon the player has seen ; find the highest pokedex number among the pokemon the player has seen
ld hl, wPokedexSeenEnd - 1 ld hl, wPokedexSeenEnd - 1
ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 - 4 ; this line's causing some issues, so we basically broke it for now
.maxSeenPokemonLoop .maxSeenPokemonLoop
ld a, [hld] ld a, [hld]
ld c, 8 ld c, 8

14
gfx/pics.asm
View file

@ -571,10 +571,24 @@ GolemAPicFront:: INCBIN "gfx/pokemon/front/golema.pic"
GolemAPicBack:: INCBIN "gfx/pokemon/back/golemab.pic" GolemAPicBack:: INCBIN "gfx/pokemon/back/golemab.pic"
RapidashGPicFront:: INCBIN "gfx/pokemon/front/rapidashg.pic" RapidashGPicFront:: INCBIN "gfx/pokemon/front/rapidashg.pic"
RapidashGPicBack:: INCBIN "gfx/pokemon/back/rapidashgb.pic" RapidashGPicBack:: INCBIN "gfx/pokemon/back/rapidashgb.pic"
SlowbroGPicFront:: INCBIN "gfx/pokemon/front/slowbrog.pic"
SlowbroGPicBack:: INCBIN "gfx/pokemon/back/slowbrogb.pic"
SlowkingGPicFront:: INCBIN "gfx/pokemon/front/slowkingg.pic"
SlowkingGPicBack:: INCBIN "gfx/pokemon/back/slowkinggb.pic"
MukAPicFront:: INCBIN "gfx/pokemon/front/muka.pic"
MukAPicBack:: INCBIN "gfx/pokemon/back/mukab.pic"
ExeggutorAPicFront:: INCBIN "gfx/pokemon/front/exeggutora.pic" ExeggutorAPicFront:: INCBIN "gfx/pokemon/front/exeggutora.pic"
ExeggutorAPicBack:: INCBIN "gfx/pokemon/back/exeggutorab.pic" ExeggutorAPicBack:: INCBIN "gfx/pokemon/back/exeggutorab.pic"
MarowakAPicFront:: INCBIN "gfx/pokemon/front/marowaka.pic" MarowakAPicFront:: INCBIN "gfx/pokemon/front/marowaka.pic"
MarowakAPicBack:: INCBIN "gfx/pokemon/back/marowakab.pic" MarowakAPicBack:: INCBIN "gfx/pokemon/back/marowakab.pic"
WeezingGPicFront:: INCBIN "gfx/pokemon/front/weezingg.pic"
WeezingGPicBack:: INCBIN "gfx/pokemon/back/weezinggb.pic"
TaurosPPicFront:: INCBIN "gfx/pokemon/front/taurospcombat.pic"
TaurosPPicBack:: INCBIN "gfx/pokemon/back/taurospcombatb.pic"
TaurosPAPicFront:: INCBIN "gfx/pokemon/front/taurospaqua.pic"
TaurosPAPicBack:: INCBIN "gfx/pokemon/back/taurospaquab.pic"
TaurosPBPicFront:: INCBIN "gfx/pokemon/front/taurospblaze.pic"
TaurosPBPicBack:: INCBIN "gfx/pokemon/back/taurospblazeb.pic"
YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic"
StudentPic:: INCBIN "gfx/trainers/student.pic" StudentPic:: INCBIN "gfx/trainers/student.pic"

BIN
gfx/pokemon/front/taurospcombat.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 772 B

After

Width:  |  Height:  |  Size: 771 B