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

WE FORGOT WYNAUT

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

1
constants/pokemon_constants.asm
View file

@ -265,6 +265,7 @@ DEF JOHTO_POKEMON EQU const_value
const STROMEN
const PHANDARIN
const UNOWN ; c9
const WYNAUT
const WOBBUFFET ; ca
const BIPULLA
const CALFLAC

1
data/pokemon/base_stats.asm
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"

20
data/pokemon/base_stats/wynaut.asm Normal file
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

1
data/pokemon/cries.asm
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)

1
data/pokemon/dex_entries.asm
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"

10
data/pokemon/dex_entries/wynaut.asm Normal file
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.@"

1
data/pokemon/dex_entry_pointers.asm
View file

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

1
data/pokemon/dex_order_alpha.asm
View file

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

1
data/pokemon/dex_order_new.asm
View file

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

1
data/pokemon/egg_moves_johto.asm
View file

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

13
data/pokemon/evos_attacks_johto.asm
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

3
data/pokemon/first_stages.asm
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

1
data/pokemon/gen1_order.asm
View file

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

1
data/pokemon/menu_icons.asm
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

1
data/pokemon/names.asm
View file

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

2
data/pokemon/palettes.asm
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

2
data/pokemon/pic_pointers.asm
View file

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

1
gfx/footprints.asm
View file

@ -246,6 +246,7 @@ INCBIN "gfx/footprints/mismagius.1bpp"
INCBIN "gfx/footprints/stromen.1bpp"
INCBIN "gfx/footprints/phandarin.1bpp"
INCBIN "gfx/footprints/unown.1bpp"
INCBIN "gfx/footprints/wynaut.1bpp"
INCBIN "gfx/footprints/wobbuffet.1bpp"
INCBIN "gfx/footprints/bipulla.1bpp"
INCBIN "gfx/footprints/calflac.1bpp"

BIN
gfx/footprints/wynaut.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 80 B

2
gfx/pics.asm
View file

@ -763,6 +763,8 @@ DudunsparceFrontpic: INCBIN "gfx/pokemon/dudunsparce/front.animated.2bpp.lz"
DudunsparceBackpic: INCBIN "gfx/pokemon/dudunsparce/back.2bpp.lz"
UrsalunaFrontpic: INCBIN "gfx/pokemon/ursaluna/front.animated.2bpp.lz"
UrsalunaBackpic: INCBIN "gfx/pokemon/ursaluna/back.2bpp.lz"
WynautFrontpic: INCBIN "gfx/pokemon/wynaut/front.animated.2bpp.lz"
WynautBackpic: INCBIN "gfx/pokemon/wynaut/back.2bpp.lz"
SECTION "Pics 20", ROMX

1
gfx/pokemon/anim_pointers.asm
View file

@ -245,6 +245,7 @@ AnimationPointers:
dw StromenAnimation
dw PhandarinAnimation
dw UnownAnimation
dw WynautAnimation
dw WobbuffetAnimation
dw BipullaAnimation
dw CalflacAnimation

1
gfx/pokemon/anims.asm
View file

@ -243,6 +243,7 @@ MismagiusAnimation: INCLUDE "gfx/pokemon/mismagius/anim.asm"
StromenAnimation: INCLUDE "gfx/pokemon/stromen/anim.asm"
PhandarinAnimation: INCLUDE "gfx/pokemon/phandarin/anim.asm"
UnownAnimation: INCLUDE "gfx/pokemon/unown/anim.asm"
WynautAnimation: INCLUDE "gfx/pokemon/wynaut/anim.asm"
WobbuffetAnimation: INCLUDE "gfx/pokemon/wobbuffet/anim.asm"
BipullaAnimation: INCLUDE "gfx/pokemon/bipulla/anim.asm"
CalflacAnimation: INCLUDE "gfx/pokemon/calflac/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -245,6 +245,7 @@ BitmasksPointers:
dw StromenBitmasks
dw PhandarinBitmasks
dw UnownBitmasks
dw WynautBitmasks
dw WobbuffetBitmasks
dw BipullaBitmasks
dw CalflacBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -243,6 +243,7 @@ MismagiusBitmasks: INCLUDE "gfx/pokemon/mismagius/bitmask.asm"
StromenBitmasks: INCLUDE "gfx/pokemon/stromen/bitmask.asm"
PhandarinBitmasks: INCLUDE "gfx/pokemon/phandarin/bitmask.asm"
UnownBitmasks: INCLUDE "gfx/pokemon/unown/bitmask.asm"
WynautBitmasks: INCLUDE "gfx/pokemon/wynaut/bitmask.asm"
WobbuffetBitmasks: INCLUDE "gfx/pokemon/wobbuffet/bitmask.asm"
BipullaBitmasks: INCLUDE "gfx/pokemon/bipulla/bitmask.asm"
CalflacBitmasks: INCLUDE "gfx/pokemon/calflac/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -245,6 +245,7 @@ FramesPointers:
dba StromenFrames
dba PhandarinFrames
dba UnownFrames
dba WynautFrames
dba WobbuffetFrames
dba BipullaFrames
dba CalflacFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -245,6 +245,7 @@ AnimationIdlePointers:
dw StromenAnimationIdle
dw PhandarinAnimationIdle
dw UnownAnimationIdle
dw WynautAnimationIdle
dw WobbuffetAnimationIdle
dw BipullaAnimationIdle
dw CalflacAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -243,6 +243,7 @@ MismagiusAnimationIdle: INCLUDE "gfx/pokemon/mismagius/anim_idle.asm"
StromenAnimationIdle: INCLUDE "gfx/pokemon/stromen/anim_idle.asm"
PhandarinAnimationIdle: INCLUDE "gfx/pokemon/phandarin/anim_idle.asm"
UnownAnimationIdle: INCLUDE "gfx/pokemon/unown/anim_idle.asm"
WynautAnimationIdle: INCLUDE "gfx/pokemon/wynaut/anim_idle.asm"
WobbuffetAnimationIdle: INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm"
BipullaAnimationIdle: INCLUDE "gfx/pokemon/bipulla/anim_idle.asm"
CalflacAnimationIdle: INCLUDE "gfx/pokemon/calflac/anim_idle.asm"

1
gfx/pokemon/johto_frames.asm
View file

@ -67,6 +67,7 @@ MismagiusFrames: INCLUDE "gfx/pokemon/mismagius/frames.asm"
StromenFrames: INCLUDE "gfx/pokemon/stromen/frames.asm"
PhandarinFrames: INCLUDE "gfx/pokemon/phandarin/frames.asm"
UnownFrames: INCLUDE "gfx/pokemon/unown/frames.asm"
WynautFrames: INCLUDE "gfx/pokemon/wynaut/frames.asm"
WobbuffetFrames: INCLUDE "gfx/pokemon/wobbuffet/frames.asm"
BipullaFrames: INCLUDE "gfx/pokemon/bipulla/frames.asm"
CalflacFrames: INCLUDE "gfx/pokemon/calflac/frames.asm"

1
gfx/pokemon/wynaut/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/wynaut/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/wynaut/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

4
maps/DebugRoom.asm
View file

@ -8,12 +8,12 @@ DebugRoom_MapScripts:
DebugPokemon1Script:
opentext
getmonname STRING_BUFFER_3, MISDREAVUS
getmonname STRING_BUFFER_3, WYNAUT
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke MISDREAVUS, 42, DUSK_STONE
givepoke WYNAUT, 14, RARE_CANDY
closetext
end