Skip to content

Commit 8d1c393

Browse files
m4-used-rolloutm4-used-rollout
committed
Added Phancero
1 parent 7b8128f commit 8d1c393

File tree

21 files changed

+83
-18
lines changed

21 files changed

+83
-18
lines changed

‎constants/pokedex_constants.asm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,5 +255,6 @@
255255
const DEX_MEW ; 151 (249)
256256
const DEX_MELTAN ; (250)
257257
const DEX_MELMETAL ; (251)
258+
const DEX_PHANCERO ; (252)
258259

259260
DEF NUM_POKEMON EQU const_value - 1

‎constants/pokemon_constants.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
const TAUROS_PA ; $F9
259259
const TAUROS_PB ; $FA
260260
const GORILLAIMO ; $FB
261-
const FOSSIL_KABUTOPS ; $FC (was B6)
261+
const PHANCERO ; $FC
262262
const FOSSIL_AERODACTYL ; $FD (was B7)
263263
const MON_GHOST ; $FE (was B8)
264264

‎crysaudio/cry_headers.asm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,3 +256,4 @@ PokemonCries::
256256
mon_cry CRY_PARAS, 238, 383 ; MEW
257257
mon_cry CRY_NATU, -18, 89 ; MELTAN
258258
mon_cry CRY_AMPHAROS, 158, 592 ; MELMETAL
259+
mon_cry CRY_FEAROW, 287, 512 ; PHANCERO

‎data/pokemon/base_stats.asm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,5 @@ INCLUDE "data/pokemon/base_stats/mewtwo.asm"
251251
INCLUDE "data/pokemon/base_stats/mew.asm"
252252
INCLUDE "data/pokemon/base_stats/meltan.asm"
253253
INCLUDE "data/pokemon/base_stats/melmetal.asm"
254+
INCLUDE "data/pokemon/base_stats/phancero.asm"
254255
assert_table_length NUM_POKEMON

‎data/pokemon/base_stats/phancero.asm‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
db DEX_PHANCERO ; pokedex id
2+
3+
db 178, 137, 57, 128, 65
4+
; hp atk def spd spc
5+
6+
db GHOST, FLYING ; type
7+
db 3 ; catch rate
8+
db 216 ; base exp yield
9+
10+
INCBIN "gfx/pokemon/front/phancero.pic", 0, 1 ; sprite dimensions
11+
dw PhanceroPicFront, PhanceroPicBack
12+
13+
; attacks known at lvl 0
14+
db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
15+
db GROWTH_SLOW ; growth rate
16+
17+
; tm/hm learnset
18+
tmhm SWORDS_DANCE, TOXIC, DOUBLE_EDGE, COUNTER, SEISMIC_TOSS, \
19+
THUNDER, EARTHQUAKE, PSYCHIC_M, DOUBLE_TEAM, SKY_ATTACK, \
20+
REST, THUNDER_WAVE, TRI_ATTACK, SUBSTITUTE, FLY, \
21+
FLASH
22+
23+
db BANK(PhanceroPicFront)
24+
assert BANK(PhanceroPicFront) == BANK(PhanceroPicBack)

‎data/pokemon/cries.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CryData::
260260
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
261261
mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
262262
mon_cry SFX_CRY_00, $00, $00 ; Gorillaimo
263-
mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil)
263+
mon_cry SFX_CRY_18, $1F, $80 ; Phancero
264264
mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil)
265265
mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost)
266266
assert_table_length NUM_POKEMON_INDEXES

‎data/pokemon/dex_entries.asm‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ PokedexEntryPointers:
251251
dw TaurosPADexEntry
252252
dw TaurosPBDexEntry
253253
dw GorillaimoDexEntry
254-
dw MissingNoDexEntry
254+
dw PhanceroDexEntry
255255
dw MissingNoDexEntry
256256
dw MissingNoDexEntry
257257
assert_table_length NUM_POKEMON_INDEXES
@@ -2024,4 +2024,10 @@ GorillaimoDexEntry:
20242024
dw 4080
20252025
text_far _GorillaimoDexEntry
20262026
text_end
2027-
2027+
2028+
PhanceroDexEntry:
2029+
db "GLITCHBIRD@"
2030+
db 5,1
2031+
dw 1032
2032+
text_far _PhanceroDexEntry
2033+
text_end

‎data/pokemon/dex_order.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ PokedexOrder:
251251
db DEX_TAUROS_PA
252252
db DEX_TAUROS_PB
253253
db DEX_GORILLAIMO
254-
db 0 ; MISSINGNO.
254+
db DEX_PHANCERO
255255
db 0 ; MISSINGNO.
256256
db 0 ; MISSINGNO.
257257
assert_table_length NUM_POKEMON_INDEXES

‎data/pokemon/evos_moves.asm‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ EvosMovesPointerTable:
263263
dw TaurosPAEvosMoves
264264
dw TaurosPBEvosMoves
265265
dw GorillaimoEvosMoves
266-
dw FossilKabutopsEvosMoves
266+
dw PhanceroEvosMoves
267267
dw FossilAerodactylEvosMoves
268268
dw MonGhostEvosMoves
269269
assert_table_length NUM_POKEMON_INDEXES
@@ -3485,10 +3485,27 @@ GorillaimoEvosMoves:
34853485
db 49, SUBMISSION
34863486
db 0
34873487
3488-
FossilKabutopsEvosMoves:
3488+
PhanceroEvosMoves:
34893489
; Evolutions
34903490
db 0
34913491
; Learnset
3492+
db 1, POUND
3493+
db 4, TELEPORT
3494+
db 7, GUST
3495+
db 10, LICK
3496+
db 15, WATER_GUN
3497+
db 20, AGILITY
3498+
db 25, WING_ATTACK
3499+
db 30, ACID_ARMOR
3500+
db 35, LEECH_SEED
3501+
db 40, NIGHT_SHADE
3502+
db 50, SKY_ATTACK
3503+
db 60, WATER_GUN
3504+
db 70, WRAP
3505+
db 80, DRILL_PECK
3506+
db 90, MIRROR_MOVE
3507+
db 95, TRI_ATTACK
3508+
db 100, HI_JUMP_KICK
34923509
db 0
34933510

34943511
FossilAerodactylEvosMoves:

‎data/pokemon/menu_icons.asm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,5 @@ MonPartyData:
251251
nybble ICON_CAT ; Mew
252252
nybble ICON_BALL ; Meltan
253253
nybble ICON_BALL ; Melmetal
254+
nybble ICON_BIRD ; Phancero
254255
end_nybble_array NUM_POKEMON

0 commit comments

Comments
 (0)