diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 128adfd..78e2394 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -130,12 +130,17 @@ const HITMONLEE ; 6a const HITMONCHAN ; 6b const LICKITUNG ; 6c + const LICKILICKY + const LICKILORD const KOFFING ; 6d const WEEZING ; 6e const RHYHORN ; 6f const RHYDON ; 70 const CHANSEY ; 71 + const BURGELA const TANGELA ; 72 + const TANGROWTH + const JUNGELA const KANGASKHAN ; 73 const HORSEA ; 74 const SEADRA ; 75 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index f61da46..0cd88a6 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -220,7 +220,7 @@ DEF NUM_HAPPINESS_CHANGES EQU const_value - 1 ; significant happiness values DEF BASE_HAPPINESS EQU 70 DEF FRIEND_BALL_HAPPINESS EQU 200 -DEF HAPPINESS_TO_EVOLVE EQU 220 +DEF HAPPINESS_TO_EVOLVE EQU 170 DEF HAPPINESS_THRESHOLD_1 EQU 100 DEF HAPPINESS_THRESHOLD_2 EQU 200 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 1ed4c88..7c72bdc 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -138,12 +138,17 @@ INCLUDE "data/pokemon/base_stats/marowak.asm" INCLUDE "data/pokemon/base_stats/hitmonlee.asm" INCLUDE "data/pokemon/base_stats/hitmonchan.asm" INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/lickilicky.asm" +INCLUDE "data/pokemon/base_stats/lickilord.asm" INCLUDE "data/pokemon/base_stats/koffing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhydon.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/burgela.asm" INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/tangrowth.asm" +INCLUDE "data/pokemon/base_stats/jungela.asm" INCLUDE "data/pokemon/base_stats/kangaskhan.asm" INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/seadra.asm" diff --git a/data/pokemon/base_stats/lickilord.asm b/data/pokemon/base_stats/lickilord.asm index f6e2229..f1b2db2 100644 --- a/data/pokemon/base_stats/lickilord.asm +++ b/data/pokemon/base_stats/lickilord.asm @@ -1,6 +1,6 @@ db 0 ; species ID placeholder - db 100, 65, 85, 50, 110, 105 + db 80, 110, 105, 70, 65, 85 ; hp atk def spd sat sdf db NORMAL, POISON ; type diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 56b9beb..12741d6 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -32,7 +32,7 @@ PokemonCries:: mon_cry CRY_EKANS, 224, 144 ; ARBOK mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU mon_cry CRY_RAICHU, 238, 136 ; RAICHU - mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU + mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F @@ -117,12 +117,17 @@ PokemonCries:: mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN mon_cry CRY_SEEL, 0, 256 ; LICKITUNG + mon_cry CRY_SEEL, -256, 300 ; LICKILICKY, tentative + mon_cry CRY_SEEL, -300, 400 ; LICKILORD, tentative mon_cry CRY_GOLEM, 230, 349 ; KOFFING mon_cry CRY_GOLEM, 255, 383 ; WEEZING mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN mon_cry CRY_RHYDON, 0, 256 ; RHYDON mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_GOLEM, 50, 140 ; BURGELA, tentative mon_cry CRY_GOLEM, 0, 256 ; TANGELA + mon_cry CRY_GOLEM, -256, 350 ; TANGROWTH, tentative + mon_cry CRY_GOLEM, -140, 383 ; JUNGELA, tentative mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 612a2b5..4796106 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -115,12 +115,17 @@ MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marowak.asm" HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonlee.asm" HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonchan.asm" LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickitung.asm" +LickilickyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickilicky.asm" +LickilordPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickilord.asm" KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/koffing.asm" WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weezing.asm" RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyhorn.asm" RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhydon.asm" ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chansey.asm" +BurgelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/burgela.asm" TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" +TangrowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangrowth.asm" +JungelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jungela.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" diff --git a/data/pokemon/dex_entries/burgela.asm b/data/pokemon/dex_entries/burgela.asm new file mode 100644 index 0000000..1797e46 --- /dev/null +++ b/data/pokemon/dex_entries/burgela.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 200, 312 ; height, weight + + db "As it runs about," + next "the vines on its" + next "head may obscure" + + page "its singular eye," + next "causing it to" + next "trip and fall.@" diff --git a/data/pokemon/dex_entries/jungela.asm b/data/pokemon/dex_entries/jungela.asm new file mode 100644 index 0000000..b88319f --- /dev/null +++ b/data/pokemon/dex_entries/jungela.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 505, 3901 ; height, weight + + db "In dense jungles," + next "its creeping vines" + next "may snare and drag" + + page "any that trod on" + next "them away to meet" + next "their doom.@" diff --git a/data/pokemon/dex_entries/lickilicky.asm b/data/pokemon/dex_entries/lickilicky.asm new file mode 100644 index 0000000..bbd5e27 --- /dev/null +++ b/data/pokemon/dex_entries/lickilicky.asm @@ -0,0 +1,10 @@ + db "LICKING@" ; species name + dw 507, 3086 ; height, weight + + db "Despite its" + next "rubbery appearance" + next "its massive tongue" + + page "can be extended" + next "with enough force" + next "to crush boulders." diff --git a/data/pokemon/dex_entries/lickilord.asm b/data/pokemon/dex_entries/lickilord.asm new file mode 100644 index 0000000..47598c0 --- /dev/null +++ b/data/pokemon/dex_entries/lickilord.asm @@ -0,0 +1,10 @@ + db "LICKING@" ; species name + dw 611, 4371 ; height, weight + + db "It commands" + next "LICKITUNG with" + next "ultrasonic scree-" + + page "ches. A single" + next "lick causes" + next "severe poisoning." diff --git a/data/pokemon/dex_entries/tangrowth.asm b/data/pokemon/dex_entries/tangrowth.asm new file mode 100644 index 0000000..5cd833d --- /dev/null +++ b/data/pokemon/dex_entries/tangrowth.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 607, 2835 ; height, weight + + db "It lives in swampy" + next "areas, feeding on" + next "unsuspecting prey." + + page "Small #MON" + next "often play on" + next "its myriad vines.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 16e7403..b99e80e 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -112,12 +112,17 @@ PokedexDataPointerTable: dba HitmonleePokedexEntry dba HitmonchanPokedexEntry dba LickitungPokedexEntry + dba LickilickyPokedexEntry + dba LickilordPokedexEntry dba KoffingPokedexEntry dba WeezingPokedexEntry dba RhyhornPokedexEntry dba RhydonPokedexEntry dba ChanseyPokedexEntry + dba BurgelaPokedexEntry dba TangelaPokedexEntry + dba TangrowthPokedexEntry + dba JungelaPokedexEntry dba KangaskhanPokedexEntry dba HorseaPokedexEntry dba SeadraPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 3a5ec02..2fa6868 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -21,6 +21,7 @@ AlphabeticalPokedexOrder: dw BLASTYKE dw BLISSEY dw BULBASAUR + dw BURGELA dw BUTTERFREE dw CATERPIE dw CELEBI @@ -101,6 +102,7 @@ AlphabeticalPokedexOrder: dw JIGGLYPUFF dw JOLTEON dw JUMPLUFF + dw JUNGELA dw JYNX dw KABUTO dw KABUTOPS @@ -117,6 +119,8 @@ AlphabeticalPokedexOrder: dw LARVITAR dw LEDIAN dw LEDYBA + dw LICKILICKY + dw LICKILORD dw LICKITUNG dw LUGIA dw MACHAMP @@ -228,6 +232,7 @@ AlphabeticalPokedexOrder: dw SUNKERN dw SWINUB dw TANGELA + dw TANGROWTH dw TAUROS dw TEDDIURSA dw TENTACOOL diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 55ba85e..39bd99b 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -185,7 +185,12 @@ NewPokedexOrder: dw SEEL dw DEWGONG dw LICKITUNG + dw LICKILICKY + dw LICKILORD + dw BURGELA dw TANGELA + dw TANGROWTH + dw JUNGELA dw EEVEE dw VAPOREON dw JOLTEON diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 09eac36..bce1d80 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -112,12 +112,17 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw LickitungEggMoves + dw NoEggMoves1 ; Lickilicky + dw NoEggMoves1 ; Lickilord dw KoffingEggMoves dw NoEggMoves1 dw RhyhornEggMoves dw NoEggMoves1 dw ChanseyEggMoves - dw TangelaEggMoves + dw BurgelaEggMoves ; Burgela + dw NoEggMoves1 + dw NoEggMoves1 ; Tangrowth + dw NoEggMoves1 ; Jungela dw KangaskhanEggMoves dw HorseaEggMoves dw NoEggMoves1 @@ -502,7 +507,7 @@ ChanseyEggMoves: dw HEAL_BELL dw -1 ; end -TangelaEggMoves: +BurgelaEggMoves: dw FLAIL dw CONFUSION dw MEGA_DRAIN diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 35a9605..48e29fb 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -112,12 +112,17 @@ EvosAttacksPointers1:: dw HitmonleeEvosAttacks dw HitmonchanEvosAttacks dw LickitungEvosAttacks + dw LickilickyEvosAttacks + dw LickilordEvosAttacks dw KoffingEvosAttacks dw WeezingEvosAttacks dw RhyhornEvosAttacks dw RhydonEvosAttacks dw ChanseyEvosAttacks + dw BurgelaEvosAttacks dw TangelaEvosAttacks + dw TangrowthEvosAttacks + dw JungelaEvosAttacks dw KangaskhanEvosAttacks dw HorseaEvosAttacks dw SeadraEvosAttacks @@ -1658,6 +1663,9 @@ HitmonchanEvosAttacks: db 0 ; no more level-up moves LickitungEvosAttacks: + dbbw EVOLVE_LEVEL, 32, LICKILICKY + dbbw EVOLVE_ITEM, POISON_STONE, LICKILORD + dbbw EVOLVE_TRADE, KINGS_ROCK, LICKILORD db 0 ; no more evolutions dbw 1, LICK dbw 7, SUPERSONIC @@ -1668,6 +1676,28 @@ LickitungEvosAttacks: dbw 37, SLAM dbw 43, SCREECH db 0 ; no more level-up moves + +LickilickyEvosAttacks: + db 0 ; no more evolutions + dbw 1, LICK + dbw 7, SUPERSONIC + dbw 13, DEFENSE_CURL + dbw 19, STOMP + dbw 25, WRAP + dbw 31, DISABLE + dbw 32, ROLLOUT + dbw 40, SLAM + dbw 49, SCREECH + db 0 ; no more level-up moves + +LickilordEvosAttacks: + db 0 ; no more evolutions + dbw 1, ACID + dbw 1, LICK + dbw 1, WRAP + dbw 1, SLAM + dbw 30, TOXIC + db 0 ; no more level-up moves KoffingEvosAttacks: dbbw EVOLVE_LEVEL, 35, WEEZING @@ -1743,7 +1773,24 @@ ChanseyEvosAttacks: dbw 57, DOUBLE_EDGE db 0 ; no more level-up moves +BurgelaEvosAttacks: + dbbw EVOLVE_LEVEL, 22, TANGELA + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 4, SLEEP_POWDER + dbw 10, ABSORB + dbw 13, POISONPOWDER + dbw 19, VINE_WHIP + dbw 23, BIND + dbw 27, MEGA_DRAIN + dbw 28, STUN_SPORE + dbw 32, SLAM + dbw 36, GROWTH + db 0 ; no more level-up moves + TangelaEvosAttacks: + dbbw EVOLVE_LEVEL, 44, TANGROWTH + dbbw EVOLVE_ITEM, DUSK_STONE, JUNGELA db 0 ; no more evolutions dbw 1, CONSTRICT dbw 4, SLEEP_POWDER @@ -1756,6 +1803,30 @@ TangelaEvosAttacks: dbw 40, SLAM dbw 46, GROWTH db 0 ; no more level-up moves + +TangrowthEvosAttacks: + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 4, SLEEP_POWDER + dbw 10, ABSORB + dbw 13, POISONPOWDER + dbw 19, VINE_WHIP + dbw 25, BIND + dbw 31, MEGA_DRAIN + dbw 34, STUN_SPORE + dbw 40, SLAM + dbw 44, ANCIENTPOWER + dbw 51, GROWTH + db 0 ; no more level-up moves + +JungelaEvosAttacks: + db 0 ; no more evolutions + dbw 1, VINE_WHIP + dbw 1, BIND + dbw 1, FAINT_ATTACK + dbw 1, NIGHT_SHADE + dbw 30, GIGA_DRAIN + db 0 ; no more level-up moves KangaskhanEvosAttacks: db 0 ; no more evolutions diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index d8c8813..0110c9a 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -112,12 +112,17 @@ FirstEvoStages:: dw TYROGUE dw TYROGUE dw LICKITUNG + dw LICKITUNG + dw LICKITUNG dw KOFFING dw KOFFING dw RHYHORN dw RHYHORN ;70 dw CHANSEY - dw TANGELA + dw BURGELA + dw BURGELA + dw BURGELA + dw BURGELA dw KANGASKHAN dw HORSEA dw HORSEA diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 58b37f0..f1a3e67 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -113,12 +113,17 @@ KantoMonSpecials: db 35 ; HITMONLEE db 35 ; HITMONCHAN db 60 ; LICKITUNG + db 80 ; LICKILICKY + db 65 ; LICKILORD db 60 ; KOFFING db 85 ; WEEZING db 30 ; RHYHORN db 45 ; RHYDON db 105 ; CHANSEY + db 80 ; BURGELA db 100 ; TANGELA + db 110 ; TANGROWTH + db 125 ; JUNGELA db 40 ; KANGASKHAN db 70 ; HORSEA db 95 ; SEADRA diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 7c6f668..bd5e2dd 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -261,4 +261,9 @@ Pokered_MonIndices: db MUNCHLAX db KLEAVOR db GOROCHU + db LICKILICKY + db LICKILORD + db BURGELA + db TANGROWTH + db JUNGELA assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 4625bc8..79cf7a4 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -113,12 +113,17 @@ MonMenuIcons: db ICON_FIGHTER ; HITMONLEE db ICON_FIGHTER ; HITMONCHAN db ICON_MONSTER ; LICKITUNG + db ICON_MONSTER ; LICKILICKY + db ICON_MONSTER ; LICKILORD db ICON_BLOB ; KOFFING db ICON_BLOB ; WEEZING db ICON_EQUINE ; RHYHORN db ICON_MONSTER ; RHYDON db ICON_CLEFAIRY ; CHANSEY + db ICON_ODDISH ; BURGELA db ICON_ODDISH ; TANGELA + db ICON_ODDISH ; TANGROWTH + db ICON_ODDISH ; JUNGELA db ICON_MONSTER ; KANGASKHAN db ICON_FISH ; HORSEA db ICON_FISH ; SEADRA diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index dd9a92d..f17e9b8 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -115,12 +115,17 @@ PokemonNames:: db "HITMONLEE@" db "HITMONCHAN" db "LICKITUNG@" + db "LICKILICKY" + db "LICKILORD@" db "KOFFING@@@" db "WEEZING@@@" db "RHYHORN@@@" db "RHYDON@@@@" db "CHANSEY@@@" + db "BURGELA@@@" db "TANGELA@@@" + db "TANGROWTH@" + db "JUNGELA@@@" db "KANGASKHAN" db "HORSEA@@@@" db "SEADRA@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 2ec2b71..1c5809b 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -255,6 +255,10 @@ INCBIN "gfx/pokemon/hitmonchan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" INCBIN "gfx/pokemon/lickitung/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/lickitung/shiny.pal" +INCBIN "gfx/pokemon/lickilicky/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/lickilicky/shiny.pal" +INCBIN "gfx/pokemon/lickilord/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/lickilord/shiny.pal" INCBIN "gfx/pokemon/koffing/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/koffing/shiny.pal" INCBIN "gfx/pokemon/weezing/front.gbcpal", middle_colors @@ -265,8 +269,14 @@ INCBIN "gfx/pokemon/rhydon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhydon/shiny.pal" INCBIN "gfx/pokemon/chansey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/chansey/shiny.pal" +INCBIN "gfx/pokemon/burgela/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/burgela/shiny.pal" INCBIN "gfx/pokemon/tangela/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tangela/shiny.pal" +INCBIN "gfx/pokemon/tangrowth/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/tangrowth/shiny.pal" +INCBIN "gfx/pokemon/jungela/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/jungela/shiny.pal" INCBIN "gfx/pokemon/kangaskhan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" INCBIN "gfx/pokemon/horsea/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 0b47362..069f044 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -235,6 +235,10 @@ PokemonPicPointers:: dba HitmonchanBackpic dba LickitungFrontpic dba LickitungBackpic + dba LickilickyFrontpic + dba LickilickyBackpic + dba LickilordFrontpic + dba LickilordBackpic dba KoffingFrontpic dba KoffingBackpic dba WeezingFrontpic @@ -245,8 +249,14 @@ PokemonPicPointers:: dba RhydonBackpic dba ChanseyFrontpic dba ChanseyBackpic + dba BurgelaFrontpic + dba BurgelaBackpic dba TangelaFrontpic dba TangelaBackpic + dba TangrowthFrontpic + dba TangrowthBackpic + dba JungelaFrontpic + dba JungelaBackpic dba KangaskhanFrontpic dba KangaskhanBackpic dba HorseaFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 39f49c4..b0757b3 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -112,12 +112,17 @@ INCBIN "gfx/footprints/marowak.1bpp" INCBIN "gfx/footprints/hitmonlee.1bpp" INCBIN "gfx/footprints/hitmonchan.1bpp" INCBIN "gfx/footprints/lickitung.1bpp" +INCBIN "gfx/footprints/lickilicky.1bpp" +INCBIN "gfx/footprints/lickilord.1bpp" INCBIN "gfx/footprints/koffing.1bpp" INCBIN "gfx/footprints/weezing.1bpp" INCBIN "gfx/footprints/rhyhorn.1bpp" INCBIN "gfx/footprints/rhydon.1bpp" INCBIN "gfx/footprints/chansey.1bpp" +INCBIN "gfx/footprints/burgela.1bpp" INCBIN "gfx/footprints/tangela.1bpp" +INCBIN "gfx/footprints/tangrowth.1bpp" +INCBIN "gfx/footprints/jungela.1bpp" INCBIN "gfx/footprints/kangaskhan.1bpp" INCBIN "gfx/footprints/horsea.1bpp" INCBIN "gfx/footprints/seadra.1bpp" @@ -268,4 +273,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $110 ; don't forget to update this + assert_table_length $10F ; don't forget to update this diff --git a/gfx/footprints/burgela.png b/gfx/footprints/burgela.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/burgela.png differ diff --git a/gfx/footprints/jungela.png b/gfx/footprints/jungela.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/jungela.png differ diff --git a/gfx/footprints/lickilicky.png b/gfx/footprints/lickilicky.png new file mode 100644 index 0000000..5c04d47 Binary files /dev/null and b/gfx/footprints/lickilicky.png differ diff --git a/gfx/footprints/lickilord.png b/gfx/footprints/lickilord.png new file mode 100644 index 0000000..5c04d47 Binary files /dev/null and b/gfx/footprints/lickilord.png differ diff --git a/gfx/footprints/tangrowth.png b/gfx/footprints/tangrowth.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/tangrowth.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 28273e6..18fe1f9 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -731,52 +731,16 @@ KleavorFrontpic: INCBIN "gfx/pokemon/kleavor/front.animated.2bpp.lz" KleavorBackpic: INCBIN "gfx/pokemon/kleavor/back.2bpp.lz" TriculesFrontpic: INCBIN "gfx/pokemon/tricules/front.animated.2bpp.lz" TriculesBackpic: INCBIN "gfx/pokemon/tricules/back.2bpp.lz" -INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz" -INCBIN "gfx/pokemon/donphan/back.2bpp.lz" -INCBIN "gfx/pokemon/wooper/back.2bpp.lz" -INCBIN "gfx/pokemon/tauros/back.2bpp.lz" -INCBIN "gfx/pokemon/tangela/back.2bpp.lz" -INCBIN "gfx/pokemon/voltorb/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_j/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/mantine/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_l/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/piloswine/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_m/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_f/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/natu/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_a/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/golem/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_u/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/diglett/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_q/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_p/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_c/back.2bpp.lz" -INCBIN "gfx/pokemon/jynx/back.2bpp.lz" -INCBIN "gfx/pokemon/golbat/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_y/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_g/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_v/back.2bpp.lz" -INCBIN "gfx/pokemon/forretress/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_s/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_e/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_j/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_b/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_o/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_z/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_w/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_n/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_a/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_m/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_k/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_t/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_x/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_l/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_u/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_q/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" +LickilickyFrontpic: INCBIN "gfx/pokemon/lickilicky/front.animated.2bpp.lz" +LickilickyBackpic: INCBIN "gfx/pokemon/lickilicky/back.2bpp.lz" +LickilordFrontpic: INCBIN "gfx/pokemon/lickilord/front.animated.2bpp.lz" +LickilordBackpic: INCBIN "gfx/pokemon/lickilord/back.2bpp.lz" +BurgelaFrontpic: INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz" +BurgelaBackpic: INCBIN "gfx/pokemon/burgela/back.2bpp.lz" +TangrowthFrontpic: INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz" +TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" +JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" +JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" SECTION "Pics 20", ROMX diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index ca8a7b2..d40b955 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -111,12 +111,17 @@ AnimationPointers: dw HitmonleeAnimation dw HitmonchanAnimation dw LickitungAnimation + dw LickilickyAnimation + dw LickilordAnimation dw KoffingAnimation dw WeezingAnimation dw RhyhornAnimation dw RhydonAnimation dw ChanseyAnimation + dw BurgelaAnimation dw TangelaAnimation + dw TangrowthAnimation + dw JungelaAnimation dw KangaskhanAnimation dw HorseaAnimation dw SeadraAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 645aa97..ffb0b5d 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -109,12 +109,17 @@ MarowakAnimation: INCLUDE "gfx/pokemon/marowak/anim.asm" HitmonleeAnimation: INCLUDE "gfx/pokemon/hitmonlee/anim.asm" HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim.asm" LickitungAnimation: INCLUDE "gfx/pokemon/lickitung/anim.asm" +LickilickyAnimation: INCLUDE "gfx/pokemon/lickilicky/anim.asm" +LickilordAnimation: INCLUDE "gfx/pokemon/lickilord/anim.asm" KoffingAnimation: INCLUDE "gfx/pokemon/koffing/anim.asm" WeezingAnimation: INCLUDE "gfx/pokemon/weezing/anim.asm" RhyhornAnimation: INCLUDE "gfx/pokemon/rhyhorn/anim.asm" RhydonAnimation: INCLUDE "gfx/pokemon/rhydon/anim.asm" ChanseyAnimation: INCLUDE "gfx/pokemon/chansey/anim.asm" +BurgelaAnimation: INCLUDE "gfx/pokemon/burgela/anim.asm" TangelaAnimation: INCLUDE "gfx/pokemon/tangela/anim.asm" +TangrowthAnimation: INCLUDE "gfx/pokemon/tangrowth/anim.asm" +JungelaAnimation: INCLUDE "gfx/pokemon/jungela/anim.asm" KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm" HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm" SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 4dfa479..50dd752 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -111,12 +111,17 @@ BitmasksPointers: dw HitmonleeBitmasks dw HitmonchanBitmasks dw LickitungBitmasks + dw LickilickyBitmasks + dw LickilordBitmasks dw KoffingBitmasks dw WeezingBitmasks dw RhyhornBitmasks dw RhydonBitmasks dw ChanseyBitmasks + dw BurgelaBitmasks dw TangelaBitmasks + dw TangrowthBitmasks + dw JungelaBitmasks dw KangaskhanBitmasks dw HorseaBitmasks dw SeadraBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index aabf61c..d65dc43 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -24,7 +24,7 @@ EkansBitmasks: INCLUDE "gfx/pokemon/ekans/bitmask.asm" ArbokBitmasks: INCLUDE "gfx/pokemon/arbok/bitmask.asm" PikachuBitmasks: INCLUDE "gfx/pokemon/pikachu/bitmask.asm" RaichuBitmasks: INCLUDE "gfx/pokemon/raichu/bitmask.asm" -GorochuBitmasks: INCLUDE "gfx/pokemon/gorochu/bitmask.asm" +GorochuBitmasks: INCLUDE "gfx/pokemon/gorochu/bitmask.asm" SandshrewBitmasks: INCLUDE "gfx/pokemon/sandshrew/bitmask.asm" SandslashBitmasks: INCLUDE "gfx/pokemon/sandslash/bitmask.asm" NidoranFBitmasks: INCLUDE "gfx/pokemon/nidoran_f/bitmask.asm" @@ -109,12 +109,17 @@ MarowakBitmasks: INCLUDE "gfx/pokemon/marowak/bitmask.asm" HitmonleeBitmasks: INCLUDE "gfx/pokemon/hitmonlee/bitmask.asm" HitmonchanBitmasks: INCLUDE "gfx/pokemon/hitmonchan/bitmask.asm" LickitungBitmasks: INCLUDE "gfx/pokemon/lickitung/bitmask.asm" +LickilickyBitmasks: INCLUDE "gfx/pokemon/lickilicky/bitmask.asm" +LickilordBitmasks: INCLUDE "gfx/pokemon/lickilord/bitmask.asm" KoffingBitmasks: INCLUDE "gfx/pokemon/koffing/bitmask.asm" WeezingBitmasks: INCLUDE "gfx/pokemon/weezing/bitmask.asm" RhyhornBitmasks: INCLUDE "gfx/pokemon/rhyhorn/bitmask.asm" RhydonBitmasks: INCLUDE "gfx/pokemon/rhydon/bitmask.asm" ChanseyBitmasks: INCLUDE "gfx/pokemon/chansey/bitmask.asm" +BurgelaBitmasks: INCLUDE "gfx/pokemon/burgela/bitmask.asm" TangelaBitmasks: INCLUDE "gfx/pokemon/tangela/bitmask.asm" +TangrowthBitmasks: INCLUDE "gfx/pokemon/tangrowth/bitmask.asm" +JungelaBitmasks: INCLUDE "gfx/pokemon/jungela/bitmask.asm" KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm" HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm" SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm" diff --git a/gfx/pokemon/burgela/anim.asm b/gfx/pokemon/burgela/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/burgela/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/burgela/anim_idle.asm b/gfx/pokemon/burgela/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/burgela/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/burgela/back.png b/gfx/pokemon/burgela/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/burgela/back.png differ diff --git a/gfx/pokemon/burgela/front.png b/gfx/pokemon/burgela/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/burgela/front.png differ diff --git a/gfx/pokemon/burgela/shiny.pal b/gfx/pokemon/burgela/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/burgela/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 07fbcd1..a2585cd 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -111,12 +111,17 @@ FramesPointers: dba HitmonleeFrames dba HitmonchanFrames dba LickitungFrames + dba LickilickyFrames + dba LickilordFrames dba KoffingFrames dba WeezingFrames dba RhyhornFrames dba RhydonFrames dba ChanseyFrames + dba BurgelaFrames dba TangelaFrames + dba TangrowthFrames + dba JungelaFrames dba KangaskhanFrames dba HorseaFrames dba SeadraFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index f017ad5..9bb8fc0 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -111,12 +111,17 @@ AnimationIdlePointers: dw HitmonleeAnimationIdle dw HitmonchanAnimationIdle dw LickitungAnimationIdle + dw LickilickyAnimationIdle + dw LickilordAnimationIdle dw KoffingAnimationIdle dw WeezingAnimationIdle dw RhyhornAnimationIdle dw RhydonAnimationIdle dw ChanseyAnimationIdle + dw BurgelaAnimationIdle dw TangelaAnimationIdle + dw TangrowthAnimationIdle + dw JungelaAnimationIdle dw KangaskhanAnimationIdle dw HorseaAnimationIdle dw SeadraAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 00a1c03..63b71c3 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -109,12 +109,17 @@ MarowakAnimationIdle: INCLUDE "gfx/pokemon/marowak/anim_idle.asm" HitmonleeAnimationIdle: INCLUDE "gfx/pokemon/hitmonlee/anim_idle.asm" HitmonchanAnimationIdle: INCLUDE "gfx/pokemon/hitmonchan/anim_idle.asm" LickitungAnimationIdle: INCLUDE "gfx/pokemon/lickitung/anim_idle.asm" +LickilickyAnimationIdle: INCLUDE "gfx/pokemon/lickilicky/anim_idle.asm" +LickilordAnimationIdle: INCLUDE "gfx/pokemon/lickilord/anim_idle.asm" KoffingAnimationIdle: INCLUDE "gfx/pokemon/koffing/anim_idle.asm" WeezingAnimationIdle: INCLUDE "gfx/pokemon/weezing/anim_idle.asm" RhyhornAnimationIdle: INCLUDE "gfx/pokemon/rhyhorn/anim_idle.asm" RhydonAnimationIdle: INCLUDE "gfx/pokemon/rhydon/anim_idle.asm" ChanseyAnimationIdle: INCLUDE "gfx/pokemon/chansey/anim_idle.asm" +BurgelaAnimationIdle: INCLUDE "gfx/pokemon/burgela/anim_idle.asm" TangelaAnimationIdle: INCLUDE "gfx/pokemon/tangela/anim_idle.asm" +TangrowthAnimationIdle: INCLUDE "gfx/pokemon/tangrowth/anim_idle.asm" +JungelaAnimationIdle: INCLUDE "gfx/pokemon/jungela/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" diff --git a/gfx/pokemon/jungela/anim.asm b/gfx/pokemon/jungela/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/jungela/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/jungela/anim_idle.asm b/gfx/pokemon/jungela/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/jungela/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/jungela/back.png b/gfx/pokemon/jungela/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/jungela/back.png differ diff --git a/gfx/pokemon/jungela/front.png b/gfx/pokemon/jungela/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/jungela/front.png differ diff --git a/gfx/pokemon/jungela/shiny.pal b/gfx/pokemon/jungela/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/jungela/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index c2cece7..2409a24 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -111,12 +111,17 @@ MarowakFrames: INCLUDE "gfx/pokemon/marowak/frames.asm" HitmonleeFrames: INCLUDE "gfx/pokemon/hitmonlee/frames.asm" HitmonchanFrames: INCLUDE "gfx/pokemon/hitmonchan/frames.asm" LickitungFrames: INCLUDE "gfx/pokemon/lickitung/frames.asm" +LickilickyFrames: INCLUDE "gfx/pokemon/lickilicky/frames.asm" +LickilordFrames: INCLUDE "gfx/pokemon/lickilord/frames.asm" KoffingFrames: INCLUDE "gfx/pokemon/koffing/frames.asm" WeezingFrames: INCLUDE "gfx/pokemon/weezing/frames.asm" RhyhornFrames: INCLUDE "gfx/pokemon/rhyhorn/frames.asm" RhydonFrames: INCLUDE "gfx/pokemon/rhydon/frames.asm" ChanseyFrames: INCLUDE "gfx/pokemon/chansey/frames.asm" +BurgelaFrames: INCLUDE "gfx/pokemon/burgela/frames.asm" TangelaFrames: INCLUDE "gfx/pokemon/tangela/frames.asm" +TangrowthFrames: INCLUDE "gfx/pokemon/tangrowth/frames.asm" +JungelaFrames: INCLUDE "gfx/pokemon/jungela/frames.asm" KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm" HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm" SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm" diff --git a/gfx/pokemon/lickilicky/anim.asm b/gfx/pokemon/lickilicky/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilicky/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilicky/anim_idle.asm b/gfx/pokemon/lickilicky/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilicky/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilicky/back.png b/gfx/pokemon/lickilicky/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/lickilicky/back.png differ diff --git a/gfx/pokemon/lickilicky/front.png b/gfx/pokemon/lickilicky/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/lickilicky/front.png differ diff --git a/gfx/pokemon/lickilicky/shiny.pal b/gfx/pokemon/lickilicky/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/lickilicky/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/lickilord/anim.asm b/gfx/pokemon/lickilord/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilord/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilord/anim_idle.asm b/gfx/pokemon/lickilord/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilord/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilord/back.png b/gfx/pokemon/lickilord/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/lickilord/back.png differ diff --git a/gfx/pokemon/lickilord/front.png b/gfx/pokemon/lickilord/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/lickilord/front.png differ diff --git a/gfx/pokemon/lickilord/shiny.pal b/gfx/pokemon/lickilord/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/lickilord/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/tangrowth/anim.asm b/gfx/pokemon/tangrowth/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/tangrowth/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/tangrowth/anim_idle.asm b/gfx/pokemon/tangrowth/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/tangrowth/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/tangrowth/back.png b/gfx/pokemon/tangrowth/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/tangrowth/back.png differ diff --git a/gfx/pokemon/tangrowth/front.png b/gfx/pokemon/tangrowth/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/tangrowth/front.png differ diff --git a/gfx/pokemon/tangrowth/shiny.pal b/gfx/pokemon/tangrowth/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/tangrowth/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index c68d90d..3335235 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -114,23 +114,23 @@ PlayersRadioText4: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, NIDORINA + getmonname STRING_BUFFER_3, LICKITUNG writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke NIDORINA, 36, MOON_STONE + givepoke BURGELA, 42, DUSK_STONE closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, GOROCHU + getmonname STRING_BUFFER_3, LICKITUNG writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke GOROCHU, 35, POISON_STONE + givepoke LICKITUNG, 42, POISON_STONE closetext end