thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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/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"

4
data/pokemon/cries.asm
View file

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

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

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 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

2
data/pokemon/dex_order_alpha.asm
View file

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

4
data/pokemon/dex_order_new.asm
View file

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

11
data/pokemon/egg_moves_kanto.asm
View file

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

49
data/pokemon/evos_attacks_kanto.asm
View file

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

2
data/pokemon/first_stages.asm
View file

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

4
data/pokemon/gen1_base_special.asm
View file

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

4
data/pokemon/gen1_order.asm
View file

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

4
data/pokemon/menu_icons.asm
View file

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

4
data/pokemon/names.asm
View file

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

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

8
data/pokemon/pic_pointers.asm
View file

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

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 ; 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

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