WE FORGOT WYNAUT

This commit is contained in:
Misty 2023-11-19 03:20:34 -05:00
parent 3ec32bd3d2
commit 0721a89fea
34 changed files with 79 additions and 5 deletions

View file

@ -272,6 +272,7 @@ INCLUDE "data/pokemon/base_stats/mismagius.asm"
INCLUDE "data/pokemon/base_stats/stromen.asm"
INCLUDE "data/pokemon/base_stats/phandarin.asm"
INCLUDE "data/pokemon/base_stats/unown.asm"
INCLUDE "data/pokemon/base_stats/wynaut.asm"
INCLUDE "data/pokemon/base_stats/wobbuffet.asm"
INCLUDE "data/pokemon/base_stats/bipulla.asm"
INCLUDE "data/pokemon/base_stats/calflac.asm"

View file

@ -0,0 +1,20 @@
db 0 ; species ID placeholder
db 95, 23, 48, 23, 23, 48
; hp atk def spd sat sdf
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 125 ; catch rate
db 44 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/wynaut/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_NONE, EGG_NONE ; egg groups
; tm/hm learnset
tmhm
; end

View file

@ -251,6 +251,7 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; STROMEN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PHANDARIN (incomplete)
mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN
mon_cry CRY_NIDORAN_M, 0, 0 ; WYNAUT (incomplete)
mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET
mon_cry CRY_NIDORAN_M, 0, 0 ; BIPULLA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CALFLAC (incomplete)

View file

@ -257,6 +257,7 @@ MismagiusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mismagius.asm"
StromenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stromen.asm"
PhandarinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/phandarin.asm"
UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm"
WynautPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wynaut.asm"
WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm"
BipullaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bipulla.asm"
CalflacPokedexEntry:: INCLUDE "data/pokemon/dex_entries/calflac.asm"

View file

@ -0,0 +1,10 @@
db "BRIGHT@" ; species name
dw 200, 309 ; height, weight
db "It often steals"
next "objects it thinks"
next "are food, the"
page "punishments it"
next "recieves only"
next "strengthening it.@"

View file

@ -246,6 +246,7 @@ PokedexDataPointerTable:
dba StromenPokedexEntry
dba PhandarinPokedexEntry
dba UnownPokedexEntry
dba WynautPokedexEntry
dba WobbuffetPokedexEntry
dba BipullaPokedexEntry
dba CalflacPokedexEntry

View file

@ -300,6 +300,7 @@ AlphabeticalPokedexOrder:
dw WIGGLYTUFF
dw WOBBUFFET
dw WOOPER
dw WYNAUT
dw XATU
dw YANMA
dw ZAPDOS

View file

@ -129,6 +129,7 @@ NewPokedexOrder:
dw EXEGGCUTE
dw EXEGGUTOR
dw SUDOWOODO
dw WYNAUT
dw WOBBUFFET
dw VENONAT
dw VENOMOTH

View file

@ -69,6 +69,7 @@ EggMovePointers2::
dw StromenEggMoves
dw NoEggMoves2 ; Phandarin
dw NoEggMoves2
dw NoEggMoves2 ; Wynaut
dw NoEggMoves2
dw BipullaEggMoves
dw NoEggMoves2 ; Calflac

View file

@ -68,6 +68,7 @@ EvosAttacksPointers2::
dw StromenEvosAttacks
dw PhandarinEvosAttacks
dw UnownEvosAttacks
dw WynautEvosAttacks
dw WobbuffetEvosAttacks
dw BipullaEvosAttacks
dw CalflacEvosAttacks
@ -1011,6 +1012,18 @@ UnownEvosAttacks:
dbw 1, HIDDEN_POWER
db 0 ; no more level-up moves
WynautEvosAttacks:
dbbw EVOLVE_LEVEL, 15, WOBBUFFET
db 0 ; no more evolutions
dbw 1, SPLASH
dbw 1, CHARM
dbw 1, ENCORE
dbw 15, COUNTER
dbw 15, MIRROR_COAT
dbw 15, SAFEGUARD
dbw 15, DESTINY_BOND
db 0 ; no more level-up moves
WobbuffetEvosAttacks:
db 0 ; no more evolutions
dbw 1, COUNTER

View file

@ -246,7 +246,8 @@ FirstEvoStages::
dw STROMEN
dw STROMEN
dw UNOWN
dw WOBBUFFET
dw WYNAUT
dw WYNAUT
dw BIPULLA
dw BIPULLA
dw BIPULLA

View file

@ -257,6 +257,7 @@ Pokered_MonIndices:
db STROMEN
db PHANDARIN
db UNOWN
db WYNAUT
db WOBBUFFET
db BIPULLA
db CALFLAC

View file

@ -247,6 +247,7 @@ MonMenuIcons:
db ICON_GHOST ; STROMEN
db ICON_GHOST ; PHANDARIN
db ICON_UNOWN ; UNOWN
db ICON_GHOST ; WYNAUT
db ICON_GHOST ; WOBBUFFET
db ICON_GHOST ; BIPULLA
db ICON_EQUINE ; CALFLAC

View file

@ -249,6 +249,7 @@ PokemonNames::
db "STROMEN@@@"
db "PHANDARIN@"
db "UNOWN@@@@@"
db "WYNAUT@@@@"
db "WOBBUFFET@"
db "BIPULLA@@@"
db "CALFLAC@@@"

View file

@ -523,6 +523,8 @@ INCBIN "gfx/pokemon/phandarin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/phandarin/shiny.pal"
INCLUDE "gfx/pokemon/unown/normal.pal" ; not front.gbcpal
INCLUDE "gfx/pokemon/unown/shiny.pal"
INCBIN "gfx/pokemon/wynaut/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wynaut/shiny.pal"
INCBIN "gfx/pokemon/wobbuffet/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wobbuffet/shiny.pal"
INCBIN "gfx/pokemon/bipulla/front.gbcpal", middle_colors

View file

@ -506,6 +506,8 @@ PokemonPicPointers::
dbw -1, -1
dbw -1, -1
dba WynautFrontpic
dba WynautBackpic
dba WobbuffetFrontpic
dba WobbuffetBackpic
dba BipullaFrontpic