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

Uh oh...it's weirduck.

Browse source 
He's finally here. Performing for you. And he has a very, very funny face.
This commit is contained in:
Llinos Evans 2024-07-06 17:43:35 +01:00
parent 2f19d364ab
commit d191b9c60b
35 changed files with 66 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/pokemon_constants.asm
View file

@ -87,6 +87,7 @@
const PERSIAN ; 35
const PERRSERKER
const PSYDUCK ; 36
const WEIRDUCK
const GOLDUCK ; 37
const MANKEY ; 38
const PRIMEAPE ; 39

1
data/pokemon/base_stats.asm
View file

@ -95,6 +95,7 @@ INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/perrserker.asm"
INCLUDE "data/pokemon/base_stats/psyduck.asm"
INCLUDE "data/pokemon/base_stats/weirduck.asm"
INCLUDE "data/pokemon/base_stats/golduck.asm"
INCLUDE "data/pokemon/base_stats/mankey.asm"
INCLUDE "data/pokemon/base_stats/primeape.asm"

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

@ -1,4 +1,4 @@
db 0 ; species ID placeholder
db WEIRDUCK ; species ID placeholder
db 65, 67, 63, 70, 80, 65
; hp atk def spd sat sdf

1
data/pokemon/cries.asm
View file

@ -74,6 +74,7 @@ PokemonCries::
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN
mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise)
mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK
mon_cry CRY_PSYDUCK, 32, 224 ; WEIRDUCK (incomplete)
mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK
mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY
mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE

1
data/pokemon/dex_entries.asm
View file

@ -68,6 +68,7 @@ MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm"
PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm"
PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm"
PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm"
WeirduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weirduck.asm"
GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm"
MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm"
PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm"

10
data/pokemon/dex_entries/weirduck.asm Normal file
View file

@ -0,0 +1,10 @@
db "DUCK@" ; species name
dw 207, 430 ; height, weight - temp
db "In the midst of"
next "its awkward phase,"
next "its psychic power"
page "has begun to awa-"
next "ken. Mainly lives"
next "in swamps.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -69,6 +69,7 @@ PokedexDataPointerTable:
dba PersianPokedexEntry
dba PerrserkerPokedexEntry
dba PsyduckPokedexEntry
dba WeirduckPokedexEntry
dba GolduckPokedexEntry
dba MankeyPokedexEntry
dba PrimeapePokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -349,6 +349,7 @@ AlphabeticalPokedexOrder:
dw WEEDLE
dw WEEPINBELL
dw WEEZING
dw WEIRDUCK
dw WIGGLYTUFF
dw WISPIRIT
dw WOBBUFFET

1
data/pokemon/dex_order_new.asm
View file

@ -179,6 +179,7 @@ NewPokedexOrder:
dw MOIBELLE
dw BELLEDAM
dw PSYDUCK
dw WEIRDUCK
dw GOLDUCK
dw MACHOP
dw MACHOKE

1
data/pokemon/egg_moves_kanto.asm
View file

@ -70,6 +70,7 @@ EggMovePointers1:
dw NoEggMoves1 ; Perrserker
dw PsyduckEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw MankeyEggMoves
dw NoEggMoves1
dw NoEggMoves1 ; Annihilape

18
data/pokemon/evos_attacks_kanto.asm
View file

@ -69,6 +69,7 @@ EvosAttacksPointers1::
dw PersianEvosAttacks
dw PerrserkerEvosAttacks
dw PsyduckEvosAttacks
dw WeirduckEvosAttacks
dw GolduckEvosAttacks
dw MankeyEvosAttacks
dw PrimeapeEvosAttacks
@ -1066,7 +1067,7 @@ PerrserkerEvosAttacks:
db 0 ; no more level-up moves
PsyduckEvosAttacks:
dbbw EVOLVE_LEVEL, 33, GOLDUCK
dbbw EVOLVE_LEVEL, 22, WEIRDUCK
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 5, TAIL_WHIP
@ -1078,6 +1079,21 @@ PsyduckEvosAttacks:
dbw 50, HYDRO_PUMP
db 0 ; no more level-up moves
WeirduckEvosAttacks:
dbbw EVOLVE_LEVEL, 35, GOLDUCK
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 5, TAIL_WHIP
dbw 10, DISABLE
dbw 16, CONFUSION
dbw 25, SCREECH
dbw 28, AMNESIA
dbw 31, GLARE
dbw 34, PSYCH_UP
dbw 42, FURY_SWIPES
dbw 54, HYDRO_PUMP
db 0 ; no more level-up moves
GolduckEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH

1
data/pokemon/first_stages.asm
View file

@ -70,6 +70,7 @@ FirstEvoStages::
dw MEOWTH ; Perrserker, should be MEOWTH_G
dw PSYDUCK
dw PSYDUCK
dw PSYDUCK
dw MANKEY ;38
dw MANKEY
dw ANNIHILAPE

1
data/pokemon/gen1_base_special.asm
View file

@ -70,6 +70,7 @@ KantoMonSpecials:
db 65 ; PERSIAN
db 50 ; PERRSERKER
db 50 ; PSYDUCK
db 65 ; WEIRDUCK
db 80 ; GOLDUCK
db 35 ; MANKEY
db 60 ; PRIMEAPE

1
data/pokemon/gen1_order.asm
View file

@ -358,4 +358,5 @@ Pokered_MonIndices:
db STRICHEEL
db LURREEL
db MANTYKE
db WEIRDUCK
assert_table_length NUM_POKEMON - 1

1
data/pokemon/menu_icons.asm
View file

@ -70,6 +70,7 @@ MonMenuIcons:
db ICON_FOX ; PERSIAN
db ICON_FOX ; PERRSERKER
db ICON_MONSTER ; PSYDUCK
db ICON_MONSTER ; WEIRDUCK
db ICON_MONSTER ; GOLDUCK
db ICON_FIGHTER ; MANKEY
db ICON_FIGHTER ; PRIMEAPE

1
data/pokemon/names.asm
View file

@ -72,6 +72,7 @@ PokemonNames::
db "PERSIAN@@@"
db "PERRSERKER"
db "PSYDUCK@@@"
db "WEIRDUCK@@"
db "GOLDUCK@@@"
db "MANKEY@@@@"
db "PRIMEAPE@@"

2
data/pokemon/palettes.asm
View file

@ -169,6 +169,8 @@ INCBIN "gfx/pokemon/perrserker/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/perrserker/shiny.pal"
INCBIN "gfx/pokemon/psyduck/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/psyduck/shiny.pal"
INCBIN "gfx/pokemon/weirduck/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/weirduck/shiny.pal"
INCBIN "gfx/pokemon/golduck/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/golduck/shiny.pal"
INCBIN "gfx/pokemon/mankey/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -149,6 +149,8 @@ PokemonPicPointers::
dba PerrserkerBackpic
dba PsyduckFrontpic
dba PsyduckBackpic
dba WeirduckFrontpic
dba WeirduckBackpic
dba GolduckFrontpic
dba GolduckBackpic
dba MankeyFrontpic

10
data/wild/johto_water.asm
View file

@ -46,9 +46,9 @@ JohtoWaterWildMons:
def_water_wildmons ILEX_FOREST
db 2 percent ; encounter rate
dbw 15, PSYDUCK
dbw 10, PSYDUCK ; WEIRDUCK
dbw 15, GOLDUCK
dbw 20, PSYDUCK
dbw 25, WEIRDUCK
dbw 35, GOLDUCK
end_water_wildmons
def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE
@ -159,8 +159,8 @@ JohtoWaterWildMons:
def_water_wildmons ROUTE_35
db 4 percent ; encounter rate
dbw 20, PSYDUCK
dbw 15, PSYDUCK
dbw 20, GOLDUCK
dbw 25, WEIRDUCK
dbw 35, GOLDUCK
end_water_wildmons
def_water_wildmons ROUTE_40

1
gfx/footprints.asm
View file

@ -69,6 +69,7 @@ INCBIN "gfx/footprints/meowth.1bpp"
INCBIN "gfx/footprints/persian.1bpp"
INCBIN "gfx/footprints/perrserker.1bpp"
INCBIN "gfx/footprints/psyduck.1bpp"
INCBIN "gfx/footprints/weirduck.1bpp"
INCBIN "gfx/footprints/golduck.1bpp"
INCBIN "gfx/footprints/mankey.1bpp"
INCBIN "gfx/footprints/primeape.1bpp"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 69 B

4
gfx/pics.asm
View file

@ -939,4 +939,6 @@ StricheelBackpic: INCBIN "gfx/pokemon/stricheel/back.2bpp.lz"
LurreelFrontpic: INCBIN "gfx/pokemon/lurreel/front.animated.2bpp.lz"
LurreelBackpic: INCBIN "gfx/pokemon/lurreel/back.2bpp.lz"
MantykeFrontpic: INCBIN "gfx/pokemon/mantyke/front.animated.2bpp.lz"
MantykeBackpic: INCBIN "gfx/pokemon/mantyke/back.2bpp.lz"
MantykeBackpic: INCBIN "gfx/pokemon/mantyke/back.2bpp.lz"
WeirduckFrontpic: INCBIN "gfx/pokemon/weirduck/front.animated.2bpp.lz"
WeirduckBackpic: INCBIN "gfx/pokemon/weirduck/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -68,6 +68,7 @@ AnimationPointers:
dw PersianAnimation
dw PerrserkerAnimation
dw PsyduckAnimation
dw WeirduckAnimation
dw GolduckAnimation
dw MankeyAnimation
dw PrimeapeAnimation

1
gfx/pokemon/anims.asm
View file

@ -66,6 +66,7 @@ MeowthAnimation: INCLUDE "gfx/pokemon/meowth/anim.asm"
PersianAnimation: INCLUDE "gfx/pokemon/persian/anim.asm"
PerrserkerAnimation: INCLUDE "gfx/pokemon/perrserker/anim.asm"
PsyduckAnimation: INCLUDE "gfx/pokemon/psyduck/anim.asm"
WeirduckAnimation: INCLUDE "gfx/pokemon/weirduck/anim.asm"
GolduckAnimation: INCLUDE "gfx/pokemon/golduck/anim.asm"
MankeyAnimation: INCLUDE "gfx/pokemon/mankey/anim.asm"
PrimeapeAnimation: INCLUDE "gfx/pokemon/primeape/anim.asm"

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -68,6 +68,7 @@ BitmasksPointers:
dw PersianBitmasks
dw PerrserkerBitmasks
dw PsyduckBitmasks
dw WeirduckBitmasks
dw GolduckBitmasks
dw MankeyBitmasks
dw PrimeapeBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -66,6 +66,7 @@ MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm"
PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm"
PerrserkerBitmasks: INCLUDE "gfx/pokemon/perrserker/bitmask.asm"
PsyduckBitmasks: INCLUDE "gfx/pokemon/psyduck/bitmask.asm"
WeirduckBitmasks: INCLUDE "gfx/pokemon/weirduck/bitmask.asm"
GolduckBitmasks: INCLUDE "gfx/pokemon/golduck/bitmask.asm"
MankeyBitmasks: INCLUDE "gfx/pokemon/mankey/bitmask.asm"
PrimeapeBitmasks: INCLUDE "gfx/pokemon/primeape/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -68,6 +68,7 @@ FramesPointers:
dba PersianFrames
dba PerrserkerFrames
dba PsyduckFrames
dba WeirduckFrames
dba GolduckFrames
dba MankeyFrames
dba PrimeapeFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -68,6 +68,7 @@ AnimationIdlePointers:
dw PersianAnimationIdle
dw PerrserkerAnimationIdle
dw PsyduckAnimationIdle
dw WeirduckAnimationIdle
dw GolduckAnimationIdle
dw MankeyAnimationIdle
dw PrimeapeAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -66,6 +66,7 @@ MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm"
PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm"
PerrserkerAnimationIdle: INCLUDE "gfx/pokemon/perrserker/anim_idle.asm"
PsyduckAnimationIdle: INCLUDE "gfx/pokemon/psyduck/anim_idle.asm"
WeirduckAnimationIdle: INCLUDE "gfx/pokemon/weirduck/anim_idle.asm"
GolduckAnimationIdle: INCLUDE "gfx/pokemon/golduck/anim_idle.asm"
MankeyAnimationIdle: INCLUDE "gfx/pokemon/mankey/anim_idle.asm"
PrimeapeAnimationIdle: INCLUDE "gfx/pokemon/primeape/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -68,6 +68,7 @@ MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm"
PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm"
PerrserkerFrames: INCLUDE "gfx/pokemon/perrserker/frames.asm"
PsyduckFrames: INCLUDE "gfx/pokemon/psyduck/frames.asm"
WeirduckFrames: INCLUDE "gfx/pokemon/weirduck/frames.asm"
GolduckFrames: INCLUDE "gfx/pokemon/golduck/frames.asm"
MankeyFrames: INCLUDE "gfx/pokemon/mankey/frames.asm"
PrimeapeFrames: INCLUDE "gfx/pokemon/primeape/frames.asm"

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

@ -0,0 +1 @@
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

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

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