diff options
161 files changed, 960 insertions, 1214 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 96d44ef5..f0240227 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,192 +1,156 @@ const_value = 1 - const RHYDON ; $01 - const KANGASKHAN ; $02 - const NIDORAN_M ; $03 - const CLEFAIRY ; $04 - const SPEAROW ; $05 - const VOLTORB ; $06 - const NIDOKING ; $07 - const SLOWBRO ; $08 - const IVYSAUR ; $09 - const EXEGGUTOR ; $0A - const LICKITUNG ; $0B - const EXEGGCUTE ; $0C - const GRIMER ; $0D - const GENGAR ; $0E - const NIDORAN_F ; $0F - const NIDOQUEEN ; $10 - const CUBONE ; $11 - const RHYHORN ; $12 - const LAPRAS ; $13 - const ARCANINE ; $14 - const MEW ; $15 - const GYARADOS ; $16 - const SHELLDER ; $17 - const TENTACOOL ; $18 - const GASTLY ; $19 - const SCYTHER ; $1A - const STARYU ; $1B - const BLASTOISE ; $1C - const PINSIR ; $1D - const TANGELA ; $1E - const MISSINGNO_1F ; $1F - const MISSINGNO_20 ; $20 - const GROWLITHE ; $21 - const ONIX ; $22 - const FEAROW ; $23 - const PIDGEY ; $24 - const SLOWPOKE ; $25 - const KADABRA ; $26 - const GRAVELER ; $27 - const CHANSEY ; $28 - const MACHOKE ; $29 - const MR_MIME ; $2A - const HITMONLEE ; $2B - const HITMONCHAN ; $2C - const ARBOK ; $2D - const PARASECT ; $2E - const PSYDUCK ; $2F - const DROWZEE ; $30 - const GOLEM ; $31 - const MISSINGNO_32 ; $32 - const MAGMAR ; $33 - const MISSINGNO_34 ; $34 - const ELECTABUZZ ; $35 - const MAGNETON ; $36 - const KOFFING ; $37 - const MISSINGNO_38 ; $38 - const MANKEY ; $39 - const SEEL ; $3A - const DIGLETT ; $3B - const TAUROS ; $3C - const MISSINGNO_3D ; $3D - const MISSINGNO_3E ; $3E - const MISSINGNO_3F ; $3F - const FARFETCHD ; $40 - const VENONAT ; $41 - const DRAGONITE ; $42 - const MISSINGNO_43 ; $43 - const MISSINGNO_44 ; $44 - const MISSINGNO_45 ; $45 - const DODUO ; $46 - const POLIWAG ; $47 - const JYNX ; $48 - const MOLTRES ; $49 - const ARTICUNO ; $4A - const ZAPDOS ; $4B - const DITTO ; $4C - const MEOWTH ; $4D - const KRABBY ; $4E - const MISSINGNO_4F ; $4F - const MISSINGNO_50 ; $50 - const MISSINGNO_51 ; $51 - const VULPIX ; $52 - const NINETALES ; $53 - const PIKACHU ; $54 - const RAICHU ; $55 - const MISSINGNO_56 ; $56 - const MISSINGNO_57 ; $57 - const DRATINI ; $58 - const DRAGONAIR ; $59 - const KABUTO ; $5A - const KABUTOPS ; $5B - const HORSEA ; $5C - const SEADRA ; $5D - const MISSINGNO_5E ; $5E - const MISSINGNO_5F ; $5F - const SANDSHREW ; $60 - const SANDSLASH ; $61 - const OMANYTE ; $62 - const OMASTAR ; $63 - const JIGGLYPUFF ; $64 - const WIGGLYTUFF ; $65 - const EEVEE ; $66 - const FLAREON ; $67 - const JOLTEON ; $68 - const VAPOREON ; $69 - const MACHOP ; $6A - const ZUBAT ; $6B - const EKANS ; $6C - const PARAS ; $6D - const POLIWHIRL ; $6E - const POLIWRATH ; $6F - const WEEDLE ; $70 - const KAKUNA ; $71 - const BEEDRILL ; $72 - const MISSINGNO_73 ; $73 - const DODRIO ; $74 - const PRIMEAPE ; $75 - const DUGTRIO ; $76 - const VENOMOTH ; $77 - const DEWGONG ; $78 - const MISSINGNO_79 ; $79 - const MISSINGNO_7A ; $7A - const CATERPIE ; $7B - const METAPOD ; $7C - const BUTTERFREE ; $7D - const MACHAMP ; $7E - const MISSINGNO_7F ; $7F - const GOLDUCK ; $80 - const HYPNO ; $81 - const GOLBAT ; $82 - const MEWTWO ; $83 - const SNORLAX ; $84 - const MAGIKARP ; $85 - const MISSINGNO_86 ; $86 - const MISSINGNO_87 ; $87 - const MUK ; $88 - const MISSINGNO_8A ; $8A - const KINGLER ; $8A - const CLOYSTER ; $8B - const MISSINGNO_8C ; $8C - const ELECTRODE ; $8D - const CLEFABLE ; $8E - const WEEZING ; $8F - const PERSIAN ; $90 - const MAROWAK ; $91 - const MISSINGNO_92 ; $92 - const HAUNTER ; $93 - const ABRA ; $94 - const ALAKAZAM ; $95 - const PIDGEOTTO ; $96 - const PIDGEOT ; $97 - const STARMIE ; $98 - const BULBASAUR ; $99 - const VENUSAUR ; $9A - const TENTACRUEL ; $9B - const MISSINGNO_9C ; $9C - const GOLDEEN ; $9D - const SEAKING ; $9E - const MISSINGNO_9F ; $9F - const MISSINGNO_A0 ; $A0 - const MISSINGNO_A1 ; $A1 - const MISSINGNO_A2 ; $A2 - const PONYTA ; $A3 - const RAPIDASH ; $A4 - const RATTATA ; $A5 - const RATICATE ; $A6 - const NIDORINO ; $A7 - const NIDORINA ; $A8 - const GEODUDE ; $A9 - const PORYGON ; $AA - const AERODACTYL ; $AB - const MISSINGNO_AC ; $AC - const MAGNEMITE ; $AD - const MISSINGNO_AE ; $AE - const MISSINGNO_AF ; $AF - const CHARMANDER ; $B0 - const SQUIRTLE ; $B1 - const CHARMELEON ; $B2 - const WARTORTLE ; $B3 - const CHARIZARD ; $B4 - const MISSINGNO_B5 ; $B5 - const FOSSIL_KABUTOPS ; $B6 - const FOSSIL_AERODACTYL ; $B7 - const MON_GHOST ; $B8 - const ODDISH ; $B9 - const GLOOM ; $BA - const VILEPLUME ; $BB - const BELLSPROUT ; $BC - const WEEPINBELL ; $BD - const VICTREEBEL ; $BE + const BULBASAUR ; 1 + const IVYSAUR ; 2 + const VENUSAUR ; 3 + const CHARMANDER ; 4 + const CHARMELEON ; 5 + const CHARIZARD ; 6 + const SQUIRTLE ; 7 + const WARTORTLE ; 8 + const BLASTOISE ; 9 + const CATERPIE ; 10 + const METAPOD ; 11 + const BUTTERFREE ; 12 + const WEEDLE ; 13 + const KAKUNA ; 14 + const BEEDRILL ; 15 + const PIDGEY ; 16 + const PIDGEOTTO ; 17 + const PIDGEOT ; 18 + const RATTATA ; 19 + const RATICATE ; 20 + const SPEAROW ; 21 + const FEAROW ; 22 + const EKANS ; 23 + const ARBOK ; 24 + const PIKACHU ; 25 + const RAICHU ; 26 + const SANDSHREW ; 27 + const SANDSLASH ; 28 + const NIDORAN_F ; 29 + const NIDORINA ; 30 + const NIDOQUEEN ; 31 + const NIDORAN_M ; 32 + const NIDORINO ; 33 + const NIDOKING ; 34 + const CLEFAIRY ; 35 + const CLEFABLE ; 36 + const VULPIX ; 37 + const NINETALES ; 38 + const JIGGLYPUFF ; 39 + const WIGGLYTUFF ; 40 + const ZUBAT ; 41 + const GOLBAT ; 42 + const ODDISH ; 43 + const GLOOM ; 44 + const VILEPLUME ; 45 + const PARAS ; 46 + const PARASECT ; 47 + const VENONAT ; 48 + const VENOMOTH ; 49 + const DIGLETT ; 50 + const DUGTRIO ; 51 + const MEOWTH ; 52 + const PERSIAN ; 53 + const PSYDUCK ; 54 + const GOLDUCK ; 55 + const MANKEY ; 56 + const PRIMEAPE ; 57 + const GROWLITHE ; 58 + const ARCANINE ; 59 + const POLIWAG ; 60 + const POLIWHIRL ; 61 + const POLIWRATH ; 62 + const ABRA ; 63 + const KADABRA ; 64 + const ALAKAZAM ; 65 + const MACHOP ; 66 + const MACHOKE ; 67 + const MACHAMP ; 68 + const BELLSPROUT ; 69 + const WEEPINBELL ; 70 + const VICTREEBEL ; 71 + const TENTACOOL ; 72 + const TENTACRUEL ; 73 + const GEODUDE ; 74 + const GRAVELER ; 75 + const GOLEM ; 76 + const PONYTA ; 77 + const RAPIDASH ; 78 + const SLOWPOKE ; 79 + const SLOWBRO ; 80 + const MAGNEMITE ; 81 + const MAGNETON ; 82 + const FARFETCHD ; 83 + const DODUO ; 84 + const DODRIO ; 85 + const SEEL ; 86 + const DEWGONG ; 87 + const GRIMER ; 88 + const MUK ; 89 + const SHELLDER ; 90 + const CLOYSTER ; 91 + const GASTLY ; 92 + const HAUNTER ; 93 + const GENGAR ; 94 + const ONIX ; 95 + const DROWZEE ; 96 + const HYPNO ; 97 + const KRABBY ; 98 + const KINGLER ; 99 + const VOLTORB ; 100 + const ELECTRODE ; 101 + const EXEGGCUTE ; 102 + const EXEGGUTOR ; 103 + const CUBONE ; 104 + const MAROWAK ; 105 + const HITMONLEE ; 106 + const HITMONCHAN ; 107 + const LICKITUNG ; 108 + const KOFFING ; 109 + const WEEZING ; 110 + const RHYHORN ; 111 + const RHYDON ; 112 + const CHANSEY ; 113 + const TANGELA ; 114 + const KANGASKHAN ; 115 + const HORSEA ; 116 + const SEADRA ; 117 + const GOLDEEN ; 118 + const SEAKING ; 119 + const STARYU ; 120 + const STARMIE ; 121 + const MR_MIME ; 122 + const SCYTHER ; 123 + const JYNX ; 124 + const ELECTABUZZ ; 125 + const MAGMAR ; 126 + const PINSIR ; 127 + const TAUROS ; 128 + const MAGIKARP ; 129 + const GYARADOS ; 130 + const LAPRAS ; 131 + const DITTO ; 132 + const EEVEE ; 133 + const VAPOREON ; 134 + const JOLTEON ; 135 + const FLAREON ; 136 + const PORYGON ; 137 + const OMANYTE ; 138 + const OMASTAR ; 139 + const KABUTO ; 140 + const KABUTOPS ; 141 + const AERODACTYL ; 142 + const SNORLAX ; 143 + const ARTICUNO ; 144 + const ZAPDOS ; 145 + const MOLTRES ; 146 + const DRATINI ; 147 + const DRAGONAIR ; 148 + const DRAGONITE ; 149 + const MEWTWO ; 150 + const MEW ; 151 + const FOSSIL_KABUTOPS ; 152 + const FOSSIL_AERODACTYL ; 153 + const MON_GHOST ; 154 diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index 1a41bb5c..da70fc63 100644 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,35,40 tmlearn 44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(AbraPicFront) diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 874dd57d..2b3520aa 100644 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(AerodactylPicFront) diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index c20b6c41..1202fb3e 100644 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,35,40 tmlearn 44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(AlakazamPicFront) diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index 6beee569..5fdf2a79 100644 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(ArbokPicFront) diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 2a2dda3b..9cbd0d9b 100644 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(ArcaninePicFront) diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index ef791055..95e5b3d2 100644 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(ArticunoPicFront) diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm index 6bf091b8..39e8b2ce 100644 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(BeedrillPicFront) diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index 1c908bbb..82ce2e44 100644 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(BellsproutPicFront) diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index eaf18b41..e3cd2af2 100644 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(BlastoisePicFront) diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 7b3567b5..ee68ca9d 100644 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -26,5 +26,5 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(BulbasaurPicFront) MonBaseStatsEnd: diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index c0fb5f6c..5e3b93ed 100644 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39 tmlearn 44,46 tmlearn 50 -db 0 ; padding +db BANK(ButterfreePicFront) diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm index d26bc5d9..705ff047 100644 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(CaterpiePicFront) diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 434b1c26..8f6cb92f 100644 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -25,4 +25,4 @@ db 4 ; growth rate tmlearn 33,34,35,37,38,40 tmlearn 41,44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(ChanseyPicFront) diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 2479a60c..2ce5cc04 100644 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50,51,54 -db 0 ; padding +db BANK(CharizardPicFront) diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index ccd53458..8cfaaf1d 100644 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50,51,54 -db 0 ; padding +db BANK(CharmanderPicFront) diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index 80aa2bca..21d7415a 100644 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50,51,54 -db 0 ; padding +db BANK(CharmeleonPicFront) diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index 17837da4..ce6d6de7 100644 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -25,4 +25,4 @@ db 4 ; growth rate tmlearn 33,34,35,38,40 tmlearn 44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(ClefablePicFront) diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index 952391c7..16c06b42 100644 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -25,4 +25,4 @@ db 4 ; growth rate tmlearn 33,34,35,38,40 tmlearn 44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(ClefairyPicFront) diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index 10f38bdb..dbfd5d5b 100644 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,36,39 tmlearn 44,47 tmlearn 49,50,53 -db 0 ; padding +db BANK(CloysterPicFront) diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index b1222d98..3ba6758d 100644 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,38,40 tmlearn 44 tmlearn 50,54 -db 0 ; padding +db BANK(CubonePicFront) diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index fb0cf2c2..85ade291 100644 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(DewgongPicFront) diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 8ef6e381..64a8a4af 100644 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34 tmlearn 44,48 tmlearn 50 -db 0 ; padding +db BANK(DiglettPicFront) diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index 90ea4c5e..d8300529 100644 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(DittoPicFront) diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index 99608f48..0987d145 100644 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 43,44 tmlearn 49,50,52 -db 0 ; padding +db BANK(DodrioPicFront) diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 760c258b..3f326784 100644 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 43,44 tmlearn 49,50,52 -db 0 ; padding +db BANK(DoduoPicFront) diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 041300e0..8be1e0ed 100644 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44,45 tmlearn 50,53 -db 0 ; padding +db BANK(DragonairPicFront) diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 442275b2..6d118a0d 100644 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44,45 tmlearn 50,53,54 -db 0 ; padding +db BANK(DragonitePicFront) diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index 5fb5c75d..43a1ac0e 100644 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44,45 tmlearn 50,53 -db 0 ; padding +db BANK(DratiniPicFront) diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index 452db1bc..4fd08a5d 100644 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,35,40 tmlearn 42,44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(DrowzeePicFront) diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index c763680f..174d18a4 100644 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34 tmlearn 44,48 tmlearn 50 -db 0 ; padding +db BANK(DugtrioPicFront) diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 51e36621..fc0faa0d 100644 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(EeveePicFront) diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index b029a67c..32da306a 100644 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(EkansPicFront) diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index 4b44604e..272f4471 100644 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,35,39,40 tmlearn 44,45,46 tmlearn 50,54,55 -db 0 ; padding +db BANK(ElectabuzzPicFront) diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index 1b292f2f..b4e21e27 100644 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,36,39,40 tmlearn 44,45,47 tmlearn 50,55 -db 0 ; padding +db BANK(ElectrodePicFront) diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index 8503889b..1c317013 100644 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,36,37 tmlearn 44,46,47 tmlearn 50 -db 0 ; padding +db BANK(ExeggcutePicFront) diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index 4d739430..9df74e4e 100644 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,36,37 tmlearn 44,46,47 tmlearn 50,54 -db 0 ; padding +db BANK(ExeggutorPicFront) diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 2aa7eca0..996c2c5a 100644 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44 tmlearn 50,51,52 -db 0 ; padding +db BANK(FarfetchdPicFront) diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 4ad88723..7d3ea62c 100644 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(FearowPicFront) diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index 70621a6a..c404e5eb 100644 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(FlareonPicFront) diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index fdcaaa71..8a82bfe6 100644 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,36 tmlearn 42,44,46,47 tmlearn 50 -db 0 ; padding +db BANK(GastlyPicFront) diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index 0e3e877c..50e1eaff 100644 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,36,40 tmlearn 42,44,46,47 tmlearn 50,54 -db 0 ; padding +db BANK(GengarPicFront) diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index a47a993a..5ac57c29 100644 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,36,38 tmlearn 44,47,48 tmlearn 50,54 -db 0 ; padding +db BANK(GeodudePicFront) diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm index f2153e5c..5861440d 100644 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(GloomPicFront) diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index 845adf4b..206aa494 100644 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(GolbatPicFront) diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index ed3a4fdb..6941b085 100644 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(GoldeenPicFront) diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm index cce89da7..9acb5d9b 100644 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(GolduckPicFront) diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index 28f2a326..6b882f90 100644 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,36,38 tmlearn 44,47,48 tmlearn 50,54 -db 0 ; padding +db BANK(GolemPicFront) diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 08776ab1..be42be38 100644 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,36,38 tmlearn 44,47,48 tmlearn 50,54 -db 0 ; padding +db BANK(GravelerPicFront) diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index 5f7a64a7..425ba9aa 100644 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,36,38 tmlearn 44,47 tmlearn 50 -db 0 ; padding +db BANK(GrimerPicFront) diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index df305636..d6aec9ec 100644 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(GrowlithePicFront) diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index 6bfc34a0..729b8553 100644 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(GyaradosPicFront) diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index bd39eaf4..10a8cebc 100644 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,36 tmlearn 42,44,46,47 tmlearn 50 -db 0 ; padding +db BANK(HaunterPicFront) diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 37021f65..b2714eee 100644 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,35,39,40 tmlearn 44 tmlearn 50,54 -db 0 ; padding +db BANK(HitmonchanPicFront) diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index d16db130..1133074e 100644 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,35,39,40 tmlearn 44 tmlearn 50,54 -db 0 ; padding +db BANK(HitmonleePicFront) diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index 01de3ff6..141d2fb4 100644 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(HorseaPicFront) diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 4e4959b4..7700050e 100644 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,35,40 tmlearn 42,44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(HypnoPicFront) diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm index 3e19f2a1..b08cec77 100644 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(IvysaurPicFront) diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index fac03fc9..da2e35a0 100644 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -25,4 +25,4 @@ db 4 ; growth rate tmlearn 33,34,38,40 tmlearn 44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(JigglypuffPicFront) diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index b33d6327..7df2abd5 100644 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45 tmlearn 50,55 -db 0 ; padding +db BANK(JolteonPicFront) diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index e69b87b9..72ace22b 100644 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,35,40 tmlearn 44,46 tmlearn 50 -db 0 ; padding +db BANK(JynxPicFront) diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 60f3e959..cf919834 100644 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(KabutoPicFront) diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index dbddab2e..f5fe14d3 100644 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(KabutopsPicFront) diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 472cc4c5..a643cf57 100644 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,35,40 tmlearn 44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(KadabraPicFront) diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm index ec593f91..910bee50 100644 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(KakunaPicFront) diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 6dcd1e3c..3a229b42 100644 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,38,40 tmlearn 44,48 tmlearn 50,53,54 -db 0 ; padding +db BANK(KangaskhanPicFront) diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 8708d5cf..9b4055d9 100644 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34 tmlearn 44 tmlearn 50,51,53,54 -db 0 ; padding +db BANK(KinglerPicFront) diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index fced6246..13c446fb 100644 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,36,38 tmlearn 44,47 tmlearn 50 -db 0 ; padding +db BANK(KoffingPicFront) diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 88d690b6..70b2aeae 100644 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34 tmlearn 44 tmlearn 50,51,53,54 -db 0 ; padding +db BANK(KrabbyPicFront) diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index 3a897525..925731ba 100644 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,40 tmlearn 44,46 tmlearn 50,53,54 -db 0 ; padding +db BANK(LaprasPicFront) diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 05020627..17c25818 100644 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,38,40 tmlearn 44 tmlearn 50,51,53,54 -db 0 ; padding +db BANK(LickitungPicFront) diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index b461d45a..a1e62eca 100644 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,38,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(MachampPicFront) diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index b8a41efd..101206d4 100644 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,38,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(MachokePicFront) diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index 9ed22dc2..338519fe 100644 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,38,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(MachopPicFront) diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index 50cc651c..104c1f54 100644 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(MagikarpPicFront) diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index 379e91df..03ec3745 100644 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,35,38,40 tmlearn 44,46 tmlearn 50,54 -db 0 ; padding +db BANK(MagmarPicFront) diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index ce042457..c4b10ff8 100644 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39 tmlearn 44,45 tmlearn 50,55 -db 0 ; padding +db BANK(MagnemitePicFront) diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index a2890bbd..76ea2361 100644 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39 tmlearn 44,45 tmlearn 50,55 -db 0 ; padding +db BANK(MagnetonPicFront) diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 406a1364..0a3851a8 100644 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,35,39,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(MankeyPicFront) diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 3b90dbb1..36b11bc3 100644 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,38,40 tmlearn 44 tmlearn 50,54 -db 0 ; padding +db BANK(MarowakPicFront) diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index dc146cf3..2c270631 100644 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(MeowthPicFront) diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm index 9da351ad..0d0a0ae2 100644 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(MetapodPicFront) diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 6919fd0e..5b12cc6e 100644 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -26,4 +26,4 @@ db 3 ; growth rate tmlearn 33,34,35,36,37,38,39,40 tmlearn 41,42,43,44,45,46,47,48 tmlearn 49,50,51,52,53,54,55,56 -db %11111111 ; usually spacing +db BANK(MewPicFront) diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index dc597345..922b4da7 100644 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,35,36,38,40 tmlearn 44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(MewtwoPicFront) diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index e9437405..f9a13d39 100644 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,38,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(MoltresPicFront) diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 8640e340..2b8bf758 100644 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,35,40 tmlearn 44,45,46 tmlearn 50,55 -db 0 ; padding +db BANK(MrMimePicFront) diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index cb15563e..74bb12b0 100644 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,36,38 tmlearn 44,47 tmlearn 50 -db 0 ; padding +db BANK(MukPicFront) diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index ebef0965..5d9dd903 100644 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,38,40 tmlearn 44,48 tmlearn 50,53,54 -db 0 ; padding +db BANK(NidokingPicFront) diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 9ea29a31..2d3beb50 100644 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,38,40 tmlearn 44,48 tmlearn 50,53,54 -db 0 ; padding +db BANK(NidoqueenPicFront) diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm index 67832f18..43fd5571 100644 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(NidoranFPicFront) diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm index a7882766..5beca83d 100644 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(NidoranMPicFront) diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm index 0ddecf70..f634caae 100644 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(NidorinaPicFront) diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm index fc435fc4..c01c8b53 100644 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(NidorinoPicFront) diff --git a/data/baseStats/ninetales.asm b/data/baseStats/ninetales.asm index e98028dc..41b670c7 100644 --- a/data/baseStats/ninetales.asm +++ b/data/baseStats/ninetales.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(NinetalesPicFront) diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm index c91c5138..14aebeee 100644 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(OddishPicFront) diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index 3c461876..73b2127d 100644 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(OmanytePicFront) diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index 09a2ae77..dafbd34f 100644 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(OmastarPicFront) diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index 6f3be4df..477645ad 100644 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,36,40 tmlearn 44,47,48 tmlearn 50,54 -db 0 ; padding +db BANK(OnixPicFront) diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm index 2c918e68..57482d25 100644 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(ParasPicFront) diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm index dfa0c73e..eafc35e4 100644 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(ParasectPicFront) diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index 2f5ef125..afab78c6 100644 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(PersianPicFront) diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index 05350d07..bff841cd 100644 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(PidgeotPicFront) diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index 74440fcc..e84e5584 100644 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(PidgeottoPicFront) diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index ec032d6b..d6a48ad4 100644 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(PidgeyPicFront) diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm index 09971b79..d14a4a9b 100644 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45 tmlearn 50,55 -db 0 ; padding +db BANK(PikachuPicFront) diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index 08c0e95a..753a5d66 100644 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 34 tmlearn 44 tmlearn 50,51,54 -db 0 ; padding +db BANK(PinsirPicFront) diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 8014811e..6efeae28 100644 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,40 tmlearn 44,46 tmlearn 50,53 -db 0 ; padding +db BANK(PoliwagPicFront) diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index 6209da68..5e1b5161 100644 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,40 tmlearn 44,46 tmlearn 50,53,54 -db 0 ; padding +db BANK(PoliwhirlPicFront) diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index 9489a6a3..cb7c9e07 100644 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 34,35,40 tmlearn 44,46 tmlearn 50,53,54 -db 0 ; padding +db BANK(PoliwrathPicFront) diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index a6ff9e4b..7367e3c4 100644 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(PonytaPicFront) diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index a049fa7f..59875985 100644 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45,46 tmlearn 49,50,55 -db 0 ; padding +db BANK(PorygonPicFront) diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index 659edefd..5827c198 100644 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,35,39,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(PrimeapePicFront) diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index db3ac79f..5980faac 100644 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(PsyduckPicFront) diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm index c830483c..04e26ea6 100644 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45 tmlearn 50,55 -db 0 ; padding +db BANK(RaichuPicFront) diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index c452159e..7b113801 100644 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(RapidashPicFront) diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index ff8373d5..82896aa9 100644 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(RaticatePicFront) diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index 7edfb626..838fcd9b 100644 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(RattataPicFront) diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index d7066906..fa686a46 100644 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 34,38,40 tmlearn 44,48 tmlearn 50,53,54 -db 0 ; padding +db BANK(RhydonPicFront) diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index a6491bd5..79d27ce2 100644 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 34,38,40 tmlearn 44,48 tmlearn 50,54 -db 0 ; padding +db BANK(RhyhornPicFront) diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index a9875a8e..1ad52514 100644 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44,48 tmlearn 50,51,54 -db 0 ; padding +db BANK(SandshrewPicFront) diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index 30477eb4..f123f78b 100644 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44,48 tmlearn 50,51,54 -db 0 ; padding +db BANK(SandslashPicFront) diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index 13de0d2b..ea3fe52d 100644 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(ScytherPicFront) diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index 9f28001b..be718833 100644 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(SeadraPicFront) diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index d4fbe8ea..0b751690 100644 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(SeakingPicFront) diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index ef9c2898..8d6a198c 100644 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(SeelPicFront) diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index 7c2cdf9d..ac006f70 100644 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,36,39 tmlearn 44,47 tmlearn 49,50,53 -db 0 ; padding +db BANK(ShellderPicFront) diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index ffeda79e..7c222bbc 100644 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44,45,46 tmlearn 49,50,53,54,55 -db 0 ; padding +db BANK(SlowbroPicFront) diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index ea238a6e..834616d6 100644 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44,45,46 tmlearn 49,50,53,54,55 -db 0 ; padding +db BANK(SlowpokePicFront) diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index 2d1fd6e3..8fe379ca 100644 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,35,36,38,40 tmlearn 44,46,48 tmlearn 50,53,54 -db 0 ; padding +db BANK(SnorlaxPicFront) diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index eb8ab1ec..5627f394 100644 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39 tmlearn 43,44 tmlearn 50,52 -db 0 ; padding +db BANK(SpearowPicFront) diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index f8dcd0a1..10885091 100644 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(SquirtlePicFront) diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index 686dfa57..42a47c7b 100644 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45,46 tmlearn 49,50,53,55 -db 0 ; padding +db BANK(StarmiePicFront) diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index 35f51a6a..2cec32d7 100644 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,39,40 tmlearn 44,45,46 tmlearn 49,50,53,55 -db 0 ; padding +db BANK(StaryuPicFront) diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index b50a57bc..60600a01 100644 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,40 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(TangelaPicFront) diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 87f28ec6..10b4f142 100644 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 34,38,40 tmlearn 44 tmlearn 50,54 -db 0 ; padding +db BANK(TaurosPicFront) diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index 7237f083..89767008 100644 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,51,53 -db 0 ; padding +db BANK(TentacoolPicFront) diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index d3d93919..ed504594 100644 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,51,53 -db 0 ; padding +db BANK(TentacruelPicFront) diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index e22b3185..74947c43 100644 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39,40 tmlearn 44 tmlearn 50,53 -db 0 ; padding +db BANK(VaporeonPicFront) diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 7a5bd981..0535c62e 100644 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,39 tmlearn 44,46 tmlearn 50 -db 0 ; padding +db BANK(VenomothPicFront) diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index aeadc6cd..11d409a5 100644 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34 tmlearn 44,46 tmlearn 50 -db 0 ; padding +db BANK(VenonatPicFront) diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 0a457321..5ce09b48 100644 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(VenusaurPicFront) diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 7a82c86e..9c16d13d 100644 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(VictreebelPicFront) diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm index 17bb9739..278806d7 100644 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(VileplumePicFront) diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index 92d2ccb3..1fe61a6b 100644 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,36,39 tmlearn 44,45,47 tmlearn 50,55 -db 0 ; padding +db BANK(VoltorbPicFront) diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 9577ae30..f5a3ab5a 100644 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 33,34,38,39,40 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(VulpixPicFront) diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index bc86bd6f..1de0c252 100644 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34,40 tmlearn 44 tmlearn 50,53,54 -db 0 ; padding +db BANK(WartortlePicFront) diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm index 8370dc41..954f2847 100644 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 0 tmlearn 0 tmlearn 0 -db 0 ; padding +db BANK(WeedlePicFront) diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 735a453f..1aa9b929 100644 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -25,4 +25,4 @@ db 3 ; growth rate tmlearn 33,34 tmlearn 44 tmlearn 50,51 -db 0 ; padding +db BANK(WeepinbellPicFront) diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index 0dd09dfe..44405ee3 100644 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,36,38 tmlearn 44,47 tmlearn 50 -db 0 ; padding +db BANK(WeezingPicFront) diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index d5fd08e2..c5719182 100644 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -25,4 +25,4 @@ db 4 ; growth rate tmlearn 33,34,38,40 tmlearn 44,45,46 tmlearn 49,50,54,55 -db 0 ; padding +db BANK(WigglytuffPicFront) diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 487052ba..e4cba0ae 100644 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -25,4 +25,4 @@ db 5 ; growth rate tmlearn 33,34,39 tmlearn 43,44,45 tmlearn 50,52,55 -db 0 ; padding +db BANK(ZapdosPicFront) diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index 1caa4259..a82630ac 100644 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -25,4 +25,4 @@ db 0 ; growth rate tmlearn 34,39 tmlearn 44 tmlearn 50 -db 0 ; padding +db BANK(ZubatPicFront) diff --git a/data/cries.asm b/data/cries.asm index 7031536e..96dd2d4a 100755 --- a/data/cries.asm +++ b/data/cries.asm @@ -1,192 +1,153 @@ CryData: ;$BaseCry, $Pitch, $Length - db $11, $00, $80; Rhydon - db $03, $00, $80; Kangaskhan - db $00, $00, $80; Nidoran♂ - db $19, $CC, $01; Clefairy - db $10, $00, $80; Spearow - db $06, $ED, $80; Voltorb - db $09, $00, $80; Nidoking - db $1F, $00, $80; Slowbro + db $0F, $80, $01; Bulbasaur db $0F, $20, $80; Ivysaur - db $0D, $00, $80; Exeggutor - db $0C, $00, $80; Lickitung - db $0B, $00, $80; Exeggcute - db $05, $00, $80; Grimer - db $07, $00, $FF; Gengar - db $01, $00, $80; Nidoran♀ - db $0A, $00, $80; Nidoqueen - db $19, $00, $80; Cubone - db $04, $00, $80; Rhyhorn - db $1B, $00, $80; Lapras - db $15, $00, $80; Arcanine - db $1E, $EE, $FF; Mew - db $17, $00, $80; Gyarados - db $18, $00, $80; Shellder - db $1A, $00, $80; Tentacool - db $1C, $00, $80; Gastly - db $16, $00, $80; Scyther - db $1E, $02, $20; Staryu + db $0F, $00, $C0; Venusaur + db $04, $60, $40; Charmander + db $04, $20, $40; Charmeleon + db $04, $00, $80; Charizard + db $1D, $60, $40; Squirtle + db $1D, $20, $40; Wartortle db $13, $00, $80; Blastoise - db $14, $00, $80; Pinsir - db $12, $00, $80; Tangela - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $1F, $20, $40; Growlithe - db $17, $FF, $C0; Onix - db $18, $40, $A0; Fearow + db $16, $80, $20; Caterpie + db $1C, $CC, $01; Metapod + db $16, $77, $40; Butterfree + db $15, $EE, $01; Weedle + db $13, $FF, $01; Kakuna + db $13, $60, $80; Beedrill db $0E, $DF, $04; Pidgey - db $02, $00, $80; Slowpoke - db $1C, $A8, $C0; Kadabra - db $24, $00, $80; Graveler - db $14, $0A, $C0; Chansey - db $1F, $48, $60; Machoke - db $20, $08, $40; Mr.Mime - db $12, $80, $C0; Hitmonlee - db $0C, $EE, $C0; Hitmonchan + db $14, $28, $C0; Pidgeotto + db $14, $11, $FF; Pidgeot + db $22, $00, $80; Rattata + db $22, $20, $FF; Raticate + db $10, $00, $80; Spearow + db $18, $40, $A0; Fearow + db $17, $12, $40; Ekans db $17, $E0, $10; Arbok - db $1E, $42, $FF; Parasect - db $21, $20, $60; Psyduck - db $0D, $88, $20; Drowzee - db $12, $E0, $40; Golem - db $00, $00, $00; MissingNo. - db $04, $FF, $30; Magmar - db $00, $00, $00; MissingNo. - db $06, $8F, $FF; Electabuzz - db $1C, $20, $C0; Magneton - db $12, $E6, $DD; Koffing - db $00, $00, $00; MissingNo. - db $0A, $DD, $60; Mankey - db $0C, $88, $C0; Seel - db $0B, $AA, $01; Diglett - db $1D, $11, $40; Tauros - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $10, $DD, $01; Farfetch'd - db $1A, $44, $40; Venonat - db $0F, $3C, $C0; Dragonite - db $00, $80, $10; MissingNo. - db $00, $00, $00; MissingNo. - db $1D, $E0, $80; MissingNo. - db $0B, $BB, $01; Doduo - db $0E, $FF, $FF; Poliwag - db $0D, $FF, $FF; Jynx - db $09, $F8, $40; Moltres - db $09, $80, $40; Articuno - db $18, $FF, $80; Zapdos - db $0E, $FF, $FF; Ditto - db $19, $77, $10; Meowth - db $20, $20, $E0; Krabby - db $22, $FF, $40; MissingNo. - db $00, $00, $00; MissingNo. - db $0E, $E0, $60; MissingNo. - db $24, $4F, $10; Vulpix - db $24, $88, $60; Ninetales db $0F, $EE, $01; Pikachu db $09, $EE, $08; Raichu - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $0F, $60, $40; Dratini - db $0F, $40, $80; Dragonair - db $16, $BB, $40; Kabuto - db $18, $EE, $01; Kabutops - db $19, $99, $10; Horsea - db $19, $3C, $01; Seadra - db $0F, $40, $C0; MissingNo. - db $0F, $20, $C0; MissingNo. db $00, $20, $40; Sandshrew db $00, $FF, $FF; Sandslash - db $1F, $F0, $01; Omanyte - db $1F, $FF, $40; Omastar + db $01, $00, $80; Nidoran♀ + db $01, $2C, $E0; Nidorina + db $0A, $00, $80; Nidoqueen + db $00, $00, $80; Nidoran♂ + db $00, $2C, $C0; Nidorino + db $09, $00, $80; Nidoking + db $19, $CC, $01; Clefairy + db $19, $AA, $20; Clefable + db $24, $4F, $10; Vulpix + db $24, $88, $60; Ninetales db $0E, $FF, $35; Jigglypuff db $0E, $68, $60; Wigglytuff - db $1A, $88, $60; Eevee - db $1A, $10, $20; Flareon - db $1A, $3D, $80; Jolteon - db $1A, $AA, $FF; Vaporeon - db $1F, $EE, $01; Machop db $1D, $E0, $80; Zubat - db $17, $12, $40; Ekans + db $1D, $FA, $80; Golbat + db $08, $DD, $01; Oddish + db $08, $AA, $40; Gloom + db $23, $22, $FF; Vileplume db $1E, $20, $E0; Paras + db $1E, $42, $FF; Parasect + db $1A, $44, $40; Venonat + db $1A, $29, $80; Venomoth + db $0B, $AA, $01; Diglett + db $0B, $2A, $10; Dugtrio + db $19, $77, $10; Meowth + db $19, $99, $FF; Persian + db $21, $20, $60; Psyduck + db $21, $FF, $40; Golduck + db $0A, $DD, $60; Mankey + db $0A, $AF, $40; Primeape + db $1F, $20, $40; Growlithe + db $15, $00, $80; Arcanine + db $0E, $FF, $FF; Poliwag db $0E, $77, $60; Poliwhirl db $0E, $00, $FF; Poliwrath - db $15, $EE, $01; Weedle - db $13, $FF, $01; Kakuna - db $13, $60, $80; Beedrill - db $00, $00, $00; MissingNo. + db $1C, $C0, $01; Abra + db $1C, $A8, $C0; Kadabra + db $1C, $98, $FF; Alakazam + db $1F, $EE, $01; Machop + db $1F, $48, $60; Machoke + db $1F, $08, $C0; Machamp + db $21, $55, $01; Bellsprout + db $25, $44, $20; Weepinbell + db $25, $66, $CC; Victreebel + db $1A, $00, $80; Tentacool + db $1A, $EE, $FF; Tentacruel + db $24, $F0, $10; Geodude + db $24, $00, $80; Graveler + db $12, $E0, $40; Golem + db $25, $00, $80; Ponyta + db $25, $20, $C0; Rapidash + db $02, $00, $80; Slowpoke + db $1F, $00, $80; Slowbro + db $1C, $80, $60; Magnemite + db $1C, $20, $C0; Magneton + db $10, $DD, $01; Farfetch'd + db $0B, $BB, $01; Doduo db $0B, $99, $20; Dodrio - db $0A, $AF, $40; Primeape - db $0B, $2A, $10; Dugtrio - db $1A, $29, $80; Venomoth + db $0C, $88, $C0; Seel db $0C, $23, $FF; Dewgong - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $16, $80, $20; Caterpie - db $1C, $CC, $01; Metapod - db $16, $77, $40; Butterfree - db $1F, $08, $C0; Machamp - db $11, $20, $10; MissingNo. - db $21, $FF, $40; Golduck - db $0D, $EE, $40; Hypno - db $1D, $FA, $80; Golbat - db $1E, $99, $FF; Mewtwo - db $05, $55, $01; Snorlax - db $17, $80, $00; Magikarp - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. + db $05, $00, $80; Grimer db $07, $EF, $FF; Muk - db $0F, $40, $80; MissingNo. - db $20, $EE, $E0; Kingler + db $18, $00, $80; Shellder db $18, $6F, $E0; Cloyster - db $00, $00, $00; MissingNo. + db $1C, $00, $80; Gastly + db $1C, $30, $40; Haunter + db $07, $00, $FF; Gengar + db $17, $FF, $C0; Onix + db $0D, $88, $20; Drowzee + db $0D, $EE, $40; Hypno + db $20, $20, $E0; Krabby + db $20, $EE, $E0; Kingler + db $06, $ED, $80; Voltorb db $06, $A8, $90; Electrode - db $19, $AA, $20; Clefable - db $12, $FF, $FF; Weezing - db $19, $99, $FF; Persian + db $0B, $00, $80; Exeggcute + db $0D, $00, $80; Exeggutor + db $19, $00, $80; Cubone db $08, $4F, $60; Marowak - db $00, $00, $00; MissingNo. - db $1C, $30, $40; Haunter - db $1C, $C0, $01; Abra - db $1C, $98, $FF; Alakazam - db $14, $28, $C0; Pidgeotto - db $14, $11, $FF; Pidgeot - db $1E, $00, $80; Starmie - db $0F, $80, $01; Bulbasaur - db $0F, $00, $C0; Venusaur - db $1A, $EE, $FF; Tentacruel - db $00, $00, $00; MissingNo. + db $12, $80, $C0; Hitmonlee + db $0C, $EE, $C0; Hitmonchan + db $0C, $00, $80; Lickitung + db $12, $E6, $DD; Koffing + db $12, $FF, $FF; Weezing + db $04, $00, $80; Rhyhorn + db $11, $00, $80; Rhydon + db $14, $0A, $C0; Chansey + db $12, $00, $80; Tangela + db $03, $00, $80; Kangaskhan + db $19, $99, $10; Horsea + db $19, $3C, $01; Seadra db $16, $80, $40; Goldeen db $16, $10, $FF; Seaking - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $25, $00, $80; Ponyta - db $25, $20, $C0; Rapidash - db $22, $00, $80; Rattata - db $22, $20, $FF; Raticate - db $00, $2C, $C0; Nidorino - db $01, $2C, $E0; Nidorina - db $24, $F0, $10; Geodude + db $1E, $02, $20; Staryu + db $1E, $00, $80; Starmie + db $20, $08, $40; Mr.Mime + db $16, $00, $80; Scyther + db $0D, $FF, $FF; Jynx + db $06, $8F, $FF; Electabuzz + db $04, $FF, $30; Magmar + db $14, $00, $80; Pinsir + db $1D, $11, $40; Tauros + db $17, $80, $00; Magikarp + db $17, $00, $80; Gyarados + db $1B, $00, $80; Lapras + db $0E, $FF, $FF; Ditto + db $1A, $88, $60; Eevee + db $1A, $AA, $FF; Vaporeon + db $1A, $3D, $80; Jolteon + db $1A, $10, $20; Flareon db $25, $AA, $FF; Porygon + db $1F, $F0, $01; Omanyte + db $1F, $FF, $40; Omastar + db $16, $BB, $40; Kabuto + db $18, $EE, $01; Kabutops db $23, $20, $F0; Aerodactyl - db $00, $00, $00; MissingNo. - db $1C, $80, $60; Magnemite - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $04, $60, $40; Charmander - db $1D, $60, $40; Squirtle - db $04, $20, $40; Charmeleon - db $1D, $20, $40; Wartortle - db $04, $00, $80; Charizard - db $1D, $00, $80; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $00, $00, $00; MissingNo. - db $08, $DD, $01; Oddish - db $08, $AA, $40; Gloom - db $23, $22, $FF; Vileplume - db $21, $55, $01; Bellsprout - db $25, $44, $20; Weepinbell - db $25, $66, $CC; Victreebel + db $05, $55, $01; Snorlax + db $09, $80, $40; Articuno + db $18, $FF, $80; Zapdos + db $09, $F8, $40; Moltres + db $0F, $60, $40; Dratini + db $0F, $40, $80; Dragonair + db $0F, $3C, $C0; Dragonite + db $1E, $99, $FF; Mewtwo + db $1E, $EE, $FF; Mew diff --git a/data/evos_moves.asm b/data/evos_moves.asm index 2371fb83..f65c9494 100755 --- a/data/evos_moves.asm +++ b/data/evos_moves.asm @@ -1,194 +1,155 @@ EvosMovesPointerTable: - dw Mon112_EvosMoves - dw Mon115_EvosMoves - dw Mon032_EvosMoves - dw Mon035_EvosMoves - dw Mon021_EvosMoves - dw Mon100_EvosMoves - dw Mon034_EvosMoves - dw Mon080_EvosMoves + dw Mon001_EvosMoves dw Mon002_EvosMoves - dw Mon103_EvosMoves - dw Mon108_EvosMoves - dw Mon102_EvosMoves - dw Mon088_EvosMoves - dw Mon094_EvosMoves - dw Mon029_EvosMoves - dw Mon031_EvosMoves - dw Mon104_EvosMoves - dw Mon111_EvosMoves - dw Mon131_EvosMoves - dw Mon059_EvosMoves - dw Mon151_EvosMoves - dw Mon130_EvosMoves - dw Mon090_EvosMoves - dw Mon072_EvosMoves - dw Mon092_EvosMoves - dw Mon123_EvosMoves - dw Mon120_EvosMoves + dw Mon003_EvosMoves + dw Mon004_EvosMoves + dw Mon005_EvosMoves + dw Mon006_EvosMoves + dw Mon007_EvosMoves + dw Mon008_EvosMoves dw Mon009_EvosMoves - dw Mon127_EvosMoves - dw Mon114_EvosMoves - dw Mon152_EvosMoves ;MissingNo - dw Mon153_EvosMoves ;MissingNo - dw Mon058_EvosMoves - dw Mon095_EvosMoves - dw Mon022_EvosMoves + dw Mon010_EvosMoves + dw Mon011_EvosMoves + dw Mon012_EvosMoves + dw Mon013_EvosMoves + dw Mon014_EvosMoves + dw Mon015_EvosMoves dw Mon016_EvosMoves - dw Mon079_EvosMoves - dw Mon064_EvosMoves - dw Mon075_EvosMoves - dw Mon113_EvosMoves - dw Mon067_EvosMoves - dw Mon122_EvosMoves - dw Mon106_EvosMoves - dw Mon107_EvosMoves + dw Mon017_EvosMoves + dw Mon018_EvosMoves + dw Mon019_EvosMoves + dw Mon020_EvosMoves + dw Mon021_EvosMoves + dw Mon022_EvosMoves + dw Mon023_EvosMoves dw Mon024_EvosMoves - dw Mon047_EvosMoves - dw Mon054_EvosMoves - dw Mon096_EvosMoves - dw Mon076_EvosMoves - dw Mon154_EvosMoves ;MissingNo - dw Mon126_EvosMoves - dw Mon155_EvosMoves ;MissingNo - dw Mon125_EvosMoves - dw Mon082_EvosMoves - dw Mon109_EvosMoves - dw Mon156_EvosMoves ;MissingNo - dw Mon056_EvosMoves - dw Mon086_EvosMoves - dw Mon050_EvosMoves - dw Mon128_EvosMoves - dw Mon157_EvosMoves ;MissingNo - dw Mon158_EvosMoves ;MissingNo - dw Mon159_EvosMoves ;MissingNo - dw Mon083_EvosMoves - dw Mon048_EvosMoves - dw Mon149_EvosMoves - dw Mon160_EvosMoves ;MissingNo - dw Mon161_EvosMoves ;MissingNo - dw Mon162_EvosMoves ;MissingNo - dw Mon084_EvosMoves - dw Mon060_EvosMoves - dw Mon124_EvosMoves - dw Mon146_EvosMoves - dw Mon144_EvosMoves - dw Mon145_EvosMoves - dw Mon132_EvosMoves - dw Mon052_EvosMoves - dw Mon098_EvosMoves - dw Mon163_EvosMoves ;MissingNo - dw Mon164_EvosMoves ;MissingNo - dw Mon165_EvosMoves ;MissingNo - dw Mon037_EvosMoves - dw Mon038_EvosMoves dw Mon025_EvosMoves dw Mon026_EvosMoves - dw Mon166_EvosMoves ;MissingNo - dw Mon167_EvosMoves ;MissingNo - dw Mon147_EvosMoves - dw Mon148_EvosMoves - dw Mon140_EvosMoves - dw Mon141_EvosMoves - dw Mon116_EvosMoves - dw Mon117_EvosMoves - dw Mon168_EvosMoves ;MissingNo - dw Mon169_EvosMoves ;MissingNo dw Mon027_EvosMoves dw Mon028_EvosMoves - dw Mon138_EvosMoves - dw Mon139_EvosMoves + dw Mon029_EvosMoves + dw Mon030_EvosMoves + dw Mon031_EvosMoves + dw Mon032_EvosMoves + dw Mon033_EvosMoves + dw Mon034_EvosMoves + dw Mon035_EvosMoves + dw Mon036_EvosMoves + dw Mon037_EvosMoves + dw Mon038_EvosMoves dw Mon039_EvosMoves dw Mon040_EvosMoves - dw Mon133_EvosMoves - dw Mon136_EvosMoves - dw Mon135_EvosMoves - dw Mon134_EvosMoves - dw Mon066_EvosMoves dw Mon041_EvosMoves - dw Mon023_EvosMoves + dw Mon042_EvosMoves + dw Mon043_EvosMoves + dw Mon044_EvosMoves + dw Mon045_EvosMoves dw Mon046_EvosMoves + dw Mon047_EvosMoves + dw Mon048_EvosMoves + dw Mon049_EvosMoves + dw Mon050_EvosMoves + dw Mon051_EvosMoves + dw Mon052_EvosMoves + dw Mon053_EvosMoves + dw Mon054_EvosMoves + dw Mon055_EvosMoves + dw Mon056_EvosMoves + dw Mon057_EvosMoves + dw Mon058_EvosMoves + dw Mon059_EvosMoves + dw Mon060_EvosMoves dw Mon061_EvosMoves dw Mon062_EvosMoves - dw Mon013_EvosMoves - dw Mon014_EvosMoves - dw Mon015_EvosMoves - dw Mon170_EvosMoves ;MissingNo + dw Mon063_EvosMoves + dw Mon064_EvosMoves + dw Mon065_EvosMoves + dw Mon066_EvosMoves + dw Mon067_EvosMoves + dw Mon068_EvosMoves + dw Mon069_EvosMoves + dw Mon070_EvosMoves + dw Mon071_EvosMoves + dw Mon072_EvosMoves + dw Mon073_EvosMoves + dw Mon074_EvosMoves + dw Mon075_EvosMoves + dw Mon076_EvosMoves + dw Mon077_EvosMoves + dw Mon078_EvosMoves + dw Mon079_EvosMoves + dw Mon080_EvosMoves + dw Mon081_EvosMoves + dw Mon082_EvosMoves + dw Mon083_EvosMoves + dw Mon084_EvosMoves dw Mon085_EvosMoves - dw Mon057_EvosMoves - dw Mon051_EvosMoves - dw Mon049_EvosMoves + dw Mon086_EvosMoves dw Mon087_EvosMoves - dw Mon171_EvosMoves ;MissingNo - dw Mon172_EvosMoves ;MissingNo - dw Mon010_EvosMoves - dw Mon011_EvosMoves - dw Mon012_EvosMoves - dw Mon068_EvosMoves - dw Mon173_EvosMoves ;MissingNo - dw Mon055_EvosMoves - dw Mon097_EvosMoves - dw Mon042_EvosMoves - dw Mon150_EvosMoves - dw Mon143_EvosMoves - dw Mon129_EvosMoves - dw Mon174_EvosMoves ;MissingNo - dw Mon175_EvosMoves ;MissingNo + dw Mon088_EvosMoves dw Mon089_EvosMoves - dw Mon176_EvosMoves ;MissingNo - dw Mon099_EvosMoves + dw Mon090_EvosMoves dw Mon091_EvosMoves - dw Mon177_EvosMoves ;MissingNo + dw Mon092_EvosMoves + dw Mon093_EvosMoves + dw Mon094_EvosMoves + dw Mon095_EvosMoves + dw Mon096_EvosMoves + dw Mon097_EvosMoves + dw Mon098_EvosMoves + dw Mon099_EvosMoves + dw Mon100_EvosMoves dw Mon101_EvosMoves - dw Mon036_EvosMoves - dw Mon110_EvosMoves - dw Mon053_EvosMoves + dw Mon102_EvosMoves + dw Mon103_EvosMoves + dw Mon104_EvosMoves dw Mon105_EvosMoves - dw Mon178_EvosMoves ;MissingNo - dw Mon093_EvosMoves - dw Mon063_EvosMoves - dw Mon065_EvosMoves - dw Mon017_EvosMoves - dw Mon018_EvosMoves - dw Mon121_EvosMoves - dw Mon001_EvosMoves - dw Mon003_EvosMoves - dw Mon073_EvosMoves - dw Mon179_EvosMoves ;MissingNo + dw Mon106_EvosMoves + dw Mon107_EvosMoves + dw Mon108_EvosMoves + dw Mon109_EvosMoves + dw Mon110_EvosMoves + dw Mon111_EvosMoves + dw Mon112_EvosMoves + dw Mon113_EvosMoves + dw Mon114_EvosMoves + dw Mon115_EvosMoves + dw Mon116_EvosMoves + dw Mon117_EvosMoves dw Mon118_EvosMoves dw Mon119_EvosMoves - dw Mon180_EvosMoves ;MissingNo - dw Mon181_EvosMoves ;MissingNo - dw Mon182_EvosMoves ;MissingNo - dw Mon183_EvosMoves ;MissingNo - dw Mon077_EvosMoves - dw Mon078_EvosMoves - dw Mon019_EvosMoves - dw Mon020_EvosMoves - dw Mon033_EvosMoves - dw Mon030_EvosMoves - dw Mon074_EvosMoves + dw Mon120_EvosMoves + dw Mon121_EvosMoves + dw Mon122_EvosMoves + dw Mon123_EvosMoves + dw Mon124_EvosMoves + dw Mon125_EvosMoves + dw Mon126_EvosMoves + dw Mon127_EvosMoves + dw Mon128_EvosMoves + dw Mon129_EvosMoves + dw Mon130_EvosMoves + dw Mon131_EvosMoves + dw Mon132_EvosMoves + dw Mon133_EvosMoves + dw Mon134_EvosMoves + dw Mon135_EvosMoves + dw Mon136_EvosMoves dw Mon137_EvosMoves + dw Mon138_EvosMoves + dw Mon139_EvosMoves + dw Mon140_EvosMoves + dw Mon141_EvosMoves dw Mon142_EvosMoves - dw Mon184_EvosMoves ;MissingNo - dw Mon081_EvosMoves - dw Mon185_EvosMoves ;MissingNo - dw Mon186_EvosMoves ;MissingNo - dw Mon004_EvosMoves - dw Mon007_EvosMoves - dw Mon005_EvosMoves - dw Mon008_EvosMoves - dw Mon006_EvosMoves - dw Mon187_EvosMoves ;MissingNo - dw Mon188_EvosMoves ;MissingNo - dw Mon189_EvosMoves ;MissingNo - dw Mon190_EvosMoves ;MissingNo - dw Mon043_EvosMoves - dw Mon044_EvosMoves - dw Mon045_EvosMoves - dw Mon069_EvosMoves - dw Mon070_EvosMoves - dw Mon071_EvosMoves + dw Mon143_EvosMoves + dw Mon144_EvosMoves + dw Mon145_EvosMoves + dw Mon146_EvosMoves + dw Mon147_EvosMoves + dw Mon148_EvosMoves + dw Mon149_EvosMoves + dw Mon150_EvosMoves + dw Mon151_EvosMoves Mon112_EvosMoves: ;RHYDON diff --git a/data/pokedex_entries.asm b/data/pokedex_entries.asm index 3fb2d3c6..5c5d94d1 100755 --- a/data/pokedex_entries.asm +++ b/data/pokedex_entries.asm @@ -1,194 +1,155 @@ PokedexEntryPointers: - dw RhydonDexEntry - dw KangaskhanDexEntry - dw NidoranMDexEntry - dw ClefairyDexEntry - dw SpearowDexEntry - dw VoltorbDexEntry - dw NidokingDexEntry - dw SlowbroDexEntry + dw BulbasaurDexEntry dw IvysaurDexEntry - dw ExeggutorDexEntry - dw LickitungDexEntry - dw ExeggcuteDexEntry - dw GrimerDexEntry - dw GengarDexEntry - dw NidoranFDexEntry - dw NidoqueenDexEntry - dw CuboneDexEntry - dw RhyhornDexEntry - dw LaprasDexEntry - dw ArcanineDexEntry - dw MewDexEntry - dw GyaradosDexEntry - dw ShellderDexEntry - dw TentacoolDexEntry - dw GastlyDexEntry - dw ScytherDexEntry - dw StaryuDexEntry + dw VenusaurDexEntry + dw CharmanderDexEntry + dw CharmeleonDexEntry + dw CharizardDexEntry + dw SquirtleDexEntry + dw WartortleDexEntry dw BlastoiseDexEntry - dw PinsirDexEntry - dw TangelaDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw GrowlitheDexEntry - dw OnixDexEntry - dw FearowDexEntry + dw CaterpieDexEntry + dw MetapodDexEntry + dw ButterfreeDexEntry + dw WeedleDexEntry + dw KakunaDexEntry + dw BeedrillDexEntry dw PidgeyDexEntry - dw SlowpokeDexEntry - dw KadabraDexEntry - dw GravelerDexEntry - dw ChanseyDexEntry - dw MachokeDexEntry - dw MrMimeDexEntry - dw HitmonleeDexEntry - dw HitmonchanDexEntry + dw PidgeottoDexEntry + dw PidgeotDexEntry + dw RattataDexEntry + dw RaticateDexEntry + dw SpearowDexEntry + dw FearowDexEntry + dw EkansDexEntry dw ArbokDexEntry - dw ParasectDexEntry - dw PsyduckDexEntry - dw DrowzeeDexEntry - dw GolemDexEntry - dw MissingNoDexEntry - dw MagmarDexEntry - dw MissingNoDexEntry - dw ElectabuzzDexEntry - dw MagnetonDexEntry - dw KoffingDexEntry - dw MissingNoDexEntry - dw MankeyDexEntry - dw SeelDexEntry - dw DiglettDexEntry - dw TaurosDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw FarfetchdDexEntry - dw VenonatDexEntry - dw DragoniteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DoduoDexEntry - dw PoliwagDexEntry - dw JynxDexEntry - dw MoltresDexEntry - dw ArticunoDexEntry - dw ZapdosDexEntry - dw DittoDexEntry - dw MeowthDexEntry - dw KrabbyDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw VulpixDexEntry - dw NinetalesDexEntry dw PikachuDexEntry dw RaichuDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw DratiniDexEntry - dw DragonairDexEntry - dw KabutoDexEntry - dw KabutopsDexEntry - dw HorseaDexEntry - dw SeadraDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry dw SandshrewDexEntry dw SandslashDexEntry - dw OmanyteDexEntry - dw OmastarDexEntry + dw NidoranFDexEntry + dw NidorinaDexEntry + dw NidoqueenDexEntry + dw NidoranMDexEntry + dw NidorinoDexEntry + dw NidokingDexEntry + dw ClefairyDexEntry + dw ClefableDexEntry + dw VulpixDexEntry + dw NinetalesDexEntry dw JigglypuffDexEntry dw WigglytuffDexEntry - dw EeveeDexEntry - dw FlareonDexEntry - dw JolteonDexEntry - dw VaporeonDexEntry - dw MachopDexEntry dw ZubatDexEntry - dw EkansDexEntry + dw GolbatDexEntry + dw OddishDexEntry + dw GloomDexEntry + dw VileplumeDexEntry dw ParasDexEntry + dw ParasectDexEntry + dw VenonatDexEntry + dw VenomothDexEntry + dw DiglettDexEntry + dw DugtrioDexEntry + dw MeowthDexEntry + dw PersianDexEntry + dw PsyduckDexEntry + dw GolduckDexEntry + dw MankeyDexEntry + dw PrimeapeDexEntry + dw GrowlitheDexEntry + dw ArcanineDexEntry + dw PoliwagDexEntry dw PoliwhirlDexEntry dw PoliwrathDexEntry - dw WeedleDexEntry - dw KakunaDexEntry - dw BeedrillDexEntry - dw MissingNoDexEntry + dw AbraDexEntry + dw KadabraDexEntry + dw AlakazamDexEntry + dw MachopDexEntry + dw MachokeDexEntry + dw MachampDexEntry + dw BellsproutDexEntry + dw WeepinbellDexEntry + dw VictreebelDexEntry + dw TentacoolDexEntry + dw TentacruelDexEntry + dw GeodudeDexEntry + dw GravelerDexEntry + dw GolemDexEntry + dw PonytaDexEntry + dw RapidashDexEntry + dw SlowpokeDexEntry + dw SlowbroDexEntry + dw MagnemiteDexEntry + dw MagnetonDexEntry + dw FarfetchdDexEntry + dw DoduoDexEntry dw DodrioDexEntry - dw PrimeapeDexEntry - dw DugtrioDexEntry - dw VenomothDexEntry + dw SeelDexEntry dw DewgongDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CaterpieDexEntry - dw MetapodDexEntry - dw ButterfreeDexEntry - dw MachampDexEntry - dw MissingNoDexEntry - dw GolduckDexEntry - dw HypnoDexEntry - dw GolbatDexEntry - dw MewtwoDexEntry - dw SnorlaxDexEntry - dw MagikarpDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry + dw GrimerDexEntry dw MukDexEntry - dw MissingNoDexEntry - dw KinglerDexEntry + dw ShellderDexEntry dw CloysterDexEntry - dw MissingNoDexEntry + dw GastlyDexEntry + dw HaunterDexEntry + dw GengarDexEntry + dw OnixDexEntry + dw DrowzeeDexEntry + dw HypnoDexEntry + dw KrabbyDexEntry + dw KinglerDexEntry + dw VoltorbDexEntry dw ElectrodeDexEntry - dw ClefableDexEntry - dw WeezingDexEntry - dw PersianDexEntry + dw ExeggcuteDexEntry + dw ExeggutorDexEntry + dw CuboneDexEntry dw MarowakDexEntry - dw MissingNoDexEntry - dw HaunterDexEntry - dw AbraDexEntry - dw AlakazamDexEntry - dw PidgeottoDexEntry - dw PidgeotDexEntry - dw StarmieDexEntry - dw BulbasaurDexEntry - dw VenusaurDexEntry - dw TentacruelDexEntry - dw MissingNoDexEntry + dw HitmonleeDexEntry + dw HitmonchanDexEntry + dw LickitungDexEntry + dw KoffingDexEntry + dw WeezingDexEntry + dw RhyhornDexEntry + dw RhydonDexEntry + dw ChanseyDexEntry + dw TangelaDexEntry + dw KangaskhanDexEntry + dw HorseaDexEntry + dw SeadraDexEntry dw GoldeenDexEntry dw SeakingDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw PonytaDexEntry - dw RapidashDexEntry - dw RattataDexEntry - dw RaticateDexEntry - dw NidorinoDexEntry - dw NidorinaDexEntry - dw GeodudeDexEntry + dw StaryuDexEntry + dw StarmieDexEntry + dw MrMimeDexEntry + dw ScytherDexEntry + dw JynxDexEntry + dw ElectabuzzDexEntry + dw MagmarDexEntry + dw PinsirDexEntry + dw TaurosDexEntry + dw MagikarpDexEntry + dw GyaradosDexEntry + dw LaprasDexEntry + dw DittoDexEntry + dw EeveeDexEntry + dw VaporeonDexEntry + dw JolteonDexEntry + dw FlareonDexEntry dw PorygonDexEntry + dw OmanyteDexEntry + dw OmastarDexEntry + dw KabutoDexEntry + dw KabutopsDexEntry dw AerodactylDexEntry - dw MissingNoDexEntry - dw MagnemiteDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw CharmanderDexEntry - dw SquirtleDexEntry - dw CharmeleonDexEntry - dw WartortleDexEntry - dw CharizardDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw MissingNoDexEntry - dw OddishDexEntry - dw GloomDexEntry - dw VileplumeDexEntry - dw BellsproutDexEntry - dw WeepinbellDexEntry - dw VictreebelDexEntry + dw SnorlaxDexEntry + dw ArticunoDexEntry + dw ZapdosDexEntry + dw MoltresDexEntry + dw DratiniDexEntry + dw DragonairDexEntry + dw DragoniteDexEntry + dw MewtwoDexEntry + dw MewDexEntry ; string: species name ; height in feet, inches @@ -1251,9 +1212,3 @@ VictreebelDexEntry: dw 340 TX_FAR _VictreebelDexEntry db "@" - -MissingNoDexEntry: - db "???@" - db 10 ; 1.0 m - db 100 ; 10.0 kg - db 0,"コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/pokedex_order.asm b/data/pokedex_order.asm index 0e293946..fd69d12b 100755 --- a/data/pokedex_order.asm +++ b/data/pokedex_order.asm @@ -1,191 +1,152 @@ PokedexOrder: - db DEX_RHYDON - db DEX_KANGASKHAN - db DEX_NIDORAN_M - db DEX_CLEFAIRY - db DEX_SPEAROW - db DEX_VOLTORB - db DEX_NIDOKING - db DEX_SLOWBRO + db DEX_BULBASAUR db DEX_IVYSAUR - db DEX_EXEGGUTOR - db DEX_LICKITUNG - db DEX_EXEGGCUTE - db DEX_GRIMER - db DEX_GENGAR - db DEX_NIDORAN_F - db DEX_NIDOQUEEN - db DEX_CUBONE - db DEX_RHYHORN - db DEX_LAPRAS - db DEX_ARCANINE - db DEX_MEW - db DEX_GYARADOS - db DEX_SHELLDER - db DEX_TENTACOOL - db DEX_GASTLY - db DEX_SCYTHER - db DEX_STARYU + db DEX_VENUSAUR + db DEX_CHARMANDER + db DEX_CHARMELEON + db DEX_CHARIZARD + db DEX_SQUIRTLE + db DEX_WARTORTLE db DEX_BLASTOISE - db DEX_PINSIR - db DEX_TANGELA - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_GROWLITHE - db DEX_ONIX - db DEX_FEAROW + db DEX_CATERPIE + db DEX_METAPOD + db DEX_BUTTERFREE + db DEX_WEEDLE + db DEX_KAKUNA + db DEX_BEEDRILL db DEX_PIDGEY - db DEX_SLOWPOKE - db DEX_KADABRA - db DEX_GRAVELER - db DEX_CHANSEY - db DEX_MACHOKE - db DEX_MR_MIME - db DEX_HITMONLEE - db DEX_HITMONCHAN + db DEX_PIDGEOTTO + db DEX_PIDGEOT + db DEX_RATTATA + db DEX_RATICATE + db DEX_SPEAROW + db DEX_FEAROW + db DEX_EKANS db DEX_ARBOK - db DEX_PARASECT - db DEX_PSYDUCK - db DEX_DROWZEE - db DEX_GOLEM - db 0 ; MISSINGNO. - db DEX_MAGMAR - db 0 ; MISSINGNO. - db DEX_ELECTABUZZ - db DEX_MAGNETON - db DEX_KOFFING - db 0 ; MISSINGNO. - db DEX_MANKEY - db DEX_SEEL - db DEX_DIGLETT - db DEX_TAUROS - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_FARFETCHD - db DEX_VENONAT - db DEX_DRAGONITE - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_DODUO - db DEX_POLIWAG - db DEX_JYNX - db DEX_MOLTRES - db DEX_ARTICUNO - db DEX_ZAPDOS - db DEX_DITTO - db DEX_MEOWTH - db DEX_KRABBY - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_VULPIX - db DEX_NINETALES db DEX_PIKACHU db DEX_RAICHU - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_DRATINI - db DEX_DRAGONAIR - db DEX_KABUTO - db DEX_KABUTOPS - db DEX_HORSEA - db DEX_SEADRA - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. db DEX_SANDSHREW db DEX_SANDSLASH - db DEX_OMANYTE - db DEX_OMASTAR + db DEX_NIDORAN_F + db DEX_NIDORINA + db DEX_NIDOQUEEN + db DEX_NIDORAN_M + db DEX_NIDORINO + db DEX_NIDOKING + db DEX_CLEFAIRY + db DEX_CLEFABLE + db DEX_VULPIX + db DEX_NINETALES db DEX_JIGGLYPUFF db DEX_WIGGLYTUFF - db DEX_EEVEE - db DEX_FLAREON - db DEX_JOLTEON - db DEX_VAPOREON - db DEX_MACHOP db DEX_ZUBAT - db DEX_EKANS + db DEX_GOLBAT + db DEX_ODDISH + db DEX_GLOOM + db DEX_VILEPLUME db DEX_PARAS + db DEX_PARASECT + db DEX_VENONAT + db DEX_VENOMOTH + db DEX_DIGLETT + db DEX_DUGTRIO + db DEX_MEOWTH + db DEX_PERSIAN + db DEX_PSYDUCK + db DEX_GOLDUCK + db DEX_MANKEY + db DEX_PRIMEAPE + db DEX_GROWLITHE + db DEX_ARCANINE + db DEX_POLIWAG db DEX_POLIWHIRL db DEX_POLIWRATH - db DEX_WEEDLE - db DEX_KAKUNA - db DEX_BEEDRILL - db 0 ; MISSINGNO. + db DEX_ABRA + db DEX_KADABRA + db DEX_ALAKAZAM + db DEX_MACHOP + db DEX_MACHOKE + db DEX_MACHAMP + db DEX_BELLSPROUT + db DEX_WEEPINBELL + db DEX_VICTREEBEL + db DEX_TENTACOOL + db DEX_TENTACRUEL + db DEX_GEODUDE + db DEX_GRAVELER + db DEX_GOLEM + db DEX_PONYTA + db DEX_RAPIDASH + db DEX_SLOWPOKE + db DEX_SLOWBRO + db DEX_MAGNEMITE + db DEX_MAGNETON + db DEX_FARFETCHD + db DEX_DODUO db DEX_DODRIO - db DEX_PRIMEAPE - db DEX_DUGTRIO - db DEX_VENOMOTH + db DEX_SEEL db DEX_DEWGONG - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_CATERPIE - db DEX_METAPOD - db DEX_BUTTERFREE - db DEX_MACHAMP - db 0 ; MISSINGNO. - db DEX_GOLDUCK - db DEX_HYPNO - db DEX_GOLBAT - db DEX_MEWTWO - db DEX_SNORLAX - db DEX_MAGIKARP - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. + db DEX_GRIMER db DEX_MUK - db 0 ; MISSINGNO. - db DEX_KINGLER + db DEX_SHELLDER db DEX_CLOYSTER - db 0 ; MISSINGNO. + db DEX_GASTLY + db DEX_HAUNTER + db DEX_GENGAR + db DEX_ONIX + db DEX_DROWZEE + db DEX_HYPNO + db DEX_KRABBY + db DEX_KINGLER + db DEX_VOLTORB db DEX_ELECTRODE - db DEX_CLEFABLE - db DEX_WEEZING - db DEX_PERSIAN + db DEX_EXEGGCUTE + db DEX_EXEGGUTOR + db DEX_CUBONE db DEX_MAROWAK - db 0 ; MISSINGNO. - db DEX_HAUNTER - db DEX_ABRA - db DEX_ALAKAZAM - db DEX_PIDGEOTTO - db DEX_PIDGEOT - db DEX_STARMIE - db DEX_BULBASAUR - db DEX_VENUSAUR - db DEX_TENTACRUEL - db 0 ; MISSINGNO. + db DEX_HITMONLEE + db DEX_HITMONCHAN + db DEX_LICKITUNG + db DEX_KOFFING + db DEX_WEEZING + db DEX_RHYHORN + db DEX_RHYDON + db DEX_CHANSEY + db DEX_TANGELA + db DEX_KANGASKHAN + db DEX_HORSEA + db DEX_SEADRA db DEX_GOLDEEN db DEX_SEAKING - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_PONYTA - db DEX_RAPIDASH - db DEX_RATTATA - db DEX_RATICATE - db DEX_NIDORINO - db DEX_NIDORINA - db DEX_GEODUDE + db DEX_STARYU + db DEX_STARMIE + db DEX_MR_MIME + db DEX_SCYTHER + db DEX_JYNX + db DEX_ELECTABUZZ + db DEX_MAGMAR + db DEX_PINSIR + db DEX_TAUROS + db DEX_MAGIKARP + db DEX_GYARADOS + db DEX_LAPRAS + db DEX_DITTO + db DEX_EEVEE + db DEX_VAPOREON + db DEX_JOLTEON + db DEX_FLAREON db DEX_PORYGON + db DEX_OMANYTE + db DEX_OMASTAR + db DEX_KABUTO + db DEX_KABUTOPS db DEX_AERODACTYL - db 0 ; MISSINGNO. - db DEX_MAGNEMITE - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_CHARMANDER - db DEX_SQUIRTLE - db DEX_CHARMELEON - db DEX_WARTORTLE - db DEX_CHARIZARD - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db 0 ; MISSINGNO. - db DEX_ODDISH - db DEX_GLOOM - db DEX_VILEPLUME - db DEX_BELLSPROUT - db DEX_WEEPINBELL - db DEX_VICTREEBEL + db DEX_SNORLAX + db DEX_ARTICUNO + db DEX_ZAPDOS + db DEX_MOLTRES + db DEX_DRATINI + db DEX_DRAGONAIR + db DEX_DRAGONITE + db DEX_MEWTWO + db DEX_MEW diff --git a/engine/palettes.asm b/engine/palettes.asm index 4785ade2..4f535413 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -70,7 +70,7 @@ SetPal_StatusScreen: ld bc, $10 call CopyData ld a, [wcf91] - cp VICTREEBEL + 1 + cp MEW + 1 jr c, .pokemon ld a, $1 ; not pokemon .pokemon @@ -285,7 +285,7 @@ LoadFrontSpriteByMonIndex:: cp NUM_POKEMON + 1 jr c, .validDexNumber ; dex >#151 invalid .invalidDexNumber - ld a, RHYDON ; $1 + ld a, RHYDON ld [wcf91], a ret .validDexNumber @@ -722,40 +722,17 @@ UncompressMonSprite:: ld [wSpriteInputPtr],a ; fetch sprite input pointer ld a,[hl] ld [wSpriteInputPtr+1],a -; define (by index number) the bank that a pokemon's image is in -; index = Mew, bank 1 -; index = Kabutops fossil, bank $B -; index < $1F, bank 9 -; $1F ≤ index < $4A, bank $A -; $4A ≤ index < $74, bank $B -; $74 ≤ index < $99, bank $C -; $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 + jr z,.GhostOrFossil + cp FOSSIL_AERODACTYL + jr z,.GhostOrFossil + cp MON_GHOST + jr z,.GhostOrFossil + ld a,[wMonHPicBank] + jr .GotBank +.GhostOrFossil ld a,BANK(FossilKabutopsPic) - jr z,.GotBank - ld a,b - cp TANGELA + 1 - ld a,BANK(TangelaPicFront) - jr c,.GotBank - ld a,b - cp MOLTRES + 1 - ld a,BANK(MoltresPicFront) - jr c,.GotBank - ld a,b - cp BEEDRILL + 2 - ld a,BANK(BeedrillPicFront) - jr c,.GotBank - ld a,b - cp STARMIE + 1 - ld a,BANK(StarmiePicFront) - jr c,.GotBank - ld a,BANK(VictreebelPicFront) .GotBank jp UncompressSpriteData @@ -10,6 +10,7 @@ PICS_2 EQU $A PICS_3 EQU $B PICS_4 EQU $C PICS_5 EQU $D +PICS_6 EQU $2D INCLUDE "home.asm" @@ -5344,8 +5345,6 @@ KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic" BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" -FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" - SECTION "Battle (bank B)", ROMX, BANK[$B] @@ -5475,8 +5474,6 @@ WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic" WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" CharizardPicFront:: INCBIN "pic/bmon/charizard.pic" CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" -GhostPic:: INCBIN "pic/other/ghost.pic" OddishPicFront:: INCBIN "pic/bmon/oddish.pic" OddishPicBack:: INCBIN "pic/monback/oddishb.pic" GloomPicFront:: INCBIN "pic/bmon/gloom.pic" @@ -6711,3 +6708,10 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" + + +SECTION "Pics 6", ROMX, BANK[PICS_6] + +FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" +FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" +GhostPic:: INCBIN "pic/other/ghost.pic" diff --git a/text/monster_names.asm b/text/monster_names.asm index a62b1bd9..0f4fc3d5 100755 --- a/text/monster_names.asm +++ b/text/monster_names.asm @@ -1,191 +1,152 @@ MonsterNames: - db "RHYDON@@@@" - db "KANGASKHAN" - db "NIDORAN♂@@" - db "CLEFAIRY@@" - db "SPEAROW@@@" - db "VOLTORB@@@" - db "NIDOKING@@" - db "SLOWBRO@@@" + db "BULBASAUR@" db "IVYSAUR@@@" - db "EXEGGUTOR@" - db "LICKITUNG@" - db "EXEGGCUTE@" - db "GRIMER@@@@" - db "GENGAR@@@@" - db "NIDORAN♀@@" - db "NIDOQUEEN@" - db "CUBONE@@@@" - db "RHYHORN@@@" - db "LAPRAS@@@@" - db "ARCANINE@@" - db "MEW@@@@@@@" - db "GYARADOS@@" - db "SHELLDER@@" - db "TENTACOOL@" - db "GASTLY@@@@" - db "SCYTHER@@@" - db "STARYU@@@@" + db "VENUSAUR@@" + db "CHARMANDER" + db "CHARMELEON" + db "CHARIZARD@" + db "SQUIRTLE@@" + db "WARTORTLE@" db "BLASTOISE@" - db "PINSIR@@@@" - db "TANGELA@@@" - db "MISSINGNO." - db "MISSINGNO." - db "GROWLITHE@" - db "ONIX@@@@@@" - db "FEAROW@@@@" + db "CATERPIE@@" + db "METAPOD@@@" + db "BUTTERFREE" + db "WEEDLE@@@@" + db "KAKUNA@@@@" + db "BEEDRILL@@" db "PIDGEY@@@@" - db "SLOWPOKE@@" - db "KADABRA@@@" - db "GRAVELER@@" - db "CHANSEY@@@" - db "MACHOKE@@@" - db "MR.MIME@@@" - db "HITMONLEE@" - db "HITMONCHAN" + db "PIDGEOTTO@" + db "PIDGEOT@@@" + db "RATTATA@@@" + db "RATICATE@@" + db "SPEAROW@@@" + db "FEAROW@@@@" + db "EKANS@@@@@" db "ARBOK@@@@@" - db "PARASECT@@" - db "PSYDUCK@@@" - db "DROWZEE@@@" - db "GOLEM@@@@@" - db "MISSINGNO." - db "MAGMAR@@@@" - db "MISSINGNO." - db "ELECTABUZZ" - db "MAGNETON@@" - db "KOFFING@@@" - db "MISSINGNO." - db "MANKEY@@@@" - db "SEEL@@@@@@" - db "DIGLETT@@@" - db "TAUROS@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "FARFETCH'D" - db "VENONAT@@@" - db "DRAGONITE@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "DODUO@@@@@" - db "POLIWAG@@@" - db "JYNX@@@@@@" - db "MOLTRES@@@" - db "ARTICUNO@@" - db "ZAPDOS@@@@" - db "DITTO@@@@@" - db "MEOWTH@@@@" - db "KRABBY@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "VULPIX@@@@" - db "NINETALES@" db "PIKACHU@@@" db "RAICHU@@@@" - db "MISSINGNO." - db "MISSINGNO." - db "DRATINI@@@" - db "DRAGONAIR@" - db "KABUTO@@@@" - db "KABUTOPS@@" - db "HORSEA@@@@" - db "SEADRA@@@@" - db "MISSINGNO." - db "MISSINGNO." db "SANDSHREW@" db "SANDSLASH@" - db "OMANYTE@@@" - db "OMASTAR@@@" + db "NIDORAN♀@@" + db "NIDORINA@@" + db "NIDOQUEEN@" + db "NIDORAN♂@@" + db "NIDORINO@@" + db "NIDOKING@@" + db "CLEFAIRY@@" + db "CLEFABLE@@" + db "VULPIX@@@@" + db "NINETALES@" db "JIGGLYPUFF" db "WIGGLYTUFF" - db "EEVEE@@@@@" - db "FLAREON@@@" - db "JOLTEON@@@" - db "VAPOREON@@" - db "MACHOP@@@@" db "ZUBAT@@@@@" - db "EKANS@@@@@" + db "GOLBAT@@@@" + db "ODDISH@@@@" + db "GLOOM@@@@@" + db "VILEPLUME@" db "PARAS@@@@@" + db "PARASECT@@" + db "VENONAT@@@" + db "VENOMOTH@@" + db "DIGLETT@@@" + db "DUGTRIO@@@" + db "MEOWTH@@@@" + db "PERSIAN@@@" + db "PSYDUCK@@@" + db "GOLDUCK@@@" + db "MANKEY@@@@" + db "PRIMEAPE@@" + db "GROWLITHE@" + db "ARCANINE@@" + db "POLIWAG@@@" db "POLIWHIRL@" db "POLIWRATH@" - db "WEEDLE@@@@" - db "KAKUNA@@@@" - db "BEEDRILL@@" - db "MISSINGNO." + db "ABRA@@@@@@" + db "KADABRA@@@" + db "ALAKAZAM@@" + db "MACHOP@@@@" + db "MACHOKE@@@" + db "MACHAMP@@@" + db "BELLSPROUT" + db "WEEPINBELL" + db "VICTREEBEL" + db "TENTACOOL@" + db "TENTACRUEL" + db "GEODUDE@@@" + db "GRAVELER@@" + db "GOLEM@@@@@" + db "PONYTA@@@@" + db "RAPIDASH@@" + db "SLOWPOKE@@" + db "SLOWBRO@@@" + db "MAGNEMITE@" + db "MAGNETON@@" + db "FARFETCH'D" + db "DODUO@@@@@" db "DODRIO@@@@" - db "PRIMEAPE@@" - db "DUGTRIO@@@" - db "VENOMOTH@@" + db "SEEL@@@@@@" db "DEWGONG@@@" - db "MISSINGNO." - db "MISSINGNO." - db "CATERPIE@@" - db "METAPOD@@@" - db "BUTTERFREE" - db "MACHAMP@@@" - db "MISSINGNO." - db "GOLDUCK@@@" - db "HYPNO@@@@@" - db "GOLBAT@@@@" - db "MEWTWO@@@@" - db "SNORLAX@@@" - db "MAGIKARP@@" - db "MISSINGNO." - db "MISSINGNO." + db "GRIMER@@@@" db "MUK@@@@@@@" - db "MISSINGNO." - db "KINGLER@@@" + db "SHELLDER@@" db "CLOYSTER@@" - db "MISSINGNO." + db "GASTLY@@@@" + db "HAUNTER@@@" + db "GENGAR@@@@" + db "ONIX@@@@@@" + db "DROWZEE@@@" + db "HYPNO@@@@@" + db "KRABBY@@@@" + db "KINGLER@@@" + db "VOLTORB@@@" db "ELECTRODE@" - db "CLEFABLE@@" - db "WEEZING@@@" - db "PERSIAN@@@" + db "EXEGGCUTE@" + db "EXEGGUTOR@" + db "CUBONE@@@@" db "MAROWAK@@@" - db "MISSINGNO." - db "HAUNTER@@@" - db "ABRA@@@@@@" - db "ALAKAZAM@@" - db "PIDGEOTTO@" - db "PIDGEOT@@@" - db "STARMIE@@@" - db "BULBASAUR@" - db "VENUSAUR@@" - db "TENTACRUEL" - db "MISSINGNO." + db "HITMONLEE@" + db "HITMONCHAN" + db "LICKITUNG@" + db "KOFFING@@@" + db "WEEZING@@@" + db "RHYHORN@@@" + db "RHYDON@@@@" + db "CHANSEY@@@" + db "TANGELA@@@" + db "KANGASKHAN" + db "HORSEA@@@@" + db "SEADRA@@@@" db "GOLDEEN@@@" db "SEAKING@@@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "PONYTA@@@@" - db "RAPIDASH@@" - db "RATTATA@@@" - db "RATICATE@@" - db "NIDORINO@@" - db "NIDORINA@@" - db "GEODUDE@@@" + db "STARYU@@@@" + db "STARMIE@@@" + db "MR.MIME@@@" + db "SCYTHER@@@" + db "JYNX@@@@@@" + db "ELECTABUZZ" + db "MAGMAR@@@@" + db "PINSIR@@@@" + db "TAUROS@@@@" + db "MAGIKARP@@" + db "GYARADOS@@" + db "LAPRAS@@@@" + db "DITTO@@@@@" + db "EEVEE@@@@@" + db "VAPOREON@@" + db "JOLTEON@@@" + db "FLAREON@@@" db "PORYGON@@@" + db "OMANYTE@@@" + db "OMASTAR@@@" + db "KABUTO@@@@" + db "KABUTOPS@@" db "AERODACTYL" - db "MISSINGNO." - db "MAGNEMITE@" - db "MISSINGNO." - db "MISSINGNO." - db "CHARMANDER" - db "SQUIRTLE@@" - db "CHARMELEON" - db "WARTORTLE@" - db "CHARIZARD@" - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "MISSINGNO." - db "ODDISH@@@@" - db "GLOOM@@@@@" - db "VILEPLUME@" - db "BELLSPROUT" - db "WEEPINBELL" - db "VICTREEBEL" + db "SNORLAX@@@" + db "ARTICUNO@@" + db "ZAPDOS@@@@" + db "MOLTRES@@@" + db "DRATINI@@@" + db "DRAGONAIR@" + db "DRAGONITE@" + db "MEWTWO@@@@" + db "MEW@@@@@@@" @@ -2089,6 +2089,8 @@ wMonHGrowthRate:: ; d0cb wMonHLearnset:: ; d0cc ; bit field flag_array 50 + 5 + +wMonHPicBank:: ; d0d3 ds 1 wSavedTilesetType:: ; d0d4 |