From ae81f290d2d3f52154494eecc495d9ba2cc80ea4 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Tue, 9 Jul 2024 20:20:51 +0100 Subject: [PATCH] Buu and Grenmar? Nowaynowaynoway! This required me to scrap some unused content from `load_font.asm`. However, this is only really a temporary fix - we need to decouple footprints.asm from it and make it load from separate banks to keep going. Look at how Pokemon sprites are loaded for reference. --- constants/pokemon_constants.asm | 2 ++ data/pokemon/base_stats.asm | 2 ++ data/pokemon/base_stats/grenmar.asm | 21 ++++++++++++++++ data/pokemon/cries.asm | 2 ++ data/pokemon/dex_entries.asm | 2 ++ data/pokemon/dex_entries/buu.asm | 10 ++++++++ data/pokemon/dex_entries/grenmar.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_johto.asm | 10 ++++++++ data/pokemon/egg_moves_kanto.asm | 9 +++++++ data/pokemon/evos_attacks_johto.asm | 14 +++++++++++ data/pokemon/evos_attacks_kanto.asm | 16 ++++++++++++ data/pokemon/first_stages.asm | 2 ++ data/pokemon/gen1_base_special.asm | 1 + 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 +++ data/trainers/parties.asm | 8 +++--- data/wild/johto_grass.asm | 36 +++++++++++++-------------- data/wild/johto_water.asm | 16 ++++++------ gfx/font.asm | 9 ------- gfx/footprints.asm | 2 ++ gfx/footprints/buu.png | Bin 0 -> 74 bytes gfx/footprints/grenmar.png | Bin 0 -> 74 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/buu/anim.asm | 1 + gfx/pokemon/buu/anim_idle.asm | 1 + gfx/pokemon/buu/back.png | Bin 0 -> 304 bytes gfx/pokemon/buu/front.png | Bin 0 -> 315 bytes gfx/pokemon/buu/shiny.pal | 2 ++ gfx/pokemon/frame_pointers.asm | 2 ++ gfx/pokemon/grenmar/anim.asm | 1 + gfx/pokemon/grenmar/anim_idle.asm | 1 + gfx/pokemon/grenmar/back.png | Bin 0 -> 304 bytes gfx/pokemon/grenmar/front.png | Bin 0 -> 315 bytes gfx/pokemon/grenmar/shiny.pal | 2 ++ gfx/pokemon/idle_pointers.asm | 2 ++ gfx/pokemon/idles.asm | 2 ++ gfx/pokemon/johto_frames.asm | 1 + gfx/pokemon/kanto_frames.asm | 1 + 48 files changed, 182 insertions(+), 38 deletions(-) create mode 100644 data/pokemon/base_stats/grenmar.asm create mode 100644 data/pokemon/dex_entries/buu.asm create mode 100644 data/pokemon/dex_entries/grenmar.asm create mode 100644 gfx/footprints/buu.png create mode 100644 gfx/footprints/grenmar.png create mode 100644 gfx/pokemon/buu/anim.asm create mode 100644 gfx/pokemon/buu/anim_idle.asm create mode 100644 gfx/pokemon/buu/back.png create mode 100644 gfx/pokemon/buu/front.png create mode 100644 gfx/pokemon/buu/shiny.pal create mode 100644 gfx/pokemon/grenmar/anim.asm create mode 100644 gfx/pokemon/grenmar/anim_idle.asm create mode 100644 gfx/pokemon/grenmar/back.png create mode 100644 gfx/pokemon/grenmar/front.png create mode 100644 gfx/pokemon/grenmar/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 92e6ccc..7f17ad4 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -186,6 +186,7 @@ const SCYTHER ; 7b const KLEAVOR const JYNX ; 7c + const BUU const ELECTABUZZ ; 7d const MAGMAR ; 7e const PINSIR ; 7f @@ -340,6 +341,7 @@ DEF JOHTO_POKEMON EQU const_value const PORYGON2 ; e9 const STANTLER ; ea const SMEARGLE ; eb + const GRENMAR const TYROGUE ; ec const HITMONTOP ; ed const SMOOCHUM ; ee diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index a9b32ae..69424a2 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -194,6 +194,7 @@ 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/buu.asm" INCLUDE "data/pokemon/base_stats/electabuzz.asm" INCLUDE "data/pokemon/base_stats/magmar.asm" INCLUDE "data/pokemon/base_stats/pinsir.asm" @@ -347,6 +348,7 @@ INCLUDE "data/pokemon/base_stats/donphan.asm" INCLUDE "data/pokemon/base_stats/porygon2.asm" INCLUDE "data/pokemon/base_stats/stantler.asm" INCLUDE "data/pokemon/base_stats/smeargle.asm" +INCLUDE "data/pokemon/base_stats/grenmar.asm" INCLUDE "data/pokemon/base_stats/tyrogue.asm" INCLUDE "data/pokemon/base_stats/hitmontop.asm" INCLUDE "data/pokemon/base_stats/smoochum.asm" diff --git a/data/pokemon/base_stats/grenmar.asm b/data/pokemon/base_stats/grenmar.asm new file mode 100644 index 0000000..ede439f --- /dev/null +++ b/data/pokemon/base_stats/grenmar.asm @@ -0,0 +1,21 @@ + db GRENMAR ; species ID placeholder + + db 80, 80, 70, 55, 105, 80 + ; hp atk def spd sat sdf + + db FIRE, WATER ; type + db 75 ; catch rate + db 160 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/grenmar/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, FLASH, FLAMETHROWER + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index ecee5bf..109d9e2 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -173,6 +173,7 @@ PokemonCries:: mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR mon_cry CRY_DROWZEE, 255, 383 ; JYNX + mon_cry CRY_NIDORAN_M, 0, 0 ; BUU mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR @@ -326,6 +327,7 @@ PokemonCries:: mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2 mon_cry CRY_AIPOM, -352, 384 ; STANTLER mon_cry CRY_PICHU, -538, 496 ; SMEARGLE + mon_cry CRY_NIDORAN_M, 0, 0 ; GRENMAR mon_cry CRY_AIPOM, 44, 264 ; TYROGUE mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 95b7c68..bbc8db4 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -384,3 +384,5 @@ BalumbaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/balumba.asm" MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm" MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm" GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm" +BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm" +GrenmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grenmar.asm" diff --git a/data/pokemon/dex_entries/buu.asm b/data/pokemon/dex_entries/buu.asm new file mode 100644 index 0000000..b60498a --- /dev/null +++ b/data/pokemon/dex_entries/buu.asm @@ -0,0 +1,10 @@ + db "ICE BEAST@" ; species name + dw 311, 191 ; height, weight - temp + + db "If it finds people" + next "stranded in the" + next "mountains, BUU will" + + page "keep them warm us-" + next "ing its heat-resis-" + next "tant fur.@" \ No newline at end of file diff --git a/data/pokemon/dex_entries/grenmar.asm b/data/pokemon/dex_entries/grenmar.asm new file mode 100644 index 0000000..6ea32c0 --- /dev/null +++ b/data/pokemon/dex_entries/grenmar.asm @@ -0,0 +1,10 @@ + db "BOMB SEEL@" ; species name + dw 311, 191 ; height, weight - temp + + db "Popular amongst" + next "ringmaster for its" + next "skillful juggling." + + page "Training one is" + next "risky, as its" + next "rock may explode.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 717ffcc..64aea23 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -168,6 +168,7 @@ PokedexDataPointerTable: dba ScytherPokedexEntry dba KleavorPokedexEntry dba JynxPokedexEntry + dba BuuPokedexEntry dba ElectabuzzPokedexEntry dba MagmarPokedexEntry dba PinsirPokedexEntry @@ -321,6 +322,7 @@ PokedexDataPointerTable: dba Porygon2PokedexEntry dba StantlerPokedexEntry dba SmearglePokedexEntry + dba GrenmarPokedexEntry dba TyroguePokedexEntry dba HitmontopPokedexEntry dba SmoochumPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index bb31a43..83d354b 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -36,6 +36,7 @@ AlphabeticalPokedexOrder: dw BULBASAUR dw BURGELA dw BUTTERFREE + dw BUU dw CACAWPHONY dw CALFLAC dw CARAPTHOR @@ -123,6 +124,7 @@ AlphabeticalPokedexOrder: dw GRANBULL dw GRAVELER dw GREAT_TUSK + dw GRENMAR dw GRIMER dw GROWLITHE dw GYARADOS diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 6ab3137..616238e 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -203,10 +203,12 @@ NewPokedexOrder: dw MAGMAR dw SMOOCHUM dw JYNX + dw BUU dw ELEKID dw ELECTABUZZ dw MR__MIME dw SMEARGLE + dw GRENMAR dw FARFETCH_D dw LUXWAN dw NATU diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 9bbb71e..f4ba6c1 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -124,6 +124,7 @@ EggMovePointers2:: dw NoEggMoves2 dw StantlerEggMoves dw NoEggMoves2 + dw GrenmarEggMoves dw TyrogueEggMoves dw NoEggMoves2 dw SmoochumEggMoves @@ -569,6 +570,15 @@ StantlerEggMoves: dw BITE dw -1 ; end +GrenmarEggMoves: + dw DISABLE + dw ENCORE + dw PERISH_SONG + dw RAPID_SPIN + dw SING + dw SLAM + dw -1 + TyrogueEggMoves: dw RAPID_SPIN dw HI_JUMP_KICK diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index d4fa95c..54ae44f 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -168,6 +168,7 @@ EggMovePointers1: dw ScytherEggMoves dw NoEggMoves1 ; Kleavor dw NoEggMoves1 + dw BuuEggMoves dw NoEggMoves1 dw NoEggMoves1 dw PinsirEggMoves @@ -645,6 +646,14 @@ ScytherEggMoves: dw LIGHT_SCREEN dw -1 ; end +BuuEggMoves: + dw BARRIER + dw CROSS_CHOP + dw KARATE_CHOP + dw SCREECH + dw ROLLING_KICK + dw -1 + PinsirEggMoves: dw FURY_ATTACK dw FLAIL diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 3ebceac..4c41c5c 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -123,6 +123,7 @@ EvosAttacksPointers2:: dw Porygon2EvosAttacks dw StantlerEvosAttacks dw SmeargleEvosAttacks + dw GrenmarEvosAttacks dw TyrogueEvosAttacks dw HitmontopEvosAttacks dw SmoochumEvosAttacks @@ -1772,6 +1773,19 @@ SmeargleEvosAttacks: dbw 91, SKETCH db 0 ; no more level-up moves +GrenmarEvosAttacks: + db 0 + dbw 1, TACKLE + dbw 1, DEFENSE_CURL + dbw 9, TAIL_WHIP + dbw 17, WATER_GUN + dbw 25, BARRAGE + dbw 33, FLAME_WHEEL + dbw 41, SMOG + dbw 49, TAKE_DOWN + dbw 57, HYDRO_PUMP + db 0 + TyrogueEvosAttacks: dbbbw EVOLVE_STAT, 20, ATK_LT_DEF, HITMONCHAN dbbbw EVOLVE_STAT, 20, ATK_GT_DEF, HITMONLEE diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 6dae85d..a9b3f3c 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -168,6 +168,7 @@ EvosAttacksPointers1:: dw ScytherEvosAttacks dw KleavorEvosAttacks dw JynxEvosAttacks + dw BuuEvosAttacks dw ElectabuzzEvosAttacks dw MagmarEvosAttacks dw PinsirEvosAttacks @@ -2507,6 +2508,21 @@ JynxEvosAttacks: dbw 57, BLIZZARD db 0 ; no more level-up moves +BuuEvosAttacks: + db 0 + dbw 1, AURORA_BEAM + dbw 6, LEER + dbw 11, ICE_PUNCH + dbw 16, MIST + dbw 21, DIZZY_PUNCH + dbw 27, FAINT_ATTACK + dbw 32, DISABLE + dbw 39, PURSUIT + dbw 45, HAZE + dbw 51, ICE_BEAM + dbw 58, BLIZZARD + db 0 + ElectabuzzEvosAttacks: db 0 ; no more evolutions dbw 1, QUICK_ATTACK diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index 17f9498..f66e64a 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -168,6 +168,7 @@ FirstEvoStages:: dw SCYTHER dw SCYTHER dw SMOOCHUM + dw BUU dw ELEKID dw MAGBY dw PINSIR @@ -321,6 +322,7 @@ FirstEvoStages:: dw PORYGON dw STANTLER dw SMEARGLE + dw GRENMAR dw TYROGUE dw TYROGUE dw SMOOCHUM diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 49ec924..d3233fe 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -169,6 +169,7 @@ KantoMonSpecials: db 55 ; SCYTHER db 45 ; KLEAVOR db 95 ; JYNX + db 85 ; BUU db 85 ; ELECTABUZZ db 85 ; MAGMAR db 55 ; PINSIR diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index ee7896f..72e665b 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -372,4 +372,6 @@ Pokered_MonIndices: db MAGNETITE db MAGNEZONE db GAVILLAIN + db BUU + db GRENMAR assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 00c4ed1..c32a73a 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -169,6 +169,7 @@ MonMenuIcons: db ICON_BUG ; SCYTHER db ICON_BUG ; KLEAVOR db ICON_HUMANSHAPE ; JYNX + db ICON_HUMANSHAPE ; BUU db ICON_HUMANSHAPE ; ELECTABUZZ db ICON_HUMANSHAPE ; MAGMAR db ICON_BUG ; PINSIR @@ -322,6 +323,7 @@ MonMenuIcons: db ICON_VOLTORB ; PORYGON2 db ICON_EQUINE ; STANTLER db ICON_MONSTER ; SMEARGLE + db ICON_LAPRAS ; GRENMAR db ICON_FIGHTER ; TYROGUE db ICON_FIGHTER ; HITMONTOP db ICON_HUMANSHAPE ; SMOOCHUM diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 19884f6..4163037 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -171,6 +171,7 @@ PokemonNames:: db "SCYTHER@@@" db "KLEAVOR@@@" db "JYNX@@@@@@" + db "BUU@@@@@@@" db "ELECTABUZZ" db "MAGMAR@@@@" db "PINSIR@@@@" @@ -324,6 +325,7 @@ PokemonNames:: db "PORYGON2@@" db "STANTLER@@" db "SMEARGLE@@" + db "GRENMAR@@@" db "TYROGUE@@@" db "HITMONTOP@" db "SMOOCHUM@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 22558ba..5463846 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -367,6 +367,8 @@ 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/buu/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/buu/shiny.pal" INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/electabuzz/shiny.pal" INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors @@ -673,6 +675,8 @@ INCBIN "gfx/pokemon/stantler/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/stantler/shiny.pal" INCBIN "gfx/pokemon/smeargle/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/smeargle/shiny.pal" +INCBIN "gfx/pokemon/grenmar/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/grenmar/shiny.pal" INCBIN "gfx/pokemon/tyrogue/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tyrogue/shiny.pal" INCBIN "gfx/pokemon/hitmontop/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 9c3ba64..485c571 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -347,6 +347,8 @@ PokemonPicPointers:: dba KleavorBackpic dba JynxFrontpic dba JynxBackpic + dba BuuFrontpic + dba BuuBackpic dba ElectabuzzFrontpic dba ElectabuzzBackpic dba MagmarFrontpic @@ -656,6 +658,8 @@ PokemonPicPointers:: dba StantlerBackpic dba SmeargleFrontpic dba SmeargleBackpic + dba GrenmarFrontpic + dba GrenmarBackpic dba TyrogueFrontpic dba TyrogueBackpic dba HitmontopFrontpic diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index e702c18..1e006de 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -82,7 +82,7 @@ PryceGroup: dw DELIBIRD dw PRESENT, ICY_WIND, RAPID_SPIN, RAIN_DANCE ; Rain Dance can make Fire moves worse ig? Spikes is cool but it's an event move - do we want that? db 33 - dw SEEL ; BUU + dw BUU dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST db 35 dw DEWGONG @@ -3000,6 +3000,8 @@ SwimmerFGroup: db "DENISE@", TRAINERTYPE_NORMAL db 22 dw SEEL + db 23 + dw GRENMAR db -1 ; end next_list_item ; SWIMMERF (6) @@ -3087,7 +3089,7 @@ SwimmerFGroup: db 28 dw SEEL db 28 - dw SEEL + dw GRENMAR db 28 dw DEWGONG db -1 ; end @@ -4912,7 +4914,7 @@ BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam. db 30 dw CLOYSTER db 26 - dw SHELLDER ; BUU + dw BUU db -1 ; end end_list_items diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 41189be..a08ce70 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -499,24 +499,24 @@ JohtoGrassWildMons: dbw 24, RIBBITO dbw 26, AZUMARILL dbw 25, GRAVELER - dbw 26, ONIX ; GRENMAR - dbw 27, ONIX ; GRENMAR + dbw 26, GRENMAR + dbw 27, GRENMAR ; day dbw 26, GRAVELER dbw 25, GOLBAT dbw 24, RIBBITO dbw 26, AZUMARILL dbw 25, GRAVELER - dbw 26, ONIX ; GRENMAR - dbw 27, ONIX ; GRENMAR + dbw 26, GRENMAR + dbw 27, GRENMAR ; nite dbw 26, GRAVELER dbw 25, GOLBAT dbw 24, QUAGSIRE dbw 26, AZUMARILL dbw 25, GRAVELER - dbw 26, ONIX ; GRENMAR - dbw 27, ONIX ; GRENMAR + dbw 26, GRENMAR + dbw 27, GRENMAR end_grass_wildmons def_grass_wildmons SLOWPOKE_WELL_B1F @@ -620,7 +620,7 @@ JohtoGrassWildMons: dbw 21, KOTORA dbw 19, GEODUDE dbw 20, RATICATE - dbw 20, RATICATE ; GRENMAR + dbw 20, GRENMAR ; day dbw 19, RATTATA dbw 22, KOTORA @@ -628,7 +628,7 @@ JohtoGrassWildMons: dbw 21, KOTORA dbw 19, GEODUDE dbw 20, RATICATE - dbw 20, RATICATE ; GRENMAR + dbw 20, GRENMAR ; nite dbw 18, RATTATA dbw 22, ZUBAT @@ -636,7 +636,7 @@ JohtoGrassWildMons: dbw 22, GOLBAT dbw 19, GEODUDE dbw 20, RATICATE - dbw 20, RATICATE ; GRENMAR + dbw 20, GRENMAR end_grass_wildmons ; Also, Larvitar is available in the morning and daytime, unless it's B2F, wherein it's all-day. @@ -647,7 +647,7 @@ JohtoGrassWildMons: dbw 18, GEODUDE dbw 19, RATTATA dbw 20, MACHOP - dbw 20, RATICATE ; GRENMAR? + dbw 20, GRENMAR dbw 22, MARILL dbw 22, LARVITAR dbw 23, LARVITAR @@ -655,14 +655,14 @@ JohtoGrassWildMons: dbw 18, GEODUDE dbw 19, RATTATA dbw 20, MACHOP - dbw 20, RATICATE ; GRENMAR? + dbw 20, GRENMAR dbw 22, MARILL dbw 22, LARVITAR dbw 23, LARVITAR ; nite dbw 18, GEODUDE dbw 19, RATTATA - dbw 20, RATICATE ; GRENMAR? + dbw 20, GRENMAR dbw 22, ZUBAT dbw 21, MARILL dbw 22, GOLBAT @@ -675,7 +675,7 @@ JohtoGrassWildMons: dbw 41, GRAVELER dbw 42, MACHOKE dbw 41, GEODUDE - dbw 40, RATICATE ; GRENMAR? + dbw 40, GRENMAR dbw 48, MARILL dbw 40, PUPITAR dbw 40, PUPITAR @@ -683,14 +683,14 @@ JohtoGrassWildMons: dbw 41, GRAVELER dbw 42, MACHOKE dbw 41, GEODUDE - dbw 40, RATICATE ; GRENMAR? + dbw 40, GRENMAR dbw 48, MARILL dbw 40, PUPITAR dbw 40, PUPITAR ; nite dbw 41, GRAVELER dbw 41, GEODUDE - dbw 40, RATICATE ; GRENMAR? + dbw 40, GRENMAR dbw 40, GOLBAT dbw 48, AZUMARILL dbw 42, GOLBAT @@ -704,7 +704,7 @@ JohtoGrassWildMons: dbw 20, ZUBAT dbw 23, GOLBAT dbw 21, MARILL - dbw 20, GEODUDE ; GRENMAR? + dbw 20, GRENMAR dbw 24, LARVITAR dbw 24, LARVITAR ; day @@ -712,7 +712,7 @@ JohtoGrassWildMons: dbw 20, ZUBAT dbw 23, GOLBAT dbw 21, MARILL - dbw 20, GEODUDE ; GRENMAR? + dbw 20, GRENMAR dbw 24, LARVITAR dbw 24, LARVITAR ; nite @@ -720,7 +720,7 @@ JohtoGrassWildMons: dbw 20, ZUBAT dbw 23, GOLBAT dbw 21, MARILL - dbw 20, GEODUDE ; GRENMAR? + dbw 20, GRENMAR dbw 24, LARVITAR dbw 24, LARVITAR end_grass_wildmons diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 5402182..c946dde 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -53,23 +53,23 @@ JohtoWaterWildMons: def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE db 4 percent ; encounter rate - dbw 15, GOLDEEN - dbw 20, MARILL - dbw 20, SEAKING + dbw 23, SEAKING + dbw 25, MARILL + dbw 25, GRENMAR end_water_wildmons def_water_wildmons MOUNT_MORTAR_2F_INSIDE db 2 percent ; encounter rate - dbw 20, GOLDEEN + dbw 23, SEAKING dbw 25, MARILL - dbw 25, SEAKING + dbw 25, GRENMAR end_water_wildmons def_water_wildmons MOUNT_MORTAR_B1F db 2 percent ; encounter rate - dbw 15, GOLDEEN - dbw 20, MARILL - dbw 20, SEAKING + dbw 23, SEAKING + dbw 25, MARILL + dbw 25, GRENMAR end_water_wildmons def_water_wildmons WHIRL_ISLAND_SW diff --git a/gfx/font.asm b/gfx/font.asm index 5666563..9828370 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -32,19 +32,10 @@ INCBIN "gfx/battle/expbar.2bpp" TownMapGFX: INCBIN "gfx/pokegear/town_map.2bpp.lz" -UnusedWeekdayKanjiGFX: ; unreferenced -INCBIN "gfx/font/unused_weekday_kanji.2bpp" - -UnusedBoldFontGFX: ; unreferenced -INCBIN "gfx/font/unused_bold_font.1bpp" - TextboxSpaceGFX: ; StatsScreen_LoadTextboxSpaceGFX reads 2bpp; LoadFrame reads first half as 1bpp INCBIN "gfx/font/space.2bpp" -UnusedUpArrowGFX: ; unreferenced -INCBIN "gfx/font/unused_up_arrow.1bpp" - MobilePhoneTilesGFX: INCBIN "gfx/mobile/phone_tiles.2bpp" diff --git a/gfx/footprints.asm b/gfx/footprints.asm index ec16292..f986431 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -168,6 +168,7 @@ INCBIN "gfx/footprints/mr__mime.1bpp" INCBIN "gfx/footprints/scyther.1bpp" INCBIN "gfx/footprints/kleavor.1bpp" INCBIN "gfx/footprints/jynx.1bpp" +INCBIN "gfx/footprints/buu.1bpp" INCBIN "gfx/footprints/electabuzz.1bpp" INCBIN "gfx/footprints/magmar.1bpp" INCBIN "gfx/footprints/pinsir.1bpp" @@ -321,6 +322,7 @@ INCBIN "gfx/footprints/donphan.1bpp" INCBIN "gfx/footprints/porygon2.1bpp" INCBIN "gfx/footprints/stantler.1bpp" INCBIN "gfx/footprints/smeargle.1bpp" +INCBIN "gfx/footprints/grenmar.1bpp" INCBIN "gfx/footprints/tyrogue.1bpp" INCBIN "gfx/footprints/hitmontop.1bpp" INCBIN "gfx/footprints/smoochum.1bpp" diff --git a/gfx/footprints/buu.png b/gfx/footprints/buu.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/footprints/grenmar.png b/gfx/footprints/grenmar.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 3d271dc..a6b75eb 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -982,3 +982,7 @@ MagnezoneFrontpic: INCBIN "gfx/pokemon/magnezone/front.animated.2bpp.lz" MagnezoneBackpic: INCBIN "gfx/pokemon/magnezone/back.2bpp.lz" GavillainFrontpic: INCBIN "gfx/pokemon/gavillain/front.animated.2bpp.lz" GavillainBackpic: INCBIN "gfx/pokemon/gavillain/back.2bpp.lz" +BuuFrontpic: INCBIN "gfx/pokemon/buu/front.animated.2bpp.lz" +BuuBackpic: INCBIN "gfx/pokemon/buu/back.2bpp.lz" +GrenmarFrontpic: INCBIN "gfx/pokemon/grenmar/front.animated.2bpp.lz" +GrenmarBackpic: INCBIN "gfx/pokemon/grenmar/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 3c3e8be..c77412c 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -167,6 +167,7 @@ AnimationPointers: dw ScytherAnimation dw KleavorAnimation dw JynxAnimation + dw BuuAnimation dw ElectabuzzAnimation dw MagmarAnimation dw PinsirAnimation @@ -320,6 +321,7 @@ AnimationPointers: dw Porygon2Animation dw StantlerAnimation dw SmeargleAnimation + dw GrenmarAnimation dw TyrogueAnimation dw HitmontopAnimation dw SmoochumAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 7f1e515..acc235f 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -165,6 +165,7 @@ 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" +BuuAnimation: INCLUDE "gfx/pokemon/buu/anim.asm" ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm" MagmarAnimation: INCLUDE "gfx/pokemon/magmar/anim.asm" PinsirAnimation: INCLUDE "gfx/pokemon/pinsir/anim.asm" @@ -318,6 +319,7 @@ DonphanAnimation: INCLUDE "gfx/pokemon/donphan/anim.asm" Porygon2Animation: INCLUDE "gfx/pokemon/porygon2/anim.asm" StantlerAnimation: INCLUDE "gfx/pokemon/stantler/anim.asm" SmeargleAnimation: INCLUDE "gfx/pokemon/smeargle/anim.asm" +GrenmarAnimation: INCLUDE "gfx/pokemon/grenmar/anim.asm" TyrogueAnimation: INCLUDE "gfx/pokemon/tyrogue/anim.asm" HitmontopAnimation: INCLUDE "gfx/pokemon/hitmontop/anim.asm" SmoochumAnimation: INCLUDE "gfx/pokemon/smoochum/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index b8e1d8b..3024905 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -167,6 +167,7 @@ BitmasksPointers: dw ScytherBitmasks dw KleavorBitmasks dw JynxBitmasks + dw BuuBitmasks dw ElectabuzzBitmasks dw MagmarBitmasks dw PinsirBitmasks @@ -320,6 +321,7 @@ BitmasksPointers: dw Porygon2Bitmasks dw StantlerBitmasks dw SmeargleBitmasks + dw GrenmarBitmasks dw TyrogueBitmasks dw HitmontopBitmasks dw SmoochumBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index ba9205a..52df4e5 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -165,6 +165,7 @@ 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" +BuuBitmasks: INCLUDE "gfx/pokemon/buu/bitmask.asm" ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm" MagmarBitmasks: INCLUDE "gfx/pokemon/magmar/bitmask.asm" PinsirBitmasks: INCLUDE "gfx/pokemon/pinsir/bitmask.asm" @@ -318,6 +319,7 @@ DonphanBitmasks: INCLUDE "gfx/pokemon/donphan/bitmask.asm" Porygon2Bitmasks: INCLUDE "gfx/pokemon/porygon2/bitmask.asm" StantlerBitmasks: INCLUDE "gfx/pokemon/stantler/bitmask.asm" SmeargleBitmasks: INCLUDE "gfx/pokemon/smeargle/bitmask.asm" +GrenmarBitmasks: INCLUDE "gfx/pokemon/grenmar/bitmask.asm" TyrogueBitmasks: INCLUDE "gfx/pokemon/tyrogue/bitmask.asm" HitmontopBitmasks: INCLUDE "gfx/pokemon/hitmontop/bitmask.asm" SmoochumBitmasks: INCLUDE "gfx/pokemon/smoochum/bitmask.asm" diff --git a/gfx/pokemon/buu/anim.asm b/gfx/pokemon/buu/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/buu/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/buu/anim_idle.asm b/gfx/pokemon/buu/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/buu/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/buu/back.png b/gfx/pokemon/buu/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/buu/shiny.pal b/gfx/pokemon/buu/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/buu/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 5ba2339..c44777c 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -167,6 +167,7 @@ FramesPointers: dba ScytherFrames dba KleavorFrames dba JynxFrames + dba BuuFrames dba ElectabuzzFrames dba MagmarFrames dba PinsirFrames @@ -320,6 +321,7 @@ FramesPointers: dba Porygon2Frames dba StantlerFrames dba SmeargleFrames + dba GrenmarFrames dba TyrogueFrames dba HitmontopFrames dba SmoochumFrames diff --git a/gfx/pokemon/grenmar/anim.asm b/gfx/pokemon/grenmar/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/grenmar/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/grenmar/anim_idle.asm b/gfx/pokemon/grenmar/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/grenmar/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/grenmar/back.png b/gfx/pokemon/grenmar/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/grenmar/shiny.pal b/gfx/pokemon/grenmar/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/grenmar/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/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index cb93fbf..8355535 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -167,6 +167,7 @@ AnimationIdlePointers: dw ScytherAnimationIdle dw KleavorAnimationIdle dw JynxAnimationIdle + dw BuuAnimationIdle dw ElectabuzzAnimationIdle dw MagmarAnimationIdle dw PinsirAnimationIdle @@ -320,6 +321,7 @@ AnimationIdlePointers: dw Porygon2AnimationIdle dw StantlerAnimationIdle dw SmeargleAnimationIdle + dw GrenmarAnimationIdle dw TyrogueAnimationIdle dw HitmontopAnimationIdle dw SmoochumAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index b4e02a9..3bbbea7 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -165,6 +165,7 @@ 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" +BuuAnimationIdle: INCLUDE "gfx/pokemon/buu/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" @@ -318,6 +319,7 @@ DonphanAnimationIdle: INCLUDE "gfx/pokemon/donphan/anim_idle.asm" Porygon2AnimationIdle: INCLUDE "gfx/pokemon/porygon2/anim_idle.asm" StantlerAnimationIdle: INCLUDE "gfx/pokemon/stantler/anim_idle.asm" SmeargleAnimationIdle: INCLUDE "gfx/pokemon/smeargle/anim_idle.asm" +GrenmarAnimationIdle: INCLUDE "gfx/pokemon/grenmar/anim_idle.asm" TyrogueAnimationIdle: INCLUDE "gfx/pokemon/tyrogue/anim_idle.asm" HitmontopAnimationIdle: INCLUDE "gfx/pokemon/hitmontop/anim_idle.asm" SmoochumAnimationIdle: INCLUDE "gfx/pokemon/smoochum/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 3040f2c..a87d141 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -122,6 +122,7 @@ DonphanFrames: INCLUDE "gfx/pokemon/donphan/frames.asm" Porygon2Frames: INCLUDE "gfx/pokemon/porygon2/frames.asm" StantlerFrames: INCLUDE "gfx/pokemon/stantler/frames.asm" SmeargleFrames: INCLUDE "gfx/pokemon/smeargle/frames.asm" +GrenmarFrames: INCLUDE "gfx/pokemon/grenmar/frames.asm" TyrogueFrames: INCLUDE "gfx/pokemon/tyrogue/frames.asm" HitmontopFrames: INCLUDE "gfx/pokemon/hitmontop/frames.asm" SmoochumFrames: INCLUDE "gfx/pokemon/smoochum/frames.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 79c6f0f..8353524 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -167,6 +167,7 @@ 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" +BuuFrames: INCLUDE "gfx/pokemon/buu/frames.asm" ElectabuzzFrames: INCLUDE "gfx/pokemon/electabuzz/frames.asm" MagmarFrames: INCLUDE "gfx/pokemon/magmar/frames.asm" PinsirFrames: INCLUDE "gfx/pokemon/pinsir/frames.asm"