diff --git a/constants/item_constants.asm b/constants/item_constants.asm index ffbe2e6..8a4c5b1 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -150,7 +150,7 @@ const SHINY_STONE ; 8e const METAL_COAT ; 8f const DRAGON_FANG ; 90 - const ITEM_91 ; 91 + const BLK_AUGURITE ; 91 const LEFTOVERS ; 92 const ITEM_93 ; 93 const ITEM_94 ; 94 diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 181bf36..16d0ef9 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -257,6 +257,9 @@ const ROCK_SMASH ; f9 const WHIRLPOOL ; fa const BEAT_UP ; fb + const ROCK_HEAD + const ROCK_SLASH + const CROSS_CUTTER DEF NUM_ATTACKS EQU const_value - 1 if NUM_ATTACKS > $3fff diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index ce6c35f..128adfd 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -54,6 +54,7 @@ const NIDORAN_M ; 20 const NIDORINO ; 21 const NIDOKING ; 22 + const NIDOREIGN const CLEFAIRY ; 23 const CLEFABLE ; 24 const VULPIX ; 25 @@ -146,10 +147,12 @@ const STARMIE ; 79 const MR__MIME ; 7a const SCYTHER ; 7b + const KLEAVOR const JYNX ; 7c const ELECTABUZZ ; 7d const MAGMAR ; 7e const PINSIR ; 7f + const TRICULES const TAUROS ; 80 const MAGIKARP ; 81 const GYARADOS ; 82 diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 8f357a9..aa2d147 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -297,8 +297,8 @@ ItemAttributes: ; BUG: Dragon Scale, not Dragon Fang, boosts Dragon-type moves (see docs/bugs_and_glitches.md) ; DRAGON_FANG item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; ITEM_91 - item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; BLK_AUGURITE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; LEFTOVERS item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_93 diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index dab49db..1cf3c49 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -145,7 +145,7 @@ ItemDescriptions: dw ShinyStoneDesc dw MetalCoatDesc dw DragonFangDesc - dw QuestionMarkDesc + dw BlkAuguriteDesc dw LeftoversDesc dw QuestionMarkDesc dw QuestionMarkDesc @@ -955,3 +955,7 @@ DuskStoneDesc: ShinyStoneDesc: db "Evolves certain" next "kinds of #MON.@" + +BlkAuguriteDesc: + db "Evolves certain" + next "kinds of #MON.@" diff --git a/data/items/names.asm b/data/items/names.asm index 074fa71..0cdfc24 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -144,7 +144,7 @@ ItemNames:: li "SHINY STONE" li "METAL COAT" li "DRAGON FANG" - li "TERU-SAMA" + li "BLK AUGURITE" li "LEFTOVERS" li "TERU-SAMA" li "TERU-SAMA" diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 4251ca5..bc6d17e 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -279,6 +279,9 @@ BattleAnimations:: dw BattleAnim_RockSmash dw BattleAnim_Whirlpool dw BattleAnim_BeatUp + dw BattleAnim_RockHead + dw BattleAnim_RockSlash + dw BattleAnim_CrossCutter assert_table_length NUM_ATTACKS + 1 dw BattleAnim_SweetScent2 @@ -4592,6 +4595,45 @@ BattleAnim_BeatUp: anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret + +BattleAnim_RockHead: + anim_1gfx ANIM_GFX_SHINE + anim_bgeffect ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW, $0, $0, $0 + anim_sound 0, 0, SFX_RAGE + anim_obj ANIM_OBJ_GLIMMER, 40, 84, $0 + anim_wait 20 + anim_1gfx ANIM_GFX_HIT + anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $14, $2, $0 + anim_wait 32 + anim_call BattleAnim_TargetObj_1Row + anim_bgeffect ANIM_BG_TACKLE, $0, BG_EFFECT_USER, $0 + anim_wait 4 + anim_sound 0, 1, SFX_EGG_BOMB + anim_obj ANIM_OBJ_HIT_YFIX, 136, 56, $0 + anim_wait 8 + anim_call BattleAnim_ShowMon_0 + anim_ret + +BattleAnim_RockSlash: ;uses the Slash animation + anim_1gfx ANIM_GFX_CUT + anim_sound 0, 1, SFX_CUT + anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 152, 40, $0 + anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 148, 36, $0 + anim_wait 32 + anim_ret + +BattleAnim_CrossCutter: ;uses the Cross Chop animation + anim_1gfx ANIM_GFX_CUT + anim_sound 0, 1, SFX_CUT + anim_obj ANIM_OBJ_CROSS_CHOP1, 152, 40, $0 + anim_obj ANIM_OBJ_CROSS_CHOP2, 120, 72, $0 + anim_wait 8 + anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $58, $2, $0 + anim_wait 92 + anim_sound 0, 1, SFX_VICEGRIP + anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10 + anim_wait 16 + anim_ret BattleAnimSub_Drain: anim_obj ANIM_OBJ_DRAIN, 132, 44, $0 diff --git a/data/moves/critical_hit_moves.asm b/data/moves/critical_hit_moves.asm index f0111ed..0ea6f2d 100644 --- a/data/moves/critical_hit_moves.asm +++ b/data/moves/critical_hit_moves.asm @@ -6,4 +6,5 @@ CriticalHitMoves: dw SLASH dw AEROBLAST dw CROSS_CHOP + dw CROSS_CUTTER dw -1 diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index 4feceab..8638f1c 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -256,6 +256,9 @@ MoveDescriptions1: dw RockSmashDescription dw WhirlpoolDescription dw BeatUpDescription + dw RockHeadDescription + dw RockSlashDescription + dw CrossCutterDescription .IndirectEnd:: InvalidMoveDescription: @@ -1264,3 +1267,15 @@ WhirlpoolDescription: BeatUpDescription: db "Party #MON join" next "in the attack.@" + +RockHeadDescription: + db "An attack that may" + next "cause flinching.@" + +RockSlashDescription: + db "A strong imprecise" + next "ROCK-type attack.@" ;the original description was too long I think + +CrossCutterDescription: + db "Has a high criti-" + next "cal hit ratio.@" diff --git a/data/moves/moves.asm b/data/moves/moves.asm index a9ba712..0f6e8c1 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -269,4 +269,7 @@ Moves1: move EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 ;ROCK_SMASH move EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 ;WHIRLPOOL move EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 ;BEAT_UP + move EFFECT_FLINCH_HIT, 80, ROCK, 100, 15, 30 ;ROCK_HEAD + move EFFECT_NORMAL_HIT, 140, ROCK, 70, 5, 0 ;ROCK_SLASH + move EFFECT_NORMAL_HIT, 50, BUG, 100, 15, 0 ;CROSS_CUTTER .IndirectEnd:: diff --git a/data/moves/names.asm b/data/moves/names.asm index 8b61038..612b2e4 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -251,4 +251,7 @@ MoveNames:: li "ROCK SMASH" li "WHIRLPOOL" li "BEAT UP" + li "ROCK HEAD" + li "ROCK SLASH" + li "CROSS CUTTER" assert_list_length NUM_ATTACKS diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 0bf4eb0..1ed4c88 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -62,6 +62,7 @@ INCLUDE "data/pokemon/base_stats/nidoqueen.asm" INCLUDE "data/pokemon/base_stats/nidoran_m.asm" INCLUDE "data/pokemon/base_stats/nidorino.asm" INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/nidoreign.asm" INCLUDE "data/pokemon/base_stats/clefairy.asm" INCLUDE "data/pokemon/base_stats/clefable.asm" INCLUDE "data/pokemon/base_stats/vulpix.asm" @@ -154,10 +155,12 @@ INCLUDE "data/pokemon/base_stats/staryu.asm" INCLUDE "data/pokemon/base_stats/starmie.asm" INCLUDE "data/pokemon/base_stats/mr__mime.asm" INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/kleavor.asm" INCLUDE "data/pokemon/base_stats/jynx.asm" INCLUDE "data/pokemon/base_stats/electabuzz.asm" INCLUDE "data/pokemon/base_stats/magmar.asm" INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tricules.asm" INCLUDE "data/pokemon/base_stats/tauros.asm" INCLUDE "data/pokemon/base_stats/magikarp.asm" INCLUDE "data/pokemon/base_stats/gyarados.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index b3ca586..56b9beb 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -41,6 +41,7 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO mon_cry CRY_RAICHU, 0, 256 ; NIDOKING + mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE mon_cry CRY_VULPIX, 79, 144 ; VULPIX @@ -133,10 +134,12 @@ PokemonCries:: mon_cry CRY_PARAS, 0, 256 ; STARMIE mon_cry CRY_KRABBY, 8, 192 ; MR__MIME mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER + mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR mon_cry CRY_DROWZEE, 255, 383 ; JYNX mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR + mon_cry CRY_RAICHU, 291, 256 ; TRICULES mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS mon_cry CRY_EKANS, 128, 128 ; MAGIKARP mon_cry CRY_EKANS, 0, 256 ; GYARADOS diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 91f8eee..612a2b5 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -35,6 +35,7 @@ NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoqueen.asm" NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_m.asm" NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorino.asm" NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm" +NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm" ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm" ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm" VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm" @@ -131,10 +132,12 @@ StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/starmie.asm" MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mr__mime.asm" ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scyther.asm" +KleavorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kleavor.asm" JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jynx.asm" ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm" MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magmar.asm" PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm" +TriculesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tricules.asm" TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" diff --git a/data/pokemon/dex_entries/kleavor.asm b/data/pokemon/dex_entries/kleavor.asm new file mode 100644 index 0000000..21cf4f4 --- /dev/null +++ b/data/pokemon/dex_entries/kleavor.asm @@ -0,0 +1,10 @@ + db "AXE@" ; species name + dw 511, 1962 ; height, weight + + db "Pieces from KLEAVOR-" + next "'s axes often fall" + next "in battle, making" + + page "them sharper. The" + next "shards can be used" + next "to make tools.@" diff --git a/data/pokemon/dex_entries/nidoreign.asm b/data/pokemon/dex_entries/nidoreign.asm new file mode 100644 index 0000000..8af2d0a --- /dev/null +++ b/data/pokemon/dex_entries/nidoreign.asm @@ -0,0 +1,10 @@ + db "LUNAR@" ; species name + dw 405, 1350 ; height, weight + + db "Said to come from" + next "the moon. The" + next "poison from its" + + page "spikes is often" + next "used in making" + next "powerful medicine." diff --git a/data/pokemon/dex_entries/tricules.asm b/data/pokemon/dex_entries/tricules.asm new file mode 100644 index 0000000..b65d2f4 --- /dev/null +++ b/data/pokemon/dex_entries/tricules.asm @@ -0,0 +1,10 @@ + db "BIG HORN@" ; species name + dw 501, 2420 ; height, weight + + db "Its elongated hor-" + next "ns contain steel" + next "components. It" + + page "easily blocks any" + next "attack with its" + next "iron-like body.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index efca2cc..16e7403 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -36,6 +36,7 @@ PokedexDataPointerTable: dba NidoranMPokedexEntry dba NidorinoPokedexEntry dba NidokingPokedexEntry + dba NidoreignPokedexEntry dba ClefairyPokedexEntry dba ClefablePokedexEntry dba VulpixPokedexEntry @@ -128,10 +129,12 @@ PokedexDataPointerTable: dba StarmiePokedexEntry dba MrMimePokedexEntry dba ScytherPokedexEntry + dba KleavorPokedexEntry dba JynxPokedexEntry dba ElectabuzzPokedexEntry dba MagmarPokedexEntry dba PinsirPokedexEntry + dba TriculesPokedexEntry dba TaurosPokedexEntry dba MagikarpPokedexEntry dba GyaradosPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index e8e6553..3a5ec02 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -109,6 +109,7 @@ AlphabeticalPokedexOrder: dw KANGASKHAN dw KINGDRA dw KINGLER + dw KLEAVOR dw KOFFING dw KRABBY dw LANTURN @@ -149,6 +150,7 @@ AlphabeticalPokedexOrder: dw NIDOQUEEN dw NIDORAN_F dw NIDORAN_M + dw NIDOREIGN dw NIDORINA dw NIDORINO dw NINETALES @@ -234,6 +236,7 @@ AlphabeticalPokedexOrder: dw TOGETIC dw TOTARTLE dw TOTODILE + dw TRICULES dw TYPHLOSION dw TYRANITAR dw TYROGUE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 13e7213..55ba85e 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -104,6 +104,7 @@ NewPokedexOrder: dw NIDORAN_M dw NIDORINO dw NIDOKING + dw NIDOREIGN dw YANMA dw SUNKERN dw SUNFLORA @@ -115,7 +116,9 @@ NewPokedexOrder: dw VENOMOTH dw SCYTHER dw SCIZOR + dw KLEAVOR dw PINSIR + dw TRICULES dw HERACROSS dw KOFFING dw WEEZING diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 9970126..4beced6 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -468,5 +468,6 @@ LarvitarEggMoves: dw OUTRAGE dw FOCUS_ENERGY dw ANCIENTPOWER + dw ROCK_SLASH NoEggMoves2: dw -1 ; end diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 758dc3a..09eac36 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -9,7 +9,7 @@ EggMovePointers1: dw NoEggMoves1 dw SquirtleEggMoves dw NoEggMoves1 - dw NoEggMoves1 + dw NoEggMoves1 ; Totartle dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -36,6 +36,7 @@ EggMovePointers1: dw NidoranMEggMoves dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Nidoreign dw NoEggMoves1 dw NoEggMoves1 dw VulpixEggMoves @@ -120,18 +121,20 @@ EggMovePointers1: dw KangaskhanEggMoves dw HorseaEggMoves dw NoEggMoves1 - dw BlastykeEggMoves - dw NoEggMoves1 + dw BlastykeEggMoves ; Blastyke + dw NoEggMoves1 ; Blastoise dw GoldeenEggMoves dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw MrMimeEggMoves dw ScytherEggMoves + dw NoEggMoves1 ; Kleavor dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw PinsirEggMoves + dw NoEggMoves1 ; Tricules dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -147,8 +150,8 @@ EggMovePointers1: dw KabutoEggMoves dw NoEggMoves1 dw AerodactylEggMoves - dw MunchlaxEggMoves - dw SnorlaxEggMoves + dw MunchlaxEggMoves ; Munchlax + dw SnorlaxEggMoves ; Should this even exist? dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -275,6 +278,7 @@ ParasEggMoves: dw FLAIL dw LIGHT_SCREEN dw PURSUIT + dw ROCK_SLASH dw -1 ; end VenonatEggMoves: @@ -366,6 +370,7 @@ TentacoolEggMoves: GeodudeEggMoves: dw MEGA_PUNCH dw ROCK_SLIDE + dw ROCK_SLASH dw -1 ; end PonytaEggMoves: @@ -445,6 +450,7 @@ KrabbyEggMoves: dw AMNESIA dw FLAIL dw SLAM + dw ROCK_SLASH dw -1 ; end ExeggcuteEggMoves: @@ -463,6 +469,7 @@ CuboneEggMoves: dw SKULL_BASH dw PERISH_SONG dw SWORDS_DANCE + dw ROCK_HEAD dw -1 ; end LickitungEggMoves: @@ -553,6 +560,7 @@ ScytherEggMoves: PinsirEggMoves: dw FURY_ATTACK dw FLAIL + dw ROCK_SLASH dw -1 ; end LaprasEggMoves: diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 29ec110..35a9605 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -36,6 +36,7 @@ EvosAttacksPointers1:: dw NidoranMEvosAttacks dw NidorinoEvosAttacks dw NidokingEvosAttacks + dw NidoreignEvosAttacks dw ClefairyEvosAttacks dw ClefableEvosAttacks dw VulpixEvosAttacks @@ -128,10 +129,12 @@ EvosAttacksPointers1:: dw StarmieEvosAttacks dw MrMimeEvosAttacks dw ScytherEvosAttacks + dw KleavorEvosAttacks dw JynxEvosAttacks dw ElectabuzzEvosAttacks dw MagmarEvosAttacks dw PinsirEvosAttacks + dw TriculesEvosAttacks dw TaurosEvosAttacks dw MagikarpEvosAttacks dw GyaradosEvosAttacks @@ -566,7 +569,9 @@ NidoranFEvosAttacks: db 0 ; no more level-up moves NidorinaEvosAttacks: - dbbw EVOLVE_ITEM, MOON_STONE, NIDOQUEEN + dbbw EVOLVE_ITEM, POISON_STONE, NIDOQUEEN + dbbw EVOLVE_LEVEL, 36, NIDOQUEEN + dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions dbw 1, GROWL dbw 1, TACKLE @@ -601,7 +606,9 @@ NidoranMEvosAttacks: db 0 ; no more level-up moves NidorinoEvosAttacks: - dbbw EVOLVE_ITEM, MOON_STONE, NIDOKING + dbbw EVOLVE_ITEM, POISON_STONE, NIDOKING + dbbw EVOLVE_LEVEL, 36, NIDOKING + dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions dbw 1, LEER dbw 1, TACKLE @@ -621,6 +628,15 @@ NidokingEvosAttacks: dbw 1, POISON_STING dbw 23, THRASH db 0 ; no more level-up moves + +NidoreignEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, SPIKE_CANNON + dbw 1, POISON_STING + dbw 1, TOXIC + dbw 23, ROCK_HEAD + db 0 ; no more level-up moves ClefairyEvosAttacks: dbbw EVOLVE_ITEM, MOON_STONE, CLEFABLE @@ -703,6 +719,7 @@ ZubatEvosAttacks: GolbatEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT + dbbw EVOLVE_LEVEL, 44, CROBAT db 0 ; no more evolutions dbw 1, SCREECH dbw 1, LEECH_LIFE @@ -902,6 +919,7 @@ MankeyEvosAttacks: dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD dbw 27, FOCUS_ENERGY dbw 33, SEISMIC_TOSS dbw 39, CROSS_CHOP @@ -918,6 +936,7 @@ PrimeapeEvosAttacks: dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD dbw 27, FOCUS_ENERGY dbw 28, RAGE dbw 36, SEISMIC_TOSS @@ -964,6 +983,7 @@ PoliwagEvosAttacks: PoliwhirlEvosAttacks: dbbw EVOLVE_ITEM, WATER_STONE, POLIWRATH dbbw EVOLVE_TRADE, KINGS_ROCK, POLITOED + dbbw EVOLVE_ITEM, HEART_STONE, POLITOED db 0 ; no more evolutions dbw 1, BUBBLE dbw 1, HYPNOSIS @@ -1160,6 +1180,7 @@ GeodudeEvosAttacks: dbw 31, ROLLOUT dbw 36, EARTHQUAKE dbw 41, EXPLOSION + dbw 46, ROCK_HEAD db 0 ; no more level-up moves GravelerEvosAttacks: @@ -1176,6 +1197,7 @@ GravelerEvosAttacks: dbw 34, ROLLOUT dbw 41, EARTHQUAKE dbw 48, EXPLOSION + dbw 55, ROCK_HEAD db 0 ; no more level-up moves GolemEvosAttacks: @@ -1192,6 +1214,7 @@ GolemEvosAttacks: dbw 34, ROLLOUT dbw 41, EARTHQUAKE dbw 48, EXPLOSION + dbw 55, ROCK_HEAD db 0 ; no more level-up moves PonytaEvosAttacks: @@ -1228,6 +1251,7 @@ RapidashEvosAttacks: SlowpokeEvosAttacks: dbbw EVOLVE_LEVEL, 37, SLOWBRO dbbw EVOLVE_TRADE, KINGS_ROCK, SLOWKING + dbbw EVOLVE_ITEM, HEART_STONE, SLOWKING db 0 ; no more evolutions dbw 1, CURSE dbw 1, TACKLE @@ -1446,6 +1470,7 @@ GengarEvosAttacks: OnixEvosAttacks: dbbw EVOLVE_TRADE, METAL_COAT, STEELIX + dbbw EVOLVE_LEVEL, 38, STEELIX db 0 ; no more evolutions dbw 1, TACKLE dbw 1, SCREECH @@ -1453,6 +1478,7 @@ OnixEvosAttacks: dbw 14, ROCK_THROW dbw 23, HARDEN dbw 27, RAGE + dbw 31, ROCK_HEAD dbw 36, SANDSTORM dbw 40, SLAM db 0 ; no more level-up moves @@ -1681,6 +1707,7 @@ RhyhornEvosAttacks: dbw 19, FURY_ATTACK dbw 31, SCARY_FACE dbw 37, HORN_DRILL + dbw 43, ROCK_HEAD dbw 49, TAKE_DOWN dbw 55, EARTHQUAKE db 0 ; no more level-up moves @@ -1695,6 +1722,7 @@ RhydonEvosAttacks: dbw 19, FURY_ATTACK dbw 31, SCARY_FACE dbw 37, HORN_DRILL + dbw 48, ROCK_HEAD dbw 54, TAKE_DOWN dbw 65, EARTHQUAKE db 0 ; no more level-up moves @@ -1871,6 +1899,8 @@ MrMimeEvosAttacks: ScytherEvosAttacks: dbbw EVOLVE_TRADE, METAL_COAT, SCIZOR + dbbw EVOLVE_LEVEL, 41, SCIZOR + dbbw EVOLVE_ITEM, BLK_AUGURITE, KLEAVOR db 0 ; no more evolutions dbw 1, QUICK_ATTACK dbw 1, LEER @@ -1883,6 +1913,20 @@ ScytherEvosAttacks: dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM db 0 ; no more level-up moves + +KleavorEvosAttacks: + db 0 ; no more evolutions + dbw 1, QUICK_ATTACK + dbw 1, LEER + dbw 6, FOCUS_ENERGY + dbw 12, PURSUIT + dbw 18, FALSE_SWIPE + dbw 24, AGILITY + dbw 30, ROCK_SLASH + dbw 36, SLASH + dbw 42, SWORDS_DANCE + dbw 48, DOUBLE_TEAM + db 0 ; no more level-up moves JynxEvosAttacks: db 0 ; no more evolutions @@ -1930,15 +1974,32 @@ MagmarEvosAttacks: db 0 ; no more level-up moves PinsirEvosAttacks: + dbbw EVOLVE_TRADE, METAL_COAT, TRICULES + dbbw EVOLVE_LEVEL, 42, TRICULES db 0 ; no more evolutions dbw 1, VICEGRIP dbw 7, FOCUS_ENERGY dbw 13, BIND dbw 19, SEISMIC_TOSS dbw 25, HARDEN - dbw 31, GUILLOTINE + dbw 31, CROSS_CUTTER dbw 37, SUBMISSION dbw 43, SWORDS_DANCE + dbw 49, GUILLOTINE + db 0 ; no more level-up moves + +TriculesEvosAttacks: + db 0 ; no more evolutions + dbw 1, VICEGRIP + dbw 7, FOCUS_ENERGY + dbw 13, BIND + dbw 19, SEISMIC_TOSS + dbw 25, HARDEN + dbw 31, CROSS_CUTTER + dbw 37, SUBMISSION + dbw 42, METAL_CLAW + dbw 43, SWORDS_DANCE + dbw 49, GUILLOTINE db 0 ; no more level-up moves TaurosEvosAttacks: @@ -2119,19 +2180,21 @@ KabutopsEvosAttacks: dbw 37, ENDURE dbw 40, SLASH dbw 51, MEGA_DRAIN + dbw 58, ROCK_SLASH dbw 65, ANCIENTPOWER db 0 ; no more level-up moves AerodactylEvosAttacks: db 0 ; no more evolutions - dbw 1, WING_ATTACK + dbw 1, TAKE_DOWN dbw 8, AGILITY dbw 15, BITE dbw 22, SUPERSONIC - dbw 29, ANCIENTPOWER + dbw 28, ANCIENTPOWER dbw 36, SCARY_FACE - dbw 43, TAKE_DOWN - dbw 50, HYPER_BEAM + dbw 40, WING_ATTACK + dbw 48, ROCK_HEAD + dbw 60, HYPER_BEAM db 0 ; no more level-up moves MunchlaxEvosAttacks: diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index e8fbacf..d8c8813 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -36,6 +36,7 @@ FirstEvoStages:: dw NIDORAN_M ;20 dw NIDORAN_M dw NIDORAN_M + dw NIDORAN_F ; Nidoreign, tentative dw CLEFFA dw CLEFFA dw VULPIX @@ -128,10 +129,12 @@ FirstEvoStages:: dw STARYU dw MR__MIME dw SCYTHER + dw SCYTHER dw SMOOCHUM dw ELEKID dw MAGBY dw PINSIR + dw PINSIR dw TAUROS ;80 dw MAGIKARP dw MAGIKARP diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 7d46176..58b37f0 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -37,6 +37,7 @@ KantoMonSpecials: db 40 ; NIDORAN_M db 55 ; NIDORINO db 75 ; NIDOKING + db 75 ; NIDOREIGN db 60 ; CLEFAIRY db 85 ; CLEFABLE db 65 ; VULPIX @@ -129,10 +130,12 @@ KantoMonSpecials: db 100 ; STARMIE db 100 ; MR__MIME db 55 ; SCYTHER + db 45 ; KLEAVOR db 95 ; JYNX db 85 ; ELECTABUZZ db 85 ; MAGMAR db 55 ; PINSIR + db 55 ; TRICULES db 70 ; TAUROS db 20 ; MAGIKARP db 100 ; GYARADOS diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 45580d3..7c6f668 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -32,6 +32,7 @@ Pokered_MonIndices: db TANGELA db SCIZOR ; MISSINGNO. db SHUCKLE ; MISSINGNO. + db NIDOREIGN db GROWLITHE db ONIX db FEAROW @@ -120,6 +121,7 @@ Pokered_MonIndices: db DUGTRIO db VENOMOTH db DEWGONG + db TRICULES db KINGDRA ; MISSINGNO. db PHANPY ; MISSINGNO. db CATERPIE @@ -192,7 +194,7 @@ Pokered_MonIndices: db BELLSPROUT db WEEPINBELL db VICTREEBEL - assert_table_length 192 ; gen 1 mon indexes + assert_table_length 194 ; gen 1 mon indexes db CHIKORITA db BAYLEEF db MEGANIUM @@ -257,5 +259,6 @@ Pokered_MonIndices: db WALKING_WAKE db SHI_SHI db MUNCHLAX + db KLEAVOR db GOROCHU assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index a6c74fc..4625bc8 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -37,6 +37,7 @@ MonMenuIcons: db ICON_FOX ; NIDORAN_M db ICON_FOX ; NIDORINO db ICON_MONSTER ; NIDOKING + db ICON_MONSTER ; NIDOREIGN db ICON_CLEFAIRY ; CLEFAIRY db ICON_CLEFAIRY ; CLEFABLE db ICON_FOX ; VULPIX @@ -129,10 +130,12 @@ MonMenuIcons: db ICON_STARYU ; STARMIE db ICON_HUMANSHAPE ; MR__MIME db ICON_BUG ; SCYTHER + db ICON_BUG ; KLEAVOR db ICON_HUMANSHAPE ; JYNX db ICON_HUMANSHAPE ; ELECTABUZZ db ICON_HUMANSHAPE ; MAGMAR db ICON_BUG ; PINSIR + db ICON_BUG ; TRICULES db ICON_EQUINE ; TAUROS db ICON_FISH ; MAGIKARP db ICON_GYARADOS ; GYARADOS diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index c26d0be..dd9a92d 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -39,6 +39,7 @@ PokemonNames:: db "NIDORAN♂@@" db "NIDORINO@@" db "NIDOKING@@" + db "NIDOREIGN@" db "CLEFAIRY@@" db "CLEFABLE@@" db "VULPIX@@@@" @@ -131,10 +132,12 @@ PokemonNames:: db "STARMIE@@@" db "MR.MIME@@@" db "SCYTHER@@@" + db "KLEAVOR@@@" db "JYNX@@@@@@" db "ELECTABUZZ" db "MAGMAR@@@@" db "PINSIR@@@@" + db "TRICULES@@" db "TAUROS@@@@" db "MAGIKARP@@" db "GYARADOS@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 11fda87..2ec2b71 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -103,6 +103,8 @@ INCBIN "gfx/pokemon/nidorino/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidorino/shiny.pal" INCBIN "gfx/pokemon/nidoking/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoking/shiny.pal" +INCBIN "gfx/pokemon/nidoreign/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/nidoreign/shiny.pal" INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefairy/shiny.pal" INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors @@ -287,6 +289,8 @@ INCBIN "gfx/pokemon/mr__mime/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mr__mime/shiny.pal" INCBIN "gfx/pokemon/scyther/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/scyther/shiny.pal" +INCBIN "gfx/pokemon/kleavor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/kleavor/shiny.pal" INCBIN "gfx/pokemon/jynx/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jynx/shiny.pal" INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors @@ -295,6 +299,8 @@ INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/magmar/shiny.pal" INCBIN "gfx/pokemon/pinsir/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pinsir/shiny.pal" +INCBIN "gfx/pokemon/tricules/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/tricules/shiny.pal" INCBIN "gfx/pokemon/tauros/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tauros/shiny.pal" INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index d0aeb86..0b47362 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -83,6 +83,8 @@ PokemonPicPointers:: dba NidorinoBackpic dba NidokingFrontpic dba NidokingBackpic + dba NidoreignFrontpic + dba NidoreignBackpic dba ClefairyFrontpic dba ClefairyBackpic dba ClefableFrontpic @@ -267,6 +269,8 @@ PokemonPicPointers:: dba MrMimeBackpic dba ScytherFrontpic dba ScytherBackpic + dba KleavorFrontpic + dba KleavorBackpic dba JynxFrontpic dba JynxBackpic dba ElectabuzzFrontpic @@ -275,6 +279,8 @@ PokemonPicPointers:: dba MagmarBackpic dba PinsirFrontpic dba PinsirBackpic + dba TriculesFrontpic + dba TriculesBackpic dba TaurosFrontpic dba TaurosBackpic dba MagikarpFrontpic diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 6d33df1..5ad6a48 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -158,7 +158,7 @@ ItemEffects: dw EvoStoneEffect ; SHINY_STONE dw NoEffect ; METAL_COAT dw NoEffect ; DRAGON_FANG - dw NoEffect ; ITEM_91 + dw EvoStoneEffect ; BLK_AUGURITE dw NoEffect ; LEFTOVERS dw NoEffect ; ITEM_93 dw NoEffect ; ITEM_94 diff --git a/gfx/footprints.asm b/gfx/footprints.asm index ec9c0ce..39f49c4 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -36,6 +36,7 @@ INCBIN "gfx/footprints/nidoqueen.1bpp" INCBIN "gfx/footprints/nidoran_m.1bpp" INCBIN "gfx/footprints/nidorino.1bpp" INCBIN "gfx/footprints/nidoking.1bpp" +INCBIN "gfx/footprints/nidoreign.1bpp" INCBIN "gfx/footprints/clefairy.1bpp" INCBIN "gfx/footprints/clefable.1bpp" INCBIN "gfx/footprints/vulpix.1bpp" @@ -73,7 +74,7 @@ INCBIN "gfx/footprints/machamp.1bpp" INCBIN "gfx/footprints/bellsprout.1bpp" INCBIN "gfx/footprints/weepinbell.1bpp" INCBIN "gfx/footprints/victreebel.1bpp" -;INCBIN "gfx/footprints/bellignan.1bpp" +INCBIN "gfx/footprints/bellignan.1bpp" INCBIN "gfx/footprints/tentacool.1bpp" INCBIN "gfx/footprints/tentacruel.1bpp" INCBIN "gfx/footprints/geodude.1bpp" @@ -128,10 +129,12 @@ INCBIN "gfx/footprints/staryu.1bpp" INCBIN "gfx/footprints/starmie.1bpp" INCBIN "gfx/footprints/mr__mime.1bpp" INCBIN "gfx/footprints/scyther.1bpp" +INCBIN "gfx/footprints/kleavor.1bpp" INCBIN "gfx/footprints/jynx.1bpp" INCBIN "gfx/footprints/electabuzz.1bpp" INCBIN "gfx/footprints/magmar.1bpp" INCBIN "gfx/footprints/pinsir.1bpp" +INCBIN "gfx/footprints/tricules.1bpp" INCBIN "gfx/footprints/tauros.1bpp" INCBIN "gfx/footprints/magikarp.1bpp" INCBIN "gfx/footprints/gyarados.1bpp" @@ -265,4 +268,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $106 ; don't forget to update this + assert_table_length $110 ; don't forget to update this diff --git a/gfx/footprints/kleavor.png b/gfx/footprints/kleavor.png new file mode 100644 index 0000000..3cefb61 Binary files /dev/null and b/gfx/footprints/kleavor.png differ diff --git a/gfx/footprints/nidoreign.png b/gfx/footprints/nidoreign.png new file mode 100644 index 0000000..7c506f1 Binary files /dev/null and b/gfx/footprints/nidoreign.png differ diff --git a/gfx/footprints/tricules.png b/gfx/footprints/tricules.png new file mode 100644 index 0000000..724bdf0 Binary files /dev/null and b/gfx/footprints/tricules.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 5a655db..28273e6 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -725,18 +725,16 @@ ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz" ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz" MunchlaxFrontpic: INCBIN "gfx/pokemon/munchlax/front.animated.2bpp.lz" MunchlaxBackpic: INCBIN "gfx/pokemon/munchlax/back.2bpp.lz" -INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" -INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" -INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" -INCBIN "gfx/pokemon/dewgong/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_b/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz" +NidoreignFrontpic: INCBIN "gfx/pokemon/nidoreign/front.animated.2bpp.lz" +NidoreignBackpic: INCBIN "gfx/pokemon/nidoreign/back.2bpp.lz" +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/unown_x/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_n/front.animated.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" @@ -757,11 +755,9 @@ 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_i/front.animated.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_r/front.animated.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" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 9cd63e3..ca8a7b2 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -35,6 +35,7 @@ AnimationPointers: dw NidoranMAnimation dw NidorinoAnimation dw NidokingAnimation + dw NidoreignAnimation dw ClefairyAnimation dw ClefableAnimation dw VulpixAnimation @@ -127,10 +128,12 @@ AnimationPointers: dw StarmieAnimation dw MrMimeAnimation dw ScytherAnimation + dw KleavorAnimation dw JynxAnimation dw ElectabuzzAnimation dw MagmarAnimation dw PinsirAnimation + dw TriculesAnimation dw TaurosAnimation dw MagikarpAnimation dw GyaradosAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 0f86c42..645aa97 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -33,6 +33,7 @@ NidoqueenAnimation: INCLUDE "gfx/pokemon/nidoqueen/anim.asm" NidoranMAnimation: INCLUDE "gfx/pokemon/nidoran_m/anim.asm" NidorinoAnimation: INCLUDE "gfx/pokemon/nidorino/anim.asm" NidokingAnimation: INCLUDE "gfx/pokemon/nidoking/anim.asm" +NidoreignAnimation: INCLUDE "gfx/pokemon/nidoreign/anim.asm" ClefairyAnimation: INCLUDE "gfx/pokemon/clefairy/anim.asm" ClefableAnimation: INCLUDE "gfx/pokemon/clefable/anim.asm" VulpixAnimation: INCLUDE "gfx/pokemon/vulpix/anim.asm" @@ -70,7 +71,7 @@ MachampAnimation: INCLUDE "gfx/pokemon/machamp/anim.asm" BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm" WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm" VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm" -BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm" +BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm" TentacoolAnimation: INCLUDE "gfx/pokemon/tentacool/anim.asm" TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm" GeodudeAnimation: INCLUDE "gfx/pokemon/geodude/anim.asm" @@ -125,10 +126,12 @@ StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm" StarmieAnimation: INCLUDE "gfx/pokemon/starmie/anim.asm" MrMimeAnimation: INCLUDE "gfx/pokemon/mr__mime/anim.asm" ScytherAnimation: INCLUDE "gfx/pokemon/scyther/anim.asm" +KleavorAnimation: INCLUDE "gfx/pokemon/kleavor/anim.asm" JynxAnimation: INCLUDE "gfx/pokemon/jynx/anim.asm" ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm" MagmarAnimation: INCLUDE "gfx/pokemon/magmar/anim.asm" PinsirAnimation: INCLUDE "gfx/pokemon/pinsir/anim.asm" +TriculesAnimation: INCLUDE "gfx/pokemon/tricules/anim.asm" TaurosAnimation: INCLUDE "gfx/pokemon/tauros/anim.asm" MagikarpAnimation: INCLUDE "gfx/pokemon/magikarp/anim.asm" GyaradosAnimation: INCLUDE "gfx/pokemon/gyarados/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 0e8f2f3..4dfa479 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -35,6 +35,7 @@ BitmasksPointers: dw NidoranMBitmasks dw NidorinoBitmasks dw NidokingBitmasks + dw NidoreignBitmasks dw ClefairyBitmasks dw ClefableBitmasks dw VulpixBitmasks @@ -127,10 +128,12 @@ BitmasksPointers: dw StarmieBitmasks dw MrMimeBitmasks dw ScytherBitmasks + dw KleavorBitmasks dw JynxBitmasks dw ElectabuzzBitmasks dw MagmarBitmasks dw PinsirBitmasks + dw TriculesBitmasks dw TaurosBitmasks dw MagikarpBitmasks dw GyaradosBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index ed8bc96..aabf61c 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -33,6 +33,7 @@ NidoqueenBitmasks: INCLUDE "gfx/pokemon/nidoqueen/bitmask.asm" NidoranMBitmasks: INCLUDE "gfx/pokemon/nidoran_m/bitmask.asm" NidorinoBitmasks: INCLUDE "gfx/pokemon/nidorino/bitmask.asm" NidokingBitmasks: INCLUDE "gfx/pokemon/nidoking/bitmask.asm" +NidoreignBitmasks: INCLUDE "gfx/pokemon/nidoreign/bitmask.asm" ClefairyBitmasks: INCLUDE "gfx/pokemon/clefairy/bitmask.asm" ClefableBitmasks: INCLUDE "gfx/pokemon/clefable/bitmask.asm" VulpixBitmasks: INCLUDE "gfx/pokemon/vulpix/bitmask.asm" @@ -70,7 +71,7 @@ MachampBitmasks: INCLUDE "gfx/pokemon/machamp/bitmask.asm" BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm" WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm" VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm" -BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm" +BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm" TentacoolBitmasks: INCLUDE "gfx/pokemon/tentacool/bitmask.asm" TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm" GeodudeBitmasks: INCLUDE "gfx/pokemon/geodude/bitmask.asm" @@ -125,10 +126,12 @@ StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm" StarmieBitmasks: INCLUDE "gfx/pokemon/starmie/bitmask.asm" MrMimeBitmasks: INCLUDE "gfx/pokemon/mr__mime/bitmask.asm" ScytherBitmasks: INCLUDE "gfx/pokemon/scyther/bitmask.asm" +KleavorBitmasks: INCLUDE "gfx/pokemon/kleavor/bitmask.asm" JynxBitmasks: INCLUDE "gfx/pokemon/jynx/bitmask.asm" ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm" MagmarBitmasks: INCLUDE "gfx/pokemon/magmar/bitmask.asm" PinsirBitmasks: INCLUDE "gfx/pokemon/pinsir/bitmask.asm" +TriculesBitmasks: INCLUDE "gfx/pokemon/tricules/bitmask.asm" TaurosBitmasks: INCLUDE "gfx/pokemon/tauros/bitmask.asm" MagikarpBitmasks: INCLUDE "gfx/pokemon/magikarp/bitmask.asm" GyaradosBitmasks: INCLUDE "gfx/pokemon/gyarados/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 02e172b..07fbcd1 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -35,6 +35,7 @@ FramesPointers: dba NidoranMFrames dba NidorinoFrames dba NidokingFrames + dba NidoreignFrames dba ClefairyFrames dba ClefableFrames dba VulpixFrames @@ -127,10 +128,12 @@ FramesPointers: dba StarmieFrames dba MrMimeFrames dba ScytherFrames + dba KleavorFrames dba JynxFrames dba ElectabuzzFrames dba MagmarFrames dba PinsirFrames + dba TriculesFrames dba TaurosFrames dba MagikarpFrames dba GyaradosFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 61c445f..f017ad5 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -35,6 +35,7 @@ AnimationIdlePointers: dw NidoranMAnimationIdle dw NidorinoAnimationIdle dw NidokingAnimationIdle + dw NidoreignAnimationIdle dw ClefairyAnimationIdle dw ClefableAnimationIdle dw VulpixAnimationIdle @@ -127,10 +128,12 @@ AnimationIdlePointers: dw StarmieAnimationIdle dw MrMimeAnimationIdle dw ScytherAnimationIdle + dw KleavorAnimationIdle dw JynxAnimationIdle dw ElectabuzzAnimationIdle dw MagmarAnimationIdle dw PinsirAnimationIdle + dw TriculesAnimationIdle dw TaurosAnimationIdle dw MagikarpAnimationIdle dw GyaradosAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index e8ee7b6..00a1c03 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -33,6 +33,7 @@ NidoqueenAnimationIdle: INCLUDE "gfx/pokemon/nidoqueen/anim_idle.asm" NidoranMAnimationIdle: INCLUDE "gfx/pokemon/nidoran_m/anim_idle.asm" NidorinoAnimationIdle: INCLUDE "gfx/pokemon/nidorino/anim_idle.asm" NidokingAnimationIdle: INCLUDE "gfx/pokemon/nidoking/anim_idle.asm" +NidoreignAnimationIdle: INCLUDE "gfx/pokemon/nidoreign/anim_idle.asm" ClefairyAnimationIdle: INCLUDE "gfx/pokemon/clefairy/anim_idle.asm" ClefableAnimationIdle: INCLUDE "gfx/pokemon/clefable/anim_idle.asm" VulpixAnimationIdle: INCLUDE "gfx/pokemon/vulpix/anim_idle.asm" @@ -70,7 +71,7 @@ MachampAnimationIdle: INCLUDE "gfx/pokemon/machamp/anim_idle.asm" BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm" WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm" VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" -BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" +BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" TentacoolAnimationIdle: INCLUDE "gfx/pokemon/tentacool/anim_idle.asm" TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm" GeodudeAnimationIdle: INCLUDE "gfx/pokemon/geodude/anim_idle.asm" @@ -125,10 +126,12 @@ StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm" StarmieAnimationIdle: INCLUDE "gfx/pokemon/starmie/anim_idle.asm" MrMimeAnimationIdle: INCLUDE "gfx/pokemon/mr__mime/anim_idle.asm" ScytherAnimationIdle: INCLUDE "gfx/pokemon/scyther/anim_idle.asm" +KleavorAnimationIdle: INCLUDE "gfx/pokemon/kleavor/anim_idle.asm" JynxAnimationIdle: INCLUDE "gfx/pokemon/jynx/anim_idle.asm" ElectabuzzAnimationIdle: INCLUDE "gfx/pokemon/electabuzz/anim_idle.asm" MagmarAnimationIdle: INCLUDE "gfx/pokemon/magmar/anim_idle.asm" PinsirAnimationIdle: INCLUDE "gfx/pokemon/pinsir/anim_idle.asm" +TriculesAnimationIdle: INCLUDE "gfx/pokemon/tricules/anim_idle.asm" TaurosAnimationIdle: INCLUDE "gfx/pokemon/tauros/anim_idle.asm" MagikarpAnimationIdle: INCLUDE "gfx/pokemon/magikarp/anim_idle.asm" GyaradosAnimationIdle: INCLUDE "gfx/pokemon/gyarados/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index a6697c1..c2cece7 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -35,6 +35,7 @@ NidoqueenFrames: INCLUDE "gfx/pokemon/nidoqueen/frames.asm" NidoranMFrames: INCLUDE "gfx/pokemon/nidoran_m/frames.asm" NidorinoFrames: INCLUDE "gfx/pokemon/nidorino/frames.asm" NidokingFrames: INCLUDE "gfx/pokemon/nidoking/frames.asm" +NidoreignFrames: INCLUDE "gfx/pokemon/nidoreign/frames.asm" ClefairyFrames: INCLUDE "gfx/pokemon/clefairy/frames.asm" ClefableFrames: INCLUDE "gfx/pokemon/clefable/frames.asm" VulpixFrames: INCLUDE "gfx/pokemon/vulpix/frames.asm" @@ -72,7 +73,7 @@ MachampFrames: INCLUDE "gfx/pokemon/machamp/frames.asm" BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm" WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm" VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm" -BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm" +BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm" TentacoolFrames: INCLUDE "gfx/pokemon/tentacool/frames.asm" TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm" GeodudeFrames: INCLUDE "gfx/pokemon/geodude/frames.asm" @@ -127,10 +128,12 @@ StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm" StarmieFrames: INCLUDE "gfx/pokemon/starmie/frames.asm" MrMimeFrames: INCLUDE "gfx/pokemon/mr__mime/frames.asm" ScytherFrames: INCLUDE "gfx/pokemon/scyther/frames.asm" +KleavorFrames: INCLUDE "gfx/pokemon/kleavor/frames.asm" JynxFrames: INCLUDE "gfx/pokemon/jynx/frames.asm" ElectabuzzFrames: INCLUDE "gfx/pokemon/electabuzz/frames.asm" MagmarFrames: INCLUDE "gfx/pokemon/magmar/frames.asm" PinsirFrames: INCLUDE "gfx/pokemon/pinsir/frames.asm" +TriculesFrames: INCLUDE "gfx/pokemon/tricules/frames.asm" TaurosFrames: INCLUDE "gfx/pokemon/tauros/frames.asm" MagikarpFrames: INCLUDE "gfx/pokemon/magikarp/frames.asm" GyaradosFrames: INCLUDE "gfx/pokemon/gyarados/frames.asm" diff --git a/gfx/pokemon/kleavor/anim.asm b/gfx/pokemon/kleavor/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/kleavor/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/kleavor/anim_idle.asm b/gfx/pokemon/kleavor/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/kleavor/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/kleavor/back.png b/gfx/pokemon/kleavor/back.png new file mode 100644 index 0000000..8ebe34e Binary files /dev/null and b/gfx/pokemon/kleavor/back.png differ diff --git a/gfx/pokemon/kleavor/front.png b/gfx/pokemon/kleavor/front.png new file mode 100644 index 0000000..c93f781 Binary files /dev/null and b/gfx/pokemon/kleavor/front.png differ diff --git a/gfx/pokemon/kleavor/shiny.pal b/gfx/pokemon/kleavor/shiny.pal new file mode 100644 index 0000000..550d6de --- /dev/null +++ b/gfx/pokemon/kleavor/shiny.pal @@ -0,0 +1,4 @@ + + RGB 17, 24, 00 + RGB 28, 09, 00 + diff --git a/gfx/pokemon/nidoreign/anim.asm b/gfx/pokemon/nidoreign/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/nidoreign/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/nidoreign/anim_idle.asm b/gfx/pokemon/nidoreign/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/nidoreign/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/nidoreign/back.png b/gfx/pokemon/nidoreign/back.png new file mode 100644 index 0000000..a8ed573 Binary files /dev/null and b/gfx/pokemon/nidoreign/back.png differ diff --git a/gfx/pokemon/nidoreign/front.png b/gfx/pokemon/nidoreign/front.png new file mode 100644 index 0000000..ecaf104 Binary files /dev/null and b/gfx/pokemon/nidoreign/front.png differ diff --git a/gfx/pokemon/nidoreign/shiny.pal b/gfx/pokemon/nidoreign/shiny.pal new file mode 100644 index 0000000..b27c118 --- /dev/null +++ b/gfx/pokemon/nidoreign/shiny.pal @@ -0,0 +1,4 @@ + + RGB 31, 16, 31 + RGB 11, 13, 08 + diff --git a/gfx/pokemon/tricules/anim.asm b/gfx/pokemon/tricules/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/tricules/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/tricules/anim_idle.asm b/gfx/pokemon/tricules/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/tricules/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/tricules/back.png b/gfx/pokemon/tricules/back.png new file mode 100644 index 0000000..e38315a Binary files /dev/null and b/gfx/pokemon/tricules/back.png differ diff --git a/gfx/pokemon/tricules/front.png b/gfx/pokemon/tricules/front.png new file mode 100644 index 0000000..a38ad7e Binary files /dev/null and b/gfx/pokemon/tricules/front.png differ diff --git a/gfx/pokemon/tricules/shiny.pal b/gfx/pokemon/tricules/shiny.pal new file mode 100644 index 0000000..4f58677 --- /dev/null +++ b/gfx/pokemon/tricules/shiny.pal @@ -0,0 +1,4 @@ + + RGB 23, 23, 09 + RGB 11, 11, 15 + diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index e3e2a1b..c68d90d 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -114,12 +114,12 @@ PlayersRadioText4: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, BELLIGNAN + getmonname STRING_BUFFER_3, NIDORINA writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke BELLIGNAN, 35, MASTER_BALL + givepoke NIDORINA, 36, MOON_STONE closetext end @@ -179,7 +179,7 @@ PlayersHouse2F_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 7, 0, LAKE_OF_RAGE, 1 + warp_event 7, 0, LAKE_OF_RAGE, 3 ;warp_event 7, 0, PLAYERS_HOUSE_1F, 3 def_coord_events