diff --git a/.gitignore b/.gitignore index 99c530f..879586b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,8 @@ used_space.png # macos files .DS_STORE + +# nix files +result +.envrc +.direnv/* diff --git a/audio/cries.asm b/audio/cries.asm index cf2ead1..a452850 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -2108,3 +2108,39 @@ Cry_Rattata_Ch8: noise_note 1, 10, 2, 57 noise_note 8, 9, 1, 73 sound_ret + +Cry_Earthtron: + channel_count 3 + channel 5, Cry_Earthtron_Ch5 + channel 6, Cry_Earthtron_Ch6 + channel 8, Cry_Earthtron_Ch8 + +Cry_Earthtron_Ch5: ; using the unused 'Earthtron' cry + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret + +Cry_Earthtron_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret + +Cry_Earthtron_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm index 58b948a..b16529c 100644 --- a/audio/cry_pointers.asm +++ b/audio/cry_pointers.asm @@ -69,4 +69,5 @@ Cries: dba Cry_Aipom dba Cry_Dunsparce dba Cry_Donphan + dba Cry_Earthtron assert_table_length NUM_CRIES diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm index 6b5aba6..71503e4 100644 --- a/constants/cry_constants.asm +++ b/constants/cry_constants.asm @@ -72,5 +72,6 @@ const CRY_AIPOM const CRY_DUNSPARCE const CRY_DONPHAN + const CRY_EARTHTRON DEF NUM_CRIES EQU const_value diff --git a/constants/item_constants.asm b/constants/item_constants.asm index ffbe2e6..8a4c5b1 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -150,7 +150,7 @@ const SHINY_STONE ; 8e const METAL_COAT ; 8f const DRAGON_FANG ; 90 - const ITEM_91 ; 91 + const BLK_AUGURITE ; 91 const LEFTOVERS ; 92 const ITEM_93 ; 93 const ITEM_94 ; 94 diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 181bf36..16d0ef9 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -257,6 +257,9 @@ const ROCK_SMASH ; f9 const WHIRLPOOL ; fa const BEAT_UP ; fb + const ROCK_HEAD + const ROCK_SLASH + const CROSS_CUTTER DEF NUM_ATTACKS EQU const_value - 1 if NUM_ATTACKS > $3fff diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 0a7c1c1..463533d 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -34,6 +34,13 @@ const WEEDLE ; 0d const KAKUNA ; 0e const BEEDRILL ; 0f + const GENTLARVA + const PUPAL + const CARAPTHOR + const KOTORA + const GAOTORA + const GOROTORA + const RAITORA const PIDGEY ; 10 const PIDGEOTTO ; 11 const PIDGEOT ; 12 @@ -45,6 +52,7 @@ const ARBOK ; 18 const PIKACHU ; 19 const RAICHU ; 1a + const GOROCHU const SANDSHREW ; 1b const SANDSLASH ; 1c const NIDORAN_F ; 1d @@ -53,29 +61,37 @@ const NIDORAN_M ; 20 const NIDORINO ; 21 const NIDOKING ; 22 + const NIDOREIGN const CLEFAIRY ; 23 const CLEFABLE ; 24 + const VULPIII const VULPIX ; 25 const NINETALES ; 26 const JIGGLYPUFF ; 27 const WIGGLYTUFF ; 28 + const BITTYBAT const ZUBAT ; 29 const GOLBAT ; 2a const ODDISH ; 2b const GLOOM ; 2c const VILEPLUME ; 2d + const PARASPOR const PARAS ; 2e const PARASECT ; 2f const VENONAT ; 30 const VENOMOTH ; 31 const DIGLETT ; 32 const DUGTRIO ; 33 + const COINPUR const MEOWTH ; 34 const PERSIAN ; 35 + const PERRSERKER const PSYDUCK ; 36 const GOLDUCK ; 37 const MANKEY ; 38 const PRIMEAPE ; 39 + const ANNIHILAPE + const PUPPERON const GROWLITHE ; 3a const ARCANINE ; 3b const POLIWAG ; 3c @@ -128,12 +144,17 @@ const HITMONLEE ; 6a const HITMONCHAN ; 6b const LICKITUNG ; 6c + const LICKILICKY + const LICKILORD const KOFFING ; 6d const WEEZING ; 6e const RHYHORN ; 6f const RHYDON ; 70 const CHANSEY ; 71 + const BURGELA const TANGELA ; 72 + const TANGROWTH + const JUNGELA const KANGASKHAN ; 73 const HORSEA ; 74 const SEADRA ; 75 @@ -145,10 +166,12 @@ const STARMIE ; 79 const MR__MIME ; 7a const SCYTHER ; 7b + const KLEAVOR const JYNX ; 7c const ELECTABUZZ ; 7d const MAGMAR ; 7e const PINSIR ; 7f + const TRICULES const TAUROS ; 80 const MAGIKARP ; 81 const GYARADOS ; 82 @@ -221,6 +244,9 @@ DEF JOHTO_POKEMON EQU const_value const QUAGSIRE ; c3 const ESPEON ; c4 const UMBREON ; c5 + const LEAFEON + const GLACEON + const SYLVEON const MURKROW ; c6 const SLOWKING ; c7 const MISDREAVUS ; c8 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index f61da46..0cd88a6 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -220,7 +220,7 @@ DEF NUM_HAPPINESS_CHANGES EQU const_value - 1 ; significant happiness values DEF BASE_HAPPINESS EQU 70 DEF FRIEND_BALL_HAPPINESS EQU 200 -DEF HAPPINESS_TO_EVOLVE EQU 220 +DEF HAPPINESS_TO_EVOLVE EQU 170 DEF HAPPINESS_THRESHOLD_1 EQU 100 DEF HAPPINESS_THRESHOLD_2 EQU 200 diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 8f357a9..aa2d147 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -297,8 +297,8 @@ ItemAttributes: ; BUG: Dragon Scale, not Dragon Fang, boosts Dragon-type moves (see docs/bugs_and_glitches.md) ; DRAGON_FANG item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; ITEM_91 - item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; BLK_AUGURITE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; LEFTOVERS item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_93 diff --git a/data/items/descriptions.asm b/data/items/descriptions.asm index dab49db..1cf3c49 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -145,7 +145,7 @@ ItemDescriptions: dw ShinyStoneDesc dw MetalCoatDesc dw DragonFangDesc - dw QuestionMarkDesc + dw BlkAuguriteDesc dw LeftoversDesc dw QuestionMarkDesc dw QuestionMarkDesc @@ -955,3 +955,7 @@ DuskStoneDesc: ShinyStoneDesc: db "Evolves certain" next "kinds of #MON.@" + +BlkAuguriteDesc: + db "Evolves certain" + next "kinds of #MON.@" diff --git a/data/items/names.asm b/data/items/names.asm index 074fa71..0cdfc24 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -144,7 +144,7 @@ ItemNames:: li "SHINY STONE" li "METAL COAT" li "DRAGON FANG" - li "TERU-SAMA" + li "BLK AUGURITE" li "LEFTOVERS" li "TERU-SAMA" li "TERU-SAMA" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index a433987..0355106 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -71,7 +71,7 @@ MapGroup_Mahogany: map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route42EcruteakGate, TILESET_GATE, GATE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route42, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND + map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_REMORAID ; literally one line and it's fixed map MahoganyTown, TILESET_JOHTO, TOWN, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_MAHOGANY_MAPS diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 4251ca5..bc6d17e 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -279,6 +279,9 @@ BattleAnimations:: dw BattleAnim_RockSmash dw BattleAnim_Whirlpool dw BattleAnim_BeatUp + dw BattleAnim_RockHead + dw BattleAnim_RockSlash + dw BattleAnim_CrossCutter assert_table_length NUM_ATTACKS + 1 dw BattleAnim_SweetScent2 @@ -4592,6 +4595,45 @@ BattleAnim_BeatUp: anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret + +BattleAnim_RockHead: + anim_1gfx ANIM_GFX_SHINE + anim_bgeffect ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW, $0, $0, $0 + anim_sound 0, 0, SFX_RAGE + anim_obj ANIM_OBJ_GLIMMER, 40, 84, $0 + anim_wait 20 + anim_1gfx ANIM_GFX_HIT + anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $14, $2, $0 + anim_wait 32 + anim_call BattleAnim_TargetObj_1Row + anim_bgeffect ANIM_BG_TACKLE, $0, BG_EFFECT_USER, $0 + anim_wait 4 + anim_sound 0, 1, SFX_EGG_BOMB + anim_obj ANIM_OBJ_HIT_YFIX, 136, 56, $0 + anim_wait 8 + anim_call BattleAnim_ShowMon_0 + anim_ret + +BattleAnim_RockSlash: ;uses the Slash animation + anim_1gfx ANIM_GFX_CUT + anim_sound 0, 1, SFX_CUT + anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 152, 40, $0 + anim_obj ANIM_OBJ_CUT_LONG_DOWN_LEFT, 148, 36, $0 + anim_wait 32 + anim_ret + +BattleAnim_CrossCutter: ;uses the Cross Chop animation + anim_1gfx ANIM_GFX_CUT + anim_sound 0, 1, SFX_CUT + anim_obj ANIM_OBJ_CROSS_CHOP1, 152, 40, $0 + anim_obj ANIM_OBJ_CROSS_CHOP2, 120, 72, $0 + anim_wait 8 + anim_bgeffect ANIM_BG_SHAKE_SCREEN_X, $58, $2, $0 + anim_wait 92 + anim_sound 0, 1, SFX_VICEGRIP + anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10 + anim_wait 16 + anim_ret BattleAnimSub_Drain: anim_obj ANIM_OBJ_DRAIN, 132, 44, $0 diff --git a/data/moves/critical_hit_moves.asm b/data/moves/critical_hit_moves.asm index f0111ed..0ea6f2d 100644 --- a/data/moves/critical_hit_moves.asm +++ b/data/moves/critical_hit_moves.asm @@ -6,4 +6,5 @@ CriticalHitMoves: dw SLASH dw AEROBLAST dw CROSS_CHOP + dw CROSS_CUTTER dw -1 diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index 4feceab..8638f1c 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -256,6 +256,9 @@ MoveDescriptions1: dw RockSmashDescription dw WhirlpoolDescription dw BeatUpDescription + dw RockHeadDescription + dw RockSlashDescription + dw CrossCutterDescription .IndirectEnd:: InvalidMoveDescription: @@ -1264,3 +1267,15 @@ WhirlpoolDescription: BeatUpDescription: db "Party #MON join" next "in the attack.@" + +RockHeadDescription: + db "An attack that may" + next "cause flinching.@" + +RockSlashDescription: + db "A strong imprecise" + next "ROCK-type attack.@" ;the original description was too long I think + +CrossCutterDescription: + db "Has a high criti-" + next "cal hit ratio.@" diff --git a/data/moves/moves.asm b/data/moves/moves.asm index a9ba712..0f6e8c1 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -269,4 +269,7 @@ Moves1: move EFFECT_DEFENSE_DOWN_HIT, 20, FIGHTING, 100, 15, 50 ;ROCK_SMASH move EFFECT_TRAP_TARGET, 15, WATER, 70, 15, 0 ;WHIRLPOOL move EFFECT_BEAT_UP, 10, DARK, 100, 10, 0 ;BEAT_UP + move EFFECT_FLINCH_HIT, 80, ROCK, 100, 15, 30 ;ROCK_HEAD + move EFFECT_NORMAL_HIT, 140, ROCK, 70, 5, 0 ;ROCK_SLASH + move EFFECT_NORMAL_HIT, 50, BUG, 100, 15, 0 ;CROSS_CUTTER .IndirectEnd:: diff --git a/data/moves/names.asm b/data/moves/names.asm index 8b61038..612b2e4 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -251,4 +251,7 @@ MoveNames:: li "ROCK SMASH" li "WHIRLPOOL" li "BEAT UP" + li "ROCK HEAD" + li "ROCK SLASH" + li "CROSS CUTTER" assert_list_length NUM_ATTACKS diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 0250a27..b5b14e3 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -42,6 +42,13 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm" INCLUDE "data/pokemon/base_stats/weedle.asm" INCLUDE "data/pokemon/base_stats/kakuna.asm" INCLUDE "data/pokemon/base_stats/beedrill.asm" +INCLUDE "data/pokemon/base_stats/gentlarva.asm" +INCLUDE "data/pokemon/base_stats/pupal.asm" +INCLUDE "data/pokemon/base_stats/carapthor.asm" +INCLUDE "data/pokemon/base_stats/kotora.asm" +INCLUDE "data/pokemon/base_stats/gaotora.asm" +INCLUDE "data/pokemon/base_stats/gorotora.asm" +INCLUDE "data/pokemon/base_stats/raitora.asm" INCLUDE "data/pokemon/base_stats/pidgey.asm" INCLUDE "data/pokemon/base_stats/pidgeotto.asm" INCLUDE "data/pokemon/base_stats/pidgeot.asm" @@ -53,6 +60,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm" INCLUDE "data/pokemon/base_stats/arbok.asm" INCLUDE "data/pokemon/base_stats/pikachu.asm" INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/gorochu.asm" INCLUDE "data/pokemon/base_stats/sandshrew.asm" INCLUDE "data/pokemon/base_stats/sandslash.asm" INCLUDE "data/pokemon/base_stats/nidoran_f.asm" @@ -61,29 +69,37 @@ INCLUDE "data/pokemon/base_stats/nidoqueen.asm" INCLUDE "data/pokemon/base_stats/nidoran_m.asm" INCLUDE "data/pokemon/base_stats/nidorino.asm" INCLUDE "data/pokemon/base_stats/nidoking.asm" +INCLUDE "data/pokemon/base_stats/nidoreign.asm" INCLUDE "data/pokemon/base_stats/clefairy.asm" INCLUDE "data/pokemon/base_stats/clefable.asm" +INCLUDE "data/pokemon/base_stats/vulpiii.asm" INCLUDE "data/pokemon/base_stats/vulpix.asm" INCLUDE "data/pokemon/base_stats/ninetales.asm" INCLUDE "data/pokemon/base_stats/jigglypuff.asm" INCLUDE "data/pokemon/base_stats/wigglytuff.asm" +INCLUDE "data/pokemon/base_stats/bittybat.asm" INCLUDE "data/pokemon/base_stats/zubat.asm" INCLUDE "data/pokemon/base_stats/golbat.asm" INCLUDE "data/pokemon/base_stats/oddish.asm" INCLUDE "data/pokemon/base_stats/gloom.asm" INCLUDE "data/pokemon/base_stats/vileplume.asm" +INCLUDE "data/pokemon/base_stats/paraspor.asm" INCLUDE "data/pokemon/base_stats/paras.asm" INCLUDE "data/pokemon/base_stats/parasect.asm" INCLUDE "data/pokemon/base_stats/venonat.asm" INCLUDE "data/pokemon/base_stats/venomoth.asm" INCLUDE "data/pokemon/base_stats/diglett.asm" INCLUDE "data/pokemon/base_stats/dugtrio.asm" +INCLUDE "data/pokemon/base_stats/coinpur.asm" INCLUDE "data/pokemon/base_stats/meowth.asm" INCLUDE "data/pokemon/base_stats/persian.asm" +INCLUDE "data/pokemon/base_stats/perrserker.asm" INCLUDE "data/pokemon/base_stats/psyduck.asm" INCLUDE "data/pokemon/base_stats/golduck.asm" INCLUDE "data/pokemon/base_stats/mankey.asm" INCLUDE "data/pokemon/base_stats/primeape.asm" +INCLUDE "data/pokemon/base_stats/annihilape.asm" +INCLUDE "data/pokemon/base_stats/pupperon.asm" INCLUDE "data/pokemon/base_stats/growlithe.asm" INCLUDE "data/pokemon/base_stats/arcanine.asm" INCLUDE "data/pokemon/base_stats/poliwag.asm" @@ -136,12 +152,17 @@ INCLUDE "data/pokemon/base_stats/marowak.asm" INCLUDE "data/pokemon/base_stats/hitmonlee.asm" INCLUDE "data/pokemon/base_stats/hitmonchan.asm" INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/lickilicky.asm" +INCLUDE "data/pokemon/base_stats/lickilord.asm" INCLUDE "data/pokemon/base_stats/koffing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhydon.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" +INCLUDE "data/pokemon/base_stats/burgela.asm" INCLUDE "data/pokemon/base_stats/tangela.asm" +INCLUDE "data/pokemon/base_stats/tangrowth.asm" +INCLUDE "data/pokemon/base_stats/jungela.asm" INCLUDE "data/pokemon/base_stats/kangaskhan.asm" INCLUDE "data/pokemon/base_stats/horsea.asm" INCLUDE "data/pokemon/base_stats/seadra.asm" @@ -153,10 +174,12 @@ INCLUDE "data/pokemon/base_stats/staryu.asm" INCLUDE "data/pokemon/base_stats/starmie.asm" INCLUDE "data/pokemon/base_stats/mr__mime.asm" INCLUDE "data/pokemon/base_stats/scyther.asm" +INCLUDE "data/pokemon/base_stats/kleavor.asm" INCLUDE "data/pokemon/base_stats/jynx.asm" INCLUDE "data/pokemon/base_stats/electabuzz.asm" INCLUDE "data/pokemon/base_stats/magmar.asm" INCLUDE "data/pokemon/base_stats/pinsir.asm" +INCLUDE "data/pokemon/base_stats/tricules.asm" INCLUDE "data/pokemon/base_stats/tauros.asm" INCLUDE "data/pokemon/base_stats/magikarp.asm" INCLUDE "data/pokemon/base_stats/gyarados.asm" @@ -228,6 +251,9 @@ INCLUDE "data/pokemon/base_stats/wooper.asm" INCLUDE "data/pokemon/base_stats/quagsire.asm" INCLUDE "data/pokemon/base_stats/espeon.asm" INCLUDE "data/pokemon/base_stats/umbreon.asm" +INCLUDE "data/pokemon/base_stats/leafeon.asm" +INCLUDE "data/pokemon/base_stats/glaceon.asm" +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" diff --git a/data/pokemon/base_stats/lickilord.asm b/data/pokemon/base_stats/lickilord.asm index f6e2229..f1b2db2 100644 --- a/data/pokemon/base_stats/lickilord.asm +++ b/data/pokemon/base_stats/lickilord.asm @@ -1,6 +1,6 @@ db 0 ; species ID placeholder - db 100, 65, 85, 50, 110, 105 + db 80, 110, 105, 70, 65, 85 ; hp atk def spd sat sdf db NORMAL, POISON ; type diff --git a/data/pokemon/base_stats/vulpiii.asm b/data/pokemon/base_stats/vulpiii.asm new file mode 100644 index 0000000..b2611c0 --- /dev/null +++ b/data/pokemon/base_stats/vulpiii.asm @@ -0,0 +1,21 @@ + db 0 ; species ID placeholder + + db 28, 31, 30, 60, 45, 60 + ; hp atk def spd sat sdf + + db FIRE, FIRE ; type + db 190 ; catch rate + db 63 ; base exp + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/vulpix/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, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index bc64bc1..2456b0f 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -21,6 +21,13 @@ PokemonCries:: mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL + mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) + mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA + mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA + mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA + mon_cry CRY_KANGASKHAN, 5, 129 ; RAITORA (Clone of Gorotora's for nowtm) mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT @@ -32,6 +39,7 @@ PokemonCries:: mon_cry CRY_EKANS, 224, 144 ; ARBOK mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU mon_cry CRY_RAICHU, 238, 136 ; RAICHU + mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F @@ -40,29 +48,37 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 256 ; NIDORAN_M mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO mon_cry CRY_RAICHU, 0, 256 ; NIDOKING + mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN mon_cry CRY_CLEFAIRY, 204, 129 ; CLEFAIRY mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE + mon_cry CRY_PIDGEY, 224, 224 ; VULPIII mon_cry CRY_VULPIX, 79, 144 ; VULPIX mon_cry CRY_VULPIX, 136, 224 ; NINETALES mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, 224, 256 ; BITTYBAT (need to recover the old one from before it was removed from KEP) mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT mon_cry CRY_ODDISH, 221, 129 ; ODDISH mon_cry CRY_ODDISH, 170, 192 ; GLOOM mon_cry CRY_VILEPLUME, 34, 383 ; VILEPLUME + mon_cry CRY_PARAS, 32, 352 ; PARASPOR (see bittybat) mon_cry CRY_PARAS, 32, 352 ; PARAS mon_cry CRY_PARAS, 66, 383 ; PARASECT mon_cry CRY_VENONAT, 68, 192 ; VENONAT mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO + mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN + mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise) mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE + mon_cry CRY_NIDOQUEEN, -1280, 512 ; ANNIHILAPE + mon_cry CRY_GROWLITHE, 32, 192 ; PUPPERON (see bittybat) mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE mon_cry CRY_PIDGEY, 255, 383 ; POLIWAG @@ -115,12 +131,17 @@ PokemonCries:: mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN mon_cry CRY_SEEL, 0, 256 ; LICKITUNG + mon_cry CRY_SEEL, -256, 300 ; LICKILICKY, tentative + mon_cry CRY_SEEL, -300, 400 ; LICKILORD, tentative mon_cry CRY_GOLEM, 230, 349 ; KOFFING mon_cry CRY_GOLEM, 255, 383 ; WEEZING mon_cry CRY_CHARMANDER, 0, 256 ; RHYHORN mon_cry CRY_RHYDON, 0, 256 ; RHYDON mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY + mon_cry CRY_GOLEM, 50, 140 ; BURGELA, tentative mon_cry CRY_GOLEM, 0, 256 ; TANGELA + mon_cry CRY_GOLEM, -256, 350 ; TANGROWTH, tentative + mon_cry CRY_GOLEM, -140, 383 ; JUNGELA, tentative mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA @@ -132,10 +153,12 @@ PokemonCries:: mon_cry CRY_PARAS, 0, 256 ; STARMIE mon_cry CRY_KRABBY, 8, 192 ; MR__MIME mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER + mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR mon_cry CRY_DROWZEE, 255, 383 ; JYNX mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR + mon_cry CRY_RAICHU, 291, 256 ; TRICULES mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS mon_cry CRY_EKANS, 128, 128 ; MAGIKARP mon_cry CRY_EKANS, 0, 256 ; GYARADOS @@ -207,6 +230,9 @@ PokemonCries:: mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE mon_cry CRY_AIPOM, 162, 320 ; ESPEON mon_cry CRY_VENONAT, -233, 240 ; UMBREON + mon_cry CRY_NIDORAN_M, 0, 0 ; LEAFEON (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; GLACEON (incomplete) + mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete) mon_cry CRY_MARILL, -31, 384 ; MURKROW mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING mon_cry CRY_HOOTHOOT, 304, 232 ; MISDREAVUS diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 59843ed..fb2d1be 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -15,6 +15,13 @@ ButterfreePokedexEntry:: INCLUDE "data/pokemon/dex_entries/butterfree.asm" WeedlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/weedle.asm" KakunaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kakuna.asm" BeedrillPokedexEntry:: INCLUDE "data/pokemon/dex_entries/beedrill.asm" +KotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kotora.asm" +GaotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gaotora.asm" +GorotoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorotora.asm" +RaitoraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raitora.asm" +GentlarvaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gentlarva.asm" +PupalPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupal.asm" +CarapthorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/carapthor.asm" PidgeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgey.asm" PidgeottoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeotto.asm" PidgeotPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pidgeot.asm" @@ -26,6 +33,7 @@ EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm" ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm" PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm" RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm" +GorochuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorochu.asm" SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm" SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm" NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm" @@ -34,29 +42,37 @@ NidoqueenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoqueen.asm" NidoranMPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_m.asm" NidorinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidorino.asm" NidokingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoking.asm" +NidoreignPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoreign.asm" ClefairyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefairy.asm" ClefablePokedexEntry:: INCLUDE "data/pokemon/dex_entries/clefable.asm" +VulpiiiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpiii.asm" VulpixPokedexEntry:: INCLUDE "data/pokemon/dex_entries/vulpix.asm" NinetalesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ninetales.asm" JigglypuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jigglypuff.asm" WigglytuffPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wigglytuff.asm" +BittybatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bittybat.asm" ZubatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/zubat.asm" GolbatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golbat.asm" OddishPokedexEntry:: INCLUDE "data/pokemon/dex_entries/oddish.asm" GloomPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gloom.asm" VileplumePokedexEntry:: INCLUDE "data/pokemon/dex_entries/vileplume.asm" +ParasporPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paraspor.asm" ParasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/paras.asm" ParasectPokedexEntry:: INCLUDE "data/pokemon/dex_entries/parasect.asm" VenonatPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venonat.asm" VenomothPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venomoth.asm" DiglettPokedexEntry:: INCLUDE "data/pokemon/dex_entries/diglett.asm" DugtrioPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dugtrio.asm" +CoinpurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coinpur.asm" MeowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/meowth.asm" +PerrserkerPokedexEntry:: INCLUDE "data/pokemon/dex_entries/perrserker.asm" PersianPokedexEntry:: INCLUDE "data/pokemon/dex_entries/persian.asm" PsyduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/psyduck.asm" GolduckPokedexEntry:: INCLUDE "data/pokemon/dex_entries/golduck.asm" MankeyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mankey.asm" PrimeapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/primeape.asm" +AnnihilapePokedexEntry:: INCLUDE "data/pokemon/dex_entries/annihilape.asm" +PupperonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pupperon.asm" GrowlithePokedexEntry:: INCLUDE "data/pokemon/dex_entries/growlithe.asm" ArcaninePokedexEntry:: INCLUDE "data/pokemon/dex_entries/arcanine.asm" PoliwagPokedexEntry:: INCLUDE "data/pokemon/dex_entries/poliwag.asm" @@ -113,12 +129,17 @@ MarowakPokedexEntry:: INCLUDE "data/pokemon/dex_entries/marowak.asm" HitmonleePokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonlee.asm" HitmonchanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/hitmonchan.asm" LickitungPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickitung.asm" +LickilickyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickilicky.asm" +LickilordPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lickilord.asm" KoffingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/koffing.asm" WeezingPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weezing.asm" RhyhornPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhyhorn.asm" RhydonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/rhydon.asm" ChanseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/chansey.asm" +BurgelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/burgela.asm" TangelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangela.asm" +TangrowthPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tangrowth.asm" +JungelaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jungela.asm" KangaskhanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kangaskhan.asm" HorseaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/horsea.asm" SeadraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/seadra.asm" @@ -130,10 +151,12 @@ StaryuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/staryu.asm" StarmiePokedexEntry:: INCLUDE "data/pokemon/dex_entries/starmie.asm" MrMimePokedexEntry:: INCLUDE "data/pokemon/dex_entries/mr__mime.asm" ScytherPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scyther.asm" +KleavorPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kleavor.asm" JynxPokedexEntry:: INCLUDE "data/pokemon/dex_entries/jynx.asm" ElectabuzzPokedexEntry:: INCLUDE "data/pokemon/dex_entries/electabuzz.asm" MagmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magmar.asm" PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm" +TriculesPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tricules.asm" TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" @@ -213,6 +236,9 @@ WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" EspeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/espeon.asm" UmbreonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/umbreon.asm" +LeafeonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/leafeon.asm" +GlaceonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/glaceon.asm" +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" diff --git a/data/pokemon/dex_entries/annihilape.asm b/data/pokemon/dex_entries/annihilape.asm new file mode 100644 index 0000000..a32f088 --- /dev/null +++ b/data/pokemon/dex_entries/annihilape.asm @@ -0,0 +1,12 @@ + db "RAGEMONKEY@" ; species name + dw 311, 1235 ; height, weight + + db "ANNIHILAPE has" + next "abandoned its" + next "physical body," + + page "using its rage" + next "to deform its" + next "body in combat.@" ; Reference to its expanding unshackled arm. + +; could be revised. diff --git a/data/pokemon/dex_entries/bittybat.asm b/data/pokemon/dex_entries/bittybat.asm new file mode 100644 index 0000000..8df1f33 --- /dev/null +++ b/data/pokemon/dex_entries/bittybat.asm @@ -0,0 +1,10 @@ + db "TINY BAT@" ; species name + dw 107, 85 ; height, weight + + db "Flits about in" + next "dark caves. A" + next "swarm of BITTYBAT" + + page "can overwhelm" + next "even significantly" + next "larger #MON.@" diff --git a/data/pokemon/dex_entries/burgela.asm b/data/pokemon/dex_entries/burgela.asm new file mode 100644 index 0000000..1797e46 --- /dev/null +++ b/data/pokemon/dex_entries/burgela.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 200, 312 ; height, weight + + db "As it runs about," + next "the vines on its" + next "head may obscure" + + page "its singular eye," + next "causing it to" + next "trip and fall.@" diff --git a/data/pokemon/dex_entries/carapthor.asm b/data/pokemon/dex_entries/carapthor.asm new file mode 100644 index 0000000..a2da377 --- /dev/null +++ b/data/pokemon/dex_entries/carapthor.asm @@ -0,0 +1,10 @@ + db "DAPPER@" ; species name + dw 311, 760 ; height, weight + + db "Thanks to its" + next "trademark jog," + next "CARAPTHOR is a" + + page "common sight on" + next "old television" + next "shows.@" diff --git a/data/pokemon/dex_entries/coinpur.asm b/data/pokemon/dex_entries/coinpur.asm new file mode 100644 index 0000000..8dfd68d --- /dev/null +++ b/data/pokemon/dex_entries/coinpur.asm @@ -0,0 +1,10 @@ + db "BIG EATER@" ; species name + dw 102, 45 ; height, weight + + db "Due to its poor" + next "eyesight, it's" + next "often distracted" + + page "by city lights." + next "Even shiny coins" + next "transfix it.@" ; Vague reference to nighttime pollinators raiding people's homes, but applied to magpie-like behaviours. diff --git a/data/pokemon/dex_entries/gaotora.asm b/data/pokemon/dex_entries/gaotora.asm new file mode 100644 index 0000000..b95d3dd --- /dev/null +++ b/data/pokemon/dex_entries/gaotora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 307, 1620 ; height, weight + + db "As GAOTORA grows," + next "it becomes more" + next "rebellious. It" + + page "loves to shock" + next "its owners as" + next "a prank.@" diff --git a/data/pokemon/dex_entries/gentlarva.asm b/data/pokemon/dex_entries/gentlarva.asm new file mode 100644 index 0000000..9fc85ac --- /dev/null +++ b/data/pokemon/dex_entries/gentlarva.asm @@ -0,0 +1,10 @@ + db "GRUB@" ; species name + dw 100, 80 ; height, weight + + db "Adored by the" + next "elderly, it's" + next "seen as a symbol" + + page "of a simpler" + next "time. Feeds on" + next "tree sap.@" diff --git a/data/pokemon/dex_entries/glaceon.asm b/data/pokemon/dex_entries/glaceon.asm new file mode 100644 index 0000000..1fdcee6 --- /dev/null +++ b/data/pokemon/dex_entries/glaceon.asm @@ -0,0 +1,10 @@ + db "FRESH SNOW@" ; species name + dw 207, 571 ; height, weight + + db "With a mere cry," + next "diamond dust will" + next "fill the air." + + page "This makes it a" + next "popular #MON" + next "at ski resorts.@" diff --git a/data/pokemon/dex_entries/gorochu.asm b/data/pokemon/dex_entries/gorochu.asm new file mode 100644 index 0000000..808cdb5 --- /dev/null +++ b/data/pokemon/dex_entries/gorochu.asm @@ -0,0 +1,10 @@ + db "VOLTAGE@" ; species name + dw 511, 1960 ; height, weight + + db "Proud of its power," + next "GOROCHU will seek" + next "foes and shock" + + page "them with THUNDER." + next "It can easily take" + next "down a TRAMPEL.@" \ No newline at end of file diff --git a/data/pokemon/dex_entries/gorotora.asm b/data/pokemon/dex_entries/gorotora.asm new file mode 100644 index 0000000..b3a4472 --- /dev/null +++ b/data/pokemon/dex_entries/gorotora.asm @@ -0,0 +1,10 @@ + db "GOROTORA@" ; species name + dw 511, 3870 ; height, weight + + db "Lives in wooded" + next "areas. Completely" + next "wild, it strikes" + + page "all who enter its" + next "domain with bolts" + next "of THUNDER.@" diff --git a/data/pokemon/dex_entries/jungela.asm b/data/pokemon/dex_entries/jungela.asm new file mode 100644 index 0000000..b88319f --- /dev/null +++ b/data/pokemon/dex_entries/jungela.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 505, 3901 ; height, weight + + db "In dense jungles," + next "its creeping vines" + next "may snare and drag" + + page "any that trod on" + next "them away to meet" + next "their doom.@" diff --git a/data/pokemon/dex_entries/kleavor.asm b/data/pokemon/dex_entries/kleavor.asm new file mode 100644 index 0000000..21cf4f4 --- /dev/null +++ b/data/pokemon/dex_entries/kleavor.asm @@ -0,0 +1,10 @@ + db "AXE@" ; species name + dw 511, 1962 ; height, weight + + db "Pieces from KLEAVOR-" + next "'s axes often fall" + next "in battle, making" + + page "them sharper. The" + next "shards can be used" + next "to make tools.@" diff --git a/data/pokemon/dex_entries/kotora.asm b/data/pokemon/dex_entries/kotora.asm new file mode 100644 index 0000000..561ead7 --- /dev/null +++ b/data/pokemon/dex_entries/kotora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 200, 620 ; height, weight + + db "Its rotund looks" + next "make it a popular" + next "first pet with" + + page "kids. However," + next "neglect quickly" + next "makes it feral.@" diff --git a/data/pokemon/dex_entries/leafeon.asm b/data/pokemon/dex_entries/leafeon.asm new file mode 100644 index 0000000..8533789 --- /dev/null +++ b/data/pokemon/dex_entries/leafeon.asm @@ -0,0 +1,10 @@ + db "VERDANT@" ; species name + dw 303, 562 ; height, weight + + db "Thanks to its" + next "photosynthesis," ; Don't ask about how long it took to make this fit in a reasonable manner. Please. + next "forests with" + + page "LEAFEON have" + next "pristine air." ; Reference to the Lental Pokedex entry. + next "Hides in bushes.@" diff --git a/data/pokemon/dex_entries/lickilicky.asm b/data/pokemon/dex_entries/lickilicky.asm new file mode 100644 index 0000000..bbd5e27 --- /dev/null +++ b/data/pokemon/dex_entries/lickilicky.asm @@ -0,0 +1,10 @@ + db "LICKING@" ; species name + dw 507, 3086 ; height, weight + + db "Despite its" + next "rubbery appearance" + next "its massive tongue" + + page "can be extended" + next "with enough force" + next "to crush boulders." diff --git a/data/pokemon/dex_entries/lickilord.asm b/data/pokemon/dex_entries/lickilord.asm new file mode 100644 index 0000000..47598c0 --- /dev/null +++ b/data/pokemon/dex_entries/lickilord.asm @@ -0,0 +1,10 @@ + db "LICKING@" ; species name + dw 611, 4371 ; height, weight + + db "It commands" + next "LICKITUNG with" + next "ultrasonic scree-" + + page "ches. A single" + next "lick causes" + next "severe poisoning." diff --git a/data/pokemon/dex_entries/nidoreign.asm b/data/pokemon/dex_entries/nidoreign.asm new file mode 100644 index 0000000..8af2d0a --- /dev/null +++ b/data/pokemon/dex_entries/nidoreign.asm @@ -0,0 +1,10 @@ + db "LUNAR@" ; species name + dw 405, 1350 ; height, weight + + db "Said to come from" + next "the moon. The" + next "poison from its" + + page "spikes is often" + next "used in making" + next "powerful medicine." diff --git a/data/pokemon/dex_entries/paraspor.asm b/data/pokemon/dex_entries/paraspor.asm new file mode 100644 index 0000000..8160c0c --- /dev/null +++ b/data/pokemon/dex_entries/paraspor.asm @@ -0,0 +1,10 @@ + db "MUSHROOM@" ; species name + dw 50, 100 ; height, weight + + db "Unable to move" + next "quickly, it lulls" + next "hungry WEEDLE" + + page "into gnawing its" + next "mushroom before" + next "ambushing them.@" diff --git a/data/pokemon/dex_entries/perrserker.asm b/data/pokemon/dex_entries/perrserker.asm new file mode 100644 index 0000000..77b345c --- /dev/null +++ b/data/pokemon/dex_entries/perrserker.asm @@ -0,0 +1,10 @@ + db "BIG EATER@" ; species name + dw 207, 617 ; height, weight + + db "PERSIAN is its" + next "archenemy. Their" + next "mutual disdain" + + page "have led to" + next "large-scale" + next "wars in cities.@" ; Could easily be revised. diff --git a/data/pokemon/dex_entries/pupal.asm b/data/pokemon/dex_entries/pupal.asm new file mode 100644 index 0000000..a24a947 --- /dev/null +++ b/data/pokemon/dex_entries/pupal.asm @@ -0,0 +1,10 @@ + db "PUPA@" ; species name + dw 207, 220 ; height, weight + + db "Dislikes fights." + next "As PUPAL awaits" + next "evolution, a" + + page "rhythmic hum can" + next "be heard from" + next "within.@" diff --git a/data/pokemon/dex_entries/pupperon.asm b/data/pokemon/dex_entries/pupperon.asm new file mode 100644 index 0000000..8769614 --- /dev/null +++ b/data/pokemon/dex_entries/pupperon.asm @@ -0,0 +1,10 @@ + db "PUPPY@" ; species name + dw 102, 210 ; height, weight + + db "Popular with rich" + next "women, PUPPERON's" + next "cute looks stop" + + page "even the coldest" + next "hearts in the" + next "street.@" ; If you know, you know. diff --git a/data/pokemon/dex_entries/raitora.asm b/data/pokemon/dex_entries/raitora.asm new file mode 100644 index 0000000..43fc1bf --- /dev/null +++ b/data/pokemon/dex_entries/raitora.asm @@ -0,0 +1,10 @@ + db "SHOCK CAT@" ; species name + dw 511, 4070 ; height, weight + + db "A domesticated" + next "KOTORA becomes" + next "this #MON." + + page "It loves to" + next "play with kids" + next "who groom it.@" diff --git a/data/pokemon/dex_entries/sylveon.asm b/data/pokemon/dex_entries/sylveon.asm new file mode 100644 index 0000000..89ba76f --- /dev/null +++ b/data/pokemon/dex_entries/sylveon.asm @@ -0,0 +1,10 @@ + db "INTERTWINING@" ; species name + dw 303, 518 ; height, weight + + db "Even against a" + next "dragon #MON," + next "SYLVEON will" + + page "fight valiantly." + next "This founded many" + next "fairy tales.@" diff --git a/data/pokemon/dex_entries/tangrowth.asm b/data/pokemon/dex_entries/tangrowth.asm new file mode 100644 index 0000000..5cd833d --- /dev/null +++ b/data/pokemon/dex_entries/tangrowth.asm @@ -0,0 +1,10 @@ + db "VINE@" ; species name + dw 607, 2835 ; height, weight + + db "It lives in swampy" + next "areas, feeding on" + next "unsuspecting prey." + + page "Small #MON" + next "often play on" + next "its myriad vines.@" diff --git a/data/pokemon/dex_entries/tricules.asm b/data/pokemon/dex_entries/tricules.asm new file mode 100644 index 0000000..b65d2f4 --- /dev/null +++ b/data/pokemon/dex_entries/tricules.asm @@ -0,0 +1,10 @@ + db "BIG HORN@" ; species name + dw 501, 2420 ; height, weight + + db "Its elongated hor-" + next "ns contain steel" + next "components. It" + + page "easily blocks any" + next "attack with its" + next "iron-like body.@" diff --git a/data/pokemon/dex_entries/vulpiii.asm b/data/pokemon/dex_entries/vulpiii.asm new file mode 100644 index 0000000..e4a014e --- /dev/null +++ b/data/pokemon/dex_entries/vulpiii.asm @@ -0,0 +1,10 @@ + db "FOX@" ; species name + dw 120, 110 ; height, weight + + db "Small and weak," + next "VULPIII prefers" + next "to pacify foes by" + + page "by shaking its" + next "3 tails instead" + next "of fighting.@" ; Reference to Tail Whip overuse by Gen 1 AI diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 502b566..5529c14 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -16,6 +16,13 @@ PokedexDataPointerTable: dba WeedlePokedexEntry dba KakunaPokedexEntry dba BeedrillPokedexEntry + dba GentlarvaPokedexEntry + dba PupalPokedexEntry + dba CarapthorPokedexEntry + dba KotoraPokedexEntry + dba GaotoraPokedexEntry + dba GorotoraPokedexEntry + dba RaitoraPokedexEntry dba PidgeyPokedexEntry dba PidgeottoPokedexEntry dba PidgeotPokedexEntry @@ -27,6 +34,7 @@ PokedexDataPointerTable: dba ArbokPokedexEntry dba PikachuPokedexEntry dba RaichuPokedexEntry + dba GorochuPokedexEntry dba SandshrewPokedexEntry dba SandslashPokedexEntry dba NidoranFPokedexEntry @@ -35,29 +43,37 @@ PokedexDataPointerTable: dba NidoranMPokedexEntry dba NidorinoPokedexEntry dba NidokingPokedexEntry + dba NidoreignPokedexEntry dba ClefairyPokedexEntry dba ClefablePokedexEntry + dba VulpiiiPokedexEntry dba VulpixPokedexEntry dba NinetalesPokedexEntry dba JigglypuffPokedexEntry dba WigglytuffPokedexEntry + dba BittybatPokedexEntry dba ZubatPokedexEntry dba GolbatPokedexEntry dba OddishPokedexEntry dba GloomPokedexEntry dba VileplumePokedexEntry + dba ParasporPokedexEntry dba ParasPokedexEntry dba ParasectPokedexEntry dba VenonatPokedexEntry dba VenomothPokedexEntry dba DiglettPokedexEntry dba DugtrioPokedexEntry + dba CoinpurPokedexEntry dba MeowthPokedexEntry dba PersianPokedexEntry + dba PerrserkerPokedexEntry dba PsyduckPokedexEntry dba GolduckPokedexEntry dba MankeyPokedexEntry dba PrimeapePokedexEntry + dba AnnihilapePokedexEntry + dba PupperonPokedexEntry dba GrowlithePokedexEntry dba ArcaninePokedexEntry dba PoliwagPokedexEntry @@ -110,12 +126,17 @@ PokedexDataPointerTable: dba HitmonleePokedexEntry dba HitmonchanPokedexEntry dba LickitungPokedexEntry + dba LickilickyPokedexEntry + dba LickilordPokedexEntry dba KoffingPokedexEntry dba WeezingPokedexEntry dba RhyhornPokedexEntry dba RhydonPokedexEntry dba ChanseyPokedexEntry + dba BurgelaPokedexEntry dba TangelaPokedexEntry + dba TangrowthPokedexEntry + dba JungelaPokedexEntry dba KangaskhanPokedexEntry dba HorseaPokedexEntry dba SeadraPokedexEntry @@ -127,10 +148,12 @@ PokedexDataPointerTable: dba StarmiePokedexEntry dba MrMimePokedexEntry dba ScytherPokedexEntry + dba KleavorPokedexEntry dba JynxPokedexEntry dba ElectabuzzPokedexEntry dba MagmarPokedexEntry dba PinsirPokedexEntry + dba TriculesPokedexEntry dba TaurosPokedexEntry dba MagikarpPokedexEntry dba GyaradosPokedexEntry @@ -202,6 +225,9 @@ PokedexDataPointerTable: dba QuagsirePokedexEntry dba EspeonPokedexEntry dba UmbreonPokedexEntry + dba LeafeonPokedexEntry + dba GlaceonPokedexEntry + dba SylveonPokedexEntry dba MurkrowPokedexEntry dba SlowkingPokedexEntry dba MisdreavusPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 53bc6cf..ed4a3ad 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -7,6 +7,7 @@ AlphabeticalPokedexOrder: dw AIPOM dw ALAKAZAM dw AMPHAROS + dw ANNIHILAPE dw ARBOK dw ARCANINE dw ARIADOS @@ -17,11 +18,14 @@ AlphabeticalPokedexOrder: dw BELLIGNAN dw BELLOSSOM dw BELLSPROUT + dw BITTYBAT dw BLASTOISE dw BLASTYKE dw BLISSEY dw BULBASAUR + dw BURGELA dw BUTTERFREE + dw CARAPTHOR dw CATERPIE dw CELEBI dw CHANSEY @@ -34,6 +38,7 @@ AlphabeticalPokedexOrder: dw CLEFAIRY dw CLEFFA dw CLOYSTER + dw COINPUR dw CORSOLA dw CROBAT dw CROCONAW @@ -69,15 +74,20 @@ AlphabeticalPokedexOrder: dw FORRETRESS dw FURRET dw GASTLY + dw GAOTORA dw GENGAR + dw GENTLARVA dw GEODUDE dw GIRAFARIG + dw GLACEON dw GLIGAR dw GLOOM dw GOLBAT dw GOLDEEN dw GOLDUCK dw GOLEM + dw GOROCHU + dw GOROTORA dw GRANBULL dw GRAVELER dw GRIMER @@ -100,6 +110,7 @@ AlphabeticalPokedexOrder: dw JIGGLYPUFF dw JOLTEON dw JUMPLUFF + dw JUNGELA dw JYNX dw KABUTO dw KABUTOPS @@ -108,13 +119,18 @@ AlphabeticalPokedexOrder: dw KANGASKHAN dw KINGDRA dw KINGLER + dw KLEAVOR dw KOFFING + dw KOTORA dw KRABBY dw LANTURN dw LAPRAS dw LARVITAR + dw LEAFEON dw LEDIAN dw LEDYBA + dw LICKILICKY + dw LICKILORD dw LICKITUNG dw LUGIA dw MACHAMP @@ -148,6 +164,7 @@ AlphabeticalPokedexOrder: dw NIDOQUEEN dw NIDORAN_F dw NIDORAN_M + dw NIDOREIGN dw NIDORINA dw NIDORINO dw NINETALES @@ -159,6 +176,8 @@ AlphabeticalPokedexOrder: dw ONIX dw PARAS dw PARASECT + dw PARASPOR + dw PERRSERKER dw PERSIAN dw PHANPY dw PICHU @@ -178,11 +197,14 @@ AlphabeticalPokedexOrder: dw PORYGON2 dw PRIMEAPE dw PSYDUCK + dw PUPAL dw PUPITAR + dw PUPPERON dw QUAGSIRE dw QUILAVA dw QWILFISH dw RAICHU + dw RAITORA dw RAIKOU dw RAPIDASH dw RATICATE @@ -224,7 +246,9 @@ AlphabeticalPokedexOrder: dw SUNFLORA dw SUNKERN dw SWINUB + dw SYLVEON dw TANGELA + dw TANGROWTH dw TAUROS dw TEDDIURSA dw TENTACOOL @@ -233,6 +257,7 @@ AlphabeticalPokedexOrder: dw TOGETIC dw TOTARTLE dw TOTODILE + dw TRICULES dw TYPHLOSION dw TYRANITAR dw TYROGUE @@ -246,6 +271,7 @@ AlphabeticalPokedexOrder: dw VICTREEBEL dw VILEPLUME dw VOLTORB + dw VULPIII dw VULPIX dw WALKING_WAKE dw WARTORTLE diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 684ca10..b120d25 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -25,12 +25,20 @@ NewPokedexOrder: dw PICHU dw PIKACHU dw RAICHU + dw GOROCHU dw CATERPIE dw METAPOD dw BUTTERFREE dw WEEDLE dw KAKUNA dw BEEDRILL + dw GENTLARVA + dw PUPAL + dw CARAPTHOR + dw KOTORA + dw GAOTORA + dw GOROTORA + dw RAITORA dw LEDYBA dw LEDIAN dw SPINARAK @@ -38,6 +46,7 @@ NewPokedexOrder: dw GEODUDE dw GRAVELER dw GOLEM + dw BITTYBAT dw ZUBAT dw GOLBAT dw CROBAT @@ -72,6 +81,7 @@ NewPokedexOrder: dw HOPPIP dw SKIPLOOM dw JUMPLUFF + dw PARASPOR dw PARAS dw PARASECT dw POLIWAG @@ -103,6 +113,7 @@ NewPokedexOrder: dw NIDORAN_M dw NIDORINO dw NIDOKING + dw NIDOREIGN dw YANMA dw SUNKERN dw SUNFLORA @@ -114,7 +125,9 @@ NewPokedexOrder: dw VENOMOTH dw SCYTHER dw SCIZOR + dw KLEAVOR dw PINSIR + dw TRICULES dw HERACROSS dw KOFFING dw WEEZING @@ -127,8 +140,10 @@ NewPokedexOrder: dw AIPOM dw SNUBBULL dw GRANBULL + dw VULPIII dw VULPIX dw NINETALES + dw PUPPERON dw GROWLITHE dw ARCANINE dw STANTLER @@ -138,8 +153,11 @@ NewPokedexOrder: dw DUGTRIO dw MANKEY dw PRIMEAPE + dw ANNIHILAPE + dw COINPUR dw MEOWTH dw PERSIAN + dw PERRSERKER dw PSYDUCK dw GOLDUCK dw MACHOP @@ -181,13 +199,21 @@ NewPokedexOrder: dw SEEL dw DEWGONG dw LICKITUNG + dw LICKILICKY + dw LICKILORD + dw BURGELA dw TANGELA + dw TANGROWTH + dw JUNGELA dw EEVEE dw VAPOREON dw JOLTEON dw FLAREON dw ESPEON dw UMBREON + dw LEAFEON + dw GLACEON + dw SYLVEON dw HORSEA dw SEADRA dw KINGDRA diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 9970126..6f5f23d 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -47,12 +47,17 @@ EggMovePointers2:: dw NoEggMoves2 dw NoEggMoves2 dw NoEggMoves2 + dw NoEggMoves2 ; Leafeon + dw NoEggMoves2 ; Glaceon + dw NoEggMoves2 ; Sylveon dw MurkrowEggMoves + ; dw NoEggMoves2 ; Honchkrow dw NoEggMoves2 dw MisdreavusEggMoves + ; dw NoEggMoves2 ; Mismagius dw NoEggMoves2 dw NoEggMoves2 - dw GirafarigEggMoves + dw GirafarigEggMoves ; This'll need a lot of stuff. Calfalc, Tsuinzu, Farigiraf... dw PinecoEggMoves dw NoEggMoves2 dw DunsparceEggMoves @@ -468,5 +473,6 @@ LarvitarEggMoves: dw OUTRAGE dw FOCUS_ENERGY dw ANCIENTPOWER + dw ROCK_SLASH NoEggMoves2: dw -1 ; end diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 1ae6925..6a765e9 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -9,13 +9,20 @@ EggMovePointers1: dw NoEggMoves1 dw SquirtleEggMoves dw NoEggMoves1 + dw NoEggMoves1 ; Totartle dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 - dw NoEggMoves1 + dw NoEggMoves1 ; Gentlarva + dw NoEggMoves1 ; Pupal + dw NoEggMoves1 ; Carapthor + dw KotoraEggMoves + dw NoEggMoves1 ; Gaotora + dw NoEggMoves1 ; Gorotora + dw NoEggMoves1 ; Raitora dw PidgeyEggMoves dw NoEggMoves1 dw NoEggMoves1 @@ -27,6 +34,7 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 dw SandshrewEggMoves dw NoEggMoves1 dw NidoranFEggMoves @@ -35,30 +43,38 @@ EggMovePointers1: dw NidoranMEggMoves dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 ; Nidoreign dw NoEggMoves1 dw NoEggMoves1 - dw VulpixEggMoves + dw VulpiiiEggMoves dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 - dw ZubatEggMoves + dw NoEggMoves1 + dw BittybatEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw OddishEggMoves dw NoEggMoves1 dw NoEggMoves1 - dw ParasEggMoves + dw ParasporEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw VenonatEggMoves dw NoEggMoves1 dw DiglettEggMoves dw NoEggMoves1 - dw MeowthEggMoves + dw CoinpurEggMoves dw NoEggMoves1 + dw NoEggMoves1 + dw NoEggMoves1 ; Perrserker dw PsyduckEggMoves dw NoEggMoves1 dw MankeyEggMoves dw NoEggMoves1 - dw GrowlitheEggMoves + dw NoEggMoves1 ; Annihilape + dw PupperonEggMoves + dw NoEggMoves1 dw NoEggMoves1 dw PoliwagEggMoves dw NoEggMoves1 @@ -110,27 +126,34 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw LickitungEggMoves + dw NoEggMoves1 ; Lickilicky + dw NoEggMoves1 ; Lickilord dw KoffingEggMoves dw NoEggMoves1 dw RhyhornEggMoves dw NoEggMoves1 dw ChanseyEggMoves - dw TangelaEggMoves + dw BurgelaEggMoves ; Burgela + dw NoEggMoves1 + dw NoEggMoves1 ; Tangrowth + dw NoEggMoves1 ; Jungela dw KangaskhanEggMoves dw HorseaEggMoves dw NoEggMoves1 - dw BlastykeEggMoves - dw NoEggMoves1 + dw BlastykeEggMoves ; Blastyke + dw NoEggMoves1 ; Blastoise dw GoldeenEggMoves dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw MrMimeEggMoves dw ScytherEggMoves + dw NoEggMoves1 ; Kleavor dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 dw PinsirEggMoves + dw NoEggMoves1 ; Tricules dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -146,8 +169,8 @@ EggMovePointers1: dw KabutoEggMoves dw NoEggMoves1 dw AerodactylEggMoves - dw MunchlaxEggMoves - dw SnorlaxEggMoves + dw MunchlaxEggMoves ; Munchlax + dw NoEggMoves1 ; Should this even exist? dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 @@ -184,6 +207,12 @@ SquirtleEggMoves: dw FLAIL dw -1 ; end +KotoraEggMoves: + dw SCREECH + dw CHARM + dw CRUNCH + dw -1 ; end + PidgeyEggMoves: dw PURSUIT dw FAINT_ATTACK @@ -243,7 +272,7 @@ NidoranMEggMoves: dw BEAT_UP dw -1 ; end -VulpixEggMoves: +VulpiiiEggMoves: dw FAINT_ATTACK dw HYPNOSIS dw FLAIL @@ -251,7 +280,7 @@ VulpixEggMoves: dw DISABLE dw -1 ; end -ZubatEggMoves: +BittybatEggMoves: dw QUICK_ATTACK dw PURSUIT dw FAINT_ATTACK @@ -266,7 +295,7 @@ OddishEggMoves: dw SYNTHESIS dw -1 ; end -ParasEggMoves: +ParasporEggMoves: dw FALSE_SWIPE dw SCREECH dw COUNTER @@ -274,6 +303,7 @@ ParasEggMoves: dw FLAIL dw LIGHT_SCREEN dw PURSUIT + dw ROCK_SLASH dw -1 ; end VenonatEggMoves: @@ -290,7 +320,7 @@ DiglettEggMoves: dw BEAT_UP dw -1 ; end -MeowthEggMoves: +CoinpurEggMoves: dw SPITE dw CHARM dw HYPNOSIS @@ -317,7 +347,7 @@ MankeyEggMoves: dw BEAT_UP dw -1 ; end -GrowlitheEggMoves: +PupperonEggMoves: dw BODY_SLAM dw SAFEGUARD dw CRUNCH @@ -365,6 +395,7 @@ TentacoolEggMoves: GeodudeEggMoves: dw MEGA_PUNCH dw ROCK_SLIDE + dw ROCK_SLASH dw -1 ; end PonytaEggMoves: @@ -444,6 +475,7 @@ KrabbyEggMoves: dw AMNESIA dw FLAIL dw SLAM + dw ROCK_SLASH dw -1 ; end ExeggcuteEggMoves: @@ -462,6 +494,7 @@ CuboneEggMoves: dw SKULL_BASH dw PERISH_SONG dw SWORDS_DANCE + dw ROCK_HEAD dw -1 ; end LickitungEggMoves: @@ -494,7 +527,7 @@ ChanseyEggMoves: dw HEAL_BELL dw -1 ; end -TangelaEggMoves: +BurgelaEggMoves: dw FLAIL dw CONFUSION dw MEGA_DRAIN @@ -552,6 +585,7 @@ ScytherEggMoves: PinsirEggMoves: dw FURY_ATTACK dw FLAIL + dw ROCK_SLASH dw -1 ; end LaprasEggMoves: @@ -590,10 +624,6 @@ MunchlaxEggMoves: dw LICK dw -1 ; end -SnorlaxEggMoves: - dw LICK - dw -1 ; end - DratiniEggMoves: dw LIGHT_SCREEN dw MIST diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index 6e62d51..7c40893 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -47,6 +47,9 @@ EvosAttacksPointers2:: dw QuagsireEvosAttacks dw EspeonEvosAttacks dw UmbreonEvosAttacks + dw LeafeonEvosAttacks + dw GlaceonEvosAttacks + dw SylveonEvosAttacks dw MurkrowEvosAttacks dw SlowkingEvosAttacks dw MisdreavusEvosAttacks @@ -718,6 +721,48 @@ UmbreonEvosAttacks: dbw 52, MOONLIGHT db 0 ; no more level-up moves +LeafeonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, ABSORB + dbw 23, QUICK_ATTACK + dbw 30, GROWTH + dbw 36, RAZOR_LEAF + dbw 42, TAKE_DOWN + dbw 47, SYNTHESIS + dbw 52, SOLARBEAM + db 0 ; no more level-up moves + +GlaceonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, AURORA_BEAM + dbw 23, QUICK_ATTACK + dbw 30, MIST + dbw 36, HAZE + dbw 42, TAKE_DOWN + dbw 47, BLIZZARD + dbw 52, BARRIER + db 0 ; no more level-up moves + +SylveonEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, TAIL_WHIP + dbw 8, SAND_ATTACK + dbw 16, POUND ; DISARMING_VOICE + dbw 23, QUICK_ATTACK + dbw 30, POUND ; DRAINING_KISS + dbw 36, POUND ; DAZZLING_GLEAM + dbw 42, SWIFT + dbw 47, CHARM + dbw 52, LIGHT_SCREEN + db 0 ; no more level-up moves + MurkrowEvosAttacks: db 0 ; no more evolutions dbw 1, PECK diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 173ef89..6a3c9f0 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -16,6 +16,13 @@ EvosAttacksPointers1:: dw WeedleEvosAttacks dw KakunaEvosAttacks dw BeedrillEvosAttacks + dw GentlarvaEvosAttacks + dw PupalEvosAttacks + dw CarapthorEvosAttacks + dw KotoraEvosAttacks + dw GaotoraEvosAttacks + dw GorotoraEvosAttacks + dw RaitoraEvosAttacks dw PidgeyEvosAttacks dw PidgeottoEvosAttacks dw PidgeotEvosAttacks @@ -27,6 +34,7 @@ EvosAttacksPointers1:: dw ArbokEvosAttacks dw PikachuEvosAttacks dw RaichuEvosAttacks + dw GorochuEvosAttacks dw SandshrewEvosAttacks dw SandslashEvosAttacks dw NidoranFEvosAttacks @@ -35,29 +43,37 @@ EvosAttacksPointers1:: dw NidoranMEvosAttacks dw NidorinoEvosAttacks dw NidokingEvosAttacks + dw NidoreignEvosAttacks dw ClefairyEvosAttacks dw ClefableEvosAttacks + dw VulpiiiEvosAttacks dw VulpixEvosAttacks dw NinetalesEvosAttacks dw JigglypuffEvosAttacks dw WigglytuffEvosAttacks + dw BittybatEvosAttacks dw ZubatEvosAttacks dw GolbatEvosAttacks dw OddishEvosAttacks dw GloomEvosAttacks dw VileplumeEvosAttacks + dw ParasporEvosAttacks dw ParasEvosAttacks dw ParasectEvosAttacks dw VenonatEvosAttacks dw VenomothEvosAttacks dw DiglettEvosAttacks dw DugtrioEvosAttacks + dw CoinpurEvosAttacks dw MeowthEvosAttacks dw PersianEvosAttacks + dw PerrserkerEvosAttacks dw PsyduckEvosAttacks dw GolduckEvosAttacks dw MankeyEvosAttacks dw PrimeapeEvosAttacks + dw AnnihilapeEvosAttacks + dw PupperonEvosAttacks dw GrowlitheEvosAttacks dw ArcanineEvosAttacks dw PoliwagEvosAttacks @@ -110,12 +126,17 @@ EvosAttacksPointers1:: dw HitmonleeEvosAttacks dw HitmonchanEvosAttacks dw LickitungEvosAttacks + dw LickilickyEvosAttacks + dw LickilordEvosAttacks dw KoffingEvosAttacks dw WeezingEvosAttacks dw RhyhornEvosAttacks dw RhydonEvosAttacks dw ChanseyEvosAttacks + dw BurgelaEvosAttacks dw TangelaEvosAttacks + dw TangrowthEvosAttacks + dw JungelaEvosAttacks dw KangaskhanEvosAttacks dw HorseaEvosAttacks dw SeadraEvosAttacks @@ -127,10 +148,12 @@ EvosAttacksPointers1:: dw StarmieEvosAttacks dw MrMimeEvosAttacks dw ScytherEvosAttacks + dw KleavorEvosAttacks dw JynxEvosAttacks dw ElectabuzzEvosAttacks dw MagmarEvosAttacks dw PinsirEvosAttacks + dw TriculesEvosAttacks dw TaurosEvosAttacks dw MagikarpEvosAttacks dw GyaradosEvosAttacks @@ -366,6 +389,98 @@ BeedrillEvosAttacks: dbw 40, AGILITY db 0 ; no more level-up moves +GentlarvaEvosAttacks: + dbbw EVOLVE_LEVEL, 7, PUPAL + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 1, STRING_SHOT + db 0 ; no more level-up moves + +PupalEvosAttacks: + dbbw EVOLVE_LEVEL, 10, CARAPTHOR + db 0 ; no more evolutions + dbw 1, HARDEN + dbw 7, HARDEN + db 0 ; no more level-up moves + +CarapthorEvosAttacks: + db 0 ; no more evolutions + dbw 1, COMET_PUNCH + dbw 10, COMET_PUNCH + dbw 15, PIN_MISSILE + dbw 20, DEFENSE_CURL + dbw 25, SWIFT + dbw 30, MEGA_PUNCH + dbw 35, SUBSTITUTE + dbw 40, SWAGGER + db 0 ; no more level-up moves + +KotoraEvosAttacks: + dbbw EVOLVE_LEVEL, 16, GAOTORA + dbbw EVOLVE_ITEM, THUNDERSTONE, RAITORA + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 18, QUICK_ATTACK + dbw 23, PURSUIT + dbw 27, SPARK + dbw 31, BITE + dbw 34, SCARY_FACE + dbw 42, THUNDER + dbw 49, AGILITY + db 0 ; no more level-up moves + +GaotoraEvosAttacks: + dbbw EVOLVE_LEVEL, 36, GAOTORA + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 39, BITE + dbw 44, SCARY_FACE + dbw 49, THRASH + dbw 54, THUNDER + dbw 49, AGILITY + db 0 ; no more level-up moves + +GorotoraEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 36, BODY_SLAM + dbw 42, BITE + dbw 50, SCARY_FACE + dbw 58, THRASH + dbw 66, THUNDER + dbw 78, AGILITY + db 0 ; no more level-up moves + +RaitoraEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 3, TACKLE + dbw 7, LEER + dbw 13, ROAR + dbw 20, QUICK_ATTACK + dbw 27, PURSUIT + dbw 33, SPARK + dbw 39, BITE + dbw 44, SCARY_FACE + dbw 54, THUNDER + dbw 63, AGILITY + db 0 ; no more level-up moves + PidgeyEvosAttacks: dbbw EVOLVE_LEVEL, 18, PIDGEOTTO db 0 ; no more evolutions @@ -504,12 +619,25 @@ PikachuEvosAttacks: db 0 ; no more level-up moves RaichuEvosAttacks: + dbbw EVOLVE_TRADE, -1, GOROCHU db 0 ; no more evolutions dbw 1, THUNDERSHOCK dbw 1, TAIL_WHIP dbw 1, QUICK_ATTACK dbw 1, THUNDERBOLT db 0 ; no more level-up moves + +GorochuEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 1, TAIL_WHIP + dbw 1, QUICK_ATTACK + dbw 1, THUNDERBOLT + dbw 53, SAND_ATTACK + dbw 57, FOCUS_ENERGY + dbw 60, LEER + dbw 65, HORN_DRILL + db 0 ; no more level-up moves SandshrewEvosAttacks: dbbw EVOLVE_LEVEL, 22, SANDSLASH @@ -552,7 +680,9 @@ NidoranFEvosAttacks: db 0 ; no more level-up moves NidorinaEvosAttacks: - dbbw EVOLVE_ITEM, MOON_STONE, NIDOQUEEN + dbbw EVOLVE_ITEM, POISON_STONE, NIDOQUEEN + dbbw EVOLVE_LEVEL, 36, NIDOQUEEN + dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions dbw 1, GROWL dbw 1, TACKLE @@ -587,7 +717,9 @@ NidoranMEvosAttacks: db 0 ; no more level-up moves NidorinoEvosAttacks: - dbbw EVOLVE_ITEM, MOON_STONE, NIDOKING + dbbw EVOLVE_ITEM, POISON_STONE, NIDOKING + dbbw EVOLVE_LEVEL, 36, NIDOKING + dbbw EVOLVE_ITEM, MOON_STONE, NIDOREIGN db 0 ; no more evolutions dbw 1, LEER dbw 1, TACKLE @@ -607,6 +739,15 @@ NidokingEvosAttacks: dbw 1, POISON_STING dbw 23, THRASH db 0 ; no more level-up moves + +NidoreignEvosAttacks: + db 0 ; no more evolutions + dbw 1, TACKLE + dbw 1, SPIKE_CANNON + dbw 1, POISON_STING + dbw 1, TOXIC + dbw 23, ROCK_HEAD + db 0 ; no more level-up moves ClefairyEvosAttacks: dbbw EVOLVE_ITEM, MOON_STONE, CLEFABLE @@ -631,6 +772,19 @@ ClefableEvosAttacks: dbw 1, MOONLIGHT db 0 ; no more level-up moves +VulpiiiEvosAttacks: + dbbw EVOLVE_LEVEL, 15, VULPIX + db 0 ; no more evolutions + dbw 1, EMBER + dbw 1, TAIL_WHIP + dbw 7, QUICK_ATTACK + dbw 13, ROAR + dbw 17, CONFUSE_RAY + dbw 21, SAFEGUARD + dbw 25, FLAMETHROWER + dbw 29, FIRE_SPIN + db 0 ; no more level-up moves + VulpixEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, NINETALES db 0 ; no more evolutions @@ -675,6 +829,18 @@ WigglytuffEvosAttacks: dbw 1, DOUBLESLAP db 0 ; no more level-up moves +BittybatEvosAttacks: + dbbw EVOLVE_LEVEL, 15, ZUBAT + db 0 ; no more evolutions + dbw 1, LEECH_LIFE + dbw 6, SUPERSONIC + dbw 12, BITE + dbw 17, CONFUSE_RAY + dbw 23, WING_ATTACK + dbw 30, MEAN_LOOK + dbw 38, HAZE + db 0 ; no more level-up moves + ZubatEvosAttacks: dbbw EVOLVE_LEVEL, 22, GOLBAT db 0 ; no more evolutions @@ -689,6 +855,7 @@ ZubatEvosAttacks: GolbatEvosAttacks: dbbw EVOLVE_HAPPINESS, TR_ANYTIME, CROBAT + dbbw EVOLVE_LEVEL, 44, CROBAT ; do we need it this time? db 0 ; no more evolutions dbw 1, SCREECH dbw 1, LEECH_LIFE @@ -738,6 +905,20 @@ VileplumeEvosAttacks: dbw 1, PETAL_DANCE db 0 ; no more level-up moves +ParasporEvosAttacks: + dbbw EVOLVE_LEVEL, 15, PARAS + db 0 ; no more evolutions + dbw 1, ABSORB + dbw 1, SCRATCH + dbw 7, STUN_SPORE + dbw 13, POISONPOWDER + dbw 17, LEECH_LIFE + dbw 21, SPORE + dbw 25, SLASH + dbw 29, GROWTH + dbw 33, GIGA_DRAIN + db 0 ; no more level-up moves + ParasEvosAttacks: dbbw EVOLVE_LEVEL, 24, PARASECT db 0 ; no more evolutions @@ -826,6 +1007,19 @@ DugtrioEvosAttacks: dbw 61, FISSURE db 0 ; no more level-up moves +CoinpurEvosAttacks: + dbbw EVOLVE_LEVEL, 14, MEOWTH ; Consideration: Day, Meowth, night, Moibelle. May be excessive. + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 11, BITE + dbw 19, PAY_DAY ; I remember having it learn this way earlier in later KEP versions... + dbw 25, FAINT_ATTACK + dbw 30, SCREECH + dbw 34, FURY_SWIPES + dbw 37, SLASH ; Seems a bit late, but Meowth gets it at L46, so... + db 0 ; no more level-up moves + MeowthEvosAttacks: dbbw EVOLVE_LEVEL, 28, PERSIAN db 0 ; no more evolutions @@ -852,6 +1046,19 @@ PersianEvosAttacks: dbw 53, SLASH db 0 ; no more level-up moves +PerrserkerEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, GROWL + dbw 11, METAL_CLAW + dbw 20, PAY_DAY + dbw 29, SWAGGER + dbw 38, SCREECH + dbw 46, FURY_SWIPES + dbw 53, SLASH + dbw 63, THRASH + db 0 ; no more level-up moves + PsyduckEvosAttacks: dbbw EVOLVE_LEVEL, 33, GOLDUCK db 0 ; no more evolutions @@ -888,6 +1095,7 @@ MankeyEvosAttacks: dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD dbw 27, FOCUS_ENERGY dbw 33, SEISMIC_TOSS dbw 39, CROSS_CHOP @@ -896,6 +1104,7 @@ MankeyEvosAttacks: db 0 ; no more level-up moves PrimeapeEvosAttacks: + dbbw EVOLVE_TRADE, -1, ANNIHILAPE ; funny db 0 ; no more evolutions dbw 1, SCRATCH dbw 1, LEER @@ -904,6 +1113,7 @@ PrimeapeEvosAttacks: dbw 9, LOW_KICK dbw 15, KARATE_CHOP dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD dbw 27, FOCUS_ENERGY dbw 28, RAGE dbw 36, SEISMIC_TOSS @@ -912,6 +1122,38 @@ PrimeapeEvosAttacks: dbw 63, THRASH db 0 ; no more level-up moves +AnnihilapeEvosAttacks: + db 0 ; no more evolutions + dbw 1, SCRATCH + dbw 1, LEER + dbw 1, LOW_KICK + dbw 1, RAGE + dbw 9, LOW_KICK + dbw 15, KARATE_CHOP + dbw 21, FURY_SWIPES + dbw 24, ROCK_HEAD + dbw 27, FOCUS_ENERGY + dbw 28, RAGE + dbw 36, SEISMIC_TOSS + dbw 45, CROSS_CHOP + dbw 54, SCREECH + dbw 63, THRASH + dbw 72, SPITE + db 0 ; no more level-up moves + +PupperonEvosAttacks: + dbbw EVOLVE_LEVEL, 15, GROWLITHE + db 0 ; no more evolutions + dbw 1, BITE + dbw 1, ROAR + dbw 9, EMBER + dbw 16, LEER + dbw 22, TAKE_DOWN + dbw 28, FLAME_WHEEL + dbw 34, AGILITY + dbw 40, FLAMETHROWER + db 0 ; no more level-up moves + GrowlitheEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, ARCANINE db 0 ; no more evolutions @@ -950,6 +1192,7 @@ PoliwagEvosAttacks: PoliwhirlEvosAttacks: dbbw EVOLVE_ITEM, WATER_STONE, POLIWRATH dbbw EVOLVE_TRADE, KINGS_ROCK, POLITOED + dbbw EVOLVE_ITEM, HEART_STONE, POLITOED db 0 ; no more evolutions dbw 1, BUBBLE dbw 1, HYPNOSIS @@ -1146,6 +1389,7 @@ GeodudeEvosAttacks: dbw 31, ROLLOUT dbw 36, EARTHQUAKE dbw 41, EXPLOSION + dbw 46, ROCK_HEAD db 0 ; no more level-up moves GravelerEvosAttacks: @@ -1162,6 +1406,7 @@ GravelerEvosAttacks: dbw 34, ROLLOUT dbw 41, EARTHQUAKE dbw 48, EXPLOSION + dbw 55, ROCK_HEAD db 0 ; no more level-up moves GolemEvosAttacks: @@ -1178,6 +1423,7 @@ GolemEvosAttacks: dbw 34, ROLLOUT dbw 41, EARTHQUAKE dbw 48, EXPLOSION + dbw 55, ROCK_HEAD db 0 ; no more level-up moves PonytaEvosAttacks: @@ -1214,6 +1460,7 @@ RapidashEvosAttacks: SlowpokeEvosAttacks: dbbw EVOLVE_LEVEL, 37, SLOWBRO dbbw EVOLVE_TRADE, KINGS_ROCK, SLOWKING + dbbw EVOLVE_ITEM, HEART_STONE, SLOWKING db 0 ; no more evolutions dbw 1, CURSE dbw 1, TACKLE @@ -1432,6 +1679,7 @@ GengarEvosAttacks: OnixEvosAttacks: dbbw EVOLVE_TRADE, METAL_COAT, STEELIX + dbbw EVOLVE_LEVEL, 38, STEELIX db 0 ; no more evolutions dbw 1, TACKLE dbw 1, SCREECH @@ -1439,6 +1687,7 @@ OnixEvosAttacks: dbw 14, ROCK_THROW dbw 23, HARDEN dbw 27, RAGE + dbw 31, ROCK_HEAD dbw 36, SANDSTORM dbw 40, SLAM db 0 ; no more level-up moves @@ -1618,6 +1867,9 @@ HitmonchanEvosAttacks: db 0 ; no more level-up moves LickitungEvosAttacks: + dbbw EVOLVE_LEVEL, 32, LICKILICKY + dbbw EVOLVE_ITEM, POISON_STONE, LICKILORD + dbbw EVOLVE_TRADE, KINGS_ROCK, LICKILORD db 0 ; no more evolutions dbw 1, LICK dbw 7, SUPERSONIC @@ -1628,6 +1880,28 @@ LickitungEvosAttacks: dbw 37, SLAM dbw 43, SCREECH db 0 ; no more level-up moves + +LickilickyEvosAttacks: + db 0 ; no more evolutions + dbw 1, LICK + dbw 7, SUPERSONIC + dbw 13, DEFENSE_CURL + dbw 19, STOMP + dbw 25, WRAP + dbw 31, DISABLE + dbw 32, ROLLOUT + dbw 40, SLAM + dbw 49, SCREECH + db 0 ; no more level-up moves + +LickilordEvosAttacks: + db 0 ; no more evolutions + dbw 1, ACID + dbw 1, LICK + dbw 1, WRAP + dbw 1, SLAM + dbw 30, TOXIC + db 0 ; no more level-up moves KoffingEvosAttacks: dbbw EVOLVE_LEVEL, 35, WEEZING @@ -1667,6 +1941,7 @@ RhyhornEvosAttacks: dbw 19, FURY_ATTACK dbw 31, SCARY_FACE dbw 37, HORN_DRILL + dbw 43, ROCK_HEAD dbw 49, TAKE_DOWN dbw 55, EARTHQUAKE db 0 ; no more level-up moves @@ -1681,6 +1956,7 @@ RhydonEvosAttacks: dbw 19, FURY_ATTACK dbw 31, SCARY_FACE dbw 37, HORN_DRILL + dbw 48, ROCK_HEAD dbw 54, TAKE_DOWN dbw 65, EARTHQUAKE db 0 ; no more level-up moves @@ -1701,7 +1977,24 @@ ChanseyEvosAttacks: dbw 57, DOUBLE_EDGE db 0 ; no more level-up moves +BurgelaEvosAttacks: + dbbw EVOLVE_LEVEL, 22, TANGELA + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 4, SLEEP_POWDER + dbw 10, ABSORB + dbw 13, POISONPOWDER + dbw 19, VINE_WHIP + dbw 23, BIND + dbw 27, MEGA_DRAIN + dbw 28, STUN_SPORE + dbw 32, SLAM + dbw 36, GROWTH + db 0 ; no more level-up moves + TangelaEvosAttacks: + dbbw EVOLVE_LEVEL, 44, TANGROWTH + dbbw EVOLVE_ITEM, DUSK_STONE, JUNGELA db 0 ; no more evolutions dbw 1, CONSTRICT dbw 4, SLEEP_POWDER @@ -1714,6 +2007,30 @@ TangelaEvosAttacks: dbw 40, SLAM dbw 46, GROWTH db 0 ; no more level-up moves + +TangrowthEvosAttacks: + db 0 ; no more evolutions + dbw 1, CONSTRICT + dbw 4, SLEEP_POWDER + dbw 10, ABSORB + dbw 13, POISONPOWDER + dbw 19, VINE_WHIP + dbw 25, BIND + dbw 31, MEGA_DRAIN + dbw 34, STUN_SPORE + dbw 40, SLAM + dbw 44, ANCIENTPOWER + dbw 51, GROWTH + db 0 ; no more level-up moves + +JungelaEvosAttacks: + db 0 ; no more evolutions + dbw 1, VINE_WHIP + dbw 1, BIND + dbw 1, FAINT_ATTACK + dbw 1, NIGHT_SHADE + dbw 30, GIGA_DRAIN + db 0 ; no more level-up moves KangaskhanEvosAttacks: db 0 ; no more evolutions @@ -1857,6 +2174,8 @@ MrMimeEvosAttacks: ScytherEvosAttacks: dbbw EVOLVE_TRADE, METAL_COAT, SCIZOR + dbbw EVOLVE_LEVEL, 41, SCIZOR + dbbw EVOLVE_ITEM, BLK_AUGURITE, KLEAVOR db 0 ; no more evolutions dbw 1, QUICK_ATTACK dbw 1, LEER @@ -1869,6 +2188,20 @@ ScytherEvosAttacks: dbw 42, SWORDS_DANCE dbw 48, DOUBLE_TEAM db 0 ; no more level-up moves + +KleavorEvosAttacks: + db 0 ; no more evolutions + dbw 1, QUICK_ATTACK + dbw 1, LEER + dbw 6, FOCUS_ENERGY + dbw 12, PURSUIT + dbw 18, FALSE_SWIPE + dbw 24, AGILITY + dbw 30, ROCK_SLASH + dbw 36, SLASH + dbw 42, SWORDS_DANCE + dbw 48, DOUBLE_TEAM + db 0 ; no more level-up moves JynxEvosAttacks: db 0 ; no more evolutions @@ -1916,15 +2249,32 @@ MagmarEvosAttacks: db 0 ; no more level-up moves PinsirEvosAttacks: + dbbw EVOLVE_TRADE, METAL_COAT, TRICULES + dbbw EVOLVE_LEVEL, 42, TRICULES db 0 ; no more evolutions dbw 1, VICEGRIP dbw 7, FOCUS_ENERGY dbw 13, BIND dbw 19, SEISMIC_TOSS dbw 25, HARDEN - dbw 31, GUILLOTINE + dbw 31, CROSS_CUTTER dbw 37, SUBMISSION dbw 43, SWORDS_DANCE + dbw 49, GUILLOTINE + db 0 ; no more level-up moves + +TriculesEvosAttacks: + db 0 ; no more evolutions + dbw 1, VICEGRIP + dbw 7, FOCUS_ENERGY + dbw 13, BIND + dbw 19, SEISMIC_TOSS + dbw 25, HARDEN + dbw 31, CROSS_CUTTER + dbw 37, SUBMISSION + dbw 42, METAL_CLAW + dbw 43, SWORDS_DANCE + dbw 49, GUILLOTINE db 0 ; no more level-up moves TaurosEvosAttacks: @@ -1986,6 +2336,9 @@ EeveeEvosAttacks: dbbw EVOLVE_ITEM, FIRE_STONE, FLAREON dbbw EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON dbbw EVOLVE_HAPPINESS, TR_NITE, UMBREON + dbbw EVOLVE_ITEM, LEAF_STONE, LEAFEON + dbbw EVOLVE_ITEM, ICE_STONE, GLACEON + dbbw EVOLVE_ITEM, MOON_STONE, SYLVEON db 0 ; no more evolutions dbw 1, TACKLE dbw 1, TAIL_WHIP @@ -2105,19 +2458,21 @@ KabutopsEvosAttacks: dbw 37, ENDURE dbw 40, SLASH dbw 51, MEGA_DRAIN + dbw 58, ROCK_SLASH dbw 65, ANCIENTPOWER db 0 ; no more level-up moves AerodactylEvosAttacks: db 0 ; no more evolutions - dbw 1, WING_ATTACK + dbw 1, TAKE_DOWN dbw 8, AGILITY dbw 15, BITE dbw 22, SUPERSONIC - dbw 29, ANCIENTPOWER + dbw 28, ANCIENTPOWER dbw 36, SCARY_FACE - dbw 43, TAKE_DOWN - dbw 50, HYPER_BEAM + dbw 40, WING_ATTACK + dbw 48, ROCK_HEAD + dbw 60, HYPER_BEAM db 0 ; no more level-up moves MunchlaxEvosAttacks: diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index a528030..a320033 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -16,6 +16,13 @@ FirstEvoStages:: dw WEEDLE dw WEEDLE dw WEEDLE + dw GENTLARVA + dw GENTLARVA + dw GENTLARVA + dw KOTORA + dw KOTORA + dw KOTORA + dw KOTORA dw PIDGEY ;10 dw PIDGEY dw PIDGEY @@ -27,6 +34,7 @@ FirstEvoStages:: dw EKANS ;18 dw PICHU dw PICHU + dw PICHU dw SANDSHREW dw SANDSHREW dw NIDORAN_F @@ -35,31 +43,39 @@ FirstEvoStages:: dw NIDORAN_M ;20 dw NIDORAN_M dw NIDORAN_M + dw NIDORAN_F ; Nidoreign, tentative dw CLEFFA dw CLEFFA - dw VULPIX - dw VULPIX + dw VULPIII + dw VULPIII + dw VULPIII dw IGGLYBUFF dw IGGLYBUFF ;28 - dw ZUBAT - dw ZUBAT + dw BITTYBAT + dw BITTYBAT + dw BITTYBAT dw ODDISH dw ODDISH dw ODDISH - dw PARAS - dw PARAS + dw PARASPOR + dw PARASPOR + dw PARASPOR dw VENONAT ;30 dw VENONAT dw DIGLETT dw DIGLETT - dw MEOWTH - dw MEOWTH + dw COINPUR + dw COINPUR + dw COINPUR + dw MEOWTH ; Perrserker, should be MEOWTH_G dw PSYDUCK dw PSYDUCK dw MANKEY ;38 dw MANKEY - dw GROWLITHE - dw GROWLITHE + dw ANNIHILAPE + dw PUPPERON + dw PUPPERON + dw PUPPERON dw POLIWAG dw POLIWAG dw POLIWAG @@ -110,12 +126,17 @@ FirstEvoStages:: dw TYROGUE dw TYROGUE dw LICKITUNG + dw LICKITUNG + dw LICKITUNG dw KOFFING dw KOFFING dw RHYHORN dw RHYHORN ;70 dw CHANSEY - dw TANGELA + dw BURGELA + dw BURGELA + dw BURGELA + dw BURGELA dw KANGASKHAN dw HORSEA dw HORSEA @@ -127,10 +148,12 @@ FirstEvoStages:: dw STARYU dw MR__MIME dw SCYTHER + dw SCYTHER dw SMOOCHUM dw ELEKID dw MAGBY dw PINSIR + dw PINSIR dw TAUROS ;80 dw MAGIKARP dw MAGIKARP @@ -173,7 +196,7 @@ FirstEvoStages:: dw LEDYBA dw SPINARAK dw SPINARAK ;a8 - dw ZUBAT + dw BITTYBAT dw CHINCHOU dw CHINCHOU dw PICHU @@ -202,6 +225,9 @@ FirstEvoStages:: dw WOOPER dw EEVEE dw EEVEE + dw EEVEE + dw EEVEE + dw EEVEE dw MURKROW dw SLOWPOKE dw MISDREAVUS ;c8 diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index afff585..de49949 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -17,6 +17,13 @@ KantoMonSpecials: db 20 ; WEEDLE db 25 ; KAKUNA db 45 ; BEEDRILL + db 25 ; GENTLARVA + db 30 ; PUPAL + db 60 ; CARAPTHOR + db 55 ; KOTORA + db 75 ; GAOTORA + db 95 ; GOROTORA + db 105 ; RAITORA, technically not meant to be here but stay with me db 35 ; PIDGEY db 50 ; PIDGEOTTO db 70 ; PIDGEOT @@ -28,6 +35,7 @@ KantoMonSpecials: db 65 ; ARBOK db 50 ; PIKACHU db 90 ; RAICHU + db 100 ; GOROCHU db 30 ; SANDSHREW db 55 ; SANDSLASH db 40 ; NIDORAN_F @@ -36,29 +44,37 @@ KantoMonSpecials: db 40 ; NIDORAN_M db 55 ; NIDORINO db 75 ; NIDOKING + db 75 ; NIDOREIGN db 60 ; CLEFAIRY db 85 ; CLEFABLE + db 60 ; VULPIII db 65 ; VULPIX db 100 ; NINETALES db 25 ; JIGGLYPUFF db 50 ; WIGGLYTUFF + db 35 ; BITTYBAT db 40 ; ZUBAT db 75 ; GOLBAT db 75 ; ODDISH db 85 ; GLOOM db 100 ; VILEPLUME + db 45 ; PARASPOR db 55 ; PARAS db 80 ; PARASECT db 40 ; VENONAT db 90 ; VENOMOTH db 45 ; DIGLETT db 70 ; DUGTRIO + db 35 ; COINPUR db 40 ; MEOWTH db 65 ; PERSIAN + db 50 ; PERRSERKER db 50 ; PSYDUCK db 80 ; GOLDUCK db 35 ; MANKEY db 60 ; PRIMEAPE + db 50 ; ANNIHILAPE + db 40 ; PUPPERON db 50 ; GROWLITHE db 80 ; ARCANINE db 40 ; POLIWAG @@ -111,12 +127,17 @@ KantoMonSpecials: db 35 ; HITMONLEE db 35 ; HITMONCHAN db 60 ; LICKITUNG + db 80 ; LICKILICKY + db 65 ; LICKILORD db 60 ; KOFFING db 85 ; WEEZING db 30 ; RHYHORN db 45 ; RHYDON db 105 ; CHANSEY + db 80 ; BURGELA db 100 ; TANGELA + db 110 ; TANGROWTH + db 125 ; JUNGELA db 40 ; KANGASKHAN db 70 ; HORSEA db 95 ; SEADRA @@ -128,10 +149,12 @@ KantoMonSpecials: db 100 ; STARMIE db 100 ; MR__MIME db 55 ; SCYTHER + db 45 ; KLEAVOR db 95 ; JYNX db 85 ; ELECTABUZZ db 85 ; MAGMAR db 55 ; PINSIR + db 55 ; TRICULES db 70 ; TAUROS db 20 ; MAGIKARP db 100 ; GYARADOS diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 7b68be0..cd69914 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -32,6 +32,7 @@ Pokered_MonIndices: db TANGELA db SCIZOR ; MISSINGNO. db SHUCKLE ; MISSINGNO. + db NIDOREIGN db GROWLITHE db ONIX db FEAROW @@ -120,6 +121,7 @@ Pokered_MonIndices: db DUGTRIO db VENOMOTH db DEWGONG + db TRICULES db KINGDRA ; MISSINGNO. db PHANPY ; MISSINGNO. db CATERPIE @@ -192,7 +194,7 @@ Pokered_MonIndices: db BELLSPROUT db WEEPINBELL db VICTREEBEL - assert_table_length 192 ; gen 1 mon indexes + assert_table_length 194 ; gen 1 mon indexes db CHIKORITA db BAYLEEF db MEGANIUM @@ -257,4 +259,28 @@ Pokered_MonIndices: db WALKING_WAKE db SHI_SHI db MUNCHLAX + db KLEAVOR + db GOROCHU + db GENTLARVA + db PUPAL + db CARAPTHOR + db KOTORA + db GAOTORA + db GOROTORA + db RAITORA + db BITTYBAT + db VULPIII + db PARASPOR + db ANNIHILAPE + db PUPPERON + db COINPUR + db PERRSERKER + db LEAFEON + db GLACEON + db SYLVEON + db LICKILICKY + db LICKILORD + db BURGELA + db TANGROWTH + db JUNGELA assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 948eab3..be3ac2a 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -17,6 +17,13 @@ MonMenuIcons: db ICON_CATERPILLAR ; WEEDLE db ICON_CATERPILLAR ; KAKUNA db ICON_BUG ; BEEDRILL + db ICON_CATERPILLAR ; GENTLARVA + db ICON_CATERPILLAR ; PUPAL + db ICON_BUG ; CARAPTHOR + db ICON_FOX ; KOTORA + db ICON_FOX ; GAOTORA + db ICON_FOX ; GOROTORA + db ICON_FOX ; RAITORA db ICON_BIRD ; PIDGEY db ICON_BIRD ; PIDGEOTTO db ICON_BIRD ; PIDGEOT @@ -28,6 +35,7 @@ MonMenuIcons: db ICON_SERPENT ; ARBOK db ICON_PIKACHU ; PIKACHU db ICON_PIKACHU ; RAICHU + db ICON_PIKACHU ; GOROCHU db ICON_MONSTER ; SANDSHREW db ICON_MONSTER ; SANDSLASH db ICON_FOX ; NIDORAN_F @@ -36,29 +44,37 @@ MonMenuIcons: db ICON_FOX ; NIDORAN_M db ICON_FOX ; NIDORINO db ICON_MONSTER ; NIDOKING + db ICON_MONSTER ; NIDOREIGN db ICON_CLEFAIRY ; CLEFAIRY db ICON_CLEFAIRY ; CLEFABLE + db ICON_FOX ; VULPIII db ICON_FOX ; VULPIX db ICON_FOX ; NINETALES db ICON_JIGGLYPUFF ; JIGGLYPUFF db ICON_JIGGLYPUFF ; WIGGLYTUFF + db ICON_BAT ; BITTYBAT db ICON_BAT ; ZUBAT db ICON_BAT ; GOLBAT db ICON_ODDISH ; ODDISH db ICON_ODDISH ; GLOOM db ICON_ODDISH ; VILEPLUME + db ICON_BUG ; PARASPOR db ICON_BUG ; PARAS db ICON_BUG ; PARASECT db ICON_CATERPILLAR ; VENONAT db ICON_MOTH ; VENOMOTH db ICON_DIGLETT ; DIGLETT db ICON_DIGLETT ; DUGTRIO + db ICON_FOX ; COINPUR db ICON_FOX ; MEOWTH db ICON_FOX ; PERSIAN + db ICON_FOX ; PERRSERKER db ICON_MONSTER ; PSYDUCK db ICON_MONSTER ; GOLDUCK db ICON_FIGHTER ; MANKEY db ICON_FIGHTER ; PRIMEAPE + db ICON_FIGHTER ; ANNIHILAPE + db ICON_FOX ; PUPPERON db ICON_FOX ; GROWLITHE db ICON_FOX ; ARCANINE db ICON_POLIWAG ; POLIWAG @@ -111,12 +127,17 @@ MonMenuIcons: db ICON_FIGHTER ; HITMONLEE db ICON_FIGHTER ; HITMONCHAN db ICON_MONSTER ; LICKITUNG + db ICON_MONSTER ; LICKILICKY + db ICON_MONSTER ; LICKILORD db ICON_BLOB ; KOFFING db ICON_BLOB ; WEEZING db ICON_EQUINE ; RHYHORN db ICON_MONSTER ; RHYDON db ICON_CLEFAIRY ; CHANSEY + db ICON_ODDISH ; BURGELA db ICON_ODDISH ; TANGELA + db ICON_ODDISH ; TANGROWTH + db ICON_ODDISH ; JUNGELA db ICON_MONSTER ; KANGASKHAN db ICON_FISH ; HORSEA db ICON_FISH ; SEADRA @@ -128,10 +149,12 @@ MonMenuIcons: db ICON_STARYU ; STARMIE db ICON_HUMANSHAPE ; MR__MIME db ICON_BUG ; SCYTHER + db ICON_BUG ; KLEAVOR db ICON_HUMANSHAPE ; JYNX db ICON_HUMANSHAPE ; ELECTABUZZ db ICON_HUMANSHAPE ; MAGMAR db ICON_BUG ; PINSIR + db ICON_BUG ; TRICULES db ICON_EQUINE ; TAUROS db ICON_FISH ; MAGIKARP db ICON_GYARADOS ; GYARADOS @@ -203,6 +226,9 @@ MonMenuIcons: db ICON_MONSTER ; QUAGSIRE db ICON_FOX ; ESPEON db ICON_FOX ; UMBREON + db ICON_FOX ; LEAFEON + db ICON_FOX ; GLACEON + db ICON_FOX ; SYLVEON db ICON_BIRD ; MURKROW db ICON_SLOWPOKE ; SLOWKING db ICON_GHOST ; MISDREAVUS diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index f8c0a1b..9b8c8eb 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -19,6 +19,13 @@ PokemonNames:: db "WEEDLE@@@@" db "KAKUNA@@@@" db "BEEDRILL@@" + db "GENTLARVA@" + db "PUPAL@@@@@" + db "CARAPTHOR@" + db "KOTORA@@@@" + db "GAOTORA@@@" + db "GOROTORA@@" + db "RAITORA@@@" db "PIDGEY@@@@" db "PIDGEOTTO@" db "PIDGEOT@@@" @@ -30,6 +37,7 @@ PokemonNames:: db "ARBOK@@@@@" db "PIKACHU@@@" db "RAICHU@@@@" + db "GOROCHU@@@" db "SANDSHREW@" db "SANDSLASH@" db "NIDORAN♀@@" @@ -38,29 +46,37 @@ PokemonNames:: db "NIDORAN♂@@" db "NIDORINO@@" db "NIDOKING@@" + db "NIDOREIGN@" db "CLEFAIRY@@" db "CLEFABLE@@" + db "VULPIII@@@" db "VULPIX@@@@" db "NINETALES@" db "JIGGLYPUFF" db "WIGGLYTUFF" + db "BITTYBAT@@" db "ZUBAT@@@@@" db "GOLBAT@@@@" db "ODDISH@@@@" db "GLOOM@@@@@" db "VILEPLUME@" + db "PARASPOR@@" db "PARAS@@@@@" db "PARASECT@@" db "VENONAT@@@" db "VENOMOTH@@" db "DIGLETT@@@" db "DUGTRIO@@@" + db "COINPUR@@@" db "MEOWTH@@@@" db "PERSIAN@@@" + db "PERRSERKER" db "PSYDUCK@@@" db "GOLDUCK@@@" db "MANKEY@@@@" db "PRIMEAPE@@" + db "ANNIHILAPE" + db "PUPPERON@@" db "GROWLITHE@" db "ARCANINE@@" db "POLIWAG@@@" @@ -113,12 +129,17 @@ PokemonNames:: db "HITMONLEE@" db "HITMONCHAN" db "LICKITUNG@" + db "LICKILICKY" + db "LICKILORD@" db "KOFFING@@@" db "WEEZING@@@" db "RHYHORN@@@" db "RHYDON@@@@" db "CHANSEY@@@" + db "BURGELA@@@" db "TANGELA@@@" + db "TANGROWTH@" + db "JUNGELA@@@" db "KANGASKHAN" db "HORSEA@@@@" db "SEADRA@@@@" @@ -130,10 +151,12 @@ PokemonNames:: db "STARMIE@@@" db "MR.MIME@@@" db "SCYTHER@@@" + db "KLEAVOR@@@" db "JYNX@@@@@@" db "ELECTABUZZ" db "MAGMAR@@@@" db "PINSIR@@@@" + db "TRICULES@@" db "TAUROS@@@@" db "MAGIKARP@@" db "GYARADOS@@" @@ -205,6 +228,9 @@ PokemonNames:: db "QUAGSIRE@@" db "ESPEON@@@@" db "UMBREON@@@" + db "LEAFEON@@@" + db "GLACEON@@@" + db "SYLVEON@@@" db "MURKROW@@@" db "SLOWKING@@" db "MISDREAVUS" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index af9746f..c685145 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -63,6 +63,20 @@ INCBIN "gfx/pokemon/kakuna/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kakuna/shiny.pal" INCBIN "gfx/pokemon/beedrill/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/beedrill/shiny.pal" +INCBIN "gfx/pokemon/gentlarva/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gentlarva/shiny.pal" +INCBIN "gfx/pokemon/pupal/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pupal/shiny.pal" +INCBIN "gfx/pokemon/carapthor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/carapthor/shiny.pal" +INCBIN "gfx/pokemon/kotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/kotora/shiny.pal" +INCBIN "gfx/pokemon/gaotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gaotora/shiny.pal" +INCBIN "gfx/pokemon/gorotora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gorotora/shiny.pal" +INCBIN "gfx/pokemon/raitora/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/raitora/shiny.pal" INCBIN "gfx/pokemon/pidgey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pidgey/shiny.pal" INCBIN "gfx/pokemon/pidgeotto/front.gbcpal", middle_colors @@ -85,6 +99,8 @@ INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pikachu/shiny.pal" INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/raichu/shiny.pal" +INCBIN "gfx/pokemon/gorochu/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gorochu/shiny.pal" INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sandshrew/shiny.pal" INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors @@ -101,10 +117,14 @@ INCBIN "gfx/pokemon/nidorino/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidorino/shiny.pal" INCBIN "gfx/pokemon/nidoking/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/nidoking/shiny.pal" +INCBIN "gfx/pokemon/nidoreign/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/nidoreign/shiny.pal" INCBIN "gfx/pokemon/clefairy/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefairy/shiny.pal" INCBIN "gfx/pokemon/clefable/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/clefable/shiny.pal" +INCBIN "gfx/pokemon/vulpiii/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/vulpiii/shiny.pal" INCBIN "gfx/pokemon/vulpix/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/vulpix/shiny.pal" INCBIN "gfx/pokemon/ninetales/front.gbcpal", middle_colors @@ -113,6 +133,8 @@ INCBIN "gfx/pokemon/jigglypuff/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" INCBIN "gfx/pokemon/wigglytuff/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" +INCBIN "gfx/pokemon/bittybat/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/bittybat/shiny.pal" INCBIN "gfx/pokemon/zubat/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/zubat/shiny.pal" INCBIN "gfx/pokemon/golbat/front.gbcpal", middle_colors @@ -123,6 +145,8 @@ INCBIN "gfx/pokemon/gloom/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/gloom/shiny.pal" INCBIN "gfx/pokemon/vileplume/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/vileplume/shiny.pal" +INCBIN "gfx/pokemon/paraspor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/paraspor/shiny.pal" INCBIN "gfx/pokemon/paras/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/paras/shiny.pal" INCBIN "gfx/pokemon/parasect/front.gbcpal", middle_colors @@ -135,10 +159,14 @@ INCBIN "gfx/pokemon/diglett/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/diglett/shiny.pal" INCBIN "gfx/pokemon/dugtrio/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/dugtrio/shiny.pal" +INCBIN "gfx/pokemon/coinpur/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/coinpur/shiny.pal" INCBIN "gfx/pokemon/meowth/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/meowth/shiny.pal" INCBIN "gfx/pokemon/persian/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/persian/shiny.pal" +INCBIN "gfx/pokemon/perrserker/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/perrserker/shiny.pal" INCBIN "gfx/pokemon/psyduck/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/psyduck/shiny.pal" INCBIN "gfx/pokemon/golduck/front.gbcpal", middle_colors @@ -147,6 +175,10 @@ INCBIN "gfx/pokemon/mankey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mankey/shiny.pal" INCBIN "gfx/pokemon/primeape/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/primeape/shiny.pal" +INCBIN "gfx/pokemon/annihilape/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/annihilape/shiny.pal" +INCBIN "gfx/pokemon/pupperon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/pupperon/shiny.pal" INCBIN "gfx/pokemon/growlithe/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/growlithe/shiny.pal" INCBIN "gfx/pokemon/arcanine/front.gbcpal", middle_colors @@ -251,6 +283,10 @@ INCBIN "gfx/pokemon/hitmonchan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" INCBIN "gfx/pokemon/lickitung/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/lickitung/shiny.pal" +INCBIN "gfx/pokemon/lickilicky/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/lickilicky/shiny.pal" +INCBIN "gfx/pokemon/lickilord/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/lickilord/shiny.pal" INCBIN "gfx/pokemon/koffing/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/koffing/shiny.pal" INCBIN "gfx/pokemon/weezing/front.gbcpal", middle_colors @@ -261,8 +297,14 @@ INCBIN "gfx/pokemon/rhydon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/rhydon/shiny.pal" INCBIN "gfx/pokemon/chansey/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/chansey/shiny.pal" +INCBIN "gfx/pokemon/burgela/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/burgela/shiny.pal" INCBIN "gfx/pokemon/tangela/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tangela/shiny.pal" +INCBIN "gfx/pokemon/tangrowth/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/tangrowth/shiny.pal" +INCBIN "gfx/pokemon/jungela/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/jungela/shiny.pal" INCBIN "gfx/pokemon/kangaskhan/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" INCBIN "gfx/pokemon/horsea/front.gbcpal", middle_colors @@ -285,6 +327,8 @@ INCBIN "gfx/pokemon/mr__mime/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/mr__mime/shiny.pal" INCBIN "gfx/pokemon/scyther/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/scyther/shiny.pal" +INCBIN "gfx/pokemon/kleavor/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/kleavor/shiny.pal" INCBIN "gfx/pokemon/jynx/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/jynx/shiny.pal" INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors @@ -293,6 +337,8 @@ INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/magmar/shiny.pal" INCBIN "gfx/pokemon/pinsir/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pinsir/shiny.pal" +INCBIN "gfx/pokemon/tricules/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/tricules/shiny.pal" INCBIN "gfx/pokemon/tauros/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tauros/shiny.pal" INCBIN "gfx/pokemon/magikarp/front.gbcpal", middle_colors @@ -435,6 +481,12 @@ INCBIN "gfx/pokemon/espeon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/espeon/shiny.pal" INCBIN "gfx/pokemon/umbreon/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/umbreon/shiny.pal" +INCBIN "gfx/pokemon/leafeon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/leafeon/shiny.pal" +INCBIN "gfx/pokemon/glaceon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/glaceon/shiny.pal" +INCBIN "gfx/pokemon/sylveon/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/sylveon/shiny.pal" INCBIN "gfx/pokemon/murkrow/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/murkrow/shiny.pal" INCBIN "gfx/pokemon/slowking/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 996e07b..f0b5528 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -43,6 +43,20 @@ PokemonPicPointers:: dba KakunaBackpic dba BeedrillFrontpic dba BeedrillBackpic + dba GentlarvaFrontpic + dba GentlarvaBackpic + dba PupalFrontpic + dba PupalBackpic + dba CarapthorFrontpic + dba CarapthorBackpic + dba KotoraFrontpic + dba KotoraBackpic + dba GaotoraFrontpic + dba GaotoraBackpic + dba GorotoraFrontpic + dba GorotoraBackpic + dba RaitoraFrontpic + dba RaitoraBackpic dba PidgeyFrontpic dba PidgeyBackpic dba PidgeottoFrontpic @@ -65,6 +79,8 @@ PokemonPicPointers:: dba PikachuBackpic dba RaichuFrontpic dba RaichuBackpic + dba GorochuFrontpic + dba GorochuBackpic dba SandshrewFrontpic dba SandshrewBackpic dba SandslashFrontpic @@ -81,10 +97,14 @@ PokemonPicPointers:: dba NidorinoBackpic dba NidokingFrontpic dba NidokingBackpic + dba NidoreignFrontpic + dba NidoreignBackpic dba ClefairyFrontpic dba ClefairyBackpic dba ClefableFrontpic dba ClefableBackpic + dba VulpiiiFrontpic + dba VulpiiiBackpic dba VulpixFrontpic dba VulpixBackpic dba NinetalesFrontpic @@ -93,6 +113,8 @@ PokemonPicPointers:: dba JigglypuffBackpic dba WigglytuffFrontpic dba WigglytuffBackpic + dba BittybatFrontpic + dba BittybatBackpic dba ZubatFrontpic dba ZubatBackpic dba GolbatFrontpic @@ -103,6 +125,8 @@ PokemonPicPointers:: dba GloomBackpic dba VileplumeFrontpic dba VileplumeBackpic + dba ParasporFrontpic + dba ParasporBackpic dba ParasFrontpic dba ParasBackpic dba ParasectFrontpic @@ -115,10 +139,14 @@ PokemonPicPointers:: dba DiglettBackpic dba DugtrioFrontpic dba DugtrioBackpic + dba CoinpurFrontpic + dba CoinpurBackpic dba MeowthFrontpic dba MeowthBackpic dba PersianFrontpic dba PersianBackpic + dba PerrserkerFrontpic + dba PerrserkerBackpic dba PsyduckFrontpic dba PsyduckBackpic dba GolduckFrontpic @@ -127,6 +155,10 @@ PokemonPicPointers:: dba MankeyBackpic dba PrimeapeFrontpic dba PrimeapeBackpic + dba AnnihilapeFrontpic + dba AnnihilapeBackpic + dba PupperonFrontpic + dba PupperonBackpic dba GrowlitheFrontpic dba GrowlitheBackpic dba ArcanineFrontpic @@ -231,6 +263,10 @@ PokemonPicPointers:: dba HitmonchanBackpic dba LickitungFrontpic dba LickitungBackpic + dba LickilickyFrontpic + dba LickilickyBackpic + dba LickilordFrontpic + dba LickilordBackpic dba KoffingFrontpic dba KoffingBackpic dba WeezingFrontpic @@ -241,8 +277,14 @@ PokemonPicPointers:: dba RhydonBackpic dba ChanseyFrontpic dba ChanseyBackpic + dba BurgelaFrontpic + dba BurgelaBackpic dba TangelaFrontpic dba TangelaBackpic + dba TangrowthFrontpic + dba TangrowthBackpic + dba JungelaFrontpic + dba JungelaBackpic dba KangaskhanFrontpic dba KangaskhanBackpic dba HorseaFrontpic @@ -265,6 +307,8 @@ PokemonPicPointers:: dba MrMimeBackpic dba ScytherFrontpic dba ScytherBackpic + dba KleavorFrontpic + dba KleavorBackpic dba JynxFrontpic dba JynxBackpic dba ElectabuzzFrontpic @@ -273,6 +317,8 @@ PokemonPicPointers:: dba MagmarBackpic dba PinsirFrontpic dba PinsirBackpic + dba TriculesFrontpic + dba TriculesBackpic dba TaurosFrontpic dba TaurosBackpic dba MagikarpFrontpic @@ -415,6 +461,12 @@ PokemonPicPointers:: dba EspeonBackpic dba UmbreonFrontpic dba UmbreonBackpic + dba LeafeonFrontpic + dba LeafeonBackpic + dba GlaceonFrontpic + dba GlaceonBackpic + dba SylveonFrontpic + dba SylveonBackpic dba MurkrowFrontpic dba MurkrowBackpic dba SlowkingFrontpic diff --git a/data/wild/fish.asm b/data/wild/fish.asm index 25a7cf7..1b1e18a 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -199,7 +199,7 @@ FishGroups: .Remoraid_Good: dbbw 35 percent, 20, MAGIKARP dbbw 70 percent, 20, POLIWAG - dbbw 90 percent + 1, 20, POLIWAG + dbbw 90 percent + 1, 20, REMORAID dbbw 100 percent, 6, TIME_GROUP .Remoraid_Super: dbbw 40 percent, 40, POLIWAG diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index fd20f0d..6bbbcf3 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -24,10 +24,10 @@ JohtoGrassWildMons: dbw 3, GASTLY dbw 4, GASTLY dbw 5, GASTLY - dbw 3, RATTATA + dbw 3, COINPUR dbw 6, GASTLY - dbw 5, RATTATA - dbw 5, RATTATA + dbw 5, COINPUR + dbw 5, COINPUR end_grass_wildmons def_grass_wildmons SPROUT_TOWER_3F @@ -52,10 +52,10 @@ JohtoGrassWildMons: dbw 3, GASTLY dbw 4, GASTLY dbw 5, GASTLY - dbw 3, RATTATA + dbw 3, COINPUR dbw 6, GASTLY - dbw 5, RATTATA - dbw 5, RATTATA + dbw 5, COINPUR + dbw 5, COINPUR end_grass_wildmons def_grass_wildmons TIN_TOWER_2F @@ -80,10 +80,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_3F @@ -108,10 +108,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_4F @@ -136,10 +136,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_5F @@ -164,10 +164,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_6F @@ -192,10 +192,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_7F @@ -220,10 +220,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_8F @@ -248,10 +248,10 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons def_grass_wildmons TIN_TOWER_9F @@ -276,39 +276,39 @@ JohtoGrassWildMons: dbw 20, GASTLY dbw 21, GASTLY dbw 22, GASTLY - dbw 22, RATTATA - dbw 23, RATTATA - dbw 24, RATTATA - dbw 24, RATTATA + dbw 22, MEOWTH ; MOIBELLE? + dbw 23, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? + dbw 24, MEOWTH ; MOIBELLE? end_grass_wildmons ; Reworked to be way more Fire-type themed. ; The Burned Tower isn't very useful because stuff like Rattata can be found anywhere. ; They're good for worldbuilding but little else. ; Did you know they removed Magmar in B1F in Crystal? For Weezing?? -; The Rattata could possibly be replaced with Vulpiii later. +; The Rattata have been replaced with Vulpiii in 1F, and Pupperon in B1F. def_grass_wildmons BURNED_TOWER_1F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR dbw 15, HOUNDOUR ; day - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR dbw 15, HOUNDOUR ; nite - dbw 13, RATTATA + dbw 13, VULPIII dbw 14, KOFFING - dbw 15, RATTATA + dbw 15, VULPIII dbw 14, ZUBAT dbw 16, KOFFING dbw 15, HOUNDOUR @@ -318,26 +318,26 @@ JohtoGrassWildMons: def_grass_wildmons BURNED_TOWER_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGBY dbw 14, MAGBY ; day - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGBY dbw 14, MAGBY ; nite - dbw 14, RATTATA + dbw 14, PUPPERON dbw 14, SLUGMA dbw 16, SLUGMA - dbw 16, RATTATA + dbw 16, PUPPERON dbw 15, ZUBAT dbw 14, MAGMAR dbw 14, MAGMAR @@ -432,7 +432,7 @@ JohtoGrassWildMons: ; morn dbw 6, GEODUDE dbw 6, SANDSHREW - dbw 5, ZUBAT + dbw 5, BITTYBAT dbw 4, RATTATA dbw 7, ZUBAT dbw 6, ONIX @@ -440,7 +440,7 @@ JohtoGrassWildMons: ; day dbw 6, GEODUDE dbw 6, SANDSHREW - dbw 5, ZUBAT + dbw 5, BITTYBAT dbw 4, RATTATA dbw 7, ZUBAT dbw 6, ONIX @@ -450,7 +450,7 @@ JohtoGrassWildMons: dbw 6, RATTATA dbw 5, WOOPER dbw 4, RATTATA - dbw 7, ZUBAT + dbw 7, BITTYBAT dbw 6, ONIX dbw 6, ONIX end_grass_wildmons @@ -459,7 +459,7 @@ JohtoGrassWildMons: db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn dbw 8, GEODUDE - dbw 6, ZUBAT + dbw 6, BITTYBAT dbw 8, ZUBAT dbw 8, ONIX dbw 6, RATTATA @@ -467,15 +467,15 @@ JohtoGrassWildMons: dbw 8, RATTATA ; day dbw 8, GEODUDE - dbw 6, ZUBAT - dbw 8, ZUBAT + dbw 6, BITTYBAT + dbw 8, BITTYBAT dbw 8, ONIX dbw 6, RATTATA dbw 8, RATTATA dbw 8, RATTATA ; nite dbw 8, GEODUDE - dbw 6, ZUBAT + dbw 6, BITTYBAT dbw 8, WOOPER dbw 8, ONIX dbw 6, RATTATA @@ -514,27 +514,27 @@ JohtoGrassWildMons: def_grass_wildmons SLOWPOKE_WELL_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE ; day - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE ; nite - dbw 5, ZUBAT - dbw 6, ZUBAT - dbw 7, ZUBAT + dbw 5, BITTYBAT + dbw 6, BITTYBAT + dbw 7, BITTYBAT dbw 6, SLOWPOKE - dbw 8, ZUBAT + dbw 8, BITTYBAT dbw 8, SLOWPOKE dbw 8, SLOWPOKE end_grass_wildmons @@ -570,8 +570,9 @@ JohtoGrassWildMons: ; With Viridian Forest existing, much of this wild data no longer made sense. ; Changed to feature Yanma, Ledyba, etc. ; Yanma gives easier Yanmega access, Ledyba and Spinarak are nice flavour. -; Paras remains accessible for HM usage. It should be Paraspor, though. +; Paraspor remains accessible for HM usage. ; Shuckle, Pineco, and Heracross should be made more common Headbutt tree Pokemon. +; Gentlarva appears less than the other bugs, as usual, replacing Pidgey. Yanma is the new predator. def_grass_wildmons ILEX_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn @@ -579,7 +580,7 @@ JohtoGrassWildMons: dbw 5, WEEDLE dbw 7, LEDYBA dbw 7, LEDYBA - dbw 7, PIDGEY + dbw 7, GENTLARVA dbw 6, YANMA dbw 6, YANMA ; day @@ -587,7 +588,7 @@ JohtoGrassWildMons: dbw 5, WEEDLE dbw 7, LEDYBA dbw 7, LEDYBA - dbw 7, PIDGEY + dbw 7, GENTLARVA dbw 6, YANMA dbw 6, YANMA ; nite @@ -596,26 +597,27 @@ JohtoGrassWildMons: dbw 7, SPINARAK dbw 7, PSYDUCK dbw 7, HOOTHOOT - dbw 6, PARAS ; PARASPOR - dbw 6, PARAS ; PARASPOR + dbw 6, PARASPOR + dbw 6, PARASPOR end_grass_wildmons ; Mt. Mortar now has consistent Marill access like GS. +; Zubats and Golbats are no longer outside during the day as their Pokedex data often says they hate light. Also, Kotora. def_grass_wildmons MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn dbw 14, RATTATA - dbw 13, ZUBAT + dbw 13, KOTORA dbw 14, MACHOP - dbw 13, GOLBAT + dbw 13, KOTORA dbw 14, GEODUDE dbw 16, RATICATE dbw 16, RATICATE ; day dbw 14, RATTATA - dbw 13, ZUBAT + dbw 13, KOTORA dbw 14, MACHOP - dbw 13, GOLBAT + dbw 13, KOTORA dbw 14, GEODUDE dbw 16, RATICATE dbw 16, RATICATE @@ -1198,28 +1200,28 @@ JohtoGrassWildMons: def_grass_wildmons DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 3, GEODUDE - dbw 2, ZUBAT - dbw 2, GEODUDE - dbw 4, GEODUDE + dbw 3, PHANPY + dbw 2, BITTYBAT + dbw 2, PHANPY + dbw 4, PHANPY dbw 2, TEDDIURSA - dbw 4, ZUBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE ; day - dbw 3, GEODUDE - dbw 2, ZUBAT - dbw 2, GEODUDE - dbw 4, GEODUDE - dbw 2, ZUBAT - dbw 4, ZUBAT + dbw 3, PHANPY + dbw 2, BITTYBAT + dbw 2, PHANPY + dbw 4, PHANPY + dbw 2, BITTYBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE ; nite dbw 3, GEODUDE - dbw 2, ZUBAT + dbw 2, BITTYBAT dbw 2, GEODUDE dbw 4, GEODUDE - dbw 2, ZUBAT - dbw 4, ZUBAT + dbw 2, BITTYBAT + dbw 4, BITTYBAT dbw 4, DUNSPARCE end_grass_wildmons @@ -1358,7 +1360,7 @@ JohtoGrassWildMons: dbw 7, HOPPIP ; nite dbw 4, WOOPER - dbw 5, RATTATA + dbw 5, COINPUR dbw 7, BELLSPROUT dbw 6, MAREEP ; From Gold dbw 7, HOOTHOOT @@ -1385,13 +1387,13 @@ JohtoGrassWildMons: dbw 7, HOPPIP dbw 7, HOPPIP ; nite - dbw 6, RATTATA + dbw 6, COINPUR dbw 6, ZUBAT dbw 6, GEODUDE dbw 6, ZUBAT - dbw 7, RATTATA - dbw 7, RATTATA - dbw 7, RATTATA + dbw 7, COINPUR + dbw 7, COINPUR + dbw 7, COINPUR end_grass_wildmons def_grass_wildmons ROUTE_34 @@ -1414,7 +1416,7 @@ JohtoGrassWildMons: dbw 10, DITTO ; nite dbw 12, DROWZEE - dbw 11, RATTATA + dbw 11, COINPUR dbw 12, HOOTHOOT dbw 10, ABRA dbw 12, JIGGLYPUFF @@ -1456,7 +1458,7 @@ JohtoGrassWildMons: dbw 4, LEDYBA dbw 4, PIDGEY dbw 5, BELLSPROUT - dbw 5, GROWLITHE + dbw 5, PUPPERON dbw 5, PIDGEY dbw 6, PIDGEY dbw 6, PIDGEY @@ -1464,7 +1466,7 @@ JohtoGrassWildMons: dbw 4, PIDGEY dbw 4, PIDGEY dbw 5, BELLSPROUT - dbw 5, GROWLITHE + dbw 5, PUPPERON dbw 5, PIDGEY dbw 6, PIDGEY dbw 6, PIDGEY @@ -1472,7 +1474,7 @@ JohtoGrassWildMons: dbw 4, SPINARAK dbw 4, HOOTHOOT dbw 5, BELLSPROUT - dbw 5, HOOTHOOT + dbw 5, VULPIII ; Silver data, but specifically at night dbw 5, HOOTHOOT dbw 5, MISDREAVUS dbw 5, MISDREAVUS @@ -1484,7 +1486,7 @@ JohtoGrassWildMons: def_grass_wildmons ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 13, LEDYBA + dbw 13, PUPPERON dbw 14, STANTLER dbw 15, PIDGEY dbw 16, GROWLITHE @@ -1492,7 +1494,7 @@ JohtoGrassWildMons: dbw 15, LEDIAN dbw 15, LEDIAN ; day - dbw 13, PIDGEY + dbw 13, PUPPERON dbw 14, STANTLER dbw 15, PIDGEY dbw 16, GROWLITHE @@ -1685,6 +1687,7 @@ JohtoGrassWildMons: ; Ports the 5% Jigglypuff all-day encounter from GS. ; Makes Hoothoot replace a Rattata at night to have continuity with Spearow. ; Overall, increased Johto frequency that matches early advertising for the game. +; Coinpur replaces Rattatas at night. def_grass_wildmons ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn @@ -1707,8 +1710,8 @@ JohtoGrassWildMons: dbw 2, GEODUDE dbw 2, HOOTHOOT dbw 3, GEODUDE - dbw 3, RATTATA - dbw 2, RATTATA + dbw 3, COINPUR + dbw 2, COINPUR dbw 2, JIGGLYPUFF dbw 2, JIGGLYPUFF end_grass_wildmons diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 91ce40c..dcc9a7c 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -338,60 +338,62 @@ KantoGrassWildMons: dbw 35, RATICATE end_grass_wildmons +; Gold Data, but with Snubbull in the day, vaguely like Crystal. def_grass_wildmons ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn dbw 37, RATTATA dbw 37, SPEAROW - dbw 38, SNUBBULL - dbw 38, RATICATE - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + dbw 38, GROWLITHE + dbw 39, RATICATE + dbw 39, RATTATA + dbw 35, SNUBBULL + dbw 35, SNUBBULL ; day dbw 37, RATTATA dbw 37, SPEAROW - dbw 38, SNUBBULL - dbw 38, RATICATE - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + dbw 38, GROWLITHE + dbw 39, RATICATE + dbw 39, RATTATA + dbw 35, GROWLITHE + dbw 35, GROWLITHE ; nite - dbw 37, MEOWTH + dbw 37, RATTATA dbw 37, MURKROW - dbw 38, HOUNDOUR - dbw 38, PERSIAN - dbw 38, JIGGLYPUFF - dbw 36, ABRA - dbw 36, ABRA + dbw 38, GROWLITHE + dbw 39, RATICATE + dbw 39, MURKROW + dbw 35, HOUNDOUR + dbw 35, HOUNDOUR end_grass_wildmons +; Silver Data, contrasting with Route 7's Gold Data. def_grass_wildmons ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn - dbw 37, SNUBBULL + dbw 37, MEOWTH dbw 39, PIDGEOTTO - dbw 36, ABRA - dbw 37, GROWLITHE - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + dbw 35, ABRA + dbw 38, VULPIX + dbw 37, PIDGEOTTO + dbw 35, KADABRA + dbw 35, KADABRA ; day - dbw 37, SNUBBULL + dbw 37, MEOWTH dbw 39, PIDGEOTTO - dbw 36, ABRA - dbw 37, GROWLITHE - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + dbw 35, ABRA + dbw 38, VULPIX + dbw 37, PIDGEOTTO + dbw 35, KADABRA + dbw 35, KADABRA ; nite dbw 37, MEOWTH - dbw 30, NOCTOWL - dbw 36, ABRA - dbw 37, HAUNTER - dbw 36, JIGGLYPUFF - dbw 38, KADABRA - dbw 38, KADABRA + dbw 30, HAUNTER + dbw 35, ABRA + dbw 39, NOCTOWL + dbw 38, VULPIX + dbw 35, KADABRA + dbw 35, KADABRA end_grass_wildmons def_grass_wildmons ROUTE_9 @@ -879,7 +881,7 @@ KantoGrassWildMons: dbw 36, METAPOD dbw 36, CATERPIE dbw 35, PARAS - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU ; day @@ -887,15 +889,15 @@ KantoGrassWildMons: dbw 36, CATERPIE dbw 35, METAPOD dbw 36, METAPOD - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU ; nite - dbw 35, ODDISH ; KOTORA - dbw 36, ODDISH ; KOTORA + dbw 35, KOTORA + dbw 36, KOTORA dbw 36, ZUBAT dbw 35, PARAS - dbw 35, ZUBAT ; KOKANA + dbw 35, GENTLARVA dbw 36, PARAS dbw 36, PIKACHU end_grass_wildmons diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 6d33df1..5ad6a48 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -158,7 +158,7 @@ ItemEffects: dw EvoStoneEffect ; SHINY_STONE dw NoEffect ; METAL_COAT dw NoEffect ; DRAGON_FANG - dw NoEffect ; ITEM_91 + dw EvoStoneEffect ; BLK_AUGURITE dw NoEffect ; LEFTOVERS dw NoEffect ; ITEM_93 dw NoEffect ; ITEM_94 diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 22dec4b..e2bac8f 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -540,12 +540,12 @@ Pokegear_UpdateClock: PokegearMap_CheckRegion: ld a, [wPokegearMapPlayerIconLandmark] - cp LANDMARK_FAST_SHIP - jr z, .johto - cp KANTO_LANDMARK - jr nc, .kanto - cp NIHON_LANDMARK - jr c, .nihon + cp LANDMARK_SILVER_CAVE+1 + jr c, .johto + cp LANDMARK_FAST_SHIP+1 + jr c, .kanto + ;cp NIHON_LANDMARK + jp .nihon .johto ld a, POKEGEARSTATE_JOHTOMAPINIT jr .done @@ -752,13 +752,13 @@ TownMap_GetKantoLandmarkLimits: ld a, [wStatusFlags] bit STATUSFLAGS_HALL_OF_FAME_F, a jr z, .not_hof - ld d, LANDMARK_ROUTE_28 + ld d, LANDMARK_FAST_SHIP ld e, LANDMARK_PALLET_TOWN ret .not_hof - ld d, LANDMARK_ROUTE_28 - ld e, LANDMARK_VICTORY_ROAD + ld d, LANDMARK_VICTORY_ROAD + ld e, LANDMARK_PALLET_TOWN ret TownMap_GetNihonLandmarkLimits: @@ -1572,7 +1572,7 @@ RadioChannels: ld a, [wPokegearMapPlayerIconLandmark] cp LANDMARK_FAST_SHIP jr z, .johto - cp KANTO_LANDMARK + cp LANDMARK_SILVER_CAVE+1 jr c, .johto ; kanto or nihon and a @@ -1925,10 +1925,13 @@ _TownMap: .InitTilemap: ld a, [wTownMapPlayerIconLandmark] - cp NIHON_LANDMARK - jr nc, .nihon2 - cp KANTO_LANDMARK - jr nc, .kanto2 + cp LANDMARK_SILVER_CAVE + 1 ; last johto landmark + 1 + jr c, .johto2 + cp LANDMARK_FAST_SHIP + 1 ; last kanto landmark + 1 + jr c, .kanto2 + jp .nihon2 + +.johto2 ld e, JOHTO_REGION jr .okay_tilemap @@ -2052,15 +2055,15 @@ LoadStation_PokemonChannel: PokegearMap: ld a, e - and a + cp JOHTO_REGION jr nz, .kanto call LoadTownMapGFX call FillJohtoMap ret .kanto - cp NIHON_LANDMARK - jr c, .nihon + cp KANTO_REGION + jr nz, .nihon call LoadTownMapGFX call FillKantoMap ret diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 4d5e66d..fd5f484 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -16,6 +16,13 @@ INCBIN "gfx/footprints/butterfree.1bpp" INCBIN "gfx/footprints/weedle.1bpp" INCBIN "gfx/footprints/kakuna.1bpp" INCBIN "gfx/footprints/beedrill.1bpp" +INCBIN "gfx/footprints/gentlarva.1bpp" +INCBIN "gfx/footprints/pupal.1bpp" +INCBIN "gfx/footprints/carapthor.1bpp" +INCBIN "gfx/footprints/kotora.1bpp" +INCBIN "gfx/footprints/gaotora.1bpp" +INCBIN "gfx/footprints/gorotora.1bpp" +INCBIN "gfx/footprints/raitora.1bpp" INCBIN "gfx/footprints/pidgey.1bpp" INCBIN "gfx/footprints/pidgeotto.1bpp" INCBIN "gfx/footprints/pidgeot.1bpp" @@ -27,6 +34,7 @@ INCBIN "gfx/footprints/ekans.1bpp" INCBIN "gfx/footprints/arbok.1bpp" INCBIN "gfx/footprints/pikachu.1bpp" INCBIN "gfx/footprints/raichu.1bpp" +INCBIN "gfx/footprints/gorochu.1bpp" INCBIN "gfx/footprints/sandshrew.1bpp" INCBIN "gfx/footprints/sandslash.1bpp" INCBIN "gfx/footprints/nidoran_f.1bpp" @@ -35,29 +43,37 @@ INCBIN "gfx/footprints/nidoqueen.1bpp" INCBIN "gfx/footprints/nidoran_m.1bpp" INCBIN "gfx/footprints/nidorino.1bpp" INCBIN "gfx/footprints/nidoking.1bpp" +INCBIN "gfx/footprints/nidoreign.1bpp" INCBIN "gfx/footprints/clefairy.1bpp" INCBIN "gfx/footprints/clefable.1bpp" +INCBIN "gfx/footprints/vulpiii.1bpp" INCBIN "gfx/footprints/vulpix.1bpp" INCBIN "gfx/footprints/ninetales.1bpp" INCBIN "gfx/footprints/jigglypuff.1bpp" INCBIN "gfx/footprints/wigglytuff.1bpp" +INCBIN "gfx/footprints/bittybat.1bpp" INCBIN "gfx/footprints/zubat.1bpp" INCBIN "gfx/footprints/golbat.1bpp" INCBIN "gfx/footprints/oddish.1bpp" INCBIN "gfx/footprints/gloom.1bpp" INCBIN "gfx/footprints/vileplume.1bpp" +INCBIN "gfx/footprints/paraspor.1bpp" INCBIN "gfx/footprints/paras.1bpp" INCBIN "gfx/footprints/parasect.1bpp" INCBIN "gfx/footprints/venonat.1bpp" INCBIN "gfx/footprints/venomoth.1bpp" INCBIN "gfx/footprints/diglett.1bpp" INCBIN "gfx/footprints/dugtrio.1bpp" +INCBIN "gfx/footprints/coinpur.1bpp" INCBIN "gfx/footprints/meowth.1bpp" INCBIN "gfx/footprints/persian.1bpp" +INCBIN "gfx/footprints/perrserker.1bpp" INCBIN "gfx/footprints/psyduck.1bpp" INCBIN "gfx/footprints/golduck.1bpp" INCBIN "gfx/footprints/mankey.1bpp" INCBIN "gfx/footprints/primeape.1bpp" +INCBIN "gfx/footprints/annihilape.1bpp" +INCBIN "gfx/footprints/pupperon.1bpp" INCBIN "gfx/footprints/growlithe.1bpp" INCBIN "gfx/footprints/arcanine.1bpp" INCBIN "gfx/footprints/poliwag.1bpp" @@ -72,7 +88,7 @@ INCBIN "gfx/footprints/machamp.1bpp" INCBIN "gfx/footprints/bellsprout.1bpp" INCBIN "gfx/footprints/weepinbell.1bpp" INCBIN "gfx/footprints/victreebel.1bpp" -;INCBIN "gfx/footprints/bellignan.1bpp" +INCBIN "gfx/footprints/bellignan.1bpp" INCBIN "gfx/footprints/tentacool.1bpp" INCBIN "gfx/footprints/tentacruel.1bpp" INCBIN "gfx/footprints/geodude.1bpp" @@ -110,12 +126,17 @@ INCBIN "gfx/footprints/marowak.1bpp" INCBIN "gfx/footprints/hitmonlee.1bpp" INCBIN "gfx/footprints/hitmonchan.1bpp" INCBIN "gfx/footprints/lickitung.1bpp" +INCBIN "gfx/footprints/lickilicky.1bpp" +INCBIN "gfx/footprints/lickilord.1bpp" INCBIN "gfx/footprints/koffing.1bpp" INCBIN "gfx/footprints/weezing.1bpp" INCBIN "gfx/footprints/rhyhorn.1bpp" INCBIN "gfx/footprints/rhydon.1bpp" INCBIN "gfx/footprints/chansey.1bpp" +INCBIN "gfx/footprints/burgela.1bpp" INCBIN "gfx/footprints/tangela.1bpp" +INCBIN "gfx/footprints/tangrowth.1bpp" +INCBIN "gfx/footprints/jungela.1bpp" INCBIN "gfx/footprints/kangaskhan.1bpp" INCBIN "gfx/footprints/horsea.1bpp" INCBIN "gfx/footprints/seadra.1bpp" @@ -127,10 +148,12 @@ INCBIN "gfx/footprints/staryu.1bpp" INCBIN "gfx/footprints/starmie.1bpp" INCBIN "gfx/footprints/mr__mime.1bpp" INCBIN "gfx/footprints/scyther.1bpp" +INCBIN "gfx/footprints/kleavor.1bpp" INCBIN "gfx/footprints/jynx.1bpp" INCBIN "gfx/footprints/electabuzz.1bpp" INCBIN "gfx/footprints/magmar.1bpp" INCBIN "gfx/footprints/pinsir.1bpp" +INCBIN "gfx/footprints/tricules.1bpp" INCBIN "gfx/footprints/tauros.1bpp" INCBIN "gfx/footprints/magikarp.1bpp" INCBIN "gfx/footprints/gyarados.1bpp" @@ -202,6 +225,9 @@ INCBIN "gfx/footprints/wooper.1bpp" INCBIN "gfx/footprints/quagsire.1bpp" INCBIN "gfx/footprints/espeon.1bpp" INCBIN "gfx/footprints/umbreon.1bpp" +INCBIN "gfx/footprints/leafeon.1bpp" +INCBIN "gfx/footprints/glaceon.1bpp" +INCBIN "gfx/footprints/sylveon.1bpp" INCBIN "gfx/footprints/murkrow.1bpp" INCBIN "gfx/footprints/slowking.1bpp" INCBIN "gfx/footprints/misdreavus.1bpp" @@ -264,4 +290,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $105 ; don't forget to update this + assert_table_length NUM_POKEMON + 5 ; The +5 accounts for the 5 glitch footprints diff --git a/gfx/footprints/annihilape.png b/gfx/footprints/annihilape.png new file mode 100644 index 0000000..35e5fae Binary files /dev/null and b/gfx/footprints/annihilape.png differ diff --git a/gfx/footprints/bittybat.png b/gfx/footprints/bittybat.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/bittybat.png differ diff --git a/gfx/footprints/burgela.png b/gfx/footprints/burgela.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/burgela.png differ diff --git a/gfx/footprints/carapthor.png b/gfx/footprints/carapthor.png new file mode 100644 index 0000000..35e5fae Binary files /dev/null and b/gfx/footprints/carapthor.png differ diff --git a/gfx/footprints/coinpur.png b/gfx/footprints/coinpur.png new file mode 100644 index 0000000..8dbc476 Binary files /dev/null and b/gfx/footprints/coinpur.png differ diff --git a/gfx/footprints/gaotora.png b/gfx/footprints/gaotora.png new file mode 100644 index 0000000..b4b5ac5 Binary files /dev/null and b/gfx/footprints/gaotora.png differ diff --git a/gfx/footprints/gentlarva.png b/gfx/footprints/gentlarva.png new file mode 100644 index 0000000..bd50e57 Binary files /dev/null and b/gfx/footprints/gentlarva.png differ diff --git a/gfx/footprints/glaceon.png b/gfx/footprints/glaceon.png new file mode 100644 index 0000000..7bfd392 Binary files /dev/null and b/gfx/footprints/glaceon.png differ diff --git a/gfx/footprints/gorochu.png b/gfx/footprints/gorochu.png new file mode 100644 index 0000000..031468d Binary files /dev/null and b/gfx/footprints/gorochu.png differ diff --git a/gfx/footprints/gorotora.png b/gfx/footprints/gorotora.png new file mode 100644 index 0000000..71a77b3 Binary files /dev/null and b/gfx/footprints/gorotora.png differ diff --git a/gfx/footprints/jungela.png b/gfx/footprints/jungela.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/jungela.png differ diff --git a/gfx/footprints/kleavor.png b/gfx/footprints/kleavor.png new file mode 100644 index 0000000..3cefb61 Binary files /dev/null and b/gfx/footprints/kleavor.png differ diff --git a/gfx/footprints/kotora.png b/gfx/footprints/kotora.png new file mode 100644 index 0000000..f41e90a Binary files /dev/null and b/gfx/footprints/kotora.png differ diff --git a/gfx/footprints/leafeon.png b/gfx/footprints/leafeon.png new file mode 100644 index 0000000..7bfd392 Binary files /dev/null and b/gfx/footprints/leafeon.png differ diff --git a/gfx/footprints/lickilicky.png b/gfx/footprints/lickilicky.png new file mode 100644 index 0000000..5c04d47 Binary files /dev/null and b/gfx/footprints/lickilicky.png differ diff --git a/gfx/footprints/lickilord.png b/gfx/footprints/lickilord.png new file mode 100644 index 0000000..5c04d47 Binary files /dev/null and b/gfx/footprints/lickilord.png differ diff --git a/gfx/footprints/nidoreign.png b/gfx/footprints/nidoreign.png new file mode 100644 index 0000000..7c506f1 Binary files /dev/null and b/gfx/footprints/nidoreign.png differ diff --git a/gfx/footprints/paraspor.png b/gfx/footprints/paraspor.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/paraspor.png differ diff --git a/gfx/footprints/perrserker.png b/gfx/footprints/perrserker.png new file mode 100644 index 0000000..8dbc476 Binary files /dev/null and b/gfx/footprints/perrserker.png differ diff --git a/gfx/footprints/pupal.png b/gfx/footprints/pupal.png new file mode 100644 index 0000000..dfe2ee3 Binary files /dev/null and b/gfx/footprints/pupal.png differ diff --git a/gfx/footprints/pupperon.png b/gfx/footprints/pupperon.png new file mode 100644 index 0000000..42c792a Binary files /dev/null and b/gfx/footprints/pupperon.png differ diff --git a/gfx/footprints/raitora.png b/gfx/footprints/raitora.png new file mode 100644 index 0000000..71a77b3 Binary files /dev/null and b/gfx/footprints/raitora.png differ diff --git a/gfx/footprints/sylveon.png b/gfx/footprints/sylveon.png new file mode 100644 index 0000000..7bfd392 Binary files /dev/null and b/gfx/footprints/sylveon.png differ diff --git a/gfx/footprints/tangrowth.png b/gfx/footprints/tangrowth.png new file mode 100644 index 0000000..64808f7 Binary files /dev/null and b/gfx/footprints/tangrowth.png differ diff --git a/gfx/footprints/tricules.png b/gfx/footprints/tricules.png new file mode 100644 index 0000000..724bdf0 Binary files /dev/null and b/gfx/footprints/tricules.png differ diff --git a/gfx/footprints/vulpiii.png b/gfx/footprints/vulpiii.png new file mode 100644 index 0000000..cf21d80 Binary files /dev/null and b/gfx/footprints/vulpiii.png differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 32ef690..577fd06 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -725,59 +725,58 @@ ShiShiFrontpic: INCBIN "gfx/pokemon/shi_shi/front.animated.2bpp.lz" ShiShiBackpic: INCBIN "gfx/pokemon/shi_shi/back.2bpp.lz" MunchlaxFrontpic: INCBIN "gfx/pokemon/munchlax/front.animated.2bpp.lz" MunchlaxBackpic: INCBIN "gfx/pokemon/munchlax/back.2bpp.lz" -INCBIN "gfx/pokemon/poliwag/back.2bpp.lz" -INCBIN "gfx/pokemon/squirtle/back.2bpp.lz" -INCBIN "gfx/pokemon/shuckle/back.2bpp.lz" -INCBIN "gfx/pokemon/dewgong/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_b/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/slowpoke/back.2bpp.lz" -INCBIN "gfx/pokemon/dunsparce/back.2bpp.lz" -INCBIN "gfx/pokemon/donphan/back.2bpp.lz" -INCBIN "gfx/pokemon/wooper/back.2bpp.lz" -INCBIN "gfx/pokemon/tauros/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_x/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_n/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/tangela/back.2bpp.lz" -INCBIN "gfx/pokemon/voltorb/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_j/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/mantine/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_l/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/piloswine/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_m/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_f/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/natu/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_a/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/golem/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_u/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/diglett/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_q/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_p/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_c/back.2bpp.lz" -INCBIN "gfx/pokemon/jynx/back.2bpp.lz" -INCBIN "gfx/pokemon/golbat/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_y/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_g/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_i/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_v/back.2bpp.lz" -INCBIN "gfx/pokemon/forretress/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_s/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_r/front.animated.2bpp.lz" -INCBIN "gfx/pokemon/unown_e/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_j/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_b/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_o/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_z/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_w/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_n/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_a/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_m/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_k/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_t/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_x/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_l/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_u/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_q/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" -INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" +NidoreignFrontpic: INCBIN "gfx/pokemon/nidoreign/front.animated.2bpp.lz" +NidoreignBackpic: INCBIN "gfx/pokemon/nidoreign/back.2bpp.lz" +KleavorFrontpic: INCBIN "gfx/pokemon/kleavor/front.animated.2bpp.lz" +KleavorBackpic: INCBIN "gfx/pokemon/kleavor/back.2bpp.lz" +TriculesFrontpic: INCBIN "gfx/pokemon/tricules/front.animated.2bpp.lz" +TriculesBackpic: INCBIN "gfx/pokemon/tricules/back.2bpp.lz" +LickilickyFrontpic: INCBIN "gfx/pokemon/lickilicky/front.animated.2bpp.lz" +LickilickyBackpic: INCBIN "gfx/pokemon/lickilicky/back.2bpp.lz" +LickilordFrontpic: INCBIN "gfx/pokemon/lickilord/front.animated.2bpp.lz" +LickilordBackpic: INCBIN "gfx/pokemon/lickilord/back.2bpp.lz" +BurgelaFrontpic: INCBIN "gfx/pokemon/burgela/front.animated.2bpp.lz" +BurgelaBackpic: INCBIN "gfx/pokemon/burgela/back.2bpp.lz" +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" + +SECTION "Pics 20", ROMX + +GorochuFrontpic: INCBIN "gfx/pokemon/gorochu/front.animated.2bpp.lz" +GorochuBackpic: INCBIN "gfx/pokemon/gorochu/back.2bpp.lz" +LeafeonFrontpic: INCBIN "gfx/pokemon/leafeon/front.animated.2bpp.lz" +LeafeonBackpic: INCBIN "gfx/pokemon/leafeon/back.2bpp.lz" +GlaceonFrontpic: INCBIN "gfx/pokemon/glaceon/front.animated.2bpp.lz" +GlaceonBackpic: INCBIN "gfx/pokemon/glaceon/back.2bpp.lz" +SylveonFrontpic: INCBIN "gfx/pokemon/sylveon/front.animated.2bpp.lz" +SylveonBackpic: INCBIN "gfx/pokemon/sylveon/back.2bpp.lz" +CoinpurFrontpic: INCBIN "gfx/pokemon/coinpur/front.animated.2bpp.lz" +CoinpurBackpic: INCBIN "gfx/pokemon/coinpur/back.2bpp.lz" +PerrserkerFrontpic: INCBIN "gfx/pokemon/perrserker/front.animated.2bpp.lz" +PerrserkerBackpic: INCBIN "gfx/pokemon/perrserker/back.2bpp.lz" +GentlarvaFrontpic: INCBIN "gfx/pokemon/gentlarva/front.animated.2bpp.lz" +GentlarvaBackpic: INCBIN "gfx/pokemon/gentlarva/back.2bpp.lz" +PupalFrontpic: INCBIN "gfx/pokemon/pupal/front.animated.2bpp.lz" +PupalBackpic: INCBIN "gfx/pokemon/pupal/back.2bpp.lz" +CarapthorFrontpic: INCBIN "gfx/pokemon/carapthor/front.animated.2bpp.lz" +CarapthorBackpic: INCBIN "gfx/pokemon/carapthor/back.2bpp.lz" +KotoraFrontpic: INCBIN "gfx/pokemon/kotora/front.animated.2bpp.lz" +KotoraBackpic: INCBIN "gfx/pokemon/kotora/back.2bpp.lz" +GaotoraFrontpic: INCBIN "gfx/pokemon/gaotora/front.animated.2bpp.lz" +GaotoraBackpic: INCBIN "gfx/pokemon/gaotora/back.2bpp.lz" +GorotoraFrontpic: INCBIN "gfx/pokemon/gorotora/front.animated.2bpp.lz" +GorotoraBackpic: INCBIN "gfx/pokemon/gorotora/back.2bpp.lz" +RaitoraFrontpic: INCBIN "gfx/pokemon/raitora/front.animated.2bpp.lz" +RaitoraBackpic: INCBIN "gfx/pokemon/raitora/back.2bpp.lz" +BittybatFrontpic: INCBIN "gfx/pokemon/bittybat/front.animated.2bpp.lz" +BittybatBackpic: INCBIN "gfx/pokemon/bittybat/back.2bpp.lz" +ParasporFrontpic: INCBIN "gfx/pokemon/paraspor/front.animated.2bpp.lz" +ParasporBackpic: INCBIN "gfx/pokemon/paraspor/back.2bpp.lz" +VulpiiiFrontpic: INCBIN "gfx/pokemon/vulpiii/front.animated.2bpp.lz" +VulpiiiBackpic: INCBIN "gfx/pokemon/vulpiii/back.2bpp.lz" +AnnihilapeFrontpic: INCBIN "gfx/pokemon/annihilape/front.animated.2bpp.lz" +AnnihilapeBackpic: INCBIN "gfx/pokemon/annihilape/back.2bpp.lz" +PupperonFrontpic: INCBIN "gfx/pokemon/pupperon/front.animated.2bpp.lz" +PupperonBackpic: INCBIN "gfx/pokemon/pupperon/back.2bpp.lz" diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 7ea2e69..cd892be 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -15,6 +15,13 @@ AnimationPointers: dw WeedleAnimation dw KakunaAnimation dw BeedrillAnimation + dw GentlarvaAnimation + dw PupalAnimation + dw CarapthorAnimation + dw KotoraAnimation + dw GaotoraAnimation + dw GorotoraAnimation + dw RaitoraAnimation dw PidgeyAnimation dw PidgeottoAnimation dw PidgeotAnimation @@ -26,6 +33,7 @@ AnimationPointers: dw ArbokAnimation dw PikachuAnimation dw RaichuAnimation + dw GorochuAnimation dw SandshrewAnimation dw SandslashAnimation dw NidoranFAnimation @@ -34,29 +42,37 @@ AnimationPointers: dw NidoranMAnimation dw NidorinoAnimation dw NidokingAnimation + dw NidoreignAnimation dw ClefairyAnimation dw ClefableAnimation + dw VulpiiiAnimation dw VulpixAnimation dw NinetalesAnimation dw JigglypuffAnimation dw WigglytuffAnimation + dw BittybatAnimation dw ZubatAnimation dw GolbatAnimation dw OddishAnimation dw GloomAnimation dw VileplumeAnimation + dw ParasporAnimation dw ParasAnimation dw ParasectAnimation dw VenonatAnimation dw VenomothAnimation dw DiglettAnimation dw DugtrioAnimation + dw CoinpurAnimation dw MeowthAnimation dw PersianAnimation + dw PerrserkerAnimation dw PsyduckAnimation dw GolduckAnimation dw MankeyAnimation dw PrimeapeAnimation + dw AnnihilapeAnimation + dw PupperonAnimation dw GrowlitheAnimation dw ArcanineAnimation dw PoliwagAnimation @@ -109,12 +125,17 @@ AnimationPointers: dw HitmonleeAnimation dw HitmonchanAnimation dw LickitungAnimation + dw LickilickyAnimation + dw LickilordAnimation dw KoffingAnimation dw WeezingAnimation dw RhyhornAnimation dw RhydonAnimation dw ChanseyAnimation + dw BurgelaAnimation dw TangelaAnimation + dw TangrowthAnimation + dw JungelaAnimation dw KangaskhanAnimation dw HorseaAnimation dw SeadraAnimation @@ -126,10 +147,12 @@ AnimationPointers: dw StarmieAnimation dw MrMimeAnimation dw ScytherAnimation + dw KleavorAnimation dw JynxAnimation dw ElectabuzzAnimation dw MagmarAnimation dw PinsirAnimation + dw TriculesAnimation dw TaurosAnimation dw MagikarpAnimation dw GyaradosAnimation @@ -201,6 +224,9 @@ AnimationPointers: dw QuagsireAnimation dw EspeonAnimation dw UmbreonAnimation + dw LeafeonAnimation + dw GlaceonAnimation + dw SylveonAnimation dw MurkrowAnimation dw SlowkingAnimation dw MisdreavusAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 8b99329..9db2aa8 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -13,6 +13,13 @@ ButterfreeAnimation: INCLUDE "gfx/pokemon/butterfree/anim.asm" WeedleAnimation: INCLUDE "gfx/pokemon/weedle/anim.asm" KakunaAnimation: INCLUDE "gfx/pokemon/kakuna/anim.asm" BeedrillAnimation: INCLUDE "gfx/pokemon/beedrill/anim.asm" +GentlarvaAnimation: INCLUDE "gfx/pokemon/gentlarva/anim.asm" +PupalAnimation: INCLUDE "gfx/pokemon/pupal/anim.asm" +CarapthorAnimation: INCLUDE "gfx/pokemon/carapthor/anim.asm" +KotoraAnimation: INCLUDE "gfx/pokemon/kotora/anim.asm" +GaotoraAnimation: INCLUDE "gfx/pokemon/gaotora/anim.asm" +GorotoraAnimation: INCLUDE "gfx/pokemon/gorotora/anim.asm" +RaitoraAnimation: INCLUDE "gfx/pokemon/raitora/anim.asm" PidgeyAnimation: INCLUDE "gfx/pokemon/pidgey/anim.asm" PidgeottoAnimation: INCLUDE "gfx/pokemon/pidgeotto/anim.asm" PidgeotAnimation: INCLUDE "gfx/pokemon/pidgeot/anim.asm" @@ -24,6 +31,7 @@ EkansAnimation: INCLUDE "gfx/pokemon/ekans/anim.asm" ArbokAnimation: INCLUDE "gfx/pokemon/arbok/anim.asm" PikachuAnimation: INCLUDE "gfx/pokemon/pikachu/anim.asm" RaichuAnimation: INCLUDE "gfx/pokemon/raichu/anim.asm" +GorochuAnimation: INCLUDE "gfx/pokemon/gorochu/anim.asm" SandshrewAnimation: INCLUDE "gfx/pokemon/sandshrew/anim.asm" SandslashAnimation: INCLUDE "gfx/pokemon/sandslash/anim.asm" NidoranFAnimation: INCLUDE "gfx/pokemon/nidoran_f/anim.asm" @@ -32,29 +40,37 @@ NidoqueenAnimation: INCLUDE "gfx/pokemon/nidoqueen/anim.asm" NidoranMAnimation: INCLUDE "gfx/pokemon/nidoran_m/anim.asm" NidorinoAnimation: INCLUDE "gfx/pokemon/nidorino/anim.asm" NidokingAnimation: INCLUDE "gfx/pokemon/nidoking/anim.asm" +NidoreignAnimation: INCLUDE "gfx/pokemon/nidoreign/anim.asm" ClefairyAnimation: INCLUDE "gfx/pokemon/clefairy/anim.asm" ClefableAnimation: INCLUDE "gfx/pokemon/clefable/anim.asm" +VulpiiiAnimation: INCLUDE "gfx/pokemon/vulpiii/anim.asm" VulpixAnimation: INCLUDE "gfx/pokemon/vulpix/anim.asm" NinetalesAnimation: INCLUDE "gfx/pokemon/ninetales/anim.asm" JigglypuffAnimation: INCLUDE "gfx/pokemon/jigglypuff/anim.asm" WigglytuffAnimation: INCLUDE "gfx/pokemon/wigglytuff/anim.asm" +BittybatAnimation: INCLUDE "gfx/pokemon/bittybat/anim.asm" ZubatAnimation: INCLUDE "gfx/pokemon/zubat/anim.asm" GolbatAnimation: INCLUDE "gfx/pokemon/golbat/anim.asm" OddishAnimation: INCLUDE "gfx/pokemon/oddish/anim.asm" GloomAnimation: INCLUDE "gfx/pokemon/gloom/anim.asm" VileplumeAnimation: INCLUDE "gfx/pokemon/vileplume/anim.asm" +ParasporAnimation: INCLUDE "gfx/pokemon/paraspor/anim.asm" ParasAnimation: INCLUDE "gfx/pokemon/paras/anim.asm" ParasectAnimation: INCLUDE "gfx/pokemon/parasect/anim.asm" VenonatAnimation: INCLUDE "gfx/pokemon/venonat/anim.asm" VenomothAnimation: INCLUDE "gfx/pokemon/venomoth/anim.asm" DiglettAnimation: INCLUDE "gfx/pokemon/diglett/anim.asm" DugtrioAnimation: INCLUDE "gfx/pokemon/dugtrio/anim.asm" +CoinpurAnimation: INCLUDE "gfx/pokemon/coinpur/anim.asm" MeowthAnimation: INCLUDE "gfx/pokemon/meowth/anim.asm" PersianAnimation: INCLUDE "gfx/pokemon/persian/anim.asm" +PerrserkerAnimation: INCLUDE "gfx/pokemon/perrserker/anim.asm" PsyduckAnimation: INCLUDE "gfx/pokemon/psyduck/anim.asm" GolduckAnimation: INCLUDE "gfx/pokemon/golduck/anim.asm" MankeyAnimation: INCLUDE "gfx/pokemon/mankey/anim.asm" PrimeapeAnimation: INCLUDE "gfx/pokemon/primeape/anim.asm" +AnnihilapeAnimation: INCLUDE "gfx/pokemon/annihilape/anim.asm" +PupperonAnimation: INCLUDE "gfx/pokemon/pupperon/anim.asm" GrowlitheAnimation: INCLUDE "gfx/pokemon/growlithe/anim.asm" ArcanineAnimation: INCLUDE "gfx/pokemon/arcanine/anim.asm" PoliwagAnimation: INCLUDE "gfx/pokemon/poliwag/anim.asm" @@ -69,7 +85,7 @@ MachampAnimation: INCLUDE "gfx/pokemon/machamp/anim.asm" BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm" WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm" VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm" -BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm" +BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm" TentacoolAnimation: INCLUDE "gfx/pokemon/tentacool/anim.asm" TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm" GeodudeAnimation: INCLUDE "gfx/pokemon/geodude/anim.asm" @@ -107,12 +123,17 @@ MarowakAnimation: INCLUDE "gfx/pokemon/marowak/anim.asm" HitmonleeAnimation: INCLUDE "gfx/pokemon/hitmonlee/anim.asm" HitmonchanAnimation: INCLUDE "gfx/pokemon/hitmonchan/anim.asm" LickitungAnimation: INCLUDE "gfx/pokemon/lickitung/anim.asm" +LickilickyAnimation: INCLUDE "gfx/pokemon/lickilicky/anim.asm" +LickilordAnimation: INCLUDE "gfx/pokemon/lickilord/anim.asm" KoffingAnimation: INCLUDE "gfx/pokemon/koffing/anim.asm" WeezingAnimation: INCLUDE "gfx/pokemon/weezing/anim.asm" RhyhornAnimation: INCLUDE "gfx/pokemon/rhyhorn/anim.asm" RhydonAnimation: INCLUDE "gfx/pokemon/rhydon/anim.asm" ChanseyAnimation: INCLUDE "gfx/pokemon/chansey/anim.asm" +BurgelaAnimation: INCLUDE "gfx/pokemon/burgela/anim.asm" TangelaAnimation: INCLUDE "gfx/pokemon/tangela/anim.asm" +TangrowthAnimation: INCLUDE "gfx/pokemon/tangrowth/anim.asm" +JungelaAnimation: INCLUDE "gfx/pokemon/jungela/anim.asm" KangaskhanAnimation: INCLUDE "gfx/pokemon/kangaskhan/anim.asm" HorseaAnimation: INCLUDE "gfx/pokemon/horsea/anim.asm" SeadraAnimation: INCLUDE "gfx/pokemon/seadra/anim.asm" @@ -124,10 +145,12 @@ StaryuAnimation: INCLUDE "gfx/pokemon/staryu/anim.asm" StarmieAnimation: INCLUDE "gfx/pokemon/starmie/anim.asm" MrMimeAnimation: INCLUDE "gfx/pokemon/mr__mime/anim.asm" ScytherAnimation: INCLUDE "gfx/pokemon/scyther/anim.asm" +KleavorAnimation: INCLUDE "gfx/pokemon/kleavor/anim.asm" JynxAnimation: INCLUDE "gfx/pokemon/jynx/anim.asm" ElectabuzzAnimation: INCLUDE "gfx/pokemon/electabuzz/anim.asm" MagmarAnimation: INCLUDE "gfx/pokemon/magmar/anim.asm" PinsirAnimation: INCLUDE "gfx/pokemon/pinsir/anim.asm" +TriculesAnimation: INCLUDE "gfx/pokemon/tricules/anim.asm" TaurosAnimation: INCLUDE "gfx/pokemon/tauros/anim.asm" MagikarpAnimation: INCLUDE "gfx/pokemon/magikarp/anim.asm" GyaradosAnimation: INCLUDE "gfx/pokemon/gyarados/anim.asm" @@ -199,6 +222,9 @@ WooperAnimation: INCLUDE "gfx/pokemon/wooper/anim.asm" QuagsireAnimation: INCLUDE "gfx/pokemon/quagsire/anim.asm" EspeonAnimation: INCLUDE "gfx/pokemon/espeon/anim.asm" UmbreonAnimation: INCLUDE "gfx/pokemon/umbreon/anim.asm" +LeafeonAnimation: INCLUDE "gfx/pokemon/leafeon/anim.asm" +GlaceonAnimation: INCLUDE "gfx/pokemon/glaceon/anim.asm" +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" diff --git a/gfx/pokemon/annihilape/anim.asm b/gfx/pokemon/annihilape/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/annihilape/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/annihilape/anim_idle.asm b/gfx/pokemon/annihilape/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/annihilape/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/annihilape/back.png b/gfx/pokemon/annihilape/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/annihilape/back.png differ diff --git a/gfx/pokemon/annihilape/front.png b/gfx/pokemon/annihilape/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/annihilape/front.png differ diff --git a/gfx/pokemon/annihilape/shiny.pal b/gfx/pokemon/annihilape/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/annihilape/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/back.png b/gfx/pokemon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/back.png differ diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 8bb9833..2e3e2ba 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -15,6 +15,13 @@ BitmasksPointers: dw WeedleBitmasks dw KakunaBitmasks dw BeedrillBitmasks + dw GentlarvaBitmasks + dw PupalBitmasks + dw CarapthorBitmasks + dw KotoraBitmasks + dw GaotoraBitmasks + dw GorotoraBitmasks + dw RaitoraBitmasks dw PidgeyBitmasks dw PidgeottoBitmasks dw PidgeotBitmasks @@ -26,6 +33,7 @@ BitmasksPointers: dw ArbokBitmasks dw PikachuBitmasks dw RaichuBitmasks + dw GorochuBitmasks dw SandshrewBitmasks dw SandslashBitmasks dw NidoranFBitmasks @@ -34,29 +42,37 @@ BitmasksPointers: dw NidoranMBitmasks dw NidorinoBitmasks dw NidokingBitmasks + dw NidoreignBitmasks dw ClefairyBitmasks dw ClefableBitmasks + dw VulpiiiBitmasks dw VulpixBitmasks dw NinetalesBitmasks dw JigglypuffBitmasks dw WigglytuffBitmasks + dw BittybatBitmasks dw ZubatBitmasks dw GolbatBitmasks dw OddishBitmasks dw GloomBitmasks dw VileplumeBitmasks + dw ParasporBitmasks dw ParasBitmasks dw ParasectBitmasks dw VenonatBitmasks dw VenomothBitmasks dw DiglettBitmasks dw DugtrioBitmasks + dw CoinpurBitmasks dw MeowthBitmasks dw PersianBitmasks + dw PerrserkerBitmasks dw PsyduckBitmasks dw GolduckBitmasks dw MankeyBitmasks dw PrimeapeBitmasks + dw AnnihilapeBitmasks + dw PupperonBitmasks dw GrowlitheBitmasks dw ArcanineBitmasks dw PoliwagBitmasks @@ -109,12 +125,17 @@ BitmasksPointers: dw HitmonleeBitmasks dw HitmonchanBitmasks dw LickitungBitmasks + dw LickilickyBitmasks + dw LickilordBitmasks dw KoffingBitmasks dw WeezingBitmasks dw RhyhornBitmasks dw RhydonBitmasks dw ChanseyBitmasks + dw BurgelaBitmasks dw TangelaBitmasks + dw TangrowthBitmasks + dw JungelaBitmasks dw KangaskhanBitmasks dw HorseaBitmasks dw SeadraBitmasks @@ -126,10 +147,12 @@ BitmasksPointers: dw StarmieBitmasks dw MrMimeBitmasks dw ScytherBitmasks + dw KleavorBitmasks dw JynxBitmasks dw ElectabuzzBitmasks dw MagmarBitmasks dw PinsirBitmasks + dw TriculesBitmasks dw TaurosBitmasks dw MagikarpBitmasks dw GyaradosBitmasks @@ -201,6 +224,9 @@ BitmasksPointers: dw QuagsireBitmasks dw EspeonBitmasks dw UmbreonBitmasks + dw LeafeonBitmasks + dw GlaceonBitmasks + dw SylveonBitmasks dw MurkrowBitmasks dw SlowkingBitmasks dw MisdreavusBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index b4f7cb3..fd1562b 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -13,6 +13,13 @@ ButterfreeBitmasks: INCLUDE "gfx/pokemon/butterfree/bitmask.asm" WeedleBitmasks: INCLUDE "gfx/pokemon/weedle/bitmask.asm" KakunaBitmasks: INCLUDE "gfx/pokemon/kakuna/bitmask.asm" BeedrillBitmasks: INCLUDE "gfx/pokemon/beedrill/bitmask.asm" +GentlarvaBitmasks: INCLUDE "gfx/pokemon/gentlarva/bitmask.asm" +PupalBitmasks: INCLUDE "gfx/pokemon/pupal/bitmask.asm" +CarapthorBitmasks: INCLUDE "gfx/pokemon/carapthor/bitmask.asm" +KotoraBitmasks: INCLUDE "gfx/pokemon/kotora/bitmask.asm" +GaotoraBitmasks: INCLUDE "gfx/pokemon/gaotora/bitmask.asm" +GorotoraBitmasks: INCLUDE "gfx/pokemon/gorotora/bitmask.asm" +RaitoraBitmasks: INCLUDE "gfx/pokemon/raitora/bitmask.asm" PidgeyBitmasks: INCLUDE "gfx/pokemon/pidgey/bitmask.asm" PidgeottoBitmasks: INCLUDE "gfx/pokemon/pidgeotto/bitmask.asm" PidgeotBitmasks: INCLUDE "gfx/pokemon/pidgeot/bitmask.asm" @@ -24,6 +31,7 @@ EkansBitmasks: INCLUDE "gfx/pokemon/ekans/bitmask.asm" ArbokBitmasks: INCLUDE "gfx/pokemon/arbok/bitmask.asm" PikachuBitmasks: INCLUDE "gfx/pokemon/pikachu/bitmask.asm" RaichuBitmasks: INCLUDE "gfx/pokemon/raichu/bitmask.asm" +GorochuBitmasks: INCLUDE "gfx/pokemon/gorochu/bitmask.asm" SandshrewBitmasks: INCLUDE "gfx/pokemon/sandshrew/bitmask.asm" SandslashBitmasks: INCLUDE "gfx/pokemon/sandslash/bitmask.asm" NidoranFBitmasks: INCLUDE "gfx/pokemon/nidoran_f/bitmask.asm" @@ -32,29 +40,37 @@ NidoqueenBitmasks: INCLUDE "gfx/pokemon/nidoqueen/bitmask.asm" NidoranMBitmasks: INCLUDE "gfx/pokemon/nidoran_m/bitmask.asm" NidorinoBitmasks: INCLUDE "gfx/pokemon/nidorino/bitmask.asm" NidokingBitmasks: INCLUDE "gfx/pokemon/nidoking/bitmask.asm" +NidoreignBitmasks: INCLUDE "gfx/pokemon/nidoreign/bitmask.asm" ClefairyBitmasks: INCLUDE "gfx/pokemon/clefairy/bitmask.asm" ClefableBitmasks: INCLUDE "gfx/pokemon/clefable/bitmask.asm" +VulpiiiBitmasks: INCLUDE "gfx/pokemon/vulpiii/bitmask.asm" VulpixBitmasks: INCLUDE "gfx/pokemon/vulpix/bitmask.asm" NinetalesBitmasks: INCLUDE "gfx/pokemon/ninetales/bitmask.asm" JigglypuffBitmasks: INCLUDE "gfx/pokemon/jigglypuff/bitmask.asm" WigglytuffBitmasks: INCLUDE "gfx/pokemon/wigglytuff/bitmask.asm" +BittybatBitmasks: INCLUDE "gfx/pokemon/bittybat/bitmask.asm" ZubatBitmasks: INCLUDE "gfx/pokemon/zubat/bitmask.asm" GolbatBitmasks: INCLUDE "gfx/pokemon/golbat/bitmask.asm" OddishBitmasks: INCLUDE "gfx/pokemon/oddish/bitmask.asm" GloomBitmasks: INCLUDE "gfx/pokemon/gloom/bitmask.asm" VileplumeBitmasks: INCLUDE "gfx/pokemon/vileplume/bitmask.asm" +ParasporBitmasks: INCLUDE "gfx/pokemon/paraspor/bitmask.asm" ParasBitmasks: INCLUDE "gfx/pokemon/paras/bitmask.asm" ParasectBitmasks: INCLUDE "gfx/pokemon/parasect/bitmask.asm" VenonatBitmasks: INCLUDE "gfx/pokemon/venonat/bitmask.asm" VenomothBitmasks: INCLUDE "gfx/pokemon/venomoth/bitmask.asm" DiglettBitmasks: INCLUDE "gfx/pokemon/diglett/bitmask.asm" DugtrioBitmasks: INCLUDE "gfx/pokemon/dugtrio/bitmask.asm" +CoinpurBitmasks: INCLUDE "gfx/pokemon/coinpur/bitmask.asm" MeowthBitmasks: INCLUDE "gfx/pokemon/meowth/bitmask.asm" PersianBitmasks: INCLUDE "gfx/pokemon/persian/bitmask.asm" +PerrserkerBitmasks: INCLUDE "gfx/pokemon/perrserker/bitmask.asm" PsyduckBitmasks: INCLUDE "gfx/pokemon/psyduck/bitmask.asm" GolduckBitmasks: INCLUDE "gfx/pokemon/golduck/bitmask.asm" MankeyBitmasks: INCLUDE "gfx/pokemon/mankey/bitmask.asm" PrimeapeBitmasks: INCLUDE "gfx/pokemon/primeape/bitmask.asm" +AnnihilapeBitmasks: INCLUDE "gfx/pokemon/annihilape/bitmask.asm" +PupperonBitmasks: INCLUDE "gfx/pokemon/pupperon/bitmask.asm" GrowlitheBitmasks: INCLUDE "gfx/pokemon/growlithe/bitmask.asm" ArcanineBitmasks: INCLUDE "gfx/pokemon/arcanine/bitmask.asm" PoliwagBitmasks: INCLUDE "gfx/pokemon/poliwag/bitmask.asm" @@ -69,7 +85,7 @@ MachampBitmasks: INCLUDE "gfx/pokemon/machamp/bitmask.asm" BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm" WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm" VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm" -BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm" +BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm" TentacoolBitmasks: INCLUDE "gfx/pokemon/tentacool/bitmask.asm" TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm" GeodudeBitmasks: INCLUDE "gfx/pokemon/geodude/bitmask.asm" @@ -107,12 +123,17 @@ MarowakBitmasks: INCLUDE "gfx/pokemon/marowak/bitmask.asm" HitmonleeBitmasks: INCLUDE "gfx/pokemon/hitmonlee/bitmask.asm" HitmonchanBitmasks: INCLUDE "gfx/pokemon/hitmonchan/bitmask.asm" LickitungBitmasks: INCLUDE "gfx/pokemon/lickitung/bitmask.asm" +LickilickyBitmasks: INCLUDE "gfx/pokemon/lickilicky/bitmask.asm" +LickilordBitmasks: INCLUDE "gfx/pokemon/lickilord/bitmask.asm" KoffingBitmasks: INCLUDE "gfx/pokemon/koffing/bitmask.asm" WeezingBitmasks: INCLUDE "gfx/pokemon/weezing/bitmask.asm" RhyhornBitmasks: INCLUDE "gfx/pokemon/rhyhorn/bitmask.asm" RhydonBitmasks: INCLUDE "gfx/pokemon/rhydon/bitmask.asm" ChanseyBitmasks: INCLUDE "gfx/pokemon/chansey/bitmask.asm" +BurgelaBitmasks: INCLUDE "gfx/pokemon/burgela/bitmask.asm" TangelaBitmasks: INCLUDE "gfx/pokemon/tangela/bitmask.asm" +TangrowthBitmasks: INCLUDE "gfx/pokemon/tangrowth/bitmask.asm" +JungelaBitmasks: INCLUDE "gfx/pokemon/jungela/bitmask.asm" KangaskhanBitmasks: INCLUDE "gfx/pokemon/kangaskhan/bitmask.asm" HorseaBitmasks: INCLUDE "gfx/pokemon/horsea/bitmask.asm" SeadraBitmasks: INCLUDE "gfx/pokemon/seadra/bitmask.asm" @@ -124,10 +145,12 @@ StaryuBitmasks: INCLUDE "gfx/pokemon/staryu/bitmask.asm" StarmieBitmasks: INCLUDE "gfx/pokemon/starmie/bitmask.asm" MrMimeBitmasks: INCLUDE "gfx/pokemon/mr__mime/bitmask.asm" ScytherBitmasks: INCLUDE "gfx/pokemon/scyther/bitmask.asm" +KleavorBitmasks: INCLUDE "gfx/pokemon/kleavor/bitmask.asm" JynxBitmasks: INCLUDE "gfx/pokemon/jynx/bitmask.asm" ElectabuzzBitmasks: INCLUDE "gfx/pokemon/electabuzz/bitmask.asm" MagmarBitmasks: INCLUDE "gfx/pokemon/magmar/bitmask.asm" PinsirBitmasks: INCLUDE "gfx/pokemon/pinsir/bitmask.asm" +TriculesBitmasks: INCLUDE "gfx/pokemon/tricules/bitmask.asm" TaurosBitmasks: INCLUDE "gfx/pokemon/tauros/bitmask.asm" MagikarpBitmasks: INCLUDE "gfx/pokemon/magikarp/bitmask.asm" GyaradosBitmasks: INCLUDE "gfx/pokemon/gyarados/bitmask.asm" @@ -199,6 +222,9 @@ WooperBitmasks: INCLUDE "gfx/pokemon/wooper/bitmask.asm" QuagsireBitmasks: INCLUDE "gfx/pokemon/quagsire/bitmask.asm" EspeonBitmasks: INCLUDE "gfx/pokemon/espeon/bitmask.asm" UmbreonBitmasks: INCLUDE "gfx/pokemon/umbreon/bitmask.asm" +LeafeonBitmasks: INCLUDE "gfx/pokemon/leafeon/bitmask.asm" +GlaceonBitmasks: INCLUDE "gfx/pokemon/glaceon/bitmask.asm" +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" diff --git a/gfx/pokemon/bittybat/anim.asm b/gfx/pokemon/bittybat/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bittybat/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bittybat/anim_idle.asm b/gfx/pokemon/bittybat/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/bittybat/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/bittybat/back.png b/gfx/pokemon/bittybat/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/bittybat/back.png differ diff --git a/gfx/pokemon/bittybat/front.png b/gfx/pokemon/bittybat/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/bittybat/front.png differ diff --git a/gfx/pokemon/bittybat/shiny.pal b/gfx/pokemon/bittybat/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/bittybat/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/burgela/anim.asm b/gfx/pokemon/burgela/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/burgela/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/burgela/anim_idle.asm b/gfx/pokemon/burgela/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/burgela/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/burgela/back.png b/gfx/pokemon/burgela/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/burgela/back.png differ diff --git a/gfx/pokemon/burgela/front.png b/gfx/pokemon/burgela/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/burgela/front.png differ diff --git a/gfx/pokemon/burgela/shiny.pal b/gfx/pokemon/burgela/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/burgela/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/carapthor/anim.asm b/gfx/pokemon/carapthor/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/carapthor/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/carapthor/anim_idle.asm b/gfx/pokemon/carapthor/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/carapthor/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/carapthor/back.png b/gfx/pokemon/carapthor/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/carapthor/back.png differ diff --git a/gfx/pokemon/carapthor/front.png b/gfx/pokemon/carapthor/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/carapthor/front.png differ diff --git a/gfx/pokemon/carapthor/shiny.pal b/gfx/pokemon/carapthor/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/carapthor/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/coinpur/anim.asm b/gfx/pokemon/coinpur/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/coinpur/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/coinpur/anim_idle.asm b/gfx/pokemon/coinpur/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/coinpur/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/coinpur/back.png b/gfx/pokemon/coinpur/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/coinpur/back.png differ diff --git a/gfx/pokemon/coinpur/front.png b/gfx/pokemon/coinpur/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/coinpur/front.png differ diff --git a/gfx/pokemon/coinpur/shiny.pal b/gfx/pokemon/coinpur/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/coinpur/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 deffd09..f192d30 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -15,6 +15,13 @@ FramesPointers: dba WeedleFrames dba KakunaFrames dba BeedrillFrames + dba GentlarvaFrames + dba PupalFrames + dba CarapthorFrames + dba KotoraFrames + dba GaotoraFrames + dba GorotoraFrames + dba RaitoraFrames dba PidgeyFrames dba PidgeottoFrames dba PidgeotFrames @@ -26,6 +33,7 @@ FramesPointers: dba ArbokFrames dba PikachuFrames dba RaichuFrames + dba GorochuFrames dba SandshrewFrames dba SandslashFrames dba NidoranFFrames @@ -34,29 +42,37 @@ FramesPointers: dba NidoranMFrames dba NidorinoFrames dba NidokingFrames + dba NidoreignFrames dba ClefairyFrames dba ClefableFrames + dba VulpiiiFrames dba VulpixFrames dba NinetalesFrames dba JigglypuffFrames dba WigglytuffFrames + dba BittybatFrames dba ZubatFrames dba GolbatFrames dba OddishFrames dba GloomFrames dba VileplumeFrames + dba ParasporFrames dba ParasFrames dba ParasectFrames dba VenonatFrames dba VenomothFrames dba DiglettFrames dba DugtrioFrames + dba CoinpurFrames dba MeowthFrames dba PersianFrames + dba PerrserkerFrames dba PsyduckFrames dba GolduckFrames dba MankeyFrames dba PrimeapeFrames + dba AnnihilapeFrames + dba PupperonFrames dba GrowlitheFrames dba ArcanineFrames dba PoliwagFrames @@ -109,12 +125,17 @@ FramesPointers: dba HitmonleeFrames dba HitmonchanFrames dba LickitungFrames + dba LickilickyFrames + dba LickilordFrames dba KoffingFrames dba WeezingFrames dba RhyhornFrames dba RhydonFrames dba ChanseyFrames + dba BurgelaFrames dba TangelaFrames + dba TangrowthFrames + dba JungelaFrames dba KangaskhanFrames dba HorseaFrames dba SeadraFrames @@ -126,10 +147,12 @@ FramesPointers: dba StarmieFrames dba MrMimeFrames dba ScytherFrames + dba KleavorFrames dba JynxFrames dba ElectabuzzFrames dba MagmarFrames dba PinsirFrames + dba TriculesFrames dba TaurosFrames dba MagikarpFrames dba GyaradosFrames @@ -201,6 +224,9 @@ FramesPointers: dba QuagsireFrames dba EspeonFrames dba UmbreonFrames + dba LeafeonFrames + dba GlaceonFrames + dba SylveonFrames dba MurkrowFrames dba SlowkingFrames dba MisdreavusFrames diff --git a/gfx/pokemon/front.png b/gfx/pokemon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/front.png differ diff --git a/gfx/pokemon/gaotora/anim.asm b/gfx/pokemon/gaotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gaotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gaotora/anim_idle.asm b/gfx/pokemon/gaotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gaotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gaotora/back.png b/gfx/pokemon/gaotora/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gaotora/back.png differ diff --git a/gfx/pokemon/gaotora/front.png b/gfx/pokemon/gaotora/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gaotora/front.png differ diff --git a/gfx/pokemon/gaotora/shiny.pal b/gfx/pokemon/gaotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gaotora/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/gentlarva/anim.asm b/gfx/pokemon/gentlarva/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gentlarva/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gentlarva/anim_idle.asm b/gfx/pokemon/gentlarva/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gentlarva/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gentlarva/back.png b/gfx/pokemon/gentlarva/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gentlarva/back.png differ diff --git a/gfx/pokemon/gentlarva/front.png b/gfx/pokemon/gentlarva/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gentlarva/front.png differ diff --git a/gfx/pokemon/gentlarva/shiny.pal b/gfx/pokemon/gentlarva/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gentlarva/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/glaceon/anim.asm b/gfx/pokemon/glaceon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/glaceon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/glaceon/anim_idle.asm b/gfx/pokemon/glaceon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/glaceon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/glaceon/back.png b/gfx/pokemon/glaceon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/glaceon/back.png differ diff --git a/gfx/pokemon/glaceon/front.png b/gfx/pokemon/glaceon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/glaceon/front.png differ diff --git a/gfx/pokemon/glaceon/shiny.pal b/gfx/pokemon/glaceon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/glaceon/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/gorochu/anim.asm b/gfx/pokemon/gorochu/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorochu/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorochu/anim_idle.asm b/gfx/pokemon/gorochu/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorochu/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorochu/back.png b/gfx/pokemon/gorochu/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gorochu/back.png differ diff --git a/gfx/pokemon/gorochu/front.png b/gfx/pokemon/gorochu/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gorochu/front.png differ diff --git a/gfx/pokemon/gorochu/shiny.pal b/gfx/pokemon/gorochu/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gorochu/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/gorotora/anim.asm b/gfx/pokemon/gorotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorotora/anim_idle.asm b/gfx/pokemon/gorotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorotora/back.png b/gfx/pokemon/gorotora/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/gorotora/back.png differ diff --git a/gfx/pokemon/gorotora/front.png b/gfx/pokemon/gorotora/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/gorotora/front.png differ diff --git a/gfx/pokemon/gorotora/shiny.pal b/gfx/pokemon/gorotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gorotora/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 9ed50ed..fbfa202 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -15,6 +15,13 @@ AnimationIdlePointers: dw WeedleAnimationIdle dw KakunaAnimationIdle dw BeedrillAnimationIdle + dw GentlarvaAnimationIdle + dw PupalAnimationIdle + dw CarapthorAnimationIdle + dw KotoraAnimationIdle + dw GaotoraAnimationIdle + dw GorotoraAnimationIdle + dw RaitoraAnimationIdle dw PidgeyAnimationIdle dw PidgeottoAnimationIdle dw PidgeotAnimationIdle @@ -26,6 +33,7 @@ AnimationIdlePointers: dw ArbokAnimationIdle dw PikachuAnimationIdle dw RaichuAnimationIdle + dw GorochuAnimationIdle dw SandshrewAnimationIdle dw SandslashAnimationIdle dw NidoranFAnimationIdle @@ -34,29 +42,37 @@ AnimationIdlePointers: dw NidoranMAnimationIdle dw NidorinoAnimationIdle dw NidokingAnimationIdle + dw NidoreignAnimationIdle dw ClefairyAnimationIdle dw ClefableAnimationIdle + dw VulpiiiAnimationIdle dw VulpixAnimationIdle dw NinetalesAnimationIdle dw JigglypuffAnimationIdle dw WigglytuffAnimationIdle + dw BittybatAnimationIdle dw ZubatAnimationIdle dw GolbatAnimationIdle dw OddishAnimationIdle dw GloomAnimationIdle dw VileplumeAnimationIdle + dw ParasporAnimationIdle dw ParasAnimationIdle dw ParasectAnimationIdle dw VenonatAnimationIdle dw VenomothAnimationIdle dw DiglettAnimationIdle dw DugtrioAnimationIdle + dw CoinpurAnimationIdle dw MeowthAnimationIdle dw PersianAnimationIdle + dw PerrserkerAnimationIdle dw PsyduckAnimationIdle dw GolduckAnimationIdle dw MankeyAnimationIdle dw PrimeapeAnimationIdle + dw AnnihilapeAnimationIdle + dw PupperonAnimationIdle dw GrowlitheAnimationIdle dw ArcanineAnimationIdle dw PoliwagAnimationIdle @@ -109,12 +125,17 @@ AnimationIdlePointers: dw HitmonleeAnimationIdle dw HitmonchanAnimationIdle dw LickitungAnimationIdle + dw LickilickyAnimationIdle + dw LickilordAnimationIdle dw KoffingAnimationIdle dw WeezingAnimationIdle dw RhyhornAnimationIdle dw RhydonAnimationIdle dw ChanseyAnimationIdle + dw BurgelaAnimationIdle dw TangelaAnimationIdle + dw TangrowthAnimationIdle + dw JungelaAnimationIdle dw KangaskhanAnimationIdle dw HorseaAnimationIdle dw SeadraAnimationIdle @@ -126,10 +147,12 @@ AnimationIdlePointers: dw StarmieAnimationIdle dw MrMimeAnimationIdle dw ScytherAnimationIdle + dw KleavorAnimationIdle dw JynxAnimationIdle dw ElectabuzzAnimationIdle dw MagmarAnimationIdle dw PinsirAnimationIdle + dw TriculesAnimationIdle dw TaurosAnimationIdle dw MagikarpAnimationIdle dw GyaradosAnimationIdle @@ -201,6 +224,9 @@ AnimationIdlePointers: dw QuagsireAnimationIdle dw EspeonAnimationIdle dw UmbreonAnimationIdle + dw LeafeonAnimationIdle + dw GlaceonAnimationIdle + dw SylveonAnimationIdle dw MurkrowAnimationIdle dw SlowkingAnimationIdle dw MisdreavusAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index a192b14..8ab93b8 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -13,6 +13,13 @@ ButterfreeAnimationIdle: INCLUDE "gfx/pokemon/butterfree/anim_idle.asm" WeedleAnimationIdle: INCLUDE "gfx/pokemon/weedle/anim_idle.asm" KakunaAnimationIdle: INCLUDE "gfx/pokemon/kakuna/anim_idle.asm" BeedrillAnimationIdle: INCLUDE "gfx/pokemon/beedrill/anim_idle.asm" +GentlarvaAnimationIdle: INCLUDE "gfx/pokemon/gentlarva/anim_idle.asm" +PupalAnimationIdle: INCLUDE "gfx/pokemon/pupal/anim_idle.asm" +CarapthorAnimationIdle: INCLUDE "gfx/pokemon/carapthor/anim_idle.asm" +KotoraAnimationIdle: INCLUDE "gfx/pokemon/kotora/anim_idle.asm" +GaotoraAnimationIdle: INCLUDE "gfx/pokemon/gaotora/anim_idle.asm" +GorotoraAnimationIdle: INCLUDE "gfx/pokemon/gorotora/anim_idle.asm" +RaitoraAnimationIdle: INCLUDE "gfx/pokemon/raitora/anim_idle.asm" PidgeyAnimationIdle: INCLUDE "gfx/pokemon/pidgey/anim_idle.asm" PidgeottoAnimationIdle: INCLUDE "gfx/pokemon/pidgeotto/anim_idle.asm" PidgeotAnimationIdle: INCLUDE "gfx/pokemon/pidgeot/anim_idle.asm" @@ -24,6 +31,7 @@ EkansAnimationIdle: INCLUDE "gfx/pokemon/ekans/anim_idle.asm" ArbokAnimationIdle: INCLUDE "gfx/pokemon/arbok/anim_idle.asm" PikachuAnimationIdle: INCLUDE "gfx/pokemon/pikachu/anim_idle.asm" RaichuAnimationIdle: INCLUDE "gfx/pokemon/raichu/anim_idle.asm" +GorochuAnimationIdle: INCLUDE "gfx/pokemon/gorochu/anim_idle.asm" SandshrewAnimationIdle: INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm" SandslashAnimationIdle: INCLUDE "gfx/pokemon/sandslash/anim_idle.asm" NidoranFAnimationIdle: INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm" @@ -32,29 +40,37 @@ NidoqueenAnimationIdle: INCLUDE "gfx/pokemon/nidoqueen/anim_idle.asm" NidoranMAnimationIdle: INCLUDE "gfx/pokemon/nidoran_m/anim_idle.asm" NidorinoAnimationIdle: INCLUDE "gfx/pokemon/nidorino/anim_idle.asm" NidokingAnimationIdle: INCLUDE "gfx/pokemon/nidoking/anim_idle.asm" +NidoreignAnimationIdle: INCLUDE "gfx/pokemon/nidoreign/anim_idle.asm" ClefairyAnimationIdle: INCLUDE "gfx/pokemon/clefairy/anim_idle.asm" ClefableAnimationIdle: INCLUDE "gfx/pokemon/clefable/anim_idle.asm" +VulpiiiAnimationIdle: INCLUDE "gfx/pokemon/vulpiii/anim_idle.asm" VulpixAnimationIdle: INCLUDE "gfx/pokemon/vulpix/anim_idle.asm" NinetalesAnimationIdle: INCLUDE "gfx/pokemon/ninetales/anim_idle.asm" JigglypuffAnimationIdle: INCLUDE "gfx/pokemon/jigglypuff/anim_idle.asm" WigglytuffAnimationIdle: INCLUDE "gfx/pokemon/wigglytuff/anim_idle.asm" +BittybatAnimationIdle: INCLUDE "gfx/pokemon/bittybat/anim_idle.asm" ZubatAnimationIdle: INCLUDE "gfx/pokemon/zubat/anim_idle.asm" GolbatAnimationIdle: INCLUDE "gfx/pokemon/golbat/anim_idle.asm" OddishAnimationIdle: INCLUDE "gfx/pokemon/oddish/anim_idle.asm" GloomAnimationIdle: INCLUDE "gfx/pokemon/gloom/anim_idle.asm" VileplumeAnimationIdle: INCLUDE "gfx/pokemon/vileplume/anim_idle.asm" +ParasporAnimationIdle: INCLUDE "gfx/pokemon/paraspor/anim_idle.asm" ParasAnimationIdle: INCLUDE "gfx/pokemon/paras/anim_idle.asm" ParasectAnimationIdle: INCLUDE "gfx/pokemon/parasect/anim_idle.asm" VenonatAnimationIdle: INCLUDE "gfx/pokemon/venonat/anim_idle.asm" VenomothAnimationIdle: INCLUDE "gfx/pokemon/venomoth/anim_idle.asm" DiglettAnimationIdle: INCLUDE "gfx/pokemon/diglett/anim_idle.asm" DugtrioAnimationIdle: INCLUDE "gfx/pokemon/dugtrio/anim_idle.asm" +CoinpurAnimationIdle: INCLUDE "gfx/pokemon/coinpur/anim_idle.asm" MeowthAnimationIdle: INCLUDE "gfx/pokemon/meowth/anim_idle.asm" PersianAnimationIdle: INCLUDE "gfx/pokemon/persian/anim_idle.asm" +PerrserkerAnimationIdle: INCLUDE "gfx/pokemon/perrserker/anim_idle.asm" PsyduckAnimationIdle: INCLUDE "gfx/pokemon/psyduck/anim_idle.asm" GolduckAnimationIdle: INCLUDE "gfx/pokemon/golduck/anim_idle.asm" MankeyAnimationIdle: INCLUDE "gfx/pokemon/mankey/anim_idle.asm" PrimeapeAnimationIdle: INCLUDE "gfx/pokemon/primeape/anim_idle.asm" +AnnihilapeAnimationIdle: INCLUDE "gfx/pokemon/annihilape/anim_idle.asm" +PupperonAnimationIdle: INCLUDE "gfx/pokemon/pupperon/anim_idle.asm" GrowlitheAnimationIdle: INCLUDE "gfx/pokemon/growlithe/anim_idle.asm" ArcanineAnimationIdle: INCLUDE "gfx/pokemon/arcanine/anim_idle.asm" PoliwagAnimationIdle: INCLUDE "gfx/pokemon/poliwag/anim_idle.asm" @@ -69,7 +85,7 @@ MachampAnimationIdle: INCLUDE "gfx/pokemon/machamp/anim_idle.asm" BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm" WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm" VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" -BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" +BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm" TentacoolAnimationIdle: INCLUDE "gfx/pokemon/tentacool/anim_idle.asm" TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm" GeodudeAnimationIdle: INCLUDE "gfx/pokemon/geodude/anim_idle.asm" @@ -107,12 +123,17 @@ MarowakAnimationIdle: INCLUDE "gfx/pokemon/marowak/anim_idle.asm" HitmonleeAnimationIdle: INCLUDE "gfx/pokemon/hitmonlee/anim_idle.asm" HitmonchanAnimationIdle: INCLUDE "gfx/pokemon/hitmonchan/anim_idle.asm" LickitungAnimationIdle: INCLUDE "gfx/pokemon/lickitung/anim_idle.asm" +LickilickyAnimationIdle: INCLUDE "gfx/pokemon/lickilicky/anim_idle.asm" +LickilordAnimationIdle: INCLUDE "gfx/pokemon/lickilord/anim_idle.asm" KoffingAnimationIdle: INCLUDE "gfx/pokemon/koffing/anim_idle.asm" WeezingAnimationIdle: INCLUDE "gfx/pokemon/weezing/anim_idle.asm" RhyhornAnimationIdle: INCLUDE "gfx/pokemon/rhyhorn/anim_idle.asm" RhydonAnimationIdle: INCLUDE "gfx/pokemon/rhydon/anim_idle.asm" ChanseyAnimationIdle: INCLUDE "gfx/pokemon/chansey/anim_idle.asm" +BurgelaAnimationIdle: INCLUDE "gfx/pokemon/burgela/anim_idle.asm" TangelaAnimationIdle: INCLUDE "gfx/pokemon/tangela/anim_idle.asm" +TangrowthAnimationIdle: INCLUDE "gfx/pokemon/tangrowth/anim_idle.asm" +JungelaAnimationIdle: INCLUDE "gfx/pokemon/jungela/anim_idle.asm" KangaskhanAnimationIdle: INCLUDE "gfx/pokemon/kangaskhan/anim_idle.asm" HorseaAnimationIdle: INCLUDE "gfx/pokemon/horsea/anim_idle.asm" SeadraAnimationIdle: INCLUDE "gfx/pokemon/seadra/anim_idle.asm" @@ -124,10 +145,12 @@ StaryuAnimationIdle: INCLUDE "gfx/pokemon/staryu/anim_idle.asm" StarmieAnimationIdle: INCLUDE "gfx/pokemon/starmie/anim_idle.asm" MrMimeAnimationIdle: INCLUDE "gfx/pokemon/mr__mime/anim_idle.asm" ScytherAnimationIdle: INCLUDE "gfx/pokemon/scyther/anim_idle.asm" +KleavorAnimationIdle: INCLUDE "gfx/pokemon/kleavor/anim_idle.asm" JynxAnimationIdle: INCLUDE "gfx/pokemon/jynx/anim_idle.asm" ElectabuzzAnimationIdle: INCLUDE "gfx/pokemon/electabuzz/anim_idle.asm" MagmarAnimationIdle: INCLUDE "gfx/pokemon/magmar/anim_idle.asm" PinsirAnimationIdle: INCLUDE "gfx/pokemon/pinsir/anim_idle.asm" +TriculesAnimationIdle: INCLUDE "gfx/pokemon/tricules/anim_idle.asm" TaurosAnimationIdle: INCLUDE "gfx/pokemon/tauros/anim_idle.asm" MagikarpAnimationIdle: INCLUDE "gfx/pokemon/magikarp/anim_idle.asm" GyaradosAnimationIdle: INCLUDE "gfx/pokemon/gyarados/anim_idle.asm" @@ -199,6 +222,9 @@ WooperAnimationIdle: INCLUDE "gfx/pokemon/wooper/anim_idle.asm" QuagsireAnimationIdle: INCLUDE "gfx/pokemon/quagsire/anim_idle.asm" EspeonAnimationIdle: INCLUDE "gfx/pokemon/espeon/anim_idle.asm" UmbreonAnimationIdle: INCLUDE "gfx/pokemon/umbreon/anim_idle.asm" +LeafeonAnimationIdle: INCLUDE "gfx/pokemon/leafeon/anim_idle.asm" +GlaceonAnimationIdle: INCLUDE "gfx/pokemon/glaceon/anim_idle.asm" +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" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 13ec3b1..349a45a 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -46,6 +46,9 @@ WooperFrames: INCLUDE "gfx/pokemon/wooper/frames.asm" QuagsireFrames: INCLUDE "gfx/pokemon/quagsire/frames.asm" EspeonFrames: INCLUDE "gfx/pokemon/espeon/frames.asm" UmbreonFrames: INCLUDE "gfx/pokemon/umbreon/frames.asm" +LeafeonFrames: INCLUDE "gfx/pokemon/leafeon/frames.asm" +GlaceonFrames: INCLUDE "gfx/pokemon/glaceon/frames.asm" +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" diff --git a/gfx/pokemon/jungela/anim.asm b/gfx/pokemon/jungela/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/jungela/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/jungela/anim_idle.asm b/gfx/pokemon/jungela/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/jungela/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/jungela/back.png b/gfx/pokemon/jungela/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/jungela/back.png differ diff --git a/gfx/pokemon/jungela/front.png b/gfx/pokemon/jungela/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/jungela/front.png differ diff --git a/gfx/pokemon/jungela/shiny.pal b/gfx/pokemon/jungela/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/jungela/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/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 658de5c..04df1dc 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -15,6 +15,13 @@ ButterfreeFrames: INCLUDE "gfx/pokemon/butterfree/frames.asm" WeedleFrames: INCLUDE "gfx/pokemon/weedle/frames.asm" KakunaFrames: INCLUDE "gfx/pokemon/kakuna/frames.asm" BeedrillFrames: INCLUDE "gfx/pokemon/beedrill/frames.asm" +GentlarvaFrames: INCLUDE "gfx/pokemon/gentlarva/frames.asm" +PupalFrames: INCLUDE "gfx/pokemon/pupal/frames.asm" +CarapthorFrames: INCLUDE "gfx/pokemon/carapthor/frames.asm" +KotoraFrames: INCLUDE "gfx/pokemon/kotora/frames.asm" +GaotoraFrames: INCLUDE "gfx/pokemon/gaotora/frames.asm" +GorotoraFrames: INCLUDE "gfx/pokemon/gorotora/frames.asm" +RaitoraFrames: INCLUDE "gfx/pokemon/raitora/frames.asm" PidgeyFrames: INCLUDE "gfx/pokemon/pidgey/frames.asm" PidgeottoFrames: INCLUDE "gfx/pokemon/pidgeotto/frames.asm" PidgeotFrames: INCLUDE "gfx/pokemon/pidgeot/frames.asm" @@ -26,6 +33,7 @@ EkansFrames: INCLUDE "gfx/pokemon/ekans/frames.asm" ArbokFrames: INCLUDE "gfx/pokemon/arbok/frames.asm" PikachuFrames: INCLUDE "gfx/pokemon/pikachu/frames.asm" RaichuFrames: INCLUDE "gfx/pokemon/raichu/frames.asm" +GorochuFrames: INCLUDE "gfx/pokemon/gorochu/frames.asm" SandshrewFrames: INCLUDE "gfx/pokemon/sandshrew/frames.asm" SandslashFrames: INCLUDE "gfx/pokemon/sandslash/frames.asm" NidoranFFrames: INCLUDE "gfx/pokemon/nidoran_f/frames.asm" @@ -34,29 +42,37 @@ NidoqueenFrames: INCLUDE "gfx/pokemon/nidoqueen/frames.asm" NidoranMFrames: INCLUDE "gfx/pokemon/nidoran_m/frames.asm" NidorinoFrames: INCLUDE "gfx/pokemon/nidorino/frames.asm" NidokingFrames: INCLUDE "gfx/pokemon/nidoking/frames.asm" +NidoreignFrames: INCLUDE "gfx/pokemon/nidoreign/frames.asm" ClefairyFrames: INCLUDE "gfx/pokemon/clefairy/frames.asm" ClefableFrames: INCLUDE "gfx/pokemon/clefable/frames.asm" +VulpiiiFrames: INCLUDE "gfx/pokemon/vulpiii/frames.asm" VulpixFrames: INCLUDE "gfx/pokemon/vulpix/frames.asm" NinetalesFrames: INCLUDE "gfx/pokemon/ninetales/frames.asm" JigglypuffFrames: INCLUDE "gfx/pokemon/jigglypuff/frames.asm" WigglytuffFrames: INCLUDE "gfx/pokemon/wigglytuff/frames.asm" +BittybatFrames: INCLUDE "gfx/pokemon/bittybat/frames.asm" ZubatFrames: INCLUDE "gfx/pokemon/zubat/frames.asm" GolbatFrames: INCLUDE "gfx/pokemon/golbat/frames.asm" OddishFrames: INCLUDE "gfx/pokemon/oddish/frames.asm" GloomFrames: INCLUDE "gfx/pokemon/gloom/frames.asm" VileplumeFrames: INCLUDE "gfx/pokemon/vileplume/frames.asm" +ParasporFrames: INCLUDE "gfx/pokemon/paraspor/frames.asm" ParasFrames: INCLUDE "gfx/pokemon/paras/frames.asm" ParasectFrames: INCLUDE "gfx/pokemon/parasect/frames.asm" VenonatFrames: INCLUDE "gfx/pokemon/venonat/frames.asm" VenomothFrames: INCLUDE "gfx/pokemon/venomoth/frames.asm" DiglettFrames: INCLUDE "gfx/pokemon/diglett/frames.asm" DugtrioFrames: INCLUDE "gfx/pokemon/dugtrio/frames.asm" +CoinpurFrames: INCLUDE "gfx/pokemon/coinpur/frames.asm" MeowthFrames: INCLUDE "gfx/pokemon/meowth/frames.asm" PersianFrames: INCLUDE "gfx/pokemon/persian/frames.asm" +PerrserkerFrames: INCLUDE "gfx/pokemon/perrserker/frames.asm" PsyduckFrames: INCLUDE "gfx/pokemon/psyduck/frames.asm" GolduckFrames: INCLUDE "gfx/pokemon/golduck/frames.asm" MankeyFrames: INCLUDE "gfx/pokemon/mankey/frames.asm" PrimeapeFrames: INCLUDE "gfx/pokemon/primeape/frames.asm" +AnnihilapeFrames: INCLUDE "gfx/pokemon/annihilape/frames.asm" +PupperonFrames: INCLUDE "gfx/pokemon/pupperon/frames.asm" GrowlitheFrames: INCLUDE "gfx/pokemon/growlithe/frames.asm" ArcanineFrames: INCLUDE "gfx/pokemon/arcanine/frames.asm" PoliwagFrames: INCLUDE "gfx/pokemon/poliwag/frames.asm" @@ -71,7 +87,7 @@ MachampFrames: INCLUDE "gfx/pokemon/machamp/frames.asm" BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm" WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm" VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm" -BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm" +BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm" TentacoolFrames: INCLUDE "gfx/pokemon/tentacool/frames.asm" TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm" GeodudeFrames: INCLUDE "gfx/pokemon/geodude/frames.asm" @@ -109,12 +125,17 @@ MarowakFrames: INCLUDE "gfx/pokemon/marowak/frames.asm" HitmonleeFrames: INCLUDE "gfx/pokemon/hitmonlee/frames.asm" HitmonchanFrames: INCLUDE "gfx/pokemon/hitmonchan/frames.asm" LickitungFrames: INCLUDE "gfx/pokemon/lickitung/frames.asm" +LickilickyFrames: INCLUDE "gfx/pokemon/lickilicky/frames.asm" +LickilordFrames: INCLUDE "gfx/pokemon/lickilord/frames.asm" KoffingFrames: INCLUDE "gfx/pokemon/koffing/frames.asm" WeezingFrames: INCLUDE "gfx/pokemon/weezing/frames.asm" RhyhornFrames: INCLUDE "gfx/pokemon/rhyhorn/frames.asm" RhydonFrames: INCLUDE "gfx/pokemon/rhydon/frames.asm" ChanseyFrames: INCLUDE "gfx/pokemon/chansey/frames.asm" +BurgelaFrames: INCLUDE "gfx/pokemon/burgela/frames.asm" TangelaFrames: INCLUDE "gfx/pokemon/tangela/frames.asm" +TangrowthFrames: INCLUDE "gfx/pokemon/tangrowth/frames.asm" +JungelaFrames: INCLUDE "gfx/pokemon/jungela/frames.asm" KangaskhanFrames: INCLUDE "gfx/pokemon/kangaskhan/frames.asm" HorseaFrames: INCLUDE "gfx/pokemon/horsea/frames.asm" SeadraFrames: INCLUDE "gfx/pokemon/seadra/frames.asm" @@ -126,10 +147,12 @@ StaryuFrames: INCLUDE "gfx/pokemon/staryu/frames.asm" StarmieFrames: INCLUDE "gfx/pokemon/starmie/frames.asm" MrMimeFrames: INCLUDE "gfx/pokemon/mr__mime/frames.asm" ScytherFrames: INCLUDE "gfx/pokemon/scyther/frames.asm" +KleavorFrames: INCLUDE "gfx/pokemon/kleavor/frames.asm" JynxFrames: INCLUDE "gfx/pokemon/jynx/frames.asm" ElectabuzzFrames: INCLUDE "gfx/pokemon/electabuzz/frames.asm" MagmarFrames: INCLUDE "gfx/pokemon/magmar/frames.asm" PinsirFrames: INCLUDE "gfx/pokemon/pinsir/frames.asm" +TriculesFrames: INCLUDE "gfx/pokemon/tricules/frames.asm" TaurosFrames: INCLUDE "gfx/pokemon/tauros/frames.asm" MagikarpFrames: INCLUDE "gfx/pokemon/magikarp/frames.asm" GyaradosFrames: INCLUDE "gfx/pokemon/gyarados/frames.asm" diff --git a/gfx/pokemon/kleavor/anim.asm b/gfx/pokemon/kleavor/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/kleavor/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/kleavor/anim_idle.asm b/gfx/pokemon/kleavor/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/kleavor/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/kleavor/back.png b/gfx/pokemon/kleavor/back.png new file mode 100644 index 0000000..8ebe34e Binary files /dev/null and b/gfx/pokemon/kleavor/back.png differ diff --git a/gfx/pokemon/kleavor/front.png b/gfx/pokemon/kleavor/front.png new file mode 100644 index 0000000..c93f781 Binary files /dev/null and b/gfx/pokemon/kleavor/front.png differ diff --git a/gfx/pokemon/kleavor/shiny.pal b/gfx/pokemon/kleavor/shiny.pal new file mode 100644 index 0000000..550d6de --- /dev/null +++ b/gfx/pokemon/kleavor/shiny.pal @@ -0,0 +1,4 @@ + + RGB 17, 24, 00 + RGB 28, 09, 00 + diff --git a/gfx/pokemon/kotora/anim.asm b/gfx/pokemon/kotora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kotora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/anim_idle.asm b/gfx/pokemon/kotora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/kotora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/kotora/back.png b/gfx/pokemon/kotora/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/kotora/back.png differ diff --git a/gfx/pokemon/kotora/front.png b/gfx/pokemon/kotora/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/kotora/front.png differ diff --git a/gfx/pokemon/kotora/shiny.pal b/gfx/pokemon/kotora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/kotora/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/leafeon/anim.asm b/gfx/pokemon/leafeon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/leafeon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/leafeon/anim_idle.asm b/gfx/pokemon/leafeon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/leafeon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/leafeon/back.png b/gfx/pokemon/leafeon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/leafeon/back.png differ diff --git a/gfx/pokemon/leafeon/front.png b/gfx/pokemon/leafeon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/leafeon/front.png differ diff --git a/gfx/pokemon/leafeon/shiny.pal b/gfx/pokemon/leafeon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/leafeon/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/lickilicky/anim.asm b/gfx/pokemon/lickilicky/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilicky/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilicky/anim_idle.asm b/gfx/pokemon/lickilicky/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilicky/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilicky/back.png b/gfx/pokemon/lickilicky/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/lickilicky/back.png differ diff --git a/gfx/pokemon/lickilicky/front.png b/gfx/pokemon/lickilicky/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/lickilicky/front.png differ diff --git a/gfx/pokemon/lickilicky/shiny.pal b/gfx/pokemon/lickilicky/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/lickilicky/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/lickilord/anim.asm b/gfx/pokemon/lickilord/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilord/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilord/anim_idle.asm b/gfx/pokemon/lickilord/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/lickilord/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/lickilord/back.png b/gfx/pokemon/lickilord/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/lickilord/back.png differ diff --git a/gfx/pokemon/lickilord/front.png b/gfx/pokemon/lickilord/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/lickilord/front.png differ diff --git a/gfx/pokemon/lickilord/shiny.pal b/gfx/pokemon/lickilord/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/lickilord/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/nidoreign/anim.asm b/gfx/pokemon/nidoreign/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/nidoreign/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/nidoreign/anim_idle.asm b/gfx/pokemon/nidoreign/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/nidoreign/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/nidoreign/back.png b/gfx/pokemon/nidoreign/back.png new file mode 100644 index 0000000..a8ed573 Binary files /dev/null and b/gfx/pokemon/nidoreign/back.png differ diff --git a/gfx/pokemon/nidoreign/front.png b/gfx/pokemon/nidoreign/front.png new file mode 100644 index 0000000..ecaf104 Binary files /dev/null and b/gfx/pokemon/nidoreign/front.png differ diff --git a/gfx/pokemon/nidoreign/shiny.pal b/gfx/pokemon/nidoreign/shiny.pal new file mode 100644 index 0000000..b27c118 --- /dev/null +++ b/gfx/pokemon/nidoreign/shiny.pal @@ -0,0 +1,4 @@ + + RGB 31, 16, 31 + RGB 11, 13, 08 + diff --git a/gfx/pokemon/paraspor/anim.asm b/gfx/pokemon/paraspor/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/paraspor/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/paraspor/anim_idle.asm b/gfx/pokemon/paraspor/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/paraspor/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/paraspor/back.png b/gfx/pokemon/paraspor/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/paraspor/back.png differ diff --git a/gfx/pokemon/paraspor/front.png b/gfx/pokemon/paraspor/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/paraspor/front.png differ diff --git a/gfx/pokemon/paraspor/shiny.pal b/gfx/pokemon/paraspor/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/paraspor/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/perrserker/anim.asm b/gfx/pokemon/perrserker/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/perrserker/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/perrserker/anim_idle.asm b/gfx/pokemon/perrserker/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/perrserker/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/perrserker/back.png b/gfx/pokemon/perrserker/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/perrserker/back.png differ diff --git a/gfx/pokemon/perrserker/front.png b/gfx/pokemon/perrserker/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/perrserker/front.png differ diff --git a/gfx/pokemon/perrserker/shiny.pal b/gfx/pokemon/perrserker/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/perrserker/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/pupal/anim.asm b/gfx/pokemon/pupal/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupal/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupal/anim_idle.asm b/gfx/pokemon/pupal/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupal/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupal/back.png b/gfx/pokemon/pupal/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/pupal/back.png differ diff --git a/gfx/pokemon/pupal/front.png b/gfx/pokemon/pupal/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/pupal/front.png differ diff --git a/gfx/pokemon/pupal/shiny.pal b/gfx/pokemon/pupal/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pupal/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/pupperon/anim.asm b/gfx/pokemon/pupperon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupperon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupperon/anim_idle.asm b/gfx/pokemon/pupperon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/pupperon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/pupperon/back.png b/gfx/pokemon/pupperon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/pupperon/back.png differ diff --git a/gfx/pokemon/pupperon/front.png b/gfx/pokemon/pupperon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/pupperon/front.png differ diff --git a/gfx/pokemon/pupperon/shiny.pal b/gfx/pokemon/pupperon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/pupperon/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/raitora/anim.asm b/gfx/pokemon/raitora/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/raitora/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/raitora/anim_idle.asm b/gfx/pokemon/raitora/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/raitora/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/raitora/back.png b/gfx/pokemon/raitora/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/raitora/back.png differ diff --git a/gfx/pokemon/raitora/front.png b/gfx/pokemon/raitora/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/raitora/front.png differ diff --git a/gfx/pokemon/raitora/shiny.pal b/gfx/pokemon/raitora/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/raitora/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/sylveon/anim.asm b/gfx/pokemon/sylveon/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sylveon/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sylveon/anim_idle.asm b/gfx/pokemon/sylveon/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/sylveon/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/sylveon/back.png b/gfx/pokemon/sylveon/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/sylveon/back.png differ diff --git a/gfx/pokemon/sylveon/front.png b/gfx/pokemon/sylveon/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/sylveon/front.png differ diff --git a/gfx/pokemon/sylveon/shiny.pal b/gfx/pokemon/sylveon/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/sylveon/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/tangrowth/anim.asm b/gfx/pokemon/tangrowth/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/tangrowth/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/tangrowth/anim_idle.asm b/gfx/pokemon/tangrowth/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/tangrowth/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/tangrowth/back.png b/gfx/pokemon/tangrowth/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/tangrowth/back.png differ diff --git a/gfx/pokemon/tangrowth/front.png b/gfx/pokemon/tangrowth/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/tangrowth/front.png differ diff --git a/gfx/pokemon/tangrowth/shiny.pal b/gfx/pokemon/tangrowth/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/tangrowth/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/tricules/anim.asm b/gfx/pokemon/tricules/anim.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/tricules/anim.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/tricules/anim_idle.asm b/gfx/pokemon/tricules/anim_idle.asm new file mode 100644 index 0000000..dd02e67 --- /dev/null +++ b/gfx/pokemon/tricules/anim_idle.asm @@ -0,0 +1 @@ + endanim diff --git a/gfx/pokemon/tricules/back.png b/gfx/pokemon/tricules/back.png new file mode 100644 index 0000000..e38315a Binary files /dev/null and b/gfx/pokemon/tricules/back.png differ diff --git a/gfx/pokemon/tricules/front.png b/gfx/pokemon/tricules/front.png new file mode 100644 index 0000000..a38ad7e Binary files /dev/null and b/gfx/pokemon/tricules/front.png differ diff --git a/gfx/pokemon/tricules/shiny.pal b/gfx/pokemon/tricules/shiny.pal new file mode 100644 index 0000000..4f58677 --- /dev/null +++ b/gfx/pokemon/tricules/shiny.pal @@ -0,0 +1,4 @@ + + RGB 23, 23, 09 + RGB 11, 11, 15 + diff --git a/gfx/pokemon/vulpiii/anim.asm b/gfx/pokemon/vulpiii/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/vulpiii/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpiii/anim_idle.asm b/gfx/pokemon/vulpiii/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/vulpiii/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/vulpiii/back.png b/gfx/pokemon/vulpiii/back.png new file mode 100644 index 0000000..c7216be Binary files /dev/null and b/gfx/pokemon/vulpiii/back.png differ diff --git a/gfx/pokemon/vulpiii/front.png b/gfx/pokemon/vulpiii/front.png new file mode 100644 index 0000000..e0a9da9 Binary files /dev/null and b/gfx/pokemon/vulpiii/front.png differ diff --git a/gfx/pokemon/vulpiii/shiny.pal b/gfx/pokemon/vulpiii/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/vulpiii/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/layout.link b/layout.link index e88be65..21eca1b 100644 --- a/layout.link +++ b/layout.link @@ -169,7 +169,6 @@ ROMX $3b ROMX $3c "Songs 3" "Sound Effects" - "Cries" ROMX $3d "Songs 4" ROMX $3e @@ -317,6 +316,8 @@ ROMX $7e ROMX $7f org $7de0 "Stadium 2 Checksums" +ROMX $80 + "Cries" WRAM0 "Stack" "Audio RAM" diff --git a/main.asm b/main.asm index 0095bbb..efecffa 100644 --- a/main.asm +++ b/main.asm @@ -241,6 +241,9 @@ INCLUDE "engine/pokemon/switchpartymons.asm" INCLUDE "engine/gfx/load_pics.asm" INCLUDE "engine/pokemon/move_mon_wo_mail.asm" INCLUDE "data/pokemon/base_stats.asm" + +SECTION "Pokemon Names", ROMX + INCLUDE "data/pokemon/names.asm" diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 1ca14d9..999b223 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -114,23 +114,23 @@ PlayersRadioText4: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, BELLIGNAN + getmonname STRING_BUFFER_3, BURGELA writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke BELLIGNAN, 35, MASTER_BALL + givepoke BURGELA, 42, DUSK_STONE closetext end DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, MUNCHLAX + getmonname STRING_BUFFER_3, LICKITUNG writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke MUNCHLAX, 35, POISON_STONE + givepoke LICKITUNG, 42, POISON_STONE closetext end @@ -145,11 +145,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry WALKING_WAKE + cry GOROCHU pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon WALKING_WAKE, 40 + loadwildmon GOROCHU, 40 startbattle reloadmapafterbattle end @@ -179,7 +179,7 @@ PlayersHouse2F_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 7, 0, LAKE_OF_RAGE, 1 + warp_event 7, 0, LAKE_OF_RAGE, 3 ;warp_event 7, 0, PLAYERS_HOUSE_1F, 3 def_coord_events diff --git a/scan_includes.exe.stackdump b/scan_includes.exe.stackdump new file mode 100644 index 0000000..7afcc48 --- /dev/null +++ b/scan_includes.exe.stackdump @@ -0,0 +1,18 @@ +Exception: STATUS_ACCESS_VIOLATION at rip=00100401246 +rax=FFFFFFF7FFF92891 rbx=0000000000000119 rcx=0000000800000010 +rdx=0000000000000000 rsi=0000000800059C23 rdi=0000000000000000 +r8 =00000000FFFFC7C4 r9 =0000000000000000 r10=0000000100000000 +r11=0000000100401282 r12=000000080006D770 r13=0000000100403148 +r14=0000000800059C22 r15=0000000000000001 +rbp=0000000100403156 rsp=00000000FFFFCA60 +program=C:\cygwin64\home\chipp\jep-hack\tools\scan_includes.exe, pid 2190, thread main +cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +00100403156 00100401246 (00800059C23, 00000000022, 00100403166, 000FFFFCB90) +00100403156 00100401409 (00000000000, 00100000001, 00180227860, 00100407000) +00100403178 00100401C87 (00000000020, 00000000000, 00180049B11, 00180048A70) +000FFFFCD30 00180049B7D (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 00180047746 (00000000000, 00000000000, 00000000000, 00000000000) +000FFFFFFF0 001800477F4 (00000000000, 00000000000, 00000000000, 00000000000) +End of stack trace