From b451ca81ce680866ec3e69a353846dfdf38b27c3 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:45:20 +0100 Subject: [PATCH] Charmada! This required moving the base stat and cry files. Not tested, so someone ought to check... --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/base_stats/charmada.asm | 21 +++++++++++++++++++++ data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/charmada.asm | 10 ++++++++++ data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_kanto.asm | 1 + data/pokemon/evos_attacks_kanto.asm | 19 +++++++++++++++++++ data/pokemon/first_stages.asm | 1 + data/pokemon/gen1_base_special.asm | 1 + data/pokemon/gen1_order.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints.asm | 1 + gfx/footprints/charmada.png | Bin 0 -> 74 bytes gfx/pics.asm | 2 ++ gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/charmada/anim.asm | 1 + gfx/pokemon/charmada/anim_idle.asm | 1 + gfx/pokemon/charmada/back.png | Bin 0 -> 304 bytes gfx/pokemon/charmada/front.png | Bin 0 -> 315 bytes gfx/pokemon/charmada/shiny.pal | 2 ++ gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/kanto_frames.asm | 1 + main.asm | 4 ++-- 35 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 data/pokemon/base_stats/charmada.asm create mode 100644 data/pokemon/dex_entries/charmada.asm create mode 100644 gfx/footprints/charmada.png create mode 100644 gfx/pokemon/charmada/anim.asm create mode 100644 gfx/pokemon/charmada/anim_idle.asm create mode 100644 gfx/pokemon/charmada/back.png create mode 100644 gfx/pokemon/charmada/front.png create mode 100644 gfx/pokemon/charmada/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index e82352d..f40240a 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -25,6 +25,7 @@ const CHARMANDER ; 04 const CHARMELEON ; 05 const CHARIZARD ; 06 + const CHARMADA const SQUIRTLE ; 07 const WARTORTLE ; 08 const TOTARTLE ; 09 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index c7b7f3d..02df4d4 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -33,6 +33,7 @@ INCLUDE "data/pokemon/base_stats/venusaur.asm" INCLUDE "data/pokemon/base_stats/charmander.asm" INCLUDE "data/pokemon/base_stats/charmeleon.asm" INCLUDE "data/pokemon/base_stats/charizard.asm" +INCLUDE "data/pokemon/base_stats/charmada.asm" INCLUDE "data/pokemon/base_stats/squirtle.asm" INCLUDE "data/pokemon/base_stats/wartortle.asm" INCLUDE "data/pokemon/base_stats/totartle.asm" diff --git a/data/pokemon/base_stats/charmada.asm b/data/pokemon/base_stats/charmada.asm new file mode 100644 index 0000000..3d05b94 --- /dev/null +++ b/data/pokemon/base_stats/charmada.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 78, 84, 100, 68, 109, 95 + ; hp atk def spd sat sdf + + db FIRE, STEEL ; type + db 45 ; catch rate + db 209 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/charmada/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER, THUNDERBOLT, IRON_TAIL, STEEL_WING, THUNDER + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 2182935..d7de1f0 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -12,6 +12,7 @@ PokemonCries:: mon_cry CRY_CHARMANDER, 96, 192 ; CHARMANDER mon_cry CRY_CHARMANDER, 32, 192 ; CHARMELEON mon_cry CRY_CHARMANDER, 0, 256 ; CHARIZARD + mon_cry CRY_CHARMANDER, 0, 256 ; CHARMADA (incomplete) mon_cry CRY_SQUIRTLE, 96, 192 ; SQUIRTLE mon_cry CRY_SQUIRTLE, 32, 192 ; WARTORTLE mon_cry CRY_SQUIRTLE, 0, 256 ; TOTARTLE diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 681140d..ac2c465 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -6,6 +6,7 @@ VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" CharmanderPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmander.asm" CharmeleonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmeleon.asm" CharizardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charizard.asm" +CharmadaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/charmada.asm" SquirtlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/squirtle.asm" WartortlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/wartortle.asm" TotartlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/totartle.asm" diff --git a/data/pokemon/dex_entries/charmada.asm b/data/pokemon/dex_entries/charmada.asm new file mode 100644 index 0000000..9d6b2f1 --- /dev/null +++ b/data/pokemon/dex_entries/charmada.asm @@ -0,0 +1,10 @@ + db "LASER@" ; species name + dw 393, 595 ; height, weight - temp + + db "This #MON was" + next "augmented by" + next "SILPH CO. to" + + page "battle TYRANITAR." ; Like a sequel to Omegadge vs Gawarhed! + next "The three heads" + next "work in unison.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 10eb5c4..0be155d 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -7,6 +7,7 @@ PokedexDataPointerTable: dba CharmanderPokedexEntry dba CharmeleonPokedexEntry dba CharizardPokedexEntry + dba CharmadaPokedexEntry dba SquirtlePokedexEntry dba WartortlePokedexEntry dba TotartlePokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index a73c94d..711e35f 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -41,6 +41,7 @@ AlphabeticalPokedexOrder: dw CELEBI dw CHANSEY dw CHARIZARD + dw CHARMADA dw CHARMANDER dw CHARMELEON dw CHEEP diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index c90631a..e3ba46d 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -331,6 +331,7 @@ NewPokedexOrder: dw CHARMANDER dw CHARMELEON dw CHARIZARD + dw CHARMADA dw SQUIRTLE dw WARTORTLE dw TOTARTLE diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 69394b4..78e6860 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -7,6 +7,7 @@ EggMovePointers1: dw CharmanderEggMoves dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 dw SquirtleEggMoves dw NoEggMoves1 dw NoEggMoves1 ; Totartle diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 5083e94..8fa9faf 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -7,6 +7,7 @@ EvosAttacksPointers1:: dw CharmanderEvosAttacks dw CharmeleonEvosAttacks dw CharizardEvosAttacks + dw CharmadaEvosAttacks dw SquirtleEvosAttacks dw WartortleEvosAttacks dw TotartleEvosAttacks @@ -258,6 +259,7 @@ CharmanderEvosAttacks: CharmeleonEvosAttacks: dbbw EVOLVE_LEVEL, 36, CHARIZARD + dbbw EVOLVE_TRADE, METAL_COAT, CHARMADA db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, GROWL @@ -288,6 +290,23 @@ CharizardEvosAttacks: dbw 54, DRAGON_RAGE dbw 64, FIRE_SPIN db 0 ; no more level-up moves + +CharmadaEvosAttacks: + db 0 ; no more evolutions + dbw 1, METAL_CLAW + dbw 1, GROWL + dbw 1, EMBER + dbw 1, SMOKESCREEN + dbw 7, EMBER + dbw 13, SMOKESCREEN + dbw 20, RAGE + dbw 27, SCARY_FACE + dbw 34, FLAMETHROWER + dbw 36, IRON_TAIL + dbw 44, SPARK + dbw 54, DRAGON_RAGE + dbw 64, FIRE_SPIN + db 0 ; no more level-up moves SquirtleEvosAttacks: dbbw EVOLVE_LEVEL, 16, WARTORTLE diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 0c2cbbd..fe25d7f 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -7,6 +7,7 @@ FirstEvoStages:: dw CHARMANDER dw CHARMANDER dw CHARMANDER + dw CHARMANDER dw SQUIRTLE dw SQUIRTLE ;08 dw SQUIRTLE diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index ee64fd8..a9d741e 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -8,6 +8,7 @@ KantoMonSpecials: db 50 ; CHARMANDER db 65 ; CHARMELEON db 85 ; CHARIZARD + db 95 ; CHARMADA db 50 ; SQUIRTLE db 65 ; WARTORTLE db 100 ; BLASTOISE diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 43fde7e..0b112fc 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -360,4 +360,5 @@ Pokered_MonIndices: db MANTYKE db WEIRDUCK db LUXWAN + db CHARMADA assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 21951df..4dbc758 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -8,6 +8,7 @@ MonMenuIcons: db ICON_CHARMANDER ; CHARMANDER db ICON_CHARMANDER ; CHARMELEON db ICON_BIGMON ; CHARIZARD + db ICON_BIGMON ; CHARMADA db ICON_SQUIRTLE ; SQUIRTLE db ICON_SQUIRTLE ; WARTORTLE db ICON_SQUIRTLE ; TOTARTLE diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index b109ab7..5f38d88 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -10,6 +10,7 @@ PokemonNames:: db "CHARMANDER" db "CHARMELEON" db "CHARIZARD@" + db "CHARMADA@@" db "SQUIRTLE@@" db "WARTORTLE@" db "TOTARTLE@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 6901a0b..da115ff 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -45,6 +45,8 @@ INCBIN "gfx/pokemon/charmeleon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/charmeleon/shiny.pal" INCBIN "gfx/pokemon/charizard/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/charizard/shiny.pal" +INCBIN "gfx/pokemon/charmada/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/charmada/shiny.pal" INCBIN "gfx/pokemon/squirtle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/squirtle/shiny.pal" INCBIN "gfx/pokemon/wartortle/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index b421234..b9ec1df 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -25,6 +25,8 @@ PokemonPicPointers:: dba CharmeleonBackpic dba CharizardFrontpic dba CharizardBackpic + dba CharmadaFrontpic + dba CharmadaBackpic dba SquirtleFrontpic dba SquirtleBackpic dba WartortleFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index e18e355..0f44f8e 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -7,6 +7,7 @@ INCBIN "gfx/footprints/venusaur.1bpp" INCBIN "gfx/footprints/charmander.1bpp" INCBIN "gfx/footprints/charmeleon.1bpp" INCBIN "gfx/footprints/charizard.1bpp" +INCBIN "gfx/footprints/charmada.1bpp" INCBIN "gfx/footprints/squirtle.1bpp" INCBIN "gfx/footprints/wartortle.1bpp" INCBIN "gfx/footprints/totartle.1bpp" diff --git a/gfx/footprints/charmada.png b/gfx/footprints/charmada.png new file mode 100644 index 0000000000000000000000000000000000000000..41dd30829a834a34bd2426c6934098ef2e84f580 GIT binary patch literal 74 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJK~ERQkcwN$2?|UG@(qG4j0`r- UjP2&U>Ny}qp00i_>zopr0KBdZ%K!iX literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index b77b7b4..b25a9d0 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -944,3 +944,5 @@ WeirduckFrontpic: INCBIN "gfx/pokemon/weirduck/front.animated.2bpp.lz" WeirduckBackpic: INCBIN "gfx/pokemon/weirduck/back.2bpp.lz" 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" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 094c84c..4aa6942 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -6,6 +6,7 @@ AnimationPointers: dw CharmanderAnimation dw CharmeleonAnimation dw CharizardAnimation + dw CharmadaAnimation dw SquirtleAnimation dw WartortleAnimation dw TotartleAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index c382149..8c400eb 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -4,6 +4,7 @@ VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm" CharmanderAnimation: INCLUDE "gfx/pokemon/charmander/anim.asm" CharmeleonAnimation: INCLUDE "gfx/pokemon/charmeleon/anim.asm" CharizardAnimation: INCLUDE "gfx/pokemon/charizard/anim.asm" +CharmadaAnimation: INCLUDE "gfx/pokemon/charmada/anim.asm" SquirtleAnimation: INCLUDE "gfx/pokemon/squirtle/anim.asm" WartortleAnimation: INCLUDE "gfx/pokemon/wartortle/anim.asm" TotartleAnimation: INCLUDE "gfx/pokemon/totartle/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 15d7510..abc26a7 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -6,6 +6,7 @@ BitmasksPointers: dw CharmanderBitmasks dw CharmeleonBitmasks dw CharizardBitmasks + dw CharmadaBitmasks dw SquirtleBitmasks dw WartortleBitmasks dw TotartleBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 3b9263a..a6f5ea8 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -4,6 +4,7 @@ VenusaurBitmasks: INCLUDE "gfx/pokemon/venusaur/bitmask.asm" CharmanderBitmasks: INCLUDE "gfx/pokemon/charmander/bitmask.asm" CharmeleonBitmasks: INCLUDE "gfx/pokemon/charmeleon/bitmask.asm" CharizardBitmasks: INCLUDE "gfx/pokemon/charizard/bitmask.asm" +CharmadaBitmasks: INCLUDE "gfx/pokemon/charmada/bitmask.asm" SquirtleBitmasks: INCLUDE "gfx/pokemon/squirtle/bitmask.asm" WartortleBitmasks: INCLUDE "gfx/pokemon/wartortle/bitmask.asm" TotartleBitmasks: INCLUDE "gfx/pokemon/totartle/bitmask.asm" diff --git a/gfx/pokemon/charmada/anim.asm b/gfx/pokemon/charmada/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/charmada/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/charmada/anim_idle.asm b/gfx/pokemon/charmada/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/charmada/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/charmada/back.png b/gfx/pokemon/charmada/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/charmada/shiny.pal b/gfx/pokemon/charmada/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/charmada/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 581ec52..8eeaa8c 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -6,6 +6,7 @@ FramesPointers: dba CharmanderFrames dba CharmeleonFrames dba CharizardFrames + dba CharmadaFrames dba SquirtleFrames dba WartortleFrames dba TotartleFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 72a015a..d1b1368 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -6,6 +6,7 @@ AnimationIdlePointers: dw CharmanderAnimationIdle dw CharmeleonAnimationIdle dw CharizardAnimationIdle + dw CharmadaAnimationIdle dw SquirtleAnimationIdle dw WartortleAnimationIdle dw TotartleAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 0de9e49..207d51b 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -4,6 +4,7 @@ VenusaurAnimationIdle: INCLUDE "gfx/pokemon/venusaur/anim_idle.asm" CharmanderAnimationIdle: INCLUDE "gfx/pokemon/charmander/anim_idle.asm" CharmeleonAnimationIdle: INCLUDE "gfx/pokemon/charmeleon/anim_idle.asm" CharizardAnimationIdle: INCLUDE "gfx/pokemon/charizard/anim_idle.asm" +CharmadaAnimationIdle: INCLUDE "gfx/pokemon/charmada/anim_idle.asm" SquirtleAnimationIdle: INCLUDE "gfx/pokemon/squirtle/anim_idle.asm" WartortleAnimationIdle: INCLUDE "gfx/pokemon/wartortle/anim_idle.asm" TotartleAnimationIdle: INCLUDE "gfx/pokemon/totartle/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index fdd6f6d..3107fb8 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -6,6 +6,7 @@ VenusaurFrames: INCLUDE "gfx/pokemon/venusaur/frames.asm" CharmanderFrames: INCLUDE "gfx/pokemon/charmander/frames.asm" CharmeleonFrames: INCLUDE "gfx/pokemon/charmeleon/frames.asm" CharizardFrames: INCLUDE "gfx/pokemon/charizard/frames.asm" +CharmadaFrames: INCLUDE "gfx/pokemon/charmada/frames.asm" SquirtleFrames: INCLUDE "gfx/pokemon/squirtle/frames.asm" WartortleFrames: INCLUDE "gfx/pokemon/wartortle/frames.asm" TotartleFrames: INCLUDE "gfx/pokemon/totartle/frames.asm" diff --git a/main.asm b/main.asm index 68763fe..376071d 100644 --- a/main.asm +++ b/main.asm @@ -240,10 +240,10 @@ INCLUDE "engine/pokemon/experience.asm" INCLUDE "engine/pokemon/switchpartymons.asm" INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" -INCLUDE "data/pokemon/base_stats.asm" SECTION "Pokemon Names", ROMX +INCLUDE "data/pokemon/base_stats.asm" ; If moving pokemon becomes a problem, it's because of this. INCLUDE "data/pokemon/names.asm" @@ -468,10 +468,10 @@ SECTION "bank3E", ROMX INCLUDE "engine/gfx/load_font.asm" INCLUDE "engine/events/name_rater.asm" -INCLUDE "engine/events/play_slow_cry.asm" SECTION "bank3Econt", ROMX +INCLUDE "engine/events/play_slow_cry.asm" INCLUDE "engine/link/time_capsule.asm" INCLUDE "engine/link/time_capsule_2.asm" INCLUDE "engine/events/magikarp.asm"