Minor spelling mistake :)

It's KazAppelin. Whoops.
This commit is contained in:
Martha Schilling 2024-07-21 22:48:31 +01:00
parent 1a4b0c9566
commit 12928cfc81
35 changed files with 35 additions and 35 deletions

View file

@ -99,7 +99,7 @@ Additionally, there have been many wild encounter tweaks. View this document for
- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer
- Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly - Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
- SoupPotato et al - Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazeppelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
- SoupPotato et al - Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
- SCMidna: Munchlax
- EyeDonutz: Walking Wake
- SageDeoxys: (TBA)

View file

@ -326,7 +326,7 @@ DEF JOHTO_POKEMON EQU const_value
const GRANBULL ; d2
const CARETORKER
const QWILFISH ; d3
const KAZEPPELIN
const KAZAPPELIN
const QWILFATHER
const SCIZOR ; d4
const SHUCKLE ; d5

View file

@ -333,7 +333,7 @@ INCLUDE "data/pokemon/base_stats/snubbull.asm"
INCLUDE "data/pokemon/base_stats/granbull.asm"
INCLUDE "data/pokemon/base_stats/caretorker.asm"
INCLUDE "data/pokemon/base_stats/qwilfish.asm"
INCLUDE "data/pokemon/base_stats/kazeppelin.asm"
INCLUDE "data/pokemon/base_stats/kazappelin.asm"
INCLUDE "data/pokemon/base_stats/qwilfather.asm"
INCLUDE "data/pokemon/base_stats/scizor.asm"
INCLUDE "data/pokemon/base_stats/shuckle.asm"

View file

@ -1,4 +1,4 @@
db KAZEPPELIN ; species ID placeholder
db KAZAPPELIN ; species ID placeholder
db 75, 95, 75, 65, 115, 85
; hp atk def spd sat sdf
@ -11,7 +11,7 @@
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/kazeppelin/front.dimensions"
INCBIN "gfx/pokemon/kazappelin/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_WATER_2, EGG_WATER_2 ; egg groups

View file

@ -312,7 +312,7 @@ PokemonCries::
mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL
mon_cry CRY_RAIKOU, 64, 512 ; CARETORKER
mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH
mon_cry CRY_NIDORAN_M, 0, 0 ; KAZEPPELIN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; KAZAPPELIN (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; QWILFATHER (incomplete)
mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR
mon_cry CRY_DUNSPARCE, 656, 168 ; SHUCKLE

View file

@ -1,9 +1,9 @@
db "MINE@" ; species name
dw 509, 1684 ; height, weight
dw 511, 1680 ; height, weight
db "The current that"
next "runs through"
next "KAZEPPELIN is"
next "KAZAPPELIN is"
page "incredibly strong,"
next "paralyzing with"

View file

@ -307,7 +307,7 @@ PokedexDataPointerTable:
dba GranbullPokedexEntry
dba CaretorkerPokedexEntry
dba QwilfishPokedexEntry
dba KazeppelinPokedexEntry
dba KazappelinPokedexEntry
dba QwilfatherPokedexEntry
dba ScizorPokedexEntry
dba ShucklePokedexEntry

View file

@ -169,7 +169,7 @@ AlphabeticalPokedexOrder:
dw KADABRA
dw KAKUNA
dw KANGASKHAN
dw KAZEPPELIN
dw KAZAPPELIN
dw KINGDRA
dw KINGLER
dw KITSEN

View file

@ -226,7 +226,7 @@ NewPokedexOrder:
dw AERCROW
dw FOXFIRE
dw QWILFISH
dw KAZEPPELIN
dw KAZAPPELIN
dw QWILFATHER
dw TENTACOOL
dw TENTACRUEL

View file

@ -95,7 +95,7 @@ EggMovePointers2::
dw NoEggMoves2
dw CaretorkerEggMoves
dw QwilfishEggMoves
dw NoEggMoves2 ; Kazeppelin
dw NoEggMoves2 ; Kazappelin
dw NoEggMoves2 ; Qwilfather
dw NoEggMoves2
dw ShuckleEggMoves

View file

@ -95,7 +95,7 @@ EvosAttacksPointers2::
dw GranbullEvosAttacks
dw CaretorkerEvosAttacks
dw QwilfishEvosAttacks
dw KazeppelinEvosAttacks
dw KazappelinEvosAttacks
dw QwilfatherEvosAttacks
dw ScizorEvosAttacks
dw ShuckleEvosAttacks
@ -1401,7 +1401,7 @@ CaretorkerEvosAttacks:
db 0 ; no more level-up moves
QwilfishEvosAttacks:
dbbw EVOLVE_ITEM, THUNDERSTONE, KAZEPPELIN
dbbw EVOLVE_ITEM, THUNDERSTONE, KAZAPPELIN
dbbw EVOLVE_ITEM, POISON_STONE, QWILFATHER
db 0 ; no more evolutions
dbw 1, SPIKES
@ -1415,7 +1415,7 @@ QwilfishEvosAttacks:
dbw 46, HYDRO_PUMP
db 0 ; no more level-up moves
KazeppelinEvosAttacks:
KazappelinEvosAttacks:
db 0 ; no more evolutions
dbw 1, POISON_STING
dbw 7, TAIL_WHIP

View file

@ -353,7 +353,7 @@ Pokered_MonIndices:
db HIPPUNK
db FOXFIRE
db YANMEGA
db KAZEPPELIN
db KAZAPPELIN
db QWILFATHER
db STRICHEEL
db LURREEL

View file

@ -308,7 +308,7 @@ MonMenuIcons:
db ICON_MONSTER ; GRANBULL
db ICON_BIRD ; CARETORKER
db ICON_FISH ; QWILFISH
db ICON_FISH ; KAZEPPELIN
db ICON_FISH ; KAZAPPELIN
db ICON_FISH ; QWILFATHER
db ICON_BUG ; SCIZOR
db ICON_BUG ; SHUCKLE

View file

@ -310,7 +310,7 @@ PokemonNames::
db "GRANBULL@@"
db "CARETORKER"
db "QWILFISH@@"
db "KAZEPPELIN"
db "KAZAPPELIN"
db "QWILFATHER"
db "SCIZOR@@@@"
db "SHUCKLE@@@"

View file

@ -645,8 +645,8 @@ INCBIN "gfx/pokemon/caretorker/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/caretorker/shiny.pal"
INCBIN "gfx/pokemon/qwilfish/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/qwilfish/shiny.pal"
INCBIN "gfx/pokemon/kazeppelin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kazeppelin/shiny.pal"
INCBIN "gfx/pokemon/kazappelin/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kazappelin/shiny.pal"
INCBIN "gfx/pokemon/qwilfather/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/qwilfather/shiny.pal"
INCBIN "gfx/pokemon/scizor/front.gbcpal", middle_colors

View file

@ -628,8 +628,8 @@ PokemonPicPointers::
dba CaretorkerBackpic
dba QwilfishFrontpic
dba QwilfishBackpic
dba KazeppelinFrontpic
dba KazeppelinBackpic
dba KazappelinFrontpic
dba KazappelinBackpic
dba QwilfatherFrontpic
dba QwilfatherBackpic
dba ScizorFrontpic

View file

@ -718,7 +718,7 @@ LtSurgeGroup:
dw ELECTRODE
dw EXPLOSION, THUNDERBOLT, THUNDER_WAVE, MIRROR_COAT
db 60
dw KAZEPPELIN
dw KAZAPPELIN
dw HYDRO_PUMP, PIN_MISSILE, THUNDERBOLT, MINIMIZE
db 60
dw MAGNEZONE
@ -2831,7 +2831,7 @@ FisherGroup:
db 54
dw QWILFATHER
db 57
dw KAZEPPELIN
dw KAZAPPELIN
db -1 ; end
end_list_items

View file

@ -307,7 +307,7 @@ INCBIN "gfx/footprints/snubbull.1bpp"
INCBIN "gfx/footprints/granbull.1bpp"
INCBIN "gfx/footprints/caretorker.1bpp"
INCBIN "gfx/footprints/qwilfish.1bpp"
INCBIN "gfx/footprints/kazeppelin.1bpp"
INCBIN "gfx/footprints/kazappelin.1bpp"
INCBIN "gfx/footprints/qwilfather.1bpp"
INCBIN "gfx/footprints/scizor.1bpp"
INCBIN "gfx/footprints/shuckle.1bpp"

View file

Before

Width:  |  Height:  |  Size: 69 B

After

Width:  |  Height:  |  Size: 69 B

View file

@ -858,8 +858,8 @@ FoxfireFrontpic: INCBIN "gfx/pokemon/foxfire/front.animated.2bpp.lz"
FoxfireBackpic: INCBIN "gfx/pokemon/foxfire/back.2bpp.lz"
YanmegaFrontpic: INCBIN "gfx/pokemon/yanmega/front.animated.2bpp.lz"
YanmegaBackpic: INCBIN "gfx/pokemon/yanmega/back.2bpp.lz"
KazeppelinFrontpic: INCBIN "gfx/pokemon/kazeppelin/front.animated.2bpp.lz"
KazeppelinBackpic: INCBIN "gfx/pokemon/kazeppelin/back.2bpp.lz"
KazappelinFrontpic: INCBIN "gfx/pokemon/kazappelin/front.animated.2bpp.lz"
KazappelinBackpic: INCBIN "gfx/pokemon/kazappelin/back.2bpp.lz"
QwilfatherFrontpic: INCBIN "gfx/pokemon/qwilfather/front.animated.2bpp.lz"
QwilfatherBackpic: INCBIN "gfx/pokemon/qwilfather/back.2bpp.lz"
StricheelFrontpic: INCBIN "gfx/pokemon/stricheel/front.animated.2bpp.lz"

View file

@ -306,7 +306,7 @@ AnimationPointers:
dw GranbullAnimation
dw CaretorkerAnimation
dw QwilfishAnimation
dw KazeppelinAnimation
dw KazappelinAnimation
dw QwilfatherAnimation
dw ScizorAnimation
dw ShuckleAnimation

View file

@ -304,7 +304,7 @@ SnubbullAnimation: INCLUDE "gfx/pokemon/snubbull/anim.asm"
GranbullAnimation: INCLUDE "gfx/pokemon/granbull/anim.asm"
CaretorkerAnimation: INCLUDE "gfx/pokemon/caretorker/anim.asm"
QwilfishAnimation: INCLUDE "gfx/pokemon/qwilfish/anim.asm"
KazeppelinAnimation: INCLUDE "gfx/pokemon/kazeppelin/anim.asm"
KazappelinAnimation: INCLUDE "gfx/pokemon/kazappelin/anim.asm"
QwilfatherAnimation: INCLUDE "gfx/pokemon/qwilfather/anim.asm"
ScizorAnimation: INCLUDE "gfx/pokemon/scizor/anim.asm"
ShuckleAnimation: INCLUDE "gfx/pokemon/shuckle/anim.asm"

View file

@ -306,7 +306,7 @@ BitmasksPointers:
dw GranbullBitmasks
dw CaretorkerBitmasks
dw QwilfishBitmasks
dw KazeppelinBitmasks
dw KazappelinBitmasks
dw QwilfatherBitmasks
dw ScizorBitmasks
dw ShuckleBitmasks

View file

@ -304,7 +304,7 @@ SnubbullBitmasks: INCLUDE "gfx/pokemon/snubbull/bitmask.asm"
GranbullBitmasks: INCLUDE "gfx/pokemon/granbull/bitmask.asm"
CaretorkerBitmasks: INCLUDE "gfx/pokemon/caretorker/bitmask.asm"
QwilfishBitmasks: INCLUDE "gfx/pokemon/qwilfish/bitmask.asm"
KazeppelinBitmasks: INCLUDE "gfx/pokemon/kazeppelin/bitmask.asm"
KazappelinBitmasks: INCLUDE "gfx/pokemon/kazappelin/bitmask.asm"
QwilfatherBitmasks: INCLUDE "gfx/pokemon/qwilfather/bitmask.asm"
ScizorBitmasks: INCLUDE "gfx/pokemon/scizor/bitmask.asm"
ShuckleBitmasks: INCLUDE "gfx/pokemon/shuckle/bitmask.asm"

View file

@ -306,7 +306,7 @@ FramesPointers:
dba GranbullFrames
dba CaretorkerFrames
dba QwilfishFrames
dba KazeppelinFrames
dba KazappelinFrames
dba QwilfatherFrames
dba ScizorFrames
dba ShuckleFrames

View file

@ -306,7 +306,7 @@ AnimationIdlePointers:
dw GranbullAnimationIdle
dw CaretorkerAnimationIdle
dw QwilfishAnimationIdle
dw KazeppelinAnimationIdle
dw KazappelinAnimationIdle
dw QwilfatherAnimationIdle
dw ScizorAnimationIdle
dw ShuckleAnimationIdle

View file

@ -304,7 +304,7 @@ SnubbullAnimationIdle: INCLUDE "gfx/pokemon/snubbull/anim_idle.asm"
GranbullAnimationIdle: INCLUDE "gfx/pokemon/granbull/anim_idle.asm"
CaretorkerAnimationIdle: INCLUDE "gfx/pokemon/caretorker/anim_idle.asm"
QwilfishAnimationIdle: INCLUDE "gfx/pokemon/qwilfish/anim_idle.asm"
KazeppelinAnimationIdle: INCLUDE "gfx/pokemon/kazeppelin/anim_idle.asm"
KazappelinAnimationIdle: INCLUDE "gfx/pokemon/kazappelin/anim_idle.asm"
QwilfatherAnimationIdle: INCLUDE "gfx/pokemon/qwilfather/anim_idle.asm"
ScizorAnimationIdle: INCLUDE "gfx/pokemon/scizor/anim_idle.asm"
ShuckleAnimationIdle: INCLUDE "gfx/pokemon/shuckle/anim_idle.asm"

View file

@ -94,7 +94,7 @@ SnubbullFrames: INCLUDE "gfx/pokemon/snubbull/frames.asm"
GranbullFrames: INCLUDE "gfx/pokemon/granbull/frames.asm"
CaretorkerFrames: INCLUDE "gfx/pokemon/caretorker/frames.asm"
QwilfishFrames: INCLUDE "gfx/pokemon/qwilfish/frames.asm"
KazeppelinFrames: INCLUDE "gfx/pokemon/kazeppelin/frames.asm"
KazappelinFrames: INCLUDE "gfx/pokemon/kazappelin/frames.asm"
QwilfatherFrames: INCLUDE "gfx/pokemon/qwilfather/frames.asm"
ScizorFrames: INCLUDE "gfx/pokemon/scizor/frames.asm"
ShuckleFrames: INCLUDE "gfx/pokemon/shuckle/frames.asm"

View file

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B

View file

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 558 B