diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 2f9a2da..97a08d9 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -27,7 +27,7 @@ const CHARIZARD ; 06 const SQUIRTLE ; 07 const WARTORTLE ; 08 - const BLASTOISE ; 09 + const TOTARTLE ; 09 const CATERPIE ; 0a const METAPOD ; 0b const BUTTERFREE ; 0c @@ -136,6 +136,8 @@ const KANGASKHAN ; 73 const HORSEA ; 74 const SEADRA ; 75 + const BLASTYKE + const BLASTOISE const GOLDEEN ; 76 const SEAKING ; 77 const STARYU ; 78 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 385ce3c..5a72bdd 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -35,7 +35,7 @@ INCLUDE "data/pokemon/base_stats/charmeleon.asm" INCLUDE "data/pokemon/base_stats/charizard.asm" INCLUDE "data/pokemon/base_stats/squirtle.asm" INCLUDE "data/pokemon/base_stats/wartortle.asm" -INCLUDE "data/pokemon/base_stats/blastoise.asm" +INCLUDE "data/pokemon/base_stats/totartle.asm" INCLUDE "data/pokemon/base_stats/caterpie.asm" INCLUDE "data/pokemon/base_stats/metapod.asm" INCLUDE "data/pokemon/base_stats/butterfree.asm" @@ -144,6 +144,8 @@ INCLUDE "data/pokemon/base_stats/tangela.asm" INCLUDE "data/pokemon/base_stats/kangaskhan.asm" INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/seadra.asm" +INCLUDE "data/pokemon/base_stats/blastyke.asm" +INCLUDE "data/pokemon/base_stats/blastoise.asm" INCLUDE "data/pokemon/base_stats/goldeen.asm" INCLUDE "data/pokemon/base_stats/seaking.asm" INCLUDE "data/pokemon/base_stats/staryu.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 09c085a..8e542f4 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -14,7 +14,7 @@ PokemonCries:: mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE - mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE + mon_cry CRY_SQUIRTLE, 0, 256 ; TOTARTLE mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE mon_cry CRY_METAPOD, 204, 129 ; METAPOD mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE @@ -123,6 +123,8 @@ PokemonCries:: mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA + mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE + mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN mon_cry CRY_CATERPIE, 16, 383 ; SEAKING mon_cry CRY_PARAS, 2, 160 ; STARYU diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index dfcd875..8b73c73 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -8,7 +8,7 @@ CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm" CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm" SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm" WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/wartortle.asm" -BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm" +TotartlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/totartle.asm" CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/caterpie.asm" MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/metapod.asm" ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm" @@ -121,6 +121,8 @@ TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm" HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm" +BlastykePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastyke.asm" +BlastoisePokedexEntry:: INCLUDE "data/pokemon/dex_entries/blastoise.asm" GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm" SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm" StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" diff --git a/data/pokemon/dex_entries/blastyke.asm b/data/pokemon/dex_entries/blastyke.asm new file mode 100644 index 0000000..4e85332 --- /dev/null +++ b/data/pokemon/dex_entries/blastyke.asm @@ -0,0 +1,10 @@ + db "BUBBLE@" ; species name + dw 201, 320 ; height, weight + + db "Its mucus is" + next "chemically similar" + next "to soap, making" + + page "the bubbles it" + next "blows useful for" + next "dirty #MON.@" diff --git a/data/pokemon/dex_entries/totartle.asm b/data/pokemon/dex_entries/totartle.asm new file mode 100644 index 0000000..3ab3b48 --- /dev/null +++ b/data/pokemon/dex_entries/totartle.asm @@ -0,0 +1,10 @@ + db "TURTLE@" ; species name + dw 503, 1570 ; height, weight + + db "Living for up to" + next "10,000 years," + next "TOTARTLE's" + + page "shell has grown" + next "seaweed that" + next "formed a tail.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 97d95fc..a2bf28d 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -9,7 +9,7 @@ PokedexDataPointerTable: dba CharizardPokedexEntry dba SquirtlePokedexEntry dba WartortlePokedexEntry - dba BlastoisePokedexEntry + dba TotartlePokedexEntry dba CaterpiePokedexEntry dba MetapodPokedexEntry dba ButterfreePokedexEntry @@ -118,6 +118,8 @@ PokedexDataPointerTable: dba KangaskhanPokedexEntry dba HorseaPokedexEntry dba SeadraPokedexEntry + dba BlastykePokedexEntry + dba BlastoisePokedexEntry dba GoldeenPokedexEntry dba SeakingPokedexEntry dba StaryuPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 9dd90dc..e231c3c 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -17,6 +17,7 @@ AlphabeticalPokedexOrder: dw BELLOSSOM dw BELLSPROUT dw BLASTOISE + dw BLASTYKE dw BLISSEY dw BULBASAUR dw BUTTERFREE @@ -227,6 +228,7 @@ AlphabeticalPokedexOrder: dw TENTACRUEL dw TOGEPI dw TOGETIC + dw TOTARTLE dw TOTODILE dw TYPHLOSION dw TYRANITAR diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 112513d..65f162e 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -190,6 +190,8 @@ NewPokedexOrder: dw HORSEA dw SEADRA dw KINGDRA + dw BLASTYKE + dw BLASTOISE dw GLIGAR dw DELIBIRD dw SWINUB @@ -235,7 +237,7 @@ NewPokedexOrder: dw CHARIZARD dw SQUIRTLE dw WARTORTLE - dw BLASTOISE + dw TOTARTLE dw ARTICUNO dw ZAPDOS dw MOLTRES diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index b047732..1cbb5f6 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -118,6 +118,8 @@ EggMovePointers1: dw KangaskhanEggMoves dw HorseaEggMoves dw NoEggMoves1 + dw BlastykeEggMoves + dw NoEggMoves1 dw GoldeenEggMoves dw NoEggMoves1 dw NoEggMoves1 @@ -514,6 +516,15 @@ HorseaEggMoves: dw SPLASH dw DRAGON_RAGE dw -1 ; end + +BlastykeEggMoves: + dw MIRROR_COAT + dw HAZE + dw MIST + dw CONFUSION + dw FORESIGHT + dw FLAIL + dw -1 ; end GoldeenEggMoves: dw PSYBEAM diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 5ac56d2..0510e1b 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -9,7 +9,7 @@ EvosAttacksPointers1:: dw CharizardEvosAttacks dw SquirtleEvosAttacks dw WartortleEvosAttacks - dw BlastoiseEvosAttacks + dw TotartleEvosAttacks dw CaterpieEvosAttacks dw MetapodEvosAttacks dw ButterfreeEvosAttacks @@ -118,6 +118,8 @@ EvosAttacksPointers1:: dw KangaskhanEvosAttacks dw HorseaEvosAttacks dw SeadraEvosAttacks + dw BlastykeEvosAttacks + dw BlastoiseEvosAttacks dw GoldeenEvosAttacks dw SeakingEvosAttacks dw StaryuEvosAttacks @@ -271,7 +273,7 @@ SquirtleEvosAttacks: db 0 ; no more level-up moves WartortleEvosAttacks: - dbbw EVOLVE_LEVEL, 36, BLASTOISE + dbbw EVOLVE_LEVEL, 36, TOTARTLE db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP @@ -288,7 +290,7 @@ WartortleEvosAttacks: dbw 53, HYDRO_PUMP db 0 ; no more level-up moves -BlastoiseEvosAttacks: +TotartleEvosAttacks: db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP @@ -301,9 +303,11 @@ BlastoiseEvosAttacks: dbw 19, BITE dbw 25, RAPID_SPIN dbw 31, PROTECT - dbw 42, RAIN_DANCE - dbw 55, SKULL_BASH - dbw 68, HYDRO_PUMP + dbw 36, COMET_PUNCH + dbw 40, RAIN_DANCE + dbw 51, SKULL_BASH + dbw 62, HYDRO_PUMP + dbw 67, PETAL_DANCE db 0 ; no more level-up moves CaterpieEvosAttacks: @@ -1737,6 +1741,39 @@ SeadraEvosAttacks: dbw 40, AGILITY dbw 51, HYDRO_PUMP db 0 ; no more level-up moves + +BlastykeEvosAttacks: + dbbw EVOLVE_LEVEL, 36, BLASTOISE + dbw 1, TACKLE + dbw 4, TAIL_WHIP + dbw 7, BUBBLE + dbw 10, WITHDRAW + dbw 13, WATER_GUN + dbw 19, BITE + dbw 25, RAPID_SPIN + dbw 31, PROTECT + dbw 38, RAIN_DANCE + dbw 47, SKULL_BASH + dbw 56, HYDRO_PUMP + db 0 ; no more level-up moves + +BlastoiseEvosAttacks: +db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 1, BUBBLE + dbw 1, WITHDRAW + dbw 4, TAIL_WHIP + dbw 7, BUBBLE + dbw 10, WITHDRAW + dbw 13, WATER_GUN + dbw 19, BITE + dbw 25, RAPID_SPIN + dbw 31, PROTECT + dbw 42, RAIN_DANCE + dbw 55, SKULL_BASH + dbw 68, HYDRO_PUMP + db 0 ; no more level-up moves GoldeenEvosAttacks: dbbw EVOLVE_LEVEL, 33, SEAKING diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 9b104f4..0e351e3 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -118,6 +118,8 @@ FirstEvoStages:: dw KANGASKHAN dw HORSEA dw HORSEA + dw BLASTYKE + dw BLASTYKE dw GOLDEEN dw GOLDEEN dw STARYU ;78 diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 1c523a0..8319287 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -10,7 +10,7 @@ KantoMonSpecials: db 85 ; CHARIZARD db 50 ; SQUIRTLE db 65 ; WARTORTLE - db 85 ; BLASTOISE + db 100 ; BLASTOISE db 20 ; CATERPIE db 25 ; METAPOD db 80 ; BUTTERFREE @@ -119,6 +119,8 @@ KantoMonSpecials: db 40 ; KANGASKHAN db 70 ; HORSEA db 95 ; SEADRA + db 45 ; BLASTYKE + db 85 ; BLASTOISE db 50 ; GOLDEEN db 80 ; SEAKING db 70 ; STARYU diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index ca40398..3583c99 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -171,6 +171,7 @@ Pokered_MonIndices: db GEODUDE db PORYGON db AERODACTYL + db BLASTYKE db RAIKOU ; MISSINGNO. db MAGNEMITE db ENTEI ; MISSINGNO. @@ -180,6 +181,7 @@ Pokered_MonIndices: db CHARMELEON db WARTORTLE db CHARIZARD + db TOTARTLE db LARVITAR ; MISSINGNO. db PUPITAR ; MISSINGNO. KABUTOPS FOSSIL db TYRANITAR ; MISSINGNO. AERODACTYL FOSSIL @@ -190,7 +192,7 @@ Pokered_MonIndices: db BELLSPROUT db WEEPINBELL db VICTREEBEL - assert_table_length 190 ; gen 1 mon indexes + assert_table_length 192 ; gen 1 mon indexes db CHIKORITA db BAYLEEF db MEGANIUM diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 506d060..c80102b 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -10,7 +10,7 @@ MonMenuIcons: db ICON_BIGMON ; CHARIZARD db ICON_SQUIRTLE ; SQUIRTLE db ICON_SQUIRTLE ; WARTORTLE - db ICON_SQUIRTLE ; BLASTOISE + db ICON_SQUIRTLE ; TOTARTLE db ICON_CATERPILLAR ; CATERPIE db ICON_CATERPILLAR ; METAPOD db ICON_MOTH ; BUTTERFREE @@ -119,6 +119,8 @@ MonMenuIcons: db ICON_MONSTER ; KANGASKHAN db ICON_FISH ; HORSEA db ICON_FISH ; SEADRA + db ICON_SQUIRTLE ; BLASTYKE + db ICON_SQUIRTLE ; BLASTOISE db ICON_FISH ; GOLDEEN db ICON_FISH ; SEAKING db ICON_STARYU ; STARYU diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 9639a27..a8ae68c 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -12,7 +12,7 @@ PokemonNames:: db "CHARIZARD@" db "SQUIRTLE@@" db "WARTORTLE@" - db "BLASTOISE@" + db "TOTARTLE@@" db "CATERPIE@@" db "METAPOD@@@" db "BUTTERFREE" @@ -121,6 +121,8 @@ PokemonNames:: db "KANGASKHAN" db "HORSEA@@@@" db "SEADRA@@@@" + db "BLASTYKE@@" + db "BLASTOISE@" db "GOLDEEN@@@" db "SEAKING@@@" db "STARYU@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index a70009e..1eb83a3 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -49,8 +49,8 @@ INCBIN "gfx/pokemon/squirtle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/squirtle/shiny.pal" INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/wartortle/shiny.pal" -INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/blastoise/shiny.pal" +INCBIN "gfx/pokemon/totartle/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/totartle/shiny.pal" INCBIN "gfx/pokemon/caterpie/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/caterpie/shiny.pal" INCBIN "gfx/pokemon/metapod/front.gbcpal", middle_colors @@ -267,6 +267,10 @@ INCBIN "gfx/pokemon/horsea/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/horsea/shiny.pal" INCBIN "gfx/pokemon/seadra/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/seadra/shiny.pal" +INCBIN "gfx/pokemon/blastyke/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/blastyke/shiny.pal" +INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/blastoise/shiny.pal" INCBIN "gfx/pokemon/goldeen/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/goldeen/shiny.pal" INCBIN "gfx/pokemon/seaking/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index f4e9ba5..ea71fc3 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -29,8 +29,8 @@ PokemonPicPointers:: dba SquirtleBackpic dba WartortleFrontpic dba WartortleBackpic - dba BlastoiseFrontpic - dba BlastoiseBackpic + dba TotartleFrontpic + dba TotartleBackpic dba CaterpieFrontpic dba CaterpieBackpic dba MetapodFrontpic @@ -247,6 +247,10 @@ PokemonPicPointers:: dba HorseaBackpic dba SeadraFrontpic dba SeadraBackpic + dba BlastykeFrontpic + dba BlastykeBackpic + dba BlastoiseFrontpic + dba BlastoiseBackpic dba GoldeenFrontpic dba GoldeenBackpic dba SeakingFrontpic diff --git a/data/tilesets/forest_attributes.bin b/data/tilesets/forest_attributes.bin index 947fbb3..33d34d6 100644 --- a/data/tilesets/forest_attributes.bin +++ b/data/tilesets/forest_attributes.bin @@ -1 +1,15 @@ - \ No newline at end of file +  + + + +  + + + + + + + + + + \ No newline at end of file diff --git a/data/tilesets/forest_collision.asm b/data/tilesets/forest_collision.asm index 0b9aa78..c3090a9 100644 --- a/data/tilesets/forest_collision.asm +++ b/data/tilesets/forest_collision.asm @@ -38,27 +38,8 @@ tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, FLOOR, WALL, FLOOR ; 28 - tilecoll WALL, FLOOR, WALL, FLOOR ; 29 - tilecoll WALL, FLOOR, WALL, FLOOR ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, FLOOR, WALL, FLOOR ; 2c - tilecoll WALL, FLOOR, WALL, FLOOR ; 2d - tilecoll WALL, FLOOR, WALL, FLOOR ; 2e - tilecoll WALL, FLOOR, WALL, FLOOR ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll WALL, FLOOR, WALL, FLOOR ; 33 - tilecoll WALL, FLOOR, WALL, FLOOR ; 34 - tilecoll WALL, FLOOR, WALL, FLOOR ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll WALL, FLOOR, WALL, FLOOR ; 37 - tilecoll WALL, FLOOR, WALL, FLOOR ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll WALL, FLOOR, WALL, FLOOR ; 3b - tilecoll WALL, FLOOR, WALL, FLOOR ; 3c - tilecoll WALL, FLOOR, WALL, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, FLOOR ; 3e - tilecoll WALL, FLOOR, WALL, FLOOR ; 3f + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 28 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 29 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 2a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2c diff --git a/data/tilesets/forest_metatiles.bin b/data/tilesets/forest_metatiles.bin index a8b82d8..04977e3 100644 --- a/data/tilesets/forest_metatiles.bin +++ b/data/tilesets/forest_metatiles.bin @@ -1 +1 @@ - ,-./<=>?**** ,-./<=>? ***&'&'6767&'67&'&'6767&'67&'67*** &'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445 \ No newline at end of file + ,-./<=>?**** ,-./<=>? ***&'&'6767&'67&'&'6767&'67&'67*** &'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445&'&'6767&'67&'67&'67&'67&'67 \ No newline at end of file diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 6871fe9..3c27419 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -9,7 +9,7 @@ INCBIN "gfx/footprints/charmeleon.1bpp" INCBIN "gfx/footprints/charizard.1bpp" INCBIN "gfx/footprints/squirtle.1bpp" INCBIN "gfx/footprints/wartortle.1bpp" -INCBIN "gfx/footprints/blastoise.1bpp" +INCBIN "gfx/footprints/totartle.1bpp" INCBIN "gfx/footprints/caterpie.1bpp" INCBIN "gfx/footprints/metapod.1bpp" INCBIN "gfx/footprints/butterfree.1bpp" @@ -118,6 +118,8 @@ INCBIN "gfx/footprints/tangela.1bpp" INCBIN "gfx/footprints/kangaskhan.1bpp" INCBIN "gfx/footprints/horsea.1bpp" INCBIN "gfx/footprints/seadra.1bpp" +INCBIN "gfx/footprints/blastyke.1bpp" +INCBIN "gfx/footprints/blastoise.1bpp" INCBIN "gfx/footprints/goldeen.1bpp" INCBIN "gfx/footprints/seaking.1bpp" INCBIN "gfx/footprints/staryu.1bpp" @@ -258,4 +260,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $100 + assert_table_length $102 diff --git a/gfx/footprints/blastyke.png b/gfx/footprints/blastyke.png new file mode 100644 index 0000000..3884cf2 Binary files /dev/null and b/gfx/footprints/blastyke.png differ diff --git a/gfx/footprints/totartle.png b/gfx/footprints/totartle.png new file mode 100644 index 0000000..95af903 Binary files /dev/null and b/gfx/footprints/totartle.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 3b9a0d5..a44a0ce 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -713,10 +713,10 @@ SECTION "Pics 19", ROMX ; Seems to be an accidental copy of the previous bank -INCBIN "gfx/pokemon/spinarak/back.2bpp.lz" -INCBIN "gfx/pokemon/raikou/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_k/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/houndour/back.2bpp.lz" +TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz" +TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz" +BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz" +BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz" INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 644346c..01b818e 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -8,7 +8,7 @@ AnimationPointers: dw CharizardAnimation dw SquirtleAnimation dw WartortleAnimation - dw BlastoiseAnimation + dw TotartleAnimation dw CaterpieAnimation dw MetapodAnimation dw ButterfreeAnimation @@ -117,6 +117,8 @@ AnimationPointers: dw KangaskhanAnimation dw HorseaAnimation dw SeadraAnimation + dw BlastykeAnimation + dw BlastoiseAnimation dw GoldeenAnimation dw SeakingAnimation dw StaryuAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index e8f490c..f943cd7 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -6,7 +6,7 @@ CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm" CharizardAnimation: INCLUDE "gfx/pokemon/charizard/anim.asm" SquirtleAnimation: INCLUDE "gfx/pokemon/squirtle/anim.asm" WartortleAnimation: INCLUDE "gfx/pokemon/wartortle/anim.asm" -BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm" +TotartleAnimation: INCLUDE "gfx/pokemon/totartle/anim.asm" CaterpieAnimation: INCLUDE "gfx/pokemon/caterpie/anim.asm" MetapodAnimation: INCLUDE "gfx/pokemon/metapod/anim.asm" ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm" @@ -115,6 +115,8 @@ TangelaAnimation: INCLUDE "gfx/pokemon/tangela/anim.asm" KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm" HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm" SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm" +BlastykeAnimation: INCLUDE "gfx/pokemon/blastyke/anim.asm" +BlastoiseAnimation: INCLUDE "gfx/pokemon/blastoise/anim.asm" GoldeenAnimation: INCLUDE "gfx/pokemon/goldeen/anim.asm" SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm" StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 3cb8ac0..29bc7c2 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -8,7 +8,7 @@ BitmasksPointers: dw CharizardBitmasks dw SquirtleBitmasks dw WartortleBitmasks - dw BlastoiseBitmasks + dw TotartleBitmasks dw CaterpieBitmasks dw MetapodBitmasks dw ButterfreeBitmasks @@ -117,6 +117,8 @@ BitmasksPointers: dw KangaskhanBitmasks dw HorseaBitmasks dw SeadraBitmasks + dw BlastykeBitmasks + dw BlastoiseBitmasks dw GoldeenBitmasks dw SeakingBitmasks dw StaryuBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 5f45049..48bd79f 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -6,7 +6,7 @@ CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm" CharizardBitmasks: INCLUDE "gfx/pokemon/charizard/bitmask.asm" SquirtleBitmasks: INCLUDE "gfx/pokemon/squirtle/bitmask.asm" WartortleBitmasks: INCLUDE "gfx/pokemon/wartortle/bitmask.asm" -BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm" +TotartleBitmasks: INCLUDE "gfx/pokemon/totartle/bitmask.asm" CaterpieBitmasks: INCLUDE "gfx/pokemon/caterpie/bitmask.asm" MetapodBitmasks: INCLUDE "gfx/pokemon/metapod/bitmask.asm" ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm" @@ -115,6 +115,8 @@ TangelaBitmasks: INCLUDE "gfx/pokemon/tangela/bitmask.asm" KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm" HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm" SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm" +BlastykeBitmasks: INCLUDE "gfx/pokemon/blastyke/bitmask.asm" +BlastoiseBitmasks: INCLUDE "gfx/pokemon/blastoise/bitmask.asm" GoldeenBitmasks: INCLUDE "gfx/pokemon/goldeen/bitmask.asm" SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm" StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm" diff --git a/gfx/pokemon/blastyke/anim.asm b/gfx/pokemon/blastyke/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/blastyke/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/blastyke/anim_idle.asm b/gfx/pokemon/blastyke/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/blastyke/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/blastyke/back.png b/gfx/pokemon/blastyke/back.png new file mode 100644 index 0000000..207bab9 Binary files /dev/null and b/gfx/pokemon/blastyke/back.png differ diff --git a/gfx/pokemon/blastyke/front.png b/gfx/pokemon/blastyke/front.png new file mode 100644 index 0000000..ea43116 Binary files /dev/null and b/gfx/pokemon/blastyke/front.png differ diff --git a/gfx/pokemon/blastyke/pallete.txt b/gfx/pokemon/blastyke/pallete.txt new file mode 100644 index 0000000..e69de29 diff --git a/gfx/pokemon/blastyke/shiny.pal b/gfx/pokemon/blastyke/shiny.pal new file mode 100644 index 0000000..dbde45e --- /dev/null +++ b/gfx/pokemon/blastyke/shiny.pal @@ -0,0 +1,4 @@ + + RGB 14, 21, 07 + RGB 16, 16, 20 + diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 5d87ea3..cb468f5 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -8,7 +8,7 @@ FramesPointers: dba CharizardFrames dba SquirtleFrames dba WartortleFrames - dba BlastoiseFrames + dba TotartleFrames dba CaterpieFrames dba MetapodFrames dba ButterfreeFrames @@ -117,6 +117,8 @@ FramesPointers: dba KangaskhanFrames dba HorseaFrames dba SeadraFrames + dba BlastykeFrames + dba BlastoiseFrames dba GoldeenFrames dba SeakingFrames dba StaryuFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index d7bc28f..c4699cd 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -8,7 +8,7 @@ AnimationIdlePointers: dw CharizardAnimationIdle dw SquirtleAnimationIdle dw WartortleAnimationIdle - dw BlastoiseAnimationIdle + dw TotartleAnimationIdle dw CaterpieAnimationIdle dw MetapodAnimationIdle dw ButterfreeAnimationIdle @@ -117,6 +117,8 @@ AnimationIdlePointers: dw KangaskhanAnimationIdle dw HorseaAnimationIdle dw SeadraAnimationIdle + dw BlastykeAnimationIdle + dw BlastoiseAnimationIdle dw GoldeenAnimationIdle dw SeakingAnimationIdle dw StaryuAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 952aae2..423ba49 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -6,7 +6,7 @@ CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm" CharizardAnimationIdle: INCLUDE "gfx/pokemon/charizard/anim_idle.asm" SquirtleAnimationIdle: INCLUDE "gfx/pokemon/squirtle/anim_idle.asm" WartortleAnimationIdle: INCLUDE "gfx/pokemon/wartortle/anim_idle.asm" -BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm" +TotartleAnimationIdle: INCLUDE "gfx/pokemon/totartle/anim_idle.asm" CaterpieAnimationIdle: INCLUDE "gfx/pokemon/caterpie/anim_idle.asm" MetapodAnimationIdle: INCLUDE "gfx/pokemon/metapod/anim_idle.asm" ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm" @@ -115,6 +115,8 @@ TangelaAnimationIdle: INCLUDE "gfx/pokemon/tangela/anim_idle.asm" KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm" HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm" SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/anim_idle.asm" +BlastykeAnimationIdle: INCLUDE "gfx/pokemon/blastyke/anim_idle.asm" +BlastoiseAnimationIdle: INCLUDE "gfx/pokemon/blastoise/anim_idle.asm" GoldeenAnimationIdle: INCLUDE "gfx/pokemon/goldeen/anim_idle.asm" SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm" StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 67a0661..ee4d116 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -8,7 +8,7 @@ CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm" CharizardFrames: INCLUDE "gfx/pokemon/charizard/frames.asm" SquirtleFrames: INCLUDE "gfx/pokemon/squirtle/frames.asm" WartortleFrames: INCLUDE "gfx/pokemon/wartortle/frames.asm" -BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm" +TotartleFrames: INCLUDE "gfx/pokemon/totartle/frames.asm" CaterpieFrames: INCLUDE "gfx/pokemon/caterpie/frames.asm" MetapodFrames: INCLUDE "gfx/pokemon/metapod/frames.asm" ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm" @@ -117,6 +117,8 @@ TangelaFrames: INCLUDE "gfx/pokemon/tangela/frames.asm" KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm" HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm" SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm" +BlastykeFrames: INCLUDE "gfx/pokemon/blastyke/frames.asm" +BlastoiseFrames: INCLUDE "gfx/pokemon/blastoise/frames.asm" GoldeenFrames: INCLUDE "gfx/pokemon/goldeen/frames.asm" SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm" StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm" diff --git a/gfx/pokemon/totartle/anim.asm b/gfx/pokemon/totartle/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/totartle/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/totartle/anim_idle.asm b/gfx/pokemon/totartle/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/totartle/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/totartle/back.png b/gfx/pokemon/totartle/back.png new file mode 100644 index 0000000..50ef272 Binary files /dev/null and b/gfx/pokemon/totartle/back.png differ diff --git a/gfx/pokemon/totartle/front.png b/gfx/pokemon/totartle/front.png new file mode 100644 index 0000000..fe91f35 Binary files /dev/null and b/gfx/pokemon/totartle/front.png differ diff --git a/gfx/pokemon/totartle/shiny.pal b/gfx/pokemon/totartle/shiny.pal new file mode 100644 index 0000000..fee8f5d --- /dev/null +++ b/gfx/pokemon/totartle/shiny.pal @@ -0,0 +1,2 @@ + RGB 16, 25, 8 + RGB 24, 17, 31 \ No newline at end of file diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 53e033d..7378f91 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -111,6 +111,35 @@ PlayersRadioText4: text "#MON!" line "#MON CHANNEL…" done + +DebugPokemon1Script: + opentext + getmonname STRING_BUFFER_3, BLASTYKE + writetext ReceivedDebugPokemonText + playsound SFX_CAUGHT_MON + waitsfx + promptbutton + givepoke BLASTYKE, 35, RARE_CANDY + closetext + end + +DebugPokemon2Script: + opentext + getmonname STRING_BUFFER_3, WARTORTLE + writetext ReceivedDebugPokemonText + playsound SFX_CAUGHT_MON + waitsfx + promptbutton + givepoke WARTORTLE, 35, RARE_CANDY + closetext + end + +ReceivedDebugPokemonText: + text " received" + line "@" + text_ram wStringBuffer3 + text "!" + done PlayersHouse2F_MapEvents: db 0, 0 ; filler @@ -131,3 +160,6 @@ PlayersHouse2F_MapEvents: object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 2, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon1Script, -1 + object_event 7, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1 + \ No newline at end of file diff --git a/maps/ViridianForest.ablk b/maps/ViridianForest.ablk index 568dc57..985d2ab 100644 Binary files a/maps/ViridianForest.ablk and b/maps/ViridianForest.ablk differ