From 62bdbe2a1b7681c806ecd7456424774f740e4ba9 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 7 Jul 2024 09:27:46 +0100 Subject: [PATCH] Terrados & Bug Fix Fixes Molambino and Luanbo not evolving properly (oops) and adds Magiprey/Terrados. Since there's no place to put Magiprey in Johto or Kanto, this'll likely be a Nihon exclusive. Got some stuff in mind! --- constants/pokemon_constants.asm | 2 ++ data/pokemon/base_stats.asm | 2 ++ data/pokemon/base_stats/magiprey.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/terrados.asm | 21 +++++++++++++++++++++ data/pokemon/cries.asm | 2 ++ data/pokemon/dex_entries.asm | 2 ++ data/pokemon/dex_entries/magiprey.asm | 10 ++++++++++ data/pokemon/dex_entries/terrados.asm | 10 ++++++++++ data/pokemon/dex_entry_pointers.asm | 2 ++ data/pokemon/dex_order_alpha.asm | 2 ++ data/pokemon/dex_order_new.asm | 2 ++ data/pokemon/egg_moves_kanto.asm | 2 ++ data/pokemon/evos_attacks_johto.asm | 4 ++-- data/pokemon/evos_attacks_kanto.asm | 22 ++++++++++++++++++++++ data/pokemon/first_stages.asm | 2 ++ data/pokemon/gen1_base_special.asm | 2 ++ data/pokemon/gen1_order.asm | 2 ++ data/pokemon/menu_icons.asm | 2 ++ data/pokemon/names.asm | 2 ++ data/pokemon/palettes.asm | 4 ++++ data/pokemon/pic_pointers.asm | 4 ++++ gfx/footprints.asm | 2 ++ gfx/footprints/magiprey.png | Bin 0 -> 69 bytes gfx/footprints/terrados.png | Bin 0 -> 69 bytes gfx/pics.asm | 4 ++++ gfx/pokemon/anim_pointers.asm | 2 ++ gfx/pokemon/anims.asm | 2 ++ gfx/pokemon/bitmask_pointers.asm | 2 ++ gfx/pokemon/bitmasks.asm | 2 ++ gfx/pokemon/frame_pointers.asm | 2 ++ gfx/pokemon/idle_pointers.asm | 2 ++ gfx/pokemon/idles.asm | 2 ++ gfx/pokemon/kanto_frames.asm | 2 ++ gfx/pokemon/magiprey/anim.asm | 1 + gfx/pokemon/magiprey/anim_idle.asm | 1 + gfx/pokemon/magiprey/back.png | Bin 0 -> 304 bytes gfx/pokemon/magiprey/front.png | Bin 0 -> 315 bytes gfx/pokemon/magiprey/shiny.pal | 2 ++ gfx/pokemon/terrados/anim.asm | 1 + gfx/pokemon/terrados/anim_idle.asm | 1 + gfx/pokemon/terrados/back.png | Bin 0 -> 304 bytes gfx/pokemon/terrados/front.png | Bin 0 -> 315 bytes gfx/pokemon/terrados/shiny.pal | 2 ++ main.asm | 2 +- 44 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 data/pokemon/base_stats/magiprey.asm create mode 100644 data/pokemon/base_stats/terrados.asm create mode 100644 data/pokemon/dex_entries/magiprey.asm create mode 100644 data/pokemon/dex_entries/terrados.asm create mode 100644 gfx/footprints/magiprey.png create mode 100644 gfx/footprints/terrados.png create mode 100644 gfx/pokemon/magiprey/anim.asm create mode 100644 gfx/pokemon/magiprey/anim_idle.asm create mode 100644 gfx/pokemon/magiprey/back.png create mode 100644 gfx/pokemon/magiprey/front.png create mode 100644 gfx/pokemon/magiprey/shiny.pal create mode 100644 gfx/pokemon/terrados/anim.asm create mode 100644 gfx/pokemon/terrados/anim_idle.asm create mode 100644 gfx/pokemon/terrados/back.png create mode 100644 gfx/pokemon/terrados/front.png create mode 100644 gfx/pokemon/terrados/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f40240a..5bfbc71 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -184,6 +184,8 @@ const TAUROS ; 80 const MAGIKARP ; 81 const GYARADOS ; 82 + const MAGIPREY + const TERRADOS const LAPRAS ; 83 const DITTO ; 84 const EEVEE ; 85 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 02df4d4..31798b0 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -192,6 +192,8 @@ 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" +INCLUDE "data/pokemon/base_stats/magiprey.asm" +INCLUDE "data/pokemon/base_stats/terrados.asm" INCLUDE "data/pokemon/base_stats/lapras.asm" INCLUDE "data/pokemon/base_stats/ditto.asm" INCLUDE "data/pokemon/base_stats/eevee.asm" diff --git a/data/pokemon/base_stats/magiprey.asm b/data/pokemon/base_stats/magiprey.asm new file mode 100644 index 0000000..32f9145 --- /dev/null +++ b/data/pokemon/base_stats/magiprey.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 20, 10, 55, 80, 15, 20 + ; hp atk def spd sat sdf + + db GROUND, GROUND ; type + db 255 ; catch rate + db 20 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 5 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/magiprey/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_MINERAL, EGG_DRAGON ; egg groups + + ; tm/hm learnset + tmhm + ; end diff --git a/data/pokemon/base_stats/terrados.asm b/data/pokemon/base_stats/terrados.asm new file mode 100644 index 0000000..a2eeb6f --- /dev/null +++ b/data/pokemon/base_stats/terrados.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 95, 125, 79, 81, 60, 100 + ; hp atk def spd sat sdf + + db GROUND, DARK ; type + db 45 ; catch rate + db 214 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 5 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/terrados/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_SLOW ; growth rate + dn EGG_MINERAL, EGG_DRAGON ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index d7de1f0..447f678 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -171,6 +171,8 @@ PokemonCries:: mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS mon_cry CRY_EKANS, 128, 128 ; MAGIKARP mon_cry CRY_EKANS, 0, 256 ; GYARADOS + mon_cry CRY_EKANS, 128, 128 ; MAGIPREY (incomplete) + mon_cry CRY_EKANS, 0, 256 ; TERRADOS (incomplete) mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS mon_cry CRY_PIDGEY, 255, 383 ; DITTO mon_cry CRY_VENONAT, 136, 224 ; EEVEE diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index ac2c465..a37a205 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -373,3 +373,5 @@ LugiaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lugia.asm" HoOhPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ho_oh.asm" ShiShiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/shi_shi.asm" CelebiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/celebi.asm" +MagipreyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magiprey.asm" +TerradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/terrados.asm" diff --git a/data/pokemon/dex_entries/magiprey.asm b/data/pokemon/dex_entries/magiprey.asm new file mode 100644 index 0000000..af71ec4 --- /dev/null +++ b/data/pokemon/dex_entries/magiprey.asm @@ -0,0 +1,10 @@ + db "LAMPREY@" ; species name + dw 211, 220 ; height, weight + + db "It hides in desert" + next "sands. When #MON" + next "come close, it" + + page "latches onto" + next "them to suck" + next "their blood.@" ; blood is rarely said in mons so consider revising diff --git a/data/pokemon/dex_entries/terrados.asm b/data/pokemon/dex_entries/terrados.asm new file mode 100644 index 0000000..a883611 --- /dev/null +++ b/data/pokemon/dex_entries/terrados.asm @@ -0,0 +1,10 @@ + db "TREMOR@" ; species name + dw 2104, 5180 ; height, weight + + db "It blindly tunnels" + next "through the earth," + next "feasting on any," + + page "unfortunate GRAVELER" + next "or ONIX that it" + next "comes across.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 0be155d..4895dff 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -166,6 +166,8 @@ PokedexDataPointerTable: dba TaurosPokedexEntry dba MagikarpPokedexEntry dba GyaradosPokedexEntry + dba MagipreyPokedexEntry + dba TerradosPokedexEntry dba LaprasPokedexEntry dba DittoPokedexEntry dba EeveePokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 711e35f..402633d 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -182,6 +182,7 @@ AlphabeticalPokedexOrder: dw MAGBY dw MAGCARGO dw MAGIKARP + dw MAGIPREY dw MAGMAR dw MAGNEMITE dw MAGNETON @@ -320,6 +321,7 @@ AlphabeticalPokedexOrder: dw TEDDIURSA dw TENTACOOL dw TENTACRUEL + dw TERRADOS dw TOGEPI dw TOGETIC dw TOGEKISS diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index e3ba46d..c50fc5e 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -101,6 +101,8 @@ NewPokedexOrder: dw REROAD dw MAGIKARP dw GYARADOS + dw MAGIPREY + dw TERRADOS dw ORFRY dw GOLDEEN dw SEAKING diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 78e6860..79fa5b2 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -166,6 +166,8 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Magiprey + dw NoEggMoves1 ; Terrados dw LaprasEggMoves dw NoEggMoves1 dw EeveeEggMoves diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 39dc0cf..3ebceac 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -1981,7 +1981,7 @@ TonquitoEvosAttacks: db 0 ; no more level-up moves MolambinoEvosAttacks: - db EVOLVE_LEVEL, 20, LUANBO + dbbw EVOLVE_LEVEL, 20, LUANBO dbw 1, BUBBLE dbw 1, SUPERSONIC ; dbw 7, DRAINING_KISS ; move not yet implemented @@ -1995,7 +1995,7 @@ MolambinoEvosAttacks: db 0 ; no more level-up moves LuanboEvosAttacks: - db EVOLVE_LEVEL, 35, GRANBO + dbbw EVOLVE_LEVEL, 35, GRANBO dbw 1, BUBBLE dbw 1, SUPERSONIC ; dbw 7, DRAINING_KISS ; move not yet implemented diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 8fa9faf..3b800d3 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -166,6 +166,8 @@ EvosAttacksPointers1:: dw TaurosEvosAttacks dw MagikarpEvosAttacks dw GyaradosEvosAttacks + dw MagipreyEvosAttacks + dw TerradosEvosAttacks dw LaprasEvosAttacks dw DittoEvosAttacks dw EeveeEvosAttacks @@ -2452,6 +2454,26 @@ GyaradosEvosAttacks: dbw 50, HYPER_BEAM db 0 ; no more level-up moves +MagipreyEvosAttacks: + dbbw EVOLVE_LEVEL, 20, TERRADOS + db 0 ; no more evolutions + dbw 1, SPLASH + dbw 15, LEECH_LIFE + dbw 30, FLAIL + db 0 ; no more level-up moves + +TerradosEvosAttacks: + db 0 ; no more evolutions + dbw 1, DIG + dbw 20, BITE + dbw 25, MAGNITUDE + dbw 30, ROAR + dbw 35, CRUNCH + dbw 40, EARTHQUAKE + dbw 45, SANDSTORM + dbw 50, FISSURE + db 0 ; no more level-up moves + LaprasEvosAttacks: db 0 ; no more evolutions dbw 1, WATER_GUN diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index fe25d7f..0bd1536 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -166,6 +166,8 @@ FirstEvoStages:: dw TAUROS ;80 dw MAGIKARP dw MAGIKARP + dw MAGIPREY + dw MAGIPREY dw LAPRAS dw DITTO dw EEVEE diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index a9d741e..3cdcd38 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -167,6 +167,8 @@ KantoMonSpecials: db 70 ; TAUROS db 20 ; MAGIKARP db 100 ; GYARADOS + db 20 ; MAGIPREY + db 100 ; TERRADOS db 95 ; LAPRAS db 48 ; DITTO db 65 ; EEVEE diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 0b112fc..f806d9e 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -361,4 +361,6 @@ Pokered_MonIndices: db WEIRDUCK db LUXWAN db CHARMADA + db MAGIPREY + db TERRADOS assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 4dbc758..242c5ea 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -167,6 +167,8 @@ MonMenuIcons: db ICON_EQUINE ; TAUROS db ICON_FISH ; MAGIKARP db ICON_GYARADOS ; GYARADOS + db ICON_FISH ; MAGIPREY + db ICON_GYARADOS ; TERRADOS db ICON_LAPRAS ; LAPRAS db ICON_BLOB ; DITTO db ICON_FOX ; EEVEE diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 5f38d88..b032ef2 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -169,6 +169,8 @@ PokemonNames:: db "TAUROS@@@@" db "MAGIKARP@@" db "GYARADOS@@" + db "MAGIPREY@@" + db "TERRADOS@@" db "LAPRAS@@@@" db "DITTO@@@@@" db "EEVEE@@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index da115ff..be94fd4 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -363,6 +363,10 @@ INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/magikarp/shiny.pal" INCBIN "gfx/pokemon/gyarados/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gyarados/shiny.pal" +INCBIN "gfx/pokemon/magiprey/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/magiprey/shiny.pal" +INCBIN "gfx/pokemon/terrados/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/terrados/shiny.pal" INCBIN "gfx/pokemon/lapras/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/lapras/shiny.pal" INCBIN "gfx/pokemon/ditto/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index b9ec1df..260e176 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -343,6 +343,10 @@ PokemonPicPointers:: dba MagikarpBackpic dba GyaradosFrontpic dba GyaradosBackpic + dba MagipreyFrontpic + dba MagipreyBackpic + dba TerradosFrontpic + dba TerradosBackpic dba LaprasFrontpic dba LaprasBackpic dba DittoFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 0f44f8e..0b0bc70 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -166,6 +166,8 @@ INCBIN "gfx/footprints/tricules.1bpp" INCBIN "gfx/footprints/tauros.1bpp" INCBIN "gfx/footprints/magikarp.1bpp" INCBIN "gfx/footprints/gyarados.1bpp" +INCBIN "gfx/footprints/magiprey.1bpp" +INCBIN "gfx/footprints/terrados.1bpp" INCBIN "gfx/footprints/lapras.1bpp" INCBIN "gfx/footprints/ditto.1bpp" INCBIN "gfx/footprints/eevee.1bpp" diff --git a/gfx/footprints/magiprey.png b/gfx/footprints/magiprey.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/footprints/terrados.png b/gfx/footprints/terrados.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe2ee3de9d088c1231dbadedf8ae4093d93763d GIT binary patch literal 69 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ9#0p?kcwN$2@CXqyZ{Eqvu9P> OK=PihelF{r5}E*#W)1`Z literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index b25a9d0..dd0df88 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -946,3 +946,7 @@ LuxwanFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz" LuxwanBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz" CharmadaFrontpic: INCBIN "gfx/pokemon/luxwan/front.animated.2bpp.lz" CharmadaBackpic: INCBIN "gfx/pokemon/luxwan/back.2bpp.lz" +MagipreyFrontpic: INCBIN "gfx/pokemon/magiprey/front.animated.2bpp.lz" +MagipreyBackpic: INCBIN "gfx/pokemon/magiprey/back.2bpp.lz" +TerradosFrontpic: INCBIN "gfx/pokemon/terrados/front.animated.2bpp.lz" +TerradosBackpic: INCBIN "gfx/pokemon/terrados/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 4aa6942..ec601cc 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -165,6 +165,8 @@ AnimationPointers: dw TaurosAnimation dw MagikarpAnimation dw GyaradosAnimation + dw MagipreyAnimation + dw TerradosAnimation dw LaprasAnimation dw DittoAnimation dw EeveeAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 8c400eb..13c5d27 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -163,6 +163,8 @@ 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" +MagipreyAnimation: INCLUDE "gfx/pokemon/magiprey/anim.asm" +TerradosAnimation: INCLUDE "gfx/pokemon/terrados/anim.asm" LaprasAnimation: INCLUDE "gfx/pokemon/lapras/anim.asm" DittoAnimation: INCLUDE "gfx/pokemon/ditto/anim.asm" EeveeAnimation: INCLUDE "gfx/pokemon/eevee/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index abc26a7..d6854a4 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -165,6 +165,8 @@ BitmasksPointers: dw TaurosBitmasks dw MagikarpBitmasks dw GyaradosBitmasks + dw MagipreyBitmasks + dw TerradosBitmasks dw LaprasBitmasks dw DittoBitmasks dw EeveeBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index a6f5ea8..6297aa5 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -163,6 +163,8 @@ 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" +MagipreyBitmasks: INCLUDE "gfx/pokemon/magiprey/bitmask.asm" +TerradosBitmasks: INCLUDE "gfx/pokemon/terrados/bitmask.asm" LaprasBitmasks: INCLUDE "gfx/pokemon/lapras/bitmask.asm" DittoBitmasks: INCLUDE "gfx/pokemon/ditto/bitmask.asm" EeveeBitmasks: INCLUDE "gfx/pokemon/eevee/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 8eeaa8c..c0c608c 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -165,6 +165,8 @@ FramesPointers: dba TaurosFrames dba MagikarpFrames dba GyaradosFrames + dba MagipreyFrames + dba TerradosFrames dba LaprasFrames dba DittoFrames dba EeveeFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index d1b1368..9246061 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -165,6 +165,8 @@ AnimationIdlePointers: dw TaurosAnimationIdle dw MagikarpAnimationIdle dw GyaradosAnimationIdle + dw MagipreyAnimationIdle + dw TerradosAnimationIdle dw LaprasAnimationIdle dw DittoAnimationIdle dw EeveeAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 207d51b..efbf363 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -163,6 +163,8 @@ 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" +MagipreyAnimationIdle: INCLUDE "gfx/pokemon/magiprey/anim_idle.asm" +TerradosAnimationIdle: INCLUDE "gfx/pokemon/terrados/anim_idle.asm" LaprasAnimationIdle: INCLUDE "gfx/pokemon/lapras/anim_idle.asm" DittoAnimationIdle: INCLUDE "gfx/pokemon/ditto/anim_idle.asm" EeveeAnimationIdle: INCLUDE "gfx/pokemon/eevee/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 3107fb8..f15f524 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -165,6 +165,8 @@ 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" +MagipreyFrames: INCLUDE "gfx/pokemon/magiprey/frames.asm" +TerradosFrames: INCLUDE "gfx/pokemon/terrados/frames.asm" LaprasFrames: INCLUDE "gfx/pokemon/lapras/frames.asm" DittoFrames: INCLUDE "gfx/pokemon/ditto/frames.asm" EeveeFrames: INCLUDE "gfx/pokemon/eevee/frames.asm" diff --git a/gfx/pokemon/magiprey/anim.asm b/gfx/pokemon/magiprey/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magiprey/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magiprey/anim_idle.asm b/gfx/pokemon/magiprey/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/magiprey/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/magiprey/back.png b/gfx/pokemon/magiprey/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/magiprey/shiny.pal b/gfx/pokemon/magiprey/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/magiprey/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/terrados/anim.asm b/gfx/pokemon/terrados/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/terrados/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/terrados/anim_idle.asm b/gfx/pokemon/terrados/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/terrados/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/terrados/back.png b/gfx/pokemon/terrados/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj literal 0 HcmV?d00001 diff --git a/gfx/pokemon/terrados/shiny.pal b/gfx/pokemon/terrados/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/terrados/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/main.asm b/main.asm index 376071d..513085d 100644 --- a/main.asm +++ b/main.asm @@ -467,10 +467,10 @@ INCLUDE "engine/movie/intro.asm" SECTION "bank3E", ROMX INCLUDE "engine/gfx/load_font.asm" -INCLUDE "engine/events/name_rater.asm" SECTION "bank3Econt", ROMX +INCLUDE "engine/events/name_rater.asm" INCLUDE "engine/events/play_slow_cry.asm" INCLUDE "engine/link/time_capsule.asm" INCLUDE "engine/link/time_capsule_2.asm"