From e85c0ac4d63f8ae771fceaeff0ddfda64baaca1f Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 19 Nov 2023 01:09:06 -0500 Subject: [PATCH 1/3] The Road To Violet City! --- constants/item_constants.asm | 2 +- constants/move_constants.asm | 1 + constants/pokemon_constants.asm | 11 ++ data/items/attributes.asm | 4 +- data/items/descriptions.asm | 6 +- data/items/names.asm | 2 +- data/moves/animations.asm | 23 +++ data/moves/descriptions.asm | 5 + data/moves/moves.asm | 1 + data/moves/names.asm | 1 + data/pokemon/base_stats.asm | 11 ++ data/pokemon/base_stats/aercrow.asm | 21 +++ data/pokemon/base_stats/belledam.asm | 21 +++ data/pokemon/base_stats/bipulla.asm | 21 +++ data/pokemon/base_stats/calflac.asm | 21 +++ data/pokemon/base_stats/dudunsparce.asm | 21 +++ data/pokemon/base_stats/farigiraf.asm | 21 +++ data/pokemon/base_stats/girafarig.asm | 2 +- data/pokemon/base_stats/mismagius.asm | 21 +++ data/pokemon/base_stats/moibelle.asm | 21 +++ data/pokemon/base_stats/phandarin.asm | 21 +++ data/pokemon/base_stats/stromen.asm | 21 +++ data/pokemon/base_stats/ursaluna.asm | 21 +++ data/pokemon/cries.asm | 11 ++ data/pokemon/dex_entries.asm | 11 ++ data/pokemon/dex_entries/aercrow.asm | 10 ++ data/pokemon/dex_entries/belledam.asm | 10 ++ data/pokemon/dex_entries/bipulla.asm | 10 ++ data/pokemon/dex_entries/calflac.asm | 10 ++ data/pokemon/dex_entries/dudunsparce.asm | 10 ++ data/pokemon/dex_entries/farigiraf.asm | 10 ++ data/pokemon/dex_entries/mismagius.asm | 10 ++ data/pokemon/dex_entries/moibelle.asm | 10 ++ data/pokemon/dex_entries/phandarin.asm | 10 ++ data/pokemon/dex_entries/stromen.asm | 10 ++ data/pokemon/dex_entries/ursaluna.asm | 10 ++ data/pokemon/dex_entry_pointers.asm | 11 ++ data/pokemon/dex_order_alpha.asm | 11 ++ data/pokemon/dex_order_new.asm | 11 ++ data/pokemon/egg_moves_johto.asm | 36 ++++- data/pokemon/evos_attacks_johto.asm | 195 +++++++++++++++++++++-- data/pokemon/first_stages.asm | 13 +- data/pokemon/gen1_order.asm | 11 ++ data/pokemon/menu_icons.asm | 13 +- data/pokemon/names.asm | 11 ++ data/pokemon/palettes.asm | 22 +++ data/pokemon/pic_pointers.asm | 22 +++ data/wild/johto_grass.asm | 182 ++++++++++----------- engine/items/item_effects.asm | 2 +- gfx/footprints.asm | 11 ++ gfx/footprints/aercrow.png | Bin 0 -> 74 bytes gfx/footprints/belledam.png | Bin 0 -> 93 bytes gfx/footprints/bipulla.png | Bin 0 -> 69 bytes gfx/footprints/calflac.png | Bin 0 -> 80 bytes gfx/footprints/dudunsparce.png | Bin 0 -> 69 bytes gfx/footprints/farigiraf.png | Bin 0 -> 80 bytes gfx/footprints/mismagius.png | Bin 0 -> 69 bytes gfx/footprints/moibelle.png | Bin 0 -> 93 bytes gfx/footprints/phandarin.png | Bin 0 -> 84 bytes gfx/footprints/stromen.png | Bin 0 -> 84 bytes gfx/footprints/ursaluna.png | Bin 0 -> 104 bytes gfx/pics.asm | 22 +++ gfx/pokemon/aercrow/anim.asm | 1 + gfx/pokemon/aercrow/anim_idle.asm | 1 + gfx/pokemon/aercrow/back.png | Bin 0 -> 304 bytes gfx/pokemon/aercrow/front.png | Bin 0 -> 315 bytes gfx/pokemon/aercrow/shiny.pal | 2 + gfx/pokemon/anim_pointers.asm | 11 ++ gfx/pokemon/anims.asm | 11 ++ gfx/pokemon/belledam/anim.asm | 1 + gfx/pokemon/belledam/anim_idle.asm | 1 + gfx/pokemon/belledam/back.png | Bin 0 -> 304 bytes gfx/pokemon/belledam/front.png | Bin 0 -> 315 bytes gfx/pokemon/belledam/shiny.pal | 2 + gfx/pokemon/bipulla/anim.asm | 1 + gfx/pokemon/bipulla/anim_idle.asm | 1 + gfx/pokemon/bipulla/back.png | Bin 0 -> 304 bytes gfx/pokemon/bipulla/front.png | Bin 0 -> 315 bytes gfx/pokemon/bipulla/shiny.pal | 2 + gfx/pokemon/bitmask_pointers.asm | 11 ++ gfx/pokemon/bitmasks.asm | 11 ++ gfx/pokemon/calflac/anim.asm | 1 + gfx/pokemon/calflac/anim_idle.asm | 1 + gfx/pokemon/calflac/back.png | Bin 0 -> 304 bytes gfx/pokemon/calflac/front.png | Bin 0 -> 315 bytes gfx/pokemon/calflac/shiny.pal | 2 + gfx/pokemon/dudunsparce/anim.asm | 1 + gfx/pokemon/dudunsparce/anim_idle.asm | 1 + gfx/pokemon/dudunsparce/back.png | Bin 0 -> 304 bytes gfx/pokemon/dudunsparce/front.png | Bin 0 -> 315 bytes gfx/pokemon/dudunsparce/shiny.pal | 2 + gfx/pokemon/farigiraf/anim.asm | 1 + gfx/pokemon/farigiraf/anim_idle.asm | 1 + gfx/pokemon/farigiraf/back.png | Bin 0 -> 304 bytes gfx/pokemon/farigiraf/front.png | Bin 0 -> 315 bytes gfx/pokemon/farigiraf/shiny.pal | 2 + gfx/pokemon/frame_pointers.asm | 11 ++ gfx/pokemon/idle_pointers.asm | 11 ++ gfx/pokemon/idles.asm | 11 ++ gfx/pokemon/johto_frames.asm | 11 ++ gfx/pokemon/mismagius/anim.asm | 1 + gfx/pokemon/mismagius/anim_idle.asm | 1 + gfx/pokemon/mismagius/back.png | Bin 0 -> 304 bytes gfx/pokemon/mismagius/front.png | Bin 0 -> 315 bytes gfx/pokemon/mismagius/shiny.pal | 2 + gfx/pokemon/moibelle/anim.asm | 1 + gfx/pokemon/moibelle/anim_idle.asm | 1 + gfx/pokemon/moibelle/back.png | Bin 0 -> 304 bytes gfx/pokemon/moibelle/front.png | Bin 0 -> 315 bytes gfx/pokemon/moibelle/shiny.pal | 2 + gfx/pokemon/phandarin/anim.asm | 1 + gfx/pokemon/phandarin/anim_idle.asm | 1 + gfx/pokemon/phandarin/back.png | Bin 0 -> 304 bytes gfx/pokemon/phandarin/front.png | Bin 0 -> 315 bytes gfx/pokemon/phandarin/shiny.pal | 2 + gfx/pokemon/stromen/anim.asm | 1 + gfx/pokemon/stromen/anim_idle.asm | 1 + gfx/pokemon/stromen/back.png | Bin 0 -> 304 bytes gfx/pokemon/stromen/front.png | Bin 0 -> 315 bytes gfx/pokemon/stromen/shiny.pal | 2 + gfx/pokemon/ursaluna/anim.asm | 1 + gfx/pokemon/ursaluna/anim_idle.asm | 1 + gfx/pokemon/ursaluna/back.png | Bin 0 -> 304 bytes gfx/pokemon/ursaluna/front.png | Bin 0 -> 315 bytes gfx/pokemon/ursaluna/shiny.pal | 2 + main.asm | 4 +- maps/DebugRoom.asm | 20 +-- 127 files changed, 1034 insertions(+), 127 deletions(-) create mode 100644 data/pokemon/base_stats/aercrow.asm create mode 100644 data/pokemon/base_stats/belledam.asm create mode 100644 data/pokemon/base_stats/bipulla.asm create mode 100644 data/pokemon/base_stats/calflac.asm create mode 100644 data/pokemon/base_stats/dudunsparce.asm create mode 100644 data/pokemon/base_stats/farigiraf.asm create mode 100644 data/pokemon/base_stats/mismagius.asm create mode 100644 data/pokemon/base_stats/moibelle.asm create mode 100644 data/pokemon/base_stats/phandarin.asm create mode 100644 data/pokemon/base_stats/stromen.asm create mode 100644 data/pokemon/base_stats/ursaluna.asm create mode 100644 data/pokemon/dex_entries/aercrow.asm create mode 100644 data/pokemon/dex_entries/belledam.asm create mode 100644 data/pokemon/dex_entries/bipulla.asm create mode 100644 data/pokemon/dex_entries/calflac.asm create mode 100644 data/pokemon/dex_entries/dudunsparce.asm create mode 100644 data/pokemon/dex_entries/farigiraf.asm create mode 100644 data/pokemon/dex_entries/mismagius.asm create mode 100644 data/pokemon/dex_entries/moibelle.asm create mode 100644 data/pokemon/dex_entries/phandarin.asm create mode 100644 data/pokemon/dex_entries/stromen.asm create mode 100644 data/pokemon/dex_entries/ursaluna.asm create mode 100644 gfx/footprints/aercrow.png create mode 100644 gfx/footprints/belledam.png create mode 100644 gfx/footprints/bipulla.png create mode 100644 gfx/footprints/calflac.png create mode 100644 gfx/footprints/dudunsparce.png create mode 100644 gfx/footprints/farigiraf.png create mode 100644 gfx/footprints/mismagius.png create mode 100644 gfx/footprints/moibelle.png create mode 100644 gfx/footprints/phandarin.png create mode 100644 gfx/footprints/stromen.png create mode 100644 gfx/footprints/ursaluna.png create mode 100644 gfx/pokemon/aercrow/anim.asm create mode 100644 gfx/pokemon/aercrow/anim_idle.asm create mode 100644 gfx/pokemon/aercrow/back.png create mode 100644 gfx/pokemon/aercrow/front.png create mode 100644 gfx/pokemon/aercrow/shiny.pal create mode 100644 gfx/pokemon/belledam/anim.asm create mode 100644 gfx/pokemon/belledam/anim_idle.asm create mode 100644 gfx/pokemon/belledam/back.png create mode 100644 gfx/pokemon/belledam/front.png create mode 100644 gfx/pokemon/belledam/shiny.pal create mode 100644 gfx/pokemon/bipulla/anim.asm create mode 100644 gfx/pokemon/bipulla/anim_idle.asm create mode 100644 gfx/pokemon/bipulla/back.png create mode 100644 gfx/pokemon/bipulla/front.png create mode 100644 gfx/pokemon/bipulla/shiny.pal create mode 100644 gfx/pokemon/calflac/anim.asm create mode 100644 gfx/pokemon/calflac/anim_idle.asm create mode 100644 gfx/pokemon/calflac/back.png create mode 100644 gfx/pokemon/calflac/front.png create mode 100644 gfx/pokemon/calflac/shiny.pal create mode 100644 gfx/pokemon/dudunsparce/anim.asm create mode 100644 gfx/pokemon/dudunsparce/anim_idle.asm create mode 100644 gfx/pokemon/dudunsparce/back.png create mode 100644 gfx/pokemon/dudunsparce/front.png create mode 100644 gfx/pokemon/dudunsparce/shiny.pal create mode 100644 gfx/pokemon/farigiraf/anim.asm create mode 100644 gfx/pokemon/farigiraf/anim_idle.asm create mode 100644 gfx/pokemon/farigiraf/back.png create mode 100644 gfx/pokemon/farigiraf/front.png create mode 100644 gfx/pokemon/farigiraf/shiny.pal create mode 100644 gfx/pokemon/mismagius/anim.asm create mode 100644 gfx/pokemon/mismagius/anim_idle.asm create mode 100644 gfx/pokemon/mismagius/back.png create mode 100644 gfx/pokemon/mismagius/front.png create mode 100644 gfx/pokemon/mismagius/shiny.pal create mode 100644 gfx/pokemon/moibelle/anim.asm create mode 100644 gfx/pokemon/moibelle/anim_idle.asm create mode 100644 gfx/pokemon/moibelle/back.png create mode 100644 gfx/pokemon/moibelle/front.png create mode 100644 gfx/pokemon/moibelle/shiny.pal create mode 100644 gfx/pokemon/phandarin/anim.asm create mode 100644 gfx/pokemon/phandarin/anim_idle.asm create mode 100644 gfx/pokemon/phandarin/back.png create mode 100644 gfx/pokemon/phandarin/front.png create mode 100644 gfx/pokemon/phandarin/shiny.pal create mode 100644 gfx/pokemon/stromen/anim.asm create mode 100644 gfx/pokemon/stromen/anim_idle.asm create mode 100644 gfx/pokemon/stromen/back.png create mode 100644 gfx/pokemon/stromen/front.png create mode 100644 gfx/pokemon/stromen/shiny.pal create mode 100644 gfx/pokemon/ursaluna/anim.asm create mode 100644 gfx/pokemon/ursaluna/anim_idle.asm create mode 100644 gfx/pokemon/ursaluna/back.png create mode 100644 gfx/pokemon/ursaluna/front.png create mode 100644 gfx/pokemon/ursaluna/shiny.pal diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 8a4c5b1..eaf6b2c 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -152,7 +152,7 @@ const DRAGON_FANG ; 90 const BLK_AUGURITE ; 91 const LEFTOVERS ; 92 - const ITEM_93 ; 93 + const PEAT_BLOCK ; 93 const ITEM_94 ; 94 const ITEM_95 ; 95 const MYSTERYBERRY ; 96 diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 16d0ef9..c7307ae 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -260,6 +260,7 @@ const ROCK_HEAD const ROCK_SLASH const CROSS_CUTTER + const MEGAPHONE DEF NUM_ATTACKS EQU const_value - 1 if NUM_ATTACKS > $3fff diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 798994c..ee1558e 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -233,6 +233,8 @@ DEF JOHTO_POKEMON EQU const_value const TOGETIC ; b0 const NATU ; b1 const XATU ; b2 + const MOIBELLE + const BELLEDAM const MAREEP ; b3 const FLAAFFY ; b4 const AMPHAROS ; b5 @@ -247,6 +249,7 @@ DEF JOHTO_POKEMON EQU const_value const AIPOM ; be const SUNKERN ; bf const SUNFLORA ; c0 + const AERCROW const YANMA ; c1 const WOOPER ; c2 const QUAGSIRE ; c3 @@ -258,12 +261,19 @@ DEF JOHTO_POKEMON EQU const_value const MURKROW ; c6 const SLOWKING ; c7 const MISDREAVUS ; c8 + const MISMAGIUS + const STROMEN + const PHANDARIN const UNOWN ; c9 const WOBBUFFET ; ca + const BIPULLA + const CALFLAC const GIRAFARIG ; cb + const FARIGIRAF const PINECO ; cc const FORRETRESS ; cd const DUNSPARCE ; ce + const DUDUNSPARCE const GLIGAR ; cf const STEELIX ; d0 const SNUBBULL ; d1 @@ -275,6 +285,7 @@ DEF JOHTO_POKEMON EQU const_value const SNEASEL ; d7 const TEDDIURSA ; d8 const URSARING ; d9 + const URSALUNA const SLUGMA ; da const MAGCARGO ; db const SWINUB ; dc diff --git a/data/items/attributes.asm b/data/items/attributes.asm index aa2d147..0a8d04f 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -301,8 +301,8 @@ ItemAttributes: 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 - item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; PEAT_BLOCK + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ITEM_94 item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_95 diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index 1cf3c49..bff76ec 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -147,7 +147,7 @@ ItemDescriptions: dw DragonFangDesc dw BlkAuguriteDesc dw LeftoversDesc - dw QuestionMarkDesc + dw PeatBlockDesc dw QuestionMarkDesc dw QuestionMarkDesc dw MysteryBerryDesc @@ -959,3 +959,7 @@ ShinyStoneDesc: BlkAuguriteDesc: db "Evolves certain" next "kinds of #MON.@" + +PeatBlockDesc: + db "Evolves certain" + next "kinds of #MON.@" diff --git a/data/items/names.asm b/data/items/names.asm index 0cdfc24..344dd66 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -146,7 +146,7 @@ ItemNames:: li "DRAGON FANG" li "BLK AUGURITE" li "LEFTOVERS" - li "TERU-SAMA" + li "PEAT BLOCK" li "TERU-SAMA" li "TERU-SAMA" li "MYSTERYBERRY" diff --git a/data/moves/animations.asm b/data/moves/animations.asm index bc6d17e..c6b4786 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -282,6 +282,7 @@ BattleAnimations:: dw BattleAnim_RockHead dw BattleAnim_RockSlash dw BattleAnim_CrossCutter + dw BattleAnim_Megaphone assert_table_length NUM_ATTACKS + 1 dw BattleAnim_SweetScent2 @@ -4634,6 +4635,28 @@ BattleAnim_CrossCutter: ;uses the Cross Chop animation anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10 anim_wait 16 anim_ret + +BattleAnim_Megaphone: ;uses the Growl animation + anim_1gfx ANIM_GFX_NOISE + anim_battlergfx_2row + anim_bgeffect ANIM_BG_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0 + anim_cry $0 +.loop + anim_call BattleAnimSub_Sound + anim_wait 16 + anim_loop 3, .loop + anim_wait 9 + anim_bgeffect ANIM_BG_BATTLEROBJ_1ROW, $0, BG_EFFECT_USER, $0 + anim_wait 8 + anim_bgeffect ANIM_BG_FADE_MON_TO_BLACK_REPEATING, $0, BG_EFFECT_TARGET, $40 + anim_wait 64 + anim_incbgeffect ANIM_BG_FADE_MON_TO_BLACK_REPEATING + anim_wait 1 + anim_bgeffect ANIM_BG_SHOW_MON, $0, BG_EFFECT_USER, $0 + anim_wait 5 + anim_incobj 10 + anim_wait 8 + anim_ret BattleAnimSub_Drain: anim_obj ANIM_OBJ_DRAIN, 132, 44, $0 diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index 8638f1c..6b9067c 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -259,6 +259,7 @@ MoveDescriptions1: dw RockHeadDescription dw RockSlashDescription dw CrossCutterDescription + dw MegaphoneDescription .IndirectEnd:: InvalidMoveDescription: @@ -1279,3 +1280,7 @@ RockSlashDescription: CrossCutterDescription: db "Has a high criti-" next "cal hit ratio.@" + +MegaphoneDescription: + db "Reduces the foe's" + next "SPCL.ATK.@" diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 0f6e8c1..8f03d71 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -272,4 +272,5 @@ Moves1: 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 + move EFFECT_SP_ATK_DOWN, 0, NORMAL, 100, 40, 0 ;MEGAPHONE .IndirectEnd:: diff --git a/data/moves/names.asm b/data/moves/names.asm index 612b2e4..55a0598 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -254,4 +254,5 @@ MoveNames:: li "ROCK HEAD" li "ROCK SLASH" li "CROSS CUTTER" + li "MEGAPHONE" assert_list_length NUM_ATTACKS diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 3ef7b3e..e1b3fb4 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -240,6 +240,8 @@ INCLUDE "data/pokemon/base_stats/togepi.asm" INCLUDE "data/pokemon/base_stats/togetic.asm" INCLUDE "data/pokemon/base_stats/natu.asm" INCLUDE "data/pokemon/base_stats/xatu.asm" +INCLUDE "data/pokemon/base_stats/moibelle.asm" +INCLUDE "data/pokemon/base_stats/belledam.asm" INCLUDE "data/pokemon/base_stats/mareep.asm" INCLUDE "data/pokemon/base_stats/flaaffy.asm" INCLUDE "data/pokemon/base_stats/ampharos.asm" @@ -254,6 +256,7 @@ INCLUDE "data/pokemon/base_stats/jumpluff.asm" INCLUDE "data/pokemon/base_stats/aipom.asm" INCLUDE "data/pokemon/base_stats/sunkern.asm" INCLUDE "data/pokemon/base_stats/sunflora.asm" +INCLUDE "data/pokemon/base_stats/aercrow.asm" INCLUDE "data/pokemon/base_stats/yanma.asm" INCLUDE "data/pokemon/base_stats/wooper.asm" INCLUDE "data/pokemon/base_stats/quagsire.asm" @@ -265,12 +268,19 @@ INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/murkrow.asm" INCLUDE "data/pokemon/base_stats/slowking.asm" INCLUDE "data/pokemon/base_stats/misdreavus.asm" +INCLUDE "data/pokemon/base_stats/mismagius.asm" +INCLUDE "data/pokemon/base_stats/stromen.asm" +INCLUDE "data/pokemon/base_stats/phandarin.asm" INCLUDE "data/pokemon/base_stats/unown.asm" INCLUDE "data/pokemon/base_stats/wobbuffet.asm" +INCLUDE "data/pokemon/base_stats/bipulla.asm" +INCLUDE "data/pokemon/base_stats/calflac.asm" INCLUDE "data/pokemon/base_stats/girafarig.asm" +INCLUDE "data/pokemon/base_stats/farigiraf.asm" INCLUDE "data/pokemon/base_stats/pineco.asm" INCLUDE "data/pokemon/base_stats/forretress.asm" INCLUDE "data/pokemon/base_stats/dunsparce.asm" +INCLUDE "data/pokemon/base_stats/dudunsparce.asm" INCLUDE "data/pokemon/base_stats/gligar.asm" INCLUDE "data/pokemon/base_stats/steelix.asm" INCLUDE "data/pokemon/base_stats/snubbull.asm" @@ -282,6 +292,7 @@ INCLUDE "data/pokemon/base_stats/heracross.asm" INCLUDE "data/pokemon/base_stats/sneasel.asm" INCLUDE "data/pokemon/base_stats/teddiursa.asm" INCLUDE "data/pokemon/base_stats/ursaring.asm" +INCLUDE "data/pokemon/base_stats/ursaluna.asm" INCLUDE "data/pokemon/base_stats/slugma.asm" INCLUDE "data/pokemon/base_stats/magcargo.asm" INCLUDE "data/pokemon/base_stats/swinub.asm" diff --git a/data/pokemon/base_stats/aercrow.asm b/data/pokemon/base_stats/aercrow.asm new file mode 100644 index 0000000..020b7f8 --- /dev/null +++ b/data/pokemon/base_stats/aercrow.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 65, 80, 95, 30, 100, 70 + ; hp atk def spd sat sdf + + db GRASS, FLYING ; type + db 180 ; catch rate + db 98 ; 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/aercrow/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY + ; end diff --git a/data/pokemon/base_stats/belledam.asm b/data/pokemon/base_stats/belledam.asm new file mode 100644 index 0000000..96d187f --- /dev/null +++ b/data/pokemon/base_stats/belledam.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 60, 85, 60, 90, 85, 70 + ; hp atk def spd sat sdf + + db DARK, DARK ; type + db 90 ; catch rate + db 151 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/belledam/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/bipulla.asm b/data/pokemon/base_stats/bipulla.asm new file mode 100644 index 0000000..2b68393 --- /dev/null +++ b/data/pokemon/base_stats/bipulla.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 20, 20, 20, 45, 65, 45 + ; hp atk def spd sat sdf + + db GHOST, GHOST ; type + db 255 ; catch rate + db 67 ; 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/bipulla/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/calflac.asm b/data/pokemon/base_stats/calflac.asm new file mode 100644 index 0000000..39b87b8 --- /dev/null +++ b/data/pokemon/base_stats/calflac.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 40, 40, 40, 65, 75, 55 + ; hp atk def spd sat sdf + + db NORMAL, PSYCHIC_TYPE ; type + db 140 ; catch rate + db 107 ; 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/calflac/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/dudunsparce.asm b/data/pokemon/base_stats/dudunsparce.asm new file mode 100644 index 0000000..fcd68f9 --- /dev/null +++ b/data/pokemon/base_stats/dudunsparce.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 125, 100, 80, 55, 85, 75 + ; hp atk def spd sat sdf + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 182 ; 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/dudunsparce/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/farigiraf.asm b/data/pokemon/base_stats/farigiraf.asm new file mode 100644 index 0000000..b4e42a2 --- /dev/null +++ b/data/pokemon/base_stats/farigiraf.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 120, 90, 70, 60, 110, 70 + ; hp atk def spd sat sdf + + db NORMAL, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 255 ; 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/farigiraf/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 8943eef..2e6f1d3 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -14,7 +14,7 @@ INCBIN "gfx/pokemon/girafarig/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_FAST ; growth rate - dn EGG_GROUND, EGG_GROUND ; egg groups + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT diff --git a/data/pokemon/base_stats/mismagius.asm b/data/pokemon/base_stats/mismagius.asm new file mode 100644 index 0000000..76f5389 --- /dev/null +++ b/data/pokemon/base_stats/mismagius.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 60, 60, 60, 105, 105, 105 + ; hp atk def spd sat sdf + + db GHOST, GHOST ; type + db 45 ; catch rate + db 187 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 25 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/mismagius/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/moibelle.asm b/data/pokemon/base_stats/moibelle.asm new file mode 100644 index 0000000..dc50e13 --- /dev/null +++ b/data/pokemon/base_stats/moibelle.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 40, 65, 40, 70, 65, 50 + ; hp atk def spd sat sdf + + db DARK, DARK ; type + db 255 ; catch rate + db 71 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/moibelle/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/phandarin.asm b/data/pokemon/base_stats/phandarin.asm new file mode 100644 index 0000000..3826895 --- /dev/null +++ b/data/pokemon/base_stats/phandarin.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 85, 85, 70, 60, 50, 50 + ; hp atk def spd sat sdf + + db GHOST, FAIRY ; type + db 45 ; catch rate + db 196 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/phandarin/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/stromen.asm b/data/pokemon/base_stats/stromen.asm new file mode 100644 index 0000000..72f0e77 --- /dev/null +++ b/data/pokemon/base_stats/stromen.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 30, 120, 60, 10, 120, 60 + ; hp atk def spd sat sdf + + db GHOST, DARK ; type + db 90 ; catch rate + db 98 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/stromen/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/ursaluna.asm b/data/pokemon/base_stats/ursaluna.asm new file mode 100644 index 0000000..75106db --- /dev/null +++ b/data/pokemon/base_stats/ursaluna.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 130, 140, 105, 50, 45, 80 + ; hp atk def spd sat sdf + + db GROUND, NORMAL ; type + db 20 ; catch rate + db 255 ; 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/ursaluna/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index b6a489a..7d44062 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -219,6 +219,8 @@ PokemonCries:: mon_cry CRY_TOGETIC, 59, 56 ; TOGETIC mon_cry CRY_NATU, -103, 256 ; NATU mon_cry CRY_NATU, -167, 360 ; XATU + mon_cry CRY_NIDORAN_M, 0, 0 ; MOIBELLE (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; BELLEDAM (incomplete) mon_cry CRY_MAREEP, 34, 216 ; MAREEP mon_cry CRY_MAREEP, -7, 384 ; FLAAFFY mon_cry CRY_AMPHAROS, -124, 232 ; AMPHAROS @@ -233,6 +235,7 @@ PokemonCries:: mon_cry CRY_AIPOM, -81, 232 ; AIPOM mon_cry CRY_MARILL, 299, 184 ; SUNKERN mon_cry CRY_SUNFLORA, -32, 384 ; SUNFLORA + mon_cry CRY_NIDORAN_M, 0, 0 ; AERCROW (incomplete) mon_cry CRY_TOTODILE, 49, 200 ; YANMA mon_cry CRY_WOOPER, 147, 175 ; WOOPER mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE @@ -244,12 +247,19 @@ PokemonCries:: mon_cry CRY_MARILL, -31, 384 ; MURKROW mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS + mon_cry CRY_NIDORAN_M, 0, 0 ; MISMAGIUS (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; STROMEN (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; PHANDARIN (incomplete) mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET + mon_cry CRY_NIDORAN_M, 0, 0 ; BIPULLA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; CALFLAC (incomplete) mon_cry CRY_GIRAFARIG, 65, 512 ; GIRAFARIG + mon_cry CRY_NIDORAN_M, 0, 0 ; FARIGIRAF (incomplete) mon_cry CRY_SLOWKING, 128, 256 ; PINECO mon_cry CRY_SLOWKING, 0, 384 ; FORRETRESS mon_cry CRY_DUNSPARCE, 452, 256 ; DUNSPARCE + mon_cry CRY_NIDORAN_M, 0, 0 ; DUDUNSPARCE (incomplete) mon_cry CRY_GLIGAR, -258, 256 ; GLIGAR mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL @@ -261,6 +271,7 @@ PokemonCries:: mon_cry CRY_WOOPER, 83, 175 ; SNEASEL mon_cry CRY_TEDDIURSA, 1954, 110 ; TEDDIURSA mon_cry CRY_TEDDIURSA, 1600, 216 ; URSARING + mon_cry CRY_NIDORAN_M, 0, 0 ; URSALUNA (incomplete) mon_cry CRY_SLUGMA, -472, 320 ; SLUGMA mon_cry CRY_MAGCARGO, -525, 448 ; MAGCARGO mon_cry CRY_CYNDAQUIL, 510, 320 ; SWINUB diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 6f4ad21..d028b0d 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -221,6 +221,8 @@ TogepiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togepi.asm" TogeticPokedexEntry:: INCLUDE "data/pokemon/dex_entries/togetic.asm" NatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/natu.asm" XatuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xatu.asm" +MoibellePokedexEntry:: INCLUDE "data/pokemon/dex_entries/moibelle.asm" +BelledamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/belledam.asm" MareepPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mareep.asm" FlaaffyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/flaaffy.asm" AmpharosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ampharos.asm" @@ -235,6 +237,7 @@ JumpluffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jumpluff.asm" AipomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aipom.asm" SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunkern.asm" SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" +AercrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/aercrow.asm" SECTION "Pokedex Entries 193-251", ROMX @@ -250,12 +253,19 @@ SylveonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sylveon.asm" MurkrowPokedexEntry:: INCLUDE "data/pokemon/dex_entries/murkrow.asm" SlowkingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slowking.asm" MisdreavusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/misdreavus.asm" +MismagiusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mismagius.asm" +StromenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stromen.asm" +PhandarinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/phandarin.asm" UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm" WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm" +BipullaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bipulla.asm" +CalflacPokedexEntry:: INCLUDE "data/pokemon/dex_entries/calflac.asm" GirafarigPokedexEntry:: INCLUDE "data/pokemon/dex_entries/girafarig.asm" +FarigirafPokedexEntry:: INCLUDE "data/pokemon/dex_entries/farigiraf.asm" PinecoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pineco.asm" ForretressPokedexEntry:: INCLUDE "data/pokemon/dex_entries/forretress.asm" DunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dunsparce.asm" +DudunsparcePokedexEntry:: INCLUDE "data/pokemon/dex_entries/dudunsparce.asm" GligarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gligar.asm" SteelixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/steelix.asm" SnubbullPokedexEntry:: INCLUDE "data/pokemon/dex_entries/snubbull.asm" @@ -267,6 +277,7 @@ HeracrossPokedexEntry:: INCLUDE "data/pokemon/dex_entries/heracross.asm" SneaselPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sneasel.asm" TeddiursaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/teddiursa.asm" UrsaringPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaring.asm" +UrsalunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ursaluna.asm" SlugmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/slugma.asm" MagcargoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magcargo.asm" SwinubPokedexEntry:: INCLUDE "data/pokemon/dex_entries/swinub.asm" diff --git a/data/pokemon/dex_entries/aercrow.asm b/data/pokemon/dex_entries/aercrow.asm new file mode 100644 index 0000000..0b938c4 --- /dev/null +++ b/data/pokemon/dex_entries/aercrow.asm @@ -0,0 +1,10 @@ + db "SCARECROW@" ; species name + dw 311, 191 ; height, weight + + db "It tries to" + next "protect crops from" + next "MURKROW, but its" + + page "FLAIL does little" + next "to dissuade" + next "their raids.@" diff --git a/data/pokemon/dex_entries/belledam.asm b/data/pokemon/dex_entries/belledam.asm new file mode 100644 index 0000000..ff4489b --- /dev/null +++ b/data/pokemon/dex_entries/belledam.asm @@ -0,0 +1,10 @@ + db "BELL@" ; species name + dw 202, 157 ; height, weight + + db "Its fierce eyes" + next "belie a playful" + next "temperment. If" + + page "it rings the bell" + next "on its tail, it's" + next "about to pounce!@" diff --git a/data/pokemon/dex_entries/bipulla.asm b/data/pokemon/dex_entries/bipulla.asm new file mode 100644 index 0000000..6a37473 --- /dev/null +++ b/data/pokemon/dex_entries/bipulla.asm @@ -0,0 +1,10 @@ + db "SPIRAL@" ; species name + dw 211, 2 ; height, weight + + db "Both heads are" + next "constantly swirl-" + next "ing around. For" + + page "unknown reasons," + next "they always move" + next "clockwise.@" diff --git a/data/pokemon/dex_entries/calflac.asm b/data/pokemon/dex_entries/calflac.asm new file mode 100644 index 0000000..503cc86 --- /dev/null +++ b/data/pokemon/dex_entries/calflac.asm @@ -0,0 +1,10 @@ + db "CALF@" ; species name + dw 404, 458 ; height, weight + + db "Formed when" + next "BIPULLA's two" + next "halves joined" + + page "together. However," + next "they still strug-" + next "gle to cooperate.@" diff --git a/data/pokemon/dex_entries/dudunsparce.asm b/data/pokemon/dex_entries/dudunsparce.asm new file mode 100644 index 0000000..0962be6 --- /dev/null +++ b/data/pokemon/dex_entries/dudunsparce.asm @@ -0,0 +1,10 @@ + db "LAND SNAKE@" ; species name + dw 1110, 864 ; height, weight + + db "Lives in deep" + next "burrows. If a" + next "predator enters," + + page "it inflates its" + next "segments and blows" + next "it away with GUST." diff --git a/data/pokemon/dex_entries/farigiraf.asm b/data/pokemon/dex_entries/farigiraf.asm new file mode 100644 index 0000000..a2c2937 --- /dev/null +++ b/data/pokemon/dex_entries/farigiraf.asm @@ -0,0 +1,10 @@ + db "LONG NECK@" ; species name + dw 1006, 3527 ; height, weight + + db "The tail having" + next "consumed the head," + next "the two's minds" + + page "have joined into" + next "one wicked and" + next "snide personality." diff --git a/data/pokemon/dex_entries/mismagius.asm b/data/pokemon/dex_entries/mismagius.asm new file mode 100644 index 0000000..3db574c --- /dev/null +++ b/data/pokemon/dex_entries/mismagius.asm @@ -0,0 +1,10 @@ + db "MAGICAL@" ; species name + dw 211, 97 ; height, weight + + db "It spins illusions" + next "of what its target" + next "desires most," + + page "gleefully feeding" + next "on their" + next "longing dreams.@" diff --git a/data/pokemon/dex_entries/moibelle.asm b/data/pokemon/dex_entries/moibelle.asm new file mode 100644 index 0000000..78d9768 --- /dev/null +++ b/data/pokemon/dex_entries/moibelle.asm @@ -0,0 +1,10 @@ + db "BELL@" ; species name + dw 101, 84 ; height, weight + + db "It often appears" + next "in the night in" + next "homes, meowing for" + + page "food. They often" + next "join the family," + next "willing or not.@" diff --git a/data/pokemon/dex_entries/phandarin.asm b/data/pokemon/dex_entries/phandarin.asm new file mode 100644 index 0000000..11a67ae --- /dev/null +++ b/data/pokemon/dex_entries/phandarin.asm @@ -0,0 +1,10 @@ + db "JIANG-SHI@" ; species name + dw 202, 41 ; height, weight + + db "No longer bound to" + next "a straw doll, its" + next "eerie giggling can" + + page "be heard as it ho-" + next "ps around looking" + next "for life energy.@" diff --git a/data/pokemon/dex_entries/stromen.asm b/data/pokemon/dex_entries/stromen.asm new file mode 100644 index 0000000..5eeae21 --- /dev/null +++ b/data/pokemon/dex_entries/stromen.asm @@ -0,0 +1,10 @@ + db "CURSE@" ; species name + dw 8, 19 ; height, weight + + db "It lives quietly" + next "in places no one" + next "goes near. Rumor" + + page "says that calling" + next "out its name" + next "will curse you.@" diff --git a/data/pokemon/dex_entries/ursaluna.asm b/data/pokemon/dex_entries/ursaluna.asm new file mode 100644 index 0000000..3b03914 --- /dev/null +++ b/data/pokemon/dex_entries/ursaluna.asm @@ -0,0 +1,10 @@ + db "PEAT@" ; species name + dw 710, 6393 ; height, weight + + db "Using its amazing" + next "sense of smell, it" + next "can locate food" + + page "and treasure and" + next "dig them up with" + next "its tough claws.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 8289467..6859a0d 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -214,6 +214,8 @@ PokedexDataPointerTable: dba TogeticPokedexEntry dba NatuPokedexEntry dba XatuPokedexEntry + dba MoibellePokedexEntry + dba BelledamPokedexEntry dba MareepPokedexEntry dba FlaaffyPokedexEntry dba AmpharosPokedexEntry @@ -228,6 +230,7 @@ PokedexDataPointerTable: dba AipomPokedexEntry dba SunkernPokedexEntry dba SunfloraPokedexEntry + dba AercrowPokedexEntry dba YanmaPokedexEntry dba WooperPokedexEntry dba QuagsirePokedexEntry @@ -239,12 +242,19 @@ PokedexDataPointerTable: dba MurkrowPokedexEntry dba SlowkingPokedexEntry dba MisdreavusPokedexEntry + dba MismagiusPokedexEntry + dba StromenPokedexEntry + dba PhandarinPokedexEntry dba UnownPokedexEntry dba WobbuffetPokedexEntry + dba BipullaPokedexEntry + dba CalflacPokedexEntry dba GirafarigPokedexEntry + dba FarigirafPokedexEntry dba PinecoPokedexEntry dba ForretressPokedexEntry dba DunsparcePokedexEntry + dba DudunsparcePokedexEntry dba GligarPokedexEntry dba SteelixPokedexEntry dba SnubbullPokedexEntry @@ -256,6 +266,7 @@ PokedexDataPointerTable: dba SneaselPokedexEntry dba TeddiursaPokedexEntry dba UrsaringPokedexEntry + dba UrsalunaPokedexEntry dba SlugmaPokedexEntry dba MagcargoPokedexEntry dba SwinubPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index f9fb2b0..16aa05f 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -3,6 +3,7 @@ AlphabeticalPokedexOrder: table_width 2, AlphabeticalPokedexOrder dw ABRA + dw AERCROW dw AERODACTYL dw AIPOM dw ALAKAZAM @@ -16,9 +17,11 @@ AlphabeticalPokedexOrder: dw BARREAU dw BAYLEEF dw BEEDRILL + dw BELLEDAM dw BELLIGNAN dw BELLOSSOM dw BELLSPROUT + dw BIPULLA dw BITTYBAT dw BLASTOISE dw BLASTYKE @@ -27,6 +30,7 @@ AlphabeticalPokedexOrder: dw BULBASAUR dw BURGELA dw BUTTERFREE + dw CALFLAC dw CARAPTHOR dw CATERPIE dw CELEBI @@ -59,6 +63,7 @@ AlphabeticalPokedexOrder: dw DRAGONITE dw DRATINI dw DROWZEE + dw DUDUNSPARCE dw DUGTRIO dw DUNSPARCE dw EEVEE @@ -71,6 +76,7 @@ AlphabeticalPokedexOrder: dw EXEGGCUTE dw EXEGGUTOR dw FARFETCH_D + dw FARIGIRAF dw FEAROW dw FERALIGATR dw FLAAFFY @@ -160,6 +166,8 @@ AlphabeticalPokedexOrder: dw MEWTWO dw MILTANK dw MISDREAVUS + dw MISMAGIUS + dw MOIBELLE dw MOLTRES dw MR__MIME dw MUK @@ -186,6 +194,7 @@ AlphabeticalPokedexOrder: dw PARASPOR dw PERRSERKER dw PERSIAN + dw PHANDARIN dw PHANPY dw PICHU dw PIDGEOT @@ -249,6 +258,7 @@ AlphabeticalPokedexOrder: dw STARMIE dw STARYU dw STEELIX + dw STROMEN dw SUDOWOODO dw SUICUNE dw SUNFLORA @@ -272,6 +282,7 @@ AlphabeticalPokedexOrder: dw UMBREON dw UNOWN dw URSARING + dw URSALUNA dw VAPOREON dw VENOMOTH dw VENONAT diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 4f29dda..65e923f 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -71,6 +71,7 @@ NewPokedexOrder: dw EKANS dw ARBOK dw DUNSPARCE + dw DUDUNSPARCE dw MAREEP dw FLAAFFY dw AMPHAROS @@ -166,6 +167,8 @@ NewPokedexOrder: dw MEOWTH dw PERSIAN dw PERRSERKER + dw MOIBELLE + dw BELLEDAM dw PSYDUCK dw GOLDUCK dw MACHOP @@ -175,7 +178,10 @@ NewPokedexOrder: dw HITMONLEE dw HITMONCHAN dw HITMONTOP + dw BIPULLA + dw CALFLAC dw GIRAFARIG + dw FARIGIRAF dw TAUROS dw MILTANK dw MAGBY @@ -189,6 +195,7 @@ NewPokedexOrder: dw FARFETCH_D dw NATU dw XATU + dw AERCROW dw QWILFISH dw TENTACOOL dw TENTACRUEL @@ -233,6 +240,7 @@ NewPokedexOrder: dw PILOSWINE dw TEDDIURSA dw URSARING + dw URSALUNA dw PHANPY dw DONPHAN dw MANTINE @@ -253,6 +261,9 @@ NewPokedexOrder: dw MAGCARGO dw SNEASEL dw MISDREAVUS + dw MISMAGIUS + dw STROMEN + dw PHANDARIN dw PORYGON dw PORYGON2 dw CHANSEY diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index d2ffb9d..97113c6 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -36,6 +36,8 @@ EggMovePointers2:: dw NoEggMoves2 dw NatuEggMoves dw NoEggMoves2 + dw MoibelleEggMoves + dw NoEggMoves2 ; Belledam dw MareepEggMoves dw NoEggMoves2 dw NoEggMoves2 @@ -47,6 +49,7 @@ EggMovePointers2:: dw HoppipEggMoves dw NoEggMoves2 dw NoEggMoves2 + dw AercrowEggMoves dw AipomEggMoves dw NoEggMoves2 dw NoEggMoves2 @@ -62,13 +65,19 @@ EggMovePointers2:: ; dw NoEggMoves2 ; Honchkrow dw NoEggMoves2 dw MisdreavusEggMoves - ; dw NoEggMoves2 ; Mismagius + dw NoEggMoves2 ; Mismagius + dw StromenEggMoves + dw NoEggMoves2 ; Phandarin dw NoEggMoves2 dw NoEggMoves2 - dw GirafarigEggMoves ; This'll need a lot of stuff. Calfalc, Tsuinzu, Farigiraf... + dw BipullaEggMoves + dw NoEggMoves2 ; Calflac + dw NoEggMoves2 ; Girafarig + dw NoEggMoves2 ; Farigiraf dw PinecoEggMoves dw NoEggMoves2 dw DunsparceEggMoves + dw NoEggMoves2 ; Dudunsparce dw GligarEggMoves dw NoEggMoves2 dw SnubbullEggMoves @@ -80,6 +89,7 @@ EggMovePointers2:: dw SneaselEggMoves dw TeddiursaEggMoves dw NoEggMoves2 + dw NoEggMoves2 ; Ursaluna dw SlugmaEggMoves dw NoEggMoves2 dw SwinubEggMoves @@ -237,6 +247,12 @@ NatuEggMoves: dw STEEL_WING dw -1 ; end +MoibelleEggMoves: + dw CHARM + dw HYPNOSIS + dw PURSUIT + dw -1 ; end + MareepEggMoves: dw THUNDERBOLT dw TAKE_DOWN @@ -270,6 +286,13 @@ HoppipEggMoves: dw AMNESIA dw PAY_DAY dw -1 ; end + +AercrowEggMoves: + dw DRILL_PECK + dw FUTURE_SIGHT + dw SAFEGUARD + dw WHIRLWIND + dw -1 ; end AipomEggMoves: dw COUNTER @@ -308,7 +331,14 @@ MisdreavusEggMoves: dw DESTINY_BOND dw -1 ; end -GirafarigEggMoves: +StromenEggMoves: + dw BODY_SLAM + dw FAINT_ATTACK + dw PURSUIT + dw STOMP + dw -1 ; end + +BipullaEggMoves: dw TAKE_DOWN dw AMNESIA dw FORESIGHT diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index ffe4bbd..f914dc3 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -36,6 +36,8 @@ EvosAttacksPointers2:: dw TogeticEvosAttacks dw NatuEvosAttacks dw XatuEvosAttacks + dw MoibelleEvoAttacks + dw BelledamEvoAttacks dw MareepEvosAttacks dw FlaaffyEvosAttacks dw AmpharosEvosAttacks @@ -50,6 +52,7 @@ EvosAttacksPointers2:: dw AipomEvosAttacks dw SunkernEvosAttacks dw SunfloraEvosAttacks + dw AercrowEvosAttacks dw YanmaEvosAttacks dw WooperEvosAttacks dw QuagsireEvosAttacks @@ -61,12 +64,19 @@ EvosAttacksPointers2:: dw MurkrowEvosAttacks dw SlowkingEvosAttacks dw MisdreavusEvosAttacks + dw MismagiusEvosAttacks + dw StromenEvosAttacks + dw PhandarinEvosAttacks dw UnownEvosAttacks dw WobbuffetEvosAttacks + dw BipullaEvosAttacks + dw CalflacEvosAttacks dw GirafarigEvosAttacks + dw FarigirafEvosAttacks dw PinecoEvosAttacks dw ForretressEvosAttacks dw DunsparceEvosAttacks + dw DudunsparceEvosAttacks dw GligarEvosAttacks dw SteelixEvosAttacks dw SnubbullEvosAttacks @@ -78,6 +88,7 @@ EvosAttacksPointers2:: dw SneaselEvosAttacks dw TeddiursaEvosAttacks dw UrsaringEvosAttacks + dw UrsalunaEvosAttacks dw SlugmaEvosAttacks dw MagcargoEvosAttacks dw SwinubEvosAttacks @@ -367,9 +378,10 @@ HoothootEvosAttacks: dbw 6, FORESIGHT dbw 11, PECK dbw 16, HYPNOSIS - dbw 22, REFLECT + dbw 22, MEGAPHONE dbw 28, TAKE_DOWN dbw 34, CONFUSION + dbw 42, REFLECT dbw 48, DREAM_EATER db 0 ; no more level-up moves @@ -382,9 +394,10 @@ NoctowlEvosAttacks: dbw 6, FORESIGHT dbw 11, PECK dbw 16, HYPNOSIS - dbw 25, REFLECT - dbw 33, TAKE_DOWN - dbw 41, CONFUSION + dbw 23, MEGAPHONE + dbw 31, TAKE_DOWN + dbw 39, CONFUSION + dbw 49, REFLECT dbw 57, DREAM_EATER db 0 ; no more level-up moves @@ -588,6 +601,35 @@ XatuEvosAttacks: dbw 50, CONFUSE_RAY dbw 65, PSYCHIC_M db 0 ; no more level-up moves + +MoibelleEvoAttacks: + dbbw EVOLVE_LEVEL, 28, BELLEDAM + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 7, TAIL_WHIP + dbw 13, HEAL_BELL + dbw 19, FAINT_ATTACK + dbw 25, LOVELY_KISS + dbw 25, SWEET_KISS + dbw 34, FURY_SWIPES + dbw 43, ATTRACT + ;dbw 50, COIN_HURL + db 0 ; no more level-up moves + +BelledamEvoAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 7, TAIL_WHIP + dbw 13, HEAL_BELL + dbw 19, FAINT_ATTACK + dbw 25, LOVELY_KISS + dbw 25, SWEET_KISS + dbw 37, FURY_SWIPES + dbw 49, ATTRACT + ;dbw 59, COIN_HURL + db 0 ; no more level-up moves MareepEvosAttacks: dbbw EVOLVE_LEVEL, 15, FLAAFFY @@ -769,6 +811,19 @@ SunfloraEvosAttacks: dbw 31, PETAL_DANCE dbw 46, SOLARBEAM db 0 ; no more level-up moves + +AercrowEvosAttacks: + db 0; no more evolutions + dbw 1, PECK + dbw 1, MEGAPHONE + dbw 8, SUPERSONIC + dbw 14, FLAIL + dbw 21, SCARY_FACE + dbw 28, WING_ATTACK + dbw 35, PETAL_DANCE + dbw 42, FORESIGHT + dbw 50, RAZOR_WIND + db 0 ; no more level-up moves YanmaEvosAttacks: db 0 ; no more evolutions @@ -902,6 +957,7 @@ SlowkingEvosAttacks: db 0 ; no more level-up moves MisdreavusEvosAttacks: + dbbw EVOLVE_ITEM, DUSK_STONE, MISMAGIUS db 0 ; no more evolutions dbw 1, GROWL dbw 1, PSYWAVE @@ -912,6 +968,43 @@ MisdreavusEvosAttacks: dbw 36, PAIN_SPLIT dbw 46, PERISH_SONG db 0 ; no more level-up moves + +MismagiusEvosAttacks: + db 0 ; no more evolutions + dbw 1, GROWL + dbw 1, PSYWAVE + dbw 1, SPITE + dbw 1, CONFUSE_RAY + dbw 25, PSYCH_UP + db 0 ; no more level-up moves + +StromenEvosAttacks: + dbbw EVOLVE_LEVEL, 1, PHANDARIN + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 8, DISABLE + dbw 16, DESTINY_BOND + dbw 25, SPITE + dbw 35, CONFUSION + dbw 46, NIGHT_SHADE + dbw 58, SUBSTITUTE + dbw 71, PSYCHIC_M + dbw 85, PAIN_SPLIT + dbw 100, CURSE + db 0 ; no more level-up moves + +PhandarinEvosAttacks: + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 8, DISABLE + dbw 16, SPLASH + dbw 25, SPITE + dbw 35, POUND ; DRAINING_KISS + dbw 46, NIGHT_SHADE + dbw 58, SUBSTITUTE + dbw 71, POUND ; DAZZLING_GLEAM + dbw 85, PAIN_SPLIT + db 0 ; no more level-up moves UnownEvosAttacks: db 0 ; no more evolutions @@ -926,18 +1019,62 @@ WobbuffetEvosAttacks: dbw 1, DESTINY_BOND db 0 ; no more level-up moves -GirafarigEvosAttacks: +BipullaEvosAttacks: + dbbw EVOLVE_LEVEL, 17, CALFLAC db 0 ; no more evolutions dbw 1, TACKLE dbw 1, GROWL - dbw 1, CONFUSION - dbw 1, STOMP dbw 7, CONFUSION - dbw 13, STOMP + dbw 13, LICK dbw 20, AGILITY - dbw 30, BATON_PASS + dbw 27, BATON_PASS + dbw 35, PSYBEAM + dbw 42, CRUNCH + dbw 45, PSYCHIC_M + db 0 ; no more level-up moves + +CalflacEvosAttacks: + dbbw EVOLVE_LEVEL, 29, GIRAFARIG + db 0 ; no more Evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 7, CONFUSION + dbw 13, LICK + dbw 17, STOMP + dbw 22, AGILITY + dbw 31, BATON_PASS dbw 41, PSYBEAM - dbw 54, CRUNCH + dbw 50, CRUNCH + dbw 55, PSYCHIC_M + db 0 ; no more level-up moves + +GirafarigEvosAttacks: + dbbw EVOLVE_LEVEL, 44, FARIGIRAF + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 7, CONFUSION + dbw 13, LICK + dbw 17, STOMP + dbw 22, AGILITY + dbw 32, BATON_PASS + dbw 44, PSYBEAM + dbw 55, CRUNCH + dbw 62, PSYCHIC_M + db 0 ; no more level-up moves + +FarigirafEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, GROWL + dbw 7, CONFUSION + dbw 13, LICK + dbw 17, STOMP + dbw 22, AGILITY + dbw 32, BATON_PASS + dbw 44, PSYBEAM + dbw 56, CRUNCH + dbw 65, PSYCHIC_M db 0 ; no more level-up moves PinecoEvosAttacks: @@ -969,6 +1106,7 @@ ForretressEvosAttacks: db 0 ; no more level-up moves DunsparceEvosAttacks: + dbbw EVOLVE_LEVEL, 33, DUDUNSPARCE db 0 ; no more evolutions dbw 1, RAGE dbw 5, DEFENSE_CURL @@ -978,6 +1116,20 @@ DunsparceEvosAttacks: dbw 30, SCREECH dbw 38, TAKE_DOWN db 0 ; no more level-up moves + +DudunsparceEvosAttacks: + db 0 ; no more evolutions + dbw 1, RAGE + dbw 5, DEFENSE_CURL + dbw 13, GLARE + dbw 18, SPITE + dbw 26, PURSUIT + dbw 30, SCREECH + dbw 33, HORN_DRILL + dbw 41, TAKE_DOWN + dbw 48, DOUBLE_EDGE + dbw 56, GUST + db 0 ; no more level-up moves GligarEvosAttacks: db 0 ; no more evolutions @@ -1076,9 +1228,10 @@ HeracrossEvosAttacks: dbw 6, HORN_ATTACK dbw 12, ENDURE dbw 19, FURY_ATTACK - dbw 27, COUNTER - dbw 35, TAKE_DOWN - dbw 44, REVERSAL + dbw 26, MEGAPHONE + dbw 33, COUNTER + dbw 40, TAKE_DOWN + dbw 47, REVERSAL dbw 54, MEGAHORN db 0 ; no more level-up moves @@ -1111,6 +1264,7 @@ TeddiursaEvosAttacks: db 0 ; no more level-up moves UrsaringEvosAttacks: + dbbw EVOLVE_ITEM, PEAT_BLOCK, URSALUNA db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -1124,6 +1278,21 @@ UrsaringEvosAttacks: dbw 49, SNORE dbw 59, THRASH db 0 ; no more level-up moves + +UrsalunaEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 8, LICK + dbw 15, FURY_SWIPES + dbw 22, FAINT_ATTACK + dbw 29, REST + dbw 39, SLASH + dbw 44, MOONLIGHT + dbw 49, SNORE + dbw 54, EARTHQUAKE + dbw 59, THRASH + db 0 ; no more level-up moves SlugmaEvosAttacks: dbbw EVOLVE_LEVEL, 38, MAGCARGO diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index d75f479..fdd5b8e 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -214,6 +214,8 @@ FirstEvoStages:: dw TOGEPI ;b0 dw NATU dw NATU + dw MOIBELLE + dw MOIBELLE dw MAREEP dw MAREEP dw MAREEP @@ -228,6 +230,7 @@ FirstEvoStages:: dw AIPOM dw SUNKERN dw SUNKERN ;c0 + dw AERCROW dw YANMA dw WOOPER dw WOOPER @@ -239,12 +242,19 @@ FirstEvoStages:: dw MURKROW dw SLOWPOKE dw MISDREAVUS ;c8 + dw MISDREAVUS + dw STROMEN + dw STROMEN dw UNOWN dw WOBBUFFET - dw GIRAFARIG + dw BIPULLA + dw BIPULLA + dw BIPULLA + dw BIPULLA dw PINECO dw PINECO dw DUNSPARCE + dw DUNSPARCE dw GLIGAR dw ONIX ;d0 dw SNUBBULL @@ -256,6 +266,7 @@ FirstEvoStages:: dw SNEASEL dw TEDDIURSA ;d8 dw TEDDIURSA + dw TEDDIURSA dw SLUGMA dw SLUGMA dw SWINUB diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 6d8fd14..5b49fac 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -228,6 +228,8 @@ Pokered_MonIndices: db TOGETIC db NATU db XATU + db MOIBELLE + db BELLEDAM db MAREEP db FLAAFFY db AMPHAROS @@ -242,6 +244,7 @@ Pokered_MonIndices: db AIPOM db SUNKERN db SUNFLORA + db AERCROW db YANMA db WOOPER db QUAGSIRE @@ -250,12 +253,19 @@ Pokered_MonIndices: db MURKROW db SLOWKING db MISDREAVUS + db MISMAGIUS + db STROMEN + db PHANDARIN db UNOWN db WOBBUFFET + db BIPULLA + db CALFLAC db GIRAFARIG + db FARIGIRAF db PINECO db FORRETRESS db DUNSPARCE + db DUDUNSPARCE db GLIGAR db STEELIX db SNUBBULL @@ -266,6 +276,7 @@ Pokered_MonIndices: db SHI_SHI db MUNCHLAX db KLEAVOR + db URSALUNA db GOROCHU db GENTLARVA db PUPAL diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index f04d5b1..3cc8409 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -204,7 +204,7 @@ MonMenuIcons: db ICON_BUG ; SPINARAK db ICON_BUG ; ARIADOS db ICON_BUG ; FOLAGE - db ICON_MOTH ; BARREAU + db ICON_MOTH ; BARREAU db ICON_BAT ; CROBAT db ICON_FISH ; CHINCHOU db ICON_FISH ; LANTURN @@ -215,6 +215,8 @@ MonMenuIcons: db ICON_BIRD ; TOGETIC db ICON_BIRD ; NATU db ICON_BIRD ; XATU + db ICON_FOX ; MOIBELLE + db ICON_FOX ; BELLEDAM db ICON_FOX ; MAREEP db ICON_MONSTER ; FLAAFFY db ICON_MONSTER ; AMPHAROS @@ -229,6 +231,7 @@ MonMenuIcons: db ICON_MONSTER ; AIPOM db ICON_ODDISH ; SUNKERN db ICON_ODDISH ; SUNFLORA + db ICON_BIRD ; AERCROW db ICON_BUG ; YANMA db ICON_MONSTER ; WOOPER db ICON_MONSTER ; QUAGSIRE @@ -240,12 +243,19 @@ MonMenuIcons: db ICON_BIRD ; MURKROW db ICON_SLOWPOKE ; SLOWKING db ICON_GHOST ; MISDREAVUS + db ICON_GHOST ; MISMAGIUS + db ICON_GHOST ; STROMEN + db ICON_GHOST ; PHANDARIN db ICON_UNOWN ; UNOWN db ICON_GHOST ; WOBBUFFET + db ICON_GHOST ; BIPULLA + db ICON_EQUINE ; CALFLAC db ICON_EQUINE ; GIRAFARIG + db ICON_EQUINE ; FARIGIRAF db ICON_BUG ; PINECO db ICON_BUG ; FORRETRESS db ICON_SERPENT ; DUNSPARCE + db ICON_SERPENT ; DUDUNSPARCE db ICON_BUG ; GLIGAR db ICON_SERPENT ; STEELIX db ICON_MONSTER ; SNUBBULL @@ -257,6 +267,7 @@ MonMenuIcons: db ICON_FOX ; SNEASEL db ICON_MONSTER ; TEDDIURSA db ICON_MONSTER ; URSARING + db ICON_MONSTER ; URSALUNA db ICON_BLOB ; SLUGMA db ICON_BLOB ; MAGCARGO db ICON_EQUINE ; SWINUB diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index ba2e0b4..7b83bd7 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -217,6 +217,8 @@ PokemonNames:: db "TOGETIC@@@" db "NATU@@@@@@" db "XATU@@@@@@" + db "MOIBELLE@@" + db "BELLEDAM@@" db "MAREEP@@@@" db "FLAAFFY@@@" db "AMPHAROS@@" @@ -231,6 +233,7 @@ PokemonNames:: db "AIPOM@@@@@" db "SUNKERN@@@" db "SUNFLORA@@" + db "AERCROW@@@" db "YANMA@@@@@" db "WOOPER@@@@" db "QUAGSIRE@@" @@ -242,12 +245,19 @@ PokemonNames:: db "MURKROW@@@" db "SLOWKING@@" db "MISDREAVUS" + db "MISMAGIUS@" + db "STROMEN@@@" + db "PHANDARIN@" db "UNOWN@@@@@" db "WOBBUFFET@" + db "BIPULLA@@@" + db "CALFLAC@@@" db "GIRAFARIG@" + db "FARIGIRAF@" db "PINECO@@@@" db "FORRETRESS" db "DUNSPARCE@" + db "DUDUNSPARC" ; this SUCKS but idk what else to do weh db "GLIGAR@@@@" db "STEELIX@@@" db "SNUBBULL@@" @@ -259,6 +269,7 @@ PokemonNames:: db "SNEASEL@@@" db "TEDDIURSA@" db "URSARING@@" + db "URSALUNA@@" db "SLUGMA@@@@" db "MAGCARGO@@" db "SWINUB@@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 6a28828..75b6778 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -459,6 +459,10 @@ INCBIN "gfx/pokemon/natu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/natu/shiny.pal" INCBIN "gfx/pokemon/xatu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/xatu/shiny.pal" +INCBIN "gfx/pokemon/moibelle/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/moibelle/shiny.pal" +INCBIN "gfx/pokemon/belledam/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/belledam/shiny.pal" INCBIN "gfx/pokemon/mareep/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mareep/shiny.pal" INCBIN "gfx/pokemon/flaaffy/front.gbcpal", middle_colors @@ -487,6 +491,8 @@ INCBIN "gfx/pokemon/sunkern/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sunkern/shiny.pal" INCBIN "gfx/pokemon/sunflora/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sunflora/shiny.pal" +INCBIN "gfx/pokemon/aercrow/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/aercrow/shiny.pal" INCBIN "gfx/pokemon/yanma/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/yanma/shiny.pal" INCBIN "gfx/pokemon/wooper/front.gbcpal", middle_colors @@ -509,18 +515,32 @@ INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/slowking/shiny.pal" INCBIN "gfx/pokemon/misdreavus/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/misdreavus/shiny.pal" +INCBIN "gfx/pokemon/mismagius/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/mismagius/shiny.pal" +INCBIN "gfx/pokemon/stromen/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/stromen/shiny.pal" +INCBIN "gfx/pokemon/phandarin/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/phandarin/shiny.pal" INCLUDE "gfx/pokemon/unown/normal.pal" ; not front.gbcpal INCLUDE "gfx/pokemon/unown/shiny.pal" INCBIN "gfx/pokemon/wobbuffet/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" +INCBIN "gfx/pokemon/bipulla/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bipulla/shiny.pal" +INCBIN "gfx/pokemon/calflac/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/calflac/shiny.pal" INCBIN "gfx/pokemon/girafarig/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/girafarig/shiny.pal" +INCBIN "gfx/pokemon/farigiraf/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/farigiraf/shiny.pal" INCBIN "gfx/pokemon/pineco/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pineco/shiny.pal" INCBIN "gfx/pokemon/forretress/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/forretress/shiny.pal" INCBIN "gfx/pokemon/dunsparce/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/dunsparce/shiny.pal" +INCBIN "gfx/pokemon/dudunsparce/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/dudunsparce/shiny.pal" INCBIN "gfx/pokemon/gligar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gligar/shiny.pal" INCBIN "gfx/pokemon/steelix/front.gbcpal", middle_colors @@ -543,6 +563,8 @@ INCBIN "gfx/pokemon/teddiursa/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/teddiursa/shiny.pal" INCBIN "gfx/pokemon/ursaring/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/ursaring/shiny.pal" +INCBIN "gfx/pokemon/ursaluna/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/ursaluna/shiny.pal" INCBIN "gfx/pokemon/slugma/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/slugma/shiny.pal" INCBIN "gfx/pokemon/magcargo/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 4029349..7974f87 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -439,6 +439,10 @@ PokemonPicPointers:: dba NatuBackpic dba XatuFrontpic dba XatuBackpic + dba MoibelleFrontpic + dba MoibelleBackpic + dba BelledamFrontpic + dba BelledamBackpic dba MareepFrontpic dba MareepBackpic dba FlaaffyFrontpic @@ -467,6 +471,8 @@ PokemonPicPointers:: dba SunkernBackpic dba SunfloraFrontpic dba SunfloraBackpic + dba AercrowFrontpic + dba AercrowBackpic dba YanmaFrontpic dba YanmaBackpic dba WooperFrontpic @@ -489,6 +495,12 @@ PokemonPicPointers:: dba SlowkingBackpic dba MisdreavusFrontpic dba MisdreavusBackpic + dba MismagiusFrontpic + dba MismagiusBackpic + dba StromenFrontpic + dba StromenBackpic + dba PhandarinFrontpic + dba PhandarinBackpic ; Unown pics have their own table. See UnownPicPointers dbw -1, -1 @@ -496,14 +508,22 @@ PokemonPicPointers:: dba WobbuffetFrontpic dba WobbuffetBackpic + dba BipullaFrontpic + dba BipullaBackpic + dba CalflacFrontpic + dba CalflacBackpic dba GirafarigFrontpic dba GirafarigBackpic + dba FarigirafFrontpic + dba FarigirafBackpic dba PinecoFrontpic dba PinecoBackpic dba ForretressFrontpic dba ForretressBackpic dba DunsparceFrontpic dba DunsparceBackpic + dba DudunsparceFrontpic + dba DudunsparceBackpic dba GligarFrontpic dba GligarBackpic dba SteelixFrontpic @@ -526,6 +546,8 @@ PokemonPicPointers:: dba TeddiursaBackpic dba UrsaringFrontpic dba UrsaringBackpic + dba UrsalunaFrontpic + dba UrsalunaBackpic dba SlugmaFrontpic dba SlugmaBackpic dba MagcargoFrontpic diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index f014add..ba2af54 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -5,57 +5,57 @@ JohtoGrassWildMons: def_grass_wildmons SPROUT_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 3, RATTATA - dbw 4, RATTATA dbw 5, RATTATA - dbw 3, RATTATA + dbw 5, BELLSPROUT dbw 6, RATTATA - dbw 5, RATTATA - dbw 5, RATTATA + dbw 7, RATTATA + dbw 6, BELLSPROUT + dbw 6, AERCROW + dbw 7, AERCROW ; day - dbw 3, RATTATA - dbw 4, RATTATA dbw 5, RATTATA - dbw 3, RATTATA + dbw 5, BELLSPROUT dbw 6, RATTATA - dbw 5, RATTATA - dbw 5, RATTATA + dbw 7, RATTATA + dbw 6, BELLSPROUT + dbw 6, AERCROW + dbw 7, AERCROW ; nite - dbw 3, GASTLY - dbw 4, GASTLY - dbw 5, GASTLY - dbw 3, COINPUR dbw 6, GASTLY dbw 5, COINPUR - dbw 5, COINPUR + dbw 5, STROMEN + dbw 7, GASTLY + dbw 6, STROMEN + dbw 6, COINPUR + dbw 7, BIPULLA end_grass_wildmons def_grass_wildmons SPROUT_TOWER_3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 3, RATTATA - dbw 4, RATTATA dbw 5, RATTATA - dbw 3, RATTATA + dbw 5, BELLSPROUT dbw 6, RATTATA - dbw 5, RATTATA - dbw 5, RATTATA + dbw 7, RATTATA + dbw 6, BELLSPROUT + dbw 6, AERCROW + dbw 7, AERCROW ; day - dbw 3, RATTATA - dbw 4, RATTATA dbw 5, RATTATA - dbw 3, RATTATA + dbw 5, BELLSPROUT dbw 6, RATTATA - dbw 5, RATTATA - dbw 5, RATTATA + dbw 7, RATTATA + dbw 6, BELLSPROUT + dbw 6, AERCROW + dbw 7, AERCROW ; nite - dbw 3, GASTLY - dbw 4, GASTLY - dbw 5, GASTLY - dbw 3, COINPUR dbw 6, GASTLY dbw 5, COINPUR - dbw 5, COINPUR + dbw 5, STROMEN + dbw 7, GASTLY + dbw 6, STROMEN + dbw 6, COINPUR + dbw 7, BIPULLA end_grass_wildmons def_grass_wildmons TIN_TOWER_2F @@ -1200,29 +1200,29 @@ JohtoGrassWildMons: def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 3, PHANPY - dbw 2, BITTYBAT - dbw 2, PHANPY - dbw 4, PHANPY - dbw 2, TEDDIURSA - dbw 4, BITTYBAT - dbw 4, DUNSPARCE + dbw 5, PHANPY + dbw 5, BITTYBAT + dbw 6, PHANPY + dbw 7, PHANPY + dbw 6, TEDDIURSA + dbw 6, BITTYBAT + dbw 7, DUNSPARCE ; day - dbw 3, PHANPY - dbw 2, BITTYBAT - dbw 2, PHANPY - dbw 4, PHANPY - dbw 2, BITTYBAT - dbw 4, BITTYBAT - dbw 4, DUNSPARCE + dbw 5, PHANPY + dbw 5, BITTYBAT + dbw 6, PHANPY + dbw 7, PHANPY + dbw 6, BITTYBAT + dbw 7, BITTYBAT + dbw 7, DUNSPARCE ; nite - dbw 3, GEODUDE - dbw 2, BITTYBAT - dbw 2, GEODUDE - dbw 4, GEODUDE - dbw 2, BITTYBAT - dbw 4, BITTYBAT - dbw 4, DUNSPARCE + dbw 5, GEODUDE + dbw 5, BITTYBAT + dbw 6, GEODUDE + dbw 7, GEODUDE + dbw 6, BITTYBAT + dbw 7, BITTYBAT + dbw 7, DUNSPARCE end_grass_wildmons def_grass_wildmons DARK_CAVE_BLACKTHORN_ENTRANCE @@ -1260,25 +1260,25 @@ JohtoGrassWildMons: dbw 2, SENTRET dbw 3, PIDGEY dbw 3, SENTRET - dbw 2, RATTATA - dbw 3, HOPPIP + dbw 3, RATTATA dbw 3, HOPPIP + dbw 4, HOPPIP ; day dbw 2, PIDGEY dbw 2, SENTRET dbw 3, PIDGEY dbw 3, SENTRET - dbw 2, RATTATA - dbw 3, HOPPIP + dbw 3, RATTATA dbw 3, HOPPIP + dbw 4, HOPPIP ; nite dbw 2, HOOTHOOT dbw 2, RATTATA dbw 3, HOOTHOOT dbw 3, RATTATA - dbw 2, RATTATA - dbw 3, HOOTHOOT - dbw 3, HOOTHOOT + dbw 4, RATTATA + dbw 3, COINPUR + dbw 4, COINPUR end_grass_wildmons def_grass_wildmons ROUTE_30 @@ -1287,26 +1287,26 @@ JohtoGrassWildMons: dbw 3, LEDYBA dbw 3, CATERPIE dbw 4, CATERPIE - dbw 4, PIDGEY + dbw 4, GENTLARVA dbw 3, WEEDLE dbw 4, HOPPIP - dbw 4, HOPPIP + dbw 5, HOPPIP ; day dbw 3, PIDGEY dbw 3, CATERPIE dbw 4, CATERPIE - dbw 4, PIDGEY + dbw 4, GENTLARVA dbw 3, WEEDLE dbw 4, HOPPIP - dbw 4, HOPPIP + dbw 5, HOPPIP ; nite dbw 3, SPINARAK dbw 3, HOOTHOOT dbw 4, POLIWAG dbw 4, HOOTHOOT - dbw 3, ZUBAT - dbw 4, HOOTHOOT - dbw 4, HOOTHOOT + dbw 3, BITTYBAT + dbw 5, HOOTHOOT + dbw 5, COINPUR end_grass_wildmons ; Replaced Gastly with Misdreavus for increased Johto frequency. @@ -1315,28 +1315,28 @@ JohtoGrassWildMons: def_grass_wildmons ROUTE_31 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 4, LEDYBA + dbw 5, LEDYBA dbw 4, CATERPIE - dbw 5, BELLSPROUT - dbw 5, PIDGEY + dbw 6, LEDYBA + dbw 4, GENTLARVA dbw 4, WEEDLE - dbw 5, HOPPIP + dbw 5, BELLSPROUT dbw 5, HOPPIP ; day - dbw 4, PIDGEY + dbw 5, PIDGEY dbw 4, CATERPIE dbw 5, BELLSPROUT - dbw 5, PIDGEY + dbw 4, GENTLARVA dbw 4, WEEDLE - dbw 5, HOPPIP + dbw 6, BELLSPROUT dbw 5, HOPPIP ; nite - dbw 4, SPINARAK + dbw 5, SPINARAK dbw 4, POLIWAG - dbw 5, BELLSPROUT + dbw 5, MOIBELLE dbw 5, HOOTHOOT - dbw 4, ZUBAT - dbw 5, MISDREAVUS + dbw 4, BITTYBAT + dbw 6, MOIBELLE dbw 5, MISDREAVUS end_grass_wildmons @@ -1691,29 +1691,29 @@ JohtoGrassWildMons: def_grass_wildmons ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 2, PHANPY - dbw 2, SPEAROW dbw 3, PHANPY + dbw 3, SPEAROW + dbw 4, PHANPY dbw 3, RATTATA - dbw 2, RATTATA - dbw 2, JIGGLYPUFF - dbw 2, JIGGLYPUFF + dbw 4, RATTATA + dbw 3, IGGLYBUFF + dbw 3, IGGLYBUFF ; day - dbw 2, PHANPY - dbw 2, SPEAROW dbw 3, PHANPY + dbw 3, SPEAROW + dbw 4, PHANPY dbw 3, RATTATA - dbw 2, RATTATA - dbw 2, JIGGLYPUFF - dbw 2, JIGGLYPUFF + dbw 4, RATTATA + dbw 3, IGGLYBUFF + dbw 3, IGGLYBUFF ; nite - dbw 2, GEODUDE - dbw 2, HOOTHOOT dbw 3, GEODUDE + dbw 3, HOOTHOOT + dbw 4, GEODUDE dbw 3, COINPUR - dbw 2, COINPUR - dbw 2, JIGGLYPUFF - dbw 2, JIGGLYPUFF + dbw 4, COINPUR + dbw 3, IGGLYBUFF + dbw 3, IGGLYBUFF end_grass_wildmons def_grass_wildmons SILVER_CAVE_OUTSIDE diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 5ad6a48..e61e24e 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -160,7 +160,7 @@ ItemEffects: dw NoEffect ; DRAGON_FANG dw EvoStoneEffect ; BLK_AUGURITE dw NoEffect ; LEFTOVERS - dw NoEffect ; ITEM_93 + dw EvoStoneEffect ; PEAT_BLOCK dw NoEffect ; ITEM_94 dw NoEffect ; ITEM_95 dw RestorePPEffect ; MYSTERYBERRY diff --git a/gfx/footprints.asm b/gfx/footprints.asm index fa56c26..35021fa 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -214,6 +214,8 @@ INCBIN "gfx/footprints/togepi.1bpp" INCBIN "gfx/footprints/togetic.1bpp" INCBIN "gfx/footprints/natu.1bpp" INCBIN "gfx/footprints/xatu.1bpp" +INCBIN "gfx/footprints/moibelle.1bpp" +INCBIN "gfx/footprints/belledam.1bpp" INCBIN "gfx/footprints/mareep.1bpp" INCBIN "gfx/footprints/flaaffy.1bpp" INCBIN "gfx/footprints/ampharos.1bpp" @@ -228,6 +230,7 @@ INCBIN "gfx/footprints/jumpluff.1bpp" INCBIN "gfx/footprints/aipom.1bpp" INCBIN "gfx/footprints/sunkern.1bpp" INCBIN "gfx/footprints/sunflora.1bpp" +INCBIN "gfx/footprints/aercrow.1bpp" INCBIN "gfx/footprints/yanma.1bpp" INCBIN "gfx/footprints/wooper.1bpp" INCBIN "gfx/footprints/quagsire.1bpp" @@ -239,12 +242,19 @@ INCBIN "gfx/footprints/sylveon.1bpp" INCBIN "gfx/footprints/murkrow.1bpp" INCBIN "gfx/footprints/slowking.1bpp" INCBIN "gfx/footprints/misdreavus.1bpp" +INCBIN "gfx/footprints/mismagius.1bpp" +INCBIN "gfx/footprints/stromen.1bpp" +INCBIN "gfx/footprints/phandarin.1bpp" INCBIN "gfx/footprints/unown.1bpp" INCBIN "gfx/footprints/wobbuffet.1bpp" +INCBIN "gfx/footprints/bipulla.1bpp" +INCBIN "gfx/footprints/calflac.1bpp" INCBIN "gfx/footprints/girafarig.1bpp" +INCBIN "gfx/footprints/farigiraf.1bpp" INCBIN "gfx/footprints/pineco.1bpp" INCBIN "gfx/footprints/forretress.1bpp" INCBIN "gfx/footprints/dunsparce.1bpp" +INCBIN "gfx/footprints/dudunsparce.1bpp" INCBIN "gfx/footprints/gligar.1bpp" INCBIN "gfx/footprints/steelix.1bpp" INCBIN "gfx/footprints/snubbull.1bpp" @@ -256,6 +266,7 @@ INCBIN "gfx/footprints/heracross.1bpp" INCBIN "gfx/footprints/sneasel.1bpp" INCBIN "gfx/footprints/teddiursa.1bpp" INCBIN "gfx/footprints/ursaring.1bpp" +INCBIN "gfx/footprints/ursaluna.1bpp" INCBIN "gfx/footprints/slugma.1bpp" INCBIN "gfx/footprints/magcargo.1bpp" INCBIN "gfx/footprints/swinub.1bpp" diff --git a/gfx/footprints/aercrow.png b/gfx/footprints/aercrow.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/belledam.png b/gfx/footprints/belledam.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbc4762c956686ca24e2d6e93fce2d059c1d494 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2?y9_@H24!ws$!6 ogQw@{e@3?t5(hY1BqG>>S{(Ot7Q{@?^9AYiboFyt=akR{0J=ID2mk;8 literal 0 HcmV?d00001 diff --git a/gfx/footprints/bipulla.png b/gfx/footprints/bipulla.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/calflac.png b/gfx/footprints/calflac.png new file mode 100644 index 0000000000000000000000000000000000000000..cb4f5e29d3a37f0aa0ab567d4e3f8ab646687a21 GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJaZeY=kcwN$2?zKq_!u~U^J}m~ b@USy5?5|^0Q~P-pq=&)N)z4*}Q$iB}MV}E_ literal 0 HcmV?d00001 diff --git a/gfx/footprints/dudunsparce.png b/gfx/footprints/dudunsparce.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/farigiraf.png b/gfx/footprints/farigiraf.png new file mode 100644 index 0000000000000000000000000000000000000000..cb4f5e29d3a37f0aa0ab567d4e3f8ab646687a21 GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJaZeY=kcwN$2?zKq_!u~U^J}m~ b@USy5?5|^0Q~P-pq=&)N)z4*}Q$iB}MV}E_ literal 0 HcmV?d00001 diff --git a/gfx/footprints/mismagius.png b/gfx/footprints/mismagius.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/moibelle.png b/gfx/footprints/moibelle.png new file mode 100644 index 0000000000000000000000000000000000000000..8dbc4762c956686ca24e2d6e93fce2d059c1d494 GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJ6;Bt(kcwN$2?y9_@H24!ws$!6 ogQw@{e@3?t5(hY1BqG>>S{(Ot7Q{@?^9AYiboFyt=akR{0J=ID2mk;8 literal 0 HcmV?d00001 diff --git a/gfx/footprints/phandarin.png b/gfx/footprints/phandarin.png new file mode 100644 index 0000000000000000000000000000000000000000..e91020b82cffb4ed898bb39dbfaef72c09873c7f GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJX-^l&kcwN$2?sde{AcL=|KE^v g1IvsD{~OkEGMrW9S($n4T@FaOr>mdKI;Vst06+d1vj6}9 literal 0 HcmV?d00001 diff --git a/gfx/footprints/stromen.png b/gfx/footprints/stromen.png new file mode 100644 index 0000000000000000000000000000000000000000..e91020b82cffb4ed898bb39dbfaef72c09873c7f GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJX-^l&kcwN$2?sde{AcL=|KE^v g1IvsD{~OkEGMrW9S($n4T@FaOr>mdKI;Vst06+d1vj6}9 literal 0 HcmV?d00001 diff --git a/gfx/footprints/ursaluna.png b/gfx/footprints/ursaluna.png new file mode 100644 index 0000000000000000000000000000000000000000..19b2cd7e64b4edbfc45c4c9178294a0075fef70d GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJeNPw1kcwN$2@VWt0tf3G8V}C< z|AC#Yj_nyUkIgsvhCl!78z%k#pDd8Txq;7ufnlz=P}Y&4orWMIJYD@<);T3K0RUCn B9_#=B literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index 92d4d77..1595a84 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -741,6 +741,28 @@ TangrowthFrontpic: INCBIN "gfx/pokemon/tangrowth/front.animated.2bpp.lz" TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" +MoibelleFrontpic: INCBIN "gfx/pokemon/moibelle/front.animated.2bpp.lz" +MoibelleBackpic: INCBIN "gfx/pokemon/moibelle/back.2bpp.lz" +BelledamFrontpic: INCBIN "gfx/pokemon/belledam/front.animated.2bpp.lz" +BelledamBackpic: INCBIN "gfx/pokemon/belledam/back.2bpp.lz" +AercrowFrontpic: INCBIN "gfx/pokemon/aercrow/front.animated.2bpp.lz" +AercrowBackpic: INCBIN "gfx/pokemon/aercrow/back.2bpp.lz" +MismagiusFrontpic: INCBIN "gfx/pokemon/mismagius/front.animated.2bpp.lz" +MismagiusBackpic: INCBIN "gfx/pokemon/mismagius/back.2bpp.lz" +StromenFrontpic: INCBIN "gfx/pokemon/stromen/front.animated.2bpp.lz" +StromenBackpic: INCBIN "gfx/pokemon/stromen/back.2bpp.lz" +PhandarinFrontpic: INCBIN "gfx/pokemon/phandarin/front.animated.2bpp.lz" +PhandarinBackpic: INCBIN "gfx/pokemon/phandarin/back.2bpp.lz" +BipullaFrontpic: INCBIN "gfx/pokemon/bipulla/front.animated.2bpp.lz" +BipullaBackpic: INCBIN "gfx/pokemon/bipulla/back.2bpp.lz" +CalflacFrontpic: INCBIN "gfx/pokemon/calflac/front.animated.2bpp.lz" +CalflacBackpic: INCBIN "gfx/pokemon/calflac/back.2bpp.lz" +FarigirafFrontpic: INCBIN "gfx/pokemon/farigiraf/front.animated.2bpp.lz" +FarigirafBackpic: INCBIN "gfx/pokemon/farigiraf/back.2bpp.lz" +DudunsparceFrontpic: INCBIN "gfx/pokemon/dudunsparce/front.animated.2bpp.lz" +DudunsparceBackpic: INCBIN "gfx/pokemon/dudunsparce/back.2bpp.lz" +UrsalunaFrontpic: INCBIN "gfx/pokemon/ursaluna/front.animated.2bpp.lz" +UrsalunaBackpic: INCBIN "gfx/pokemon/ursaluna/back.2bpp.lz" SECTION "Pics 20", ROMX diff --git a/gfx/pokemon/aercrow/anim.asm b/gfx/pokemon/aercrow/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/aercrow/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/aercrow/anim_idle.asm b/gfx/pokemon/aercrow/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/aercrow/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/aercrow/back.png b/gfx/pokemon/aercrow/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/aercrow/shiny.pal b/gfx/pokemon/aercrow/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/aercrow/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/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 5968084..93a78b7 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -213,6 +213,8 @@ AnimationPointers: dw TogeticAnimation dw NatuAnimation dw XatuAnimation + dw MoibelleAnimation + dw BelledamAnimation dw MareepAnimation dw FlaaffyAnimation dw AmpharosAnimation @@ -227,6 +229,7 @@ AnimationPointers: dw AipomAnimation dw SunkernAnimation dw SunfloraAnimation + dw AercrowAnimation dw YanmaAnimation dw WooperAnimation dw QuagsireAnimation @@ -238,12 +241,19 @@ AnimationPointers: dw MurkrowAnimation dw SlowkingAnimation dw MisdreavusAnimation + dw MismagiusAnimation + dw StromenAnimation + dw PhandarinAnimation dw UnownAnimation dw WobbuffetAnimation + dw BipullaAnimation + dw CalflacAnimation dw GirafarigAnimation + dw FarigirafAnimation dw PinecoAnimation dw ForretressAnimation dw DunsparceAnimation + dw DudunsparceAnimation dw GligarAnimation dw SteelixAnimation dw SnubbullAnimation @@ -255,6 +265,7 @@ AnimationPointers: dw SneaselAnimation dw TeddiursaAnimation dw UrsaringAnimation + dw UrsalunaAnimation dw SlugmaAnimation dw MagcargoAnimation dw SwinubAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 5df613f..0e76b02 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -211,6 +211,8 @@ TogepiAnimation: INCLUDE "gfx/pokemon/togepi/anim.asm" TogeticAnimation: INCLUDE "gfx/pokemon/togetic/anim.asm" NatuAnimation: INCLUDE "gfx/pokemon/natu/anim.asm" XatuAnimation: INCLUDE "gfx/pokemon/xatu/anim.asm" +MoibelleAnimation: INCLUDE "gfx/pokemon/moibelle/anim.asm" +BelledamAnimation: INCLUDE "gfx/pokemon/belledam/anim.asm" MareepAnimation: INCLUDE "gfx/pokemon/mareep/anim.asm" FlaaffyAnimation: INCLUDE "gfx/pokemon/flaaffy/anim.asm" AmpharosAnimation: INCLUDE "gfx/pokemon/ampharos/anim.asm" @@ -225,6 +227,7 @@ JumpluffAnimation: INCLUDE "gfx/pokemon/jumpluff/anim.asm" AipomAnimation: INCLUDE "gfx/pokemon/aipom/anim.asm" SunkernAnimation: INCLUDE "gfx/pokemon/sunkern/anim.asm" SunfloraAnimation: INCLUDE "gfx/pokemon/sunflora/anim.asm" +AercrowAnimation: INCLUDE "gfx/pokemon/aercrow/anim.asm" YanmaAnimation: INCLUDE "gfx/pokemon/yanma/anim.asm" WooperAnimation: INCLUDE "gfx/pokemon/wooper/anim.asm" QuagsireAnimation: INCLUDE "gfx/pokemon/quagsire/anim.asm" @@ -236,12 +239,19 @@ SylveonAnimation: INCLUDE "gfx/pokemon/sylveon/anim.asm" MurkrowAnimation: INCLUDE "gfx/pokemon/murkrow/anim.asm" SlowkingAnimation: INCLUDE "gfx/pokemon/slowking/anim.asm" MisdreavusAnimation: INCLUDE "gfx/pokemon/misdreavus/anim.asm" +MismagiusAnimation: INCLUDE "gfx/pokemon/mismagius/anim.asm" +StromenAnimation: INCLUDE "gfx/pokemon/stromen/anim.asm" +PhandarinAnimation: INCLUDE "gfx/pokemon/phandarin/anim.asm" UnownAnimation: INCLUDE "gfx/pokemon/unown/anim.asm" WobbuffetAnimation: INCLUDE "gfx/pokemon/wobbuffet/anim.asm" +BipullaAnimation: INCLUDE "gfx/pokemon/bipulla/anim.asm" +CalflacAnimation: INCLUDE "gfx/pokemon/calflac/anim.asm" GirafarigAnimation: INCLUDE "gfx/pokemon/girafarig/anim.asm" +FarigirafAnimation: INCLUDE "gfx/pokemon/farigiraf/anim.asm" PinecoAnimation: INCLUDE "gfx/pokemon/pineco/anim.asm" ForretressAnimation: INCLUDE "gfx/pokemon/forretress/anim.asm" DunsparceAnimation: INCLUDE "gfx/pokemon/dunsparce/anim.asm" +DudunsparceAnimation: INCLUDE "gfx/pokemon/dudunsparce/anim.asm" GligarAnimation: INCLUDE "gfx/pokemon/gligar/anim.asm" SteelixAnimation: INCLUDE "gfx/pokemon/steelix/anim.asm" SnubbullAnimation: INCLUDE "gfx/pokemon/snubbull/anim.asm" @@ -253,6 +263,7 @@ HeracrossAnimation: INCLUDE "gfx/pokemon/heracross/anim.asm" SneaselAnimation: INCLUDE "gfx/pokemon/sneasel/anim.asm" TeddiursaAnimation: INCLUDE "gfx/pokemon/teddiursa/anim.asm" UrsaringAnimation: INCLUDE "gfx/pokemon/ursaring/anim.asm" +UrsalunaAnimation: INCLUDE "gfx/pokemon/ursaluna/anim.asm" SlugmaAnimation: INCLUDE "gfx/pokemon/slugma/anim.asm" MagcargoAnimation: INCLUDE "gfx/pokemon/magcargo/anim.asm" SwinubAnimation: INCLUDE "gfx/pokemon/swinub/anim.asm" diff --git a/gfx/pokemon/belledam/anim.asm b/gfx/pokemon/belledam/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/belledam/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/belledam/anim_idle.asm b/gfx/pokemon/belledam/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/belledam/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/belledam/back.png b/gfx/pokemon/belledam/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/belledam/shiny.pal b/gfx/pokemon/belledam/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/belledam/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/bipulla/anim.asm b/gfx/pokemon/bipulla/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bipulla/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bipulla/anim_idle.asm b/gfx/pokemon/bipulla/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bipulla/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bipulla/back.png b/gfx/pokemon/bipulla/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/bipulla/shiny.pal b/gfx/pokemon/bipulla/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bipulla/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/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 2e42406..3663475 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -213,6 +213,8 @@ BitmasksPointers: dw TogeticBitmasks dw NatuBitmasks dw XatuBitmasks + dw MoibelleBitmasks + dw BelledamBitmasks dw MareepBitmasks dw FlaaffyBitmasks dw AmpharosBitmasks @@ -227,6 +229,7 @@ BitmasksPointers: dw AipomBitmasks dw SunkernBitmasks dw SunfloraBitmasks + dw AercrowBitmasks dw YanmaBitmasks dw WooperBitmasks dw QuagsireBitmasks @@ -238,12 +241,19 @@ BitmasksPointers: dw MurkrowBitmasks dw SlowkingBitmasks dw MisdreavusBitmasks + dw MismagiusBitmasks + dw StromenBitmasks + dw PhandarinBitmasks dw UnownBitmasks dw WobbuffetBitmasks + dw BipullaBitmasks + dw CalflacBitmasks dw GirafarigBitmasks + dw FarigirafBitmasks dw PinecoBitmasks dw ForretressBitmasks dw DunsparceBitmasks + dw DudunsparceBitmasks dw GligarBitmasks dw SteelixBitmasks dw SnubbullBitmasks @@ -255,6 +265,7 @@ BitmasksPointers: dw SneaselBitmasks dw TeddiursaBitmasks dw UrsaringBitmasks + dw UrsalunaBitmasks dw SlugmaBitmasks dw MagcargoBitmasks dw SwinubBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 65a4092..8bfb1b2 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -211,6 +211,8 @@ TogepiBitmasks: INCLUDE "gfx/pokemon/togepi/bitmask.asm" TogeticBitmasks: INCLUDE "gfx/pokemon/togetic/bitmask.asm" NatuBitmasks: INCLUDE "gfx/pokemon/natu/bitmask.asm" XatuBitmasks: INCLUDE "gfx/pokemon/xatu/bitmask.asm" +MoibelleBitmasks: INCLUDE "gfx/pokemon/moibelle/bitmask.asm" +BelledamBitmasks: INCLUDE "gfx/pokemon/belledam/bitmask.asm" MareepBitmasks: INCLUDE "gfx/pokemon/mareep/bitmask.asm" FlaaffyBitmasks: INCLUDE "gfx/pokemon/flaaffy/bitmask.asm" AmpharosBitmasks: INCLUDE "gfx/pokemon/ampharos/bitmask.asm" @@ -225,6 +227,7 @@ JumpluffBitmasks: INCLUDE "gfx/pokemon/jumpluff/bitmask.asm" AipomBitmasks: INCLUDE "gfx/pokemon/aipom/bitmask.asm" SunkernBitmasks: INCLUDE "gfx/pokemon/sunkern/bitmask.asm" SunfloraBitmasks: INCLUDE "gfx/pokemon/sunflora/bitmask.asm" +AercrowBitmasks: INCLUDE "gfx/pokemon/aercrow/bitmask.asm" YanmaBitmasks: INCLUDE "gfx/pokemon/yanma/bitmask.asm" WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm" QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm" @@ -236,12 +239,19 @@ SylveonBitmasks: INCLUDE "gfx/pokemon/sylveon/bitmask.asm" MurkrowBitmasks: INCLUDE "gfx/pokemon/murkrow/bitmask.asm" SlowkingBitmasks: INCLUDE "gfx/pokemon/slowking/bitmask.asm" MisdreavusBitmasks: INCLUDE "gfx/pokemon/misdreavus/bitmask.asm" +MismagiusBitmasks: INCLUDE "gfx/pokemon/mismagius/bitmask.asm" +StromenBitmasks: INCLUDE "gfx/pokemon/stromen/bitmask.asm" +PhandarinBitmasks: INCLUDE "gfx/pokemon/phandarin/bitmask.asm" UnownBitmasks: INCLUDE "gfx/pokemon/unown/bitmask.asm" WobbuffetBitmasks: INCLUDE "gfx/pokemon/wobbuffet/bitmask.asm" +BipullaBitmasks: INCLUDE "gfx/pokemon/bipulla/bitmask.asm" +CalflacBitmasks: INCLUDE "gfx/pokemon/calflac/bitmask.asm" GirafarigBitmasks: INCLUDE "gfx/pokemon/girafarig/bitmask.asm" +FarigirafBitmasks: INCLUDE "gfx/pokemon/farigiraf/bitmask.asm" PinecoBitmasks: INCLUDE "gfx/pokemon/pineco/bitmask.asm" ForretressBitmasks: INCLUDE "gfx/pokemon/forretress/bitmask.asm" DunsparceBitmasks: INCLUDE "gfx/pokemon/dunsparce/bitmask.asm" +DudunsparceBitmasks: INCLUDE "gfx/pokemon/dudunsparce/bitmask.asm" GligarBitmasks: INCLUDE "gfx/pokemon/gligar/bitmask.asm" SteelixBitmasks: INCLUDE "gfx/pokemon/steelix/bitmask.asm" SnubbullBitmasks: INCLUDE "gfx/pokemon/snubbull/bitmask.asm" @@ -253,6 +263,7 @@ HeracrossBitmasks: INCLUDE "gfx/pokemon/heracross/bitmask.asm" SneaselBitmasks: INCLUDE "gfx/pokemon/sneasel/bitmask.asm" TeddiursaBitmasks: INCLUDE "gfx/pokemon/teddiursa/bitmask.asm" UrsaringBitmasks: INCLUDE "gfx/pokemon/ursaring/bitmask.asm" +UrsalunaBitmasks: INCLUDE "gfx/pokemon/ursaluna/bitmask.asm" SlugmaBitmasks: INCLUDE "gfx/pokemon/slugma/bitmask.asm" MagcargoBitmasks: INCLUDE "gfx/pokemon/magcargo/bitmask.asm" SwinubBitmasks: INCLUDE "gfx/pokemon/swinub/bitmask.asm" diff --git a/gfx/pokemon/calflac/anim.asm b/gfx/pokemon/calflac/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/calflac/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/calflac/anim_idle.asm b/gfx/pokemon/calflac/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/calflac/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/calflac/back.png b/gfx/pokemon/calflac/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/calflac/shiny.pal b/gfx/pokemon/calflac/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/calflac/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/dudunsparce/anim.asm b/gfx/pokemon/dudunsparce/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/dudunsparce/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/dudunsparce/anim_idle.asm b/gfx/pokemon/dudunsparce/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/dudunsparce/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/dudunsparce/back.png b/gfx/pokemon/dudunsparce/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/dudunsparce/shiny.pal b/gfx/pokemon/dudunsparce/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/dudunsparce/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/farigiraf/anim.asm b/gfx/pokemon/farigiraf/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/farigiraf/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/farigiraf/anim_idle.asm b/gfx/pokemon/farigiraf/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/farigiraf/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/farigiraf/back.png b/gfx/pokemon/farigiraf/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/farigiraf/shiny.pal b/gfx/pokemon/farigiraf/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/farigiraf/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 acd36af..7a0d425 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -213,6 +213,8 @@ FramesPointers: dba TogeticFrames dba NatuFrames dba XatuFrames + dba MoibelleFrames + dba BelledamFrames dba MareepFrames dba FlaaffyFrames dba AmpharosFrames @@ -227,6 +229,7 @@ FramesPointers: dba AipomFrames dba SunkernFrames dba SunfloraFrames + dba AercrowFrames dba YanmaFrames dba WooperFrames dba QuagsireFrames @@ -238,12 +241,19 @@ FramesPointers: dba MurkrowFrames dba SlowkingFrames dba MisdreavusFrames + dba MismagiusFrames + dba StromenFrames + dba PhandarinFrames dba UnownFrames dba WobbuffetFrames + dba BipullaFrames + dba CalflacFrames dba GirafarigFrames + dba FarigirafFrames dba PinecoFrames dba ForretressFrames dba DunsparceFrames + dba DudunsparceFrames dba GligarFrames dba SteelixFrames dba SnubbullFrames @@ -255,6 +265,7 @@ FramesPointers: dba SneaselFrames dba TeddiursaFrames dba UrsaringFrames + dba UrsalunaFrames dba SlugmaFrames dba MagcargoFrames dba SwinubFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 34ca4c1..05645c0 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -213,6 +213,8 @@ AnimationIdlePointers: dw TogeticAnimationIdle dw NatuAnimationIdle dw XatuAnimationIdle + dw MoibelleAnimationIdle + dw BelledamAnimationIdle dw MareepAnimationIdle dw FlaaffyAnimationIdle dw AmpharosAnimationIdle @@ -227,6 +229,7 @@ AnimationIdlePointers: dw AipomAnimationIdle dw SunkernAnimationIdle dw SunfloraAnimationIdle + dw AercrowAnimationIdle dw YanmaAnimationIdle dw WooperAnimationIdle dw QuagsireAnimationIdle @@ -238,12 +241,19 @@ AnimationIdlePointers: dw MurkrowAnimationIdle dw SlowkingAnimationIdle dw MisdreavusAnimationIdle + dw MismagiusAnimationIdle + dw StromenAnimationIdle + dw PhandarinAnimationIdle dw UnownAnimationIdle dw WobbuffetAnimationIdle + dw BipullaAnimationIdle + dw CalflacAnimationIdle dw GirafarigAnimationIdle + dw FarigirafAnimationIdle dw PinecoAnimationIdle dw ForretressAnimationIdle dw DunsparceAnimationIdle + dw DudunsparceAnimationIdle dw GligarAnimationIdle dw SteelixAnimationIdle dw SnubbullAnimationIdle @@ -255,6 +265,7 @@ AnimationIdlePointers: dw SneaselAnimationIdle dw TeddiursaAnimationIdle dw UrsaringAnimationIdle + dw UrsalunaAnimationIdle dw SlugmaAnimationIdle dw MagcargoAnimationIdle dw SwinubAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 6f00225..9fe72fd 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -211,6 +211,8 @@ TogepiAnimationIdle: INCLUDE "gfx/pokemon/togepi/anim_idle.asm" TogeticAnimationIdle: INCLUDE "gfx/pokemon/togetic/anim_idle.asm" NatuAnimationIdle: INCLUDE "gfx/pokemon/natu/anim_idle.asm" XatuAnimationIdle: INCLUDE "gfx/pokemon/xatu/anim_idle.asm" +MoibelleAnimationIdle: INCLUDE "gfx/pokemon/moibelle/anim_idle.asm" +BelledamAnimationIdle: INCLUDE "gfx/pokemon/belledam/anim_idle.asm" MareepAnimationIdle: INCLUDE "gfx/pokemon/mareep/anim_idle.asm" FlaaffyAnimationIdle: INCLUDE "gfx/pokemon/flaaffy/anim_idle.asm" AmpharosAnimationIdle: INCLUDE "gfx/pokemon/ampharos/anim_idle.asm" @@ -225,6 +227,7 @@ JumpluffAnimationIdle: INCLUDE "gfx/pokemon/jumpluff/anim_idle.asm" AipomAnimationIdle: INCLUDE "gfx/pokemon/aipom/anim_idle.asm" SunkernAnimationIdle: INCLUDE "gfx/pokemon/sunkern/anim_idle.asm" SunfloraAnimationIdle: INCLUDE "gfx/pokemon/sunflora/anim_idle.asm" +AercrowAnimationIdle: INCLUDE "gfx/pokemon/aercrow/anim_idle.asm" YanmaAnimationIdle: INCLUDE "gfx/pokemon/yanma/anim_idle.asm" WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm" QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm" @@ -236,12 +239,19 @@ SylveonAnimationIdle: INCLUDE "gfx/pokemon/sylveon/anim_idle.asm" MurkrowAnimationIdle: INCLUDE "gfx/pokemon/murkrow/anim_idle.asm" SlowkingAnimationIdle: INCLUDE "gfx/pokemon/slowking/anim_idle.asm" MisdreavusAnimationIdle: INCLUDE "gfx/pokemon/misdreavus/anim_idle.asm" +MismagiusAnimationIdle: INCLUDE "gfx/pokemon/mismagius/anim_idle.asm" +StromenAnimationIdle: INCLUDE "gfx/pokemon/stromen/anim_idle.asm" +PhandarinAnimationIdle: INCLUDE "gfx/pokemon/phandarin/anim_idle.asm" UnownAnimationIdle: INCLUDE "gfx/pokemon/unown/anim_idle.asm" WobbuffetAnimationIdle: INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm" +BipullaAnimationIdle: INCLUDE "gfx/pokemon/bipulla/anim_idle.asm" +CalflacAnimationIdle: INCLUDE "gfx/pokemon/calflac/anim_idle.asm" GirafarigAnimationIdle: INCLUDE "gfx/pokemon/girafarig/anim_idle.asm" +FarigirafAnimationIdle: INCLUDE "gfx/pokemon/farigiraf/anim_idle.asm" PinecoAnimationIdle: INCLUDE "gfx/pokemon/pineco/anim_idle.asm" ForretressAnimationIdle: INCLUDE "gfx/pokemon/forretress/anim_idle.asm" DunsparceAnimationIdle: INCLUDE "gfx/pokemon/dunsparce/anim_idle.asm" +DudunsparceAnimationIdle: INCLUDE "gfx/pokemon/dudunsparce/anim_idle.asm" GligarAnimationIdle: INCLUDE "gfx/pokemon/gligar/anim_idle.asm" SteelixAnimationIdle: INCLUDE "gfx/pokemon/steelix/anim_idle.asm" SnubbullAnimationIdle: INCLUDE "gfx/pokemon/snubbull/anim_idle.asm" @@ -253,6 +263,7 @@ HeracrossAnimationIdle: INCLUDE "gfx/pokemon/heracross/anim_idle.asm" SneaselAnimationIdle: INCLUDE "gfx/pokemon/sneasel/anim_idle.asm" TeddiursaAnimationIdle: INCLUDE "gfx/pokemon/teddiursa/anim_idle.asm" UrsaringAnimationIdle: INCLUDE "gfx/pokemon/ursaring/anim_idle.asm" +UrsalunaAnimationIdle: INCLUDE "gfx/pokemon/ursaluna/anim_idle.asm" SlugmaAnimationIdle: INCLUDE "gfx/pokemon/slugma/anim_idle.asm" MagcargoAnimationIdle: INCLUDE "gfx/pokemon/magcargo/anim_idle.asm" SwinubAnimationIdle: INCLUDE "gfx/pokemon/swinub/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 67198dd..e08e971 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -35,6 +35,8 @@ TogepiFrames: INCLUDE "gfx/pokemon/togepi/frames.asm" TogeticFrames: INCLUDE "gfx/pokemon/togetic/frames.asm" NatuFrames: INCLUDE "gfx/pokemon/natu/frames.asm" XatuFrames: INCLUDE "gfx/pokemon/xatu/frames.asm" +MoibelleFrames: INCLUDE "gfx/pokemon/moibelle/frames.asm" +BelledamFrames: INCLUDE "gfx/pokemon/belledam/frames.asm" MareepFrames: INCLUDE "gfx/pokemon/mareep/frames.asm" FlaaffyFrames: INCLUDE "gfx/pokemon/flaaffy/frames.asm" AmpharosFrames: INCLUDE "gfx/pokemon/ampharos/frames.asm" @@ -49,6 +51,7 @@ JumpluffFrames: INCLUDE "gfx/pokemon/jumpluff/frames.asm" AipomFrames: INCLUDE "gfx/pokemon/aipom/frames.asm" SunkernFrames: INCLUDE "gfx/pokemon/sunkern/frames.asm" SunfloraFrames: INCLUDE "gfx/pokemon/sunflora/frames.asm" +AercrowFrames: INCLUDE "gfx/pokemon/aercrow/frames.asm" YanmaFrames: INCLUDE "gfx/pokemon/yanma/frames.asm" WooperFrames: INCLUDE "gfx/pokemon/wooper/frames.asm" QuagsireFrames: INCLUDE "gfx/pokemon/quagsire/frames.asm" @@ -60,12 +63,19 @@ SylveonFrames: INCLUDE "gfx/pokemon/sylveon/frames.asm" MurkrowFrames: INCLUDE "gfx/pokemon/murkrow/frames.asm" SlowkingFrames: INCLUDE "gfx/pokemon/slowking/frames.asm" MisdreavusFrames: INCLUDE "gfx/pokemon/misdreavus/frames.asm" +MismagiusFrames: INCLUDE "gfx/pokemon/mismagius/frames.asm" +StromenFrames: INCLUDE "gfx/pokemon/stromen/frames.asm" +PhandarinFrames: INCLUDE "gfx/pokemon/phandarin/frames.asm" UnownFrames: INCLUDE "gfx/pokemon/unown/frames.asm" WobbuffetFrames: INCLUDE "gfx/pokemon/wobbuffet/frames.asm" +BipullaFrames: INCLUDE "gfx/pokemon/bipulla/frames.asm" +CalflacFrames: INCLUDE "gfx/pokemon/calflac/frames.asm" GirafarigFrames: INCLUDE "gfx/pokemon/girafarig/frames.asm" +FarigirafFrames: INCLUDE "gfx/pokemon/farigiraf/frames.asm" PinecoFrames: INCLUDE "gfx/pokemon/pineco/frames.asm" ForretressFrames: INCLUDE "gfx/pokemon/forretress/frames.asm" DunsparceFrames: INCLUDE "gfx/pokemon/dunsparce/frames.asm" +DudunsparceFrames: INCLUDE "gfx/pokemon/dudunsparce/frames.asm" GligarFrames: INCLUDE "gfx/pokemon/gligar/frames.asm" SteelixFrames: INCLUDE "gfx/pokemon/steelix/frames.asm" SnubbullFrames: INCLUDE "gfx/pokemon/snubbull/frames.asm" @@ -77,6 +87,7 @@ HeracrossFrames: INCLUDE "gfx/pokemon/heracross/frames.asm" SneaselFrames: INCLUDE "gfx/pokemon/sneasel/frames.asm" TeddiursaFrames: INCLUDE "gfx/pokemon/teddiursa/frames.asm" UrsaringFrames: INCLUDE "gfx/pokemon/ursaring/frames.asm" +UrsalunaFrames: INCLUDE "gfx/pokemon/ursaluna/frames.asm" SlugmaFrames: INCLUDE "gfx/pokemon/slugma/frames.asm" MagcargoFrames: INCLUDE "gfx/pokemon/magcargo/frames.asm" SwinubFrames: INCLUDE "gfx/pokemon/swinub/frames.asm" diff --git a/gfx/pokemon/mismagius/anim.asm b/gfx/pokemon/mismagius/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/mismagius/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/mismagius/anim_idle.asm b/gfx/pokemon/mismagius/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/mismagius/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/mismagius/back.png b/gfx/pokemon/mismagius/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/mismagius/shiny.pal b/gfx/pokemon/mismagius/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/mismagius/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/moibelle/anim.asm b/gfx/pokemon/moibelle/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/moibelle/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/moibelle/anim_idle.asm b/gfx/pokemon/moibelle/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/moibelle/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/moibelle/back.png b/gfx/pokemon/moibelle/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/moibelle/shiny.pal b/gfx/pokemon/moibelle/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/moibelle/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/phandarin/anim.asm b/gfx/pokemon/phandarin/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/phandarin/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/phandarin/anim_idle.asm b/gfx/pokemon/phandarin/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/phandarin/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/phandarin/back.png b/gfx/pokemon/phandarin/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/phandarin/shiny.pal b/gfx/pokemon/phandarin/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/phandarin/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/stromen/anim.asm b/gfx/pokemon/stromen/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/stromen/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/stromen/anim_idle.asm b/gfx/pokemon/stromen/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/stromen/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/stromen/back.png b/gfx/pokemon/stromen/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/stromen/shiny.pal b/gfx/pokemon/stromen/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/stromen/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/ursaluna/anim.asm b/gfx/pokemon/ursaluna/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/ursaluna/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/ursaluna/anim_idle.asm b/gfx/pokemon/ursaluna/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/ursaluna/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/ursaluna/back.png b/gfx/pokemon/ursaluna/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/ursaluna/shiny.pal b/gfx/pokemon/ursaluna/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/ursaluna/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 efecffa..10f0e26 100644 --- a/main.asm +++ b/main.asm @@ -475,8 +475,10 @@ INCLUDE "engine/link/time_capsule_2.asm" INCLUDE "engine/pokedex/unown_dex.asm" INCLUDE "engine/events/magikarp.asm" INCLUDE "engine/battle/hidden_power.asm" -INCLUDE "engine/battle/misc.asm" +SECTION "bank3Econt", ROMX + +INCLUDE "engine/battle/misc.asm" SECTION "bank3F", ROMX diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 4fc522a..b7d94d2 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,23 +8,23 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, FOLAGE + getmonname STRING_BUFFER_3, MISDREAVUS writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke FOLAGE, 42, RARE_CANDY + givepoke MISDREAVUS, 42, DUSK_STONE closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, CUBBURN + getmonname STRING_BUFFER_3, HERACROSS writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke CUBBURN, 42, RARE_CANDY + givepoke HERACROSS, 47, MASTER_BALL closetext end @@ -39,34 +39,34 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry GOROCHU + cry DUNSPARCE pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon GOROCHU, 40 + loadwildmon DUNSPARCE, 40 startbattle reloadmapafterbattle end DebugTextA: - text "Waaaake!!" + text "Duuuun!!" done DebugPokemon4Script: faceplayer opentext writetext DebugTextB - cry SHI_SHI + cry BIPULLA pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon SHI_SHI, 40 + loadwildmon BIPULLA, 41 startbattle reloadmapafterbattle end DebugTextB: - text "Komaiiii!" + text "Hissss!" done DebugFlyScript: From 2da479b93cc88992b412ba4c9f9680dcbfe19445 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 19 Nov 2023 01:21:35 -0500 Subject: [PATCH 2/3] The Road To Violet City! --- data/pokemon/base_stats/aercrow.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/belledam.asm | 25 +++++++++++++++++++++++++ data/pokemon/base_stats/bipulla.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/calflac.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/dudunsparce.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/farigiraf.asm | 25 +++++++++++++++++++++++++ data/pokemon/base_stats/mismagius.asm | 21 +++++++++++++++++++++ data/pokemon/base_stats/moibelle.asm | 25 +++++++++++++++++++++++++ data/pokemon/base_stats/phandarin.asm | 25 +++++++++++++++++++++++++ data/pokemon/base_stats/stromen.asm | 25 +++++++++++++++++++++++++ data/pokemon/base_stats/ursaluna.asm | 21 +++++++++++++++++++++ 11 files changed, 251 insertions(+) create mode 100644 data/pokemon/base_stats/aercrow.asm create mode 100644 data/pokemon/base_stats/belledam.asm create mode 100644 data/pokemon/base_stats/bipulla.asm create mode 100644 data/pokemon/base_stats/calflac.asm create mode 100644 data/pokemon/base_stats/dudunsparce.asm create mode 100644 data/pokemon/base_stats/farigiraf.asm create mode 100644 data/pokemon/base_stats/mismagius.asm create mode 100644 data/pokemon/base_stats/moibelle.asm create mode 100644 data/pokemon/base_stats/phandarin.asm create mode 100644 data/pokemon/base_stats/stromen.asm create mode 100644 data/pokemon/base_stats/ursaluna.asm diff --git a/data/pokemon/base_stats/aercrow.asm b/data/pokemon/base_stats/aercrow.asm new file mode 100644 index 0000000..020b7f8 --- /dev/null +++ b/data/pokemon/base_stats/aercrow.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 65, 80, 95, 30, 100, 70 + ; hp atk def spd sat sdf + + db GRASS, FLYING ; type + db 180 ; catch rate + db 98 ; 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/aercrow/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY + ; end diff --git a/data/pokemon/base_stats/belledam.asm b/data/pokemon/base_stats/belledam.asm new file mode 100644 index 0000000..46f85c5 --- /dev/null +++ b/data/pokemon/base_stats/belledam.asm @@ -0,0 +1,25 @@ + db 0 ; species ID placeholder + + db 60, 85, 60, 90, 85, 70 + ; hp atk def spd sat sdf + + db DARK, DARK ; type + db 90 ; catch rate + db 151 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/belledam/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate +<<<<<<< HEAD + dn EGG_GROUND, EGG_GROUND ; egg groups +======= + dn EGG_FIELD, EGG_FIELD ; egg groups +>>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/bipulla.asm b/data/pokemon/base_stats/bipulla.asm new file mode 100644 index 0000000..2b68393 --- /dev/null +++ b/data/pokemon/base_stats/bipulla.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 20, 20, 20, 45, 65, 45 + ; hp atk def spd sat sdf + + db GHOST, GHOST ; type + db 255 ; catch rate + db 67 ; 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/bipulla/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/calflac.asm b/data/pokemon/base_stats/calflac.asm new file mode 100644 index 0000000..39b87b8 --- /dev/null +++ b/data/pokemon/base_stats/calflac.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 40, 40, 40, 65, 75, 55 + ; hp atk def spd sat sdf + + db NORMAL, PSYCHIC_TYPE ; type + db 140 ; catch rate + db 107 ; 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/calflac/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/dudunsparce.asm b/data/pokemon/base_stats/dudunsparce.asm new file mode 100644 index 0000000..fcd68f9 --- /dev/null +++ b/data/pokemon/base_stats/dudunsparce.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 125, 100, 80, 55, 85, 75 + ; hp atk def spd sat sdf + + db NORMAL, NORMAL ; type + db 45 ; catch rate + db 182 ; 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/dudunsparce/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/farigiraf.asm b/data/pokemon/base_stats/farigiraf.asm new file mode 100644 index 0000000..725aa88 --- /dev/null +++ b/data/pokemon/base_stats/farigiraf.asm @@ -0,0 +1,25 @@ + db 0 ; species ID placeholder + + db 120, 90, 70, 60, 110, 70 + ; hp atk def spd sat sdf + + db NORMAL, PSYCHIC_TYPE ; type + db 45 ; catch rate + db 255 ; 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/farigiraf/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset +<<<<<<< HEAD + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT +======= + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT +>>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da + ; end diff --git a/data/pokemon/base_stats/mismagius.asm b/data/pokemon/base_stats/mismagius.asm new file mode 100644 index 0000000..76f5389 --- /dev/null +++ b/data/pokemon/base_stats/mismagius.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 60, 60, 60, 105, 105, 105 + ; hp atk def spd sat sdf + + db GHOST, GHOST ; type + db 45 ; catch rate + db 187 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 25 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/mismagius/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/moibelle.asm b/data/pokemon/base_stats/moibelle.asm new file mode 100644 index 0000000..dca8ec0 --- /dev/null +++ b/data/pokemon/base_stats/moibelle.asm @@ -0,0 +1,25 @@ + db 0 ; species ID placeholder + + db 40, 65, 40, 70, 65, 50 + ; hp atk def spd sat sdf + + db DARK, DARK ; type + db 255 ; catch rate + db 71 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/moibelle/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate +<<<<<<< HEAD + dn EGG_GROUND, EGG_GROUND ; egg groups +======= + dn EGG_FIELD, EGG_FIELD ; egg groups +>>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da + + ; tm/hm learnset + tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT + ; end diff --git a/data/pokemon/base_stats/phandarin.asm b/data/pokemon/base_stats/phandarin.asm new file mode 100644 index 0000000..e92ca43 --- /dev/null +++ b/data/pokemon/base_stats/phandarin.asm @@ -0,0 +1,25 @@ + db 0 ; species ID placeholder + + db 85, 85, 70, 60, 50, 50 + ; hp atk def spd sat sdf + + db GHOST, FAIRY ; type + db 45 ; catch rate + db 196 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/phandarin/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset +<<<<<<< HEAD + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT +======= + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT +>>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da + ; end diff --git a/data/pokemon/base_stats/stromen.asm b/data/pokemon/base_stats/stromen.asm new file mode 100644 index 0000000..d2cfb40 --- /dev/null +++ b/data/pokemon/base_stats/stromen.asm @@ -0,0 +1,25 @@ + db 0 ; species ID placeholder + + db 30, 120, 60, 10, 120, 60 + ; hp atk def spd sat sdf + + db GHOST, DARK ; type + db 90 ; catch rate + db 98 ; base exp + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/stromen/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups + + ; tm/hm learnset +<<<<<<< HEAD + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT +======= + tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT +>>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da + ; end diff --git a/data/pokemon/base_stats/ursaluna.asm b/data/pokemon/base_stats/ursaluna.asm new file mode 100644 index 0000000..75106db --- /dev/null +++ b/data/pokemon/base_stats/ursaluna.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 130, 140, 105, 50, 45, 80 + ; hp atk def spd sat sdf + + db GROUND, NORMAL ; type + db 20 ; catch rate + db 255 ; 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/ursaluna/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups + + ; tm/hm learnset + tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH + ; end From 3d3bf94175fa0e634e22852cdf04004a6bb8c018 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 19 Nov 2023 01:31:28 -0500 Subject: [PATCH 3/3] The Road To Violet City! --- data/pokemon/base_stats/belledam.asm | 5 ----- data/pokemon/base_stats/farigiraf.asm | 4 ---- data/pokemon/base_stats/moibelle.asm | 5 ----- data/pokemon/base_stats/phandarin.asm | 4 ---- data/pokemon/base_stats/stromen.asm | 4 ---- 5 files changed, 22 deletions(-) diff --git a/data/pokemon/base_stats/belledam.asm b/data/pokemon/base_stats/belledam.asm index 46f85c5..883e30e 100644 --- a/data/pokemon/base_stats/belledam.asm +++ b/data/pokemon/base_stats/belledam.asm @@ -14,12 +14,7 @@ INCBIN "gfx/pokemon/belledam/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_FAST ; growth rate -<<<<<<< HEAD dn EGG_GROUND, EGG_GROUND ; egg groups -======= - dn EGG_FIELD, EGG_FIELD ; egg groups ->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da - ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/farigiraf.asm b/data/pokemon/base_stats/farigiraf.asm index 725aa88..b4e42a2 100644 --- a/data/pokemon/base_stats/farigiraf.asm +++ b/data/pokemon/base_stats/farigiraf.asm @@ -17,9 +17,5 @@ dn EGG_GROUND, EGG_INDETERMINATE ; egg groups ; tm/hm learnset -<<<<<<< HEAD tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT -======= - tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT ->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da ; end diff --git a/data/pokemon/base_stats/moibelle.asm b/data/pokemon/base_stats/moibelle.asm index dca8ec0..eeba1c7 100644 --- a/data/pokemon/base_stats/moibelle.asm +++ b/data/pokemon/base_stats/moibelle.asm @@ -14,12 +14,7 @@ INCBIN "gfx/pokemon/moibelle/front.dimensions" dw NULL, NULL ; unused (beta front/back pics) db GROWTH_MEDIUM_FAST ; growth rate -<<<<<<< HEAD dn EGG_GROUND, EGG_GROUND ; egg groups -======= - dn EGG_FIELD, EGG_FIELD ; egg groups ->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da - ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/phandarin.asm b/data/pokemon/base_stats/phandarin.asm index e92ca43..3826895 100644 --- a/data/pokemon/base_stats/phandarin.asm +++ b/data/pokemon/base_stats/phandarin.asm @@ -17,9 +17,5 @@ dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tm/hm learnset -<<<<<<< HEAD tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT -======= - tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT ->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da ; end diff --git a/data/pokemon/base_stats/stromen.asm b/data/pokemon/base_stats/stromen.asm index d2cfb40..72f0e77 100644 --- a/data/pokemon/base_stats/stromen.asm +++ b/data/pokemon/base_stats/stromen.asm @@ -17,9 +17,5 @@ dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups ; tm/hm learnset -<<<<<<< HEAD tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT -======= - tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT ->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da ; end