Revert "April Fools!"

This reverts commit 44304c57fc.
This commit is contained in:
Martha Schilling 2024-04-01 10:54:56 +01:00
parent 44304c57fc
commit 2d24f19ba6
26 changed files with 20 additions and 81 deletions

View file

@ -251,5 +251,4 @@ INCLUDE "data/pokemon/base_stats/mewtwo.asm"
INCLUDE "data/pokemon/base_stats/mew.asm"
INCLUDE "data/pokemon/base_stats/meltan.asm"
INCLUDE "data/pokemon/base_stats/melmetal.asm"
INCLUDE "data/pokemon/base_stats/yoshi.asm"
assert_table_length NUM_POKEMON

View file

@ -1,26 +0,0 @@
db DEX_YOSHI ; pokedex id
db 91, 134, 95, 80, 100
; hp atk def spd spc
db DRAGON, NORMAL ; type
db 9 ; catch rate
db 218 ; base exp
INCBIN "gfx/pokemon/front/yoshi.pic", 0, 1 ; sprite dimensions
dw YoshiPicFront, YoshiPicBack
db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \
HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, EGG_BOMB, \
FIRE_BLAST, SWIFT, SKULL_BASH, SOFTBOILED, REST, \
THUNDER_WAVE, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(YoshiPicFront)
assert BANK(YoshiPicFront) == BANK(YoshiPicBack)

View file

@ -252,7 +252,7 @@ PokedexEntryPointers:
dw TaurosPBDexEntry
dw GorillaimoDexEntry
dw MissingNoDexEntry
dw YoshiDexEntry
dw MissingNoDexEntry
dw MissingNoDexEntry
assert_table_length NUM_POKEMON_INDEXES
@ -2024,11 +2024,4 @@ GorillaimoDexEntry:
dw 4080
text_far _GorillaimoDexEntry
text_end
YoshiDexEntry:
db "DINOSAUR@"
db 5,11
dw 1990
text_far _YoshiDexEntry
text_end

View file

@ -252,6 +252,6 @@ PokedexOrder:
db DEX_TAUROS_PB
db DEX_GORILLAIMO
db 0 ; MISSINGNO.
db DEX_YOSHI
db 0 ; MISSINGNO.
db 0 ; MISSINGNO.
assert_table_length NUM_POKEMON_INDEXES

View file

@ -1121,7 +1121,6 @@ VenonatEvosMoves:
DragoniteEvosMoves:
; Evolutions
db EV_ITEM, FIRE_STONE, 1, YOSHI
db 0
; Learnset
db 10, THUNDER_WAVE
@ -3496,14 +3495,6 @@ FossilAerodactylEvosMoves:
; Evolutions
db 0
; Learnset
db 10, THUNDER_WAVE
db 20, AGILITY
db 35, SLAM
db 45, DRAGON_RAGE
db 55, EGG_BOMB
db 60, HYPER_BEAM
db 65, THUNDER
db 75, EGG_TOSS
db 0
MonGhostEvosMoves:

View file

@ -251,5 +251,4 @@ MonPartyData:
nybble ICON_CAT ; Mew
nybble ICON_BALL ; Meltan
nybble ICON_BALL ; Melmetal
nybble ICON_MON ; Yoshi
end_nybble_array NUM_POKEMON

View file

@ -252,7 +252,7 @@ MonsterNames::
db "TAUROS@@@@" ; Paldean, Blaze
db "GORILLAIMO"
db "MISSINGNO."
db "YOSHI@@@@@"
db "MISSINGNO."
db "MISSINGNO."
assert_table_length NUM_POKEMON_INDEXES

View file

@ -998,16 +998,6 @@ _GorillaimoDexEntry::
next "battling GAWARHED"
dex
_YoshiDexEntry::
text "This rare species"
next "is known for its"
next "long tongue and"
page "playful demeanor."
next "You can even ride"
next "on its back"
dex
_MissingNoDexEntry:: ; unused
text "This is a newly"
next "discovered"

View file

@ -252,5 +252,4 @@ MonsterPalettes:
db PAL_MEWMON ; MEW
db PAL_YELLOWMON ; MELTAN
db PAL_YELLOWMON ; MELMETAL
db PAL_GREENMON ; YOSHI
assert_table_length NUM_POKEMON + 1