diff options
699 files changed, 1120 insertions, 1095 deletions
@@ -539,7 +539,7 @@ INCLUDE "audio/music/surfingpikachu.asm" INCLUDE "audio/music/yellowunusedsong.asm" INCLUDE "audio/music/meetjessiejames.asm" -INCBIN "audio/unknown_832b9.bin" +INCBIN "garbage/bank20.bin" ; Pikachu cries are in different banks diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm index 7f1f4598..d1f9f795 100644 --- a/audio/music/meetjessiejames.asm +++ b/audio/music/meetjessiejames.asm @@ -306,4 +306,3 @@ Music_MeetJessieJames_branch_83235:: note E_, 1 rest 1 sound_loop 0, Music_MeetJessieJames_branch_83235 - sound_ret diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index e6eb50db..483bafa9 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -2,18 +2,6 @@ TILE_WIDTH EQU 8 ; pixels LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes - const_def - const SHADE_WHITE ; %00 - const SHADE_LIGHT ; %01 - const SHADE_DARK ; %10 - const SHADE_BLACK ; %11 -NUM_PAL_COLORS EQU const_value - -PAL_COLOR_SIZE EQU 2 -PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE - -NUM_ACTIVE_PALS EQU 4 - SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 67416600..bf99ec9b 100755 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -223,3 +223,6 @@ assert NUM_TMS == const_value - TM01, "NUM_TMS ({d:NUM_TMS}) does not match the ; These fit in 7 bytes, with one unused bit left over. __tmhm_value__ = NUM_TMS + NUM_HMS + 1 UNUSED_TMNUM EQU __tmhm_value__ + +; used for Time Capsule held item compatibility +TWISTEDSPOON_GSC EQU $60 diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index a16999e7..00b5748d 100755 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -1,9 +1,15 @@ ; monochrome palette color ids const_def - const WHITE - const LIGHT_GRAY - const DARK_GRAY - const BLACK + const SHADE_WHITE ; %00 + const SHADE_LIGHT ; %01 + const SHADE_DARK ; %10 + const SHADE_BLACK ; %11 +NUM_PAL_COLORS EQU const_value + +PAL_COLOR_SIZE EQU 2 +PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE + +NUM_ACTIVE_PALS EQU 4 ; pal/blk packets ; SetPalFunctions indexes (see engine/gfx/palettes.asm) diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index 80f88cc4..56dac3a5 100755 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -48,11 +48,11 @@ FirstMapSpec: special_warp_spec REDS_HOUSE_2F, 3, 6, REDS_HOUSE_2 TradeCenterSpec1: special_warp_spec TRADE_CENTER, 3, 4, CLUB -TradeCenterSpec2: +TradeCenterSpec2: special_warp_spec TRADE_CENTER, 6, 4, CLUB -ColosseumSpec1: +ColosseumSpec1: special_warp_spec COLOSSEUM, 3, 4, CLUB -ColosseumSpec2: +ColosseumSpec2: special_warp_spec COLOSSEUM, 6, 4, CLUB diff --git a/data/pokemon/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index 54c9a9c9..3c69c7c7 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -7,17 +7,17 @@ db 200 ; catch rate db 73 ; base exp - INCBIN "gfx/pokemon/front_yellow/abra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/abra.pic", 0, 1 ; sprite dimensions dw AbraPicFront, AbraPicBack db TELEPORT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 5ed73b3e..aad1aff5 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 202 ; base exp - INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/aerodactyl.pic", 0, 1 ; sprite dimensions dw AerodactylPicFront, AerodactylPicBack db WING_ATTACK, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset @@ -16,7 +16,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ HYPER_BEAM, RAGE, DRAGON_RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, \ REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index c3e1c4cd..30bf57cc 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -7,18 +7,18 @@ db 50 ; catch rate db 186 ; base exp - INCBIN "gfx/pokemon/front_yellow/alakazam.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/alakazam.pic", 0, 1 ; sprite dimensions dw AlakazamPicFront, AlakazamPicBack db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index f981efae..c34316ce 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 147 ; base exp - INCBIN "gfx/pokemon/front_yellow/arbok.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/arbok.pic", 0, 1 ; sprite dimensions dw ArbokPicFront, ArbokPicBack db WRAP, LEER, POISON_STING, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 380be0a8..d21ec31b 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 213 ; base exp - INCBIN "gfx/pokemon/front_yellow/arcanine.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/arcanine.pic", 0, 1 ; sprite dimensions dw ArcaninePicFront, ArcaninePicBack db ROAR, EMBER, LEER, TAKE_DOWN ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DRAGON_RAGE, DIG, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index d53fc4fc..c40d5326 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 215 ; base exp - INCBIN "gfx/pokemon/front_yellow/articuno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions dw ArticunoPicFront, ArticunoPicBack db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index ac1c5757..328538a3 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 159 ; base exp - INCBIN "gfx/pokemon/front_yellow/beedrill.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions dw BeedrillPicFront, BeedrillPicBack db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 8b46be24..075598db 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 84 ; base exp - INCBIN "gfx/pokemon/front_yellow/bellsprout.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/bellsprout.pic", 0, 1 ; sprite dimensions dw BellsproutPicFront, BellsproutPicBack db VINE_WHIP, GROWTH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 041db750..512c66a3 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 210 ; base exp - INCBIN "gfx/pokemon/front_yellow/blastoise.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/blastoise.pic", 0, 1 ; sprite dimensions dw BlastoisePicFront, BlastoisePicBack db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index a20d2744..e2796f9e 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/bulbasaur.pic", 0, 1 ; sprite dimensions dw BulbasaurPicFront, BulbasaurPicBack db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index ca480b58..56f64df8 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 160 ; base exp - INCBIN "gfx/pokemon/front_yellow/butterfree.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index 1f048547..e9c196ab 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 53 ; base exp - INCBIN "gfx/pokemon/front_yellow/caterpie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/caterpie.pic", 0, 1 ; sprite dimensions dw CaterpiePicFront, CaterpiePicBack db TACKLE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index 81da1513..0d673e2b 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -7,20 +7,20 @@ db 30 ; catch rate db 255 ; base exp - INCBIN "gfx/pokemon/front_yellow/chansey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/chansey.pic", 0, 1 ; sprite dimensions dw ChanseyPicFront, ChanseyPicBack db POUND, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + EGG_BOMB, FIRE_BLAST, SKULL_BASH, SOFTBOILED, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index 7154f472..6ecf64d4 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 209 ; base exp - INCBIN "gfx/pokemon/front_yellow/charizard.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/charizard.pic", 0, 1 ; sprite dimensions dw CharizardPicFront, CharizardPicBack db SCRATCH, GROWL, EMBER, LEER ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ CUT, FLY, STRENGTH ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 4e3a7f59..acf364ed 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 65 ; base exp - INCBIN "gfx/pokemon/front_yellow/charmander.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/charmander.pic", 0, 1 ; sprite dimensions dw CharmanderPicFront, CharmanderPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index e85ef0de..0305197e 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 142 ; base exp - INCBIN "gfx/pokemon/front_yellow/charmeleon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/charmeleon.pic", 0, 1 ; sprite dimensions dw CharmeleonPicFront, CharmeleonPicBack db SCRATCH, GROWL, EMBER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index c01ac2e6..0aef8405 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -7,19 +7,19 @@ db 25 ; catch rate db 129 ; base exp - INCBIN "gfx/pokemon/front_yellow/clefable.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions dw ClefablePicFront, ClefablePicBack db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index a00ccafe..136b30be 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -7,19 +7,19 @@ db 150 ; catch rate db 68 ; base exp - INCBIN "gfx/pokemon/front_yellow/clefairy.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/clefairy.pic", 0, 1 ; sprite dimensions dw ClefairyPicFront, ClefairyPicBack db POUND, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, METRONOME, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index eb691a50..8b75cb0e 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -7,17 +7,17 @@ db 60 ; catch rate db 203 ; base exp - INCBIN "gfx/pokemon/front_yellow/cloyster.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/cloyster.pic", 0, 1 ; sprite dimensions dw CloysterPicFront, CloysterPicBack db WITHDRAW, SUPERSONIC, CLAMP, AURORA_BEAM ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ - SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, \ + SWIFT, REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 53224fb8..fc155047 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 87 ; base exp - INCBIN "gfx/pokemon/front_yellow/cubone.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/cubone.pic", 0, 1 ; sprite dimensions dw CubonePicFront, CubonePicBack db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index 7bb63662..822189a9 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 176 ; base exp - INCBIN "gfx/pokemon/front_yellow/dewgong.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dewgong.pic", 0, 1 ; sprite dimensions dw DewgongPicFront, DewgongPicBack db HEADBUTT, GROWL, AURORA_BEAM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 76721d69..46780291 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -7,14 +7,14 @@ db 255 ; catch rate db 81 ; base exp - INCBIN "gfx/pokemon/front_yellow/diglett.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/diglett.pic", 0, 1 ; sprite dimensions dw DiglettPicFront, DiglettPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ BIDE, REST, ROCK_SLIDE, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index a8a175ec..a3d919f4 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -7,7 +7,7 @@ db 35 ; catch rate db 61 ; base exp - INCBIN "gfx/pokemon/front_yellow/ditto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/ditto.pic", 0, 1 ; sprite dimensions dw DittoPicFront, DittoPicBack db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 481c021b..a3e95545 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 158 ; base exp - INCBIN "gfx/pokemon/front_yellow/dodrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dodrio.pic", 0, 1 ; sprite dimensions dw DodrioPicFront, DodrioPicBack db PECK, GROWL, FURY_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index af9e2cf7..9803960b 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 96 ; base exp - INCBIN "gfx/pokemon/front_yellow/doduo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions dw DoduoPicFront, DoduoPicBack db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm WHIRLWIND, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, SKY_ATTACK, REST, TRI_ATTACK, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index c50c8e74..b95254f2 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -7,7 +7,7 @@ db 27 ; catch rate db 144 ; base exp - INCBIN "gfx/pokemon/front_yellow/dragonair.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions dw DragonairPicFront, DragonairPicBack db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ REST, THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index ff4aa45a..d84adc2f 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -7,18 +7,18 @@ db 9 ; catch rate db 218 ; base exp - INCBIN "gfx/pokemon/front_yellow/dragonite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dragonite.pic", 0, 1 ; sprite dimensions dw DragonitePicFront, DragonitePicBack db WRAP, LEER, THUNDER_WAVE, AGILITY ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ + tmhm RAZOR_WIND, TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 28ac755b..42a93822 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 67 ; base exp - INCBIN "gfx/pokemon/front_yellow/dratini.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions dw DratiniPicFront, DratiniPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, DRAGON_RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 0c71b320..047b9f8e 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 102 ; base exp - INCBIN "gfx/pokemon/front_yellow/drowzee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/drowzee.pic", 0, 1 ; sprite dimensions dw DrowzeePicFront, DrowzeePicBack db POUND, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, DREAM_EATER, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index e29c120b..94e733e9 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -7,16 +7,16 @@ db 50 ; catch rate db 153 ; base exp - INCBIN "gfx/pokemon/front_yellow/dugtrio.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/dugtrio.pic", 0, 1 ; sprite dimensions dw DugtrioPicFront, DugtrioPicBack db SCRATCH, GROWL, DIG, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, ROCK_SLIDE, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index add50a6d..6919285d 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 92 ; base exp - INCBIN "gfx/pokemon/front_yellow/eevee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/eevee.pic", 0, 1 ; sprite dimensions dw EeveePicFront, EeveePicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index 0b6a8945..878d223f 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 62 ; base exp - INCBIN "gfx/pokemon/front_yellow/ekans.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/ekans.pic", 0, 1 ; sprite dimensions dw EkansPicFront, EkansPicBack db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, ROCK_SLIDE, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index dfd153bb..8378cc52 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 156 ; base exp - INCBIN "gfx/pokemon/front_yellow/electabuzz.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/electabuzz.pic", 0, 1 ; sprite dimensions dw ElectabuzzPicFront, ElectabuzzPicBack db QUICK_ATTACK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index ae2e6cf4..59f21767 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 150 ; base exp - INCBIN "gfx/pokemon/front_yellow/electrode.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/electrode.pic", 0, 1 ; sprite dimensions dw ElectrodePicFront, ElectrodePicBack db TACKLE, SCREECH, SONICBOOM, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SELFDESTRUCT, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, EXPLOSION, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 418c3948..8eea9e3a 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 98 ; base exp - INCBIN "gfx/pokemon/front_yellow/exeggcute.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/exeggcute.pic", 0, 1 ; sprite dimensions dw ExeggcutePicFront, ExeggcutePicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, EGG_BOMB, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 236d706e..cb4d3ee6 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 212 ; base exp - INCBIN "gfx/pokemon/front_yellow/exeggutor.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/exeggutor.pic", 0, 1 ; sprite dimensions dw ExeggutorPicFront, ExeggutorPicBack db BARRAGE, HYPNOSIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, EGG_BOMB, \ REST, PSYWAVE, EXPLOSION, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/farfetchd.asm b/data/pokemon/base_stats/farfetchd.asm index d608b3fb..8e0d79e4 100644 --- a/data/pokemon/base_stats/farfetchd.asm +++ b/data/pokemon/base_stats/farfetchd.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 94 ; base exp - INCBIN "gfx/pokemon/front_yellow/farfetchd.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/farfetchd.pic", 0, 1 ; sprite dimensions dw FarfetchdPicFront, FarfetchdPicBack db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ + tmhm RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, TOXIC, BODY_SLAM, \ TAKE_DOWN, DOUBLE_EDGE, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index afb89921..33ad5c5a 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 162 ; base exp - INCBIN "gfx/pokemon/front_yellow/fearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions dw FearowPicFront, FearowPicBack db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index 0a714783..2aa8f507 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 198 ; base exp - INCBIN "gfx/pokemon/front_yellow/flareon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/flareon.pic", 0, 1 ; sprite dimensions dw FlareonPicFront, FlareonPicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, EMBER ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index fc8c86ef..f48b4234 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 95 ; base exp - INCBIN "gfx/pokemon/front_yellow/gastly.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gastly.pic", 0, 1 ; sprite dimensions dw GastlyPicFront, GastlyPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index dc9105c6..3a07a441 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 190 ; base exp - INCBIN "gfx/pokemon/front_yellow/gengar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gengar.pic", 0, 1 ; sprite dimensions dw GengarPicFront, GengarPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ - SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, \ + SKULL_BASH, DREAM_EATER, REST, PSYWAVE, EXPLOSION, \ SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index a2225f5c..849e1234 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 86 ; base exp - INCBIN "gfx/pokemon/front_yellow/geodude.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/geodude.pic", 0, 1 ; sprite dimensions dw GeodudePicFront, GeodudePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 8c24985c..7526d5ef 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 132 ; base exp - INCBIN "gfx/pokemon/front_yellow/gloom.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gloom.pic", 0, 1 ; sprite dimensions dw GloomPicFront, GloomPicBack db ABSORB, POISONPOWDER, STUN_SPORE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 6eb60490..9c852c91 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 171 ; base exp - INCBIN "gfx/pokemon/front_yellow/golbat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions dw GolbatPicFront, GolbatPicBack db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index 662c6c93..35ea2418 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 111 ; base exp - INCBIN "gfx/pokemon/front_yellow/goldeen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions dw GoldeenPicFront, GoldeenPicBack db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index b7c035c6..eb79d100 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 174 ; base exp - INCBIN "gfx/pokemon/front_yellow/golduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index a8f5cbf9..adcefb3f 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 177 ; base exp - INCBIN "gfx/pokemon/front_yellow/golem.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/golem.pic", 0, 1 ; sprite dimensions dw GolemPicFront, GolemPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index d5dfda81..af0b3dcc 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 134 ; base exp - INCBIN "gfx/pokemon/front_yellow/graveler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/graveler.pic", 0, 1 ; sprite dimensions dw GravelerPicFront, GravelerPicBack db TACKLE, DEFENSE_CURL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm MEGA_PUNCH, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b2e0f08a..24e972ce 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 90 ; base exp - INCBIN "gfx/pokemon/front_yellow/grimer.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/grimer.pic", 0, 1 ; sprite dimensions dw GrimerPicFront, GrimerPicBack db POUND, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, BODY_SLAM, RAGE, MEGA_DRAIN, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index 2c70184f..efc1059f 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 91 ; base exp - INCBIN "gfx/pokemon/front_yellow/growlithe.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/growlithe.pic", 0, 1 ; sprite dimensions dw GrowlithePicFront, GrowlithePicBack db BITE, ROAR, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index 13c30ff8..62dd980f 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 214 ; base exp - INCBIN "gfx/pokemon/front_yellow/gyarados.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/gyarados.pic", 0, 1 ; sprite dimensions dw GyaradosPicFront, GyaradosPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ DRAGON_RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index cf9df9ec..71e94347 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 126 ; base exp - INCBIN "gfx/pokemon/front_yellow/haunter.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/haunter.pic", 0, 1 ; sprite dimensions dw HaunterPicFront, HaunterPicBack db LICK, CONFUSE_RAY, NIGHT_SHADE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ + tmhm TOXIC, RAGE, MEGA_DRAIN, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, \ DREAM_EATER, REST, PSYWAVE, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index 1b7651ff..407e5e32 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 140 ; base exp - INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions dw HitmonchanPicFront, HitmonchanPicBack db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index 51da5f75..e39ceecd 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 139 ; base exp - INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/hitmonlee.pic", 0, 1 ; sprite dimensions dw HitmonleePicFront, HitmonleePicBack db DOUBLE_KICK, MEDITATE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index 1a5a5aff..9520ad59 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -7,16 +7,16 @@ db 225 ; catch rate db 83 ; base exp - INCBIN "gfx/pokemon/front_yellow/horsea.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/horsea.pic", 0, 1 ; sprite dimensions dw HorseaPicFront, HorseaPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, RAGE, MIMIC, DOUBLE_TEAM, \ - BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index b43cd961..760276db 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 165 ; base exp - INCBIN "gfx/pokemon/front_yellow/hypno.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/hypno.pic", 0, 1 ; sprite dimensions dw HypnoPicFront, HypnoPicBack db POUND, HYPNOSIS, DISABLE, CONFUSION ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, METRONOME, SKULL_BASH, DREAM_EATER, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 3d69a8d7..3601a924 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 141 ; base exp - INCBIN "gfx/pokemon/front_yellow/ivysaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions dw IvysaurPicFront, IvysaurPicBack db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 8348431d..c249d93d 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -7,19 +7,19 @@ db 170 ; catch rate db 76 ; base exp - INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions dw JigglypuffPicFront, JigglypuffPicBack db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ - THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ - REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, SOLARBEAM, \ + THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, \ STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index 3db8c96a..a4b74759 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 197 ; base exp - INCBIN "gfx/pokemon/front_yellow/jolteon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/jolteon.pic", 0, 1 ; sprite dimensions dw JolteonPicFront, JolteonPicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index f4fe28c7..1700c890 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 137 ; base exp - INCBIN "gfx/pokemon/front_yellow/jynx.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions dw JynxPicFront, JynxPicBack db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index d5d96d1f..407c78f5 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 119 ; base exp - INCBIN "gfx/pokemon/front_yellow/kabuto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kabuto.pic", 0, 1 ; sprite dimensions dw KabutoPicFront, KabutoPicBack db SCRATCH, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index f067949e..e3a6d44f 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 201 ; base exp - INCBIN "gfx/pokemon/front_yellow/kabutops.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kabutops.pic", 0, 1 ; sprite dimensions dw KabutopsPicFront, KabutopsPicBack db SCRATCH, HARDEN, ABSORB, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index 30d2feef..77fbf556 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -7,17 +7,17 @@ db 100 ; catch rate db 145 ; base exp - INCBIN "gfx/pokemon/front_yellow/kadabra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kadabra.pic", 0, 1 ; sprite dimensions dw KadabraPicFront, KadabraPicBack db TELEPORT, KINESIS, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ DIG, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ + REFLECT, BIDE, METRONOME, SKULL_BASH, REST, \ THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 39870dc4..c0cfb63c 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 71 ; base exp - INCBIN "gfx/pokemon/front_yellow/kakuna.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions dw KakunaPicFront, KakunaPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 7d3cf971..ccd36041 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 175 ; base exp - INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kangaskhan.pic", 0, 1 ; sprite dimensions dw KangaskhanPicFront, KangaskhanPicBack db COMET_PUNCH, RAGE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ - DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, MIMIC, \ + DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index c0d75d62..d3b3b80e 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 206 ; base exp - INCBIN "gfx/pokemon/front_yellow/kingler.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/kingler.pic", 0, 1 ; sprite dimensions dw KinglerPicFront, KinglerPicBack db BUBBLE, LEER, VICEGRIP, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, \ SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 5b63ebc8..b9b63812 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 114 ; base exp - INCBIN "gfx/pokemon/front_yellow/koffing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/koffing.pic", 0, 1 ; sprite dimensions dw KoffingPicFront, KoffingPicBack db TACKLE, SMOG, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ + tmhm TOXIC, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, REST, \ EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index dd0f739a..6bd1c197 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -7,7 +7,7 @@ db 225 ; catch rate db 115 ; base exp - INCBIN "gfx/pokemon/front_yellow/krabby.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/krabby.pic", 0, 1 ; sprite dimensions dw KrabbyPicFront, KrabbyPicBack db BUBBLE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \ CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index eb45e08c..5e31f7f5 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 219 ; base exp - INCBIN "gfx/pokemon/front_yellow/lapras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/lapras.pic", 0, 1 ; sprite dimensions dw LaprasPicFront, LaprasPicBack db WATER_GUN, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + RAGE, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index eef13946..45826b40 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 127 ; base exp - INCBIN "gfx/pokemon/front_yellow/lickitung.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/lickitung.pic", 0, 1 ; sprite dimensions dw LickitungPicFront, LickitungPicBack db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, SWORDS_DANCE, MEGA_KICK, TOXIC, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index e00ccea6..f750f9fa 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 193 ; base exp - INCBIN "gfx/pokemon/front_yellow/machamp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions dw MachampPicFront, MachampPicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 0e1a1d46..b52772ef 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -7,17 +7,17 @@ db 90 ; catch rate db 146 ; base exp - INCBIN "gfx/pokemon/front_yellow/machoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions dw MachokePicFront, MachokePicBack db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 3c7b8491..20fe0e6e 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -7,17 +7,17 @@ db 180 ; catch rate db 88 ; base exp - INCBIN "gfx/pokemon/front_yellow/machop.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions dw MachopPicFront, MachopPicBack db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index 8d7eef46..c2c2f8c2 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 20 ; base exp - INCBIN "gfx/pokemon/front_yellow/magikarp.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/magikarp.pic", 0, 1 ; sprite dimensions dw MagikarpPicFront, MagikarpPicBack db SPLASH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 1619e211..b402cfa3 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 167 ; base exp - INCBIN "gfx/pokemon/front_yellow/magmar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/magmar.pic", 0, 1 ; sprite dimensions dw MagmarPicFront, MagmarPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ RAGE, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ + BIDE, METRONOME, FIRE_BLAST, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index cb249496..6242d692 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 89 ; base exp - INCBIN "gfx/pokemon/front_yellow/magnemite.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/magnemite.pic", 0, 1 ; sprite dimensions dw MagnemitePicFront, MagnemitePicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, THUNDERBOLT, \ - THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ + THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, REST, THUNDER_WAVE, SUBSTITUTE, \ FLASH ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 36db2428..13d2e595 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 161 ; base exp - INCBIN "gfx/pokemon/front_yellow/magneton.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions dw MagnetonPicFront, MagnetonPicBack db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ + REFLECT, BIDE, SWIFT, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index cb60435b..ea529243 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 74 ; base exp - INCBIN "gfx/pokemon/front_yellow/mankey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions dw MankeyPicFront, MankeyPicBack db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ - DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, DIG, MIMIC, \ + DOUBLE_TEAM, BIDE, METRONOME, SWIFT, SKULL_BASH, \ REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index bdd1636e..ee2b778f 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -7,18 +7,18 @@ db 75 ; catch rate db 124 ; base exp - INCBIN "gfx/pokemon/front_yellow/marowak.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/marowak.pic", 0, 1 ; sprite dimensions dw MarowakPicFront, MarowakPicBack db BONE_CLUB, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 9b06043b..31a59bd5 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 69 ; base exp - INCBIN "gfx/pokemon/front_yellow/meowth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/meowth.pic", 0, 1 ; sprite dimensions dw MeowthPicFront, MeowthPicBack db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, PAY_DAY, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index 5d3d1740..e20b08bf 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 72 ; base exp - INCBIN "gfx/pokemon/front_yellow/metapod.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions dw MetapodPicFront, MetapodPicBack db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index caa7fb85..c7f268a2 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -7,23 +7,23 @@ db 45 ; catch rate db 64 ; base exp - INCBIN "gfx/pokemon/front_yellow/mew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/mew.pic", 0, 1 ; sprite dimensions dw MewPicFront, MewPicBack db POUND, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ - SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ - PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ + SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ + PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ CUT, FLY, SURF, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 99ff53fe..5d76160f 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -7,19 +7,19 @@ db 3 ; catch rate db 220 ; base exp - INCBIN "gfx/pokemon/front_yellow/mewtwo.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/mewtwo.pic", 0, 1 ; sprite dimensions dw MewtwoPicFront, MewtwoPicBack db CONFUSION, DISABLE, SWIFT, PSYCHIC_M ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ + SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 50b23fd8..58745a29 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 217 ; base exp - INCBIN "gfx/pokemon/front_yellow/moltres.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions dw MoltresPicFront, MoltresPicBack db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKY_ATTACK, REST, \ SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/mrmime.asm b/data/pokemon/base_stats/mrmime.asm index e6cdba21..20c96508 100644 --- a/data/pokemon/base_stats/mrmime.asm +++ b/data/pokemon/base_stats/mrmime.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 136 ; base exp - INCBIN "gfx/pokemon/front_yellow/mr.mime.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/mr.mime.pic", 0, 1 ; sprite dimensions dw MrMimePicFront, MrMimePicBack db CONFUSION, BARRIER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + METRONOME, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index 42885050..901421ec 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -7,15 +7,15 @@ db 75 ; catch rate db 157 ; base exp - INCBIN "gfx/pokemon/front_yellow/muk.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/muk.pic", 0, 1 ; sprite dimensions dw MukPicFront, MukPicBack db POUND, DISABLE, POISON_GAS, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ + tmhm TOXIC, BODY_SLAM, HYPER_BEAM, RAGE, MEGA_DRAIN, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \ SELFDESTRUCT, FIRE_BLAST, REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 602ed2ff..2e0d4177 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 195 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidoking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 5fba3fed..9b249f98 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -7,19 +7,19 @@ db 45 ; catch rate db 194 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidoqueen.pic", 0, 1 ; sprite dimensions dw NidoqueenPicFront, NidoqueenPicBack db TACKLE, SCRATCH, TAIL_WHIP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/nidoranf.asm b/data/pokemon/base_stats/nidoranf.asm index 814e2dd7..8ba4316c 100644 --- a/data/pokemon/base_stats/nidoranf.asm +++ b/data/pokemon/base_stats/nidoranf.asm @@ -7,14 +7,14 @@ db 235 ; catch rate db 59 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidoranf.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidoranf.pic", 0, 1 ; sprite dimensions dw NidoranFPicFront, NidoranFPicBack db GROWL, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BLIZZARD, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidoranm.asm b/data/pokemon/base_stats/nidoranm.asm index 05b3050a..2b412640 100644 --- a/data/pokemon/base_stats/nidoranm.asm +++ b/data/pokemon/base_stats/nidoranm.asm @@ -7,7 +7,7 @@ db 235 ; catch rate db 60 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidoranm.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidoranm.pic", 0, 1 ; sprite dimensions dw NidoranMPicFront, NidoranMPicBack db LEER, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + BLIZZARD, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 9831db3e..4345aeb7 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 117 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidorina.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidorina.pic", 0, 1 ; sprite dimensions dw NidorinaPicFront, NidorinaPicBack db GROWL, TACKLE, SCRATCH, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index d8abd036..44a11559 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 118 ; base exp - INCBIN "gfx/pokemon/front_yellow/nidorino.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/nidorino.pic", 0, 1 ; sprite dimensions dw NidorinoPicFront, NidorinoPicBack db LEER, TACKLE, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index 7373d2e9..2c2bc615 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 178 ; base exp - INCBIN "gfx/pokemon/front_yellow/ninetales.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/ninetales.pic", 0, 1 ; sprite dimensions dw NinetalesPicFront, NinetalesPicBack db EMBER, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DIG, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index de1498b9..60172ea4 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -7,15 +7,15 @@ db 255 ; catch rate db 78 ; base exp - INCBIN "gfx/pokemon/front_yellow/oddish.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/oddish.pic", 0, 1 ; sprite dimensions dw OddishPicFront, OddishPicBack db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 1dff5d20..258b2706 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 120 ; base exp - INCBIN "gfx/pokemon/front_yellow/omanyte.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/omanyte.pic", 0, 1 ; sprite dimensions dw OmanytePicFront, OmanytePicBack db WATER_GUN, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 1deaf789..8ba4113e 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 199 ; base exp - INCBIN "gfx/pokemon/front_yellow/omastar.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions dw OmastarPicFront, OmastarPicBack db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + REFLECT, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ SURF ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index 96048ee5..29d2f677 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 108 ; base exp - INCBIN "gfx/pokemon/front_yellow/onix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/onix.pic", 0, 1 ; sprite dimensions dw OnixPicFront, OnixPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ - BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ + BIDE, SELFDESTRUCT, SKULL_BASH, REST, EXPLOSION, \ ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 82e9920e..0a36e229 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 70 ; base exp - INCBIN "gfx/pokemon/front_yellow/paras.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/paras.pic", 0, 1 ; sprite dimensions dw ParasPicFront, ParasPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ + RAGE, MEGA_DRAIN, SOLARBEAM, DIG, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, REST, \ SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index bcd47673..5fa09fc9 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 128 ; base exp - INCBIN "gfx/pokemon/front_yellow/parasect.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/parasect.pic", 0, 1 ; sprite dimensions dw ParasectPicFront, ParasectPicBack db SCRATCH, STUN_SPORE, LEECH_LIFE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index 4da05861..ec214ead 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -7,16 +7,16 @@ db 90 ; catch rate db 148 ; base exp - INCBIN "gfx/pokemon/front_yellow/persian.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/persian.pic", 0, 1 ; sprite dimensions dw PersianPicFront, PersianPicBack db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ WATER_GUN, HYPER_BEAM, PAY_DAY, RAGE, THUNDERBOLT, \ - THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + THUNDER, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index b4370201..9be82174 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 172 ; base exp - INCBIN "gfx/pokemon/front_yellow/pidgeot.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/pidgeot.pic", 0, 1 ; sprite dimensions dw PidgeotPicFront, PidgeotPicBack db GUST, SAND_ATTACK, QUICK_ATTACK, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKY_ATTACK, REST, SUBSTITUTE, \ FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index c44325db..2b99e4a6 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 113 ; base exp - INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/pidgeotto.pic", 0, 1 ; sprite dimensions dw PidgeottoPicFront, PidgeottoPicBack db GUST, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 0c1c241b..04d23804 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 55 ; base exp - INCBIN "gfx/pokemon/front_yellow/pidgey.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/pidgey.pic", 0, 1 ; sprite dimensions dw PidgeyPicFront, PidgeyPicBack db GUST, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 8bef5f8b..4a7f5e80 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 82 ; base exp - INCBIN "gfx/pokemon/front_yellow/pikachu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/pikachu.pic", 0, 1 ; sprite dimensions dw PikachuPicFront, PikachuPicBack db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ - THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, PAY_DAY, SUBMISSION, SEISMIC_TOSS, RAGE, \ + THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index e67a2896..946feaf1 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 200 ; base exp - INCBIN "gfx/pokemon/front_yellow/pinsir.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/pinsir.pic", 0, 1 ; sprite dimensions dw PinsirPicFront, PinsirPicBack db VICEGRIP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 04f0aae5..f13b4c85 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 77 ; base exp - INCBIN "gfx/pokemon/front_yellow/poliwag.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions dw PoliwagPicFront, PoliwagPicBack db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ - MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, PSYCHIC_M, \ + MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, REST, \ PSYWAVE, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index 54673b74..8055d5ff 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -7,18 +7,18 @@ db 120 ; catch rate db 131 ; base exp - INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions dw PoliwhirlPicFront, PoliwhirlPicBack db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ - METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, BIDE, \ + METRONOME, SKULL_BASH, REST, PSYWAVE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 2c3b6bc5..cd89c1ed 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -7,18 +7,18 @@ db 45 ; catch rate db 185 ; base exp - INCBIN "gfx/pokemon/front_yellow/poliwrath.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/poliwrath.pic", 0, 1 ; sprite dimensions dw PoliwrathPicFront, PoliwrathPicBack db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ EARTHQUAKE, FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, \ - BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ + BIDE, METRONOME, SKULL_BASH, REST, PSYWAVE, \ SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index ee8e3389..71d51956 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 152 ; base exp - INCBIN "gfx/pokemon/front_yellow/ponyta.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions dw PonytaPicFront, PonytaPicBack db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index 8be8923e..bfec59ef 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 130 ; base exp - INCBIN "gfx/pokemon/front_yellow/porygon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/porygon.pic", 0, 1 ; sprite dimensions dw PorygonPicFront, PorygonPicBack db TACKLE, SHARPEN, CONVERSION, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index 57f6e901..6d533b28 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 149 ; base exp - INCBIN "gfx/pokemon/front_yellow/primeape.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions dw PrimeapePicFront, PrimeapePicBack db SCRATCH, LEER, LOW_KICK, KARATE_CHOP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ - MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, DIG, \ + MIMIC, DOUBLE_TEAM, BIDE, METRONOME, SWIFT, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index 1f6c4437..b3fb9f41 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -7,17 +7,17 @@ db 190 ; catch rate db 80 ; base exp - INCBIN "gfx/pokemon/front_yellow/psyduck.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions dw PsyduckPicFront, PsyduckPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index 9ac93813..a5c5acea 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -7,17 +7,17 @@ db 75 ; catch rate db 122 ; base exp - INCBIN "gfx/pokemon/front_yellow/raichu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/raichu.pic", 0, 1 ; sprite dimensions dw RaichuPicFront, RaichuPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ RAGE, THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ THUNDER_WAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 8a093859..dbe16ab0 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -7,7 +7,7 @@ db 60 ; catch rate db 192 ; base exp - INCBIN "gfx/pokemon/front_yellow/rapidash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/rapidash.pic", 0, 1 ; sprite dimensions dw RapidashPicFront, RapidashPicBack db EMBER, TAIL_WHIP, STOMP, GROWL ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ + HYPER_BEAM, RAGE, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 9dc46afb..b33adf4d 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -7,15 +7,15 @@ db 90 ; catch rate db 116 ; base exp - INCBIN "gfx/pokemon/front_yellow/raticate.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/raticate.pic", 0, 1 ; sprite dimensions dw RaticatePicFront, RaticatePicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \ BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 9cace629..d6e263a1 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -7,16 +7,16 @@ db 255 ; catch rate db 57 ; base exp - INCBIN "gfx/pokemon/front_yellow/rattata.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/rattata.pic", 0, 1 ; sprite dimensions dw RattataPicFront, RattataPicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index f08f7255..c6b17500 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -7,19 +7,19 @@ db 60 ; catch rate db 204 ; base exp - INCBIN "gfx/pokemon/front_yellow/rhydon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/rhydon.pic", 0, 1 ; sprite dimensions dw RhydonPicFront, RhydonPicBack db HORN_ATTACK, STOMP, TAIL_WHIP, FURY_ATTACK ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ - TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ - BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ - SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \ + SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index 3b8b1eb4..6f4bb31b 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -7,7 +7,7 @@ db 120 ; catch rate db 135 ; base exp - INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/rhyhorn.pic", 0, 1 ; sprite dimensions dw RhyhornPicFront, RhyhornPicBack db HORN_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, \ SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index aa107190..a05f516f 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 93 ; base exp - INCBIN "gfx/pokemon/front_yellow/sandshrew.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/sandshrew.pic", 0, 1 ; sprite dimensions dw SandshrewPicFront, SandshrewPicBack db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ - DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ - SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ + SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, FISSURE, \ + DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, CUT, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index 9c51bbba..5a50dd25 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -7,7 +7,7 @@ db 90 ; catch rate db 163 ; base exp - INCBIN "gfx/pokemon/front_yellow/sandslash.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/sandslash.pic", 0, 1 ; sprite dimensions dw SandslashPicFront, SandslashPicBack db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,9 +15,9 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ - FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ - SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ + HYPER_BEAM, SUBMISSION, SEISMIC_TOSS, RAGE, EARTHQUAKE, \ + FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \ + SWIFT, SKULL_BASH, REST, ROCK_SLIDE, SUBSTITUTE, \ CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index de73eea4..044a2baf 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -7,15 +7,15 @@ db 45 ; catch rate db 187 ; base exp - INCBIN "gfx/pokemon/front_yellow/scyther.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/scyther.pic", 0, 1 ; sprite dimensions dw ScytherPicFront, ScytherPicBack db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 89ab670f..6e3fb7ef 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -7,16 +7,16 @@ db 75 ; catch rate db 155 ; base exp - INCBIN "gfx/pokemon/front_yellow/seadra.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/seadra.pic", 0, 1 ; sprite dimensions dw SeadraPicFront, SeadraPicBack db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ - DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, MIMIC, \ + DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, REST, \ SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index bcb0dd64..532a4c70 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 170 ; base exp - INCBIN "gfx/pokemon/front_yellow/seaking.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions dw SeakingPicFront, SeakingPicBack db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ + tmhm TOXIC, HORN_DRILL, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \ REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index eba3d34d..e2fe02ec 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -7,7 +7,7 @@ db 190 ; catch rate db 100 ; base exp - INCBIN "gfx/pokemon/front_yellow/seel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/seel.pic", 0, 1 ; sprite dimensions dw SeelPicFront, SeelPicBack db HEADBUTT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index ed8cc154..b52f7cb4 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 97 ; base exp - INCBIN "gfx/pokemon/front_yellow/shellder.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/shellder.pic", 0, 1 ; sprite dimensions dw ShellderPicFront, ShellderPicBack db TACKLE, WITHDRAW, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, TELEPORT, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SELFDESTRUCT, SWIFT, \ REST, EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index 33f02f22..77483e91 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -7,20 +7,20 @@ db 75 ; catch rate db 164 ; base exp - INCBIN "gfx/pokemon/front_yellow/slowbro.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/slowbro.pic", 0, 1 ; sprite dimensions dw SlowbroPicFront, SlowbroPicBack db CONFUSION, DISABLE, HEADBUTT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ - PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + FIRE_BLAST, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, \ FLASH ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index 32eb6aa9..0ae2ef0a 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -7,18 +7,18 @@ db 190 ; catch rate db 99 ; base exp - INCBIN "gfx/pokemon/front_yellow/slowpoke.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/slowpoke.pic", 0, 1 ; sprite dimensions dw SlowpokePicFront, SlowpokePicBack db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, PAY_DAY, RAGE, \ + EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \ TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index f835a4b9..9b6ccd3e 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -7,20 +7,20 @@ db 25 ; catch rate db 154 ; base exp - INCBIN "gfx/pokemon/front_yellow/snorlax.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/snorlax.pic", 0, 1 ; sprite dimensions dw SnorlaxPicFront, SnorlaxPicBack db HEADBUTT, AMNESIA, REST, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ - RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ - FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ - REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, \ + RAGE, SOLARBEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, \ + FISSURE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, METRONOME, SELFDESTRUCT, FIRE_BLAST, SKULL_BASH, \ + REST, PSYWAVE, ROCK_SLIDE, SUBSTITUTE, SURF, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index c353fc89..161f4100 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 58 ; base exp - INCBIN "gfx/pokemon/front_yellow/spearow.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/spearow.pic", 0, 1 ; sprite dimensions dw SpearowPicFront, SpearowPicBack db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ + RAGE, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \ SKY_ATTACK, REST, SUBSTITUTE, FLY ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 11db64ac..e844ac6e 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 66 ; base exp - INCBIN "gfx/pokemon/front_yellow/squirtle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/squirtle.pic", 0, 1 ; sprite dimensions dw SquirtlePicFront, SquirtlePicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 6f9681a2..1ec43ca8 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -7,18 +7,18 @@ db 60 ; catch rate db 207 ; base exp - INCBIN "gfx/pokemon/front_yellow/starmie.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/starmie.pic", 0, 1 ; sprite dimensions dw StarmiePicFront, StarmiePicBack db TACKLE, WATER_GUN, HARDEN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ THUNDER, PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, \ - REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ - THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ + REFLECT, BIDE, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, \ FLASH ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index 08b1250b..198f552f 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -7,17 +7,17 @@ db 225 ; catch rate db 106 ; base exp - INCBIN "gfx/pokemon/front_yellow/staryu.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/staryu.pic", 0, 1 ; sprite dimensions dw StaryuPicFront, StaryuPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ - ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ - PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ - BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, \ + ICE_BEAM, BLIZZARD, RAGE, THUNDERBOLT, THUNDER, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKULL_BASH, REST, THUNDER_WAVE, \ PSYWAVE, TRI_ATTACK, SUBSTITUTE, SURF, FLASH ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index bb0bafd1..8ab7d548 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 166 ; base exp - INCBIN "gfx/pokemon/front_yellow/tangela.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/tangela.pic", 0, 1 ; sprite dimensions dw TangelaPicFront, TangelaPicBack db CONSTRICT, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, BIDE, SKULL_BASH, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 311eecad..9aba3e22 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 211 ; base exp - INCBIN "gfx/pokemon/front_yellow/tauros.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions dw TaurosPicFront, TaurosPicBack db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -17,7 +17,7 @@ tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ + BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index 7f128c3f..e8296d61 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 105 ; base exp - INCBIN "gfx/pokemon/front_yellow/tentacool.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/tentacool.pic", 0, 1 ; sprite dimensions dw TentacoolPicFront, TentacoolPicBack db ACID, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, MEGA_DRAIN, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index eeea2d0f..ad8f773e 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -7,16 +7,16 @@ db 60 ; catch rate db 205 ; base exp - INCBIN "gfx/pokemon/front_yellow/tentacruel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/tentacruel.pic", 0, 1 ; sprite dimensions dw TentacruelPicFront, TentacruelPicBack db ACID, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MEGA_DRAIN, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SKULL_BASH, REST, SUBSTITUTE, CUT, SURF ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index bc800fea..5c45b173 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -7,16 +7,16 @@ db 45 ; catch rate db 196 ; base exp - INCBIN "gfx/pokemon/front_yellow/vaporeon.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/vaporeon.pic", 0, 1 ; sprite dimensions dw VaporeonPicFront, VaporeonPicBack db TACKLE, TAIL_WHIP, QUICK_ATTACK, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ - WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ + WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \ SKULL_BASH, REST, SUBSTITUTE, SURF ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index 85c1de76..ff4295d0 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -7,7 +7,7 @@ db 75 ; catch rate db 138 ; base exp - INCBIN "gfx/pokemon/front_yellow/venomoth.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/venomoth.pic", 0, 1 ; sprite dimensions dw VenomothPicFront, VenomothPicBack db TACKLE, DISABLE, SUPERSONIC, CONFUSION ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, PSYCHIC_M, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ SWIFT, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 47590f61..49ee0b97 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 75 ; base exp - INCBIN "gfx/pokemon/front_yellow/venonat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/venonat.pic", 0, 1 ; sprite dimensions dw VenonatPicFront, VenonatPicBack db TACKLE, DISABLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ - SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, MEGA_DRAIN, \ + SOLARBEAM, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, PSYWAVE, SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index d97b9c64..414590d8 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 208 ; base exp - INCBIN "gfx/pokemon/front_yellow/venusaur.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions dw VenusaurPicFront, VenusaurPicBack db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index 8fd9c2f9..5b958297 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 191 ; base exp - INCBIN "gfx/pokemon/front_yellow/victreebel.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/victreebel.pic", 0, 1 ; sprite dimensions dw VictreebelPicFront, VictreebelPicBack db SLEEP_POWDER, STUN_SPORE, ACID, RAZOR_LEAF ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index d6baddb9..10ae05da 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -7,7 +7,7 @@ db 45 ; catch rate db 184 ; base exp - INCBIN "gfx/pokemon/front_yellow/vileplume.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/vileplume.pic", 0, 1 ; sprite dimensions dw VileplumePicFront, VileplumePicBack db STUN_SPORE, SLEEP_POWDER, ACID, PETAL_DANCE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm SWORDS_DANCE, TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ + HYPER_BEAM, RAGE, MEGA_DRAIN, SOLARBEAM, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, REST, SUBSTITUTE, \ CUT ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 6234d3a4..4ad65701 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -7,16 +7,16 @@ db 190 ; catch rate db 103 ; base exp - INCBIN "gfx/pokemon/front_yellow/voltorb.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/voltorb.pic", 0, 1 ; sprite dimensions dw VoltorbPicFront, VoltorbPicBack db TACKLE, SCREECH, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ - TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ + tmhm TOXIC, TAKE_DOWN, RAGE, THUNDERBOLT, THUNDER, \ + TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + SELFDESTRUCT, SWIFT, REST, THUNDER_WAVE, EXPLOSION, \ SUBSTITUTE, FLASH ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index 7aba033e..c112b97d 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -7,15 +7,15 @@ db 190 ; catch rate db 63 ; base exp - INCBIN "gfx/pokemon/front_yellow/vulpix.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/vulpix.pic", 0, 1 ; sprite dimensions dw VulpixPicFront, VulpixPicBack db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index df4c7314..d430bcdc 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -7,17 +7,17 @@ db 45 ; catch rate db 143 ; base exp - INCBIN "gfx/pokemon/front_yellow/wartortle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/wartortle.pic", 0, 1 ; sprite dimensions dw WartortlePicFront, WartortlePicBack db TACKLE, TAIL_WHIP, BUBBLE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, DIG, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SKULL_BASH, \ REST, SUBSTITUTE, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 67769f3b..f6aba236 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 52 ; base exp - INCBIN "gfx/pokemon/front_yellow/weedle.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/weedle.pic", 0, 1 ; sprite dimensions dw WeedlePicFront, WeedlePicBack db POISON_STING, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 90a3dc49..513de8f8 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -7,15 +7,15 @@ db 120 ; catch rate db 151 ; base exp - INCBIN "gfx/pokemon/front_yellow/weepinbell.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/weepinbell.pic", 0, 1 ; sprite dimensions dw WeepinbellPicFront, WeepinbellPicBack db VINE_WHIP, GROWTH, WRAP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset - tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ - MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ + tmhm SWORDS_DANCE, TOXIC, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ + MEGA_DRAIN, SOLARBEAM, MIMIC, DOUBLE_TEAM, REFLECT, \ BIDE, REST, SUBSTITUTE, CUT ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index f5618bb0..d605f15a 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -7,15 +7,15 @@ db 60 ; catch rate db 173 ; base exp - INCBIN "gfx/pokemon/front_yellow/weezing.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/weezing.pic", 0, 1 ; sprite dimensions dw WeezingPicFront, WeezingPicBack db TACKLE, SMOG, SLUDGE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset - tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ - MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ + tmhm TOXIC, HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, \ + MIMIC, DOUBLE_TEAM, BIDE, SELFDESTRUCT, FIRE_BLAST, \ REST, EXPLOSION, SUBSTITUTE ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index 2a6876b2..7249badf 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -7,19 +7,19 @@ db 50 ; catch rate db 109 ; base exp - INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions dw WigglytuffPicFront, WigglytuffPicBack db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ - DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ - HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ - SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, \ + HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ + SOLARBEAM, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \ + MIMIC, DOUBLE_TEAM, REFLECT, BIDE, FIRE_BLAST, \ + SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, TRI_ATTACK, \ SUBSTITUTE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 68b6396a..6571d286 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -7,7 +7,7 @@ db 3 ; catch rate db 216 ; base exp - INCBIN "gfx/pokemon/front_yellow/zapdos.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions dw ZapdosPicFront, ZapdosPicBack db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,8 +15,8 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ - DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ + HYPER_BEAM, RAGE, THUNDERBOLT, THUNDER, MIMIC, \ + DOUBLE_TEAM, REFLECT, BIDE, SWIFT, SKY_ATTACK, \ REST, THUNDER_WAVE, SUBSTITUTE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 9e4fa80f..ddae33cb 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -7,7 +7,7 @@ db 255 ; catch rate db 54 ; base exp - INCBIN "gfx/pokemon/front_yellow/zubat.pic", 0, 1 ; sprite dimensions + INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions dw ZubatPicFront, ZubatPicBack db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset @@ -15,7 +15,7 @@ ; tm/hm learnset tmhm RAZOR_WIND, WHIRLWIND, TOXIC, TAKE_DOWN, DOUBLE_EDGE, \ - RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ + RAGE, MEGA_DRAIN, MIMIC, DOUBLE_TEAM, BIDE, \ SWIFT, REST, SUBSTITUTE ; end diff --git a/data/pokemon/unknown_list.asm b/data/pokemon/unknown_list.asm new file mode 100644 index 00000000..010d415b --- /dev/null +++ b/data/pokemon/unknown_list.asm @@ -0,0 +1,36 @@ +; This list is used by a unreferenced function. + +Pointer_3b0ee: + db NIDOKING + db IVYSAUR + db EXEGGUTOR + db GENGAR + db NIDOQUEEN + db ARCANINE + db GYARADOS + db BLASTOISE + db GOLEM + db DRAGONITE + db NINETALES + db DRAGONAIR + db KABUTOPS + db OMASTAR + db JIGGLYPUFF + db FLAREON + db JOLTEON + db VAPOREON + db BEEDRILL + db BUTTERFREE + db MACHAMP + db CLOYSTER + db CLEFABLE + db ALAKAZAM + db STARMIE + db VENUSAUR + db TENTACRUEL + db CHARMELEON + db WARTORTLE + db CHARIZARD + db VILEPLUME + db VICTREEBEL + db -1 ; end diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 3b0fd4ec..4110e8b6 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -57,7 +57,7 @@ DrawFrameBlock: inc hl inc de ld a, [hli] - add a, $31 ; base tile ID for battle animations + add $31 ; base tile ID for battle animations ld [de], a ; store tile ID inc de ld a, [hli] @@ -91,7 +91,7 @@ DrawFrameBlock: inc hl inc de ld a, [hli] - add a, $31 ; base tile ID for battle animations + add $31 ; base tile ID for battle animations ld [de], a ; store tile ID inc de ; toggle horizontal and vertical flip @@ -99,10 +99,10 @@ DrawFrameBlock: and a ld b, OAM_VFLIP | OAM_HFLIP jr z, .storeFlags1 - cp a, OAM_HFLIP + cp OAM_HFLIP ld b, OAM_VFLIP jr z, .storeFlags1 - cp a, OAM_VFLIP + cp OAM_VFLIP ld b, OAM_HFLIP jr z, .storeFlags1 ld b, 0 @@ -160,7 +160,7 @@ DrawFrameBlock: .afterDrawingTiles ld a, [wFBMode] cp FRAMEBLOCKMODE_02 - jr z, .advanceFrameBlockDestAddr; skip delay and don't clean OAM buffer + jr z, .advanceFrameBlockDestAddr ; skip delay and don't clean OAM buffer ld a, [wSubAnimFrameDelay] ld c, a call DelayFrames @@ -1327,7 +1327,7 @@ BattleAnimWriteOAMEntry: ; Y coordinate = e (increased by 8 each call, before the write to OAM) ; X coordinate = [wBaseCoordX] ; tile = d -; attributes = variable (dependant on coords) +; attributes = variable (depending on coords) ld a, $1 ld [wdef5], a ld a, e @@ -1402,7 +1402,7 @@ AdjustOAMBlockYPos2: ret AnimationBlinkEnemyMon: - ; Make the enemy mon's sprite blink on and off for a second or two +; Make the enemy mon's sprite blink on and off for a second or two ld hl, AnimationBlinkMon jp CallWithTurnFlipped @@ -1880,7 +1880,7 @@ _AnimationSlideMonOff: jr nz, .slideLoop ret -; Since mon pic tile numbers go from top to bottom, left to right in order, +; Since mon pic tile numbers go from top to bottom, left to right in order, ; adding the height of the mon pic in tiles to a tile number gives the tile ; number of the tile one column to the right (and thus subtracting the height ; gives the reverse). If the next tile would be past the edge of the pic, the 2 @@ -2246,7 +2246,7 @@ ClearMonPicFromTileMap: ret ; puts the tile map destination address of a mon sprite in hl, given the row count in b -; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out, +; The usual row count is 7, but it may be smaller when sliding a mon sprite in/out, ; in order to show only a portion of the mon sprite. GetMonSpriteTileMapPointerFromRowCount: push de diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 82c3318c..6d3a4f9c 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -355,7 +355,7 @@ BattleTransition_FlashScreenPalettes: ; used for low level trainer dungeon battles BattleTransition_Shrink: - ld c, 9 + ld c, SCREEN_HEIGHT / 2 .loop push bc xor a @@ -389,7 +389,7 @@ BattleTransition_Shrink: ; used for high level trainer dungeon battles BattleTransition_Split: - ld c, 9 + ld c, SCREEN_HEIGHT / 2 xor a ldh [hAutoBGTransferEnabled], a .loop diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f66f509f..abb1c9b4 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -902,7 +902,7 @@ ReplaceFaintedEnemyMon: ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor - setpal SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE + ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE ldh [rOBP0], a ldh [rOBP1], a call UpdateGBCPal_OBP0 @@ -1765,7 +1765,7 @@ SendOutMon: ld hl, wEnemyMonHP ld a, [hli] or [hl] ; is enemy mon HP zero? - jp z, .skipDrawingEnemyHUDAndHPBar; if HP is zero, skip drawing the HUD and HP bar + jp z, .skipDrawingEnemyHUDAndHPBar ; if HP is zero, skip drawing the HUD and HP bar call DrawEnemyHUDAndHPBar .skipDrawingEnemyHUDAndHPBar call DrawPlayerHUDAndHPBar @@ -2096,16 +2096,17 @@ DisplayBattleMenu:: jp .handleBattleMenuInput ; the following happens for the old man tutorial and prof. oak pikachu battle .doSimulatedMenuInput + ; Temporarily save the player name in wGrassRate, + ; which is supposed to get overwritten when entering a + ; map with wild Pokémon. + ; In Red/Blue, due to an oversight, the data may not get + ; overwritten (on Cinnabar and Route 21) and the infamous + ; Missingno. glitch can show up. + ; However, this has been fixed in Yellow. ld hl, wPlayerName ld de, wGrassRate ld bc, NAME_LENGTH - call CopyData ; temporarily save the player name in unused space, - ; which is supposed to get overwritten when entering a - ; map with wild Pokémon. - ; In Red/Blue, due to an oversight, the data - ; may not get overwritten (cinnabar) and the infamous - ; Missingno. glitch can show up. However, - ; this has been fixed in yellow + call CopyData ld hl, .oldManName ld a, [wBattleType] dec a @@ -2310,9 +2311,9 @@ BagWasSelected: jr DisplayBagMenu SimulatedInputBattleItemList: - db 1 ; # of items + db 1 ; # items db POKE_BALL, 1 - db $ff + db -1 ; end DisplayPlayerBag: ; get the pointer to player's bag when in a normal battle @@ -4258,7 +4259,7 @@ CheckForDisobedience: call GetCurrentMove .canUseMove ld a, $1 - and a; clear Z flag + and a ; clear Z flag ret .cannotUseMove xor a ; set Z flag @@ -4642,7 +4643,7 @@ CalculateDamage: ld b, 4 call Divide -; Update wCurDamage. +; Update wCurDamage. ; Capped at MAX_NEUTRAL_DAMAGE - MIN_NEUTRAL_DAMAGE: 999 - 2 = 997. ld hl, wDamage ld b, [hl] @@ -4731,7 +4732,7 @@ JumpToOHKOMoveEffect: INCLUDE "data/battle/unused_critical_hit_moves.asm" ; determines if attack is a critical hit -; azure heights claims "the fastest pokémon (who are, not coincidentally, +; Azure Heights claims "the fastest pokémon (who are, not coincidentally, ; among the most popular) tend to CH about 20 to 25% of the time." CriticalHitTest: xor a @@ -5442,26 +5443,32 @@ AdjustDamageForMoveType: .done ret +; function to tell how effective the type of an enemy attack is on the player's current pokemon +; this doesn't take into account the effects that dual types can have +; (e.g. 4x weakness / resistance, weaknesses and resistances canceling) +; the result is stored in [wTypeEffectiveness] +; ($05 is not very effective, $10 is neutral, $14 is super effective) +; as far is can tell, this is only used once in some AI code to help decide which move to use AIGetTypeEffectiveness: ld a, [wEnemyMoveType] - ld d, a ; d = type of enemy move + ld d, a ; d = type of enemy move ld hl, wBattleMonType - ld b, [hl] ; b = type 1 of player's pokemon + ld b, [hl] ; b = type 1 of player's pokemon inc hl - ld c, [hl] ; c = type 2 of player's pokemon + ld c, [hl] ; c = type 2 of player's pokemon ld a, $10 - ld [wd11e], a ; initialize [wd11e] to neutral effectiveness + ld [wTypeEffectiveness], a ; initialize to neutral effectiveness ld hl, TypeEffects .loop ld a, [hli] cp $ff ret z - cp d ; match the type of the move + cp d ; match the type of the move jr nz, .nextTypePair1 ld a, [hli] - cp b ; match with type 1 of pokemon + cp b ; match with type 1 of pokemon jr z, .done - cp c ; or match with type 2 of pokemon + cp c ; or match with type 2 of pokemon jr z, .done jr .nextTypePair2 .nextTypePair1 @@ -5469,8 +5476,8 @@ AIGetTypeEffectiveness: .nextTypePair2 inc hl jr .loop - .done + ; 40% chance for Lorelei's Dewgong to ignore type effectiveness? ld a, [wTrainerClass] cp LORELEI jr nz, .ok @@ -5481,9 +5488,8 @@ AIGetTypeEffectiveness: cp $66 ; 40 percent ret c .ok - ld a, [hl] - ld [wd11e], a ; store damage multiplier + ld [wTypeEffectiveness], a ; store damage multiplier ret INCLUDE "data/types/type_matchups.asm" @@ -6462,7 +6468,7 @@ SwapPlayerAndEnemyLevels: ; (for use when scrolling the player sprite and enemy's silhouettes on screen) LoadPlayerBackPic: ld a, [wBattleType] - ld de, OldManPic + ld de, OldManPicBack cp BATTLE_TYPE_OLD_MAN ; is it the old man tutorial? jr z, .next ld de, ProfOakPicBack diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index c4e81816..7573ce8d 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -231,7 +231,7 @@ FreezeBurnParalyzeEffect: ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr .next1 .asm_3f2c7 - cp a, PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those + cp PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr c, .next1 ; branch ahead if this is a 10% chance effect.. ld b, $4d ; else use 0x4D/0x100 or 77/256 = 30.1%~ chance @@ -247,7 +247,7 @@ FreezeBurnParalyzeEffect: jr z, .burn1 cp FREEZE_SIDE_EFFECT jr z, .freeze1 -; .paralyze +; .paralyze1 ld a, 1 << PAR ld [wEnemyMonStatus], a call QuarterSpeedDueToParalysis ; quarter speed of affected mon @@ -293,7 +293,7 @@ FreezeBurnParalyzeEffect: ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr .next2 .asm_3f341 - cp a, PARALYZE_SIDE_EFFECT1 + 1 + cp PARALYZE_SIDE_EFFECT1 + 1 ld b, $1a jr c, .next2 ld b, $4d @@ -309,6 +309,7 @@ FreezeBurnParalyzeEffect: jr z, .burn2 cp FREEZE_SIDE_EFFECT jr z, .freeze2 +; .paralyze2 ld a, 1 << PAR ld [wBattleMonStatus], a call QuarterSpeedDueToParalysis diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index bab804bb..61fbdfa3 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -43,7 +43,7 @@ GainExperience: inc de jr .nextBaseStat .maxStatExp ; if the upper byte also overflowed, then we have hit the max stat exp - dec a ; a is 0 from previous check + dec a ; ld a, $ff; a is 0 from previous check ld [de], a inc de ld [de], a @@ -234,15 +234,15 @@ GainExperience: xor a ; battle mon ld [wCalculateWhoseStats], a ld hl, CalculateModifiedStats - call Bankswitch15ToF + call CallBattleCore ld hl, ApplyBurnAndParalysisPenaltiesToPlayer - call Bankswitch15ToF + call CallBattleCore ld hl, ApplyBadgeStatBoosts - call Bankswitch15ToF + call CallBattleCore ld hl, DrawPlayerHUDAndHPBar - call Bankswitch15ToF + call CallBattleCore ld hl, PrintEmptyString - call Bankswitch15ToF + call CallBattleCore call SaveScreenTilesToBuffer1 .printGrewLevelText callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP @@ -345,7 +345,7 @@ BoostExp: ldh [hQuotient + 2], a ret -Bankswitch15ToF: +CallBattleCore: ld b, BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 03059022..76d89ba9 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -77,7 +77,7 @@ CopyMonPicFromBGToSpriteVRAM: ld [hli], a ld a, d ld [hli], a - ld a, $14 ; use OBP1 + ld a, OAM_OBP1 | 4 ld [hli], a inc d dec c diff --git a/engine/battle/move_effects/heal.asm b/engine/battle/move_effects/heal.asm index 80923a29..c3ffda65 100644 --- a/engine/battle/move_effects/heal.asm +++ b/engine/battle/move_effects/heal.asm @@ -86,7 +86,7 @@ HealEffect_: ld [wHPBarNewHP], a .playAnim ld hl, PlayCurrentMoveAnimation - call Bankswitch3DtoF + call EffectCallBattleCore ldh a, [hWhoseTurn] and a hlcoord 10, 9 @@ -98,14 +98,14 @@ HealEffect_: ld [wHPBarType], a predef UpdateHPBar2 ld hl, DrawHUDsAndHPBars - call Bankswitch3DtoF + call EffectCallBattleCore ld hl, RegainedHealthText jp PrintText .failed ld c, 50 call DelayFrames ld hl, PrintButItFailedText_ - jp Bankswitch3DtoF + jp EffectCallBattleCore StartedSleepingEffect: text_far _StartedSleepingEffect diff --git a/engine/battle/move_effects/reflect_light_screen.asm b/engine/battle/move_effects/reflect_light_screen.asm index c05055fa..46c299e9 100644 --- a/engine/battle/move_effects/reflect_light_screen.asm +++ b/engine/battle/move_effects/reflect_light_screen.asm @@ -23,14 +23,14 @@ ReflectLightScreenEffect_: .playAnim push hl ld hl, PlayCurrentMoveAnimation - call Bankswitch3DtoF + call EffectCallBattleCore pop hl jp PrintText .moveFailed ld c, 50 call DelayFrames ld hl, PrintButItFailedText_ - jp Bankswitch3DtoF + jp EffectCallBattleCore LightScreenProtectedText: text_far _LightScreenProtectedText @@ -40,6 +40,6 @@ ReflectGainedArmorText: text_far _ReflectGainedArmorText text_end -Bankswitch3DtoF: +EffectCallBattleCore: ld b, BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index d37bd94d..af47ae1b 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -134,7 +134,7 @@ TransformEffect_: .failed ld hl, PrintButItFailedText_ - jp Bankswitch3DtoF + jp EffectCallBattleCore TransformedText: text_far _TransformedText diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index 9362cc3a..a61f402f 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -2,18 +2,18 @@ PrintSafariZoneBattleText: ld hl, wSafariBaitFactor ld a, [hl] and a - jr z, .asm_411e + jr z, .no_bait dec [hl] ld hl, SafariZoneEatingText - jr .asm_4138 -.asm_411e + jr .done +.no_bait dec hl ld a, [hl] and a ret z dec [hl] ld hl, SafariZoneAngryText - jr nz, .asm_4138 + jr nz, .done push hl ld a, [wEnemyMonSpecies] ld [wd0b5], a @@ -21,7 +21,7 @@ PrintSafariZoneBattleText: ld a, [wMonHCatchRate] ld [wEnemyMonActualCatchRate], a pop hl -.asm_4138 +.done push hl call LoadScreenTilesFromBuffer1 pop hl diff --git a/engine/battle/scale_sprites.asm b/engine/battle/scale_sprites.asm index 794a65ab..38ebff21 100644 --- a/engine/battle/scale_sprites.asm +++ b/engine/battle/scale_sprites.asm @@ -4,18 +4,18 @@ ScaleSpriteByTwo: ld a, $0 call SwitchSRAMBankAndLatchClockData - call ScaleSpriteByTwo_ + call .ScaleSpriteByTwo call PrepareRTCDataAndDisableSRAM ret -ScaleSpriteByTwo_: +.ScaleSpriteByTwo: ld de, sSpriteBuffer1 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer0 + SPRITEBUFFERSIZE - 1 ; end of destination buffer - call ScaleLastSpriteColumnByTwo ; last tile column is special case - call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns + call ScaleLastSpriteColumnByTwo ; last tile column is special case + call ScaleFirstThreeSpriteColumnsByTwo ; scale first 3 tile columns ld de, sSpriteBuffer2 + (4*4*8) - 5 ; last byte of input data, last 4 rows already skipped ld hl, sSpriteBuffer1 + SPRITEBUFFERSIZE - 1 ; end of destination buffer - call ScaleLastSpriteColumnByTwo ; last tile column is special case + call ScaleLastSpriteColumnByTwo ; last tile column is special case ScaleFirstThreeSpriteColumnsByTwo: ld b, $3 ; 3 tile columns diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 17e68e75..94e427a1 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -295,10 +295,10 @@ TrainerAI: cp LINK_STATE_BATTLING jr z, .done ; if in a link battle, we're done as well ld a, [wEnemyBattleStatus1] - and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY ; %10011 + and 1 << CHARGING_UP | 1 << THRASHING_ABOUT | 1 << STORING_ENERGY jr nz, .done ; don't follow trainer ai if opponent is in a locked state ld a, [wEnemyBattleStatus2] - and 1 << USING_RAGE ; %1000000 + and 1 << USING_RAGE jr nz, .done ; don't follow trainer ai if opponent is locked in rage ; note that this doesn't check for hyper beam recharge which can cause problems ld a, [wTrainerClass] ; what trainer class is this? @@ -311,7 +311,7 @@ TrainerAI: add hl, bc ld a, [wAICount] and a - jr z, .done; if no AI uses left, we're done here + jr z, .done ; if no AI uses left, we're done here inc hl inc a jr nz, .getpointer diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index de5f402e..10de5ed2 100755 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm @@ -8,8 +8,7 @@ PrintCardKeyText: ret z cp b jr nz, .silphCoMapListLoop -; does not check for tile in front of player. This might be buggy - ;predef GetTileAndCoordsInFrontOfPlayer +; does not check for tile in front of player. This might be buggy. ld a, [wTileInFrontOfPlayer] cp $18 jr z, .cardKeyDoorInFrontOfPlayer diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index c08992d3..b480c6d0 100755 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -19,7 +19,7 @@ _RunPaletteCommand: push de jp hl -SetPal_Black: +SetPal_BattleBlack: ld hl, PalPacket_Black ld de, BlkPacket_Battle ret @@ -30,7 +30,6 @@ SetPal_Battle: ld de, wPalPacket ld bc, $10 call CopyData - ;ld a, [wPlayerBattleStatus3] ld hl, wBattleMonSpecies ld a, [hl] and a @@ -42,7 +41,6 @@ SetPal_Battle: .asm_71ef9 call DeterminePaletteID ld b, a - ;ld a, [wEnemyBattleStatus3] ld hl, wEnemyMonSpecies2 call DeterminePaletteID ld c, a @@ -118,7 +116,7 @@ SetPal_Slots: ld de, BlkPacket_Slots ret -SetPal_Titlescreen: +SetPal_TitleScreen: ld hl, PalPacket_Titlescreen ld de, BlkPacket_Titlescreen ret @@ -267,13 +265,13 @@ SendUnknownPalPacket_72064:: SetPalFunctions: ; entries correspond to SET_PAL_* constants - dw SetPal_Black + dw SetPal_BattleBlack dw SetPal_Battle dw SetPal_TownMap dw SetPal_StatusScreen dw SetPal_Pokedex dw SetPal_Slots - dw SetPal_Titlescreen + dw SetPal_TitleScreen dw SetPal_NidorinoIntro dw SetPal_Generic dw SetPal_Overworld diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm index b62d9d4b..136e3afb 100644 --- a/engine/gfx/sprite_oam.asm +++ b/engine/gfx/sprite_oam.asm @@ -219,7 +219,7 @@ _IsTilePassable:: ld l, a ; hl now points to passable tiles .loop ld a, [hli] - cp a, $ff + cp $ff jr z, .tileNotPassable cp c jr nz, .loop diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index c2e0b2b4..e28edc6c 100644 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -34,9 +34,9 @@ AddItemToInventory_:: cp b ; does the current item in the table match the item being added? jp z, .increaseItemQuantity ; if so, increase the item's quantity inc hl -.loop +.addAnotherStackOfItem ld a, [hl] - cp a, $ff ; is it the end of the table? + cp $ff ; is it the end of the table? jr nz, .notAtEndOfInventory .addNewItem ; add an item not yet in the inventory pop hl @@ -74,7 +74,7 @@ AddItemToInventory_:: ; if so, store 99 in the current slot and store the rest in a new slot ld a, 99 ld [hli], a - jp .loop + jp .addAnotherStackOfItem .increaseItemQuantityFailed pop hl and a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d4c3ae18..00a575f1 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -386,7 +386,7 @@ ItemUseBall: ldh [hDivisor], a ld b, 4 call Divide - + ; Determine Status2. ; no status ailment: Status2 = 0 ; Burn/Paralysis/Poison: Status2 = 5 @@ -3092,7 +3092,7 @@ SendNewMonToBox: ld a, [wcf91] cp KADABRA jr nz, .notKadabra - ld a, $60 ; twistedspoon in gsc + ld a, TWISTEDSPOON_GSC ld [wBoxMon1CatchRate], a .notKadabra ret diff --git a/engine/items/tms.asm b/engine/items/tms.asm index dcf2665d..40030675 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -11,7 +11,7 @@ CanLearnTM: ld hl, TechnicalMachines .findTMloop ld a, [hli] - cp $ff ; reached terminator? + cp -1 ; reached terminator? jr z, .done cp b jr z, .TMfoundLoop diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index c401d1c1..d385044a 100755 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -152,7 +152,7 @@ LoadTownMap_Fly:: call LoadFontTilePatterns ld de, BirdSprite ld b, BANK(BirdSprite) - ld c, $c + ld c, 12 ld hl, vSprites tile $04 call CopyVideoData ld de, TownMapUpArrow diff --git a/engine/joypad.asm b/engine/joypad.asm index 06a15e4e..d50eea08 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -7,7 +7,6 @@ ReadJoypad_:: ret nz ld a, 1 << 5 ; select direction keys - ;ld c, 0 ldh [rJOYP], a ldh a, [rJOYP] @@ -19,9 +18,9 @@ ReadJoypad_:: ld a, 1 << 4 ; select button keys ldh [rJOYP], a - REPT 6 +REPT 6 ldh a, [rJOYP] - ENDR +ENDR cpl and %1111 or b @@ -32,14 +31,13 @@ ReadJoypad_:: ldh [rJOYP], a ret - _Joypad:: ; hJoyReleased: (hJoyLast ^ hJoyInput) & hJoyLast ; hJoyPressed: (hJoyLast ^ hJoyInput) & hJoyInput ldh a, [hJoyInput] ld b, a - and $4F + and A_BUTTON + B_BUTTON + SELECT + START + D_UP cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset jp z, TrySoftReset diff --git a/engine/link/print_waiting_text.asm b/engine/link/print_waiting_text.asm index 98a44970..a07967fd 100644 --- a/engine/link/print_waiting_text.asm +++ b/engine/link/print_waiting_text.asm @@ -3,12 +3,13 @@ PrintWaitingText:: lb bc, 1, 11 ld a, [wIsInBattle] and a - jr z, .asm_4b9a + jr z, .trade +; battle call TextBoxBorder - jr .asm_4b9d -.asm_4b9a + jr .border_done +.trade call CableClub_TextBoxBorder -.asm_4b9d +.border_done hlcoord 4, 11 ld de, WaitingText call PlaceString diff --git a/engine/math/bcd.asm b/engine/math/bcd.asm index 92bf6f17..5747a684 100644 --- a/engine/math/bcd.asm +++ b/engine/math/bcd.asm @@ -13,7 +13,7 @@ DivideBCD:: ldh [hDivideBCDBuffer+1], a ldh [hDivideBCDBuffer+2], a ld d, $1 -.mulBy10Loop +.mulBy10Loop ; multiply the divisor by 10 until the leading digit is nonzero ; to set up the standard long division algorithm ldh a, [hDivideBCDDivisor] @@ -108,7 +108,7 @@ DivideBCD:: ldh a, [hDivideBCDBuffer+2] ldh [hDivideBCDQuotient+2], a pop de - ld a, $6 + ld a, $6 sub d and a ret z diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 874fe50f..315e4805 100755 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -205,9 +205,9 @@ HandlePokedexListMenu: jr z, .checkIfRightPressed .downPressed ; scroll down one row ld a, [wDexMaxSeenMon] - cp a, 7 + cp 7 jp c, .loop ; can't if the list is shorter than 7 - sub a, 7 + sub 7 ld b, a ld a, [wListScrollOffset] cp b @@ -221,12 +221,12 @@ HandlePokedexListMenu: jr z, .checkIfLeftPressed .rightPressed ; scroll down 7 rows ld a, [wDexMaxSeenMon] - cp a, 7 + cp 7 jp c, .loop ; can't if the list is shorter than 7 - sub a, 6 + sub 6 ld b, a ld a, [wListScrollOffset] - add a, 7 + add 7 ld [wListScrollOffset], a cp b jp c, .loop @@ -240,7 +240,7 @@ HandlePokedexListMenu: jr z, .buttonAPressed .leftPressed ld a, [wListScrollOffset] - sub a, 7 + sub 7 ld [wListScrollOffset], a jp nc, .loop xor a @@ -324,7 +324,7 @@ DrawPokedexVerticalLine: .loop ld [hl], a add hl, de - xor a, 1 ; toggle between vertical line tile and box tile + xor 1 ; toggle between vertical line tile and box tile dec c jr nz, .loop ret @@ -459,7 +459,7 @@ ShowPokedexDataInternal: .waitForButtonPress call JoypadLowSensitivity ldh a, [hJoy5] - and a, A_BUTTON | B_BUTTON + and A_BUTTON | B_BUTTON jr z, .waitForButtonPress pop af ldh [hTilesetType], a diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 6d319867..641c4f62 100755 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -1689,7 +1689,7 @@ SurfingMinigame_WriteTotal: .Total: db $2b,$2c,$25,$28,$2d ; Total - + DidPlayerGetAHighScore: ld hl, wSurfingMinigameHiScore + 1 ld a, [wSurfingMinigameTotalScore + 1] diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 9165113f..a9774ff9 100755 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -83,7 +83,7 @@ PlayShootingStar: ld b, SET_PAL_GAME_FREAK_INTRO call RunPaletteCommand farcall LoadCopyrightAndTextBoxTiles - ldPal a, BLACK, DARK_GRAY, LIGHT_GRAY, WHITE + ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE ldh [rBGP], a call UpdateGBCPal_BGP ld c, 180 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 0b421d89..11852ae4 100755 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -254,7 +254,7 @@ CopyrightTextString: TitleScreen_PlayPikachuPCM: callfar PlayPikachuSoundClip ret - + DoTitleScreenFunction: call .CheckTimer ld a, [wTitleScreenScene] @@ -268,7 +268,7 @@ DoTitleScreenFunction: ld l, a jp hl - + .Jumptable: dw .Nop dw .BlinkHalf @@ -282,13 +282,13 @@ DoTitleScreenFunction: dw .BlinkWait dw .BlinkOpen dw .GoBackToStart - + .GoBackToStart: xor a ld [wTitleScreenScene], a .Nop ret - + .BlinkOpen: ld e, 0 jr .LoadBlinkFrame @@ -316,7 +316,7 @@ DoTitleScreenFunction: ld hl, wTitleScreenScene inc [hl] ret - + .CheckTimer: ld hl, wTitleScreenTimer ld a, [hl] diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index e31c0bd2..ba412ab2 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -304,7 +304,7 @@ GetSplitMapSpriteSetID: ld hl, MapSpriteSets add hl, de ld a, [hl] ; a = spriteSetID - cp a, $f0 ; does the map have 2 sprite sets? + cp $f0 ; does the map have 2 sprite sets? ret c ; Chooses the correct sprite set ID depending on the player's position within ; the map for maps with two sprite sets. diff --git a/engine/overworld/specific_script_flags.asm b/engine/overworld/specific_script_flags.asm index d6f333ac..b59aa9d0 100644 --- a/engine/overworld/specific_script_flags.asm +++ b/engine/overworld/specific_script_flags.asm @@ -8,7 +8,7 @@ SetMapSpecificScriptFlagsOnMapReload:: ld a, [hli] cp c jr z, .in_list - cp a, $ff + cp $ff jr nz, .search_loop ret diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm index 6b912e61..91c16999 100755 --- a/engine/pikachu/pikachu_movement.asm +++ b/engine/pikachu/pikachu_movement.asm @@ -866,7 +866,7 @@ LoadPikachuShadowOAMData: push bc push de push hl - + ld bc, wOAMBuffer + 4 * 36 ld a, [wPikaSpriteY] ld e, a diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm index 33a3e504..755395ba 100755 --- a/engine/pikachu/pikachu_pic_animation.asm +++ b/engine/pikachu/pikachu_pic_animation.asm @@ -625,7 +625,7 @@ PikaPicAnimCommand_loadgfx: ld a, [wPikaPicAnimCurGraphicID] call LoadPikaPicAnimGFXHeader ld a, c - cp a, $ff + cp $ff jr z, .compressed call RequestPikaPicAnimGFX jr .done diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index d3d08e99..54d7b4de 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -172,10 +172,10 @@ _AddPartyMon:: ld [de], a ld a, [wcf91] cp KADABRA - jr nz, .skipGivingTwistedSpoon - ld a, $60 ; twistedspoon in gen 2 + jr nz, .notKadabra + ld a, TWISTEDSPOON_GSC ld [de], a -.skipGivingTwistedSpoon +.notKadabra ld hl, wMonHMoves ld a, [hli] inc de @@ -436,7 +436,7 @@ _MoveMon:: cp PARTY_TO_DAYCARE ld de, wDayCareMonOT jr z, .findOTsrc - dec a + dec a ld hl, wPartyMonOT ld a, [wPartyCount] jr nz, .addOToffset diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 4e48fe30..3df780c1 100755 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -452,40 +452,7 @@ Func_3b0a2: scf ret -Pointer_3b0ee: - db NIDOKING - db IVYSAUR - db EXEGGUTOR - db GENGAR - db NIDOQUEEN - db ARCANINE - db GYARADOS - db BLASTOISE - db GOLEM - db DRAGONITE - db NINETALES - db DRAGONAIR - db KABUTOPS - db OMASTAR - db JIGGLYPUFF - db FLAREON - db JOLTEON - db VAPOREON - db BEEDRILL - db BUTTERFREE - db MACHAMP - db CLOYSTER - db CLEFABLE - db ALAKAZAM - db STARMIE - db VENUSAUR - db TENTACRUEL - db CHARMELEON - db WARTORTLE - db CHARIZARD - db VILEPLUME - db VICTREEBEL - db $ff +INCLUDE "data/pokemon/unknown_list.asm" Func_3b10f: ld c, $0 diff --git a/engine/predefs.asm b/engine/predefs.asm index 73f69d03..a9877739 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -1,8 +1,8 @@ GetPredefPointer:: - ; Store the contents of the register - ; pairs (hl, de, bc) at wPredefRegisters. - ; Then put the bank and address of predef - ; wPredefID in [wPredefBank] and hl. +; Store the contents of the register +; pairs (hl, de, bc) at wPredefRegisters. +; Then put the bank and address of predef +; wPredefID in [wPredefBank] and hl. ld a, h ld [wPredefRegisters], a diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm index 180f044c..b257aff4 100755 --- a/engine/printer/printer2.asm +++ b/engine/printer/printer2.asm @@ -356,7 +356,7 @@ Func_ea6af: ld hl, wPrinterSerialFrameDelay inc [hl] ld a, [hl] - cp a, $6 + cp $6 ret c xor a ld [hl], a @@ -381,17 +381,17 @@ Func_ea6d2: call Func_ea742 ret c ld a, [wPrinterHandshake] - cp a, $ff + cp $ff jr nz, .asm_ea6e4 ld a, [wPrinterStatusFlags] - cp a, $ff + cp $ff jr z, .asm_ea6fb .asm_ea6e4 ld a, [wPrinterHandshake] - cp a, $81 + cp $81 jr nz, .asm_ea6fb ld a, [wPrinterStatusFlags] - cp a, $0 + cp $0 jr nz, .asm_ea6fb ld hl, wPrinterConnectionOpen set 1, [hl] diff --git a/audio/unknown_832b9.bin b/garbage/bank20.bin Binary files differindex 1c14816a..96a64283 100755..100644 --- a/audio/unknown_832b9.bin +++ b/garbage/bank20.bin diff --git a/gfx/battle/oldman.png b/gfx/battle/oldmanb.png Binary files differindex 6d48000f..6d48000f 100644 --- a/gfx/battle/oldman.png +++ b/gfx/battle/oldmanb.png diff --git a/gfx/pics.asm b/gfx/pics.asm index 2e410ea3..6cd8af95 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1,326 +1,326 @@ SECTION "Pics 1", ROMX -RhydonPicFront:: INCBIN "gfx/pokemon/front_yellow/rhydon.pic" +RhydonPicFront:: INCBIN "gfx/pokemon/front/rhydon.pic" RhydonPicBack:: INCBIN "gfx/pokemon/back/rhydonb.pic" -KangaskhanPicFront:: INCBIN "gfx/pokemon/front_yellow/kangaskhan.pic" +KangaskhanPicFront:: INCBIN "gfx/pokemon/front/kangaskhan.pic" KangaskhanPicBack:: INCBIN "gfx/pokemon/back/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "gfx/pokemon/front_yellow/nidoranm.pic" +NidoranMPicFront:: INCBIN "gfx/pokemon/front/nidoranm.pic" NidoranMPicBack:: INCBIN "gfx/pokemon/back/nidoranmb.pic" -ClefairyPicFront:: INCBIN "gfx/pokemon/front_yellow/clefairy.pic" +ClefairyPicFront:: INCBIN "gfx/pokemon/front/clefairy.pic" ClefairyPicBack:: INCBIN "gfx/pokemon/back/clefairyb.pic" -SpearowPicFront:: INCBIN "gfx/pokemon/front_yellow/spearow.pic" +SpearowPicFront:: INCBIN "gfx/pokemon/front/spearow.pic" SpearowPicBack:: INCBIN "gfx/pokemon/back/spearowb.pic" -VoltorbPicFront:: INCBIN "gfx/pokemon/front_yellow/voltorb.pic" +VoltorbPicFront:: INCBIN "gfx/pokemon/front/voltorb.pic" VoltorbPicBack:: INCBIN "gfx/pokemon/back/voltorbb.pic" -NidokingPicFront:: INCBIN "gfx/pokemon/front_yellow/nidoking.pic" +NidokingPicFront:: INCBIN "gfx/pokemon/front/nidoking.pic" NidokingPicBack:: INCBIN "gfx/pokemon/back/nidokingb.pic" -SlowbroPicFront:: INCBIN "gfx/pokemon/front_yellow/slowbro.pic" +SlowbroPicFront:: INCBIN "gfx/pokemon/front/slowbro.pic" SlowbroPicBack:: INCBIN "gfx/pokemon/back/slowbrob.pic" -IvysaurPicFront:: INCBIN "gfx/pokemon/front_yellow/ivysaur.pic" +IvysaurPicFront:: INCBIN "gfx/pokemon/front/ivysaur.pic" IvysaurPicBack:: INCBIN "gfx/pokemon/back/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "gfx/pokemon/front_yellow/exeggutor.pic" +ExeggutorPicFront:: INCBIN "gfx/pokemon/front/exeggutor.pic" ExeggutorPicBack:: INCBIN "gfx/pokemon/back/exeggutorb.pic" -LickitungPicFront:: INCBIN "gfx/pokemon/front_yellow/lickitung.pic" +LickitungPicFront:: INCBIN "gfx/pokemon/front/lickitung.pic" LickitungPicBack:: INCBIN "gfx/pokemon/back/lickitungb.pic" -ExeggcutePicFront:: INCBIN "gfx/pokemon/front_yellow/exeggcute.pic" +ExeggcutePicFront:: INCBIN "gfx/pokemon/front/exeggcute.pic" ExeggcutePicBack:: INCBIN "gfx/pokemon/back/exeggcuteb.pic" -GrimerPicFront:: INCBIN "gfx/pokemon/front_yellow/grimer.pic" +GrimerPicFront:: INCBIN "gfx/pokemon/front/grimer.pic" GrimerPicBack:: INCBIN "gfx/pokemon/back/grimerb.pic" -GengarPicFront:: INCBIN "gfx/pokemon/front_yellow/gengar.pic" +GengarPicFront:: INCBIN "gfx/pokemon/front/gengar.pic" GengarPicBack:: INCBIN "gfx/pokemon/back/gengarb.pic" -NidoranFPicFront:: INCBIN "gfx/pokemon/front_yellow/nidoranf.pic" +NidoranFPicFront:: INCBIN "gfx/pokemon/front/nidoranf.pic" NidoranFPicBack:: INCBIN "gfx/pokemon/back/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "gfx/pokemon/front_yellow/nidoqueen.pic" +NidoqueenPicFront:: INCBIN "gfx/pokemon/front/nidoqueen.pic" NidoqueenPicBack:: INCBIN "gfx/pokemon/back/nidoqueenb.pic" -CubonePicFront:: INCBIN "gfx/pokemon/front_yellow/cubone.pic" +CubonePicFront:: INCBIN "gfx/pokemon/front/cubone.pic" CubonePicBack:: INCBIN "gfx/pokemon/back/cuboneb.pic" -RhyhornPicFront:: INCBIN "gfx/pokemon/front_yellow/rhyhorn.pic" +RhyhornPicFront:: INCBIN "gfx/pokemon/front/rhyhorn.pic" RhyhornPicBack:: INCBIN "gfx/pokemon/back/rhyhornb.pic" -LaprasPicFront:: INCBIN "gfx/pokemon/front_yellow/lapras.pic" +LaprasPicFront:: INCBIN "gfx/pokemon/front/lapras.pic" LaprasPicBack:: INCBIN "gfx/pokemon/back/laprasb.pic" -ArcaninePicFront:: INCBIN "gfx/pokemon/front_yellow/arcanine.pic" +ArcaninePicFront:: INCBIN "gfx/pokemon/front/arcanine.pic" ArcaninePicBack:: INCBIN "gfx/pokemon/back/arcanineb.pic" -MewPicFront:: INCBIN "gfx/pokemon/front_yellow/mew.pic" +MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic" MewPicBack:: INCBIN "gfx/pokemon/back/mewb.pic" -GyaradosPicFront:: INCBIN "gfx/pokemon/front_yellow/gyarados.pic" +GyaradosPicFront:: INCBIN "gfx/pokemon/front/gyarados.pic" GyaradosPicBack:: INCBIN "gfx/pokemon/back/gyaradosb.pic" -ShellderPicFront:: INCBIN "gfx/pokemon/front_yellow/shellder.pic" +ShellderPicFront:: INCBIN "gfx/pokemon/front/shellder.pic" ShellderPicBack:: INCBIN "gfx/pokemon/back/shellderb.pic" -TentacoolPicFront:: INCBIN "gfx/pokemon/front_yellow/tentacool.pic" +TentacoolPicFront:: INCBIN "gfx/pokemon/front/tentacool.pic" TentacoolPicBack:: INCBIN "gfx/pokemon/back/tentacoolb.pic" -GastlyPicFront:: INCBIN "gfx/pokemon/front_yellow/gastly.pic" +GastlyPicFront:: INCBIN "gfx/pokemon/front/gastly.pic" GastlyPicBack:: INCBIN "gfx/pokemon/back/gastlyb.pic" -ScytherPicFront:: INCBIN "gfx/pokemon/front_yellow/scyther.pic" +ScytherPicFront:: INCBIN "gfx/pokemon/front/scyther.pic" ScytherPicBack:: INCBIN "gfx/pokemon/back/scytherb.pic" -StaryuPicFront:: INCBIN "gfx/pokemon/front_yellow/staryu.pic" +StaryuPicFront:: INCBIN "gfx/pokemon/front/staryu.pic" StaryuPicBack:: INCBIN "gfx/pokemon/back/staryub.pic" -BlastoisePicFront:: INCBIN "gfx/pokemon/front_yellow/blastoise.pic" +BlastoisePicFront:: INCBIN "gfx/pokemon/front/blastoise.pic" BlastoisePicBack:: INCBIN "gfx/pokemon/back/blastoiseb.pic" -PinsirPicFront:: INCBIN "gfx/pokemon/front_yellow/pinsir.pic" +PinsirPicFront:: INCBIN "gfx/pokemon/front/pinsir.pic" PinsirPicBack:: INCBIN "gfx/pokemon/back/pinsirb.pic" -TangelaPicFront:: INCBIN "gfx/pokemon/front_yellow/tangela.pic" +TangelaPicFront:: INCBIN "gfx/pokemon/front/tangela.pic" TangelaPicBack:: INCBIN "gfx/pokemon/back/tangelab.pic" SECTION "Pics 2", ROMX -GrowlithePicFront:: INCBIN "gfx/pokemon/front_yellow/growlithe.pic" +GrowlithePicFront:: INCBIN "gfx/pokemon/front/growlithe.pic" GrowlithePicBack:: INCBIN "gfx/pokemon/back/growlitheb.pic" -OnixPicFront:: INCBIN "gfx/pokemon/front_yellow/onix.pic" +OnixPicFront:: INCBIN "gfx/pokemon/front/onix.pic" OnixPicBack:: INCBIN "gfx/pokemon/back/onixb.pic" -FearowPicFront:: INCBIN "gfx/pokemon/front_yellow/fearow.pic" +FearowPicFront:: INCBIN "gfx/pokemon/front/fearow.pic" FearowPicBack:: INCBIN "gfx/pokemon/back/fearowb.pic" -PidgeyPicFront:: INCBIN "gfx/pokemon/front_yellow/pidgey.pic" +PidgeyPicFront:: INCBIN "gfx/pokemon/front/pidgey.pic" PidgeyPicBack:: INCBIN "gfx/pokemon/back/pidgeyb.pic" -SlowpokePicFront:: INCBIN "gfx/pokemon/front_yellow/slowpoke.pic" +SlowpokePicFront:: INCBIN "gfx/pokemon/front/slowpoke.pic" SlowpokePicBack:: INCBIN "gfx/pokemon/back/slowpokeb.pic" -KadabraPicFront:: INCBIN "gfx/pokemon/front_yellow/kadabra.pic" +KadabraPicFront:: INCBIN "gfx/pokemon/front/kadabra.pic" KadabraPicBack:: INCBIN "gfx/pokemon/back/kadabrab.pic" -GravelerPicFront:: INCBIN "gfx/pokemon/front_yellow/graveler.pic" +GravelerPicFront:: INCBIN "gfx/pokemon/front/graveler.pic" GravelerPicBack:: INCBIN "gfx/pokemon/back/gravelerb.pic" -ChanseyPicFront:: INCBIN "gfx/pokemon/front_yellow/chansey.pic" +ChanseyPicFront:: INCBIN "gfx/pokemon/front/chansey.pic" ChanseyPicBack:: INCBIN "gfx/pokemon/back/chanseyb.pic" -MachokePicFront:: INCBIN "gfx/pokemon/front_yellow/machoke.pic" +MachokePicFront:: INCBIN "gfx/pokemon/front/machoke.pic" MachokePicBack:: INCBIN "gfx/pokemon/back/machokeb.pic" -MrMimePicFront:: INCBIN "gfx/pokemon/front_yellow/mr.mime.pic" +MrMimePicFront:: INCBIN "gfx/pokemon/front/mr.mime.pic" MrMimePicBack:: INCBIN "gfx/pokemon/back/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "gfx/pokemon/front_yellow/hitmonlee.pic" +HitmonleePicFront:: INCBIN "gfx/pokemon/front/hitmonlee.pic" HitmonleePicBack:: INCBIN "gfx/pokemon/back/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "gfx/pokemon/front_yellow/hitmonchan.pic" +HitmonchanPicFront:: INCBIN "gfx/pokemon/front/hitmonchan.pic" HitmonchanPicBack:: INCBIN "gfx/pokemon/back/hitmonchanb.pic" -ArbokPicFront:: INCBIN "gfx/pokemon/front_yellow/arbok.pic" +ArbokPicFront:: INCBIN "gfx/pokemon/front/arbok.pic" ArbokPicBack:: INCBIN "gfx/pokemon/back/arbokb.pic" -ParasectPicFront:: INCBIN "gfx/pokemon/front_yellow/parasect.pic" +ParasectPicFront:: INCBIN "gfx/pokemon/front/parasect.pic" ParasectPicBack:: INCBIN "gfx/pokemon/back/parasectb.pic" -PsyduckPicFront:: INCBIN "gfx/pokemon/front_yellow/psyduck.pic" +PsyduckPicFront:: INCBIN "gfx/pokemon/front/psyduck.pic" PsyduckPicBack:: INCBIN "gfx/pokemon/back/psyduckb.pic" -DrowzeePicFront:: INCBIN "gfx/pokemon/front_yellow/drowzee.pic" +DrowzeePicFront:: INCBIN "gfx/pokemon/front/drowzee.pic" DrowzeePicBack:: INCBIN "gfx/pokemon/back/drowzeeb.pic" -GolemPicFront:: INCBIN "gfx/pokemon/front_yellow/golem.pic" +GolemPicFront:: INCBIN "gfx/pokemon/front/golem.pic" GolemPicBack:: INCBIN "gfx/pokemon/back/golemb.pic" -MagmarPicFront:: INCBIN "gfx/pokemon/front_yellow/magmar.pic" +MagmarPicFront:: INCBIN "gfx/pokemon/front/magmar.pic" MagmarPicBack:: INCBIN "gfx/pokemon/back/magmarb.pic" -ElectabuzzPicFront:: INCBIN "gfx/pokemon/front_yellow/electabuzz.pic" +ElectabuzzPicFront:: INCBIN "gfx/pokemon/front/electabuzz.pic" ElectabuzzPicBack:: INCBIN "gfx/pokemon/back/electabuzzb.pic" -MagnetonPicFront:: INCBIN "gfx/pokemon/front_yellow/magneton.pic" +MagnetonPicFront:: INCBIN "gfx/pokemon/front/magneton.pic" MagnetonPicBack:: INCBIN "gfx/pokemon/back/magnetonb.pic" -KoffingPicFront:: INCBIN "gfx/pokemon/front_yellow/koffing.pic" +KoffingPicFront:: INCBIN "gfx/pokemon/front/koffing.pic" KoffingPicBack:: INCBIN "gfx/pokemon/back/koffingb.pic" -MankeyPicFront:: INCBIN "gfx/pokemon/front_yellow/mankey.pic" +MankeyPicFront:: INCBIN "gfx/pokemon/front/mankey.pic" MankeyPicBack:: INCBIN "gfx/pokemon/back/mankeyb.pic" -SeelPicFront:: INCBIN "gfx/pokemon/front_yellow/seel.pic" +SeelPicFront:: INCBIN "gfx/pokemon/front/seel.pic" SeelPicBack:: INCBIN "gfx/pokemon/back/seelb.pic" -DiglettPicFront:: INCBIN "gfx/pokemon/front_yellow/diglett.pic" +DiglettPicFront:: INCBIN "gfx/pokemon/front/diglett.pic" DiglettPicBack:: INCBIN "gfx/pokemon/back/diglettb.pic" -TaurosPicFront:: INCBIN "gfx/pokemon/front_yellow/tauros.pic" +TaurosPicFront:: INCBIN "gfx/pokemon/front/tauros.pic" TaurosPicBack:: INCBIN "gfx/pokemon/back/taurosb.pic" -FarfetchdPicFront:: INCBIN "gfx/pokemon/front_yellow/farfetchd.pic" +FarfetchdPicFront:: INCBIN "gfx/pokemon/front/farfetchd.pic" FarfetchdPicBack:: INCBIN "gfx/pokemon/back/farfetchdb.pic" -VenonatPicFront:: INCBIN "gfx/pokemon/front_yellow/venonat.pic" +VenonatPicFront:: INCBIN "gfx/pokemon/front/venonat.pic" VenonatPicBack:: INCBIN "gfx/pokemon/back/venonatb.pic" -DragonitePicFront:: INCBIN "gfx/pokemon/front_yellow/dragonite.pic" +DragonitePicFront:: INCBIN "gfx/pokemon/front/dragonite.pic" DragonitePicBack:: INCBIN "gfx/pokemon/back/dragoniteb.pic" -DoduoPicFront:: INCBIN "gfx/pokemon/front_yellow/doduo.pic" +DoduoPicFront:: INCBIN "gfx/pokemon/front/doduo.pic" DoduoPicBack:: INCBIN "gfx/pokemon/back/doduob.pic" -PoliwagPicFront:: INCBIN "gfx/pokemon/front_yellow/poliwag.pic" +PoliwagPicFront:: INCBIN "gfx/pokemon/front/poliwag.pic" PoliwagPicBack:: INCBIN "gfx/pokemon/back/poliwagb.pic" -JynxPicFront:: INCBIN "gfx/pokemon/front_yellow/jynx.pic" +JynxPicFront:: INCBIN "gfx/pokemon/front/jynx.pic" JynxPicBack:: INCBIN "gfx/pokemon/back/jynxb.pic" -MoltresPicFront:: INCBIN "gfx/pokemon/front_yellow/moltres.pic" +MoltresPicFront:: INCBIN "gfx/pokemon/front/moltres.pic" MoltresPicBack:: INCBIN "gfx/pokemon/back/moltresb.pic" SECTION "Pics 3", ROMX -ArticunoPicFront:: INCBIN "gfx/pokemon/front_yellow/articuno.pic" +ArticunoPicFront:: INCBIN "gfx/pokemon/front/articuno.pic" ArticunoPicBack:: INCBIN "gfx/pokemon/back/articunob.pic" -ZapdosPicFront:: INCBIN "gfx/pokemon/front_yellow/zapdos.pic" +ZapdosPicFront:: INCBIN "gfx/pokemon/front/zapdos.pic" ZapdosPicBack:: INCBIN "gfx/pokemon/back/zapdosb.pic" -DittoPicFront:: INCBIN "gfx/pokemon/front_yellow/ditto.pic" +DittoPicFront:: INCBIN "gfx/pokemon/front/ditto.pic" DittoPicBack:: INCBIN "gfx/pokemon/back/dittob.pic" -MeowthPicFront:: INCBIN "gfx/pokemon/front_yellow/meowth.pic" +MeowthPicFront:: INCBIN "gfx/pokemon/front/meowth.pic" MeowthPicBack:: INCBIN "gfx/pokemon/back/meowthb.pic" -KrabbyPicFront:: INCBIN "gfx/pokemon/front_yellow/krabby.pic" +KrabbyPicFront:: INCBIN "gfx/pokemon/front/krabby.pic" KrabbyPicBack:: INCBIN "gfx/pokemon/back/krabbyb.pic" -VulpixPicFront:: INCBIN "gfx/pokemon/front_yellow/vulpix.pic" +VulpixPicFront:: INCBIN "gfx/pokemon/front/vulpix.pic" VulpixPicBack:: INCBIN "gfx/pokemon/back/vulpixb.pic" -NinetalesPicFront:: INCBIN "gfx/pokemon/front_yellow/ninetales.pic" +NinetalesPicFront:: INCBIN "gfx/pokemon/front/ninetales.pic" NinetalesPicBack:: INCBIN "gfx/pokemon/back/ninetalesb.pic" -PikachuPicFront:: INCBIN "gfx/pokemon/front_yellow/pikachu.pic" +PikachuPicFront:: INCBIN "gfx/pokemon/front/pikachu.pic" PikachuPicBack:: INCBIN "gfx/pokemon/back/pikachub.pic" -RaichuPicFront:: INCBIN "gfx/pokemon/front_yellow/raichu.pic" +RaichuPicFront:: INCBIN "gfx/pokemon/front/raichu.pic" RaichuPicBack:: INCBIN "gfx/pokemon/back/raichub.pic" -DratiniPicFront:: INCBIN "gfx/pokemon/front_yellow/dratini.pic" +DratiniPicFront:: INCBIN "gfx/pokemon/front/dratini.pic" DratiniPicBack:: INCBIN "gfx/pokemon/back/dratinib.pic" -DragonairPicFront:: INCBIN "gfx/pokemon/front_yellow/dragonair.pic" +DragonairPicFront:: INCBIN "gfx/pokemon/front/dragonair.pic" DragonairPicBack:: INCBIN "gfx/pokemon/back/dragonairb.pic" -KabutoPicFront:: INCBIN "gfx/pokemon/front_yellow/kabuto.pic" +KabutoPicFront:: INCBIN "gfx/pokemon/front/kabuto.pic" KabutoPicBack:: INCBIN "gfx/pokemon/back/kabutob.pic" -KabutopsPicFront:: INCBIN "gfx/pokemon/front_yellow/kabutops.pic" +KabutopsPicFront:: INCBIN "gfx/pokemon/front/kabutops.pic" KabutopsPicBack:: INCBIN "gfx/pokemon/back/kabutopsb.pic" -HorseaPicFront:: INCBIN "gfx/pokemon/front_yellow/horsea.pic" +HorseaPicFront:: INCBIN "gfx/pokemon/front/horsea.pic" HorseaPicBack:: INCBIN "gfx/pokemon/back/horseab.pic" -SeadraPicFront:: INCBIN "gfx/pokemon/front_yellow/seadra.pic" +SeadraPicFront:: INCBIN "gfx/pokemon/front/seadra.pic" SeadraPicBack:: INCBIN "gfx/pokemon/back/seadrab.pic" -SandshrewPicFront:: INCBIN "gfx/pokemon/front_yellow/sandshrew.pic" +SandshrewPicFront:: INCBIN "gfx/pokemon/front/sandshrew.pic" SandshrewPicBack:: INCBIN "gfx/pokemon/back/sandshrewb.pic" -SandslashPicFront:: INCBIN "gfx/pokemon/front_yellow/sandslash.pic" +SandslashPicFront:: INCBIN "gfx/pokemon/front/sandslash.pic" SandslashPicBack:: INCBIN "gfx/pokemon/back/sandslashb.pic" -OmanytePicFront:: INCBIN "gfx/pokemon/front_yellow/omanyte.pic" +OmanytePicFront:: INCBIN "gfx/pokemon/front/omanyte.pic" OmanytePicBack:: INCBIN "gfx/pokemon/back/omanyteb.pic" -OmastarPicFront:: INCBIN "gfx/pokemon/front_yellow/omastar.pic" +OmastarPicFront:: INCBIN "gfx/pokemon/front/omastar.pic" OmastarPicBack:: INCBIN "gfx/pokemon/back/omastarb.pic" -JigglypuffPicFront:: INCBIN "gfx/pokemon/front_yellow/jigglypuff.pic" +JigglypuffPicFront:: INCBIN "gfx/pokemon/front/jigglypuff.pic" JigglypuffPicBack:: INCBIN "gfx/pokemon/back/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "gfx/pokemon/front_yellow/wigglytuff.pic" +WigglytuffPicFront:: INCBIN "gfx/pokemon/front/wigglytuff.pic" WigglytuffPicBack:: INCBIN "gfx/pokemon/back/wigglytuffb.pic" -EeveePicFront:: INCBIN "gfx/pokemon/front_yellow/eevee.pic" +EeveePicFront:: INCBIN "gfx/pokemon/front/eevee.pic" EeveePicBack:: INCBIN "gfx/pokemon/back/eeveeb.pic" -FlareonPicFront:: INCBIN "gfx/pokemon/front_yellow/flareon.pic" +FlareonPicFront:: INCBIN "gfx/pokemon/front/flareon.pic" FlareonPicBack:: INCBIN "gfx/pokemon/back/flareonb.pic" -JolteonPicFront:: INCBIN "gfx/pokemon/front_yellow/jolteon.pic" +JolteonPicFront:: INCBIN "gfx/pokemon/front/jolteon.pic" JolteonPicBack:: INCBIN "gfx/pokemon/back/jolteonb.pic" -VaporeonPicFront:: INCBIN "gfx/pokemon/front_yellow/vaporeon.pic" +VaporeonPicFront:: INCBIN "gfx/pokemon/front/vaporeon.pic" VaporeonPicBack:: INCBIN "gfx/pokemon/back/vaporeonb.pic" -MachopPicFront:: INCBIN "gfx/pokemon/front_yellow/machop.pic" +MachopPicFront:: INCBIN "gfx/pokemon/front/machop.pic" MachopPicBack:: INCBIN "gfx/pokemon/back/machopb.pic" -ZubatPicFront:: INCBIN "gfx/pokemon/front_yellow/zubat.pic" +ZubatPicFront:: INCBIN "gfx/pokemon/front/zubat.pic" ZubatPicBack:: INCBIN "gfx/pokemon/back/zubatb.pic" -EkansPicFront:: INCBIN "gfx/pokemon/front_yellow/ekans.pic" +EkansPicFront:: INCBIN "gfx/pokemon/front/ekans.pic" EkansPicBack:: INCBIN "gfx/pokemon/back/ekansb.pic" -ParasPicFront:: INCBIN "gfx/pokemon/front_yellow/paras.pic" +ParasPicFront:: INCBIN "gfx/pokemon/front/paras.pic" ParasPicBack:: INCBIN "gfx/pokemon/back/parasb.pic" -PoliwhirlPicFront:: INCBIN "gfx/pokemon/front_yellow/poliwhirl.pic" +PoliwhirlPicFront:: INCBIN "gfx/pokemon/front/poliwhirl.pic" PoliwhirlPicBack:: INCBIN "gfx/pokemon/back/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "gfx/pokemon/front_yellow/poliwrath.pic" +PoliwrathPicFront:: INCBIN "gfx/pokemon/front/poliwrath.pic" PoliwrathPicBack:: INCBIN "gfx/pokemon/back/poliwrathb.pic" -WeedlePicFront:: INCBIN "gfx/pokemon/front_yellow/weedle.pic" +WeedlePicFront:: INCBIN "gfx/pokemon/front/weedle.pic" WeedlePicBack:: INCBIN "gfx/pokemon/back/weedleb.pic" -KakunaPicFront:: INCBIN "gfx/pokemon/front_yellow/kakuna.pic" +KakunaPicFront:: INCBIN "gfx/pokemon/front/kakuna.pic" KakunaPicBack:: INCBIN "gfx/pokemon/back/kakunab.pic" -BeedrillPicFront:: INCBIN "gfx/pokemon/front_yellow/beedrill.pic" +BeedrillPicFront:: INCBIN "gfx/pokemon/front/beedrill.pic" BeedrillPicBack:: INCBIN "gfx/pokemon/back/beedrillb.pic" -FossilKabutopsPic:: INCBIN "gfx/pokemon/front_yellow/fossilkabutops.pic" +FossilKabutopsPic:: INCBIN "gfx/pokemon/front/fossilkabutops.pic" SECTION "Pics 4", ROMX -DodrioPicFront:: INCBIN "gfx/pokemon/front_yellow/dodrio.pic" +DodrioPicFront:: INCBIN "gfx/pokemon/front/dodrio.pic" DodrioPicBack:: INCBIN "gfx/pokemon/back/dodriob.pic" -PrimeapePicFront:: INCBIN "gfx/pokemon/front_yellow/primeape.pic" +PrimeapePicFront:: INCBIN "gfx/pokemon/front/primeape.pic" PrimeapePicBack:: INCBIN "gfx/pokemon/back/primeapeb.pic" -DugtrioPicFront:: INCBIN "gfx/pokemon/front_yellow/dugtrio.pic" +DugtrioPicFront:: INCBIN "gfx/pokemon/front/dugtrio.pic" DugtrioPicBack:: INCBIN "gfx/pokemon/back/dugtriob.pic" -VenomothPicFront:: INCBIN "gfx/pokemon/front_yellow/venomoth.pic" +VenomothPicFront:: INCBIN "gfx/pokemon/front/venomoth.pic" VenomothPicBack:: INCBIN "gfx/pokemon/back/venomothb.pic" -DewgongPicFront:: INCBIN "gfx/pokemon/front_yellow/dewgong.pic" +DewgongPicFront:: INCBIN "gfx/pokemon/front/dewgong.pic" DewgongPicBack:: INCBIN "gfx/pokemon/back/dewgongb.pic" -CaterpiePicFront:: INCBIN "gfx/pokemon/front_yellow/caterpie.pic" +CaterpiePicFront:: INCBIN "gfx/pokemon/front/caterpie.pic" CaterpiePicBack:: INCBIN "gfx/pokemon/back/caterpieb.pic" -MetapodPicFront:: INCBIN "gfx/pokemon/front_yellow/metapod.pic" +MetapodPicFront:: INCBIN "gfx/pokemon/front/metapod.pic" MetapodPicBack:: INCBIN "gfx/pokemon/back/metapodb.pic" -ButterfreePicFront:: INCBIN "gfx/pokemon/front_yellow/butterfree.pic" +ButterfreePicFront:: INCBIN "gfx/pokemon/front/butterfree.pic" ButterfreePicBack:: INCBIN "gfx/pokemon/back/butterfreeb.pic" -MachampPicFront:: INCBIN "gfx/pokemon/front_yellow/machamp.pic" +MachampPicFront:: INCBIN "gfx/pokemon/front/machamp.pic" MachampPicBack:: INCBIN "gfx/pokemon/back/machampb.pic" -GolduckPicFront:: INCBIN "gfx/pokemon/front_yellow/golduck.pic" +GolduckPicFront:: INCBIN "gfx/pokemon/front/golduck.pic" GolduckPicBack:: INCBIN "gfx/pokemon/back/golduckb.pic" -HypnoPicFront:: INCBIN "gfx/pokemon/front_yellow/hypno.pic" +HypnoPicFront:: INCBIN "gfx/pokemon/front/hypno.pic" HypnoPicBack:: INCBIN "gfx/pokemon/back/hypnob.pic" -GolbatPicFront:: INCBIN "gfx/pokemon/front_yellow/golbat.pic" +GolbatPicFront:: INCBIN "gfx/pokemon/front/golbat.pic" GolbatPicBack:: INCBIN "gfx/pokemon/back/golbatb.pic" -MewtwoPicFront:: INCBIN "gfx/pokemon/front_yellow/mewtwo.pic" +MewtwoPicFront:: INCBIN "gfx/pokemon/front/mewtwo.pic" MewtwoPicBack:: INCBIN "gfx/pokemon/back/mewtwob.pic" -SnorlaxPicFront:: INCBIN "gfx/pokemon/front_yellow/snorlax.pic" +SnorlaxPicFront:: INCBIN "gfx/pokemon/front/snorlax.pic" SnorlaxPicBack:: INCBIN "gfx/pokemon/back/snorlaxb.pic" -MagikarpPicFront:: INCBIN "gfx/pokemon/front_yellow/magikarp.pic" +MagikarpPicFront:: INCBIN "gfx/pokemon/front/magikarp.pic" MagikarpPicBack:: INCBIN "gfx/pokemon/back/magikarpb.pic" -MukPicFront:: INCBIN "gfx/pokemon/front_yellow/muk.pic" +MukPicFront:: INCBIN "gfx/pokemon/front/muk.pic" MukPicBack:: INCBIN "gfx/pokemon/back/mukb.pic" -KinglerPicFront:: INCBIN "gfx/pokemon/front_yellow/kingler.pic" +KinglerPicFront:: INCBIN "gfx/pokemon/front/kingler.pic" KinglerPicBack:: INCBIN "gfx/pokemon/back/kinglerb.pic" -CloysterPicFront:: INCBIN "gfx/pokemon/front_yellow/cloyster.pic" +CloysterPicFront:: INCBIN "gfx/pokemon/front/cloyster.pic" CloysterPicBack:: INCBIN "gfx/pokemon/back/cloysterb.pic" -ElectrodePicFront:: INCBIN "gfx/pokemon/front_yellow/electrode.pic" +ElectrodePicFront:: INCBIN "gfx/pokemon/front/electrode.pic" ElectrodePicBack:: INCBIN "gfx/pokemon/back/electrodeb.pic" -ClefablePicFront:: INCBIN "gfx/pokemon/front_yellow/clefable.pic" +ClefablePicFront:: INCBIN "gfx/pokemon/front/clefable.pic" ClefablePicBack:: INCBIN "gfx/pokemon/back/clefableb.pic" -WeezingPicFront:: INCBIN "gfx/pokemon/front_yellow/weezing.pic" +WeezingPicFront:: INCBIN "gfx/pokemon/front/weezing.pic" WeezingPicBack:: INCBIN "gfx/pokemon/back/weezingb.pic" -PersianPicFront:: INCBIN "gfx/pokemon/front_yellow/persian.pic" +PersianPicFront:: INCBIN "gfx/pokemon/front/persian.pic" PersianPicBack:: INCBIN "gfx/pokemon/back/persianb.pic" -MarowakPicFront:: INCBIN "gfx/pokemon/front_yellow/marowak.pic" +MarowakPicFront:: INCBIN "gfx/pokemon/front/marowak.pic" MarowakPicBack:: INCBIN "gfx/pokemon/back/marowakb.pic" -HaunterPicFront:: INCBIN "gfx/pokemon/front_yellow/haunter.pic" +HaunterPicFront:: INCBIN "gfx/pokemon/front/haunter.pic" HaunterPicBack:: INCBIN "gfx/pokemon/back/haunterb.pic" -AbraPicFront:: INCBIN "gfx/pokemon/front_yellow/abra.pic" +AbraPicFront:: INCBIN "gfx/pokemon/front/abra.pic" AbraPicBack:: INCBIN "gfx/pokemon/back/abrab.pic" -AlakazamPicFront:: INCBIN "gfx/pokemon/front_yellow/alakazam.pic" +AlakazamPicFront:: INCBIN "gfx/pokemon/front/alakazam.pic" AlakazamPicBack:: INCBIN "gfx/pokemon/back/alakazamb.pic" -PidgeottoPicFront:: INCBIN "gfx/pokemon/front_yellow/pidgeotto.pic" +PidgeottoPicFront:: INCBIN "gfx/pokemon/front/pidgeotto.pic" PidgeottoPicBack:: INCBIN "gfx/pokemon/back/pidgeottob.pic" -PidgeotPicFront:: INCBIN "gfx/pokemon/front_yellow/pidgeot.pic" +PidgeotPicFront:: INCBIN "gfx/pokemon/front/pidgeot.pic" PidgeotPicBack:: INCBIN "gfx/pokemon/back/pidgeotb.pic" -StarmiePicFront:: INCBIN "gfx/pokemon/front_yellow/starmie.pic" +StarmiePicFront:: INCBIN "gfx/pokemon/front/starmie.pic" StarmiePicBack:: INCBIN "gfx/pokemon/back/starmieb.pic" SECTION "Pics 5", ROMX -BulbasaurPicFront:: INCBIN "gfx/pokemon/front_yellow/bulbasaur.pic" +BulbasaurPicFront:: INCBIN "gfx/pokemon/front/bulbasaur.pic" BulbasaurPicBack:: INCBIN "gfx/pokemon/back/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "gfx/pokemon/front_yellow/venusaur.pic" +VenusaurPicFront:: INCBIN "gfx/pokemon/front/venusaur.pic" VenusaurPicBack:: INCBIN "gfx/pokemon/back/venusaurb.pic" -TentacruelPicFront:: INCBIN "gfx/pokemon/front_yellow/tentacruel.pic" +TentacruelPicFront:: INCBIN "gfx/pokemon/front/tentacruel.pic" TentacruelPicBack:: INCBIN "gfx/pokemon/back/tentacruelb.pic" -GoldeenPicFront:: INCBIN "gfx/pokemon/front_yellow/goldeen.pic" +GoldeenPicFront:: INCBIN "gfx/pokemon/front/goldeen.pic" GoldeenPicBack:: INCBIN "gfx/pokemon/back/goldeenb.pic" -SeakingPicFront:: INCBIN "gfx/pokemon/front_yellow/seaking.pic" +SeakingPicFront:: INCBIN "gfx/pokemon/front/seaking.pic" SeakingPicBack:: INCBIN "gfx/pokemon/back/seakingb.pic" -PonytaPicFront:: INCBIN "gfx/pokemon/front_yellow/ponyta.pic" -RapidashPicFront:: INCBIN "gfx/pokemon/front_yellow/rapidash.pic" +PonytaPicFront:: INCBIN "gfx/pokemon/front/ponyta.pic" +RapidashPicFront:: INCBIN "gfx/pokemon/front/rapidash.pic" PonytaPicBack:: INCBIN "gfx/pokemon/back/ponytab.pic" RapidashPicBack:: INCBIN "gfx/pokemon/back/rapidashb.pic" -RattataPicFront:: INCBIN "gfx/pokemon/front_yellow/rattata.pic" +RattataPicFront:: INCBIN "gfx/pokemon/front/rattata.pic" RattataPicBack:: INCBIN "gfx/pokemon/back/rattatab.pic" -RaticatePicFront:: INCBIN "gfx/pokemon/front_yellow/raticate.pic" +RaticatePicFront:: INCBIN "gfx/pokemon/front/raticate.pic" RaticatePicBack:: INCBIN "gfx/pokemon/back/raticateb.pic" -NidorinoPicFront:: INCBIN "gfx/pokemon/front_yellow/nidorino.pic" +NidorinoPicFront:: INCBIN "gfx/pokemon/front/nidorino.pic" NidorinoPicBack:: INCBIN "gfx/pokemon/back/nidorinob.pic" -NidorinaPicFront:: INCBIN "gfx/pokemon/front_yellow/nidorina.pic" +NidorinaPicFront:: INCBIN "gfx/pokemon/front/nidorina.pic" NidorinaPicBack:: INCBIN "gfx/pokemon/back/nidorinab.pic" -GeodudePicFront:: INCBIN "gfx/pokemon/front_yellow/geodude.pic" +GeodudePicFront:: INCBIN "gfx/pokemon/front/geodude.pic" GeodudePicBack:: INCBIN "gfx/pokemon/back/geodudeb.pic" -PorygonPicFront:: INCBIN "gfx/pokemon/front_yellow/porygon.pic" +PorygonPicFront:: INCBIN "gfx/pokemon/front/porygon.pic" PorygonPicBack:: INCBIN "gfx/pokemon/back/porygonb.pic" -AerodactylPicFront:: INCBIN "gfx/pokemon/front_yellow/aerodactyl.pic" +AerodactylPicFront:: INCBIN "gfx/pokemon/front/aerodactyl.pic" AerodactylPicBack:: INCBIN "gfx/pokemon/back/aerodactylb.pic" -MagnemitePicFront:: INCBIN "gfx/pokemon/front_yellow/magnemite.pic" +MagnemitePicFront:: INCBIN "gfx/pokemon/front/magnemite.pic" MagnemitePicBack:: INCBIN "gfx/pokemon/back/magnemiteb.pic" -CharmanderPicFront:: INCBIN "gfx/pokemon/front_yellow/charmander.pic" +CharmanderPicFront:: INCBIN "gfx/pokemon/front/charmander.pic" CharmanderPicBack:: INCBIN "gfx/pokemon/back/charmanderb.pic" -SquirtlePicFront:: INCBIN "gfx/pokemon/front_yellow/squirtle.pic" +SquirtlePicFront:: INCBIN "gfx/pokemon/front/squirtle.pic" SquirtlePicBack:: INCBIN "gfx/pokemon/back/squirtleb.pic" -CharmeleonPicFront:: INCBIN "gfx/pokemon/front_yellow/charmeleon.pic" +CharmeleonPicFront:: INCBIN "gfx/pokemon/front/charmeleon.pic" CharmeleonPicBack:: INCBIN "gfx/pokemon/back/charmeleonb.pic" -WartortlePicFront:: INCBIN "gfx/pokemon/front_yellow/wartortle.pic" +WartortlePicFront:: INCBIN "gfx/pokemon/front/wartortle.pic" WartortlePicBack:: INCBIN "gfx/pokemon/back/wartortleb.pic" -CharizardPicFront:: INCBIN "gfx/pokemon/front_yellow/charizard.pic" +CharizardPicFront:: INCBIN "gfx/pokemon/front/charizard.pic" CharizardPicBack:: INCBIN "gfx/pokemon/back/charizardb.pic" -FossilAerodactylPic:: INCBIN "gfx/pokemon/front_yellow/fossilaerodactyl.pic" +FossilAerodactylPic:: INCBIN "gfx/pokemon/front/fossilaerodactyl.pic" GhostPic:: INCBIN "gfx/battle/ghost.pic" -OddishPicFront:: INCBIN "gfx/pokemon/front_yellow/oddish.pic" +OddishPicFront:: INCBIN "gfx/pokemon/front/oddish.pic" OddishPicBack:: INCBIN "gfx/pokemon/back/oddishb.pic" -GloomPicFront:: INCBIN "gfx/pokemon/front_yellow/gloom.pic" +GloomPicFront:: INCBIN "gfx/pokemon/front/gloom.pic" GloomPicBack:: INCBIN "gfx/pokemon/back/gloomb.pic" -VileplumePicFront:: INCBIN "gfx/pokemon/front_yellow/vileplume.pic" +VileplumePicFront:: INCBIN "gfx/pokemon/front/vileplume.pic" VileplumePicBack:: INCBIN "gfx/pokemon/back/vileplumeb.pic" -BellsproutPicFront:: INCBIN "gfx/pokemon/front_yellow/bellsprout.pic" +BellsproutPicFront:: INCBIN "gfx/pokemon/front/bellsprout.pic" BellsproutPicBack:: INCBIN "gfx/pokemon/back/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "gfx/pokemon/front_yellow/weepinbell.pic" +WeepinbellPicFront:: INCBIN "gfx/pokemon/front/weepinbell.pic" WeepinbellPicBack:: INCBIN "gfx/pokemon/back/weepinbellb.pic" -VictreebelPicFront:: INCBIN "gfx/pokemon/front_yellow/victreebel.pic" +VictreebelPicFront:: INCBIN "gfx/pokemon/front/victreebel.pic" VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" @@ -350,7 +350,7 @@ JugglerPic:: INCBIN "gfx/trainers/juggler.pic" TamerPic:: INCBIN "gfx/trainers/tamer.pic" BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic" BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic" -Rival1Pic:: INCBIN "gfx/trainers/yellow/rival1.pic" +Rival1Pic:: INCBIN "gfx/trainers/rival1.pic" ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" ChiefPic:: ScientistPic:: INCBIN "gfx/trainers/scientist.pic" @@ -359,25 +359,25 @@ RocketPic:: INCBIN "gfx/trainers/rocket.pic" CooltrainerMPic:: INCBIN "gfx/trainers/cooltrainerm.pic" CooltrainerFPic:: INCBIN "gfx/trainers/cooltrainerf.pic" BrunoPic:: INCBIN "gfx/trainers/bruno.pic" -BrockPic:: INCBIN "gfx/trainers/yellow/brock.pic" -MistyPic:: INCBIN "gfx/trainers/yellow/misty.pic" +BrockPic:: INCBIN "gfx/trainers/brock.pic" +MistyPic:: INCBIN "gfx/trainers/misty.pic" LtSurgePic:: INCBIN "gfx/trainers/lt.surge.pic" -ErikaPic:: INCBIN "gfx/trainers/yellow/erika.pic" +ErikaPic:: INCBIN "gfx/trainers/erika.pic" KogaPic:: INCBIN "gfx/trainers/koga.pic" BlainePic:: INCBIN "gfx/trainers/blaine.pic" SabrinaPic:: INCBIN "gfx/trainers/sabrina.pic" GentlemanPic:: INCBIN "gfx/trainers/gentleman.pic" -Rival2Pic:: INCBIN "gfx/trainers/yellow/rival2.pic" -Rival3Pic:: INCBIN "gfx/trainers/yellow/rival3.pic" +Rival2Pic:: INCBIN "gfx/trainers/rival2.pic" +Rival3Pic:: INCBIN "gfx/trainers/rival3.pic" LoreleiPic:: INCBIN "gfx/trainers/lorelei.pic" ChannelerPic:: INCBIN "gfx/trainers/channeler.pic" AgathaPic:: INCBIN "gfx/trainers/agatha.pic" LancePic:: INCBIN "gfx/trainers/lance.pic" -JessieJamesPic:: INCBIN "gfx/trainers/yellow/jessiejames.pic" +JessieJamesPic:: INCBIN "gfx/trainers/jessiejames.pic" SECTION "Pics 7", ROMX RedPicBack:: INCBIN "gfx/player/redb.pic" -OldManPic:: INCBIN "gfx/battle/oldman.pic" +OldManPicBack:: INCBIN "gfx/battle/oldmanb.pic" ProfOakPicBack:: INCBIN "gfx/battle/prof.oakb.pic" diff --git a/gfx/player.asm b/gfx/player.asm index 20eb48b4..188daaf2 100644 --- a/gfx/player.asm +++ b/gfx/player.asm @@ -1,3 +1,3 @@ -RedPicFront:: INCBIN "gfx/player/yellow/red.pic" +RedPicFront:: INCBIN "gfx/player/red.pic" ShrinkPic1:: INCBIN "gfx/player/shrink1.pic" ShrinkPic2:: INCBIN "gfx/player/shrink2.pic" diff --git a/gfx/player/red.png b/gfx/player/red.png Binary files differindex 9098fc76..dff68167 100644 --- a/gfx/player/red.png +++ b/gfx/player/red.png diff --git a/gfx/player/yellow/red.png b/gfx/player/yellow/red.png Binary files differdeleted file mode 100644 index dff68167..00000000 --- a/gfx/player/yellow/red.png +++ /dev/null diff --git a/gfx/pokemon/front/abra.png b/gfx/pokemon/front/abra.png Binary files differindex 12045ee3..3573a040 100644 --- a/gfx/pokemon/front/abra.png +++ b/gfx/pokemon/front/abra.png diff --git a/gfx/pokemon/front/aerodactyl.png b/gfx/pokemon/front/aerodactyl.png Binary files differindex 4cbfdeeb..cf0212a0 100644 --- a/gfx/pokemon/front/aerodactyl.png +++ b/gfx/pokemon/front/aerodactyl.png diff --git a/gfx/pokemon/front/alakazam.png b/gfx/pokemon/front/alakazam.png Binary files differindex 9c379b6a..613ae5ad 100644 --- a/gfx/pokemon/front/alakazam.png +++ b/gfx/pokemon/front/alakazam.png diff --git a/gfx/pokemon/front/arbok.png b/gfx/pokemon/front/arbok.png Binary files differindex bd8da001..45df87b1 100644 --- a/gfx/pokemon/front/arbok.png +++ b/gfx/pokemon/front/arbok.png diff --git a/gfx/pokemon/front/arcanine.png b/gfx/pokemon/front/arcanine.png Binary files differindex 5d25961d..77bb89b0 100644 --- a/gfx/pokemon/front/arcanine.png +++ b/gfx/pokemon/front/arcanine.png diff --git a/gfx/pokemon/front/articuno.png b/gfx/pokemon/front/articuno.png Binary files differindex 66986add..e8ae875e 100644 --- a/gfx/pokemon/front/articuno.png +++ b/gfx/pokemon/front/articuno.png diff --git a/gfx/pokemon/front/beedrill.png b/gfx/pokemon/front/beedrill.png Binary files differindex 36b4a06f..bc9ca73d 100644 --- a/gfx/pokemon/front/beedrill.png +++ b/gfx/pokemon/front/beedrill.png diff --git a/gfx/pokemon/front/bellsprout.png b/gfx/pokemon/front/bellsprout.png Binary files differindex e4fc5e18..f3d2ff1c 100644 --- a/gfx/pokemon/front/bellsprout.png +++ b/gfx/pokemon/front/bellsprout.png diff --git a/gfx/pokemon/front/blastoise.png b/gfx/pokemon/front/blastoise.png Binary files differindex 2192b43a..6cdd8e30 100644 --- a/gfx/pokemon/front/blastoise.png +++ b/gfx/pokemon/front/blastoise.png diff --git a/gfx/pokemon/front/bulbasaur.png b/gfx/pokemon/front/bulbasaur.png Binary files differindex a2a924c7..27abe273 100644 --- a/gfx/pokemon/front/bulbasaur.png +++ b/gfx/pokemon/front/bulbasaur.png diff --git a/gfx/pokemon/front/butterfree.png b/gfx/pokemon/front/butterfree.png Binary files differindex 8f1a69aa..951ae4c4 100644 --- a/gfx/pokemon/front/butterfree.png +++ b/gfx/pokemon/front/butterfree.png diff --git a/gfx/pokemon/front/caterpie.png b/gfx/pokemon/front/caterpie.png Binary files differindex 8e1a49dd..8e3205c9 100644 --- a/gfx/pokemon/front/caterpie.png +++ b/gfx/pokemon/front/caterpie.png diff --git a/gfx/pokemon/front/chansey.png b/gfx/pokemon/front/chansey.png Binary files differindex 832ba27c..d517535a 100644 --- a/gfx/pokemon/front/chansey.png +++ b/gfx/pokemon/front/chansey.png diff --git a/gfx/pokemon/front/charizard.png b/gfx/pokemon/front/charizard.png Binary files differindex ad29e489..100416d4 100644 --- a/gfx/pokemon/front/charizard.png +++ b/gfx/pokemon/front/charizard.png diff --git a/gfx/pokemon/front/charmander.png b/gfx/pokemon/front/charmander.png Binary files differindex 12d16f01..155a68a4 100644 --- a/gfx/pokemon/front/charmander.png +++ b/gfx/pokemon/front/charmander.png diff --git a/gfx/pokemon/front/charmeleon.png b/gfx/pokemon/front/charmeleon.png Binary files differindex a5cff72f..63808b25 100644 --- a/gfx/pokemon/front/charmeleon.png +++ b/gfx/pokemon/front/charmeleon.png diff --git a/gfx/pokemon/front/clefable.png b/gfx/pokemon/front/clefable.png Binary files differindex 2fcfac0a..8e5111f9 100644 --- a/gfx/pokemon/front/clefable.png +++ b/gfx/pokemon/front/clefable.png diff --git a/gfx/pokemon/front/clefairy.png b/gfx/pokemon/front/clefairy.png Binary files differindex 5a7f3721..4a26be0b 100644 --- a/gfx/pokemon/front/clefairy.png +++ b/gfx/pokemon/front/clefairy.png diff --git a/gfx/pokemon/front/cloyster.png b/gfx/pokemon/front/cloyster.png Binary files differindex 71f63a7f..67542d93 100644 --- a/gfx/pokemon/front/cloyster.png +++ b/gfx/pokemon/front/cloyster.png diff --git a/gfx/pokemon/front/cubone.png b/gfx/pokemon/front/cubone.png Binary files differindex 23e3a23a..c5dec329 100644 --- a/gfx/pokemon/front/cubone.png +++ b/gfx/pokemon/front/cubone.png diff --git a/gfx/pokemon/front/dewgong.png b/gfx/pokemon/front/dewgong.png Binary files differindex aac4e65c..c7bb5424 100644 --- a/gfx/pokemon/front/dewgong.png +++ b/gfx/pokemon/front/dewgong.png diff --git a/gfx/pokemon/front/diglett.png b/gfx/pokemon/front/diglett.png Binary files differindex f92ae5bc..a9becda8 100644 --- a/gfx/pokemon/front/diglett.png +++ b/gfx/pokemon/front/diglett.png diff --git a/gfx/pokemon/front/ditto.png b/gfx/pokemon/front/ditto.png Binary files differindex 4485e6ec..3c662491 100644 --- a/gfx/pokemon/front/ditto.png +++ b/gfx/pokemon/front/ditto.png diff --git a/gfx/pokemon/front/dodrio.png b/gfx/pokemon/front/dodrio.png Binary files differindex 92e6839d..45606e63 100644 --- a/gfx/pokemon/front/dodrio.png +++ b/gfx/pokemon/front/dodrio.png diff --git a/gfx/pokemon/front/doduo.png b/gfx/pokemon/front/doduo.png Binary files differindex 20cba7ba..0aa722c0 100644 --- a/gfx/pokemon/front/doduo.png +++ b/gfx/pokemon/front/doduo.png diff --git a/gfx/pokemon/front/dragonair.png b/gfx/pokemon/front/dragonair.png Binary files differindex 55d1ef5b..e7fc1448 100644 --- a/gfx/pokemon/front/dragonair.png +++ b/gfx/pokemon/front/dragonair.png diff --git a/gfx/pokemon/front/dragonite.png b/gfx/pokemon/front/dragonite.png Binary files differindex 4c387c3e..7ac78924 100644 --- a/gfx/pokemon/front/dragonite.png +++ b/gfx/pokemon/front/dragonite.png diff --git a/gfx/pokemon/front/dratini.png b/gfx/pokemon/front/dratini.png Binary files differindex 9df332e4..5a1a880f 100644 --- a/gfx/pokemon/front/dratini.png +++ b/gfx/pokemon/front/dratini.png diff --git a/gfx/pokemon/front/drowzee.png b/gfx/pokemon/front/drowzee.png Binary files differindex cc85510b..16d3edfc 100644 --- a/gfx/pokemon/front/drowzee.png +++ b/gfx/pokemon/front/drowzee.png diff --git a/gfx/pokemon/front/dugtrio.png b/gfx/pokemon/front/dugtrio.png Binary files differindex 433f95ef..c20d01b6 100644 --- a/gfx/pokemon/front/dugtrio.png +++ b/gfx/pokemon/front/dugtrio.png diff --git a/gfx/pokemon/front/eevee.png b/gfx/pokemon/front/eevee.png Binary files differindex 956f8ce0..7bc62ae9 100644 --- a/gfx/pokemon/front/eevee.png +++ b/gfx/pokemon/front/eevee.png diff --git a/gfx/pokemon/front/ekans.png b/gfx/pokemon/front/ekans.png Binary files differindex 6dffaf84..1d454a13 100644 --- a/gfx/pokemon/front/ekans.png +++ b/gfx/pokemon/front/ekans.png diff --git a/gfx/pokemon/front/electabuzz.png b/gfx/pokemon/front/electabuzz.png Binary files differindex 0ddccbe1..77647d26 100644 --- a/gfx/pokemon/front/electabuzz.png +++ b/gfx/pokemon/front/electabuzz.png diff --git a/gfx/pokemon/front/electrode.png b/gfx/pokemon/front/electrode.png Binary files differindex 8df79e6a..f5e05464 100644..100755 --- a/gfx/pokemon/front/electrode.png +++ b/gfx/pokemon/front/electrode.png diff --git a/gfx/pokemon/front/exeggcute.png b/gfx/pokemon/front/exeggcute.png Binary files differindex 0ddf8e32..901e2244 100644 --- a/gfx/pokemon/front/exeggcute.png +++ b/gfx/pokemon/front/exeggcute.png diff --git a/gfx/pokemon/front/exeggutor.png b/gfx/pokemon/front/exeggutor.png Binary files differindex 89ccbdc4..3e8d37cb 100644 --- a/gfx/pokemon/front/exeggutor.png +++ b/gfx/pokemon/front/exeggutor.png diff --git a/gfx/pokemon/front/farfetchd.png b/gfx/pokemon/front/farfetchd.png Binary files differindex 490e2b7c..8412e767 100644 --- a/gfx/pokemon/front/farfetchd.png +++ b/gfx/pokemon/front/farfetchd.png diff --git a/gfx/pokemon/front/fearow.png b/gfx/pokemon/front/fearow.png Binary files differindex c2c65257..7b54a854 100644 --- a/gfx/pokemon/front/fearow.png +++ b/gfx/pokemon/front/fearow.png diff --git a/gfx/pokemon/front/flareon.png b/gfx/pokemon/front/flareon.png Binary files differindex eadebd27..5b0e5376 100644 --- a/gfx/pokemon/front/flareon.png +++ b/gfx/pokemon/front/flareon.png diff --git a/gfx/pokemon/front/gastly.png b/gfx/pokemon/front/gastly.png Binary files differindex 081b121d..9d236e5a 100644 --- a/gfx/pokemon/front/gastly.png +++ b/gfx/pokemon/front/gastly.png diff --git a/gfx/pokemon/front/gengar.png b/gfx/pokemon/front/gengar.png Binary files differindex 450662d7..1993bcfc 100644 --- a/gfx/pokemon/front/gengar.png +++ b/gfx/pokemon/front/gengar.png diff --git a/gfx/pokemon/front/geodude.png b/gfx/pokemon/front/geodude.png Binary files differindex 4202192a..c28db680 100644 --- a/gfx/pokemon/front/geodude.png +++ b/gfx/pokemon/front/geodude.png diff --git a/gfx/pokemon/front/gloom.png b/gfx/pokemon/front/gloom.png Binary files differindex c2ea9ba4..6071ea5d 100644 --- a/gfx/pokemon/front/gloom.png +++ b/gfx/pokemon/front/gloom.png diff --git a/gfx/pokemon/front/golbat.png b/gfx/pokemon/front/golbat.png Binary files differindex 6abc6f0a..7d2b17da 100644 --- a/gfx/pokemon/front/golbat.png +++ b/gfx/pokemon/front/golbat.png diff --git a/gfx/pokemon/front/goldeen.png b/gfx/pokemon/front/goldeen.png Binary files differindex e8cbfddc..c6bbeae5 100644 --- a/gfx/pokemon/front/goldeen.png +++ b/gfx/pokemon/front/goldeen.png diff --git a/gfx/pokemon/front/golduck.png b/gfx/pokemon/front/golduck.png Binary files differindex 5448f7c8..299b6300 100644 --- a/gfx/pokemon/front/golduck.png +++ b/gfx/pokemon/front/golduck.png diff --git a/gfx/pokemon/front/golem.png b/gfx/pokemon/front/golem.png Binary files differindex 1dba6a67..7d317b7d 100644 --- a/gfx/pokemon/front/golem.png +++ b/gfx/pokemon/front/golem.png diff --git a/gfx/pokemon/front/graveler.png b/gfx/pokemon/front/graveler.png Binary files differindex 0d9da672..26d4b0a1 100644 --- a/gfx/pokemon/front/graveler.png +++ b/gfx/pokemon/front/graveler.png diff --git a/gfx/pokemon/front/grimer.png b/gfx/pokemon/front/grimer.png Binary files differindex 255b10b9..a72c9e45 100644 --- a/gfx/pokemon/front/grimer.png +++ b/gfx/pokemon/front/grimer.png diff --git a/gfx/pokemon/front/growlithe.png b/gfx/pokemon/front/growlithe.png Binary files differindex b753bce7..e75173cf 100644 --- a/gfx/pokemon/front/growlithe.png +++ b/gfx/pokemon/front/growlithe.png diff --git a/gfx/pokemon/front/gyarados.png b/gfx/pokemon/front/gyarados.png Binary files differindex a7ed0c17..387c2725 100644 --- a/gfx/pokemon/front/gyarados.png +++ b/gfx/pokemon/front/gyarados.png diff --git a/gfx/pokemon/front/haunter.png b/gfx/pokemon/front/haunter.png Binary files differindex 4d6c758d..d7f96e3d 100644 --- a/gfx/pokemon/front/haunter.png +++ b/gfx/pokemon/front/haunter.png diff --git a/gfx/pokemon/front/hitmonchan.png b/gfx/pokemon/front/hitmonchan.png Binary files differindex d8a6ffd3..2fb7122b 100644 --- a/gfx/pokemon/front/hitmonchan.png +++ b/gfx/pokemon/front/hitmonchan.png diff --git a/gfx/pokemon/front/hitmonlee.png b/gfx/pokemon/front/hitmonlee.png Binary files differindex 36042c68..acbe68ff 100644 --- a/gfx/pokemon/front/hitmonlee.png +++ b/gfx/pokemon/front/hitmonlee.png diff --git a/gfx/pokemon/front/horsea.png b/gfx/pokemon/front/horsea.png Binary files differindex cd28df8c..390c419d 100644 --- a/gfx/pokemon/front/horsea.png +++ b/gfx/pokemon/front/horsea.png diff --git a/gfx/pokemon/front/hypno.png b/gfx/pokemon/front/hypno.png Binary files differindex e7434ea4..ed100f66 100644 --- a/gfx/pokemon/front/hypno.png +++ b/gfx/pokemon/front/hypno.png diff --git a/gfx/pokemon/front/ivysaur.png b/gfx/pokemon/front/ivysaur.png Binary files differindex dad10ae0..4da5664b 100644 --- a/gfx/pokemon/front/ivysaur.png +++ b/gfx/pokemon/front/ivysaur.png diff --git a/gfx/pokemon/front/jigglypuff.png b/gfx/pokemon/front/jigglypuff.png Binary files differindex a5475777..d11ec165 100644 --- a/gfx/pokemon/front/jigglypuff.png +++ b/gfx/pokemon/front/jigglypuff.png diff --git a/gfx/pokemon/front/jolteon.png b/gfx/pokemon/front/jolteon.png Binary files differindex 7ecd6fbb..a1942ec6 100644 --- a/gfx/pokemon/front/jolteon.png +++ b/gfx/pokemon/front/jolteon.png diff --git a/gfx/pokemon/front/jynx.png b/gfx/pokemon/front/jynx.png Binary files differindex 583bd5da..699ab3f5 100644 --- a/gfx/pokemon/front/jynx.png +++ b/gfx/pokemon/front/jynx.png diff --git a/gfx/pokemon/front/kabuto.png b/gfx/pokemon/front/kabuto.png Binary files differindex e8e44e15..58f27e0f 100644 --- a/gfx/pokemon/front/kabuto.png +++ b/gfx/pokemon/front/kabuto.png diff --git a/gfx/pokemon/front/kabutops.png b/gfx/pokemon/front/kabutops.png Binary files differindex 39fcb900..e898ca12 100644 --- a/gfx/pokemon/front/kabutops.png +++ b/gfx/pokemon/front/kabutops.png diff --git a/gfx/pokemon/front/kadabra.png b/gfx/pokemon/front/kadabra.png Binary files differindex 36589440..58aff19a 100644 --- a/gfx/pokemon/front/kadabra.png +++ b/gfx/pokemon/front/kadabra.png diff --git a/gfx/pokemon/front/kakuna.png b/gfx/pokemon/front/kakuna.png Binary files differindex ee350ffd..fb4ec863 100644 --- a/gfx/pokemon/front/kakuna.png +++ b/gfx/pokemon/front/kakuna.png diff --git a/gfx/pokemon/front/kangaskhan.png b/gfx/pokemon/front/kangaskhan.png Binary files differindex 1c0ba99c..56ab2619 100644 --- a/gfx/pokemon/front/kangaskhan.png +++ b/gfx/pokemon/front/kangaskhan.png diff --git a/gfx/pokemon/front/kingler.png b/gfx/pokemon/front/kingler.png Binary files differindex b2bd7418..c7610d11 100644 --- a/gfx/pokemon/front/kingler.png +++ b/gfx/pokemon/front/kingler.png diff --git a/gfx/pokemon/front/koffing.png b/gfx/pokemon/front/koffing.png Binary files differindex 36961502..9d394cdc 100644 --- a/gfx/pokemon/front/koffing.png +++ b/gfx/pokemon/front/koffing.png diff --git a/gfx/pokemon/front/krabby.png b/gfx/pokemon/front/krabby.png Binary files differindex b280e8db..fe463732 100644 --- a/gfx/pokemon/front/krabby.png +++ b/gfx/pokemon/front/krabby.png diff --git a/gfx/pokemon/front/lapras.png b/gfx/pokemon/front/lapras.png Binary files differindex 822c00e9..ee954079 100644 --- a/gfx/pokemon/front/lapras.png +++ b/gfx/pokemon/front/lapras.png diff --git a/gfx/pokemon/front/lickitung.png b/gfx/pokemon/front/lickitung.png Binary files differindex 050f7d23..3b480655 100644 --- a/gfx/pokemon/front/lickitung.png +++ b/gfx/pokemon/front/lickitung.png diff --git a/gfx/pokemon/front/machamp.png b/gfx/pokemon/front/machamp.png Binary files differindex c854a2cf..f2bf5a0b 100644 --- a/gfx/pokemon/front/machamp.png +++ b/gfx/pokemon/front/machamp.png diff --git a/gfx/pokemon/front/machoke.png b/gfx/pokemon/front/machoke.png Binary files differindex 317dad96..7079a52b 100644 --- a/gfx/pokemon/front/machoke.png +++ b/gfx/pokemon/front/machoke.png diff --git a/gfx/pokemon/front/machop.png b/gfx/pokemon/front/machop.png Binary files differindex 63909c11..cd6d6891 100644 --- a/gfx/pokemon/front/machop.png +++ b/gfx/pokemon/front/machop.png diff --git a/gfx/pokemon/front/magikarp.png b/gfx/pokemon/front/magikarp.png Binary files differindex e71402f8..881aa50a 100644 --- a/gfx/pokemon/front/magikarp.png +++ b/gfx/pokemon/front/magikarp.png diff --git a/gfx/pokemon/front/magmar.png b/gfx/pokemon/front/magmar.png Binary files differindex 9bc1d929..839fa204 100644 --- a/gfx/pokemon/front/magmar.png +++ b/gfx/pokemon/front/magmar.png diff --git a/gfx/pokemon/front/magnemite.png b/gfx/pokemon/front/magnemite.png Binary files differindex f2254bed..4cb5e3da 100644 --- a/gfx/pokemon/front/magnemite.png +++ b/gfx/pokemon/front/magnemite.png diff --git a/gfx/pokemon/front/magneton.png b/gfx/pokemon/front/magneton.png Binary files differindex 4d0f2cc7..5d2a3eaa 100644 --- a/gfx/pokemon/front/magneton.png +++ b/gfx/pokemon/front/magneton.png diff --git a/gfx/pokemon/front/mankey.png b/gfx/pokemon/front/mankey.png Binary files differindex 303ce1f2..f3266f29 100644 --- a/gfx/pokemon/front/mankey.png +++ b/gfx/pokemon/front/mankey.png diff --git a/gfx/pokemon/front/marowak.png b/gfx/pokemon/front/marowak.png Binary files differindex b2d18437..d90e4627 100644 --- a/gfx/pokemon/front/marowak.png +++ b/gfx/pokemon/front/marowak.png diff --git a/gfx/pokemon/front/meowth.png b/gfx/pokemon/front/meowth.png Binary files differindex 0e706c35..de82b0c2 100644 --- a/gfx/pokemon/front/meowth.png +++ b/gfx/pokemon/front/meowth.png diff --git a/gfx/pokemon/front/metapod.png b/gfx/pokemon/front/metapod.png Binary files differindex cbfa6e1e..6268ed9a 100644 --- a/gfx/pokemon/front/metapod.png +++ b/gfx/pokemon/front/metapod.png diff --git a/gfx/pokemon/front/mew.png b/gfx/pokemon/front/mew.png Binary files differindex 7e25a96d..a00783a9 100644 --- a/gfx/pokemon/front/mew.png +++ b/gfx/pokemon/front/mew.png diff --git a/gfx/pokemon/front/mewtwo.png b/gfx/pokemon/front/mewtwo.png Binary files differindex b7a31296..40c6f217 100644 --- a/gfx/pokemon/front/mewtwo.png +++ b/gfx/pokemon/front/mewtwo.png diff --git a/gfx/pokemon/front/moltres.png b/gfx/pokemon/front/moltres.png Binary files differindex 7c153998..e5e3d02e 100644 --- a/gfx/pokemon/front/moltres.png +++ b/gfx/pokemon/front/moltres.png diff --git a/gfx/pokemon/front/mr.mime.png b/gfx/pokemon/front/mr.mime.png Binary files differindex d9085ec6..5a3642d3 100644 --- a/gfx/pokemon/front/mr.mime.png +++ b/gfx/pokemon/front/mr.mime.png diff --git a/gfx/pokemon/front/muk.png b/gfx/pokemon/front/muk.png Binary files differindex f69b83b7..d7d98e37 100644 --- a/gfx/pokemon/front/muk.png +++ b/gfx/pokemon/front/muk.png diff --git a/gfx/pokemon/front/nidoking.png b/gfx/pokemon/front/nidoking.png Binary files differindex 24330538..785adc67 100644 --- a/gfx/pokemon/front/nidoking.png +++ b/gfx/pokemon/front/nidoking.png diff --git a/gfx/pokemon/front/nidoqueen.png b/gfx/pokemon/front/nidoqueen.png Binary files differindex c0043e1b..24f786c7 100644 --- a/gfx/pokemon/front/nidoqueen.png +++ b/gfx/pokemon/front/nidoqueen.png diff --git a/gfx/pokemon/front/nidoranf.png b/gfx/pokemon/front/nidoranf.png Binary files differindex 6b58b274..1f6532d2 100644 --- a/gfx/pokemon/front/nidoranf.png +++ b/gfx/pokemon/front/nidoranf.png diff --git a/gfx/pokemon/front/nidoranm.png b/gfx/pokemon/front/nidoranm.png Binary files differindex 92d0cb49..bb960e01 100644 --- a/gfx/pokemon/front/nidoranm.png +++ b/gfx/pokemon/front/nidoranm.png diff --git a/gfx/pokemon/front/nidorina.png b/gfx/pokemon/front/nidorina.png Binary files differindex 68aca7c4..76edf719 100644 --- a/gfx/pokemon/front/nidorina.png +++ b/gfx/pokemon/front/nidorina.png diff --git a/gfx/pokemon/front/nidorino.png b/gfx/pokemon/front/nidorino.png Binary files differindex 795bf0c5..c68dbdd1 100644 --- a/gfx/pokemon/front/nidorino.png +++ b/gfx/pokemon/front/nidorino.png diff --git a/gfx/pokemon/front/ninetales.png b/gfx/pokemon/front/ninetales.png Binary files differindex ed6bb398..f7ff9ff6 100644 --- a/gfx/pokemon/front/ninetales.png +++ b/gfx/pokemon/front/ninetales.png diff --git a/gfx/pokemon/front/oddish.png b/gfx/pokemon/front/oddish.png Binary files differindex e47dabe1..17281e3b 100644 --- a/gfx/pokemon/front/oddish.png +++ b/gfx/pokemon/front/oddish.png diff --git a/gfx/pokemon/front/omanyte.png b/gfx/pokemon/front/omanyte.png Binary files differindex bdfa5440..eafbd593 100644 --- a/gfx/pokemon/front/omanyte.png +++ b/gfx/pokemon/front/omanyte.png diff --git a/gfx/pokemon/front/omastar.png b/gfx/pokemon/front/omastar.png Binary files differindex 3221d3d8..2eb40d37 100644 --- a/gfx/pokemon/front/omastar.png +++ b/gfx/pokemon/front/omastar.png diff --git a/gfx/pokemon/front/onix.png b/gfx/pokemon/front/onix.png Binary files differindex 44a21a61..1e49634f 100644 --- a/gfx/pokemon/front/onix.png +++ b/gfx/pokemon/front/onix.png diff --git a/gfx/pokemon/front/paras.png b/gfx/pokemon/front/paras.png Binary files differindex f4909bbd..73c805c8 100644 --- a/gfx/pokemon/front/paras.png +++ b/gfx/pokemon/front/paras.png diff --git a/gfx/pokemon/front/parasect.png b/gfx/pokemon/front/parasect.png Binary files differindex 938bf53b..def9e493 100644 --- a/gfx/pokemon/front/parasect.png +++ b/gfx/pokemon/front/parasect.png diff --git a/gfx/pokemon/front/persian.png b/gfx/pokemon/front/persian.png Binary files differindex cc15677a..831a9da8 100644 --- a/gfx/pokemon/front/persian.png +++ b/gfx/pokemon/front/persian.png diff --git a/gfx/pokemon/front/pidgeot.png b/gfx/pokemon/front/pidgeot.png Binary files differindex 7daf609f..4bb98422 100644 --- a/gfx/pokemon/front/pidgeot.png +++ b/gfx/pokemon/front/pidgeot.png diff --git a/gfx/pokemon/front/pidgeotto.png b/gfx/pokemon/front/pidgeotto.png Binary files differindex c86b86f1..0490003c 100644 --- a/gfx/pokemon/front/pidgeotto.png +++ b/gfx/pokemon/front/pidgeotto.png diff --git a/gfx/pokemon/front/pidgey.png b/gfx/pokemon/front/pidgey.png Binary files differindex 70d9dd4a..fe507e6d 100644 --- a/gfx/pokemon/front/pidgey.png +++ b/gfx/pokemon/front/pidgey.png diff --git a/gfx/pokemon/front/pikachu.png b/gfx/pokemon/front/pikachu.png Binary files differindex 159e47e9..4fc61c87 100644 --- a/gfx/pokemon/front/pikachu.png +++ b/gfx/pokemon/front/pikachu.png diff --git a/gfx/pokemon/front/pinsir.png b/gfx/pokemon/front/pinsir.png Binary files differindex 320c79cb..0f8d8639 100644 --- a/gfx/pokemon/front/pinsir.png +++ b/gfx/pokemon/front/pinsir.png diff --git a/gfx/pokemon/front/poliwag.png b/gfx/pokemon/front/poliwag.png Binary files differindex 397d2e66..1c19fd1c 100644 --- a/gfx/pokemon/front/poliwag.png +++ b/gfx/pokemon/front/poliwag.png diff --git a/gfx/pokemon/front/poliwhirl.png b/gfx/pokemon/front/poliwhirl.png Binary files differindex a7039145..f56f75df 100644 --- a/gfx/pokemon/front/poliwhirl.png +++ b/gfx/pokemon/front/poliwhirl.png diff --git a/gfx/pokemon/front/poliwrath.png b/gfx/pokemon/front/poliwrath.png Binary files differindex f31d0680..20fe9e6c 100644 --- a/gfx/pokemon/front/poliwrath.png +++ b/gfx/pokemon/front/poliwrath.png diff --git a/gfx/pokemon/front/ponyta.png b/gfx/pokemon/front/ponyta.png Binary files differindex 4d8c1bee..b4ec63b2 100644 --- a/gfx/pokemon/front/ponyta.png +++ b/gfx/pokemon/front/ponyta.png diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png Binary files differindex ba3500c6..f991dd6e 100644 --- a/gfx/pokemon/front/porygon.png +++ b/gfx/pokemon/front/porygon.png diff --git a/gfx/pokemon/front/primeape.png b/gfx/pokemon/front/primeape.png Binary files differindex 7c5a1a09..a14234f5 100644 --- a/gfx/pokemon/front/primeape.png +++ b/gfx/pokemon/front/primeape.png diff --git a/gfx/pokemon/front/psyduck.png b/gfx/pokemon/front/psyduck.png Binary files differindex 86772256..75cd2f17 100644 --- a/gfx/pokemon/front/psyduck.png +++ b/gfx/pokemon/front/psyduck.png diff --git a/gfx/pokemon/front/raichu.png b/gfx/pokemon/front/raichu.png Binary files differindex a29731e5..1ef39dc9 100644 --- a/gfx/pokemon/front/raichu.png +++ b/gfx/pokemon/front/raichu.png diff --git a/gfx/pokemon/front/rapidash.png b/gfx/pokemon/front/rapidash.png Binary files differindex 62d47506..804e7829 100644 --- a/gfx/pokemon/front/rapidash.png +++ b/gfx/pokemon/front/rapidash.png diff --git a/gfx/pokemon/front/raticate.png b/gfx/pokemon/front/raticate.png Binary files differindex 64340846..95018e0b 100644 --- a/gfx/pokemon/front/raticate.png +++ b/gfx/pokemon/front/raticate.png diff --git a/gfx/pokemon/front/rattata.png b/gfx/pokemon/front/rattata.png Binary files differindex 9b391cca..423299bb 100644 --- a/gfx/pokemon/front/rattata.png +++ b/gfx/pokemon/front/rattata.png diff --git a/gfx/pokemon/front/rhydon.png b/gfx/pokemon/front/rhydon.png Binary files differindex 92406476..6d75e4be 100644 --- a/gfx/pokemon/front/rhydon.png +++ b/gfx/pokemon/front/rhydon.png diff --git a/gfx/pokemon/front/rhyhorn.png b/gfx/pokemon/front/rhyhorn.png Binary files differindex 9452b701..dcf9dd6a 100644 --- a/gfx/pokemon/front/rhyhorn.png +++ b/gfx/pokemon/front/rhyhorn.png diff --git a/gfx/pokemon/front/sandshrew.png b/gfx/pokemon/front/sandshrew.png Binary files differindex bcf52215..010908fd 100644 --- a/gfx/pokemon/front/sandshrew.png +++ b/gfx/pokemon/front/sandshrew.png diff --git a/gfx/pokemon/front/sandslash.png b/gfx/pokemon/front/sandslash.png Binary files differindex 3b212a60..d37a8de1 100644 --- a/gfx/pokemon/front/sandslash.png +++ b/gfx/pokemon/front/sandslash.png diff --git a/gfx/pokemon/front/scyther.png b/gfx/pokemon/front/scyther.png Binary files differindex 3fe6eeae..51663342 100644 --- a/gfx/pokemon/front/scyther.png +++ b/gfx/pokemon/front/scyther.png diff --git a/gfx/pokemon/front/seadra.png b/gfx/pokemon/front/seadra.png Binary files differindex e8af292f..150416dc 100644 --- a/gfx/pokemon/front/seadra.png +++ b/gfx/pokemon/front/seadra.png diff --git a/gfx/pokemon/front/seaking.png b/gfx/pokemon/front/seaking.png Binary files differindex ebe70c7e..75060461 100644 --- a/gfx/pokemon/front/seaking.png +++ b/gfx/pokemon/front/seaking.png diff --git a/gfx/pokemon/front/seel.png b/gfx/pokemon/front/seel.png Binary files differindex c4b2315a..ef3574b0 100644 --- a/gfx/pokemon/front/seel.png +++ b/gfx/pokemon/front/seel.png diff --git a/gfx/pokemon/front/shellder.png b/gfx/pokemon/front/shellder.png Binary files differindex cf44a7fe..d7ddfa48 100644 --- a/gfx/pokemon/front/shellder.png +++ b/gfx/pokemon/front/shellder.png diff --git a/gfx/pokemon/front/slowbro.png b/gfx/pokemon/front/slowbro.png Binary files differindex e61ad34b..e506c9ec 100644 --- a/gfx/pokemon/front/slowbro.png +++ b/gfx/pokemon/front/slowbro.png diff --git a/gfx/pokemon/front/slowpoke.png b/gfx/pokemon/front/slowpoke.png Binary files differindex fdf701d7..1328f4a0 100644 --- a/gfx/pokemon/front/slowpoke.png +++ b/gfx/pokemon/front/slowpoke.png diff --git a/gfx/pokemon/front/snorlax.png b/gfx/pokemon/front/snorlax.png Binary files differindex 5b571a18..00c78d27 100644 --- a/gfx/pokemon/front/snorlax.png +++ b/gfx/pokemon/front/snorlax.png diff --git a/gfx/pokemon/front/spearow.png b/gfx/pokemon/front/spearow.png Binary files differindex 835800a5..d9349987 100644 --- a/gfx/pokemon/front/spearow.png +++ b/gfx/pokemon/front/spearow.png diff --git a/gfx/pokemon/front/squirtle.png b/gfx/pokemon/front/squirtle.png Binary files differindex bc0c9979..db7aa6c7 100644 --- a/gfx/pokemon/front/squirtle.png +++ b/gfx/pokemon/front/squirtle.png diff --git a/gfx/pokemon/front/starmie.png b/gfx/pokemon/front/starmie.png Binary files differindex 24025ddf..2ed93b4d 100644 --- a/gfx/pokemon/front/starmie.png +++ b/gfx/pokemon/front/starmie.png diff --git a/gfx/pokemon/front/staryu.png b/gfx/pokemon/front/staryu.png Binary files differindex 394732e9..320fb6a6 100644 --- a/gfx/pokemon/front/staryu.png +++ b/gfx/pokemon/front/staryu.png diff --git a/gfx/pokemon/front/tangela.png b/gfx/pokemon/front/tangela.png Binary files differindex eff9c5a5..43d04726 100644 --- a/gfx/pokemon/front/tangela.png +++ b/gfx/pokemon/front/tangela.png diff --git a/gfx/pokemon/front/tauros.png b/gfx/pokemon/front/tauros.png Binary files differindex 3a4edfee..8086fd13 100644 --- a/gfx/pokemon/front/tauros.png +++ b/gfx/pokemon/front/tauros.png diff --git a/gfx/pokemon/front/tentacool.png b/gfx/pokemon/front/tentacool.png Binary files differindex 534e5496..88d7fde3 100644 --- a/gfx/pokemon/front/tentacool.png +++ b/gfx/pokemon/front/tentacool.png diff --git a/gfx/pokemon/front/tentacruel.png b/gfx/pokemon/front/tentacruel.png Binary files differindex 7a26a305..47383372 100644 --- a/gfx/pokemon/front/tentacruel.png +++ b/gfx/pokemon/front/tentacruel.png diff --git a/gfx/pokemon/front/vaporeon.png b/gfx/pokemon/front/vaporeon.png Binary files differindex 48dafce6..2c35af22 100644 --- a/gfx/pokemon/front/vaporeon.png +++ b/gfx/pokemon/front/vaporeon.png diff --git a/gfx/pokemon/front/venomoth.png b/gfx/pokemon/front/venomoth.png Binary files differindex e28b1017..9d801497 100644 --- a/gfx/pokemon/front/venomoth.png +++ b/gfx/pokemon/front/venomoth.png diff --git a/gfx/pokemon/front/venonat.png b/gfx/pokemon/front/venonat.png Binary files differindex edf15889..574ed26b 100644 --- a/gfx/pokemon/front/venonat.png +++ b/gfx/pokemon/front/venonat.png diff --git a/gfx/pokemon/front/venusaur.png b/gfx/pokemon/front/venusaur.png Binary files differindex dd39184a..f6a964e3 100644 --- a/gfx/pokemon/front/venusaur.png +++ b/gfx/pokemon/front/venusaur.png diff --git a/gfx/pokemon/front/victreebel.png b/gfx/pokemon/front/victreebel.png Binary files differindex 29a471c8..115c45a3 100644 --- a/gfx/pokemon/front/victreebel.png +++ b/gfx/pokemon/front/victreebel.png diff --git a/gfx/pokemon/front/vileplume.png b/gfx/pokemon/front/vileplume.png Binary files differindex e788425e..af4f0862 100644 --- a/gfx/pokemon/front/vileplume.png +++ b/gfx/pokemon/front/vileplume.png diff --git a/gfx/pokemon/front/voltorb.png b/gfx/pokemon/front/voltorb.png Binary files differindex 22d0c675..8b4bc64d 100644 --- a/gfx/pokemon/front/voltorb.png +++ b/gfx/pokemon/front/voltorb.png diff --git a/gfx/pokemon/front/vulpix.png b/gfx/pokemon/front/vulpix.png Binary files differindex f4780ef2..cef8fbd8 100644 --- a/gfx/pokemon/front/vulpix.png +++ b/gfx/pokemon/front/vulpix.png diff --git a/gfx/pokemon/front/wartortle.png b/gfx/pokemon/front/wartortle.png Binary files differindex bd844562..961aaf4f 100644 --- a/gfx/pokemon/front/wartortle.png +++ b/gfx/pokemon/front/wartortle.png diff --git a/gfx/pokemon/front/weedle.png b/gfx/pokemon/front/weedle.png Binary files differindex 445fe8f3..989b57b5 100644 --- a/gfx/pokemon/front/weedle.png +++ b/gfx/pokemon/front/weedle.png diff --git a/gfx/pokemon/front/weepinbell.png b/gfx/pokemon/front/weepinbell.png Binary files differindex 6ee57334..8dd8fc34 100644 --- a/gfx/pokemon/front/weepinbell.png +++ b/gfx/pokemon/front/weepinbell.png diff --git a/gfx/pokemon/front/weezing.png b/gfx/pokemon/front/weezing.png Binary files differindex deb2a623..445556b3 100644 --- a/gfx/pokemon/front/weezing.png +++ b/gfx/pokemon/front/weezing.png diff --git a/gfx/pokemon/front/wigglytuff.png b/gfx/pokemon/front/wigglytuff.png Binary files differindex c7cd495b..c9ae89ad 100644 --- a/gfx/pokemon/front/wigglytuff.png +++ b/gfx/pokemon/front/wigglytuff.png diff --git a/gfx/pokemon/front/zapdos.png b/gfx/pokemon/front/zapdos.png Binary files differindex 0bd71f4e..47b63d6a 100644 --- a/gfx/pokemon/front/zapdos.png +++ b/gfx/pokemon/front/zapdos.png diff --git a/gfx/pokemon/front/zubat.png b/gfx/pokemon/front/zubat.png Binary files differindex 73078725..86ac4710 100644 --- a/gfx/pokemon/front/zubat.png +++ b/gfx/pokemon/front/zubat.png diff --git a/gfx/pokemon/front_rg/abra.png b/gfx/pokemon/front_rg/abra.png Binary files differdeleted file mode 100644 index bc0cb24b..00000000 --- a/gfx/pokemon/front_rg/abra.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/aerodactyl.png b/gfx/pokemon/front_rg/aerodactyl.png Binary files differdeleted file mode 100644 index 89812b32..00000000 --- a/gfx/pokemon/front_rg/aerodactyl.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/alakazam.png b/gfx/pokemon/front_rg/alakazam.png Binary files differdeleted file mode 100644 index 3a8b32d1..00000000 --- a/gfx/pokemon/front_rg/alakazam.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/arbok.png b/gfx/pokemon/front_rg/arbok.png Binary files differdeleted file mode 100644 index dab294f5..00000000 --- a/gfx/pokemon/front_rg/arbok.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/arcanine.png b/gfx/pokemon/front_rg/arcanine.png Binary files differdeleted file mode 100644 index 0149138b..00000000 --- a/gfx/pokemon/front_rg/arcanine.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/articuno.png b/gfx/pokemon/front_rg/articuno.png Binary files differdeleted file mode 100644 index 99b6385d..00000000 --- a/gfx/pokemon/front_rg/articuno.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/beedrill.png b/gfx/pokemon/front_rg/beedrill.png Binary files differdeleted file mode 100644 index b6f31036..00000000 --- a/gfx/pokemon/front_rg/beedrill.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/bellsprout.png b/gfx/pokemon/front_rg/bellsprout.png Binary files differdeleted file mode 100644 index 380913d5..00000000 --- a/gfx/pokemon/front_rg/bellsprout.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/blastoise.png b/gfx/pokemon/front_rg/blastoise.png Binary files differdeleted file mode 100644 index 97bf497b..00000000 --- a/gfx/pokemon/front_rg/blastoise.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/bulbasaur.png b/gfx/pokemon/front_rg/bulbasaur.png Binary files differdeleted file mode 100644 index 1a4676a1..00000000 --- a/gfx/pokemon/front_rg/bulbasaur.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/butterfree.png b/gfx/pokemon/front_rg/butterfree.png Binary files differdeleted file mode 100644 index 0b3044d4..00000000 --- a/gfx/pokemon/front_rg/butterfree.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/caterpie.png b/gfx/pokemon/front_rg/caterpie.png Binary files differdeleted file mode 100644 index dca52b88..00000000 --- a/gfx/pokemon/front_rg/caterpie.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/chansey.png b/gfx/pokemon/front_rg/chansey.png Binary files differdeleted file mode 100644 index fa47540e..00000000 --- a/gfx/pokemon/front_rg/chansey.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/charizard.png b/gfx/pokemon/front_rg/charizard.png Binary files differdeleted file mode 100644 index a8b87e05..00000000 --- a/gfx/pokemon/front_rg/charizard.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/charmander.png b/gfx/pokemon/front_rg/charmander.png Binary files differdeleted file mode 100644 index 153f9381..00000000 --- a/gfx/pokemon/front_rg/charmander.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/charmeleon.png b/gfx/pokemon/front_rg/charmeleon.png Binary files differdeleted file mode 100644 index f60d1294..00000000 --- a/gfx/pokemon/front_rg/charmeleon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/clefable.png b/gfx/pokemon/front_rg/clefable.png Binary files differdeleted file mode 100644 index 8ef6be5f..00000000 --- a/gfx/pokemon/front_rg/clefable.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/clefairy.png b/gfx/pokemon/front_rg/clefairy.png Binary files differdeleted file mode 100644 index 632844d5..00000000 --- a/gfx/pokemon/front_rg/clefairy.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/cloyster.png b/gfx/pokemon/front_rg/cloyster.png Binary files differdeleted file mode 100644 index b6e16485..00000000 --- a/gfx/pokemon/front_rg/cloyster.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/cubone.png b/gfx/pokemon/front_rg/cubone.png Binary files differdeleted file mode 100644 index 1312b7c7..00000000 --- a/gfx/pokemon/front_rg/cubone.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dewgong.png b/gfx/pokemon/front_rg/dewgong.png Binary files differdeleted file mode 100644 index 823b7125..00000000 --- a/gfx/pokemon/front_rg/dewgong.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/diglett.png b/gfx/pokemon/front_rg/diglett.png Binary files differdeleted file mode 100644 index 69b93a90..00000000 --- a/gfx/pokemon/front_rg/diglett.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/ditto.png b/gfx/pokemon/front_rg/ditto.png Binary files differdeleted file mode 100644 index 1a38c474..00000000 --- a/gfx/pokemon/front_rg/ditto.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dodrio.png b/gfx/pokemon/front_rg/dodrio.png Binary files differdeleted file mode 100644 index c88fa388..00000000 --- a/gfx/pokemon/front_rg/dodrio.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/doduo.png b/gfx/pokemon/front_rg/doduo.png Binary files differdeleted file mode 100644 index c95aae73..00000000 --- a/gfx/pokemon/front_rg/doduo.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dragonair.png b/gfx/pokemon/front_rg/dragonair.png Binary files differdeleted file mode 100644 index fe097cfa..00000000 --- a/gfx/pokemon/front_rg/dragonair.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dragonite.png b/gfx/pokemon/front_rg/dragonite.png Binary files differdeleted file mode 100644 index 49474a4d..00000000 --- a/gfx/pokemon/front_rg/dragonite.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dratini.png b/gfx/pokemon/front_rg/dratini.png Binary files differdeleted file mode 100644 index 9c7e454d..00000000 --- a/gfx/pokemon/front_rg/dratini.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/drowzee.png b/gfx/pokemon/front_rg/drowzee.png Binary files differdeleted file mode 100644 index b8cdf0db..00000000 --- a/gfx/pokemon/front_rg/drowzee.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/dugtrio.png b/gfx/pokemon/front_rg/dugtrio.png Binary files differdeleted file mode 100644 index 1619ab92..00000000 --- a/gfx/pokemon/front_rg/dugtrio.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/eevee.png b/gfx/pokemon/front_rg/eevee.png Binary files differdeleted file mode 100644 index b8fcab5a..00000000 --- a/gfx/pokemon/front_rg/eevee.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/ekans.png b/gfx/pokemon/front_rg/ekans.png Binary files differdeleted file mode 100644 index cd43c69c..00000000 --- a/gfx/pokemon/front_rg/ekans.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/electabuzz.png b/gfx/pokemon/front_rg/electabuzz.png Binary files differdeleted file mode 100644 index 24791e64..00000000 --- a/gfx/pokemon/front_rg/electabuzz.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/electrode.png b/gfx/pokemon/front_rg/electrode.png Binary files differdeleted file mode 100644 index ff812003..00000000 --- a/gfx/pokemon/front_rg/electrode.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/exeggcute.png b/gfx/pokemon/front_rg/exeggcute.png Binary files differdeleted file mode 100644 index 63b55927..00000000 --- a/gfx/pokemon/front_rg/exeggcute.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/exeggutor.png b/gfx/pokemon/front_rg/exeggutor.png Binary files differdeleted file mode 100644 index dc1f7287..00000000 --- a/gfx/pokemon/front_rg/exeggutor.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/farfetchd.png b/gfx/pokemon/front_rg/farfetchd.png Binary files differdeleted file mode 100644 index bd97b9e8..00000000 --- a/gfx/pokemon/front_rg/farfetchd.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/fearow.png b/gfx/pokemon/front_rg/fearow.png Binary files differdeleted file mode 100644 index 93d7a847..00000000 --- a/gfx/pokemon/front_rg/fearow.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/flareon.png b/gfx/pokemon/front_rg/flareon.png Binary files differdeleted file mode 100644 index 7a39866a..00000000 --- a/gfx/pokemon/front_rg/flareon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/fossilaerodactyl.png b/gfx/pokemon/front_rg/fossilaerodactyl.png Binary files differdeleted file mode 100644 index 27d5c3ac..00000000 --- a/gfx/pokemon/front_rg/fossilaerodactyl.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/fossilkabutops.png b/gfx/pokemon/front_rg/fossilkabutops.png Binary files differdeleted file mode 100644 index d37edb02..00000000 --- a/gfx/pokemon/front_rg/fossilkabutops.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/gastly.png b/gfx/pokemon/front_rg/gastly.png Binary files differdeleted file mode 100644 index a5c0f406..00000000 --- a/gfx/pokemon/front_rg/gastly.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/gengar.png b/gfx/pokemon/front_rg/gengar.png Binary files differdeleted file mode 100644 index cb31fecf..00000000 --- a/gfx/pokemon/front_rg/gengar.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/geodude.png b/gfx/pokemon/front_rg/geodude.png Binary files differdeleted file mode 100644 index 02b690e9..00000000 --- a/gfx/pokemon/front_rg/geodude.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/gloom.png b/gfx/pokemon/front_rg/gloom.png Binary files differdeleted file mode 100644 index c2fd2aa7..00000000 --- a/gfx/pokemon/front_rg/gloom.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/golbat.png b/gfx/pokemon/front_rg/golbat.png Binary files differdeleted file mode 100644 index 1fb2a341..00000000 --- a/gfx/pokemon/front_rg/golbat.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/goldeen.png b/gfx/pokemon/front_rg/goldeen.png Binary files differdeleted file mode 100644 index bee7de2a..00000000 --- a/gfx/pokemon/front_rg/goldeen.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/golduck.png b/gfx/pokemon/front_rg/golduck.png Binary files differdeleted file mode 100644 index a0827b54..00000000 --- a/gfx/pokemon/front_rg/golduck.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/golem.png b/gfx/pokemon/front_rg/golem.png Binary files differdeleted file mode 100644 index 86ea3c68..00000000 --- a/gfx/pokemon/front_rg/golem.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/graveler.png b/gfx/pokemon/front_rg/graveler.png Binary files differdeleted file mode 100644 index 5e876f0b..00000000 --- a/gfx/pokemon/front_rg/graveler.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/grimer.png b/gfx/pokemon/front_rg/grimer.png Binary files differdeleted file mode 100644 index cc6931fb..00000000 --- a/gfx/pokemon/front_rg/grimer.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/growlithe.png b/gfx/pokemon/front_rg/growlithe.png Binary files differdeleted file mode 100644 index 1aafd535..00000000 --- a/gfx/pokemon/front_rg/growlithe.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/gyarados.png b/gfx/pokemon/front_rg/gyarados.png Binary files differdeleted file mode 100644 index 4d25aabb..00000000 --- a/gfx/pokemon/front_rg/gyarados.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/haunter.png b/gfx/pokemon/front_rg/haunter.png Binary files differdeleted file mode 100644 index 531c8a62..00000000 --- a/gfx/pokemon/front_rg/haunter.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/hitmonchan.png b/gfx/pokemon/front_rg/hitmonchan.png Binary files differdeleted file mode 100644 index 1774dd18..00000000 --- a/gfx/pokemon/front_rg/hitmonchan.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/hitmonlee.png b/gfx/pokemon/front_rg/hitmonlee.png Binary files differdeleted file mode 100644 index 04ca9be3..00000000 --- a/gfx/pokemon/front_rg/hitmonlee.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/horsea.png b/gfx/pokemon/front_rg/horsea.png Binary files differdeleted file mode 100644 index 0d11d78c..00000000 --- a/gfx/pokemon/front_rg/horsea.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/hypno.png b/gfx/pokemon/front_rg/hypno.png Binary files differdeleted file mode 100644 index f29559c2..00000000 --- a/gfx/pokemon/front_rg/hypno.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/ivysaur.png b/gfx/pokemon/front_rg/ivysaur.png Binary files differdeleted file mode 100644 index 337bc27d..00000000 --- a/gfx/pokemon/front_rg/ivysaur.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/jigglypuff.png b/gfx/pokemon/front_rg/jigglypuff.png Binary files differdeleted file mode 100644 index 607c429e..00000000 --- a/gfx/pokemon/front_rg/jigglypuff.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/jolteon.png b/gfx/pokemon/front_rg/jolteon.png Binary files differdeleted file mode 100644 index fab34a30..00000000 --- a/gfx/pokemon/front_rg/jolteon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/jynx.png b/gfx/pokemon/front_rg/jynx.png Binary files differdeleted file mode 100644 index 6966ce34..00000000 --- a/gfx/pokemon/front_rg/jynx.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kabuto.png b/gfx/pokemon/front_rg/kabuto.png Binary files differdeleted file mode 100644 index b8923ad7..00000000 --- a/gfx/pokemon/front_rg/kabuto.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kabutops.png b/gfx/pokemon/front_rg/kabutops.png Binary files differdeleted file mode 100644 index 0f33c4d0..00000000 --- a/gfx/pokemon/front_rg/kabutops.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kadabra.png b/gfx/pokemon/front_rg/kadabra.png Binary files differdeleted file mode 100644 index 8b8abc1a..00000000 --- a/gfx/pokemon/front_rg/kadabra.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kakuna.png b/gfx/pokemon/front_rg/kakuna.png Binary files differdeleted file mode 100644 index 0cc6eabf..00000000 --- a/gfx/pokemon/front_rg/kakuna.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kangaskhan.png b/gfx/pokemon/front_rg/kangaskhan.png Binary files differdeleted file mode 100644 index c9d3361d..00000000 --- a/gfx/pokemon/front_rg/kangaskhan.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/kingler.png b/gfx/pokemon/front_rg/kingler.png Binary files differdeleted file mode 100644 index c1302fbf..00000000 --- a/gfx/pokemon/front_rg/kingler.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/koffing.png b/gfx/pokemon/front_rg/koffing.png Binary files differdeleted file mode 100644 index e6dfee04..00000000 --- a/gfx/pokemon/front_rg/koffing.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/krabby.png b/gfx/pokemon/front_rg/krabby.png Binary files differdeleted file mode 100644 index 2740128f..00000000 --- a/gfx/pokemon/front_rg/krabby.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/lapras.png b/gfx/pokemon/front_rg/lapras.png Binary files differdeleted file mode 100644 index b696b8d9..00000000 --- a/gfx/pokemon/front_rg/lapras.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/lickitung.png b/gfx/pokemon/front_rg/lickitung.png Binary files differdeleted file mode 100644 index 3deb9b12..00000000 --- a/gfx/pokemon/front_rg/lickitung.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/machamp.png b/gfx/pokemon/front_rg/machamp.png Binary files differdeleted file mode 100644 index a6f773a0..00000000 --- a/gfx/pokemon/front_rg/machamp.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/machoke.png b/gfx/pokemon/front_rg/machoke.png Binary files differdeleted file mode 100644 index ed637897..00000000 --- a/gfx/pokemon/front_rg/machoke.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/machop.png b/gfx/pokemon/front_rg/machop.png Binary files differdeleted file mode 100644 index a5e20532..00000000 --- a/gfx/pokemon/front_rg/machop.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/magikarp.png b/gfx/pokemon/front_rg/magikarp.png Binary files differdeleted file mode 100644 index 68bc4f8c..00000000 --- a/gfx/pokemon/front_rg/magikarp.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/magmar.png b/gfx/pokemon/front_rg/magmar.png Binary files differdeleted file mode 100644 index f12bd2f2..00000000 --- a/gfx/pokemon/front_rg/magmar.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/magnemite.png b/gfx/pokemon/front_rg/magnemite.png Binary files differdeleted file mode 100644 index fc807398..00000000 --- a/gfx/pokemon/front_rg/magnemite.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/magneton.png b/gfx/pokemon/front_rg/magneton.png Binary files differdeleted file mode 100644 index 51a3f12c..00000000 --- a/gfx/pokemon/front_rg/magneton.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/mankey.png b/gfx/pokemon/front_rg/mankey.png Binary files differdeleted file mode 100644 index 9ae43757..00000000 --- a/gfx/pokemon/front_rg/mankey.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/marowak.png b/gfx/pokemon/front_rg/marowak.png Binary files differdeleted file mode 100644 index 8ac6c6ee..00000000 --- a/gfx/pokemon/front_rg/marowak.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/meowth.png b/gfx/pokemon/front_rg/meowth.png Binary files differdeleted file mode 100644 index d00a08db..00000000 --- a/gfx/pokemon/front_rg/meowth.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/metapod.png b/gfx/pokemon/front_rg/metapod.png Binary files differdeleted file mode 100644 index 5d7514f4..00000000 --- a/gfx/pokemon/front_rg/metapod.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/mew.png b/gfx/pokemon/front_rg/mew.png Binary files differdeleted file mode 100644 index 0d9bef36..00000000 --- a/gfx/pokemon/front_rg/mew.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/mewtwo.png b/gfx/pokemon/front_rg/mewtwo.png Binary files differdeleted file mode 100644 index b41409ca..00000000 --- a/gfx/pokemon/front_rg/mewtwo.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/moltres.png b/gfx/pokemon/front_rg/moltres.png Binary files differdeleted file mode 100644 index 52259f4a..00000000 --- a/gfx/pokemon/front_rg/moltres.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/mr.mime.png b/gfx/pokemon/front_rg/mr.mime.png Binary files differdeleted file mode 100644 index 6dca1791..00000000 --- a/gfx/pokemon/front_rg/mr.mime.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/muk.png b/gfx/pokemon/front_rg/muk.png Binary files differdeleted file mode 100644 index 8816e939..00000000 --- a/gfx/pokemon/front_rg/muk.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidoking.png b/gfx/pokemon/front_rg/nidoking.png Binary files differdeleted file mode 100644 index c181e60c..00000000 --- a/gfx/pokemon/front_rg/nidoking.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidoqueen.png b/gfx/pokemon/front_rg/nidoqueen.png Binary files differdeleted file mode 100644 index 86cba6d6..00000000 --- a/gfx/pokemon/front_rg/nidoqueen.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidoranf.png b/gfx/pokemon/front_rg/nidoranf.png Binary files differdeleted file mode 100644 index 8d99c920..00000000 --- a/gfx/pokemon/front_rg/nidoranf.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidoranm.png b/gfx/pokemon/front_rg/nidoranm.png Binary files differdeleted file mode 100644 index 9a93e864..00000000 --- a/gfx/pokemon/front_rg/nidoranm.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidorina.png b/gfx/pokemon/front_rg/nidorina.png Binary files differdeleted file mode 100644 index a8d277b8..00000000 --- a/gfx/pokemon/front_rg/nidorina.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/nidorino.png b/gfx/pokemon/front_rg/nidorino.png Binary files differdeleted file mode 100644 index 4d6c9e55..00000000 --- a/gfx/pokemon/front_rg/nidorino.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/ninetales.png b/gfx/pokemon/front_rg/ninetales.png Binary files differdeleted file mode 100644 index 128e8e53..00000000 --- a/gfx/pokemon/front_rg/ninetales.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/oddish.png b/gfx/pokemon/front_rg/oddish.png Binary files differdeleted file mode 100644 index 55aa2d09..00000000 --- a/gfx/pokemon/front_rg/oddish.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/omanyte.png b/gfx/pokemon/front_rg/omanyte.png Binary files differdeleted file mode 100644 index d042710e..00000000 --- a/gfx/pokemon/front_rg/omanyte.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/omastar.png b/gfx/pokemon/front_rg/omastar.png Binary files differdeleted file mode 100644 index af84f55f..00000000 --- a/gfx/pokemon/front_rg/omastar.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/onix.png b/gfx/pokemon/front_rg/onix.png Binary files differdeleted file mode 100644 index 3b731ece..00000000 --- a/gfx/pokemon/front_rg/onix.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/paras.png b/gfx/pokemon/front_rg/paras.png Binary files differdeleted file mode 100644 index b8ee6517..00000000 --- a/gfx/pokemon/front_rg/paras.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/parasect.png b/gfx/pokemon/front_rg/parasect.png Binary files differdeleted file mode 100644 index 3d58b8e5..00000000 --- a/gfx/pokemon/front_rg/parasect.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/persian.png b/gfx/pokemon/front_rg/persian.png Binary files differdeleted file mode 100644 index aed4d6dc..00000000 --- a/gfx/pokemon/front_rg/persian.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/pidgeot.png b/gfx/pokemon/front_rg/pidgeot.png Binary files differdeleted file mode 100644 index 4b4aa72f..00000000 --- a/gfx/pokemon/front_rg/pidgeot.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/pidgeotto.png b/gfx/pokemon/front_rg/pidgeotto.png Binary files differdeleted file mode 100644 index 58a51f5d..00000000 --- a/gfx/pokemon/front_rg/pidgeotto.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/pidgey.png b/gfx/pokemon/front_rg/pidgey.png Binary files differdeleted file mode 100644 index 7636fb67..00000000 --- a/gfx/pokemon/front_rg/pidgey.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/pikachu.png b/gfx/pokemon/front_rg/pikachu.png Binary files differdeleted file mode 100644 index 5a3eb782..00000000 --- a/gfx/pokemon/front_rg/pikachu.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/pinsir.png b/gfx/pokemon/front_rg/pinsir.png Binary files differdeleted file mode 100644 index 2944c453..00000000 --- a/gfx/pokemon/front_rg/pinsir.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/poliwag.png b/gfx/pokemon/front_rg/poliwag.png Binary files differdeleted file mode 100644 index a1ad26c8..00000000 --- a/gfx/pokemon/front_rg/poliwag.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/poliwhirl.png b/gfx/pokemon/front_rg/poliwhirl.png Binary files differdeleted file mode 100644 index d18311d6..00000000 --- a/gfx/pokemon/front_rg/poliwhirl.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/poliwrath.png b/gfx/pokemon/front_rg/poliwrath.png Binary files differdeleted file mode 100644 index 49f07b96..00000000 --- a/gfx/pokemon/front_rg/poliwrath.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/ponyta.png b/gfx/pokemon/front_rg/ponyta.png Binary files differdeleted file mode 100644 index c3a67849..00000000 --- a/gfx/pokemon/front_rg/ponyta.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/porygon.png b/gfx/pokemon/front_rg/porygon.png Binary files differdeleted file mode 100644 index 1ed804ff..00000000 --- a/gfx/pokemon/front_rg/porygon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/primeape.png b/gfx/pokemon/front_rg/primeape.png Binary files differdeleted file mode 100644 index 42c03f6d..00000000 --- a/gfx/pokemon/front_rg/primeape.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/psyduck.png b/gfx/pokemon/front_rg/psyduck.png Binary files differdeleted file mode 100644 index cd0a5e9e..00000000 --- a/gfx/pokemon/front_rg/psyduck.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/raichu.png b/gfx/pokemon/front_rg/raichu.png Binary files differdeleted file mode 100644 index 961d2aeb..00000000 --- a/gfx/pokemon/front_rg/raichu.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/rapidash.png b/gfx/pokemon/front_rg/rapidash.png Binary files differdeleted file mode 100644 index d118b947..00000000 --- a/gfx/pokemon/front_rg/rapidash.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/raticate.png b/gfx/pokemon/front_rg/raticate.png Binary files differdeleted file mode 100644 index 895c1006..00000000 --- a/gfx/pokemon/front_rg/raticate.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/rattata.png b/gfx/pokemon/front_rg/rattata.png Binary files differdeleted file mode 100644 index 8d114876..00000000 --- a/gfx/pokemon/front_rg/rattata.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/rhydon.png b/gfx/pokemon/front_rg/rhydon.png Binary files differdeleted file mode 100644 index 772e64d8..00000000 --- a/gfx/pokemon/front_rg/rhydon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/rhyhorn.png b/gfx/pokemon/front_rg/rhyhorn.png Binary files differdeleted file mode 100644 index 1b968785..00000000 --- a/gfx/pokemon/front_rg/rhyhorn.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/sandshrew.png b/gfx/pokemon/front_rg/sandshrew.png Binary files differdeleted file mode 100644 index e078d6d3..00000000 --- a/gfx/pokemon/front_rg/sandshrew.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/sandslash.png b/gfx/pokemon/front_rg/sandslash.png Binary files differdeleted file mode 100644 index 55320b96..00000000 --- a/gfx/pokemon/front_rg/sandslash.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/scyther.png b/gfx/pokemon/front_rg/scyther.png Binary files differdeleted file mode 100644 index de4d89ed..00000000 --- a/gfx/pokemon/front_rg/scyther.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/seadra.png b/gfx/pokemon/front_rg/seadra.png Binary files differdeleted file mode 100644 index 17cdf4ea..00000000 --- a/gfx/pokemon/front_rg/seadra.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/seaking.png b/gfx/pokemon/front_rg/seaking.png Binary files differdeleted file mode 100644 index 184f0556..00000000 --- a/gfx/pokemon/front_rg/seaking.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/seel.png b/gfx/pokemon/front_rg/seel.png Binary files differdeleted file mode 100644 index cb2f7f2e..00000000 --- a/gfx/pokemon/front_rg/seel.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/shellder.png b/gfx/pokemon/front_rg/shellder.png Binary files differdeleted file mode 100644 index b7c41dd2..00000000 --- a/gfx/pokemon/front_rg/shellder.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/slowbro.png b/gfx/pokemon/front_rg/slowbro.png Binary files differdeleted file mode 100644 index b67bbc08..00000000 --- a/gfx/pokemon/front_rg/slowbro.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/slowpoke.png b/gfx/pokemon/front_rg/slowpoke.png Binary files differdeleted file mode 100644 index d59e9008..00000000 --- a/gfx/pokemon/front_rg/slowpoke.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/snorlax.png b/gfx/pokemon/front_rg/snorlax.png Binary files differdeleted file mode 100644 index c249327d..00000000 --- a/gfx/pokemon/front_rg/snorlax.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/spearow.png b/gfx/pokemon/front_rg/spearow.png Binary files differdeleted file mode 100644 index c1fce869..00000000 --- a/gfx/pokemon/front_rg/spearow.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/squirtle.png b/gfx/pokemon/front_rg/squirtle.png Binary files differdeleted file mode 100644 index 3139cddc..00000000 --- a/gfx/pokemon/front_rg/squirtle.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/starmie.png b/gfx/pokemon/front_rg/starmie.png Binary files differdeleted file mode 100644 index 395fd857..00000000 --- a/gfx/pokemon/front_rg/starmie.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/staryu.png b/gfx/pokemon/front_rg/staryu.png Binary files differdeleted file mode 100644 index 740089e8..00000000 --- a/gfx/pokemon/front_rg/staryu.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/tangela.png b/gfx/pokemon/front_rg/tangela.png Binary files differdeleted file mode 100644 index a6f6327c..00000000 --- a/gfx/pokemon/front_rg/tangela.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/tauros.png b/gfx/pokemon/front_rg/tauros.png Binary files differdeleted file mode 100644 index ae57f111..00000000 --- a/gfx/pokemon/front_rg/tauros.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/tentacool.png b/gfx/pokemon/front_rg/tentacool.png Binary files differdeleted file mode 100644 index 59a979c2..00000000 --- a/gfx/pokemon/front_rg/tentacool.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/tentacruel.png b/gfx/pokemon/front_rg/tentacruel.png Binary files differdeleted file mode 100644 index aaf4d426..00000000 --- a/gfx/pokemon/front_rg/tentacruel.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/vaporeon.png b/gfx/pokemon/front_rg/vaporeon.png Binary files differdeleted file mode 100644 index 72db05da..00000000 --- a/gfx/pokemon/front_rg/vaporeon.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/venomoth.png b/gfx/pokemon/front_rg/venomoth.png Binary files differdeleted file mode 100644 index e677255e..00000000 --- a/gfx/pokemon/front_rg/venomoth.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/venonat.png b/gfx/pokemon/front_rg/venonat.png Binary files differdeleted file mode 100644 index cf2f4df1..00000000 --- a/gfx/pokemon/front_rg/venonat.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/venusaur.png b/gfx/pokemon/front_rg/venusaur.png Binary files differdeleted file mode 100644 index f444a234..00000000 --- a/gfx/pokemon/front_rg/venusaur.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/victreebel.png b/gfx/pokemon/front_rg/victreebel.png Binary files differdeleted file mode 100644 index 62193011..00000000 --- a/gfx/pokemon/front_rg/victreebel.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/vileplume.png b/gfx/pokemon/front_rg/vileplume.png Binary files differdeleted file mode 100644 index e39d50e0..00000000 --- a/gfx/pokemon/front_rg/vileplume.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/voltorb.png b/gfx/pokemon/front_rg/voltorb.png Binary files differdeleted file mode 100644 index c2159e6c..00000000 --- a/gfx/pokemon/front_rg/voltorb.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/vulpix.png b/gfx/pokemon/front_rg/vulpix.png Binary files differdeleted file mode 100644 index 8b8810ad..00000000 --- a/gfx/pokemon/front_rg/vulpix.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/wartortle.png b/gfx/pokemon/front_rg/wartortle.png Binary files differdeleted file mode 100644 index 6e65bb7c..00000000 --- a/gfx/pokemon/front_rg/wartortle.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/weedle.png b/gfx/pokemon/front_rg/weedle.png Binary files differdeleted file mode 100644 index 3efbd49d..00000000 --- a/gfx/pokemon/front_rg/weedle.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/weepinbell.png b/gfx/pokemon/front_rg/weepinbell.png Binary files differdeleted file mode 100644 index 18b44783..00000000 --- a/gfx/pokemon/front_rg/weepinbell.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/weezing.png b/gfx/pokemon/front_rg/weezing.png Binary files differdeleted file mode 100644 index 5b30b4e0..00000000 --- a/gfx/pokemon/front_rg/weezing.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/wigglytuff.png b/gfx/pokemon/front_rg/wigglytuff.png Binary files differdeleted file mode 100644 index e986affd..00000000 --- a/gfx/pokemon/front_rg/wigglytuff.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/zapdos.png b/gfx/pokemon/front_rg/zapdos.png Binary files differdeleted file mode 100644 index 534ac4a9..00000000 --- a/gfx/pokemon/front_rg/zapdos.png +++ /dev/null diff --git a/gfx/pokemon/front_rg/zubat.png b/gfx/pokemon/front_rg/zubat.png Binary files differdeleted file mode 100644 index 14dc9118..00000000 --- a/gfx/pokemon/front_rg/zubat.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/abra.png b/gfx/pokemon/front_yellow/abra.png Binary files differdeleted file mode 100644 index 3573a040..00000000 --- a/gfx/pokemon/front_yellow/abra.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/aerodactyl.png b/gfx/pokemon/front_yellow/aerodactyl.png Binary files differdeleted file mode 100644 index cf0212a0..00000000 --- a/gfx/pokemon/front_yellow/aerodactyl.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/alakazam.png b/gfx/pokemon/front_yellow/alakazam.png Binary files differdeleted file mode 100644 index 613ae5ad..00000000 --- a/gfx/pokemon/front_yellow/alakazam.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/arbok.png b/gfx/pokemon/front_yellow/arbok.png Binary files differdeleted file mode 100644 index 45df87b1..00000000 --- a/gfx/pokemon/front_yellow/arbok.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/arcanine.png b/gfx/pokemon/front_yellow/arcanine.png Binary files differdeleted file mode 100644 index 77bb89b0..00000000 --- a/gfx/pokemon/front_yellow/arcanine.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/articuno.png b/gfx/pokemon/front_yellow/articuno.png Binary files differdeleted file mode 100644 index e8ae875e..00000000 --- a/gfx/pokemon/front_yellow/articuno.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/beedrill.png b/gfx/pokemon/front_yellow/beedrill.png Binary files differdeleted file mode 100644 index bc9ca73d..00000000 --- a/gfx/pokemon/front_yellow/beedrill.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/bellsprout.png b/gfx/pokemon/front_yellow/bellsprout.png Binary files differdeleted file mode 100644 index f3d2ff1c..00000000 --- a/gfx/pokemon/front_yellow/bellsprout.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/blastoise.png b/gfx/pokemon/front_yellow/blastoise.png Binary files differdeleted file mode 100644 index 6cdd8e30..00000000 --- a/gfx/pokemon/front_yellow/blastoise.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/bulbasaur.png b/gfx/pokemon/front_yellow/bulbasaur.png Binary files differdeleted file mode 100644 index 27abe273..00000000 --- a/gfx/pokemon/front_yellow/bulbasaur.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/butterfree.png b/gfx/pokemon/front_yellow/butterfree.png Binary files differdeleted file mode 100644 index 951ae4c4..00000000 --- a/gfx/pokemon/front_yellow/butterfree.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/caterpie.png b/gfx/pokemon/front_yellow/caterpie.png Binary files differdeleted file mode 100644 index 8e3205c9..00000000 --- a/gfx/pokemon/front_yellow/caterpie.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/chansey.png b/gfx/pokemon/front_yellow/chansey.png Binary files differdeleted file mode 100644 index d517535a..00000000 --- a/gfx/pokemon/front_yellow/chansey.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/charizard.png b/gfx/pokemon/front_yellow/charizard.png Binary files differdeleted file mode 100644 index 100416d4..00000000 --- a/gfx/pokemon/front_yellow/charizard.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/charmander.png b/gfx/pokemon/front_yellow/charmander.png Binary files differdeleted file mode 100644 index 155a68a4..00000000 --- a/gfx/pokemon/front_yellow/charmander.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/charmeleon.png b/gfx/pokemon/front_yellow/charmeleon.png Binary files differdeleted file mode 100644 index 63808b25..00000000 --- a/gfx/pokemon/front_yellow/charmeleon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/clefable.png b/gfx/pokemon/front_yellow/clefable.png Binary files differdeleted file mode 100644 index 8e5111f9..00000000 --- a/gfx/pokemon/front_yellow/clefable.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/clefairy.png b/gfx/pokemon/front_yellow/clefairy.png Binary files differdeleted file mode 100644 index 4a26be0b..00000000 --- a/gfx/pokemon/front_yellow/clefairy.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/cloyster.png b/gfx/pokemon/front_yellow/cloyster.png Binary files differdeleted file mode 100644 index 67542d93..00000000 --- a/gfx/pokemon/front_yellow/cloyster.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/cubone.png b/gfx/pokemon/front_yellow/cubone.png Binary files differdeleted file mode 100644 index c5dec329..00000000 --- a/gfx/pokemon/front_yellow/cubone.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dewgong.png b/gfx/pokemon/front_yellow/dewgong.png Binary files differdeleted file mode 100644 index c7bb5424..00000000 --- a/gfx/pokemon/front_yellow/dewgong.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/diglett.png b/gfx/pokemon/front_yellow/diglett.png Binary files differdeleted file mode 100644 index a9becda8..00000000 --- a/gfx/pokemon/front_yellow/diglett.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/ditto.png b/gfx/pokemon/front_yellow/ditto.png Binary files differdeleted file mode 100644 index 3c662491..00000000 --- a/gfx/pokemon/front_yellow/ditto.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dodrio.png b/gfx/pokemon/front_yellow/dodrio.png Binary files differdeleted file mode 100644 index 45606e63..00000000 --- a/gfx/pokemon/front_yellow/dodrio.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/doduo.png b/gfx/pokemon/front_yellow/doduo.png Binary files differdeleted file mode 100644 index 0aa722c0..00000000 --- a/gfx/pokemon/front_yellow/doduo.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dragonair.png b/gfx/pokemon/front_yellow/dragonair.png Binary files differdeleted file mode 100644 index e7fc1448..00000000 --- a/gfx/pokemon/front_yellow/dragonair.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dragonite.png b/gfx/pokemon/front_yellow/dragonite.png Binary files differdeleted file mode 100644 index 7ac78924..00000000 --- a/gfx/pokemon/front_yellow/dragonite.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dratini.png b/gfx/pokemon/front_yellow/dratini.png Binary files differdeleted file mode 100644 index 5a1a880f..00000000 --- a/gfx/pokemon/front_yellow/dratini.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/drowzee.png b/gfx/pokemon/front_yellow/drowzee.png Binary files differdeleted file mode 100644 index 16d3edfc..00000000 --- a/gfx/pokemon/front_yellow/drowzee.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/dugtrio.png b/gfx/pokemon/front_yellow/dugtrio.png Binary files differdeleted file mode 100644 index c20d01b6..00000000 --- a/gfx/pokemon/front_yellow/dugtrio.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/eevee.png b/gfx/pokemon/front_yellow/eevee.png Binary files differdeleted file mode 100644 index 7bc62ae9..00000000 --- a/gfx/pokemon/front_yellow/eevee.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/ekans.png b/gfx/pokemon/front_yellow/ekans.png Binary files differdeleted file mode 100644 index 1d454a13..00000000 --- a/gfx/pokemon/front_yellow/ekans.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/electabuzz.png b/gfx/pokemon/front_yellow/electabuzz.png Binary files differdeleted file mode 100644 index 77647d26..00000000 --- a/gfx/pokemon/front_yellow/electabuzz.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/electrode.png b/gfx/pokemon/front_yellow/electrode.png Binary files differdeleted file mode 100755 index f5e05464..00000000 --- a/gfx/pokemon/front_yellow/electrode.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/exeggcute.png b/gfx/pokemon/front_yellow/exeggcute.png Binary files differdeleted file mode 100644 index 901e2244..00000000 --- a/gfx/pokemon/front_yellow/exeggcute.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/exeggutor.png b/gfx/pokemon/front_yellow/exeggutor.png Binary files differdeleted file mode 100644 index 3e8d37cb..00000000 --- a/gfx/pokemon/front_yellow/exeggutor.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/farfetchd.png b/gfx/pokemon/front_yellow/farfetchd.png Binary files differdeleted file mode 100644 index 8412e767..00000000 --- a/gfx/pokemon/front_yellow/farfetchd.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/fearow.png b/gfx/pokemon/front_yellow/fearow.png Binary files differdeleted file mode 100644 index 7b54a854..00000000 --- a/gfx/pokemon/front_yellow/fearow.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/flareon.png b/gfx/pokemon/front_yellow/flareon.png Binary files differdeleted file mode 100644 index 5b0e5376..00000000 --- a/gfx/pokemon/front_yellow/flareon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/fossilaerodactyl.png b/gfx/pokemon/front_yellow/fossilaerodactyl.png Binary files differdeleted file mode 100644 index eb7fc3a3..00000000 --- a/gfx/pokemon/front_yellow/fossilaerodactyl.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/fossilkabutops.png b/gfx/pokemon/front_yellow/fossilkabutops.png Binary files differdeleted file mode 100644 index dd8d41ea..00000000 --- a/gfx/pokemon/front_yellow/fossilkabutops.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/gastly.png b/gfx/pokemon/front_yellow/gastly.png Binary files differdeleted file mode 100644 index 9d236e5a..00000000 --- a/gfx/pokemon/front_yellow/gastly.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/gengar.png b/gfx/pokemon/front_yellow/gengar.png Binary files differdeleted file mode 100644 index 1993bcfc..00000000 --- a/gfx/pokemon/front_yellow/gengar.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/geodude.png b/gfx/pokemon/front_yellow/geodude.png Binary files differdeleted file mode 100644 index c28db680..00000000 --- a/gfx/pokemon/front_yellow/geodude.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/gloom.png b/gfx/pokemon/front_yellow/gloom.png Binary files differdeleted file mode 100644 index 6071ea5d..00000000 --- a/gfx/pokemon/front_yellow/gloom.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/golbat.png b/gfx/pokemon/front_yellow/golbat.png Binary files differdeleted file mode 100644 index 7d2b17da..00000000 --- a/gfx/pokemon/front_yellow/golbat.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/goldeen.png b/gfx/pokemon/front_yellow/goldeen.png Binary files differdeleted file mode 100644 index c6bbeae5..00000000 --- a/gfx/pokemon/front_yellow/goldeen.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/golduck.png b/gfx/pokemon/front_yellow/golduck.png Binary files differdeleted file mode 100644 index 299b6300..00000000 --- a/gfx/pokemon/front_yellow/golduck.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/golem.png b/gfx/pokemon/front_yellow/golem.png Binary files differdeleted file mode 100644 index 7d317b7d..00000000 --- a/gfx/pokemon/front_yellow/golem.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/graveler.png b/gfx/pokemon/front_yellow/graveler.png Binary files differdeleted file mode 100644 index 26d4b0a1..00000000 --- a/gfx/pokemon/front_yellow/graveler.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/grimer.png b/gfx/pokemon/front_yellow/grimer.png Binary files differdeleted file mode 100644 index a72c9e45..00000000 --- a/gfx/pokemon/front_yellow/grimer.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/growlithe.png b/gfx/pokemon/front_yellow/growlithe.png Binary files differdeleted file mode 100644 index e75173cf..00000000 --- a/gfx/pokemon/front_yellow/growlithe.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/gyarados.png b/gfx/pokemon/front_yellow/gyarados.png Binary files differdeleted file mode 100644 index 387c2725..00000000 --- a/gfx/pokemon/front_yellow/gyarados.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/haunter.png b/gfx/pokemon/front_yellow/haunter.png Binary files differdeleted file mode 100644 index d7f96e3d..00000000 --- a/gfx/pokemon/front_yellow/haunter.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/hitmonchan.png b/gfx/pokemon/front_yellow/hitmonchan.png Binary files differdeleted file mode 100644 index 2fb7122b..00000000 --- a/gfx/pokemon/front_yellow/hitmonchan.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/hitmonlee.png b/gfx/pokemon/front_yellow/hitmonlee.png Binary files differdeleted file mode 100644 index acbe68ff..00000000 --- a/gfx/pokemon/front_yellow/hitmonlee.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/horsea.png b/gfx/pokemon/front_yellow/horsea.png Binary files differdeleted file mode 100644 index 390c419d..00000000 --- a/gfx/pokemon/front_yellow/horsea.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/hypno.png b/gfx/pokemon/front_yellow/hypno.png Binary files differdeleted file mode 100644 index ed100f66..00000000 --- a/gfx/pokemon/front_yellow/hypno.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/ivysaur.png b/gfx/pokemon/front_yellow/ivysaur.png Binary files differdeleted file mode 100644 index 4da5664b..00000000 --- a/gfx/pokemon/front_yellow/ivysaur.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/jigglypuff.png b/gfx/pokemon/front_yellow/jigglypuff.png Binary files differdeleted file mode 100644 index d11ec165..00000000 --- a/gfx/pokemon/front_yellow/jigglypuff.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/jolteon.png b/gfx/pokemon/front_yellow/jolteon.png Binary files differdeleted file mode 100644 index a1942ec6..00000000 --- a/gfx/pokemon/front_yellow/jolteon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/jynx.png b/gfx/pokemon/front_yellow/jynx.png Binary files differdeleted file mode 100644 index 699ab3f5..00000000 --- a/gfx/pokemon/front_yellow/jynx.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kabuto.png b/gfx/pokemon/front_yellow/kabuto.png Binary files differdeleted file mode 100644 index 58f27e0f..00000000 --- a/gfx/pokemon/front_yellow/kabuto.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kabutops.png b/gfx/pokemon/front_yellow/kabutops.png Binary files differdeleted file mode 100644 index e898ca12..00000000 --- a/gfx/pokemon/front_yellow/kabutops.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kadabra.png b/gfx/pokemon/front_yellow/kadabra.png Binary files differdeleted file mode 100644 index 58aff19a..00000000 --- a/gfx/pokemon/front_yellow/kadabra.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kakuna.png b/gfx/pokemon/front_yellow/kakuna.png Binary files differdeleted file mode 100644 index fb4ec863..00000000 --- a/gfx/pokemon/front_yellow/kakuna.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kangaskhan.png b/gfx/pokemon/front_yellow/kangaskhan.png Binary files differdeleted file mode 100644 index 56ab2619..00000000 --- a/gfx/pokemon/front_yellow/kangaskhan.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/kingler.png b/gfx/pokemon/front_yellow/kingler.png Binary files differdeleted file mode 100644 index c7610d11..00000000 --- a/gfx/pokemon/front_yellow/kingler.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/koffing.png b/gfx/pokemon/front_yellow/koffing.png Binary files differdeleted file mode 100644 index 9d394cdc..00000000 --- a/gfx/pokemon/front_yellow/koffing.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/krabby.png b/gfx/pokemon/front_yellow/krabby.png Binary files differdeleted file mode 100644 index fe463732..00000000 --- a/gfx/pokemon/front_yellow/krabby.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/lapras.png b/gfx/pokemon/front_yellow/lapras.png Binary files differdeleted file mode 100644 index ee954079..00000000 --- a/gfx/pokemon/front_yellow/lapras.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/lickitung.png b/gfx/pokemon/front_yellow/lickitung.png Binary files differdeleted file mode 100644 index 3b480655..00000000 --- a/gfx/pokemon/front_yellow/lickitung.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/machamp.png b/gfx/pokemon/front_yellow/machamp.png Binary files differdeleted file mode 100644 index f2bf5a0b..00000000 --- a/gfx/pokemon/front_yellow/machamp.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/machoke.png b/gfx/pokemon/front_yellow/machoke.png Binary files differdeleted file mode 100644 index 7079a52b..00000000 --- a/gfx/pokemon/front_yellow/machoke.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/machop.png b/gfx/pokemon/front_yellow/machop.png Binary files differdeleted file mode 100644 index cd6d6891..00000000 --- a/gfx/pokemon/front_yellow/machop.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/magikarp.png b/gfx/pokemon/front_yellow/magikarp.png Binary files differdeleted file mode 100644 index 881aa50a..00000000 --- a/gfx/pokemon/front_yellow/magikarp.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/magmar.png b/gfx/pokemon/front_yellow/magmar.png Binary files differdeleted file mode 100644 index 839fa204..00000000 --- a/gfx/pokemon/front_yellow/magmar.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/magnemite.png b/gfx/pokemon/front_yellow/magnemite.png Binary files differdeleted file mode 100644 index 4cb5e3da..00000000 --- a/gfx/pokemon/front_yellow/magnemite.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/magneton.png b/gfx/pokemon/front_yellow/magneton.png Binary files differdeleted file mode 100644 index 5d2a3eaa..00000000 --- a/gfx/pokemon/front_yellow/magneton.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/mankey.png b/gfx/pokemon/front_yellow/mankey.png Binary files differdeleted file mode 100644 index f3266f29..00000000 --- a/gfx/pokemon/front_yellow/mankey.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/marowak.png b/gfx/pokemon/front_yellow/marowak.png Binary files differdeleted file mode 100644 index d90e4627..00000000 --- a/gfx/pokemon/front_yellow/marowak.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/meowth.png b/gfx/pokemon/front_yellow/meowth.png Binary files differdeleted file mode 100644 index de82b0c2..00000000 --- a/gfx/pokemon/front_yellow/meowth.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/metapod.png b/gfx/pokemon/front_yellow/metapod.png Binary files differdeleted file mode 100644 index 6268ed9a..00000000 --- a/gfx/pokemon/front_yellow/metapod.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/mew.png b/gfx/pokemon/front_yellow/mew.png Binary files differdeleted file mode 100644 index a00783a9..00000000 --- a/gfx/pokemon/front_yellow/mew.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/mewtwo.png b/gfx/pokemon/front_yellow/mewtwo.png Binary files differdeleted file mode 100644 index 40c6f217..00000000 --- a/gfx/pokemon/front_yellow/mewtwo.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/moltres.png b/gfx/pokemon/front_yellow/moltres.png Binary files differdeleted file mode 100644 index e5e3d02e..00000000 --- a/gfx/pokemon/front_yellow/moltres.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/mr.mime.png b/gfx/pokemon/front_yellow/mr.mime.png Binary files differdeleted file mode 100644 index 5a3642d3..00000000 --- a/gfx/pokemon/front_yellow/mr.mime.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/muk.png b/gfx/pokemon/front_yellow/muk.png Binary files differdeleted file mode 100644 index d7d98e37..00000000 --- a/gfx/pokemon/front_yellow/muk.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidoking.png b/gfx/pokemon/front_yellow/nidoking.png Binary files differdeleted file mode 100644 index 785adc67..00000000 --- a/gfx/pokemon/front_yellow/nidoking.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidoqueen.png b/gfx/pokemon/front_yellow/nidoqueen.png Binary files differdeleted file mode 100644 index 24f786c7..00000000 --- a/gfx/pokemon/front_yellow/nidoqueen.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidoranf.png b/gfx/pokemon/front_yellow/nidoranf.png Binary files differdeleted file mode 100644 index 1f6532d2..00000000 --- a/gfx/pokemon/front_yellow/nidoranf.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidoranm.png b/gfx/pokemon/front_yellow/nidoranm.png Binary files differdeleted file mode 100644 index bb960e01..00000000 --- a/gfx/pokemon/front_yellow/nidoranm.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidorina.png b/gfx/pokemon/front_yellow/nidorina.png Binary files differdeleted file mode 100644 index 76edf719..00000000 --- a/gfx/pokemon/front_yellow/nidorina.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/nidorino.png b/gfx/pokemon/front_yellow/nidorino.png Binary files differdeleted file mode 100644 index c68dbdd1..00000000 --- a/gfx/pokemon/front_yellow/nidorino.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/ninetales.png b/gfx/pokemon/front_yellow/ninetales.png Binary files differdeleted file mode 100644 index f7ff9ff6..00000000 --- a/gfx/pokemon/front_yellow/ninetales.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/oddish.png b/gfx/pokemon/front_yellow/oddish.png Binary files differdeleted file mode 100644 index 17281e3b..00000000 --- a/gfx/pokemon/front_yellow/oddish.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/omanyte.png b/gfx/pokemon/front_yellow/omanyte.png Binary files differdeleted file mode 100644 index eafbd593..00000000 --- a/gfx/pokemon/front_yellow/omanyte.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/omastar.png b/gfx/pokemon/front_yellow/omastar.png Binary files differdeleted file mode 100644 index 2eb40d37..00000000 --- a/gfx/pokemon/front_yellow/omastar.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/onix.png b/gfx/pokemon/front_yellow/onix.png Binary files differdeleted file mode 100644 index 1e49634f..00000000 --- a/gfx/pokemon/front_yellow/onix.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/paras.png b/gfx/pokemon/front_yellow/paras.png Binary files differdeleted file mode 100644 index 73c805c8..00000000 --- a/gfx/pokemon/front_yellow/paras.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/parasect.png b/gfx/pokemon/front_yellow/parasect.png Binary files differdeleted file mode 100644 index def9e493..00000000 --- a/gfx/pokemon/front_yellow/parasect.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/persian.png b/gfx/pokemon/front_yellow/persian.png Binary files differdeleted file mode 100644 index 831a9da8..00000000 --- a/gfx/pokemon/front_yellow/persian.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/pidgeot.png b/gfx/pokemon/front_yellow/pidgeot.png Binary files differdeleted file mode 100644 index 4bb98422..00000000 --- a/gfx/pokemon/front_yellow/pidgeot.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/pidgeotto.png b/gfx/pokemon/front_yellow/pidgeotto.png Binary files differdeleted file mode 100644 index 0490003c..00000000 --- a/gfx/pokemon/front_yellow/pidgeotto.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/pidgey.png b/gfx/pokemon/front_yellow/pidgey.png Binary files differdeleted file mode 100644 index fe507e6d..00000000 --- a/gfx/pokemon/front_yellow/pidgey.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/pikachu.png b/gfx/pokemon/front_yellow/pikachu.png Binary files differdeleted file mode 100644 index 4fc61c87..00000000 --- a/gfx/pokemon/front_yellow/pikachu.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/pinsir.png b/gfx/pokemon/front_yellow/pinsir.png Binary files differdeleted file mode 100644 index 0f8d8639..00000000 --- a/gfx/pokemon/front_yellow/pinsir.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/poliwag.png b/gfx/pokemon/front_yellow/poliwag.png Binary files differdeleted file mode 100644 index 1c19fd1c..00000000 --- a/gfx/pokemon/front_yellow/poliwag.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/poliwhirl.png b/gfx/pokemon/front_yellow/poliwhirl.png Binary files differdeleted file mode 100644 index f56f75df..00000000 --- a/gfx/pokemon/front_yellow/poliwhirl.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/poliwrath.png b/gfx/pokemon/front_yellow/poliwrath.png Binary files differdeleted file mode 100644 index 20fe9e6c..00000000 --- a/gfx/pokemon/front_yellow/poliwrath.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/ponyta.png b/gfx/pokemon/front_yellow/ponyta.png Binary files differdeleted file mode 100644 index b4ec63b2..00000000 --- a/gfx/pokemon/front_yellow/ponyta.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/porygon.png b/gfx/pokemon/front_yellow/porygon.png Binary files differdeleted file mode 100644 index f991dd6e..00000000 --- a/gfx/pokemon/front_yellow/porygon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/primeape.png b/gfx/pokemon/front_yellow/primeape.png Binary files differdeleted file mode 100644 index a14234f5..00000000 --- a/gfx/pokemon/front_yellow/primeape.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/psyduck.png b/gfx/pokemon/front_yellow/psyduck.png Binary files differdeleted file mode 100644 index 75cd2f17..00000000 --- a/gfx/pokemon/front_yellow/psyduck.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/raichu.png b/gfx/pokemon/front_yellow/raichu.png Binary files differdeleted file mode 100644 index 1ef39dc9..00000000 --- a/gfx/pokemon/front_yellow/raichu.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/rapidash.png b/gfx/pokemon/front_yellow/rapidash.png Binary files differdeleted file mode 100644 index 804e7829..00000000 --- a/gfx/pokemon/front_yellow/rapidash.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/raticate.png b/gfx/pokemon/front_yellow/raticate.png Binary files differdeleted file mode 100644 index 95018e0b..00000000 --- a/gfx/pokemon/front_yellow/raticate.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/rattata.png b/gfx/pokemon/front_yellow/rattata.png Binary files differdeleted file mode 100644 index 423299bb..00000000 --- a/gfx/pokemon/front_yellow/rattata.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/rhydon.png b/gfx/pokemon/front_yellow/rhydon.png Binary files differdeleted file mode 100644 index 6d75e4be..00000000 --- a/gfx/pokemon/front_yellow/rhydon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/rhyhorn.png b/gfx/pokemon/front_yellow/rhyhorn.png Binary files differdeleted file mode 100644 index dcf9dd6a..00000000 --- a/gfx/pokemon/front_yellow/rhyhorn.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/sandshrew.png b/gfx/pokemon/front_yellow/sandshrew.png Binary files differdeleted file mode 100644 index 010908fd..00000000 --- a/gfx/pokemon/front_yellow/sandshrew.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/sandslash.png b/gfx/pokemon/front_yellow/sandslash.png Binary files differdeleted file mode 100644 index d37a8de1..00000000 --- a/gfx/pokemon/front_yellow/sandslash.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/scyther.png b/gfx/pokemon/front_yellow/scyther.png Binary files differdeleted file mode 100644 index 51663342..00000000 --- a/gfx/pokemon/front_yellow/scyther.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/seadra.png b/gfx/pokemon/front_yellow/seadra.png Binary files differdeleted file mode 100644 index 150416dc..00000000 --- a/gfx/pokemon/front_yellow/seadra.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/seaking.png b/gfx/pokemon/front_yellow/seaking.png Binary files differdeleted file mode 100644 index 75060461..00000000 --- a/gfx/pokemon/front_yellow/seaking.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/seel.png b/gfx/pokemon/front_yellow/seel.png Binary files differdeleted file mode 100644 index ef3574b0..00000000 --- a/gfx/pokemon/front_yellow/seel.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/shellder.png b/gfx/pokemon/front_yellow/shellder.png Binary files differdeleted file mode 100644 index d7ddfa48..00000000 --- a/gfx/pokemon/front_yellow/shellder.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/slowbro.png b/gfx/pokemon/front_yellow/slowbro.png Binary files differdeleted file mode 100644 index e506c9ec..00000000 --- a/gfx/pokemon/front_yellow/slowbro.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/slowpoke.png b/gfx/pokemon/front_yellow/slowpoke.png Binary files differdeleted file mode 100644 index 1328f4a0..00000000 --- a/gfx/pokemon/front_yellow/slowpoke.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/snorlax.png b/gfx/pokemon/front_yellow/snorlax.png Binary files differdeleted file mode 100644 index 00c78d27..00000000 --- a/gfx/pokemon/front_yellow/snorlax.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/spearow.png b/gfx/pokemon/front_yellow/spearow.png Binary files differdeleted file mode 100644 index d9349987..00000000 --- a/gfx/pokemon/front_yellow/spearow.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/squirtle.png b/gfx/pokemon/front_yellow/squirtle.png Binary files differdeleted file mode 100644 index db7aa6c7..00000000 --- a/gfx/pokemon/front_yellow/squirtle.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/starmie.png b/gfx/pokemon/front_yellow/starmie.png Binary files differdeleted file mode 100644 index 2ed93b4d..00000000 --- a/gfx/pokemon/front_yellow/starmie.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/staryu.png b/gfx/pokemon/front_yellow/staryu.png Binary files differdeleted file mode 100644 index 320fb6a6..00000000 --- a/gfx/pokemon/front_yellow/staryu.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/tangela.png b/gfx/pokemon/front_yellow/tangela.png Binary files differdeleted file mode 100644 index 43d04726..00000000 --- a/gfx/pokemon/front_yellow/tangela.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/tauros.png b/gfx/pokemon/front_yellow/tauros.png Binary files differdeleted file mode 100644 index 8086fd13..00000000 --- a/gfx/pokemon/front_yellow/tauros.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/tentacool.png b/gfx/pokemon/front_yellow/tentacool.png Binary files differdeleted file mode 100644 index 88d7fde3..00000000 --- a/gfx/pokemon/front_yellow/tentacool.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/tentacruel.png b/gfx/pokemon/front_yellow/tentacruel.png Binary files differdeleted file mode 100644 index 47383372..00000000 --- a/gfx/pokemon/front_yellow/tentacruel.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/vaporeon.png b/gfx/pokemon/front_yellow/vaporeon.png Binary files differdeleted file mode 100644 index 2c35af22..00000000 --- a/gfx/pokemon/front_yellow/vaporeon.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/venomoth.png b/gfx/pokemon/front_yellow/venomoth.png Binary files differdeleted file mode 100644 index 9d801497..00000000 --- a/gfx/pokemon/front_yellow/venomoth.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/venonat.png b/gfx/pokemon/front_yellow/venonat.png Binary files differdeleted file mode 100644 index 574ed26b..00000000 --- a/gfx/pokemon/front_yellow/venonat.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/venusaur.png b/gfx/pokemon/front_yellow/venusaur.png Binary files differdeleted file mode 100644 index f6a964e3..00000000 --- a/gfx/pokemon/front_yellow/venusaur.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/victreebel.png b/gfx/pokemon/front_yellow/victreebel.png Binary files differdeleted file mode 100644 index 115c45a3..00000000 --- a/gfx/pokemon/front_yellow/victreebel.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/vileplume.png b/gfx/pokemon/front_yellow/vileplume.png Binary files differdeleted file mode 100644 index af4f0862..00000000 --- a/gfx/pokemon/front_yellow/vileplume.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/voltorb.png b/gfx/pokemon/front_yellow/voltorb.png Binary files differdeleted file mode 100644 index 8b4bc64d..00000000 --- a/gfx/pokemon/front_yellow/voltorb.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/vulpix.png b/gfx/pokemon/front_yellow/vulpix.png Binary files differdeleted file mode 100644 index cef8fbd8..00000000 --- a/gfx/pokemon/front_yellow/vulpix.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/wartortle.png b/gfx/pokemon/front_yellow/wartortle.png Binary files differdeleted file mode 100644 index 961aaf4f..00000000 --- a/gfx/pokemon/front_yellow/wartortle.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/weedle.png b/gfx/pokemon/front_yellow/weedle.png Binary files differdeleted file mode 100644 index 989b57b5..00000000 --- a/gfx/pokemon/front_yellow/weedle.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/weepinbell.png b/gfx/pokemon/front_yellow/weepinbell.png Binary files differdeleted file mode 100644 index 8dd8fc34..00000000 --- a/gfx/pokemon/front_yellow/weepinbell.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/weezing.png b/gfx/pokemon/front_yellow/weezing.png Binary files differdeleted file mode 100644 index 445556b3..00000000 --- a/gfx/pokemon/front_yellow/weezing.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/wigglytuff.png b/gfx/pokemon/front_yellow/wigglytuff.png Binary files differdeleted file mode 100644 index c9ae89ad..00000000 --- a/gfx/pokemon/front_yellow/wigglytuff.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/zapdos.png b/gfx/pokemon/front_yellow/zapdos.png Binary files differdeleted file mode 100644 index 47b63d6a..00000000 --- a/gfx/pokemon/front_yellow/zapdos.png +++ /dev/null diff --git a/gfx/pokemon/front_yellow/zubat.png b/gfx/pokemon/front_yellow/zubat.png Binary files differdeleted file mode 100644 index 86ac4710..00000000 --- a/gfx/pokemon/front_yellow/zubat.png +++ /dev/null diff --git a/gfx/sgb/green_border.png b/gfx/sgb/green_border.png Binary files differdeleted file mode 100644 index 939f2240..00000000 --- a/gfx/sgb/green_border.png +++ /dev/null diff --git a/gfx/sgb/green_border.tilemap b/gfx/sgb/green_border.tilemap Binary files differdeleted file mode 100644 index 5381bb17..00000000 --- a/gfx/sgb/green_border.tilemap +++ /dev/null diff --git a/gfx/slots/green_slots_1.png b/gfx/slots/green_slots_1.png Binary files differdeleted file mode 100644 index dc7bffdd..00000000 --- a/gfx/slots/green_slots_1.png +++ /dev/null diff --git a/gfx/slots/green_slots_2.png b/gfx/slots/green_slots_2.png Binary files differdeleted file mode 100644 index 5072b556..00000000 --- a/gfx/slots/green_slots_2.png +++ /dev/null diff --git a/gfx/tilesets/tilesets_rg/flower.png b/gfx/tilesets/tilesets_rg/flower.png Binary files differdeleted file mode 100644 index bb54085a..00000000 --- a/gfx/tilesets/tilesets_rg/flower.png +++ /dev/null diff --git a/gfx/tilesets/tilesets_rg/forest.png b/gfx/tilesets/tilesets_rg/forest.png Binary files differdeleted file mode 100644 index bd01b7cf..00000000 --- a/gfx/tilesets/tilesets_rg/forest.png +++ /dev/null diff --git a/gfx/tilesets/tilesets_rg/overworld.png b/gfx/tilesets/tilesets_rg/overworld.png Binary files differdeleted file mode 100644 index 009c1359..00000000 --- a/gfx/tilesets/tilesets_rg/overworld.png +++ /dev/null diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png Binary files differindex fc8f2378..8b33e8b9 100644 --- a/gfx/trainers/brock.png +++ b/gfx/trainers/brock.png diff --git a/gfx/trainers/erika.png b/gfx/trainers/erika.png Binary files differindex 961d094b..446ed6aa 100644 --- a/gfx/trainers/erika.png +++ b/gfx/trainers/erika.png diff --git a/gfx/trainers/yellow/jessiejames.png b/gfx/trainers/jessiejames.png Binary files differindex 764e5af4..764e5af4 100644 --- a/gfx/trainers/yellow/jessiejames.png +++ b/gfx/trainers/jessiejames.png diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png Binary files differindex ea2e655a..a7fdd6bc 100644 --- a/gfx/trainers/misty.png +++ b/gfx/trainers/misty.png diff --git a/gfx/trainers/rival1.png b/gfx/trainers/rival1.png Binary files differindex 6b94fd27..4a0ba97c 100644 --- a/gfx/trainers/rival1.png +++ b/gfx/trainers/rival1.png diff --git a/gfx/trainers/rival2.png b/gfx/trainers/rival2.png Binary files differindex df9b2524..e8718589 100644 --- a/gfx/trainers/rival2.png +++ b/gfx/trainers/rival2.png diff --git a/gfx/trainers/rival3.png b/gfx/trainers/rival3.png Binary files differindex 5e6fc5ff..08e22813 100644 --- a/gfx/trainers/rival3.png +++ b/gfx/trainers/rival3.png diff --git a/gfx/trainers/yellow/brock.png b/gfx/trainers/yellow/brock.png Binary files differdeleted file mode 100644 index 8b33e8b9..00000000 --- a/gfx/trainers/yellow/brock.png +++ /dev/null diff --git a/gfx/trainers/yellow/erika.png b/gfx/trainers/yellow/erika.png Binary files differdeleted file mode 100644 index 446ed6aa..00000000 --- a/gfx/trainers/yellow/erika.png +++ /dev/null diff --git a/gfx/trainers/yellow/misty.png b/gfx/trainers/yellow/misty.png Binary files differdeleted file mode 100644 index a7fdd6bc..00000000 --- a/gfx/trainers/yellow/misty.png +++ /dev/null diff --git a/gfx/trainers/yellow/rival1.png b/gfx/trainers/yellow/rival1.png Binary files differdeleted file mode 100644 index 4a0ba97c..00000000 --- a/gfx/trainers/yellow/rival1.png +++ /dev/null diff --git a/gfx/trainers/yellow/rival2.png b/gfx/trainers/yellow/rival2.png Binary files differdeleted file mode 100644 index e8718589..00000000 --- a/gfx/trainers/yellow/rival2.png +++ /dev/null diff --git a/gfx/trainers/yellow/rival3.png b/gfx/trainers/yellow/rival3.png Binary files differdeleted file mode 100644 index 08e22813..00000000 --- a/gfx/trainers/yellow/rival3.png +++ /dev/null @@ -50,6 +50,7 @@ INCLUDE "home/inventory.asm" INCLUDE "home/list_menu.asm" INCLUDE "home/names.asm" INCLUDE "home/reload_tiles.asm" +INCLUDE "home/printer.asm" INCLUDE "home/item.asm" INCLUDE "home/textbox.asm" INCLUDE "home/cgb_palettes.asm" diff --git a/home/cgb_palettes.asm b/home/cgb_palettes.asm index 24738ae2..b8cc92c6 100644 --- a/home/cgb_palettes.asm +++ b/home/cgb_palettes.asm @@ -74,8 +74,12 @@ Func_3082:: ldh a, [hLoadedROMBank] push af call FadeOutAudio - callbs Music_DoLowHealthAlarm - callbs Audio1_UpdateMusic + ld a, BANK(Music_DoLowHealthAlarm) + call BankswitchCommon + call Music_DoLowHealthAlarm + ld a, BANK(Audio1_UpdateMusic) + call BankswitchCommon + call Audio1_UpdateMusic pop af call BankswitchCommon ret diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm index 34f4b4ec..79cc99d6 100644 --- a/home/clear_sprites.asm +++ b/home/clear_sprites.asm @@ -1,7 +1,7 @@ ClearSprites:: xor a ld hl, wOAMBuffer - ld b, 40 * 4 + ld b, wOAMBufferEnd - wOAMBuffer .loop ld [hli], a dec b diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm index 40c49c3e..0003022b 100644 --- a/home/hidden_objects.asm +++ b/home/hidden_objects.asm @@ -9,7 +9,9 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: bit 0, a ; A button jr z, .nothingFound ; A button is pressed - callbs CheckForHiddenObject + ld a, BANK(CheckForHiddenObject) + call BankswitchCommon + call CheckForHiddenObject ldh a, [hDidntFindAnyHiddenObject] and a jr nz, .hiddenObjectNotFound diff --git a/home/item_price.asm b/home/item_price.asm index d8c2068e..39749ee9 100644 --- a/home/item_price.asm +++ b/home/item_price.asm @@ -31,7 +31,9 @@ GetItemPrice:: ldh [hItemPrice], a jr .done .getTMPrice - callbs GetMachinePrice + ld a, BANK(GetMachinePrice) + call BankswitchCommon + call GetMachinePrice .done ld de, hItemPrice pop af diff --git a/home/joypad.asm b/home/joypad.asm index 15f10fe2..5eb2962f 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -1,5 +1,5 @@ Joypad:: - homecall_jump _Joypad + homejp _Joypad ReadJoypad:: - homecall_jump ReadJoypad_ + homejp ReadJoypad_ diff --git a/home/overworld.asm b/home/overworld.asm index 2909b01e..68d50695 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -743,7 +743,8 @@ HandleBlackOut:: call StopMusic ld hl, wd72e res 5, [hl] - switchbank SpecialWarpIn ; also Bank(SpecialEnterMap) + ld a, BANK(SpecialWarpIn) ; also BANK(SpecialEnterMap) + call BankswitchCommon callfar ResetStatusAndHalveMoneyOnBlackout call SpecialWarpIn call PlayDefaultMusicFadeOutCurrent @@ -770,7 +771,9 @@ HandleFlyWarpOrDungeonWarp:: res 5, [hl] ; forced to ride bike call LeaveMapAnim call Func_07c4 - callbs SpecialWarpIn + ld a, BANK(SpecialWarpIn) + call BankswitchCommon + call SpecialWarpIn jp SpecialEnterMap LeaveMapAnim:: @@ -1439,9 +1442,7 @@ AdvancePlayerSprite:: push af ld a, $FF ld [wUpdateSpritesEnabled], a - ld hl, _AdvancePlayerSprite - ld b, BANK(_AdvancePlayerSprite) - call Bankswitch + callfar _AdvancePlayerSprite pop af ld [wUpdateSpritesEnabled], a ret @@ -1914,7 +1915,8 @@ asm_0dbd: ld b, $00 ldh a, [hLoadedROMBank] push af - switchbank MapSongBanks + ld a, BANK(MapSongBanks) + call BankswitchCommon ld hl, MapSongBanks add hl, bc add hl, bc @@ -2041,16 +2043,16 @@ CopyMapViewToVRAM:: ld de, vBGMap0 CopyMapViewToVRAM2: ld hl, wTileMap - ld b, 18 + ld b, SCREEN_HEIGHT .vramCopyLoop - ld c, 20 + ld c, SCREEN_WIDTH .vramCopyInnerLoop ld a, [hli] ld [de], a inc e dec c jr nz, .vramCopyInnerLoop - ld a, 32 - 20 ; total vram map width in tiles - screen width in tiles + ld a, BG_MAP_WIDTH - SCREEN_WIDTH add e ld e, a jr nc, .noCarry @@ -2068,11 +2070,11 @@ SwitchToMapRomBank:: ld c, a ld b, $00 ld a, BANK(MapHeaderBanks) - call BankswitchHome ; switch to ROM bank 3F + call BankswitchHome ld hl, MapHeaderBanks add hl, bc ld a, [hl] - ldh [hMapROMBank], a ; save map ROM bank + ldh [hMapROMBank], a call BankswitchBack ldh a, [hMapROMBank] call BankswitchCommon @@ -2083,7 +2085,8 @@ SwitchToMapRomBank:: GetMapHeaderPointer:: ldh a, [hLoadedROMBank] push af - switchbank MapHeaderPointers + ld a, BANK(MapHeaderPointers) + call BankswitchCommon push de ld a, [wCurMap] ld e, a @@ -2114,7 +2117,7 @@ ResetUsingStrengthOutOfBattleBit: ForceBikeOrSurf:: ld b, BANK(RedSprite) - ld hl, LoadPlayerSpriteGraphics + ld hl, LoadPlayerSpriteGraphics ; in bank 0 call Bankswitch jp PlayDefaultMusic ; update map/player state? diff --git a/home/pics.asm b/home/pics.asm index f3b3f1b5..8fd9a26a 100644 --- a/home/pics.asm +++ b/home/pics.asm @@ -18,10 +18,6 @@ UncompressMonSprite:: ; $99 ≤ index, bank $D ld a, [wcf91] ; XXX name for this ram location ld b, a - ;cp MEW - ;ld a, BANK(MewPicFront) - ;jr z, .GotBank - ;ld a, b cp FOSSIL_KABUTOPS ld a, BANK(FossilKabutopsPic) jr z, .GotBank diff --git a/home/pikachu.asm b/home/pikachu.asm index c9c94635..ae6acfe3 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -108,7 +108,9 @@ ApplyPikachuMovementData:: ldh a, [hLoadedROMBank] ld b, a push af - callbs ApplyPikachuMovementData_ + ld a, BANK(ApplyPikachuMovementData_) + call BankswitchCommon + call ApplyPikachuMovementData_ pop af call BankswitchCommon ret diff --git a/home/pokemon.asm b/home/pokemon.asm index 3e08906f..8e304fd3 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -5,7 +5,6 @@ DrawHPBar:: push hl push de - ;push bc ; Left ld a, $71 ; "HP:" @@ -61,7 +60,6 @@ DrawHPBar:: add e ld [hl], a .done - ;pop bc pop de pop hl ret @@ -124,7 +122,8 @@ LoadFrontSpriteByMonIndex:: pop hl ldh a, [hLoadedROMBank] push af - switchbank CopyUncompressedPicToHL + ld a, BANK(CopyUncompressedPicToHL) + call BankswitchCommon xor a ldh [hStartTileID], a call CopyUncompressedPicToHL @@ -355,7 +354,7 @@ PrintStatusCondition:: ret PrintStatusConditionNotFainted:: - homecall_jump_sf PrintStatusAilment + homejp_sf PrintStatusAilment ; function to print pokemon level, leaving off the ":L" if the level is at least 100 ; INPUT: @@ -404,7 +403,8 @@ GetwMoves:: GetMonHeader:: ldh a, [hLoadedROMBank] push af - switchbank BaseStats + ld a, BANK(BaseStats) + call BankswitchCommon push bc push de push hl @@ -423,8 +423,6 @@ GetMonHeader:: ld b, $77 ; size of Aerodactyl fossil sprite cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z, .specialID - ;cp MEW - ;jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] dec a diff --git a/home/printer.asm b/home/printer.asm new file mode 100644 index 00000000..6d9f145c --- /dev/null +++ b/home/printer.asm @@ -0,0 +1,34 @@ + +PrinterSerial:: + homecall PrinterSerial_ + ret + +SerialFunction:: + ld a, [wPrinterConnectionOpen] + bit 0, a + ret z + ld a, [wPrinterOpcode] + and a + ret nz + ld hl, wOverworldMap + 650 + inc [hl] + ld a, [hl] + cp $6 + ret c + xor a + ld [hl], a + ld a, $0c + ld [wPrinterOpcode], a + ld a, $88 + ldh [rSB], a + ld a, $1 + ldh [rSC], a + ld a, START_TRANSFER_INTERNAL_CLOCK + ldh [rSC], a + ret + +; causes the text box to close without waiting for a button press after displaying text +DisableWaitingAfterTextDisplay:: + ld a, $01 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret diff --git a/home/reload_tiles.asm b/home/reload_tiles.asm index ae9f6544..b596263a 100644 --- a/home/reload_tiles.asm +++ b/home/reload_tiles.asm @@ -31,37 +31,3 @@ ChooseFlyDestination:: ld hl, wd72e res 4, [hl] farjp LoadTownMap_Fly - -PrinterSerial:: - homecall PrinterSerial_ - ret - -SerialFunction:: - ld a, [wPrinterConnectionOpen] - bit 0, a - ret z - ld a, [wPrinterOpcode] - and a - ret nz - ld hl, wOverworldMap + 650 - inc [hl] - ld a, [hl] - cp $6 - ret c - xor a - ld [hl], a - ld a, $0c - ld [wPrinterOpcode], a - ld a, $88 - ldh [rSB], a - ld a, $1 - ldh [rSC], a - ld a, START_TRANSFER_INTERNAL_CLOCK - ldh [rSC], a - ret - -; causes the text box to close without waiting for a button press after displaying text -DisableWaitingAfterTextDisplay:: - ld a, $01 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ret diff --git a/home/start.asm b/home/start.asm index 379436ae..366806e9 100644 --- a/home/start.asm +++ b/home/start.asm @@ -4,7 +4,7 @@ _Start:: xor a jr .ok .gbc - ld a, 1 + ld a, TRUE .ok ldh [hGBC], a jp Init diff --git a/home/start_menu.asm b/home/start_menu.asm index bd1b24bf..8edccfe2 100755 --- a/home/start_menu.asm +++ b/home/start_menu.asm @@ -1,5 +1,6 @@ DisplayStartMenu:: - switchbank StartMenu_Pokedex ; also bank for other functions + ld a, BANK(StartMenu_Pokedex) ; also bank for other functions + call BankswitchCommon ld a, [wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy], a ld a, SFX_START_MENU diff --git a/home/text.asm b/home/text.asm index 78d69138..adb81425 100644 --- a/home/text.asm +++ b/home/text.asm @@ -554,8 +554,8 @@ TextCommandSounds:: db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED db TX_SOUND_CRY_PIKACHU, PIKACHU ; used in OakSpeech - db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 - db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused + db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 + db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused TextCommand_DOTS:: ; wait for button press or 30 frames while printing "…"s diff --git a/home/text_script.asm b/home/text_script.asm index 20cfb71d..fe81cb51 100644 --- a/home/text_script.asm +++ b/home/text_script.asm @@ -41,17 +41,12 @@ DisplayTextID:: .spriteHandling ; get the text ID of the sprite push hl - ;push de - ;push bc - ;farcall UpdateSpriteFacingOffsetAndDelayMovement ; update the graphics of the sprite the player is talking to (to face the right direction) - ;pop bc - ;pop de ld hl, wMapSpriteData ; NPC text entries ldh a, [hSpriteIndexOrTextID] dec a add a ld e, a - ld d, $0 + ld d, 0 add hl, de inc hl ld a, [hl] ; a = text ID of the sprite @@ -60,7 +55,7 @@ DisplayTextID:: ; look up the address of the text in the map's text entries dec a ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld a, [hli] diff --git a/home/uncompress.asm b/home/uncompress.asm index 182821aa..27474f2d 100644 --- a/home/uncompress.asm +++ b/home/uncompress.asm @@ -558,7 +558,7 @@ ResetSpriteBufferPointers:: ; maps each nybble to its reverse NybbleReverseTable:: - db $0, $8, $4, $c, $2, $a, $6 ,$e, $1, $9, $5, $d, $3, $b, $7 ,$f + db $0, $8, $4, $c, $2, $a, $6, $e, $1, $9, $5, $d, $3, $b, $7, $f ; combines the two loaded chunks with xor (the chunk loaded second is the destination). Both chunks are differeintial decoded beforehand. UnpackSpriteMode2:: diff --git a/home/update_sprites.asm b/home/update_sprites.asm index 0c32dad8..5bb9ee12 100644 --- a/home/update_sprites.asm +++ b/home/update_sprites.asm @@ -4,7 +4,8 @@ UpdateSprites:: ret nz ldh a, [hLoadedROMBank] push af - switchbank _UpdateSprites + ld a, BANK(_UpdateSprites) + call BankswitchCommon ld a, $ff ld [wUpdateSpritesEnabled], a call _UpdateSprites diff --git a/home/vblank.asm b/home/vblank.asm index ed39714f..3957639a 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -59,8 +59,12 @@ VBlank:: .skipDec call FadeOutAudio - callbs Music_DoLowHealthAlarm - callbs Audio1_UpdateMusic + ld a, BANK(Music_DoLowHealthAlarm) + call BankswitchCommon + call Music_DoLowHealthAlarm + ld a, BANK(Audio1_UpdateMusic) + call BankswitchCommon + call Audio1_UpdateMusic call SerialFunction @@ -96,8 +96,8 @@ hTilePlayerStandingOn:: db hSpritePriority:: db UNION -;; Multiplication and division variables are meant -;; to overlap for back-to-back usage. Big endian. +; Multiplication and division variables are meant +; to overlap for back-to-back usage. Big endian. UNION ds 1 hMultiplicand:: ds 3 diff --git a/macros/code.asm b/macros/code.asm index 8507b1ad..e0b3e9c9 100755 --- a/macros/code.asm +++ b/macros/code.asm @@ -4,7 +4,7 @@ lb: MACRO ; r, hi, lo ld \1, ((\2) & $ff) << 8 + ((\3) & $ff) ENDM -ldPal: MACRO +ldpal: MACRO ld \1, \2 << 6 | \3 << 4 | \4 << 2 | \5 ENDM diff --git a/macros/farcall.asm b/macros/farcall.asm index e6ecdaae..f3fa07d4 100644 --- a/macros/farcall.asm +++ b/macros/farcall.asm @@ -32,7 +32,7 @@ homecall: MACRO call BankswitchCommon ENDM -homecall_jump: MACRO +homejp: MACRO ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -42,7 +42,7 @@ homecall_jump: MACRO jp BankswitchCommon ENDM -homecall_jump_sf: MACRO +homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -50,10 +50,10 @@ homecall_jump_sf: MACRO call \1 pop bc ld a, b - jp BankswitchCommon + call BankswitchCommon ENDM -homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af +homejp_sf: MACRO ; homejp but save flags by popping into bc instead of af ldh a, [hLoadedROMBank] push af ld a, BANK(\1) @@ -61,18 +61,7 @@ homecall_sf: MACRO ; homecall but save flags by popping into bc instead of af call \1 pop bc ld a, b - call BankswitchCommon -ENDM - -switchbank: MACRO - ld a, BANK(\1) - call BankswitchCommon -ENDM - -callbs: MACRO - ld a, BANK(\1) - call BankswitchCommon - call \1 + jp BankswitchCommon ENDM calladb_ModifyPikachuHappiness: MACRO diff --git a/macros/gfx.asm b/macros/gfx.asm index ad428eb0..98eabec4 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -16,18 +16,6 @@ color EQUS "+ PAL_COLOR_SIZE *" tiles EQUS "* LEN_2BPP_TILE" tile EQUS "+ LEN_2BPP_TILE *" -setpal: MACRO - ld a, \1 << 6 | \2 << 4 | \3 << 2 | \4 -ENDM - -setpalBGP: MACRO - setpal SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE -ENDM - -setpalOBP: MACRO - setpal SHADE_BLACK, SHADE_DARK, SHADE_WHITE, SHADE_WHITE -ENDM - dbsprite: MACRO ; x tile, y tile, x pixel, y pixel, vtile offset, attributes db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 @@ -151,6 +151,7 @@ wc0f3:: ds 1 wc0f4:: ds 1 wc0f5:: ds 11 + SECTION "Sprite State Data", WRAM0 wSpriteDataStart:: @@ -191,7 +192,7 @@ wSprite11StateData1:: spritestatedata1 wSprite11StateData1 wSprite12StateData1:: spritestatedata1 wSprite12StateData1 wSprite13StateData1:: spritestatedata1 wSprite13StateData1 wSprite14StateData1:: spritestatedata1 wSprite14StateData1 -wSpritePikachuStateData1:: spritestatedata1 wSpritePikachuStateData1 +wSpritePikachuStateData1:: spritestatedata1 wSpritePikachuStateData1 wSpriteStateData2:: ; more data for all sprites on the current map @@ -229,7 +230,7 @@ wSprite11StateData2:: spritestatedata2 wSprite11StateData2 wSprite12StateData2:: spritestatedata2 wSprite12StateData2 wSprite13StateData2:: spritestatedata2 wSprite13StateData2 wSprite14StateData2:: spritestatedata2 wSprite14StateData2 -wSpritePikachuStateData2:: spritestatedata2 wSpritePikachuStateData2 +wSpritePikachuStateData2:: spritestatedata2 wSpritePikachuStateData2 wSpriteDataEnd:: @@ -244,16 +245,24 @@ wOAMBufferEnd:: wTileMap:: ; buffer for tiles that are visible on screen (20 columns by 18 rows) - ds SCREEN_HEIGHT * SCREEN_WIDTH - -wSerialPartyMonsPatchList:: -; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer + ds SCREEN_WIDTH * SCREEN_HEIGHT +UNION wTileMapBackup:: ; buffer for temporarily saving and restoring current screen's tiles ; (e.g. if menus are drawn on top) -; ds 20 * 18 + ds SCREEN_WIDTH * SCREEN_HEIGHT + +NEXTU +wSerialPartyMonsPatchList:: +; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer + ds 200 + +wSerialEnemyMonsPatchList:: +; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer + ds 200 +NEXTU wAnimatedObjectsData:: ; Used by functions in BANK 3E ; This looks similar to the address structure for Gen 2 OAM animations. @@ -303,10 +312,7 @@ wAnimatedObjectGlobalXOffset:: ds 1 wAnimatedObjectsDataEnd:: -wSerialEnemyMonsPatchList:: -; list of indexes to patch with SERIAL_NO_DATA_BYTE after transfer - -; Surfing Minigame +; Surfing minigame wSurfingMinigameData:: ds 1 wSurfingMinigameRoutineNumber:: @@ -356,7 +362,6 @@ wc5ee:: ds 1 wSurfingMinigameBGMapReadBuffer:: ds 16 - ds 24 wSurfingMinigameSCX:: ds 3 @@ -375,6 +380,7 @@ wSurfingMinigameRoutineDelay:: wSurfingMinigameIntroAnimationFinished:: ds 1 +; Yellow intro wYellowIntroCurrentScene:: wc634:: ds 1 @@ -384,13 +390,21 @@ wc635:: wYellowIntroAnimatedObjectStructPointer:: ds 1 wSurfingMinigameDataEnd:: +ENDU - ds 177 + ds 80 +UNION +wOverworldMap:: + ds 1300 +wOverworldMapEnd:: + +NEXTU wTempPic:: + ds 7 * 7 tiles + +NEXTU wPrinterData:: -wOverworldMap:: - ; ds 1300 wPrinterSendState:: ds 1 wPrinterRowIndex:: @@ -480,8 +494,7 @@ wcbea:: wcbec:: ds 16 - -wOverworldMapEnd:: +ENDU wRedrawRowOrColumnSrcTiles:: ; the tiles of the row or column to be redrawn by RedrawRowOrColumn @@ -617,6 +630,7 @@ wUnknownSerialCounter:: ; 2 bytes wEnteringCableClub:: +; 1 byte ds 2 wWhichTradeMonSelectionMenu:: @@ -705,16 +719,13 @@ wBoostExpByExpAll:: wAnimationType:: ; values between 0-6. Shake screen horizontally, shake screen vertically, blink Pokemon... +UNION wNPCMovementDirections:: - -wPikaPicUsedGFXCount:: ds 1 -wPikaPicUsedGFX:: wDexRatingNumMonsOwned:: ds 1 - wDexRatingText:: wTrainerCardBadgeAttributes:: ds 1 @@ -723,21 +734,42 @@ wSlotMachineSavedROMBank:: ; ROM back to return to when the player is done with the slot machine ds 1 - ds 13 -wPikaPicUsedGFXEnd:: - ds 13 + ds 26 wAnimPalette:: ds 1 ds 29 -wNPCMovementDirections2:: +NEXTU +wPikaPicUsedGFXCount:: + ds 1 -wPikaPicAnimObjectDataBufferSize:: +wPikaPicUsedGFX:: + ds 16 +wPikaPicUsedGFXEnd:: + ds 43 +ENDU + +UNION +wNPCMovementDirections2:: + ds 10 + +NEXTU wSwitchPartyMonTempBuffer:: ; temporary buffer when swapping party mon data + ds 49 + +NEXTU + ds 10 + +wNumStepsToTake:: +; used in Pallet Town scripted movement + ds 1 + +NEXTU +wPikaPicAnimObjectDataBufferSize:: ds 1 wPikaPicAnimObjectDataBuffer:: @@ -750,14 +782,11 @@ wPikaPicAnimObjectDataBuffer:: ; 5: x offset ; 6: y offset ; 7: unused - - ds 9 - -wNumStepsToTake:: -; used in Pallet Town scripted movement - ds 23 + ds 4 * 8 wPikaPicAnimObjectDataBufferEnd:: - ds 26 +ENDU + + ds 10 wRLEByteCount:: ds 1 @@ -835,7 +864,7 @@ wTotalPayDayMoney:: wSafariEscapeFactor:: ds 1 wSafariBaitFactor:: - ds 1; + ds 1 ds 1 @@ -1194,7 +1223,6 @@ wPlayerSpinWhileMovingUpOrDownAnimFrameDelay:: wHiddenObjectIndex:: wTrainerFacingDirection:: - ds 1 wHoFMonOrPlayer:: @@ -1240,8 +1268,6 @@ wHoFTeamNo:: wSlotMachineWheel1MiddleTile:: wFieldMovesLeftmostXCoord:: - -wcd42:: ds 1 wLastFieldMoveID:: @@ -1591,14 +1617,19 @@ wPalPacket:: wPartyMenuBlkPacket:: ; $30 bytes ds 9 + wPartyHPBarAttributes:: - ds 20 + ds 6 + + ds 14 wExpAmountGained:: ; 2-byte big-endian number ; the total amount of exp a mon gained -wcf4b:: ds 2 ; storage buffer for various strings +wcf4b:: +; storage buffer for various strings + ds 2 wGainBoostedExp:: ds 1 @@ -1779,7 +1810,11 @@ wEnemyMonDefense:: dw wEnemyMonSpeed:: dw wEnemyMonSpecial:: dw wEnemyMonPP:: ds 3 ; NUM_MOVES - 1 + + SECTION "WRAM Bank 1", WRAMX + +; continuing wEnemyMon from the previous section ds 1 ; NUM_MOVES - 3 wEnemyMonBaseStats:: ds 5 @@ -1931,6 +1966,7 @@ wPlayerConfusedCounter:: wPlayerToxicCounter:: ds 1 + wPlayerDisabledMove:: ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left @@ -1947,6 +1983,7 @@ wEnemyConfusedCounter:: wEnemyToxicCounter:: ds 1 + wEnemyDisabledMove:: ; high nibble: which move is disabled (1-4) ; low nibble: disable turns left @@ -2247,7 +2284,7 @@ wMonHBackSprite:: ds 2 wMonHMoves:: - ds 4 + ds NUM_MOVES wMonHGrowthRate:: ds 1 @@ -2755,8 +2792,8 @@ wExpressionNumber:: ds 1 wPikaPicAnimNumber:: ds 1 - -wPikachuMovementScriptBank:: ds 1 + +wPikachuMovementScriptBank:: ds 1 wPikachuMovementScriptAddress:: dw wPikachuMovementFlags:: ; bit 6 - spawn shadow @@ -2764,7 +2801,6 @@ wPikachuMovementFlags:: ds 1 UNION - wCurPikaMovementData:: wCurPikaMovementParam1:: ds 1 wCurPikaMovementFunc1:: ds 1 @@ -2782,7 +2818,6 @@ wPikachuStepSubtimer:: ds 1 wCurPikaMovementDataEnd:: NEXTU - wPikaPicAnimPointer:: dw wPikaPicAnimPointerSetupFinished:: ds 1 wPikaPicAnimCurGraphicID:: ds 1 @@ -2818,11 +2853,11 @@ wd475:: ds 1 wd47a:: ds 1 ds 24 - + wd492:: ds 1 - + ds 1 - + wSurfingMinigameHiScore:: ds 2 ; 4-digit BCD little-endian ds 1 @@ -3344,7 +3379,6 @@ wBeatLorelei:: ; the game uses this to tell when Elite 4 events need to be reset ds 1 -wd735:: ds 1 wd736:: @@ -3401,7 +3435,7 @@ wGrassMons:: wSerialEnemyDataBlock:: ds 9 -wEnemyPartyCount:: ds 1 +wEnemyPartyCount:: ds 1 wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; Overload enemy party data @@ -3488,6 +3522,7 @@ wBoxMon2:: ds BOX_STRUCT_LENGTH * (MONS_PER_BOX - 1) wBoxMonOT:: ds NAME_LENGTH * MONS_PER_BOX wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX wBoxMonNicksEnd:: + wBoxDataEnd:: wGBCBasePalPointers:: ds NUM_ACTIVE_PALS * 2 @@ -3498,7 +3533,9 @@ wLastOBP1:: ds 1 wdef5:: ds 1 wBGPPalsBuffer:: ds NUM_ACTIVE_PALS * PALETTE_SIZE + SECTION "Stack", WRAMX + wStack:: |
