diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-08 16:20:14 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-08 16:20:14 -0500 |
| commit | 385b109b07a604999b9fca2bf8d307aeb3a60df0 (patch) | |
| tree | 31f90d97e53c8a011d9cb45fc19e5bc699957621 | |
| parent | 778ffafc87ede74e237b4907733353f2e303dffc (diff) | |
Move data, mon header data, cry data.
Also remove bmon folder
308 files changed, 326 insertions, 330 deletions
diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index bb5b15e5..2a60f548 100755 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 200 ; catch rate db 73 ; base exp yield -INCBIN "pic/bmon/abra.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/abra.pic",0,1 ; 55, sprite dimensions dw AbraPicFront dw AbraPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 949d39dc..2678b126 100755 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 202 ; base exp yield -INCBIN "pic/bmon/aerodactyl.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/aerodactyl.pic",0,1 ; 77, sprite dimensions dw AerodactylPicFront dw AerodactylPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 69e39afc..5912d8c1 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 50 ; catch rate db 186 ; base exp yield -INCBIN "pic/bmon/alakazam.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/alakazam.pic",0,1 ; 77, sprite dimensions dw AlakazamPicFront dw AlakazamPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index 34a73933..1ba984a2 100755 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 90 ; catch rate db 147 ; base exp yield -INCBIN "pic/bmon/arbok.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/arbok.pic",0,1 ; 77, sprite dimensions dw ArbokPicFront dw ArbokPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 4d4e8f77..005eae80 100755 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 75 ; catch rate db 213 ; base exp yield -INCBIN "pic/bmon/arcanine.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/arcanine.pic",0,1 ; 77, sprite dimensions dw ArcaninePicFront dw ArcaninePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index 31c328ed..cd34319d 100755 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -9,7 +9,7 @@ db ICE ; species type 1 db FLYING ; species type 2 db 3 ; catch rate db 215 ; base exp yield -INCBIN "pic/bmon/articuno.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/articuno.pic",0,1 ; 77, sprite dimensions dw ArticunoPicFront dw ArticunoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm index b3c85f3d..670c21ba 100755 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 159 ; base exp yield -INCBIN "pic/bmon/beedrill.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/beedrill.pic",0,1 ; 77, sprite dimensions dw BeedrillPicFront dw BeedrillPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index d6297826..8fbf44fd 100755 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 255 ; catch rate db 84 ; base exp yield -INCBIN "pic/bmon/bellsprout.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/bellsprout.pic",0,1 ; 55, sprite dimensions dw BellsproutPicFront dw BellsproutPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index e5ccd2db..8b14cf27 100755 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 210 ; base exp yield -INCBIN "pic/bmon/blastoise.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/blastoise.pic",0,1 ; 77, sprite dimensions dw BlastoisePicFront dw BlastoisePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 261b28ee..3a8f9b94 100755 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 64 ; base exp yield -INCBIN "pic/bmon/bulbasaur.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/bulbasaur.pic",0,1 ; 55, sprite dimensions dw BulbasaurPicFront dw BulbasaurPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index f17e21fb..af90880f 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 160 ; base exp yield -INCBIN "pic/bmon/butterfree.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/butterfree.pic",0,1 ; 77, sprite dimensions dw ButterfreePicFront dw ButterfreePicBack ; attacks known at lvl 0 @@ -26,5 +26,4 @@ db 0 ; growth rate tmlearn 33,34,39 tmlearn 44,46 tmlearn 50,55 -ENDC db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm index 975f31a1..bad53fd1 100755 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db BUG ; species type 2 db 255 ; catch rate db 53 ; base exp yield -INCBIN "pic/bmon/caterpie.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/caterpie.pic",0,1 ; 55, sprite dimensions dw CaterpiePicFront dw CaterpiePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 1dd96a9a..ecf11c5c 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 30 ; catch rate db 255 ; base exp yield -INCBIN "pic/bmon/chansey.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/chansey.pic",0,1 ; 66, sprite dimensions dw ChanseyPicFront dw ChanseyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index b4b908c8..34579a7f 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 209 ; base exp yield -INCBIN "pic/bmon/charizard.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/charizard.pic",0,1 ; 77, sprite dimensions dw CharizardPicFront dw CharizardPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index 936befa4..33210827 100755 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 45 ; catch rate db 65 ; base exp yield -INCBIN "pic/bmon/charmander.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/charmander.pic",0,1 ; 55, sprite dimensions dw CharmanderPicFront dw CharmanderPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index 8e2675f0..8adb6a94 100755 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 45 ; catch rate db 142 ; base exp yield -INCBIN "pic/bmon/charmeleon.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/charmeleon.pic",0,1 ; 66, sprite dimensions dw CharmeleonPicFront dw CharmeleonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index e26f1445..322a328b 100755 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 25 ; catch rate db 129 ; base exp yield -INCBIN "pic/bmon/clefable.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/clefable.pic",0,1 ; 66, sprite dimensions dw ClefablePicFront dw ClefablePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index cc47df10..21ee00e2 100755 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 150 ; catch rate db 68 ; base exp yield -INCBIN "pic/bmon/clefairy.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/clefairy.pic",0,1 ; 55, sprite dimensions dw ClefairyPicFront dw ClefairyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index aa09d48a..fd6a2000 100755 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db ICE ; species type 2 db 60 ; catch rate db 203 ; base exp yield -INCBIN "pic/bmon/cloyster.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/cloyster.pic",0,1 ; 77, sprite dimensions dw CloysterPicFront dw CloysterPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index 74584844..7c8bd86b 100755 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -9,14 +9,14 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 190 ; catch rate db 87 ; base exp yield -INCBIN "pic/bmon/cubone.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/cubone.pic",0,1 ; 55, sprite dimensions dw CubonePicFront dw CubonePicBack ; attacks known at lvl 0 -db BONE_CLUB db GROWL db 0 db 0 +db 0 db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index e7efc42b..60641a71 100755 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db ICE ; species type 2 db 75 ; catch rate db 176 ; base exp yield -INCBIN "pic/bmon/dewgong.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/dewgong.pic",0,1 ; 66, sprite dimensions dw DewgongPicFront dw DewgongPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index a66f9e34..e0f79555 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 255 ; catch rate db 81 ; base exp yield -INCBIN "pic/bmon/diglett.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/diglett.pic",0,1 ; 55, sprite dimensions dw DiglettPicFront dw DiglettPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index 88def477..b3c8e5cb 100755 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 35 ; catch rate db 61 ; base exp yield -INCBIN "pic/bmon/ditto.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/ditto.pic",0,1 ; 55, sprite dimensions dw DittoPicFront dw DittoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index 025204fb..5436763f 100755 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 158 ; base exp yield -INCBIN "pic/bmon/dodrio.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/dodrio.pic",0,1 ; 77, sprite dimensions dw DodrioPicFront dw DodrioPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 091152dd..badcc329 100755 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 190 ; catch rate db 96 ; base exp yield -INCBIN "pic/bmon/doduo.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/doduo.pic",0,1 ; 55, sprite dimensions dw DoduoPicFront dw DoduoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index b8f0a606..a061c349 100755 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -7,9 +7,9 @@ db 70 ; base speed db 70 ; base special db DRAGON ; species type 1 db DRAGON ; species type 2 -db 45 ; catch rate +db 27 ; catch rate db 144 ; base exp yield -INCBIN "pic/bmon/dragonair.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/dragonair.pic",0,1 ; 66, sprite dimensions dw DragonairPicFront dw DragonairPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 1000e384..608e07ea 100755 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -7,9 +7,9 @@ db 80 ; base speed db 100 ; base special db DRAGON ; species type 1 db FLYING ; species type 2 -db 45 ; catch rate +db 9 ; catch rate db 218 ; base exp yield -INCBIN "pic/bmon/dragonite.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/dragonite.pic",0,1 ; 77, sprite dimensions dw DragonitePicFront dw DragonitePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index 37ed8f09..51396135 100755 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -9,7 +9,7 @@ db DRAGON ; species type 1 db DRAGON ; species type 2 db 45 ; catch rate db 67 ; base exp yield -INCBIN "pic/bmon/dratini.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/dratini.pic",0,1 ; 55, sprite dimensions dw DratiniPicFront dw DratiniPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index 6397eeaf..50694200 100755 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 190 ; catch rate db 102 ; base exp yield -INCBIN "pic/bmon/drowzee.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/drowzee.pic",0,1 ; 66, sprite dimensions dw DrowzeePicFront dw DrowzeePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index 5892b020..6a500c42 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 50 ; catch rate db 153 ; base exp yield -INCBIN "pic/bmon/dugtrio.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/dugtrio.pic",0,1 ; 66, sprite dimensions dw DugtrioPicFront dw DugtrioPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 87c21acd..415fe8e5 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 45 ; catch rate db 92 ; base exp yield -INCBIN "pic/bmon/eevee.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/eevee.pic",0,1 ; 55, sprite dimensions dw EeveePicFront dw EeveePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 26e75eeb..a151f03b 100755 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 255 ; catch rate db 62 ; base exp yield -INCBIN "pic/bmon/ekans.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/ekans.pic",0,1 ; 55, sprite dimensions dw EkansPicFront dw EkansPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index 5dc76c37..41941f38 100755 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 45 ; catch rate db 156 ; base exp yield -INCBIN "pic/bmon/electabuzz.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/electabuzz.pic",0,1 ; 66, sprite dimensions dw ElectabuzzPicFront dw ElectabuzzPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index dc9da8d3..679e4106 100755 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 60 ; catch rate db 150 ; base exp yield -INCBIN "pic/bmon/electrode.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/electrode.pic",0,1 ; 55, sprite dimensions dw ElectrodePicFront dw ElectrodePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index 4c77db2a..6ed8e54c 100755 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db PSYCHIC ; species type 2 db 90 ; catch rate db 98 ; base exp yield -INCBIN "pic/bmon/exeggcute.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/exeggcute.pic",0,1 ; 77, sprite dimensions dw ExeggcutePicFront dw ExeggcutePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index f67857e2..6c240f62 100755 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db PSYCHIC ; species type 2 db 45 ; catch rate db 212 ; base exp yield -INCBIN "pic/bmon/exeggutor.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/exeggutor.pic",0,1 ; 77, sprite dimensions dw ExeggutorPicFront dw ExeggutorPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 015e9ff8..8f91682c 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 94 ; base exp yield -INCBIN "pic/bmon/farfetchd.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/farfetchd.pic",0,1 ; 66, sprite dimensions dw FarfetchdPicFront dw FarfetchdPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 8d3059db..76f0ab07 100755 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 90 ; catch rate db 162 ; base exp yield -INCBIN "pic/bmon/fearow.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/fearow.pic",0,1 ; 77, sprite dimensions dw FearowPicFront dw FearowPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index a785cf27..6b77565b 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 45 ; catch rate db 198 ; base exp yield -INCBIN "pic/bmon/flareon.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/flareon.pic",0,1 ; 66, sprite dimensions dw FlareonPicFront dw FlareonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index c6e69bd2..9dbc3d03 100755 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -9,7 +9,7 @@ db GHOST ; species type 1 db POISON ; species type 2 db 190 ; catch rate db 95 ; base exp yield -INCBIN "pic/bmon/gastly.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/gastly.pic",0,1 ; 77, sprite dimensions dw GastlyPicFront dw GastlyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index 910903d0..ec8be2c9 100755 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -9,7 +9,7 @@ db GHOST ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 190 ; base exp yield -INCBIN "pic/bmon/gengar.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/gengar.pic",0,1 ; 66, sprite dimensions dw GengarPicFront dw GengarPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index e185e3c0..60d7c3bb 100755 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db GROUND ; species type 2 db 255 ; catch rate db 86 ; base exp yield -INCBIN "pic/bmon/geodude.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/geodude.pic",0,1 ; 55, sprite dimensions dw GeodudePicFront dw GeodudePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm index efee0dae..3035eda4 100755 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 120 ; catch rate db 132 ; base exp yield -INCBIN "pic/bmon/gloom.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/gloom.pic",0,1 ; 66, sprite dimensions dw GloomPicFront dw GloomPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index e6a22f70..0e2a2c4c 100755 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db FLYING ; species type 2 db 90 ; catch rate db 171 ; base exp yield -INCBIN "pic/bmon/golbat.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/golbat.pic",0,1 ; 77, sprite dimensions dw GolbatPicFront dw GolbatPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index 36cf0d96..255c563f 100755 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 225 ; catch rate db 111 ; base exp yield -INCBIN "pic/bmon/goldeen.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/goldeen.pic",0,1 ; 66, sprite dimensions dw GoldeenPicFront dw GoldeenPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm index e063ae47..1ee62835 100755 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 75 ; catch rate db 174 ; base exp yield -INCBIN "pic/bmon/golduck.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/golduck.pic",0,1 ; 77, sprite dimensions dw GolduckPicFront dw GolduckPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index 1308bc78..425085d4 100755 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db GROUND ; species type 2 db 45 ; catch rate db 177 ; base exp yield -INCBIN "pic/bmon/golem.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/golem.pic",0,1 ; 66, sprite dimensions dw GolemPicFront dw GolemPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 8cc740dd..5c1cd772 100755 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db GROUND ; species type 2 db 120 ; catch rate db 134 ; base exp yield -INCBIN "pic/bmon/graveler.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/graveler.pic",0,1 ; 66, sprite dimensions dw GravelerPicFront dw GravelerPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index 55aedc95..073a7edf 100755 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 190 ; catch rate db 90 ; base exp yield -INCBIN "pic/bmon/grimer.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/grimer.pic",0,1 ; 55, sprite dimensions dw GrimerPicFront dw GrimerPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index cc4d1ff7..d9989309 100755 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 190 ; catch rate db 91 ; base exp yield -INCBIN "pic/bmon/growlithe.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/growlithe.pic",0,1 ; 55, sprite dimensions dw GrowlithePicFront dw GrowlithePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index fde735ee..f54eadb1 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 214 ; base exp yield -INCBIN "pic/bmon/gyarados.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/gyarados.pic",0,1 ; 77, sprite dimensions dw GyaradosPicFront dw GyaradosPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index a530108a..5eb8911f 100755 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -9,7 +9,7 @@ db GHOST ; species type 1 db POISON ; species type 2 db 90 ; catch rate db 126 ; base exp yield -INCBIN "pic/bmon/haunter.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/haunter.pic",0,1 ; 66, sprite dimensions dw HaunterPicFront dw HaunterPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 4a717248..6546f5b8 100755 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 45 ; catch rate db 140 ; base exp yield -INCBIN "pic/bmon/hitmonchan.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/hitmonchan.pic",0,1 ; 66, sprite dimensions dw HitmonchanPicFront dw HitmonchanPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index e25bb725..54bf8ea1 100755 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 45 ; catch rate db 139 ; base exp yield -INCBIN "pic/bmon/hitmonlee.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/hitmonlee.pic",0,1 ; 77, sprite dimensions dw HitmonleePicFront dw HitmonleePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index b754f425..6aa2bded 100755 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 225 ; catch rate db 83 ; base exp yield -INCBIN "pic/bmon/horsea.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/horsea.pic",0,1 ; 55, sprite dimensions dw HorseaPicFront dw HorseaPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 3ba1ad30..9fd81899 100755 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 75 ; catch rate db 165 ; base exp yield -INCBIN "pic/bmon/hypno.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/hypno.pic",0,1 ; 77, sprite dimensions dw HypnoPicFront dw HypnoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm index 9672935e..524ac405 100755 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 141 ; base exp yield -INCBIN "pic/bmon/ivysaur.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/ivysaur.pic",0,1 ; 66, sprite dimensions dw IvysaurPicFront dw IvysaurPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index 5111e9c8..93387691 100755 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 170 ; catch rate db 76 ; base exp yield -INCBIN "pic/bmon/jigglypuff.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/jigglypuff.pic",0,1 ; 55, sprite dimensions dw JigglypuffPicFront dw JigglypuffPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index e753bf97..8cd73449 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 45 ; catch rate db 197 ; base exp yield -INCBIN "pic/bmon/jolteon.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/jolteon.pic",0,1 ; 66, sprite dimensions dw JolteonPicFront dw JolteonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index 82778775..76ae07c6 100755 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -9,7 +9,7 @@ db ICE ; species type 1 db PSYCHIC ; species type 2 db 45 ; catch rate db 137 ; base exp yield -INCBIN "pic/bmon/jynx.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/jynx.pic",0,1 ; 66, sprite dimensions dw JynxPicFront dw JynxPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 1fde7156..fe9ab304 100755 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 119 ; base exp yield -INCBIN "pic/bmon/kabuto.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/kabuto.pic",0,1 ; 55, sprite dimensions dw KabutoPicFront dw KabutoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 170fee9b..87b06093 100755 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 201 ; base exp yield -INCBIN "pic/bmon/kabutops.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/kabutops.pic",0,1 ; 66, sprite dimensions dw KabutopsPicFront dw KabutopsPicBack ; attacks known at lvl 0 @@ -25,5 +25,5 @@ db 0 ; growth rate tmlearn 31,32 tmlearn 33,34,40 tmlearn 44 - tmlearn 50,53 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 12387f7f..94c9d3fd 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 100 ; catch rate db 145 ; base exp yield -INCBIN "pic/bmon/kadabra.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/kadabra.pic",0,1 ; 66, sprite dimensions dw KadabraPicFront dw KadabraPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm index 4ee90925..17b56fdf 100755 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db POISON ; species type 2 db 120 ; catch rate db 71 ; base exp yield -INCBIN "pic/bmon/kakuna.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/kakuna.pic",0,1 ; 55, sprite dimensions dw KakunaPicFront dw KakunaPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index a17cb653..921c595f 100755 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 45 ; catch rate db 175 ; base exp yield -INCBIN "pic/bmon/kangaskhan.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/kangaskhan.pic",0,1 ; 77, sprite dimensions dw KangaskhanPicFront dw KangaskhanPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 7604bf80..8f47bdf0 100755 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 60 ; catch rate db 206 ; base exp yield -INCBIN "pic/bmon/kingler.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/kingler.pic",0,1 ; 77, sprite dimensions dw KinglerPicFront dw KinglerPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index 24f47d17..02f03bf2 100755 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 190 ; catch rate db 114 ; base exp yield -INCBIN "pic/bmon/koffing.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/koffing.pic",0,1 ; 66, sprite dimensions dw KoffingPicFront dw KoffingPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 3d901041..576493e9 100755 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 225 ; catch rate db 115 ; base exp yield -INCBIN "pic/bmon/krabby.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/krabby.pic",0,1 ; 55, sprite dimensions dw KrabbyPicFront dw KrabbyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index 71555c5e..072c56cd 100755 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db ICE ; species type 2 db 45 ; catch rate db 219 ; base exp yield -INCBIN "pic/bmon/lapras.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/lapras.pic",0,1 ; 77, sprite dimensions dw LaprasPicFront dw LaprasPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index eec9d2f3..6e710ccf 100755 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 45 ; catch rate db 127 ; base exp yield -INCBIN "pic/bmon/lickitung.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/lickitung.pic",0,1 ; 77, sprite dimensions dw LickitungPicFront dw LickitungPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index c9ca26dd..ca3ffbaa 100755 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 45 ; catch rate db 193 ; base exp yield -INCBIN "pic/bmon/machamp.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/machamp.pic",0,1 ; 77, sprite dimensions dw MachampPicFront dw MachampPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 6e2a977e..db2cc86a 100755 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 90 ; catch rate db 146 ; base exp yield -INCBIN "pic/bmon/machoke.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/machoke.pic",0,1 ; 77, sprite dimensions dw MachokePicFront dw MachokePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index 6e9f5ca0..bc059d43 100755 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 180 ; catch rate db 88 ; base exp yield -INCBIN "pic/bmon/machop.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/machop.pic",0,1 ; 55, sprite dimensions dw MachopPicFront dw MachopPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index 95f72547..9d9bf11f 100755 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 255 ; catch rate db 20 ; base exp yield -INCBIN "pic/bmon/magikarp.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/magikarp.pic",0,1 ; 66, sprite dimensions dw MagikarpPicFront dw MagikarpPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index 781c9edc..c7bec4af 100755 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 45 ; catch rate db 167 ; base exp yield -INCBIN "pic/bmon/magmar.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/magmar.pic",0,1 ; 66, sprite dimensions dw MagmarPicFront dw MagmarPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index 79f84923..61d1be47 100755 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 190 ; catch rate db 89 ; base exp yield -INCBIN "pic/bmon/magnemite.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/magnemite.pic",0,1 ; 55, sprite dimensions dw MagnemitePicFront dw MagnemitePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index c8606619..e851c49b 100755 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 60 ; catch rate db 161 ; base exp yield -INCBIN "pic/bmon/magneton.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/magneton.pic",0,1 ; 66, sprite dimensions dw MagnetonPicFront dw MagnetonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 759fe599..af380c44 100755 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -9,7 +9,7 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 190 ; catch rate db 74 ; base exp yield -INCBIN "pic/bmon/mankey.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/mankey.pic",0,1 ; 55, sprite dimensions dw MankeyPicFront dw MankeyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 5ee80e94..355cb8d2 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 75 ; catch rate db 124 ; base exp yield -INCBIN "pic/bmon/marowak.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/marowak.pic",0,1 ; 66, sprite dimensions dw MarowakPicFront dw MarowakPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index 14f82ca4..e90e79c1 100755 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 255 ; catch rate db 69 ; base exp yield -INCBIN "pic/bmon/meowth.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/meowth.pic",0,1 ; 55, sprite dimensions dw MeowthPicFront dw MeowthPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm index 981bbbfb..24316ff0 100755 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db BUG ; species type 2 db 120 ; catch rate db 72 ; base exp yield -INCBIN "pic/bmon/metapod.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/metapod.pic",0,1 ; 55, sprite dimensions dw MetapodPicFront dw MetapodPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 1af20fa4..6ab5e1cd 100755 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 45 ; catch rate db 64 ; base exp yield -INCBIN "pic/bmon/mew.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/mew.pic",0,1 ; 55, sprite dimensions dw MewPicFront dw MewPicBack ; attacks known at lvl 0 @@ -25,5 +25,5 @@ db 3 ; growth rate tmlearn 25,26,27,28,29,30,31,32 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 + tmlearn 49,50,51,52,53,54,55 +db 0 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index 95127645..66dc370c 100755 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 3 ; catch rate db 220 ; base exp yield -INCBIN "pic/bmon/mewtwo.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/mewtwo.pic",0,1 ; 77, sprite dimensions dw MewtwoPicFront dw MewtwoPicBack ; attacks known at lvl 0 @@ -20,7 +20,7 @@ db PSYCHIC_M db 5 ; growth rate ; learnset tmlearn 1,5,6,8 - tmlearn 9,10,11,12,13,14,15,16 + tmlearn 9,10,11,12,13,14,15 tmlearn 17,18,19,20,22,24 tmlearn 25,29,30,31,32 tmlearn 33,34,35,36,38,40 diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index 646d9a49..16145040 100755 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FLYING ; species type 2 db 3 ; catch rate db 217 ; base exp yield -INCBIN "pic/bmon/moltres.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/moltres.pic",0,1 ; 77, sprite dimensions dw MoltresPicFront dw MoltresPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 3182eca0..898f42bb 100755 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -9,7 +9,7 @@ db PSYCHIC ; species type 1 db PSYCHIC ; species type 2 db 45 ; catch rate db 136 ; base exp yield -INCBIN "pic/bmon/mr.mime.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/mr.mime.pic",0,1 ; 66, sprite dimensions dw MrMimePicFront dw MrMimePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 7ef711c3..1087e999 100755 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 75 ; catch rate db 157 ; base exp yield -INCBIN "pic/bmon/muk.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/muk.pic",0,1 ; 77, sprite dimensions dw MukPicFront dw MukPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index 8802f52a..7a48a5f1 100755 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db GROUND ; species type 2 db 45 ; catch rate db 195 ; base exp yield -INCBIN "pic/bmon/nidoking.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/nidoking.pic",0,1 ; 77, sprite dimensions dw NidokingPicFront dw NidokingPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 5e6ab97b..47d484a0 100755 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db GROUND ; species type 2 db 45 ; catch rate db 194 ; base exp yield -INCBIN "pic/bmon/nidoqueen.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/nidoqueen.pic",0,1 ; 77, sprite dimensions dw NidoqueenPicFront dw NidoqueenPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm index c3f9a6e3..d8452729 100755 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 235 ; catch rate db 59 ; base exp yield -INCBIN "pic/bmon/nidoranf.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/nidoranf.pic",0,1 ; 55, sprite dimensions dw NidoranFPicFront dw NidoranFPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm index 14e9bc9f..457068d2 100755 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 235 ; catch rate db 60 ; base exp yield -INCBIN "pic/bmon/nidoranm.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/nidoranm.pic",0,1 ; 55, sprite dimensions dw NidoranMPicFront dw NidoranMPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm index 902286c5..84573897 100755 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 120 ; catch rate db 117 ; base exp yield -INCBIN "pic/bmon/nidorina.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/nidorina.pic",0,1 ; 66, sprite dimensions dw NidorinaPicFront dw NidorinaPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm index db5844a9..5ce0cfe4 100755 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 120 ; catch rate db 118 ; base exp yield -INCBIN "pic/bmon/nidorino.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/nidorino.pic",0,1 ; 66, sprite dimensions dw NidorinoPicFront dw NidorinoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm index f5339b35..f9bfcbbb 100755 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 75 ; catch rate db 178 ; base exp yield -INCBIN "pic/bmon/ninetales.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/ninetales.pic",0,1 ; 77, sprite dimensions dw NinetalesPicFront dw NinetalesPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm index 895ccbe1..c8543cf7 100755 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 255 ; catch rate db 78 ; base exp yield -INCBIN "pic/bmon/oddish.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/oddish.pic",0,1 ; 55, sprite dimensions dw OddishPicFront dw OddishPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index 9246a325..0a8df250 100755 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 120 ; base exp yield -INCBIN "pic/bmon/omanyte.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/omanyte.pic",0,1 ; 55, sprite dimensions dw OmanytePicFront dw OmanytePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index 17b45efe..b319d38f 100755 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 199 ; base exp yield -INCBIN "pic/bmon/omastar.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/omastar.pic",0,1 ; 66, sprite dimensions dw OmastarPicFront dw OmastarPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index 4f2f8e6b..a12be1b9 100755 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -9,7 +9,7 @@ db ROCK ; species type 1 db GROUND ; species type 2 db 45 ; catch rate db 108 ; base exp yield -INCBIN "pic/bmon/onix.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/onix.pic",0,1 ; 77, sprite dimensions dw OnixPicFront dw OnixPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm index daf1aaa9..f1411503 100755 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db GRASS ; species type 2 db 190 ; catch rate db 70 ; base exp yield -INCBIN "pic/bmon/paras.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/paras.pic",0,1 ; 55, sprite dimensions dw ParasPicFront dw ParasPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm index cacf8e4b..2b8030f5 100755 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db GRASS ; species type 2 db 75 ; catch rate db 128 ; base exp yield -INCBIN "pic/bmon/parasect.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/parasect.pic",0,1 ; 77, sprite dimensions dw ParasectPicFront dw ParasectPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index 69429830..7c5d44b2 100755 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 90 ; catch rate db 148 ; base exp yield -INCBIN "pic/bmon/persian.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/persian.pic",0,1 ; 77, sprite dimensions dw PersianPicFront dw PersianPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index 19c9f2b4..84f4ed1a 100755 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 172 ; base exp yield -INCBIN "pic/bmon/pidgeot.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/pidgeot.pic",0,1 ; 77, sprite dimensions dw PidgeotPicFront dw PidgeotPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index 96a58cc3..9daae217 100755 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 120 ; catch rate db 113 ; base exp yield -INCBIN "pic/bmon/pidgeotto.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/pidgeotto.pic",0,1 ; 66, sprite dimensions dw PidgeottoPicFront dw PidgeottoPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index 6d5e238d..c9fde3a9 100755 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 255 ; catch rate db 55 ; base exp yield -INCBIN "pic/bmon/pidgey.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/pidgey.pic",0,1 ; 55, sprite dimensions dw PidgeyPicFront dw PidgeyPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm index 1cd96200..d7354d38 100755 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 190 ; catch rate db 82 ; base exp yield -INCBIN "pic/bmon/pikachu.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/pikachu.pic",0,1 ; 55, sprite dimensions dw PikachuPicFront dw PikachuPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index 8f36d87d..c32a4f94 100755 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db BUG ; species type 2 db 45 ; catch rate db 200 ; base exp yield -INCBIN "pic/bmon/pinsir.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/pinsir.pic",0,1 ; 77, sprite dimensions dw PinsirPicFront dw PinsirPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 7df20056..e869a407 100755 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 255 ; catch rate db 77 ; base exp yield -INCBIN "pic/bmon/poliwag.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/poliwag.pic",0,1 ; 55, sprite dimensions dw PoliwagPicFront dw PoliwagPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index a93d2674..86b45c1c 100755 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 120 ; catch rate db 131 ; base exp yield -INCBIN "pic/bmon/poliwhirl.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/poliwhirl.pic",0,1 ; 66, sprite dimensions dw PoliwhirlPicFront dw PoliwhirlPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index 4d35c2cc..43dee414 100755 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db FIGHTING ; species type 2 db 45 ; catch rate db 185 ; base exp yield -INCBIN "pic/bmon/poliwrath.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/poliwrath.pic",0,1 ; 77, sprite dimensions dw PoliwrathPicFront dw PoliwrathPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index 9856ecbd..bc6eb0ca 100755 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 190 ; catch rate db 152 ; base exp yield -INCBIN "pic/bmon/ponyta.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/ponyta.pic",0,1 ; 66, sprite dimensions dw PonytaPicFront dw PonytaPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index 7ccee3c8..708b18cf 100755 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 45 ; catch rate db 130 ; base exp yield -INCBIN "pic/bmon/porygon.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/porygon.pic",0,1 ; 66, sprite dimensions dw PorygonPicFront dw PorygonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index a3dfe576..e904e16f 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -9,14 +9,14 @@ db FIGHTING ; species type 1 db FIGHTING ; species type 2 db 75 ; catch rate db 149 ; base exp yield -INCBIN "pic/bmon/primeape.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/primeape.pic",0,1 ; 77, sprite dimensions dw PrimeapePicFront dw PrimeapePicBack ; attacks known at lvl 0 db SCRATCH -db KARATE_CHOP -db FURY_SWIPES +db LEER db LOW_KICK +db KARATE_CHOP db 0 ; growth rate ; learnset tmlearn 1,5,6,8 diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index 469097fe..3c52c1cf 100755 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 190 ; catch rate db 80 ; base exp yield -INCBIN "pic/bmon/psyduck.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/psyduck.pic",0,1 ; 55, sprite dimensions dw PsyduckPicFront dw PsyduckPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm index c6757b0b..28004b22 100755 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 75 ; catch rate db 122 ; base exp yield -INCBIN "pic/bmon/raichu.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/raichu.pic",0,1 ; 77, sprite dimensions dw RaichuPicFront dw RaichuPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index 097b95bd..b7b9590d 100755 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 60 ; catch rate db 192 ; base exp yield -INCBIN "pic/bmon/rapidash.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/rapidash.pic",0,1 ; 77, sprite dimensions dw RapidashPicFront dw RapidashPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index 5fac0f1b..e2330525 100755 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 90 ; catch rate db 116 ; base exp yield -INCBIN "pic/bmon/raticate.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/raticate.pic",0,1 ; 66, sprite dimensions dw RaticatePicFront dw RaticatePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index dada06bc..6c7816d2 100755 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 255 ; catch rate db 57 ; base exp yield -INCBIN "pic/bmon/rattata.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/rattata.pic",0,1 ; 55, sprite dimensions dw RattataPicFront dw RattataPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index eb2396e1..b5c078e8 100755 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -10,7 +10,7 @@ db GROUND ; species type 1 db ROCK ; species type 2 db 60 ; catch rate db 204 ; base exp yield -INCBIN "pic/bmon/rhydon.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/rhydon.pic",0,1 ; 77, sprite dimensions dw RhydonPicFront dw RhydonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index 4e292406..d7d47f34 100755 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db ROCK ; species type 2 db 120 ; catch rate db 135 ; base exp yield -INCBIN "pic/bmon/rhyhorn.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/rhyhorn.pic",0,1 ; 77, sprite dimensions dw RhyhornPicFront dw RhyhornPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index ff12e24f..cd69869a 100755 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 255 ; catch rate db 93 ; base exp yield -INCBIN "pic/bmon/sandshrew.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/sandshrew.pic",0,1 ; 55, sprite dimensions dw SandshrewPicFront dw SandshrewPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index 2975b20f..261794db 100755 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -9,7 +9,7 @@ db GROUND ; species type 1 db GROUND ; species type 2 db 90 ; catch rate db 163 ; base exp yield -INCBIN "pic/bmon/sandslash.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/sandslash.pic",0,1 ; 66, sprite dimensions dw SandslashPicFront dw SandslashPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index f91327f4..7e564f12 100755 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db FLYING ; species type 2 db 45 ; catch rate db 187 ; base exp yield -INCBIN "pic/bmon/scyther.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/scyther.pic",0,1 ; 77, sprite dimensions dw ScytherPicFront dw ScytherPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index 4d28e2a3..32b1ae7e 100755 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 75 ; catch rate db 155 ; base exp yield -INCBIN "pic/bmon/seadra.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/seadra.pic",0,1 ; 66, sprite dimensions dw SeadraPicFront dw SeadraPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index d1087618..52723719 100755 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 60 ; catch rate db 170 ; base exp yield -INCBIN "pic/bmon/seaking.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/seaking.pic",0,1 ; 77, sprite dimensions dw SeakingPicFront dw SeakingPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index b6546b6f..30b5eb38 100755 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 190 ; catch rate db 100 ; base exp yield -INCBIN "pic/bmon/seel.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/seel.pic",0,1 ; 66, sprite dimensions dw SeelPicFront dw SeelPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index fcb87404..35284a06 100755 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 190 ; catch rate db 97 ; base exp yield -INCBIN "pic/bmon/shellder.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/shellder.pic",0,1 ; 55, sprite dimensions dw ShellderPicFront dw ShellderPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index 2d1f8444..b1c4a6bc 100755 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db PSYCHIC ; species type 2 db 75 ; catch rate db 164 ; base exp yield -INCBIN "pic/bmon/slowbro.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/slowbro.pic",0,1 ; 77, sprite dimensions dw SlowbroPicFront dw SlowbroPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index e5edcdb9..7e2fbd55 100755 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db PSYCHIC ; species type 2 db 190 ; catch rate db 99 ; base exp yield -INCBIN "pic/bmon/slowpoke.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/slowpoke.pic",0,1 ; 55, sprite dimensions dw SlowpokePicFront dw SlowpokePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index 0a91f37e..44660b2d 100755 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 25 ; catch rate db 154 ; base exp yield -INCBIN "pic/bmon/snorlax.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/snorlax.pic",0,1 ; 77, sprite dimensions dw SnorlaxPicFront dw SnorlaxPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index 4e90e749..fd1f991b 100755 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db FLYING ; species type 2 db 255 ; catch rate db 58 ; base exp yield -INCBIN "pic/bmon/spearow.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/spearow.pic",0,1 ; 55, sprite dimensions dw SpearowPicFront dw SpearowPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index 1257a3f0..9b6aea2f 100755 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 66 ; base exp yield -INCBIN "pic/bmon/squirtle.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/squirtle.pic",0,1 ; 55, sprite dimensions dw SquirtlePicFront dw SquirtlePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index 94c8f2d9..92206c1c 100755 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db PSYCHIC ; species type 2 db 60 ; catch rate db 207 ; base exp yield -INCBIN "pic/bmon/starmie.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/starmie.pic",0,1 ; 66, sprite dimensions dw StarmiePicFront dw StarmiePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index 3afbb7a5..00dc60d6 100755 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 225 ; catch rate db 106 ; base exp yield -INCBIN "pic/bmon/staryu.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/staryu.pic",0,1 ; 66, sprite dimensions dw StaryuPicFront dw StaryuPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index a9cab332..0310adaf 100755 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -9,12 +9,12 @@ db GRASS ; species type 1 db GRASS ; species type 2 db 45 ; catch rate db 166 ; base exp yield -INCBIN "pic/bmon/tangela.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/tangela.pic",0,1 ; 66, sprite dimensions dw TangelaPicFront dw TangelaPicBack ; attacks known at lvl 0 db CONSTRICT -db BIND +db 0 db 0 db 0 db 0 ; growth rate diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 39844f76..025d7e83 100755 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 45 ; catch rate db 211 ; base exp yield -INCBIN "pic/bmon/tauros.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/tauros.pic",0,1 ; 77, sprite dimensions dw TaurosPicFront dw TaurosPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index 12ff9e0d..b1f8bc3a 100755 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db POISON ; species type 2 db 190 ; catch rate db 105 ; base exp yield -INCBIN "pic/bmon/tentacool.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/tentacool.pic",0,1 ; 55, sprite dimensions dw TentacoolPicFront dw TentacoolPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index 01a2f685..ce687de5 100755 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db POISON ; species type 2 db 60 ; catch rate db 205 ; base exp yield -INCBIN "pic/bmon/tentacruel.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/tentacruel.pic",0,1 ; 66, sprite dimensions dw TentacruelPicFront dw TentacruelPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index 1fd8bf52..7d84b3da 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 196 ; base exp yield -INCBIN "pic/bmon/vaporeon.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/vaporeon.pic",0,1 ; 66, sprite dimensions dw VaporeonPicFront dw VaporeonPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index 3ef7018b..306f0c01 100755 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db POISON ; species type 2 db 75 ; catch rate db 138 ; base exp yield -INCBIN "pic/bmon/venomoth.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/venomoth.pic",0,1 ; 77, sprite dimensions dw VenomothPicFront dw VenomothPicBack ; attacks known at lvl 0 @@ -25,5 +25,5 @@ db 0 ; growth rate tmlearn 29,30,31,32 tmlearn 33,34,39 tmlearn 44,46 - tmlearn 50 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 2f71a9df..53b899e8 100755 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db POISON ; species type 2 db 190 ; catch rate db 75 ; base exp yield -INCBIN "pic/bmon/venonat.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/venonat.pic",0,1 ; 55, sprite dimensions dw VenonatPicFront dw VenonatPicBack ; attacks known at lvl 0 @@ -22,8 +22,8 @@ db 0 ; growth rate tmlearn 6 tmlearn 9,10 tmlearn 20,21,22 - tmlearn 29,30,31,32 - tmlearn 33,34,39 + tmlearn 29,31,32 + tmlearn 33,34 tmlearn 44,46 tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 5052e9d0..74292f1b 100755 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 208 ; base exp yield -INCBIN "pic/bmon/venusaur.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/venusaur.pic",0,1 ; 77, sprite dimensions dw VenusaurPicFront dw VenusaurPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 0df7e22c..bec70ecd 100755 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 191 ; base exp yield -INCBIN "pic/bmon/victreebel.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/victreebel.pic",0,1 ; 77, sprite dimensions dw VictreebelPicFront dw VictreebelPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm index 20d1b4e4..8519eb09 100755 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 45 ; catch rate db 184 ; base exp yield -INCBIN "pic/bmon/vileplume.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/vileplume.pic",0,1 ; 77, sprite dimensions dw VileplumePicFront dw VileplumePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index 4267990f..91d1af27 100755 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db ELECTRIC ; species type 2 db 190 ; catch rate db 103 ; base exp yield -INCBIN "pic/bmon/voltorb.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/voltorb.pic",0,1 ; 55, sprite dimensions dw VoltorbPicFront dw VoltorbPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 80a25853..0de2f37f 100755 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -9,7 +9,7 @@ db FIRE ; species type 1 db FIRE ; species type 2 db 190 ; catch rate db 63 ; base exp yield -INCBIN "pic/bmon/vulpix.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/vulpix.pic",0,1 ; 66, sprite dimensions dw VulpixPicFront dw VulpixPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index b8d1f84f..a5ddb6ef 100755 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -9,7 +9,7 @@ db WATER ; species type 1 db WATER ; species type 2 db 45 ; catch rate db 143 ; base exp yield -INCBIN "pic/bmon/wartortle.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/wartortle.pic",0,1 ; 66, sprite dimensions dw WartortlePicFront dw WartortlePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm index ecd788db..97e37734 100755 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -9,7 +9,7 @@ db BUG ; species type 1 db POISON ; species type 2 db 255 ; catch rate db 52 ; base exp yield -INCBIN "pic/bmon/weedle.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/weedle.pic",0,1 ; 55, sprite dimensions dw WeedlePicFront dw WeedlePicBack ; attacks known at lvl 0 diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 22c6a40b..9eb1fac3 100755 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -9,7 +9,7 @@ db GRASS ; species type 1 db POISON ; species type 2 db 120 ; catch rate db 151 ; base exp yield -INCBIN "pic/bmon/weepinbell.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/weepinbell.pic",0,1 ; 66, sprite dimensions dw WeepinbellPicFront dw WeepinbellPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index 265ed3c8..356940d1 100755 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db POISON ; species type 2 db 60 ; catch rate db 173 ; base exp yield -INCBIN "pic/bmon/weezing.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/weezing.pic",0,1 ; 77, sprite dimensions dw WeezingPicFront dw WeezingPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index 13bf9b3a..1d165b23 100755 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -9,7 +9,7 @@ db NORMAL ; species type 1 db NORMAL ; species type 2 db 50 ; catch rate db 109 ; base exp yield -INCBIN "pic/bmon/wigglytuff.pic",0,1 ; 66, sprite dimensions +INCBIN "pic/ymon/wigglytuff.pic",0,1 ; 66, sprite dimensions dw WigglytuffPicFront dw WigglytuffPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 5ae1f25f..0c98f2f5 100755 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -9,7 +9,7 @@ db ELECTRIC ; species type 1 db FLYING ; species type 2 db 3 ; catch rate db 216 ; base exp yield -INCBIN "pic/bmon/zapdos.pic",0,1 ; 77, sprite dimensions +INCBIN "pic/ymon/zapdos.pic",0,1 ; 77, sprite dimensions dw ZapdosPicFront dw ZapdosPicBack ; attacks known at lvl 0 diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index bafac885..84b2b6e9 100755 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -9,7 +9,7 @@ db POISON ; species type 1 db FLYING ; species type 2 db 255 ; catch rate db 54 ; base exp yield -INCBIN "pic/bmon/zubat.pic",0,1 ; 55, sprite dimensions +INCBIN "pic/ymon/zubat.pic",0,1 ; 55, sprite dimensions dw ZubatPicFront dw ZubatPicBack ; attacks known at lvl 0 diff --git a/data/base_stats.asm b/data/base_stats.asm index d7d26533..716d1118 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -148,3 +148,4 @@ INCLUDE "data/baseStats/dratini.asm" INCLUDE "data/baseStats/dragonair.asm" INCLUDE "data/baseStats/dragonite.asm" INCLUDE "data/baseStats/mewtwo.asm" +INCLUDE "data/baseStats/mew.asm" @@ -713,9 +713,9 @@ ENDM tmlearn: MACRO x = 0 rept _NARG -if \1 != 0 +IF \1 != 0 x = x | (1 << ((\1 - 1) % 8)) -endc +ENDC shift endr db x @@ -19,7 +19,7 @@ SECTION "bank1",ROMX,BANK[$1] INCLUDE "data/facing.asm" -;MewPicFront:: INCBIN "pic/bmon/mew.pic" +;MewPicFront:: INCBIN "pic/ymon/mew.pic" ;MewPicBack:: INCBIN "pic/monback/mewb.pic" ;INCLUDE "data/baseStats/mew.asm" @@ -4947,63 +4947,63 @@ INCLUDE "engine/hidden_object_functions7.asm" SECTION "Pics 1", ROMX, BANK[PICS_1] -RhydonPicFront:: INCBIN "pic/bmon/rhydon.pic" +RhydonPicFront:: INCBIN "pic/ymon/rhydon.pic" RhydonPicBack:: INCBIN "pic/monback/rhydonb.pic" -KangaskhanPicFront:: INCBIN "pic/bmon/kangaskhan.pic" +KangaskhanPicFront:: INCBIN "pic/ymon/kangaskhan.pic" KangaskhanPicBack:: INCBIN "pic/monback/kangaskhanb.pic" -NidoranMPicFront:: INCBIN "pic/bmon/nidoranm.pic" +NidoranMPicFront:: INCBIN "pic/ymon/nidoranm.pic" NidoranMPicBack:: INCBIN "pic/monback/nidoranmb.pic" -ClefairyPicFront:: INCBIN "pic/bmon/clefairy.pic" +ClefairyPicFront:: INCBIN "pic/ymon/clefairy.pic" ClefairyPicBack:: INCBIN "pic/monback/clefairyb.pic" -SpearowPicFront:: INCBIN "pic/bmon/spearow.pic" +SpearowPicFront:: INCBIN "pic/ymon/spearow.pic" SpearowPicBack:: INCBIN "pic/monback/spearowb.pic" -VoltorbPicFront:: INCBIN "pic/bmon/voltorb.pic" +VoltorbPicFront:: INCBIN "pic/ymon/voltorb.pic" VoltorbPicBack:: INCBIN "pic/monback/voltorbb.pic" -NidokingPicFront:: INCBIN "pic/bmon/nidoking.pic" +NidokingPicFront:: INCBIN "pic/ymon/nidoking.pic" NidokingPicBack:: INCBIN "pic/monback/nidokingb.pic" -SlowbroPicFront:: INCBIN "pic/bmon/slowbro.pic" +SlowbroPicFront:: INCBIN "pic/ymon/slowbro.pic" SlowbroPicBack:: INCBIN "pic/monback/slowbrob.pic" -IvysaurPicFront:: INCBIN "pic/bmon/ivysaur.pic" +IvysaurPicFront:: INCBIN "pic/ymon/ivysaur.pic" IvysaurPicBack:: INCBIN "pic/monback/ivysaurb.pic" -ExeggutorPicFront:: INCBIN "pic/bmon/exeggutor.pic" +ExeggutorPicFront:: INCBIN "pic/ymon/exeggutor.pic" ExeggutorPicBack:: INCBIN "pic/monback/exeggutorb.pic" -LickitungPicFront:: INCBIN "pic/bmon/lickitung.pic" +LickitungPicFront:: INCBIN "pic/ymon/lickitung.pic" LickitungPicBack:: INCBIN "pic/monback/lickitungb.pic" -ExeggcutePicFront:: INCBIN "pic/bmon/exeggcute.pic" +ExeggcutePicFront:: INCBIN "pic/ymon/exeggcute.pic" ExeggcutePicBack:: INCBIN "pic/monback/exeggcuteb.pic" -GrimerPicFront:: INCBIN "pic/bmon/grimer.pic" +GrimerPicFront:: INCBIN "pic/ymon/grimer.pic" GrimerPicBack:: INCBIN "pic/monback/grimerb.pic" -GengarPicFront:: INCBIN "pic/bmon/gengar.pic" +GengarPicFront:: INCBIN "pic/ymon/gengar.pic" GengarPicBack:: INCBIN "pic/monback/gengarb.pic" -NidoranFPicFront:: INCBIN "pic/bmon/nidoranf.pic" +NidoranFPicFront:: INCBIN "pic/ymon/nidoranf.pic" NidoranFPicBack:: INCBIN "pic/monback/nidoranfb.pic" -NidoqueenPicFront:: INCBIN "pic/bmon/nidoqueen.pic" +NidoqueenPicFront:: INCBIN "pic/ymon/nidoqueen.pic" NidoqueenPicBack:: INCBIN "pic/monback/nidoqueenb.pic" -CubonePicFront:: INCBIN "pic/bmon/cubone.pic" +CubonePicFront:: INCBIN "pic/ymon/cubone.pic" CubonePicBack:: INCBIN "pic/monback/cuboneb.pic" -RhyhornPicFront:: INCBIN "pic/bmon/rhyhorn.pic" +RhyhornPicFront:: INCBIN "pic/ymon/rhyhorn.pic" RhyhornPicBack:: INCBIN "pic/monback/rhyhornb.pic" -LaprasPicFront:: INCBIN "pic/bmon/lapras.pic" +LaprasPicFront:: INCBIN "pic/ymon/lapras.pic" LaprasPicBack:: INCBIN "pic/monback/laprasb.pic" -ArcaninePicFront:: INCBIN "pic/bmon/arcanine.pic" +ArcaninePicFront:: INCBIN "pic/ymon/arcanine.pic" ArcaninePicBack:: INCBIN "pic/monback/arcanineb.pic" -GyaradosPicFront:: INCBIN "pic/bmon/gyarados.pic" +GyaradosPicFront:: INCBIN "pic/ymon/gyarados.pic" GyaradosPicBack:: INCBIN "pic/monback/gyaradosb.pic" -ShellderPicFront:: INCBIN "pic/bmon/shellder.pic" +ShellderPicFront:: INCBIN "pic/ymon/shellder.pic" ShellderPicBack:: INCBIN "pic/monback/shellderb.pic" -TentacoolPicFront:: INCBIN "pic/bmon/tentacool.pic" +TentacoolPicFront:: INCBIN "pic/ymon/tentacool.pic" TentacoolPicBack:: INCBIN "pic/monback/tentacoolb.pic" -GastlyPicFront:: INCBIN "pic/bmon/gastly.pic" +GastlyPicFront:: INCBIN "pic/ymon/gastly.pic" GastlyPicBack:: INCBIN "pic/monback/gastlyb.pic" -ScytherPicFront:: INCBIN "pic/bmon/scyther.pic" +ScytherPicFront:: INCBIN "pic/ymon/scyther.pic" ScytherPicBack:: INCBIN "pic/monback/scytherb.pic" -StaryuPicFront:: INCBIN "pic/bmon/staryu.pic" +StaryuPicFront:: INCBIN "pic/ymon/staryu.pic" StaryuPicBack:: INCBIN "pic/monback/staryub.pic" -BlastoisePicFront:: INCBIN "pic/bmon/blastoise.pic" +BlastoisePicFront:: INCBIN "pic/ymon/blastoise.pic" BlastoisePicBack:: INCBIN "pic/monback/blastoiseb.pic" -PinsirPicFront:: INCBIN "pic/bmon/pinsir.pic" +PinsirPicFront:: INCBIN "pic/ymon/pinsir.pic" PinsirPicBack:: INCBIN "pic/monback/pinsirb.pic" -TangelaPicFront:: INCBIN "pic/bmon/tangela.pic" +TangelaPicFront:: INCBIN "pic/ymon/tangela.pic" TangelaPicBack:: INCBIN "pic/monback/tangelab.pic" @@ -5015,69 +5015,69 @@ INCLUDE "engine/battle/save_trainer_name.asm" SECTION "Pics 2", ROMX, BANK[PICS_2] -GrowlithePicFront:: INCBIN "pic/bmon/growlithe.pic" +GrowlithePicFront:: INCBIN "pic/ymon/growlithe.pic" GrowlithePicBack:: INCBIN "pic/monback/growlitheb.pic" -OnixPicFront:: INCBIN "pic/bmon/onix.pic" +OnixPicFront:: INCBIN "pic/ymon/onix.pic" OnixPicBack:: INCBIN "pic/monback/onixb.pic" -FearowPicFront:: INCBIN "pic/bmon/fearow.pic" +FearowPicFront:: INCBIN "pic/ymon/fearow.pic" FearowPicBack:: INCBIN "pic/monback/fearowb.pic" -PidgeyPicFront:: INCBIN "pic/bmon/pidgey.pic" +PidgeyPicFront:: INCBIN "pic/ymon/pidgey.pic" PidgeyPicBack:: INCBIN "pic/monback/pidgeyb.pic" -SlowpokePicFront:: INCBIN "pic/bmon/slowpoke.pic" +SlowpokePicFront:: INCBIN "pic/ymon/slowpoke.pic" SlowpokePicBack:: INCBIN "pic/monback/slowpokeb.pic" -KadabraPicFront:: INCBIN "pic/bmon/kadabra.pic" +KadabraPicFront:: INCBIN "pic/ymon/kadabra.pic" KadabraPicBack:: INCBIN "pic/monback/kadabrab.pic" -GravelerPicFront:: INCBIN "pic/bmon/graveler.pic" +GravelerPicFront:: INCBIN "pic/ymon/graveler.pic" GravelerPicBack:: INCBIN "pic/monback/gravelerb.pic" -ChanseyPicFront:: INCBIN "pic/bmon/chansey.pic" +ChanseyPicFront:: INCBIN "pic/ymon/chansey.pic" ChanseyPicBack:: INCBIN "pic/monback/chanseyb.pic" -MachokePicFront:: INCBIN "pic/bmon/machoke.pic" +MachokePicFront:: INCBIN "pic/ymon/machoke.pic" MachokePicBack:: INCBIN "pic/monback/machokeb.pic" -MrMimePicFront:: INCBIN "pic/bmon/mr.mime.pic" +MrMimePicFront:: INCBIN "pic/ymon/mr.mime.pic" MrMimePicBack:: INCBIN "pic/monback/mr.mimeb.pic" -HitmonleePicFront:: INCBIN "pic/bmon/hitmonlee.pic" +HitmonleePicFront:: INCBIN "pic/ymon/hitmonlee.pic" HitmonleePicBack:: INCBIN "pic/monback/hitmonleeb.pic" -HitmonchanPicFront:: INCBIN "pic/bmon/hitmonchan.pic" +HitmonchanPicFront:: INCBIN "pic/ymon/hitmonchan.pic" HitmonchanPicBack:: INCBIN "pic/monback/hitmonchanb.pic" -ArbokPicFront:: INCBIN "pic/bmon/arbok.pic" +ArbokPicFront:: INCBIN "pic/ymon/arbok.pic" ArbokPicBack:: INCBIN "pic/monback/arbokb.pic" -ParasectPicFront:: INCBIN "pic/bmon/parasect.pic" +ParasectPicFront:: INCBIN "pic/ymon/parasect.pic" ParasectPicBack:: INCBIN "pic/monback/parasectb.pic" -PsyduckPicFront:: INCBIN "pic/bmon/psyduck.pic" +PsyduckPicFront:: INCBIN "pic/ymon/psyduck.pic" PsyduckPicBack:: INCBIN "pic/monback/psyduckb.pic" -DrowzeePicFront:: INCBIN "pic/bmon/drowzee.pic" +DrowzeePicFront:: INCBIN "pic/ymon/drowzee.pic" DrowzeePicBack:: INCBIN "pic/monback/drowzeeb.pic" -GolemPicFront:: INCBIN "pic/bmon/golem.pic" +GolemPicFront:: INCBIN "pic/ymon/golem.pic" GolemPicBack:: INCBIN "pic/monback/golemb.pic" -MagmarPicFront:: INCBIN "pic/bmon/magmar.pic" +MagmarPicFront:: INCBIN "pic/ymon/magmar.pic" MagmarPicBack:: INCBIN "pic/monback/magmarb.pic" -ElectabuzzPicFront:: INCBIN "pic/bmon/electabuzz.pic" +ElectabuzzPicFront:: INCBIN "pic/ymon/electabuzz.pic" ElectabuzzPicBack:: INCBIN "pic/monback/electabuzzb.pic" -MagnetonPicFront:: INCBIN "pic/bmon/magneton.pic" +MagnetonPicFront:: INCBIN "pic/ymon/magneton.pic" MagnetonPicBack:: INCBIN "pic/monback/magnetonb.pic" -KoffingPicFront:: INCBIN "pic/bmon/koffing.pic" +KoffingPicFront:: INCBIN "pic/ymon/koffing.pic" KoffingPicBack:: INCBIN "pic/monback/koffingb.pic" -MankeyPicFront:: INCBIN "pic/bmon/mankey.pic" +MankeyPicFront:: INCBIN "pic/ymon/mankey.pic" MankeyPicBack:: INCBIN "pic/monback/mankeyb.pic" -SeelPicFront:: INCBIN "pic/bmon/seel.pic" +SeelPicFront:: INCBIN "pic/ymon/seel.pic" SeelPicBack:: INCBIN "pic/monback/seelb.pic" -DiglettPicFront:: INCBIN "pic/bmon/diglett.pic" +DiglettPicFront:: INCBIN "pic/ymon/diglett.pic" DiglettPicBack:: INCBIN "pic/monback/diglettb.pic" -TaurosPicFront:: INCBIN "pic/bmon/tauros.pic" +TaurosPicFront:: INCBIN "pic/ymon/tauros.pic" TaurosPicBack:: INCBIN "pic/monback/taurosb.pic" -FarfetchdPicFront:: INCBIN "pic/bmon/farfetchd.pic" +FarfetchdPicFront:: INCBIN "pic/ymon/farfetchd.pic" FarfetchdPicBack:: INCBIN "pic/monback/farfetchdb.pic" -VenonatPicFront:: INCBIN "pic/bmon/venonat.pic" +VenonatPicFront:: INCBIN "pic/ymon/venonat.pic" VenonatPicBack:: INCBIN "pic/monback/venonatb.pic" -DragonitePicFront:: INCBIN "pic/bmon/dragonite.pic" +DragonitePicFront:: INCBIN "pic/ymon/dragonite.pic" DragonitePicBack:: INCBIN "pic/monback/dragoniteb.pic" -DoduoPicFront:: INCBIN "pic/bmon/doduo.pic" +DoduoPicFront:: INCBIN "pic/ymon/doduo.pic" DoduoPicBack:: INCBIN "pic/monback/doduob.pic" -PoliwagPicFront:: INCBIN "pic/bmon/poliwag.pic" +PoliwagPicFront:: INCBIN "pic/ymon/poliwag.pic" PoliwagPicBack:: INCBIN "pic/monback/poliwagb.pic" -JynxPicFront:: INCBIN "pic/bmon/jynx.pic" +JynxPicFront:: INCBIN "pic/ymon/jynx.pic" JynxPicBack:: INCBIN "pic/monback/jynxb.pic" -MoltresPicFront:: INCBIN "pic/bmon/moltres.pic" +MoltresPicFront:: INCBIN "pic/ymon/moltres.pic" MoltresPicBack:: INCBIN "pic/monback/moltresb.pic" @@ -5087,76 +5087,76 @@ INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm" SECTION "Pics 3", ROMX, BANK[PICS_3] -ArticunoPicFront:: INCBIN "pic/bmon/articuno.pic" +ArticunoPicFront:: INCBIN "pic/ymon/articuno.pic" ArticunoPicBack:: INCBIN "pic/monback/articunob.pic" -ZapdosPicFront:: INCBIN "pic/bmon/zapdos.pic" +ZapdosPicFront:: INCBIN "pic/ymon/zapdos.pic" ZapdosPicBack:: INCBIN "pic/monback/zapdosb.pic" -DittoPicFront:: INCBIN "pic/bmon/ditto.pic" +DittoPicFront:: INCBIN "pic/ymon/ditto.pic" DittoPicBack:: INCBIN "pic/monback/dittob.pic" -MeowthPicFront:: INCBIN "pic/bmon/meowth.pic" +MeowthPicFront:: INCBIN "pic/ymon/meowth.pic" MeowthPicBack:: INCBIN "pic/monback/meowthb.pic" -KrabbyPicFront:: INCBIN "pic/bmon/krabby.pic" +KrabbyPicFront:: INCBIN "pic/ymon/krabby.pic" KrabbyPicBack:: INCBIN "pic/monback/krabbyb.pic" -VulpixPicFront:: INCBIN "pic/bmon/vulpix.pic" +VulpixPicFront:: INCBIN "pic/ymon/vulpix.pic" VulpixPicBack:: INCBIN "pic/monback/vulpixb.pic" -NinetalesPicFront:: INCBIN "pic/bmon/ninetales.pic" +NinetalesPicFront:: INCBIN "pic/ymon/ninetales.pic" NinetalesPicBack:: INCBIN "pic/monback/ninetalesb.pic" -PikachuPicFront:: INCBIN "pic/bmon/pikachu.pic" +PikachuPicFront:: INCBIN "pic/ymon/pikachu.pic" PikachuPicBack:: INCBIN "pic/monback/pikachub.pic" -RaichuPicFront:: INCBIN "pic/bmon/raichu.pic" +RaichuPicFront:: INCBIN "pic/ymon/raichu.pic" RaichuPicBack:: INCBIN "pic/monback/raichub.pic" -DratiniPicFront:: INCBIN "pic/bmon/dratini.pic" +DratiniPicFront:: INCBIN "pic/ymon/dratini.pic" DratiniPicBack:: INCBIN "pic/monback/dratinib.pic" -DragonairPicFront:: INCBIN "pic/bmon/dragonair.pic" +DragonairPicFront:: INCBIN "pic/ymon/dragonair.pic" DragonairPicBack:: INCBIN "pic/monback/dragonairb.pic" -KabutoPicFront:: INCBIN "pic/bmon/kabuto.pic" +KabutoPicFront:: INCBIN "pic/ymon/kabuto.pic" KabutoPicBack:: INCBIN "pic/monback/kabutob.pic" -KabutopsPicFront:: INCBIN "pic/bmon/kabutops.pic" +KabutopsPicFront:: INCBIN "pic/ymon/kabutops.pic" KabutopsPicBack:: INCBIN "pic/monback/kabutopsb.pic" -HorseaPicFront:: INCBIN "pic/bmon/horsea.pic" +HorseaPicFront:: INCBIN "pic/ymon/horsea.pic" HorseaPicBack:: INCBIN "pic/monback/horseab.pic" -SeadraPicFront:: INCBIN "pic/bmon/seadra.pic" +SeadraPicFront:: INCBIN "pic/ymon/seadra.pic" SeadraPicBack:: INCBIN "pic/monback/seadrab.pic" -SandshrewPicFront:: INCBIN "pic/bmon/sandshrew.pic" +SandshrewPicFront:: INCBIN "pic/ymon/sandshrew.pic" SandshrewPicBack:: INCBIN "pic/monback/sandshrewb.pic" -SandslashPicFront:: INCBIN "pic/bmon/sandslash.pic" +SandslashPicFront:: INCBIN "pic/ymon/sandslash.pic" SandslashPicBack:: INCBIN "pic/monback/sandslashb.pic" -OmanytePicFront:: INCBIN "pic/bmon/omanyte.pic" +OmanytePicFront:: INCBIN "pic/ymon/omanyte.pic" OmanytePicBack:: INCBIN "pic/monback/omanyteb.pic" -OmastarPicFront:: INCBIN "pic/bmon/omastar.pic" +OmastarPicFront:: INCBIN "pic/ymon/omastar.pic" OmastarPicBack:: INCBIN "pic/monback/omastarb.pic" -JigglypuffPicFront:: INCBIN "pic/bmon/jigglypuff.pic" +JigglypuffPicFront:: INCBIN "pic/ymon/jigglypuff.pic" JigglypuffPicBack:: INCBIN "pic/monback/jigglypuffb.pic" -WigglytuffPicFront:: INCBIN "pic/bmon/wigglytuff.pic" +WigglytuffPicFront:: INCBIN "pic/ymon/wigglytuff.pic" WigglytuffPicBack:: INCBIN "pic/monback/wigglytuffb.pic" -EeveePicFront:: INCBIN "pic/bmon/eevee.pic" +EeveePicFront:: INCBIN "pic/ymon/eevee.pic" EeveePicBack:: INCBIN "pic/monback/eeveeb.pic" -FlareonPicFront:: INCBIN "pic/bmon/flareon.pic" +FlareonPicFront:: INCBIN "pic/ymon/flareon.pic" FlareonPicBack:: INCBIN "pic/monback/flareonb.pic" -JolteonPicFront:: INCBIN "pic/bmon/jolteon.pic" +JolteonPicFront:: INCBIN "pic/ymon/jolteon.pic" JolteonPicBack:: INCBIN "pic/monback/jolteonb.pic" -VaporeonPicFront:: INCBIN "pic/bmon/vaporeon.pic" +VaporeonPicFront:: INCBIN "pic/ymon/vaporeon.pic" VaporeonPicBack:: INCBIN "pic/monback/vaporeonb.pic" -MachopPicFront:: INCBIN "pic/bmon/machop.pic" +MachopPicFront:: INCBIN "pic/ymon/machop.pic" MachopPicBack:: INCBIN "pic/monback/machopb.pic" -ZubatPicFront:: INCBIN "pic/bmon/zubat.pic" +ZubatPicFront:: INCBIN "pic/ymon/zubat.pic" ZubatPicBack:: INCBIN "pic/monback/zubatb.pic" -EkansPicFront:: INCBIN "pic/bmon/ekans.pic" +EkansPicFront:: INCBIN "pic/ymon/ekans.pic" EkansPicBack:: INCBIN "pic/monback/ekansb.pic" -ParasPicFront:: INCBIN "pic/bmon/paras.pic" +ParasPicFront:: INCBIN "pic/ymon/paras.pic" ParasPicBack:: INCBIN "pic/monback/parasb.pic" -PoliwhirlPicFront:: INCBIN "pic/bmon/poliwhirl.pic" +PoliwhirlPicFront:: INCBIN "pic/ymon/poliwhirl.pic" PoliwhirlPicBack:: INCBIN "pic/monback/poliwhirlb.pic" -PoliwrathPicFront:: INCBIN "pic/bmon/poliwrath.pic" +PoliwrathPicFront:: INCBIN "pic/ymon/poliwrath.pic" PoliwrathPicBack:: INCBIN "pic/monback/poliwrathb.pic" -WeedlePicFront:: INCBIN "pic/bmon/weedle.pic" +WeedlePicFront:: INCBIN "pic/ymon/weedle.pic" WeedlePicBack:: INCBIN "pic/monback/weedleb.pic" -KakunaPicFront:: INCBIN "pic/bmon/kakuna.pic" +KakunaPicFront:: INCBIN "pic/ymon/kakuna.pic" KakunaPicBack:: INCBIN "pic/monback/kakunab.pic" -BeedrillPicFront:: INCBIN "pic/bmon/beedrill.pic" +BeedrillPicFront:: INCBIN "pic/ymon/beedrill.pic" BeedrillPicBack:: INCBIN "pic/monback/beedrillb.pic" -FossilKabutopsPic:: INCBIN "pic/bmon/fossilkabutops.pic" +FossilKabutopsPic:: INCBIN "pic/ymon/fossilkabutops.pic" SECTION "Battle (bank B)", ROMX, BANK[$B] @@ -5177,63 +5177,63 @@ INCLUDE "engine/game_corner_slots2.asm" SECTION "Pics 4", ROMX, BANK[PICS_4] -DodrioPicFront:: INCBIN "pic/bmon/dodrio.pic" +DodrioPicFront:: INCBIN "pic/ymon/dodrio.pic" DodrioPicBack:: INCBIN "pic/monback/dodriob.pic" -PrimeapePicFront:: INCBIN "pic/bmon/primeape.pic" +PrimeapePicFront:: INCBIN "pic/ymon/primeape.pic" PrimeapePicBack:: INCBIN "pic/monback/primeapeb.pic" -DugtrioPicFront:: INCBIN "pic/bmon/dugtrio.pic" +DugtrioPicFront:: INCBIN "pic/ymon/dugtrio.pic" DugtrioPicBack:: INCBIN "pic/monback/dugtriob.pic" -VenomothPicFront:: INCBIN "pic/bmon/venomoth.pic" +VenomothPicFront:: INCBIN "pic/ymon/venomoth.pic" VenomothPicBack:: INCBIN "pic/monback/venomothb.pic" -DewgongPicFront:: INCBIN "pic/bmon/dewgong.pic" +DewgongPicFront:: INCBIN "pic/ymon/dewgong.pic" DewgongPicBack:: INCBIN "pic/monback/dewgongb.pic" -CaterpiePicFront:: INCBIN "pic/bmon/caterpie.pic" +CaterpiePicFront:: INCBIN "pic/ymon/caterpie.pic" CaterpiePicBack:: INCBIN "pic/monback/caterpieb.pic" -MetapodPicFront:: INCBIN "pic/bmon/metapod.pic" +MetapodPicFront:: INCBIN "pic/ymon/metapod.pic" MetapodPicBack:: INCBIN "pic/monback/metapodb.pic" -ButterfreePicFront:: INCBIN "pic/bmon/butterfree.pic" +ButterfreePicFront:: INCBIN "pic/ymon/butterfree.pic" ButterfreePicBack:: INCBIN "pic/monback/butterfreeb.pic" -MachampPicFront:: INCBIN "pic/bmon/machamp.pic" +MachampPicFront:: INCBIN "pic/ymon/machamp.pic" MachampPicBack:: INCBIN "pic/monback/machampb.pic" -GolduckPicFront:: INCBIN "pic/bmon/golduck.pic" +GolduckPicFront:: INCBIN "pic/ymon/golduck.pic" GolduckPicBack:: INCBIN "pic/monback/golduckb.pic" -HypnoPicFront:: INCBIN "pic/bmon/hypno.pic" +HypnoPicFront:: INCBIN "pic/ymon/hypno.pic" HypnoPicBack:: INCBIN "pic/monback/hypnob.pic" -GolbatPicFront:: INCBIN "pic/bmon/golbat.pic" +GolbatPicFront:: INCBIN "pic/ymon/golbat.pic" GolbatPicBack:: INCBIN "pic/monback/golbatb.pic" -MewtwoPicFront:: INCBIN "pic/bmon/mewtwo.pic" +MewtwoPicFront:: INCBIN "pic/ymon/mewtwo.pic" MewtwoPicBack:: INCBIN "pic/monback/mewtwob.pic" -SnorlaxPicFront:: INCBIN "pic/bmon/snorlax.pic" +SnorlaxPicFront:: INCBIN "pic/ymon/snorlax.pic" SnorlaxPicBack:: INCBIN "pic/monback/snorlaxb.pic" -MagikarpPicFront:: INCBIN "pic/bmon/magikarp.pic" +MagikarpPicFront:: INCBIN "pic/ymon/magikarp.pic" MagikarpPicBack:: INCBIN "pic/monback/magikarpb.pic" -MukPicFront:: INCBIN "pic/bmon/muk.pic" +MukPicFront:: INCBIN "pic/ymon/muk.pic" MukPicBack:: INCBIN "pic/monback/mukb.pic" -KinglerPicFront:: INCBIN "pic/bmon/kingler.pic" +KinglerPicFront:: INCBIN "pic/ymon/kingler.pic" KinglerPicBack:: INCBIN "pic/monback/kinglerb.pic" -CloysterPicFront:: INCBIN "pic/bmon/cloyster.pic" +CloysterPicFront:: INCBIN "pic/ymon/cloyster.pic" CloysterPicBack:: INCBIN "pic/monback/cloysterb.pic" -ElectrodePicFront:: INCBIN "pic/bmon/electrode.pic" +ElectrodePicFront:: INCBIN "pic/ymon/electrode.pic" ElectrodePicBack:: INCBIN "pic/monback/electrodeb.pic" -ClefablePicFront:: INCBIN "pic/bmon/clefable.pic" +ClefablePicFront:: INCBIN "pic/ymon/clefable.pic" ClefablePicBack:: INCBIN "pic/monback/clefableb.pic" -WeezingPicFront:: INCBIN "pic/bmon/weezing.pic" +WeezingPicFront:: INCBIN "pic/ymon/weezing.pic" WeezingPicBack:: INCBIN "pic/monback/weezingb.pic" -PersianPicFront:: INCBIN "pic/bmon/persian.pic" +PersianPicFront:: INCBIN "pic/ymon/persian.pic" PersianPicBack:: INCBIN "pic/monback/persianb.pic" -MarowakPicFront:: INCBIN "pic/bmon/marowak.pic" +MarowakPicFront:: INCBIN "pic/ymon/marowak.pic" MarowakPicBack:: INCBIN "pic/monback/marowakb.pic" -HaunterPicFront:: INCBIN "pic/bmon/haunter.pic" +HaunterPicFront:: INCBIN "pic/ymon/haunter.pic" HaunterPicBack:: INCBIN "pic/monback/haunterb.pic" -AbraPicFront:: INCBIN "pic/bmon/abra.pic" +AbraPicFront:: INCBIN "pic/ymon/abra.pic" AbraPicBack:: INCBIN "pic/monback/abrab.pic" -AlakazamPicFront:: INCBIN "pic/bmon/alakazam.pic" +AlakazamPicFront:: INCBIN "pic/ymon/alakazam.pic" AlakazamPicBack:: INCBIN "pic/monback/alakazamb.pic" -PidgeottoPicFront:: INCBIN "pic/bmon/pidgeotto.pic" +PidgeottoPicFront:: INCBIN "pic/ymon/pidgeotto.pic" PidgeottoPicBack:: INCBIN "pic/monback/pidgeottob.pic" -PidgeotPicFront:: INCBIN "pic/bmon/pidgeot.pic" +PidgeotPicFront:: INCBIN "pic/ymon/pidgeot.pic" PidgeotPicBack:: INCBIN "pic/monback/pidgeotb.pic" -StarmiePicFront:: INCBIN "pic/bmon/starmie.pic" +StarmiePicFront:: INCBIN "pic/ymon/starmie.pic" StarmiePicBack:: INCBIN "pic/monback/starmieb.pic" RedPicBack:: INCBIN "pic/trainer/redb.pic" @@ -5247,59 +5247,59 @@ SECTION "Battle (bank C)", ROMX, BANK[$C] SECTION "Pics 5", ROMX, BANK[PICS_5] -BulbasaurPicFront:: INCBIN "pic/bmon/bulbasaur.pic" +BulbasaurPicFront:: INCBIN "pic/ymon/bulbasaur.pic" BulbasaurPicBack:: INCBIN "pic/monback/bulbasaurb.pic" -VenusaurPicFront:: INCBIN "pic/bmon/venusaur.pic" +VenusaurPicFront:: INCBIN "pic/ymon/venusaur.pic" VenusaurPicBack:: INCBIN "pic/monback/venusaurb.pic" -TentacruelPicFront:: INCBIN "pic/bmon/tentacruel.pic" +TentacruelPicFront:: INCBIN "pic/ymon/tentacruel.pic" TentacruelPicBack:: INCBIN "pic/monback/tentacruelb.pic" -GoldeenPicFront:: INCBIN "pic/bmon/goldeen.pic" +GoldeenPicFront:: INCBIN "pic/ymon/goldeen.pic" GoldeenPicBack:: INCBIN "pic/monback/goldeenb.pic" -SeakingPicFront:: INCBIN "pic/bmon/seaking.pic" +SeakingPicFront:: INCBIN "pic/ymon/seaking.pic" SeakingPicBack:: INCBIN "pic/monback/seakingb.pic" -PonytaPicFront:: INCBIN "pic/bmon/ponyta.pic" -RapidashPicFront:: INCBIN "pic/bmon/rapidash.pic" +PonytaPicFront:: INCBIN "pic/ymon/ponyta.pic" +RapidashPicFront:: INCBIN "pic/ymon/rapidash.pic" PonytaPicBack:: INCBIN "pic/monback/ponytab.pic" RapidashPicBack:: INCBIN "pic/monback/rapidashb.pic" -RattataPicFront:: INCBIN "pic/bmon/rattata.pic" +RattataPicFront:: INCBIN "pic/ymon/rattata.pic" RattataPicBack:: INCBIN "pic/monback/rattatab.pic" -RaticatePicFront:: INCBIN "pic/bmon/raticate.pic" +RaticatePicFront:: INCBIN "pic/ymon/raticate.pic" RaticatePicBack:: INCBIN "pic/monback/raticateb.pic" -NidorinoPicFront:: INCBIN "pic/bmon/nidorino.pic" +NidorinoPicFront:: INCBIN "pic/ymon/nidorino.pic" NidorinoPicBack:: INCBIN "pic/monback/nidorinob.pic" -NidorinaPicFront:: INCBIN "pic/bmon/nidorina.pic" +NidorinaPicFront:: INCBIN "pic/ymon/nidorina.pic" NidorinaPicBack:: INCBIN "pic/monback/nidorinab.pic" -GeodudePicFront:: INCBIN "pic/bmon/geodude.pic" +GeodudePicFront:: INCBIN "pic/ymon/geodude.pic" GeodudePicBack:: INCBIN "pic/monback/geodudeb.pic" -PorygonPicFront:: INCBIN "pic/bmon/porygon.pic" +PorygonPicFront:: INCBIN "pic/ymon/porygon.pic" PorygonPicBack:: INCBIN "pic/monback/porygonb.pic" -AerodactylPicFront:: INCBIN "pic/bmon/aerodactyl.pic" +AerodactylPicFront:: INCBIN "pic/ymon/aerodactyl.pic" AerodactylPicBack:: INCBIN "pic/monback/aerodactylb.pic" -MagnemitePicFront:: INCBIN "pic/bmon/magnemite.pic" +MagnemitePicFront:: INCBIN "pic/ymon/magnemite.pic" MagnemitePicBack:: INCBIN "pic/monback/magnemiteb.pic" -CharmanderPicFront:: INCBIN "pic/bmon/charmander.pic" +CharmanderPicFront:: INCBIN "pic/ymon/charmander.pic" CharmanderPicBack:: INCBIN "pic/monback/charmanderb.pic" -SquirtlePicFront:: INCBIN "pic/bmon/squirtle.pic" +SquirtlePicFront:: INCBIN "pic/ymon/squirtle.pic" SquirtlePicBack:: INCBIN "pic/monback/squirtleb.pic" -CharmeleonPicFront:: INCBIN "pic/bmon/charmeleon.pic" +CharmeleonPicFront:: INCBIN "pic/ymon/charmeleon.pic" CharmeleonPicBack:: INCBIN "pic/monback/charmeleonb.pic" -WartortlePicFront:: INCBIN "pic/bmon/wartortle.pic" +WartortlePicFront:: INCBIN "pic/ymon/wartortle.pic" WartortlePicBack:: INCBIN "pic/monback/wartortleb.pic" -CharizardPicFront:: INCBIN "pic/bmon/charizard.pic" +CharizardPicFront:: INCBIN "pic/ymon/charizard.pic" CharizardPicBack:: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic:: INCBIN "pic/bmon/fossilaerodactyl.pic" +FossilAerodactylPic:: INCBIN "pic/ymon/fossilaerodactyl.pic" GhostPic:: INCBIN "pic/other/ghost.pic" -OddishPicFront:: INCBIN "pic/bmon/oddish.pic" +OddishPicFront:: INCBIN "pic/ymon/oddish.pic" OddishPicBack:: INCBIN "pic/monback/oddishb.pic" -GloomPicFront:: INCBIN "pic/bmon/gloom.pic" +GloomPicFront:: INCBIN "pic/ymon/gloom.pic" GloomPicBack:: INCBIN "pic/monback/gloomb.pic" -VileplumePicFront:: INCBIN "pic/bmon/vileplume.pic" +VileplumePicFront:: INCBIN "pic/ymon/vileplume.pic" VileplumePicBack:: INCBIN "pic/monback/vileplumeb.pic" -BellsproutPicFront:: INCBIN "pic/bmon/bellsprout.pic" +BellsproutPicFront:: INCBIN "pic/ymon/bellsprout.pic" BellsproutPicBack:: INCBIN "pic/monback/bellsproutb.pic" -WeepinbellPicFront:: INCBIN "pic/bmon/weepinbell.pic" +WeepinbellPicFront:: INCBIN "pic/ymon/weepinbell.pic" WeepinbellPicBack:: INCBIN "pic/monback/weepinbellb.pic" -VictreebelPicFront:: INCBIN "pic/bmon/victreebel.pic" +VictreebelPicFront:: INCBIN "pic/ymon/victreebel.pic" VictreebelPicBack:: INCBIN "pic/monback/victreebelb.pic" diff --git a/pic/bmon/abra.png b/pic/bmon/abra.png Binary files differdeleted file mode 100644 index 12045ee3..00000000 --- a/pic/bmon/abra.png +++ /dev/null diff --git a/pic/bmon/aerodactyl.png b/pic/bmon/aerodactyl.png Binary files differdeleted file mode 100644 index 4cbfdeeb..00000000 --- a/pic/bmon/aerodactyl.png +++ /dev/null diff --git a/pic/bmon/alakazam.png b/pic/bmon/alakazam.png Binary files differdeleted file mode 100644 index 9c379b6a..00000000 --- a/pic/bmon/alakazam.png +++ /dev/null diff --git a/pic/bmon/arbok.png b/pic/bmon/arbok.png Binary files differdeleted file mode 100644 index bd8da001..00000000 --- a/pic/bmon/arbok.png +++ /dev/null diff --git a/pic/bmon/arcanine.png b/pic/bmon/arcanine.png Binary files differdeleted file mode 100644 index 5d25961d..00000000 --- a/pic/bmon/arcanine.png +++ /dev/null diff --git a/pic/bmon/articuno.png b/pic/bmon/articuno.png Binary files differdeleted file mode 100644 index 66986add..00000000 --- a/pic/bmon/articuno.png +++ /dev/null diff --git a/pic/bmon/beedrill.png b/pic/bmon/beedrill.png Binary files differdeleted file mode 100644 index 36b4a06f..00000000 --- a/pic/bmon/beedrill.png +++ /dev/null diff --git a/pic/bmon/bellsprout.png b/pic/bmon/bellsprout.png Binary files differdeleted file mode 100644 index e4fc5e18..00000000 --- a/pic/bmon/bellsprout.png +++ /dev/null diff --git a/pic/bmon/blastoise.png b/pic/bmon/blastoise.png Binary files differdeleted file mode 100644 index 2192b43a..00000000 --- a/pic/bmon/blastoise.png +++ /dev/null diff --git a/pic/bmon/bulbasaur.png b/pic/bmon/bulbasaur.png Binary files differdeleted file mode 100644 index a2a924c7..00000000 --- a/pic/bmon/bulbasaur.png +++ /dev/null diff --git a/pic/bmon/butterfree.png b/pic/bmon/butterfree.png Binary files differdeleted file mode 100644 index 8f1a69aa..00000000 --- a/pic/bmon/butterfree.png +++ /dev/null diff --git a/pic/bmon/caterpie.png b/pic/bmon/caterpie.png Binary files differdeleted file mode 100644 index 8e1a49dd..00000000 --- a/pic/bmon/caterpie.png +++ /dev/null diff --git a/pic/bmon/chansey.png b/pic/bmon/chansey.png Binary files differdeleted file mode 100644 index 832ba27c..00000000 --- a/pic/bmon/chansey.png +++ /dev/null diff --git a/pic/bmon/charizard.png b/pic/bmon/charizard.png Binary files differdeleted file mode 100644 index ad29e489..00000000 --- a/pic/bmon/charizard.png +++ /dev/null diff --git a/pic/bmon/charmander.png b/pic/bmon/charmander.png Binary files differdeleted file mode 100644 index 12d16f01..00000000 --- a/pic/bmon/charmander.png +++ /dev/null diff --git a/pic/bmon/charmeleon.png b/pic/bmon/charmeleon.png Binary files differdeleted file mode 100644 index a5cff72f..00000000 --- a/pic/bmon/charmeleon.png +++ /dev/null diff --git a/pic/bmon/clefable.png b/pic/bmon/clefable.png Binary files differdeleted file mode 100644 index 2fcfac0a..00000000 --- a/pic/bmon/clefable.png +++ /dev/null diff --git a/pic/bmon/clefairy.png b/pic/bmon/clefairy.png Binary files differdeleted file mode 100644 index 5a7f3721..00000000 --- a/pic/bmon/clefairy.png +++ /dev/null diff --git a/pic/bmon/cloyster.png b/pic/bmon/cloyster.png Binary files differdeleted file mode 100644 index 71f63a7f..00000000 --- a/pic/bmon/cloyster.png +++ /dev/null diff --git a/pic/bmon/cubone.png b/pic/bmon/cubone.png Binary files differdeleted file mode 100644 index 23e3a23a..00000000 --- a/pic/bmon/cubone.png +++ /dev/null diff --git a/pic/bmon/dewgong.png b/pic/bmon/dewgong.png Binary files differdeleted file mode 100644 index aac4e65c..00000000 --- a/pic/bmon/dewgong.png +++ /dev/null diff --git a/pic/bmon/diglett.png b/pic/bmon/diglett.png Binary files differdeleted file mode 100644 index f92ae5bc..00000000 --- a/pic/bmon/diglett.png +++ /dev/null diff --git a/pic/bmon/ditto.png b/pic/bmon/ditto.png Binary files differdeleted file mode 100644 index 4485e6ec..00000000 --- a/pic/bmon/ditto.png +++ /dev/null diff --git a/pic/bmon/dodrio.png b/pic/bmon/dodrio.png Binary files differdeleted file mode 100644 index 92e6839d..00000000 --- a/pic/bmon/dodrio.png +++ /dev/null diff --git a/pic/bmon/doduo.png b/pic/bmon/doduo.png Binary files differdeleted file mode 100644 index 20cba7ba..00000000 --- a/pic/bmon/doduo.png +++ /dev/null diff --git a/pic/bmon/dragonair.png b/pic/bmon/dragonair.png Binary files differdeleted file mode 100644 index 55d1ef5b..00000000 --- a/pic/bmon/dragonair.png +++ /dev/null diff --git a/pic/bmon/dragonite.png b/pic/bmon/dragonite.png Binary files differdeleted file mode 100644 index 4c387c3e..00000000 --- a/pic/bmon/dragonite.png +++ /dev/null diff --git a/pic/bmon/dratini.png b/pic/bmon/dratini.png Binary files differdeleted file mode 100644 index 9df332e4..00000000 --- a/pic/bmon/dratini.png +++ /dev/null diff --git a/pic/bmon/drowzee.png b/pic/bmon/drowzee.png Binary files differdeleted file mode 100644 index cc85510b..00000000 --- a/pic/bmon/drowzee.png +++ /dev/null diff --git a/pic/bmon/dugtrio.png b/pic/bmon/dugtrio.png Binary files differdeleted file mode 100644 index 433f95ef..00000000 --- a/pic/bmon/dugtrio.png +++ /dev/null diff --git a/pic/bmon/eevee.png b/pic/bmon/eevee.png Binary files differdeleted file mode 100644 index 956f8ce0..00000000 --- a/pic/bmon/eevee.png +++ /dev/null diff --git a/pic/bmon/ekans.png b/pic/bmon/ekans.png Binary files differdeleted file mode 100644 index 6dffaf84..00000000 --- a/pic/bmon/ekans.png +++ /dev/null diff --git a/pic/bmon/electabuzz.png b/pic/bmon/electabuzz.png Binary files differdeleted file mode 100644 index 0ddccbe1..00000000 --- a/pic/bmon/electabuzz.png +++ /dev/null diff --git a/pic/bmon/electrode.png b/pic/bmon/electrode.png Binary files differdeleted file mode 100644 index 8df79e6a..00000000 --- a/pic/bmon/electrode.png +++ /dev/null diff --git a/pic/bmon/exeggcute.png b/pic/bmon/exeggcute.png Binary files differdeleted file mode 100644 index 0ddf8e32..00000000 --- a/pic/bmon/exeggcute.png +++ /dev/null diff --git a/pic/bmon/exeggutor.png b/pic/bmon/exeggutor.png Binary files differdeleted file mode 100644 index 89ccbdc4..00000000 --- a/pic/bmon/exeggutor.png +++ /dev/null diff --git a/pic/bmon/farfetchd.png b/pic/bmon/farfetchd.png Binary files differdeleted file mode 100644 index 490e2b7c..00000000 --- a/pic/bmon/farfetchd.png +++ /dev/null diff --git a/pic/bmon/fearow.png b/pic/bmon/fearow.png Binary files differdeleted file mode 100644 index c2c65257..00000000 --- a/pic/bmon/fearow.png +++ /dev/null diff --git a/pic/bmon/flareon.png b/pic/bmon/flareon.png Binary files differdeleted file mode 100644 index eadebd27..00000000 --- a/pic/bmon/flareon.png +++ /dev/null diff --git a/pic/bmon/gastly.png b/pic/bmon/gastly.png Binary files differdeleted file mode 100644 index 081b121d..00000000 --- a/pic/bmon/gastly.png +++ /dev/null diff --git a/pic/bmon/gengar.png b/pic/bmon/gengar.png Binary files differdeleted file mode 100644 index 450662d7..00000000 --- a/pic/bmon/gengar.png +++ /dev/null diff --git a/pic/bmon/geodude.png b/pic/bmon/geodude.png Binary files differdeleted file mode 100644 index 4202192a..00000000 --- a/pic/bmon/geodude.png +++ /dev/null diff --git a/pic/bmon/gloom.png b/pic/bmon/gloom.png Binary files differdeleted file mode 100644 index c2ea9ba4..00000000 --- a/pic/bmon/gloom.png +++ /dev/null diff --git a/pic/bmon/golbat.png b/pic/bmon/golbat.png Binary files differdeleted file mode 100644 index 6abc6f0a..00000000 --- a/pic/bmon/golbat.png +++ /dev/null diff --git a/pic/bmon/goldeen.png b/pic/bmon/goldeen.png Binary files differdeleted file mode 100644 index e8cbfddc..00000000 --- a/pic/bmon/goldeen.png +++ /dev/null diff --git a/pic/bmon/golduck.png b/pic/bmon/golduck.png Binary files differdeleted file mode 100644 index 5448f7c8..00000000 --- a/pic/bmon/golduck.png +++ /dev/null diff --git a/pic/bmon/golem.png b/pic/bmon/golem.png Binary files differdeleted file mode 100644 index 1dba6a67..00000000 --- a/pic/bmon/golem.png +++ /dev/null diff --git a/pic/bmon/graveler.png b/pic/bmon/graveler.png Binary files differdeleted file mode 100644 index 0d9da672..00000000 --- a/pic/bmon/graveler.png +++ /dev/null diff --git a/pic/bmon/grimer.png b/pic/bmon/grimer.png Binary files differdeleted file mode 100644 index 255b10b9..00000000 --- a/pic/bmon/grimer.png +++ /dev/null diff --git a/pic/bmon/growlithe.png b/pic/bmon/growlithe.png Binary files differdeleted file mode 100644 index b753bce7..00000000 --- a/pic/bmon/growlithe.png +++ /dev/null diff --git a/pic/bmon/gyarados.png b/pic/bmon/gyarados.png Binary files differdeleted file mode 100644 index a7ed0c17..00000000 --- a/pic/bmon/gyarados.png +++ /dev/null diff --git a/pic/bmon/haunter.png b/pic/bmon/haunter.png Binary files differdeleted file mode 100644 index 4d6c758d..00000000 --- a/pic/bmon/haunter.png +++ /dev/null diff --git a/pic/bmon/hitmonchan.png b/pic/bmon/hitmonchan.png Binary files differdeleted file mode 100644 index d8a6ffd3..00000000 --- a/pic/bmon/hitmonchan.png +++ /dev/null diff --git a/pic/bmon/hitmonlee.png b/pic/bmon/hitmonlee.png Binary files differdeleted file mode 100644 index 36042c68..00000000 --- a/pic/bmon/hitmonlee.png +++ /dev/null diff --git a/pic/bmon/horsea.png b/pic/bmon/horsea.png Binary files differdeleted file mode 100644 index cd28df8c..00000000 --- a/pic/bmon/horsea.png +++ /dev/null diff --git a/pic/bmon/hypno.png b/pic/bmon/hypno.png Binary files differdeleted file mode 100644 index e7434ea4..00000000 --- a/pic/bmon/hypno.png +++ /dev/null diff --git a/pic/bmon/ivysaur.png b/pic/bmon/ivysaur.png Binary files differdeleted file mode 100644 index dad10ae0..00000000 --- a/pic/bmon/ivysaur.png +++ /dev/null diff --git a/pic/bmon/jigglypuff.png b/pic/bmon/jigglypuff.png Binary files differdeleted file mode 100644 index a5475777..00000000 --- a/pic/bmon/jigglypuff.png +++ /dev/null diff --git a/pic/bmon/jolteon.png b/pic/bmon/jolteon.png Binary files differdeleted file mode 100644 index 7ecd6fbb..00000000 --- a/pic/bmon/jolteon.png +++ /dev/null diff --git a/pic/bmon/jynx.png b/pic/bmon/jynx.png Binary files differdeleted file mode 100644 index 583bd5da..00000000 --- a/pic/bmon/jynx.png +++ /dev/null diff --git a/pic/bmon/kabuto.png b/pic/bmon/kabuto.png Binary files differdeleted file mode 100644 index e8e44e15..00000000 --- a/pic/bmon/kabuto.png +++ /dev/null diff --git a/pic/bmon/kabutops.png b/pic/bmon/kabutops.png Binary files differdeleted file mode 100644 index 39fcb900..00000000 --- a/pic/bmon/kabutops.png +++ /dev/null diff --git a/pic/bmon/kadabra.png b/pic/bmon/kadabra.png Binary files differdeleted file mode 100644 index 36589440..00000000 --- a/pic/bmon/kadabra.png +++ /dev/null diff --git a/pic/bmon/kakuna.png b/pic/bmon/kakuna.png Binary files differdeleted file mode 100644 index ee350ffd..00000000 --- a/pic/bmon/kakuna.png +++ /dev/null diff --git a/pic/bmon/kangaskhan.png b/pic/bmon/kangaskhan.png Binary files differdeleted file mode 100644 index 1c0ba99c..00000000 --- a/pic/bmon/kangaskhan.png +++ /dev/null diff --git a/pic/bmon/kingler.png b/pic/bmon/kingler.png Binary files differdeleted file mode 100644 index b2bd7418..00000000 --- a/pic/bmon/kingler.png +++ /dev/null diff --git a/pic/bmon/koffing.png b/pic/bmon/koffing.png Binary files differdeleted file mode 100644 index 36961502..00000000 --- a/pic/bmon/koffing.png +++ /dev/null diff --git a/pic/bmon/krabby.png b/pic/bmon/krabby.png Binary files differdeleted file mode 100644 index b280e8db..00000000 --- a/pic/bmon/krabby.png +++ /dev/null diff --git a/pic/bmon/lapras.png b/pic/bmon/lapras.png Binary files differdeleted file mode 100644 index 822c00e9..00000000 --- a/pic/bmon/lapras.png +++ /dev/null diff --git a/pic/bmon/lickitung.png b/pic/bmon/lickitung.png Binary files differdeleted file mode 100644 index 050f7d23..00000000 --- a/pic/bmon/lickitung.png +++ /dev/null diff --git a/pic/bmon/machamp.png b/pic/bmon/machamp.png Binary files differdeleted file mode 100644 index c854a2cf..00000000 --- a/pic/bmon/machamp.png +++ /dev/null diff --git a/pic/bmon/machoke.png b/pic/bmon/machoke.png Binary files differdeleted file mode 100644 index 317dad96..00000000 --- a/pic/bmon/machoke.png +++ /dev/null diff --git a/pic/bmon/machop.png b/pic/bmon/machop.png Binary files differdeleted file mode 100644 index 63909c11..00000000 --- a/pic/bmon/machop.png +++ /dev/null diff --git a/pic/bmon/magikarp.png b/pic/bmon/magikarp.png Binary files differdeleted file mode 100644 index e71402f8..00000000 --- a/pic/bmon/magikarp.png +++ /dev/null diff --git a/pic/bmon/magmar.png b/pic/bmon/magmar.png Binary files differdeleted file mode 100644 index 9bc1d929..00000000 --- a/pic/bmon/magmar.png +++ /dev/null diff --git a/pic/bmon/magnemite.png b/pic/bmon/magnemite.png Binary files differdeleted file mode 100644 index f2254bed..00000000 --- a/pic/bmon/magnemite.png +++ /dev/null diff --git a/pic/bmon/magneton.png b/pic/bmon/magneton.png Binary files differdeleted file mode 100644 index 4d0f2cc7..00000000 --- a/pic/bmon/magneton.png +++ /dev/null diff --git a/pic/bmon/mankey.png b/pic/bmon/mankey.png Binary files differdeleted file mode 100644 index 303ce1f2..00000000 --- a/pic/bmon/mankey.png +++ /dev/null diff --git a/pic/bmon/marowak.png b/pic/bmon/marowak.png Binary files differdeleted file mode 100644 index b2d18437..00000000 --- a/pic/bmon/marowak.png +++ /dev/null diff --git a/pic/bmon/meowth.png b/pic/bmon/meowth.png Binary files differdeleted file mode 100644 index 0e706c35..00000000 --- a/pic/bmon/meowth.png +++ /dev/null diff --git a/pic/bmon/metapod.png b/pic/bmon/metapod.png Binary files differdeleted file mode 100644 index cbfa6e1e..00000000 --- a/pic/bmon/metapod.png +++ /dev/null diff --git a/pic/bmon/mew.png b/pic/bmon/mew.png Binary files differdeleted file mode 100644 index 7e25a96d..00000000 --- a/pic/bmon/mew.png +++ /dev/null diff --git a/pic/bmon/mewtwo.png b/pic/bmon/mewtwo.png Binary files differdeleted file mode 100644 index b7a31296..00000000 --- a/pic/bmon/mewtwo.png +++ /dev/null diff --git a/pic/bmon/moltres.png b/pic/bmon/moltres.png Binary files differdeleted file mode 100644 index 7c153998..00000000 --- a/pic/bmon/moltres.png +++ /dev/null diff --git a/pic/bmon/mr.mime.png b/pic/bmon/mr.mime.png Binary files differdeleted file mode 100644 index d9085ec6..00000000 --- a/pic/bmon/mr.mime.png +++ /dev/null diff --git a/pic/bmon/muk.png b/pic/bmon/muk.png Binary files differdeleted file mode 100644 index f69b83b7..00000000 --- a/pic/bmon/muk.png +++ /dev/null diff --git a/pic/bmon/nidoking.png b/pic/bmon/nidoking.png Binary files differdeleted file mode 100644 index 24330538..00000000 --- a/pic/bmon/nidoking.png +++ /dev/null diff --git a/pic/bmon/nidoqueen.png b/pic/bmon/nidoqueen.png Binary files differdeleted file mode 100644 index c0043e1b..00000000 --- a/pic/bmon/nidoqueen.png +++ /dev/null diff --git a/pic/bmon/nidoranf.png b/pic/bmon/nidoranf.png Binary files differdeleted file mode 100644 index 6b58b274..00000000 --- a/pic/bmon/nidoranf.png +++ /dev/null diff --git a/pic/bmon/nidoranm.png b/pic/bmon/nidoranm.png Binary files differdeleted file mode 100644 index 92d0cb49..00000000 --- a/pic/bmon/nidoranm.png +++ /dev/null diff --git a/pic/bmon/nidorina.png b/pic/bmon/nidorina.png Binary files differdeleted file mode 100644 index 68aca7c4..00000000 --- a/pic/bmon/nidorina.png +++ /dev/null diff --git a/pic/bmon/nidorino.png b/pic/bmon/nidorino.png Binary files differdeleted file mode 100644 index 795bf0c5..00000000 --- a/pic/bmon/nidorino.png +++ /dev/null diff --git a/pic/bmon/ninetales.png b/pic/bmon/ninetales.png Binary files differdeleted file mode 100644 index ed6bb398..00000000 --- a/pic/bmon/ninetales.png +++ /dev/null diff --git a/pic/bmon/oddish.png b/pic/bmon/oddish.png Binary files differdeleted file mode 100644 index e47dabe1..00000000 --- a/pic/bmon/oddish.png +++ /dev/null diff --git a/pic/bmon/omanyte.png b/pic/bmon/omanyte.png Binary files differdeleted file mode 100644 index bdfa5440..00000000 --- a/pic/bmon/omanyte.png +++ /dev/null diff --git a/pic/bmon/omastar.png b/pic/bmon/omastar.png Binary files differdeleted file mode 100644 index 3221d3d8..00000000 --- a/pic/bmon/omastar.png +++ /dev/null diff --git a/pic/bmon/onix.png b/pic/bmon/onix.png Binary files differdeleted file mode 100644 index 44a21a61..00000000 --- a/pic/bmon/onix.png +++ /dev/null diff --git a/pic/bmon/paras.png b/pic/bmon/paras.png Binary files differdeleted file mode 100644 index f4909bbd..00000000 --- a/pic/bmon/paras.png +++ /dev/null diff --git a/pic/bmon/parasect.png b/pic/bmon/parasect.png Binary files differdeleted file mode 100644 index 938bf53b..00000000 --- a/pic/bmon/parasect.png +++ /dev/null diff --git a/pic/bmon/persian.png b/pic/bmon/persian.png Binary files differdeleted file mode 100644 index cc15677a..00000000 --- a/pic/bmon/persian.png +++ /dev/null diff --git a/pic/bmon/pidgeot.png b/pic/bmon/pidgeot.png Binary files differdeleted file mode 100644 index 7daf609f..00000000 --- a/pic/bmon/pidgeot.png +++ /dev/null diff --git a/pic/bmon/pidgeotto.png b/pic/bmon/pidgeotto.png Binary files differdeleted file mode 100644 index c86b86f1..00000000 --- a/pic/bmon/pidgeotto.png +++ /dev/null diff --git a/pic/bmon/pidgey.png b/pic/bmon/pidgey.png Binary files differdeleted file mode 100644 index 70d9dd4a..00000000 --- a/pic/bmon/pidgey.png +++ /dev/null diff --git a/pic/bmon/pikachu.png b/pic/bmon/pikachu.png Binary files differdeleted file mode 100644 index 159e47e9..00000000 --- a/pic/bmon/pikachu.png +++ /dev/null diff --git a/pic/bmon/pinsir.png b/pic/bmon/pinsir.png Binary files differdeleted file mode 100644 index 320c79cb..00000000 --- a/pic/bmon/pinsir.png +++ /dev/null diff --git a/pic/bmon/poliwag.png b/pic/bmon/poliwag.png Binary files differdeleted file mode 100644 index 397d2e66..00000000 --- a/pic/bmon/poliwag.png +++ /dev/null diff --git a/pic/bmon/poliwhirl.png b/pic/bmon/poliwhirl.png Binary files differdeleted file mode 100644 index a7039145..00000000 --- a/pic/bmon/poliwhirl.png +++ /dev/null diff --git a/pic/bmon/poliwrath.png b/pic/bmon/poliwrath.png Binary files differdeleted file mode 100644 index f31d0680..00000000 --- a/pic/bmon/poliwrath.png +++ /dev/null diff --git a/pic/bmon/ponyta.png b/pic/bmon/ponyta.png Binary files differdeleted file mode 100644 index 4d8c1bee..00000000 --- a/pic/bmon/ponyta.png +++ /dev/null diff --git a/pic/bmon/porygon.png b/pic/bmon/porygon.png Binary files differdeleted file mode 100644 index ba3500c6..00000000 --- a/pic/bmon/porygon.png +++ /dev/null diff --git a/pic/bmon/primeape.png b/pic/bmon/primeape.png Binary files differdeleted file mode 100644 index 7c5a1a09..00000000 --- a/pic/bmon/primeape.png +++ /dev/null diff --git a/pic/bmon/psyduck.png b/pic/bmon/psyduck.png Binary files differdeleted file mode 100644 index 86772256..00000000 --- a/pic/bmon/psyduck.png +++ /dev/null diff --git a/pic/bmon/raichu.png b/pic/bmon/raichu.png Binary files differdeleted file mode 100644 index a29731e5..00000000 --- a/pic/bmon/raichu.png +++ /dev/null diff --git a/pic/bmon/rapidash.png b/pic/bmon/rapidash.png Binary files differdeleted file mode 100644 index 62d47506..00000000 --- a/pic/bmon/rapidash.png +++ /dev/null diff --git a/pic/bmon/raticate.png b/pic/bmon/raticate.png Binary files differdeleted file mode 100644 index 64340846..00000000 --- a/pic/bmon/raticate.png +++ /dev/null diff --git a/pic/bmon/rattata.png b/pic/bmon/rattata.png Binary files differdeleted file mode 100644 index 9b391cca..00000000 --- a/pic/bmon/rattata.png +++ /dev/null diff --git a/pic/bmon/rhydon.png b/pic/bmon/rhydon.png Binary files differdeleted file mode 100644 index 92406476..00000000 --- a/pic/bmon/rhydon.png +++ /dev/null diff --git a/pic/bmon/rhyhorn.png b/pic/bmon/rhyhorn.png Binary files differdeleted file mode 100644 index 9452b701..00000000 --- a/pic/bmon/rhyhorn.png +++ /dev/null diff --git a/pic/bmon/sandshrew.png b/pic/bmon/sandshrew.png Binary files differdeleted file mode 100644 index bcf52215..00000000 --- a/pic/bmon/sandshrew.png +++ /dev/null diff --git a/pic/bmon/sandslash.png b/pic/bmon/sandslash.png Binary files differdeleted file mode 100644 index 3b212a60..00000000 --- a/pic/bmon/sandslash.png +++ /dev/null diff --git a/pic/bmon/scyther.png b/pic/bmon/scyther.png Binary files differdeleted file mode 100644 index 3fe6eeae..00000000 --- a/pic/bmon/scyther.png +++ /dev/null diff --git a/pic/bmon/seadra.png b/pic/bmon/seadra.png Binary files differdeleted file mode 100644 index e8af292f..00000000 --- a/pic/bmon/seadra.png +++ /dev/null diff --git a/pic/bmon/seaking.png b/pic/bmon/seaking.png Binary files differdeleted file mode 100644 index ebe70c7e..00000000 --- a/pic/bmon/seaking.png +++ /dev/null diff --git a/pic/bmon/seel.png b/pic/bmon/seel.png Binary files differdeleted file mode 100644 index c4b2315a..00000000 --- a/pic/bmon/seel.png +++ /dev/null diff --git a/pic/bmon/shellder.png b/pic/bmon/shellder.png Binary files differdeleted file mode 100644 index cf44a7fe..00000000 --- a/pic/bmon/shellder.png +++ /dev/null diff --git a/pic/bmon/slowbro.png b/pic/bmon/slowbro.png Binary files differdeleted file mode 100644 index e61ad34b..00000000 --- a/pic/bmon/slowbro.png +++ /dev/null diff --git a/pic/bmon/slowpoke.png b/pic/bmon/slowpoke.png Binary files differdeleted file mode 100644 index fdf701d7..00000000 --- a/pic/bmon/slowpoke.png +++ /dev/null diff --git a/pic/bmon/snorlax.png b/pic/bmon/snorlax.png Binary files differdeleted file mode 100644 index 5b571a18..00000000 --- a/pic/bmon/snorlax.png +++ /dev/null diff --git a/pic/bmon/spearow.png b/pic/bmon/spearow.png Binary files differdeleted file mode 100644 index 835800a5..00000000 --- a/pic/bmon/spearow.png +++ /dev/null diff --git a/pic/bmon/squirtle.png b/pic/bmon/squirtle.png Binary files differdeleted file mode 100644 index bc0c9979..00000000 --- a/pic/bmon/squirtle.png +++ /dev/null diff --git a/pic/bmon/starmie.png b/pic/bmon/starmie.png Binary files differdeleted file mode 100644 index 24025ddf..00000000 --- a/pic/bmon/starmie.png +++ /dev/null diff --git a/pic/bmon/staryu.png b/pic/bmon/staryu.png Binary files differdeleted file mode 100644 index 394732e9..00000000 --- a/pic/bmon/staryu.png +++ /dev/null diff --git a/pic/bmon/tangela.png b/pic/bmon/tangela.png Binary files differdeleted file mode 100644 index eff9c5a5..00000000 --- a/pic/bmon/tangela.png +++ /dev/null diff --git a/pic/bmon/tauros.png b/pic/bmon/tauros.png Binary files differdeleted file mode 100644 index 3a4edfee..00000000 --- a/pic/bmon/tauros.png +++ /dev/null diff --git a/pic/bmon/tentacool.png b/pic/bmon/tentacool.png Binary files differdeleted file mode 100644 index 534e5496..00000000 --- a/pic/bmon/tentacool.png +++ /dev/null diff --git a/pic/bmon/tentacruel.png b/pic/bmon/tentacruel.png Binary files differdeleted file mode 100644 index 7a26a305..00000000 --- a/pic/bmon/tentacruel.png +++ /dev/null diff --git a/pic/bmon/vaporeon.png b/pic/bmon/vaporeon.png Binary files differdeleted file mode 100644 index 48dafce6..00000000 --- a/pic/bmon/vaporeon.png +++ /dev/null diff --git a/pic/bmon/venomoth.png b/pic/bmon/venomoth.png Binary files differdeleted file mode 100644 index e28b1017..00000000 --- a/pic/bmon/venomoth.png +++ /dev/null diff --git a/pic/bmon/venonat.png b/pic/bmon/venonat.png Binary files differdeleted file mode 100644 index edf15889..00000000 --- a/pic/bmon/venonat.png +++ /dev/null diff --git a/pic/bmon/venusaur.png b/pic/bmon/venusaur.png Binary files differdeleted file mode 100644 index dd39184a..00000000 --- a/pic/bmon/venusaur.png +++ /dev/null diff --git a/pic/bmon/victreebel.png b/pic/bmon/victreebel.png Binary files differdeleted file mode 100644 index 29a471c8..00000000 --- a/pic/bmon/victreebel.png +++ /dev/null diff --git a/pic/bmon/vileplume.png b/pic/bmon/vileplume.png Binary files differdeleted file mode 100644 index e788425e..00000000 --- a/pic/bmon/vileplume.png +++ /dev/null diff --git a/pic/bmon/voltorb.png b/pic/bmon/voltorb.png Binary files differdeleted file mode 100644 index 22d0c675..00000000 --- a/pic/bmon/voltorb.png +++ /dev/null diff --git a/pic/bmon/vulpix.png b/pic/bmon/vulpix.png Binary files differdeleted file mode 100644 index f4780ef2..00000000 --- a/pic/bmon/vulpix.png +++ /dev/null diff --git a/pic/bmon/wartortle.png b/pic/bmon/wartortle.png Binary files differdeleted file mode 100644 index bd844562..00000000 --- a/pic/bmon/wartortle.png +++ /dev/null diff --git a/pic/bmon/weedle.png b/pic/bmon/weedle.png Binary files differdeleted file mode 100644 index 445fe8f3..00000000 --- a/pic/bmon/weedle.png +++ /dev/null diff --git a/pic/bmon/weepinbell.png b/pic/bmon/weepinbell.png Binary files differdeleted file mode 100644 index 6ee57334..00000000 --- a/pic/bmon/weepinbell.png +++ /dev/null diff --git a/pic/bmon/weezing.png b/pic/bmon/weezing.png Binary files differdeleted file mode 100644 index deb2a623..00000000 --- a/pic/bmon/weezing.png +++ /dev/null diff --git a/pic/bmon/wigglytuff.png b/pic/bmon/wigglytuff.png Binary files differdeleted file mode 100644 index c7cd495b..00000000 --- a/pic/bmon/wigglytuff.png +++ /dev/null diff --git a/pic/bmon/zapdos.png b/pic/bmon/zapdos.png Binary files differdeleted file mode 100644 index 0bd71f4e..00000000 --- a/pic/bmon/zapdos.png +++ /dev/null diff --git a/pic/bmon/zubat.png b/pic/bmon/zubat.png Binary files differdeleted file mode 100644 index 73078725..00000000 --- a/pic/bmon/zubat.png +++ /dev/null diff --git a/pic/bmon/fossilaerodactyl.png b/pic/ymon/fossilaerodactyl.png Binary files differindex eb7fc3a3..eb7fc3a3 100644 --- a/pic/bmon/fossilaerodactyl.png +++ b/pic/ymon/fossilaerodactyl.png diff --git a/pic/bmon/fossilkabutops.png b/pic/ymon/fossilkabutops.png Binary files differindex dd8d41ea..dd8d41ea 100644 --- a/pic/bmon/fossilkabutops.png +++ b/pic/ymon/fossilkabutops.png diff --git a/yellow/main.asm b/yellow/main.asm index b40d08a7..ab298239 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -3772,7 +3772,7 @@ KakunaPicBack: INCBIN "pic/monback/kakunab.pic" BeedrillPicFront: INCBIN "pic/ymon/beedrill.pic" BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic" -FossilKabutopsPic: INCBIN "pic/bmon/fossilkabutops.pic" +FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic" dr $2fd25,$2fd42 CheckIfMoveIsKnown: ; 2fd42 (b:7d42) @@ -3885,7 +3885,7 @@ WartortlePicFront: INCBIN "pic/ymon/wartortle.pic" WartortlePicBack: INCBIN "pic/monback/wartortleb.pic" CharizardPicFront: INCBIN "pic/ymon/charizard.pic" CharizardPicBack: INCBIN "pic/monback/charizardb.pic" -FossilAerodactylPic: INCBIN "pic/bmon/fossilaerodactyl.pic" +FossilAerodactylPic: INCBIN "pic/ymon/fossilaerodactyl.pic" GhostPic: INCBIN "pic/other/ghost.pic" OddishPicFront: INCBIN "pic/ymon/oddish.pic" OddishPicBack: INCBIN "pic/monback/oddishb.pic" @@ -3904,14 +3904,10 @@ VictreebelPicBack: INCBIN "pic/monback/victreebelb.pic" SECTION "bank0E",ROMX,BANK[$0E] -Moves: ; 38000 (e:4000) - dr $38000,$38006 -MoveEnd: ; 38006 (e:4006) - dr $38006,$383de -BaseStats: ; 383de (e:43de) - dr $383de,$39462 -CryData: ; 39462 (e:5462) - dr $39462,$39893 +INCLUDE "data/moves.asm" +BaseStats: INCLUDE "data/base_stats.asm" +INCLUDE "data/cries.asm" + dr $3969c,$39893 TrainerPicAndMoneyPointers: ; 39893 (e:5893) dr $39893,$3997e TrainerNames: ; 3997e (e:597e) |
