thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

TOTARTLE AND BLASTYKEgit status! (+Viridian Forest & Debug Stuff)

Browse source
This commit is contained in:
Misty Violet 2023-10-25 23:52:47 -04:00
parent c6a4f3245b
commit d1e9accd44
46 changed files with 215 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/pokemon_constants.asm
View file

@ -27,7 +27,7 @@
const CHARIZARD ; 06 const CHARIZARD ; 06
const SQUIRTLE ; 07 const SQUIRTLE ; 07
const WARTORTLE ; 08 const WARTORTLE ; 08
const BLASTOISE ; 09 const TOTARTLE ; 09
const CATERPIE ; 0a const CATERPIE ; 0a
const METAPOD ; 0b const METAPOD ; 0b
const BUTTERFREE ; 0c const BUTTERFREE ; 0c
@ -136,6 +136,8 @@
const KANGASKHAN ; 73 const KANGASKHAN ; 73
const HORSEA ; 74 const HORSEA ; 74
const SEADRA ; 75 const SEADRA ; 75
const BLASTYKE
const BLASTOISE
const GOLDEEN ; 76 const GOLDEEN ; 76
const SEAKING ; 77 const SEAKING ; 77
const STARYU ; 78 const STARYU ; 78

4
data/pokemon/base_stats.asm
View file

@ -35,7 +35,7 @@ INCLUDE "data/pokemon/base_stats/charmeleon.asm"
INCLUDE "data/pokemon/base_stats/charizard.asm" INCLUDE "data/pokemon/base_stats/charizard.asm"
INCLUDE "data/pokemon/base_stats/squirtle.asm" INCLUDE "data/pokemon/base_stats/squirtle.asm"
INCLUDE "data/pokemon/base_stats/wartortle.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/caterpie.asm"
INCLUDE "data/pokemon/base_stats/metapod.asm" INCLUDE "data/pokemon/base_stats/metapod.asm"
INCLUDE "data/pokemon/base_stats/butterfree.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/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.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/goldeen.asm"
INCLUDE "data/pokemon/base_stats/seaking.asm" INCLUDE "data/pokemon/base_stats/seaking.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm" INCLUDE "data/pokemon/base_stats/staryu.asm"

4
data/pokemon/cries.asm
View file

@ -14,7 +14,7 @@ PokemonCries::
mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD
mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE
mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE 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_CATERPIE, 128, 160 ; CATERPIE
mon_cry CRY_METAPOD, 204, 129 ; METAPOD mon_cry CRY_METAPOD, 204, 129 ; METAPOD
mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE
@ -123,6 +123,8 @@ PokemonCries::
mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA 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, 128, 192 ; GOLDEEN
mon_cry CRY_CATERPIE, 16, 383 ; SEAKING mon_cry CRY_CATERPIE, 16, 383 ; SEAKING
mon_cry CRY_PARAS, 2, 160 ; STARYU mon_cry CRY_PARAS, 2, 160 ; STARYU

4
data/pokemon/dex_entries.asm
View file

@ -8,7 +8,7 @@ CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm"
CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm" CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm"
SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm" SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm"
WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/wartortle.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" CaterpiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/caterpie.asm"
MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/metapod.asm" MetapodPokedexEntry:: INCLUDE "data/pokemon/dex_entries/metapod.asm"
ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.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" KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm"
HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm"
SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.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" GoldeenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/goldeen.asm"
SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm" SeakingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seaking.asm"
StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm"

10
data/pokemon/dex_entries/blastyke.asm Normal file
View file

@ -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.@"

10
data/pokemon/dex_entries/totartle.asm Normal file
View file

@ -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.@"

4
data/pokemon/dex_entry_pointers.asm
View file

@ -9,7 +9,7 @@ PokedexDataPointerTable:
dba CharizardPokedexEntry dba CharizardPokedexEntry
dba SquirtlePokedexEntry dba SquirtlePokedexEntry
dba WartortlePokedexEntry dba WartortlePokedexEntry
dba BlastoisePokedexEntry dba TotartlePokedexEntry
dba CaterpiePokedexEntry dba CaterpiePokedexEntry
dba MetapodPokedexEntry dba MetapodPokedexEntry
dba ButterfreePokedexEntry dba ButterfreePokedexEntry
@ -118,6 +118,8 @@ PokedexDataPointerTable:
dba KangaskhanPokedexEntry dba KangaskhanPokedexEntry
dba HorseaPokedexEntry dba HorseaPokedexEntry
dba SeadraPokedexEntry dba SeadraPokedexEntry
dba BlastykePokedexEntry
dba BlastoisePokedexEntry
dba GoldeenPokedexEntry dba GoldeenPokedexEntry
dba SeakingPokedexEntry dba SeakingPokedexEntry
dba StaryuPokedexEntry dba StaryuPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -17,6 +17,7 @@ AlphabeticalPokedexOrder:
dw BELLOSSOM dw BELLOSSOM
dw BELLSPROUT dw BELLSPROUT
dw BLASTOISE dw BLASTOISE
dw BLASTYKE
dw BLISSEY dw BLISSEY
dw BULBASAUR dw BULBASAUR
dw BUTTERFREE dw BUTTERFREE
@ -227,6 +228,7 @@ AlphabeticalPokedexOrder:
dw TENTACRUEL dw TENTACRUEL
dw TOGEPI dw TOGEPI
dw TOGETIC dw TOGETIC
dw TOTARTLE
dw TOTODILE dw TOTODILE
dw TYPHLOSION dw TYPHLOSION
dw TYRANITAR dw TYRANITAR

4
data/pokemon/dex_order_new.asm
View file

@ -190,6 +190,8 @@ NewPokedexOrder:
dw HORSEA dw HORSEA
dw SEADRA dw SEADRA
dw KINGDRA dw KINGDRA
dw BLASTYKE
dw BLASTOISE
dw GLIGAR dw GLIGAR
dw DELIBIRD dw DELIBIRD
dw SWINUB dw SWINUB
@ -235,7 +237,7 @@ NewPokedexOrder:
dw CHARIZARD dw CHARIZARD
dw SQUIRTLE dw SQUIRTLE
dw WARTORTLE dw WARTORTLE
dw BLASTOISE dw TOTARTLE
dw ARTICUNO dw ARTICUNO
dw ZAPDOS dw ZAPDOS
dw MOLTRES dw MOLTRES

11
data/pokemon/egg_moves_kanto.asm
View file

@ -118,6 +118,8 @@ EggMovePointers1:
dw KangaskhanEggMoves dw KangaskhanEggMoves
dw HorseaEggMoves dw HorseaEggMoves
dw NoEggMoves1 dw NoEggMoves1
dw BlastykeEggMoves
dw NoEggMoves1
dw GoldeenEggMoves dw GoldeenEggMoves
dw NoEggMoves1 dw NoEggMoves1
dw NoEggMoves1 dw NoEggMoves1
@ -514,6 +516,15 @@ HorseaEggMoves:
dw SPLASH dw SPLASH
dw DRAGON_RAGE dw DRAGON_RAGE
dw -1 ; end dw -1 ; end
BlastykeEggMoves:
dw MIRROR_COAT
dw HAZE
dw MIST
dw CONFUSION
dw FORESIGHT
dw FLAIL
dw -1 ; end
GoldeenEggMoves: GoldeenEggMoves:
dw PSYBEAM dw PSYBEAM

49
data/pokemon/evos_attacks_kanto.asm
View file

@ -9,7 +9,7 @@ EvosAttacksPointers1::
dw CharizardEvosAttacks dw CharizardEvosAttacks
dw SquirtleEvosAttacks dw SquirtleEvosAttacks
dw WartortleEvosAttacks dw WartortleEvosAttacks
dw BlastoiseEvosAttacks dw TotartleEvosAttacks
dw CaterpieEvosAttacks dw CaterpieEvosAttacks
dw MetapodEvosAttacks dw MetapodEvosAttacks
dw ButterfreeEvosAttacks dw ButterfreeEvosAttacks
@ -118,6 +118,8 @@ EvosAttacksPointers1::
dw KangaskhanEvosAttacks dw KangaskhanEvosAttacks
dw HorseaEvosAttacks dw HorseaEvosAttacks
dw SeadraEvosAttacks dw SeadraEvosAttacks
dw BlastykeEvosAttacks
dw BlastoiseEvosAttacks
dw GoldeenEvosAttacks dw GoldeenEvosAttacks
dw SeakingEvosAttacks dw SeakingEvosAttacks
dw StaryuEvosAttacks dw StaryuEvosAttacks
@ -271,7 +273,7 @@ SquirtleEvosAttacks:
db 0 ; no more level-up moves db 0 ; no more level-up moves
WartortleEvosAttacks: WartortleEvosAttacks:
dbbw EVOLVE_LEVEL, 36, BLASTOISE dbbw EVOLVE_LEVEL, 36, TOTARTLE
db 0 ; no more evolutions db 0 ; no more evolutions
dbw 1, TACKLE dbw 1, TACKLE
dbw 1, TAIL_WHIP dbw 1, TAIL_WHIP
@ -288,7 +290,7 @@ WartortleEvosAttacks:
dbw 53, HYDRO_PUMP dbw 53, HYDRO_PUMP
db 0 ; no more level-up moves db 0 ; no more level-up moves
BlastoiseEvosAttacks: TotartleEvosAttacks:
db 0 ; no more evolutions db 0 ; no more evolutions
dbw 1, TACKLE dbw 1, TACKLE
dbw 1, TAIL_WHIP dbw 1, TAIL_WHIP
@ -301,9 +303,11 @@ BlastoiseEvosAttacks:
dbw 19, BITE dbw 19, BITE
dbw 25, RAPID_SPIN dbw 25, RAPID_SPIN
dbw 31, PROTECT dbw 31, PROTECT
dbw 42, RAIN_DANCE dbw 36, COMET_PUNCH
dbw 55, SKULL_BASH dbw 40, RAIN_DANCE
dbw 68, HYDRO_PUMP dbw 51, SKULL_BASH
dbw 62, HYDRO_PUMP
dbw 67, PETAL_DANCE
db 0 ; no more level-up moves db 0 ; no more level-up moves
CaterpieEvosAttacks: CaterpieEvosAttacks:
@ -1737,6 +1741,39 @@ SeadraEvosAttacks:
dbw 40, AGILITY dbw 40, AGILITY
dbw 51, HYDRO_PUMP dbw 51, HYDRO_PUMP
db 0 ; no more level-up moves 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: GoldeenEvosAttacks:
dbbw EVOLVE_LEVEL, 33, SEAKING dbbw EVOLVE_LEVEL, 33, SEAKING

2
data/pokemon/first_stages.asm
View file

@ -118,6 +118,8 @@ FirstEvoStages::
dw KANGASKHAN dw KANGASKHAN
dw HORSEA dw HORSEA
dw HORSEA dw HORSEA
dw BLASTYKE
dw BLASTYKE
dw GOLDEEN dw GOLDEEN
dw GOLDEEN dw GOLDEEN
dw STARYU ;78 dw STARYU ;78

4
data/pokemon/gen1_base_special.asm
View file

@ -10,7 +10,7 @@ KantoMonSpecials:
db 85 ; CHARIZARD db 85 ; CHARIZARD
db 50 ; SQUIRTLE db 50 ; SQUIRTLE
db 65 ; WARTORTLE db 65 ; WARTORTLE
db 85 ; BLASTOISE db 100 ; BLASTOISE
db 20 ; CATERPIE db 20 ; CATERPIE
db 25 ; METAPOD db 25 ; METAPOD
db 80 ; BUTTERFREE db 80 ; BUTTERFREE
@ -119,6 +119,8 @@ KantoMonSpecials:
db 40 ; KANGASKHAN db 40 ; KANGASKHAN
db 70 ; HORSEA db 70 ; HORSEA
db 95 ; SEADRA db 95 ; SEADRA
db 45 ; BLASTYKE
db 85 ; BLASTOISE
db 50 ; GOLDEEN db 50 ; GOLDEEN
db 80 ; SEAKING db 80 ; SEAKING
db 70 ; STARYU db 70 ; STARYU

4
data/pokemon/gen1_order.asm
View file

@ -171,6 +171,7 @@ Pokered_MonIndices:
db GEODUDE db GEODUDE
db PORYGON db PORYGON
db AERODACTYL db AERODACTYL
db BLASTYKE
db RAIKOU ; MISSINGNO. db RAIKOU ; MISSINGNO.
db MAGNEMITE db MAGNEMITE
db ENTEI ; MISSINGNO. db ENTEI ; MISSINGNO.
@ -180,6 +181,7 @@ Pokered_MonIndices:
db CHARMELEON db CHARMELEON
db WARTORTLE db WARTORTLE
db CHARIZARD db CHARIZARD
db TOTARTLE
db LARVITAR ; MISSINGNO. db LARVITAR ; MISSINGNO.
db PUPITAR ; MISSINGNO. KABUTOPS FOSSIL db PUPITAR ; MISSINGNO. KABUTOPS FOSSIL
db TYRANITAR ; MISSINGNO. AERODACTYL FOSSIL db TYRANITAR ; MISSINGNO. AERODACTYL FOSSIL
@ -190,7 +192,7 @@ Pokered_MonIndices:
db BELLSPROUT db BELLSPROUT
db WEEPINBELL db WEEPINBELL
db VICTREEBEL db VICTREEBEL
assert_table_length 190 ; gen 1 mon indexes assert_table_length 192 ; gen 1 mon indexes
db CHIKORITA db CHIKORITA
db BAYLEEF db BAYLEEF
db MEGANIUM db MEGANIUM

4
data/pokemon/menu_icons.asm
View file

@ -10,7 +10,7 @@ MonMenuIcons:
db ICON_BIGMON ; CHARIZARD db ICON_BIGMON ; CHARIZARD
db ICON_SQUIRTLE ; SQUIRTLE db ICON_SQUIRTLE ; SQUIRTLE
db ICON_SQUIRTLE ; WARTORTLE db ICON_SQUIRTLE ; WARTORTLE
db ICON_SQUIRTLE ; BLASTOISE db ICON_SQUIRTLE ; TOTARTLE
db ICON_CATERPILLAR ; CATERPIE db ICON_CATERPILLAR ; CATERPIE
db ICON_CATERPILLAR ; METAPOD db ICON_CATERPILLAR ; METAPOD
db ICON_MOTH ; BUTTERFREE db ICON_MOTH ; BUTTERFREE
@ -119,6 +119,8 @@ MonMenuIcons:
db ICON_MONSTER ; KANGASKHAN db ICON_MONSTER ; KANGASKHAN
db ICON_FISH ; HORSEA db ICON_FISH ; HORSEA
db ICON_FISH ; SEADRA db ICON_FISH ; SEADRA
db ICON_SQUIRTLE ; BLASTYKE
db ICON_SQUIRTLE ; BLASTOISE
db ICON_FISH ; GOLDEEN db ICON_FISH ; GOLDEEN
db ICON_FISH ; SEAKING db ICON_FISH ; SEAKING
db ICON_STARYU ; STARYU db ICON_STARYU ; STARYU

4
data/pokemon/names.asm
View file

@ -12,7 +12,7 @@ PokemonNames::
db "CHARIZARD@" db "CHARIZARD@"
db "SQUIRTLE@@" db "SQUIRTLE@@"
db "WARTORTLE@" db "WARTORTLE@"
db "BLASTOISE@" db "TOTARTLE@@"
db "CATERPIE@@" db "CATERPIE@@"
db "METAPOD@@@" db "METAPOD@@@"
db "BUTTERFREE" db "BUTTERFREE"
@ -121,6 +121,8 @@ PokemonNames::
db "KANGASKHAN" db "KANGASKHAN"
db "HORSEA@@@@" db "HORSEA@@@@"
db "SEADRA@@@@" db "SEADRA@@@@"
db "BLASTYKE@@"
db "BLASTOISE@"
db "GOLDEEN@@@" db "GOLDEEN@@@"
db "SEAKING@@@" db "SEAKING@@@"
db "STARYU@@@@" db "STARYU@@@@"

8
data/pokemon/palettes.asm
View file

@ -49,8 +49,8 @@ INCBIN "gfx/pokemon/squirtle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/squirtle/shiny.pal" INCLUDE "gfx/pokemon/squirtle/shiny.pal"
INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/wartortle/shiny.pal" INCLUDE "gfx/pokemon/wartortle/shiny.pal"
INCBIN "gfx/pokemon/blastoise/front.gbcpal", middle_colors INCBIN "gfx/pokemon/totartle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/blastoise/shiny.pal" INCLUDE "gfx/pokemon/totartle/shiny.pal"
INCBIN "gfx/pokemon/caterpie/front.gbcpal", middle_colors INCBIN "gfx/pokemon/caterpie/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/caterpie/shiny.pal" INCLUDE "gfx/pokemon/caterpie/shiny.pal"
INCBIN "gfx/pokemon/metapod/front.gbcpal", middle_colors 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" INCLUDE "gfx/pokemon/horsea/shiny.pal"
INCBIN "gfx/pokemon/seadra/front.gbcpal", middle_colors INCBIN "gfx/pokemon/seadra/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/seadra/shiny.pal" 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 INCBIN "gfx/pokemon/goldeen/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/goldeen/shiny.pal" INCLUDE "gfx/pokemon/goldeen/shiny.pal"
INCBIN "gfx/pokemon/seaking/front.gbcpal", middle_colors INCBIN "gfx/pokemon/seaking/front.gbcpal", middle_colors

8
data/pokemon/pic_pointers.asm
View file

@ -29,8 +29,8 @@ PokemonPicPointers::
dba SquirtleBackpic dba SquirtleBackpic
dba WartortleFrontpic dba WartortleFrontpic
dba WartortleBackpic dba WartortleBackpic
dba BlastoiseFrontpic dba TotartleFrontpic
dba BlastoiseBackpic dba TotartleBackpic
dba CaterpieFrontpic dba CaterpieFrontpic
dba CaterpieBackpic dba CaterpieBackpic
dba MetapodFrontpic dba MetapodFrontpic
@ -247,6 +247,10 @@ PokemonPicPointers::
dba HorseaBackpic dba HorseaBackpic
dba SeadraFrontpic dba SeadraFrontpic
dba SeadraBackpic dba SeadraBackpic
dba BlastykeFrontpic
dba BlastykeBackpic
dba BlastoiseFrontpic
dba BlastoiseBackpic
dba GoldeenFrontpic dba GoldeenFrontpic
dba GoldeenBackpic dba GoldeenBackpic
dba SeakingFrontpic dba SeakingFrontpic

16
data/tilesets/forest_attributes.bin
View file

@ -1 +1,15 @@
  








29
data/tilesets/forest_collision.asm
View file

@ -38,27 +38,8 @@
tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 27
tilecoll WALL, FLOOR, WALL, FLOOR ; 28 tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 28
tilecoll WALL, FLOOR, WALL, FLOOR ; 29 tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 29
tilecoll WALL, FLOOR, WALL, FLOOR ; 2a tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 2a
tilecoll WALL, FLOOR, WALL, FLOOR ; 2b tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b
tilecoll WALL, FLOOR, WALL, FLOOR ; 2c tilecoll FLOOR, 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

2
data/tilesets/forest_metatiles.bin
View file

@ -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 ,-./<=>?**** ,-./<=>? ***&'&'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

6
gfx/footprints.asm
View file

@ -9,7 +9,7 @@ INCBIN "gfx/footprints/charmeleon.1bpp"
INCBIN "gfx/footprints/charizard.1bpp" INCBIN "gfx/footprints/charizard.1bpp"
INCBIN "gfx/footprints/squirtle.1bpp" INCBIN "gfx/footprints/squirtle.1bpp"
INCBIN "gfx/footprints/wartortle.1bpp" INCBIN "gfx/footprints/wartortle.1bpp"
INCBIN "gfx/footprints/blastoise.1bpp" INCBIN "gfx/footprints/totartle.1bpp"
INCBIN "gfx/footprints/caterpie.1bpp" INCBIN "gfx/footprints/caterpie.1bpp"
INCBIN "gfx/footprints/metapod.1bpp" INCBIN "gfx/footprints/metapod.1bpp"
INCBIN "gfx/footprints/butterfree.1bpp" INCBIN "gfx/footprints/butterfree.1bpp"
@ -118,6 +118,8 @@ INCBIN "gfx/footprints/tangela.1bpp"
INCBIN "gfx/footprints/kangaskhan.1bpp" INCBIN "gfx/footprints/kangaskhan.1bpp"
INCBIN "gfx/footprints/horsea.1bpp" INCBIN "gfx/footprints/horsea.1bpp"
INCBIN "gfx/footprints/seadra.1bpp" INCBIN "gfx/footprints/seadra.1bpp"
INCBIN "gfx/footprints/blastyke.1bpp"
INCBIN "gfx/footprints/blastoise.1bpp"
INCBIN "gfx/footprints/goldeen.1bpp" INCBIN "gfx/footprints/goldeen.1bpp"
INCBIN "gfx/footprints/seaking.1bpp" INCBIN "gfx/footprints/seaking.1bpp"
INCBIN "gfx/footprints/staryu.1bpp" INCBIN "gfx/footprints/staryu.1bpp"
@ -258,4 +260,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp" INCBIN "gfx/footprints/256.1bpp"
assert_table_length $100 assert_table_length $102

BIN
gfx/footprints/blastyke.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 108 B

BIN
gfx/footprints/totartle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 100 B

8
gfx/pics.asm
View file

@ -713,10 +713,10 @@ SECTION "Pics 19", ROMX
; Seems to be an accidental copy of the previous bank ; Seems to be an accidental copy of the previous bank
INCBIN "gfx/pokemon/spinarak/back.2bpp.lz" TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
INCBIN "gfx/pokemon/raikou/back.2bpp.lz" TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_k/front.animated.2bpp.lz" BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
INCBIN "gfx/pokemon/houndour/back.2bpp.lz" BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"

4
gfx/pokemon/anim_pointers.asm
View file

@ -8,7 +8,7 @@ AnimationPointers:
dw CharizardAnimation dw CharizardAnimation
dw SquirtleAnimation dw SquirtleAnimation
dw WartortleAnimation dw WartortleAnimation
dw BlastoiseAnimation dw TotartleAnimation
dw CaterpieAnimation dw CaterpieAnimation
dw MetapodAnimation dw MetapodAnimation
dw ButterfreeAnimation dw ButterfreeAnimation
@ -117,6 +117,8 @@ AnimationPointers:
dw KangaskhanAnimation dw KangaskhanAnimation
dw HorseaAnimation dw HorseaAnimation
dw SeadraAnimation dw SeadraAnimation
dw BlastykeAnimation
dw BlastoiseAnimation
dw GoldeenAnimation dw GoldeenAnimation
dw SeakingAnimation dw SeakingAnimation
dw StaryuAnimation dw StaryuAnimation

4
gfx/pokemon/anims.asm
View file

@ -6,7 +6,7 @@ CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm"
CharizardAnimation: INCLUDE "gfx/pokemon/charizard/anim.asm" CharizardAnimation: INCLUDE "gfx/pokemon/charizard/anim.asm"
SquirtleAnimation: INCLUDE "gfx/pokemon/squirtle/anim.asm" SquirtleAnimation: INCLUDE "gfx/pokemon/squirtle/anim.asm"
WartortleAnimation: INCLUDE "gfx/pokemon/wartortle/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" CaterpieAnimation: INCLUDE "gfx/pokemon/caterpie/anim.asm"
MetapodAnimation: INCLUDE "gfx/pokemon/metapod/anim.asm" MetapodAnimation: INCLUDE "gfx/pokemon/metapod/anim.asm"
ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/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" KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm"
HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm" HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm"
SeadraAnimation: INCLUDE "gfx/pokemon/seadra/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" GoldeenAnimation: INCLUDE "gfx/pokemon/goldeen/anim.asm"
SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm" SeakingAnimation: INCLUDE "gfx/pokemon/seaking/anim.asm"
StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm" StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm"

4
gfx/pokemon/bitmask_pointers.asm
View file

@ -8,7 +8,7 @@ BitmasksPointers:
dw CharizardBitmasks dw CharizardBitmasks
dw SquirtleBitmasks dw SquirtleBitmasks
dw WartortleBitmasks dw WartortleBitmasks
dw BlastoiseBitmasks dw TotartleBitmasks
dw CaterpieBitmasks dw CaterpieBitmasks
dw MetapodBitmasks dw MetapodBitmasks
dw ButterfreeBitmasks dw ButterfreeBitmasks
@ -117,6 +117,8 @@ BitmasksPointers:
dw KangaskhanBitmasks dw KangaskhanBitmasks
dw HorseaBitmasks dw HorseaBitmasks
dw SeadraBitmasks dw SeadraBitmasks
dw BlastykeBitmasks
dw BlastoiseBitmasks
dw GoldeenBitmasks dw GoldeenBitmasks
dw SeakingBitmasks dw SeakingBitmasks
dw StaryuBitmasks dw StaryuBitmasks

4
gfx/pokemon/bitmasks.asm
View file

@ -6,7 +6,7 @@ CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm"
CharizardBitmasks: INCLUDE "gfx/pokemon/charizard/bitmask.asm" CharizardBitmasks: INCLUDE "gfx/pokemon/charizard/bitmask.asm"
SquirtleBitmasks: INCLUDE "gfx/pokemon/squirtle/bitmask.asm" SquirtleBitmasks: INCLUDE "gfx/pokemon/squirtle/bitmask.asm"
WartortleBitmasks: INCLUDE "gfx/pokemon/wartortle/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" CaterpieBitmasks: INCLUDE "gfx/pokemon/caterpie/bitmask.asm"
MetapodBitmasks: INCLUDE "gfx/pokemon/metapod/bitmask.asm" MetapodBitmasks: INCLUDE "gfx/pokemon/metapod/bitmask.asm"
ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/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" KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm"
HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm" HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm"
SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/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" GoldeenBitmasks: INCLUDE "gfx/pokemon/goldeen/bitmask.asm"
SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm" SeakingBitmasks: INCLUDE "gfx/pokemon/seaking/bitmask.asm"
StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm" StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm"

1
gfx/pokemon/blastyke/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/blastyke/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/blastyke/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
gfx/pokemon/blastyke/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

0
gfx/pokemon/blastyke/pallete.txt Normal file
View file

4
gfx/pokemon/blastyke/shiny.pal Normal file
View file

@ -0,0 +1,4 @@
RGB 14, 21, 07
RGB 16, 16, 20

4
gfx/pokemon/frame_pointers.asm
View file

@ -8,7 +8,7 @@ FramesPointers:
dba CharizardFrames dba CharizardFrames
dba SquirtleFrames dba SquirtleFrames
dba WartortleFrames dba WartortleFrames
dba BlastoiseFrames dba TotartleFrames
dba CaterpieFrames dba CaterpieFrames
dba MetapodFrames dba MetapodFrames
dba ButterfreeFrames dba ButterfreeFrames
@ -117,6 +117,8 @@ FramesPointers:
dba KangaskhanFrames dba KangaskhanFrames
dba HorseaFrames dba HorseaFrames
dba SeadraFrames dba SeadraFrames
dba BlastykeFrames
dba BlastoiseFrames
dba GoldeenFrames dba GoldeenFrames
dba SeakingFrames dba SeakingFrames
dba StaryuFrames dba StaryuFrames

4
gfx/pokemon/idle_pointers.asm
View file

@ -8,7 +8,7 @@ AnimationIdlePointers:
dw CharizardAnimationIdle dw CharizardAnimationIdle
dw SquirtleAnimationIdle dw SquirtleAnimationIdle
dw WartortleAnimationIdle dw WartortleAnimationIdle
dw BlastoiseAnimationIdle dw TotartleAnimationIdle
dw CaterpieAnimationIdle dw CaterpieAnimationIdle
dw MetapodAnimationIdle dw MetapodAnimationIdle
dw ButterfreeAnimationIdle dw ButterfreeAnimationIdle
@ -117,6 +117,8 @@ AnimationIdlePointers:
dw KangaskhanAnimationIdle dw KangaskhanAnimationIdle
dw HorseaAnimationIdle dw HorseaAnimationIdle
dw SeadraAnimationIdle dw SeadraAnimationIdle
dw BlastykeAnimationIdle
dw BlastoiseAnimationIdle
dw GoldeenAnimationIdle dw GoldeenAnimationIdle
dw SeakingAnimationIdle dw SeakingAnimationIdle
dw StaryuAnimationIdle dw StaryuAnimationIdle

4
gfx/pokemon/idles.asm
View file

@ -6,7 +6,7 @@ CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm"
CharizardAnimationIdle: INCLUDE "gfx/pokemon/charizard/anim_idle.asm" CharizardAnimationIdle: INCLUDE "gfx/pokemon/charizard/anim_idle.asm"
SquirtleAnimationIdle: INCLUDE "gfx/pokemon/squirtle/anim_idle.asm" SquirtleAnimationIdle: INCLUDE "gfx/pokemon/squirtle/anim_idle.asm"
WartortleAnimationIdle: INCLUDE "gfx/pokemon/wartortle/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" CaterpieAnimationIdle: INCLUDE "gfx/pokemon/caterpie/anim_idle.asm"
MetapodAnimationIdle: INCLUDE "gfx/pokemon/metapod/anim_idle.asm" MetapodAnimationIdle: INCLUDE "gfx/pokemon/metapod/anim_idle.asm"
ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/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" KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm"
HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm" HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm"
SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/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" GoldeenAnimationIdle: INCLUDE "gfx/pokemon/goldeen/anim_idle.asm"
SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm" SeakingAnimationIdle: INCLUDE "gfx/pokemon/seaking/anim_idle.asm"
StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm" StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm"

4
gfx/pokemon/kanto_frames.asm
View file

@ -8,7 +8,7 @@ CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm"
CharizardFrames: INCLUDE "gfx/pokemon/charizard/frames.asm" CharizardFrames: INCLUDE "gfx/pokemon/charizard/frames.asm"
SquirtleFrames: INCLUDE "gfx/pokemon/squirtle/frames.asm" SquirtleFrames: INCLUDE "gfx/pokemon/squirtle/frames.asm"
WartortleFrames: INCLUDE "gfx/pokemon/wartortle/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" CaterpieFrames: INCLUDE "gfx/pokemon/caterpie/frames.asm"
MetapodFrames: INCLUDE "gfx/pokemon/metapod/frames.asm" MetapodFrames: INCLUDE "gfx/pokemon/metapod/frames.asm"
ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/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" KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm"
HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm" HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm"
SeadraFrames: INCLUDE "gfx/pokemon/seadra/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" GoldeenFrames: INCLUDE "gfx/pokemon/goldeen/frames.asm"
SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm" SeakingFrames: INCLUDE "gfx/pokemon/seaking/frames.asm"
StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm" StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm"

1
gfx/pokemon/totartle/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/totartle/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/totartle/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
gfx/pokemon/totartle/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 870 B

2
gfx/pokemon/totartle/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 16, 25, 8
RGB 24, 17, 31

32
maps/PlayersHouse2F.asm
View file

@ -111,6 +111,35 @@ PlayersRadioText4:
text "#MON!" text "#MON!"
line "#MON CHANNEL…" line "#MON CHANNEL…"
done 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 "<PLAYER> received"
line "@"
text_ram wStringBuffer3
text "!"
done
PlayersHouse2F_MapEvents: PlayersHouse2F_MapEvents:
db 0, 0 ; filler 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 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 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 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

BIN
maps/ViridianForest.ablk
View file

Binary file not shown.