From 2d24f19ba6554f6161b69d691636722c0bc78217 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 1 Apr 2024 10:54:56 +0100 Subject: [PATCH] Revert "April Fools!" This reverts commit 44304c57fc3c44a408f1cfcb79147c943bf2a3d5. --- constants/move_constants.asm | 1 - constants/pokedex_constants.asm | 1 - constants/pokemon_constants.asm | 2 +- crysaudio/cry_headers.asm | 1 - data/moves/animations.asm | 11 -------- data/moves/moves.asm | 1 - data/moves/names.asm | 1 - data/moves/sfx.asm | 1 - data/pokemon/base_stats.asm | 1 - data/pokemon/base_stats/yoshi.asm | 26 ------------------ data/pokemon/dex_entries.asm | 9 +----- data/pokemon/dex_order.asm | 2 +- data/pokemon/evos_moves.asm | 9 ------ data/pokemon/menu_icons.asm | 1 - data/pokemon/names.asm | 2 +- data/pokemon/new_dex_text.asm | 10 ------- data/pokemon/palettes.asm | 1 - .../events/hidden_objects/museum_fossils.asm | 6 ++++ engine/menus/pokedex.asm | 2 +- engine/movie/title.asm | 2 +- gfx/pics.asm | 3 +- gfx/pokemon/back/yoshib.png | Bin 609 -> 0 bytes gfx/pokemon/front/yoshi.png | Bin 825 -> 0 bytes home/pics.asm | 2 ++ home/pokemon.asm | 4 +++ scripts/CeladonMansion3F.asm | 2 +- 26 files changed, 20 insertions(+), 81 deletions(-) delete mode 100644 data/pokemon/base_stats/yoshi.asm delete mode 100644 gfx/pokemon/back/yoshib.png delete mode 100644 gfx/pokemon/front/yoshi.png diff --git a/constants/move_constants.asm b/constants/move_constants.asm index f12ef01f..2a7625b6 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -192,7 +192,6 @@ const NASTY_PLOT ; b8 const UPPERCUT ; b9 const POWDER_SNOW ; b10 - const EGG_TOSS ; b10 const STRUGGLE ; formerly a5, now c0 DEF NUM_ATTACKS EQU const_value - 1 diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index b70cb185..abc8c98f 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -255,6 +255,5 @@ const DEX_MEW ; 151 (249) const DEX_MELTAN ; (250) const DEX_MELMETAL ; (251) - const DEX_YOSHI DEF NUM_POKEMON EQU const_value - 1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 3dd2555a..c2c74bd6 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -259,7 +259,7 @@ const TAUROS_PB ; $FA const GORILLAIMO ; $FB const FOSSIL_KABUTOPS ; $FC (was B6) - const YOSHI ; $FD (was B7) + const FOSSIL_AERODACTYL ; $FD (was B7) const MON_GHOST ; $FE (was B8) DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 24234468..7fccf934 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -256,4 +256,3 @@ PokemonCries:: mon_cry CRY_PARAS, 238, 383 ; MEW mon_cry CRY_NATU, -18, 89 ; MELTAN mon_cry CRY_AMPHAROS, 158, 592 ; MELMETAL - mon_cry CRY_DUNSPARCE, 383, 383 ; YOSHI diff --git a/data/moves/animations.asm b/data/moves/animations.asm index e6cfb3f1..5a6ec261 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -186,7 +186,6 @@ AttackAnimationPointers: dw NastyPlotAnim dw UppercutAnim dw PowderSnowAnim - dw EggTossAnim dw StruggleAnim assert_table_length NUM_ATTACKS dw ShowPicAnim @@ -1379,16 +1378,6 @@ KowtowCleaveAnim: DisarmingVoiceAnim: battle_anim DISARMING_VOICE, SUBANIM_0_HEART_1_MUSIC, 1, 6 db -1 ; end - -EggTossAnim: - battle_anim DEFENSE_CURL, SE_SLIDE_MON_DOWN - battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 - battle_anim NO_MOVE, SE_SHOW_MON_PIC - battle_anim BARRAGE, SUBANIM_1_CIRCLE_BLACK_TOSS, 1, 4 - battle_anim DOUBLESLAP, SUBANIM_1_STAR_BIG_MOVING, 1, 6 - battle_anim AMNESIA, SE_SLIDE_ENEMY_MON_OFF - battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC - db -1 ; end BallTossAnim: battle_anim NO_MOVE, SUBANIM_0_BALL_TOSS_HIGH, 0, 3 diff --git a/data/moves/moves.asm b/data/moves/moves.asm index c6691fd3..b6221ff6 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -197,6 +197,5 @@ Moves: move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25 - move EGG_TOSS, NO_ADDITIONAL_EFFECT, 90, DRAGON, 95, 10 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 assert_table_length NUM_ATTACKS diff --git a/data/moves/names.asm b/data/moves/names.asm index 82542c00..ffded4b8 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -186,6 +186,5 @@ MoveNames:: ; 12chr limit li "NASTY PLOT" li "UPPERCUT" li "POWDER SNOW" - li "EGG TOSS" li "STRUGGLE" assert_list_length NUM_ATTACKS diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index 536243ca..c959ea83 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -187,7 +187,6 @@ MoveSoundTable: db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT db SFX_BATTLE_28, $40, $80 ; POWDER_SNOW - db SFX_BATTLE_34, $00, $40 ; EGG_TOSS db SFX_BATTLE_0B, $00, $80 ; STRUGGLE assert_table_length NUM_ATTACKS diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 8f8f8017..0d47b0cc 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -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 diff --git a/data/pokemon/base_stats/yoshi.asm b/data/pokemon/base_stats/yoshi.asm deleted file mode 100644 index e773fc60..00000000 --- a/data/pokemon/base_stats/yoshi.asm +++ /dev/null @@ -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) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index bb405334..af2b8d29 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -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 \ No newline at end of file diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index f4cd6426..76656719 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -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 diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 8c8fd5d8..4f006def 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -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: diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 6b3c4dea..13053cb4 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 770450f7..c6144ce8 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -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 diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 8ad180aa..d5f70602 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -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" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index e51f97fb..773cdaeb 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -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 diff --git a/engine/events/hidden_objects/museum_fossils.asm b/engine/events/hidden_objects/museum_fossils.asm index 1f4694bd..a3863273 100644 --- a/engine/events/hidden_objects/museum_fossils.asm +++ b/engine/events/hidden_objects/museum_fossils.asm @@ -1,4 +1,7 @@ AerodactylFossil: + ld a, FOSSIL_AERODACTYL + ld [wcf91], a + call DisplayMonFrontSpriteInBox call EnableAutoTextBoxDrawing tx_pre AerodactylFossilText ret @@ -8,6 +11,9 @@ AerodactylFossilText:: text_end KabutopsFossil: + ld a, FOSSIL_KABUTOPS + ld [wcf91], a + call DisplayMonFrontSpriteInBox call EnableAutoTextBoxDrawing tx_pre KabutopsFossilText ret diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index bfad6d57..723b1845 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -202,7 +202,7 @@ HandlePokedexListMenu: ld de, PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld b, 253 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. + ld b, 252 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. .maxSeenPokemonLoop ld a, [hld] ld c, 8 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 36a10813..f5bab4be 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -398,7 +398,7 @@ VersionOnTitleScreenText: db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Blue Version" DebugNewGamePlayerName: - db "J.ESTER@" + db "NINTEN@" DebugNewGameRivalName: db "SONY@" diff --git a/gfx/pics.asm b/gfx/pics.asm index d1d6aa4c..db5e343c 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -470,10 +470,9 @@ PerrserkerPicFront:: INCBIN "gfx/pokemon/front/perrserker.pic" PerrserkerPicBack:: INCBIN "gfx/pokemon/back/perrserkerb.pic" MrRimePicFront:: INCBIN "gfx/pokemon/front/mr.rime.pic" MrRimePicBack:: INCBIN "gfx/pokemon/back/mr.rimeb.pic" -YoshiPicFront:: INCBIN "gfx/pokemon/front/yoshi.pic" -YoshiPicBack:: INCBIN "gfx/pokemon/back/yoshib.pic" FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" GhostPic:: INCBIN "gfx/battle/ghost.pic" SECTION "Pics 9", ROMX diff --git a/gfx/pokemon/back/yoshib.png b/gfx/pokemon/back/yoshib.png deleted file mode 100644 index ba94c0cf5d6d8585cbb58dc3ccf36840c2a9ba4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+IE6C$sR$z3=CCj3=9n|3=F@3LJcn% z7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4?NMQuIw+EWrdVv>KRwB0SYnZ7x{%So?lcx3&>F|ag8WRNi0dVN-jzTQVd20Mkcxj z#=1t9A%+%K#wJ!q7TN{|Rt5%l9tT*UXvob^$xN%nqQM-ZA^O{lT%ZOGxD6$lxv9k^ ziMa(>^gu27wfbZUx zlP)gpjT#TaIkZlMb>4GHzri9q%TSCZ{g&Y|7R94hdRJv4xpj|C%vhCaqpZ4%;mPcm oYxg|wS?Hi-XW49gM8qyWI8|V=RPgg&ebxsLQ0MfRw7XSbN diff --git a/gfx/pokemon/front/yoshi.png b/gfx/pokemon/front/yoshi.png deleted file mode 100644 index 90cedf2781d1ab312dac6fa785d2608265a6aed8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7Tdg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&U^Z?k>HzXM3p^r=85sBugD~Uq{1quc zLG}_)Usv`Q%rXMN)U+i>sd1CM)>q69kJCNghbR2(Owxcs1*{5e;xJ)76MT1X1Nx#9ix^5h&1+YTBD9}B!@tR;PJ$ss$tcM_b=HFwN5%)D^d%0t(~sQkO7xMx|6`F5lHKZchM zNtUmFQS|LF^RsvU+bj-GbDaLSMKt8*st3RCJe{^8xAOYIoFmUF7UwyxPnB4?C}T^` zPaY#BHb0)Lk{OfA1D4zGK6-PbBfro$x176^KPS0(%u`uEQTWBF@W7SRbhTy9@`noF zYcdawn{?)o)`5iye=g7R()hnTmf^(dD5py;N1}i8zIQ4&e9Is&2#PgNS3j3^P6