diff options
Diffstat (limited to 'gfx')
577 files changed, 425 insertions, 1133 deletions
diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm index 52ac4e6b5..7f8f59189 100644 --- a/gfx/battle_anims.asm +++ b/gfx/battle_anims.asm @@ -1,4 +1,4 @@ -AnimObj00GFX: ; 84a2e +AnimObj00GFX: AnimObjHitGFX: INCBIN "gfx/battle_anims/hit.2bpp.lz" AnimObjCutGFX: INCBIN "gfx/battle_anims/cut.2bpp.lz" AnimObjFireGFX: INCBIN "gfx/battle_anims/fire.2bpp.lz" @@ -38,4 +38,3 @@ AnimObjShineGFX: INCBIN "gfx/battle_anims/shine.2bpp.lz" AnimObjAngelsGFX: INCBIN "gfx/battle_anims/angels.2bpp.lz" AnimObjWaveGFX: INCBIN "gfx/battle_anims/wave.2bpp.lz" AnimObjAeroblastGFX: INCBIN "gfx/battle_anims/aeroblast.2bpp.lz" -; 8640e diff --git a/gfx/unknown/b789.pal b/gfx/beta_poker/beta_poker.pal index cce760662..cce760662 100644 --- a/gfx/unknown/b789.pal +++ b/gfx/beta_poker/beta_poker.pal diff --git a/gfx/font.asm b/gfx/font.asm index bf5741074..2361c2ae6 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -7,7 +7,7 @@ INCBIN "gfx/font/font.1bpp" FontBattleExtra: INCBIN "gfx/font/font_battle_extra.2bpp" -Frames: ; f8800 +Frames: INCBIN "gfx/frames/1.1bpp" INCBIN "gfx/frames/2.1bpp" INCBIN "gfx/frames/3.1bpp" @@ -17,66 +17,50 @@ INCBIN "gfx/frames/6.1bpp" INCBIN "gfx/frames/7.1bpp" INCBIN "gfx/frames/8.1bpp" INCBIN "gfx/frames/9.1bpp" -; f89b0 ; Various misc graphics here. -StatsScreenPageTilesGFX: ; f89b0 +StatsScreenPageTilesGFX: INCBIN "gfx/stats/stats_tiles.2bpp" -; f8ac0 -EnemyHPBarBorderGFX: ; f8ac0 +EnemyHPBarBorderGFX: INCBIN "gfx/battle/enemy_hp_bar_border.1bpp" -; f8ae0 -HPExpBarBorderGFX: ; f8ae0 +HPExpBarBorderGFX: INCBIN "gfx/battle/hp_exp_bar_border.1bpp" -; f8b10 -ExpBarGFX: ; f8b10 +ExpBarGFX: INCBIN "gfx/battle/expbar.2bpp" -; f8ba0 -TownMapGFX: ; f8ba0 +TownMapGFX: INCBIN "gfx/pokegear/town_map.2bpp.lz" -; f8ea4 UnusedWeekdayKanjiGFX: ; unused kanji INCBIN "gfx/font/unused_weekday_kanji.2bpp" -; f8f24 -PokegearPhoneIconGFX: ; f8f24 +PokegearPhoneIconGFX: INCBIN "gfx/font/phone_icon.2bpp" -; f8f34 UnusedBoldFontGFX: ; unused bold letters + unown chars INCBIN "gfx/font/unused_bold_font.1bpp" -; f9204 -TextBoxSpaceGFX: ; f9204 +TextBoxSpaceGFX: INCBIN "gfx/frames/space.1bpp" -; f9214 -FontsExtra_SolidBlackGFX: ; f9214 +FontsExtra_SolidBlackGFX: INCBIN "gfx/font/black.1bpp" -; f921c UnusedUpArrowGFX: ; unused up arrow + whitespace INCBIN "gfx/font/unused_up_arrow.1bpp" -; f9234 -MobilePhoneTilesGFX: ; f9234 +MobilePhoneTilesGFX: INCBIN "gfx/mobile/phone_tiles.2bpp" -; f9344 -MapEntryFrameGFX: ; f9344 +MapEntryFrameGFX: INCBIN "gfx/frames/map_entry_sign.2bpp" -; f9424 -FontsExtra2_UpArrowGFX: ; f9424 +FontsExtra2_UpArrowGFX: INCBIN "gfx/font/up_arrow.2bpp" -; f9434 -Footprints: ; f9434 +Footprints: INCLUDE "gfx/footprints.asm" -; fb434 diff --git a/gfx/icons.asm b/gfx/icons.asm index 0733c26f6..c664516fa 100644 --- a/gfx/icons.asm +++ b/gfx/icons.asm @@ -1,40 +1,41 @@ -Icons: +Icons: ; used only for BANK(Icons) + NullIcon: -PoliwagIcon: INCBIN "gfx/icons/poliwag.2bpp" ; 0x8ec0d -JigglypuffIcon: INCBIN "gfx/icons/jigglypuff.2bpp" ; 0x8ec8d -DiglettIcon: INCBIN "gfx/icons/diglett.2bpp" ; 0x8ed0d -PikachuIcon: INCBIN "gfx/icons/pikachu.2bpp" ; 0x8ed8d -StaryuIcon: INCBIN "gfx/icons/staryu.2bpp" ; 0x8ee0d -FishIcon: INCBIN "gfx/icons/fish.2bpp" ; 0x8ee8d -BirdIcon: INCBIN "gfx/icons/bird.2bpp" ; 0x8ef0d -MonsterIcon: INCBIN "gfx/icons/monster.2bpp" ; 0x8ef8d -ClefairyIcon: INCBIN "gfx/icons/clefairy.2bpp" ; 0x8f00d -OddishIcon: INCBIN "gfx/icons/oddish.2bpp" ; 0x8f08d -BugIcon: INCBIN "gfx/icons/bug.2bpp" ; 0x8f10d -GhostIcon: INCBIN "gfx/icons/ghost.2bpp" ; 0x8f18d -LaprasIcon: INCBIN "gfx/icons/lapras.2bpp" ; 0x8f20d -HumanshapeIcon: INCBIN "gfx/icons/humanshape.2bpp" ; 0x8f28d -FoxIcon: INCBIN "gfx/icons/fox.2bpp" ; 0x8f30d -EquineIcon: INCBIN "gfx/icons/equine.2bpp" ; 0x8f38d -ShellIcon: INCBIN "gfx/icons/shell.2bpp" ; 0x8f40d -BlobIcon: INCBIN "gfx/icons/blob.2bpp" ; 0x8f48d -SerpentIcon: INCBIN "gfx/icons/serpent.2bpp" ; 0x8f50d -VoltorbIcon: INCBIN "gfx/icons/voltorb.2bpp" ; 0x8f58d -SquirtleIcon: INCBIN "gfx/icons/squirtle.2bpp" ; 0x8f60d -BulbasaurIcon: INCBIN "gfx/icons/bulbasaur.2bpp" ; 0x8f68d -CharmanderIcon: INCBIN "gfx/icons/charmander.2bpp" ; 0x8f70d -CaterpillarIcon: INCBIN "gfx/icons/caterpillar.2bpp" ; 0x8f78d -UnownIcon: INCBIN "gfx/icons/unown.2bpp" ; 0x8f80d -GeodudeIcon: INCBIN "gfx/icons/geodude.2bpp" ; 0x8f88d -FighterIcon: INCBIN "gfx/icons/fighter.2bpp" ; 0x8f90d -EggIcon: INCBIN "gfx/icons/egg.2bpp" ; 0x8f98d -JellyfishIcon: INCBIN "gfx/icons/jellyfish.2bpp" ; 0x8fa0d -MothIcon: INCBIN "gfx/icons/moth.2bpp" ; 0x8fa8d -BatIcon: INCBIN "gfx/icons/bat.2bpp" ; 0x8fb0d -SnorlaxIcon: INCBIN "gfx/icons/snorlax.2bpp" ; 0x8fb8d -HoOhIcon: INCBIN "gfx/icons/ho_oh.2bpp" ; 0x8fc0d -LugiaIcon: INCBIN "gfx/icons/lugia.2bpp" ; 0x8fc8d -GyaradosIcon: INCBIN "gfx/icons/gyarados.2bpp" ; 0x8fd0d -SlowpokeIcon: INCBIN "gfx/icons/slowpoke.2bpp" ; 0x8fd8d -SudowoodoIcon: INCBIN "gfx/icons/sudowoodo.2bpp" ; 0x8fe0d -BigmonIcon: INCBIN "gfx/icons/bigmon.2bpp" ; 0x8fe8d +PoliwagIcon: INCBIN "gfx/icons/poliwag.2bpp" +JigglypuffIcon: INCBIN "gfx/icons/jigglypuff.2bpp" +DiglettIcon: INCBIN "gfx/icons/diglett.2bpp" +PikachuIcon: INCBIN "gfx/icons/pikachu.2bpp" +StaryuIcon: INCBIN "gfx/icons/staryu.2bpp" +FishIcon: INCBIN "gfx/icons/fish.2bpp" +BirdIcon: INCBIN "gfx/icons/bird.2bpp" +MonsterIcon: INCBIN "gfx/icons/monster.2bpp" +ClefairyIcon: INCBIN "gfx/icons/clefairy.2bpp" +OddishIcon: INCBIN "gfx/icons/oddish.2bpp" +BugIcon: INCBIN "gfx/icons/bug.2bpp" +GhostIcon: INCBIN "gfx/icons/ghost.2bpp" +LaprasIcon: INCBIN "gfx/icons/lapras.2bpp" +HumanshapeIcon: INCBIN "gfx/icons/humanshape.2bpp" +FoxIcon: INCBIN "gfx/icons/fox.2bpp" +EquineIcon: INCBIN "gfx/icons/equine.2bpp" +ShellIcon: INCBIN "gfx/icons/shell.2bpp" +BlobIcon: INCBIN "gfx/icons/blob.2bpp" +SerpentIcon: INCBIN "gfx/icons/serpent.2bpp" +VoltorbIcon: INCBIN "gfx/icons/voltorb.2bpp" +SquirtleIcon: INCBIN "gfx/icons/squirtle.2bpp" +BulbasaurIcon: INCBIN "gfx/icons/bulbasaur.2bpp" +CharmanderIcon: INCBIN "gfx/icons/charmander.2bpp" +CaterpillarIcon: INCBIN "gfx/icons/caterpillar.2bpp" +UnownIcon: INCBIN "gfx/icons/unown.2bpp" +GeodudeIcon: INCBIN "gfx/icons/geodude.2bpp" +FighterIcon: INCBIN "gfx/icons/fighter.2bpp" +EggIcon: INCBIN "gfx/icons/egg.2bpp" +JellyfishIcon: INCBIN "gfx/icons/jellyfish.2bpp" +MothIcon: INCBIN "gfx/icons/moth.2bpp" +BatIcon: INCBIN "gfx/icons/bat.2bpp" +SnorlaxIcon: INCBIN "gfx/icons/snorlax.2bpp" +HoOhIcon: INCBIN "gfx/icons/ho_oh.2bpp" +LugiaIcon: INCBIN "gfx/icons/lugia.2bpp" +GyaradosIcon: INCBIN "gfx/icons/gyarados.2bpp" +SlowpokeIcon: INCBIN "gfx/icons/slowpoke.2bpp" +SudowoodoIcon: INCBIN "gfx/icons/sudowoodo.2bpp" +BigmonIcon: INCBIN "gfx/icons/bigmon.2bpp" diff --git a/gfx/mail.asm b/gfx/mail.asm index 83ca99f60..f8b3f2891 100644 --- a/gfx/mail.asm +++ b/gfx/mail.asm @@ -1,111 +1,111 @@ -MorphMailDividerGFX: ; b9926 +MorphMailDividerGFX: INCBIN "gfx/mail/morph_mail_divider.1bpp" -BlueSkyMailGrassGFX: ; b992e +BlueSkyMailGrassGFX: INCBIN "gfx/mail/grass.1bpp" -PortraitMailSmallPokeballGFX: ; b9936 +PortraitMailSmallPokeballGFX: INCBIN "gfx/mail/small_pokeball.1bpp" -MorphMailBorderGFX: ; b993e +MorphMailBorderGFX: INCBIN "gfx/mail/morph_mail_border.1bpp" -MusicMailSmallNoteGFX: ; b9946 +MusicMailSmallNoteGFX: INCBIN "gfx/mail/small_note.1bpp" -SurfMailWaveGFX: ; b994e +SurfMailWaveGFX: INCBIN "gfx/mail/wave.1bpp" -PortraitMailUnderlineGFX: ; b995e +PortraitMailUnderlineGFX: INCBIN "gfx/mail/portraitmail_underline.1bpp" -LovelyMailUnderlineGFX: ; b9966 +LovelyMailUnderlineGFX: INCBIN "gfx/mail/lovely_mail_underline.1bpp" -LovelyMailSmallHeartGFX: ; b996e +LovelyMailSmallHeartGFX: INCBIN "gfx/mail/small_heart.1bpp" -SurfLiteBlueMailSmallShapesGFX: ; b9976 +SurfLiteBlueMailSmallShapesGFX: INCBIN "gfx/mail/small_triangle.1bpp" -EonMailBorder1GFX: ; b997e +EonMailBorder1GFX: INCBIN "gfx/mail/eon_mail_border_1.1bpp" -EonMailBorder2GFX: ; b998e +EonMailBorder2GFX: INCBIN "gfx/mail/eon_mail_border_2.1bpp" -MailNatuGFX: ; b9996 +MailNatuGFX: INCBIN "gfx/mail/natu.1bpp" -MailDratiniGFX: ; b99c6 +MailDratiniGFX: INCBIN "gfx/mail/dratini.1bpp" -MailPoliwagGFX: ; b99f6 +MailPoliwagGFX: INCBIN "gfx/mail/poliwag.1bpp" -MailLaprasGFX: ; b9a26 +MailLaprasGFX: INCBIN "gfx/mail/lapras.1bpp" -MailEeveeGFX: ; b9a56 +MailEeveeGFX: INCBIN "gfx/mail/eevee.1bpp" -MailDittoGFX: ; b9a86 +MailDittoGFX: INCBIN "gfx/mail/ditto.1bpp" -MailMewGFX: ; b9ab6 +MailMewGFX: INCBIN "gfx/mail/mew.1bpp" -MailDragoniteGFX: ; b9b46 +MailDragoniteGFX: INCBIN "gfx/mail/dragonite.1bpp" -MailSentretGFX: ; b9bce +MailSentretGFX: INCBIN "gfx/mail/sentret.1bpp" -MailUnusedGrassGFX: ; b9bee +MailUnusedGrassGFX: INCBIN "gfx/mail/unused_grass.1bpp" -PortraitMailLargePokeballGFX: ; b9bfe +PortraitMailLargePokeballGFX: INCBIN "gfx/mail/large_pokeball.1bpp" -MailOddishGFX: ; b9c1e +MailOddishGFX: INCBIN "gfx/mail/oddish.1bpp" -SurfLiteBlueMailLargeShapesGFX: ; b9c3e +SurfLiteBlueMailLargeShapesGFX: INCBIN "gfx/mail/large_triangle.1bpp" -LovelyMailLargeHeartGFX: ; b9c5e +LovelyMailLargeHeartGFX: INCBIN "gfx/mail/large_heart.1bpp" -MorphMailBorderCornerGFX: ; b9c7e +MorphMailBorderCornerGFX: INCBIN "gfx/mail/morph_mail_corner.1bpp" -MailLargeCircleGFX: ; b9c9e +MailLargeCircleGFX: INCBIN "gfx/mail/large_circle.1bpp" -FlowerMailFlowerGFX: ; b9cbe +FlowerMailFlowerGFX: INCBIN "gfx/mail/flower_1.1bpp" INCBIN "gfx/mail/flower_2.1bpp" -MusicMailLargeNoteGFX: ; b9cfe +MusicMailLargeNoteGFX: INCBIN "gfx/mail/large_note.1bpp" -MailCloudGFX: ; b9d16 +MailCloudGFX: INCBIN "gfx/mail/cloud.1bpp" -SurfMailBorderGFX: ; b9d46 +SurfMailBorderGFX: INCBIN "gfx/mail/surf_mail_border.1bpp" -FlowerMailBorderGFX: ; b9d86 +FlowerMailBorderGFX: INCBIN "gfx/mail/flower_mail_border.1bpp" -LiteBlueMailBorderGFX: ; b9dc6 +LiteBlueMailBorderGFX: INCBIN "gfx/mail/litebluemail_border.1bpp" -MusicMailBorderGFX: ; b9e06 +MusicMailBorderGFX: INCBIN "gfx/mail/music_mail_border.1bpp" -LovelyMailBorderGFX: ; b9e26 +LovelyMailBorderGFX: INCBIN "gfx/mail/lovely_mail_border.1bpp" -PortraitMailBorderGFX: ; b9e4e +PortraitMailBorderGFX: INCBIN "gfx/mail/portraitmail_border.1bpp" diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png Binary files differindex 52e2bcdd5..aa693cc40 100644 --- a/gfx/pack/pack_menu.png +++ b/gfx/pack/pack_menu.png diff --git a/gfx/pics.asm b/gfx/pics.asm index 198569a76..d771b63d2 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -4,6 +4,7 @@ INCLUDE "constants.asm" ; PokemonPicPointers and UnownPicPointers are assumed to start at the same ; address, but in different banks. This is enforced in pokecrystal.link. + SECTION "Pic Pointers", ROMX INCLUDE "data/pokemon/pic_pointers.asm" @@ -20,7 +21,6 @@ INCLUDE "data/trainers/pic_pointers.asm" SECTION "Pics 1", ROMX -Pics_1:: HoOhFrontpic: INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz" MachampFrontpic: INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz" @@ -35,7 +35,6 @@ VenusaurFrontpic: INCBIN "gfx/pokemon/venusaur/front.animated.2bpp.lz" EnteiFrontpic: INCBIN "gfx/pokemon/entei/front.animated.2bpp.lz" SuicuneFrontpic: INCBIN "gfx/pokemon/suicune/front.animated.2bpp.lz" TyphlosionFrontpic: INCBIN "gfx/pokemon/typhlosion/front.animated.2bpp.lz" -; 123ffa SECTION "Pics 2", ROMX @@ -56,7 +55,6 @@ MewtwoFrontpic: INCBIN "gfx/pokemon/mewtwo/front.animated.2bpp.lz" FearowFrontpic: INCBIN "gfx/pokemon/fearow/front.animated.2bpp.lz" CharizardFrontpic: INCBIN "gfx/pokemon/charizard/front.animated.2bpp.lz" QuilavaFrontpic: INCBIN "gfx/pokemon/quilava/front.animated.2bpp.lz" -; 127ffe SECTION "Pics 3", ROMX @@ -79,7 +77,6 @@ VictreebelFrontpic: INCBIN "gfx/pokemon/victreebel/front.animated.2bpp.lz" RaichuFrontpic: INCBIN "gfx/pokemon/raichu/front.animated.2bpp.lz" PrimeapeFrontpic: INCBIN "gfx/pokemon/primeape/front.animated.2bpp.lz" OmastarBackpic: INCBIN "gfx/pokemon/omastar/back.2bpp.lz" -; 12bffe SECTION "Pics 4", ROMX @@ -104,7 +101,6 @@ JolteonFrontpic: INCBIN "gfx/pokemon/jolteon/front.animated.2bpp.lz" DonphanFrontpic: INCBIN "gfx/pokemon/donphan/front.animated.2bpp.lz" PinsirFrontpic: INCBIN "gfx/pokemon/pinsir/front.animated.2bpp.lz" UnownEFrontpic: INCBIN "gfx/pokemon/unown_e/front.animated.2bpp.lz" -; 130000 SECTION "Pics 5", ROMX @@ -130,7 +126,6 @@ AzumarillFrontpic: INCBIN "gfx/pokemon/azumarill/front.animated.2bpp.lz" ParasectFrontpic: INCBIN "gfx/pokemon/parasect/front.animated.2bpp.lz" MrMimeFrontpic: INCBIN "gfx/pokemon/mr__mime/front.animated.2bpp.lz" HeracrossFrontpic: INCBIN "gfx/pokemon/heracross/front.animated.2bpp.lz" -; 133fff SECTION "Pics 6", ROMX @@ -158,7 +153,6 @@ MarowakFrontpic: INCBIN "gfx/pokemon/marowak/front.animated.2bpp.lz" VulpixFrontpic: INCBIN "gfx/pokemon/vulpix/front.animated.2bpp.lz" GligarFrontpic: INCBIN "gfx/pokemon/gligar/front.animated.2bpp.lz" DunsparceFrontpic: INCBIN "gfx/pokemon/dunsparce/front.animated.2bpp.lz" -; 137fff SECTION "Pics 7", ROMX @@ -188,7 +182,6 @@ DragonairFrontpic: INCBIN "gfx/pokemon/dragonair/front.animated.2bpp.lz" ForretressFrontpic: INCBIN "gfx/pokemon/forretress/front.animated.2bpp.lz" TogeticFrontpic: INCBIN "gfx/pokemon/togetic/front.animated.2bpp.lz" KangaskhanBackpic: INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz" -; 13c000 SECTION "Pics 8", ROMX @@ -220,7 +213,6 @@ FurretFrontpic: INCBIN "gfx/pokemon/furret/front.animated.2bpp.lz" CyndaquilFrontpic: INCBIN "gfx/pokemon/cyndaquil/front.animated.2bpp.lz" HitmonchanFrontpic: INCBIN "gfx/pokemon/hitmonchan/front.animated.2bpp.lz" QuagsireFrontpic: INCBIN "gfx/pokemon/quagsire/front.animated.2bpp.lz" -; 13fff7 SECTION "Pics 9", ROMX @@ -256,7 +248,6 @@ SandshrewFrontpic: INCBIN "gfx/pokemon/sandshrew/front.animated.2bpp.lz" NidoranFFrontpic: INCBIN "gfx/pokemon/nidoran_f/front.animated.2bpp.lz" PidgeyFrontpic: INCBIN "gfx/pokemon/pidgey/front.animated.2bpp.lz" ParasectBackpic: INCBIN "gfx/pokemon/parasect/back.2bpp.lz" -; 144000 SECTION "Pics 10", ROMX @@ -296,7 +287,6 @@ HitmontopBackpic: INCBIN "gfx/pokemon/hitmontop/back.2bpp.lz" CloysterBackpic: INCBIN "gfx/pokemon/cloyster/back.2bpp.lz" HoothootFrontpic: INCBIN "gfx/pokemon/hoothoot/front.animated.2bpp.lz" UnownFBackpic: INCBIN "gfx/pokemon/unown_f/back.2bpp.lz" -; 148000 SECTION "Pics 11", ROMX @@ -339,7 +329,6 @@ CelebiBackpic: INCBIN "gfx/pokemon/celebi/back.2bpp.lz" KrabbyBackpic: INCBIN "gfx/pokemon/krabby/back.2bpp.lz" BugCatcherPic: INCBIN "gfx/trainers/bug_catcher.2bpp.lz" SnorlaxBackpic: INCBIN "gfx/pokemon/snorlax/back.2bpp.lz" -; 14bffb SECTION "Pics 12", ROMX @@ -385,7 +374,6 @@ FlareonBackpic: INCBIN "gfx/pokemon/flareon/back.2bpp.lz" GoldeenBackpic: INCBIN "gfx/pokemon/goldeen/back.2bpp.lz" BulbasaurFrontpic: INCBIN "gfx/pokemon/bulbasaur/front.animated.2bpp.lz" StarmieBackpic: INCBIN "gfx/pokemon/starmie/back.2bpp.lz" -; 150000 SECTION "Pics 13", ROMX @@ -433,7 +421,6 @@ NidorinoBackpic: INCBIN "gfx/pokemon/nidorino/back.2bpp.lz" MysticalmanPic: INCBIN "gfx/trainers/mysticalman.2bpp.lz" CooltrainerfPic: INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz" ElectrodeFrontpic: INCBIN "gfx/pokemon/electrode/front.animated.2bpp.lz" -; 153fe3 SECTION "Pics 14", ROMX @@ -484,7 +471,6 @@ VenonatBackpic: INCBIN "gfx/pokemon/venonat/back.2bpp.lz" BellossomBackpic: INCBIN "gfx/pokemon/bellossom/back.2bpp.lz" Rival1Pic: INCBIN "gfx/trainers/rival1.2bpp.lz" SwinubBackpic: INCBIN "gfx/pokemon/swinub/back.2bpp.lz" -; 158000 SECTION "Pics 15", ROMX @@ -538,7 +524,6 @@ MagnemiteFrontpic: INCBIN "gfx/pokemon/magnemite/front.animated.2bpp.lz" ErikaPic: INCBIN "gfx/trainers/erika.2bpp.lz" JaninePic: INCBIN "gfx/trainers/janine.2bpp.lz" MagnemiteBackpic: INCBIN "gfx/pokemon/magnemite/back.2bpp.lz" -; 15bffa SECTION "Pics 16", ROMX @@ -596,7 +581,6 @@ SwinubFrontpic: INCBIN "gfx/pokemon/swinub/front.animated.2bpp.lz" LarvitarBackpic: INCBIN "gfx/pokemon/larvitar/back.2bpp.lz" PorygonBackpic: INCBIN "gfx/pokemon/porygon/back.2bpp.lz" UnownHBackpic: INCBIN "gfx/pokemon/unown_h/back.2bpp.lz" -; 15ffff SECTION "Pics 17", ROMX @@ -662,7 +646,6 @@ MetapodBackpic: INCBIN "gfx/pokemon/metapod/back.2bpp.lz" JigglypuffBackpic: INCBIN "gfx/pokemon/jigglypuff/back.2bpp.lz" OddishBackpic: INCBIN "gfx/pokemon/oddish/back.2bpp.lz" UnownDBackpic: INCBIN "gfx/pokemon/unown_d/back.2bpp.lz" -; 163ffc SECTION "Pics 18", ROMX @@ -727,7 +710,6 @@ UnownYBackpic: INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" UnownPBackpic: INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" UnownIBackpic: INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" UnownRBackpic: INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" -; 1669d3 SECTION "Pics 19", ROMX @@ -794,3 +776,17 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz" INCBIN "gfx/pokemon/unown_p/back.2bpp.lz" INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" + + +; Sections "Pics 20" to "Pics 24" are not used for any graphics, +; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm). + +SECTION "Pics 20", ROMX + +SECTION "Pics 21", ROMX + +SECTION "Pics 22", ROMX + +SECTION "Pics 23", ROMX + +SECTION "Pics 24", ROMX diff --git a/gfx/pokemon/abra/anim.asm b/gfx/pokemon/abra/anim.asm index 9d37567ac..3eecf0cf0 100644 --- a/gfx/pokemon/abra/anim.asm +++ b/gfx/pokemon/abra/anim.asm @@ -4,4 +4,3 @@ frame 2, 09 dorepeat 1 endanim -; 0xd0c5a diff --git a/gfx/pokemon/abra/anim_idle.asm b/gfx/pokemon/abra/anim_idle.asm index 796e57f88..c30d12eed 100644 --- a/gfx/pokemon/abra/anim_idle.asm +++ b/gfx/pokemon/abra/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd1b38 diff --git a/gfx/pokemon/aerodactyl/anim.asm b/gfx/pokemon/aerodactyl/anim.asm index 515cba043..5e6a67c7f 100644 --- a/gfx/pokemon/aerodactyl/anim.asm +++ b/gfx/pokemon/aerodactyl/anim.asm @@ -6,4 +6,3 @@ frame 1, 08 dorepeat 4 endanim -; 0xd10a1 diff --git a/gfx/pokemon/aerodactyl/anim_idle.asm b/gfx/pokemon/aerodactyl/anim_idle.asm index 4394a8e0c..ad4667aff 100644 --- a/gfx/pokemon/aerodactyl/anim_idle.asm +++ b/gfx/pokemon/aerodactyl/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1e2b diff --git a/gfx/pokemon/aipom/anim.asm b/gfx/pokemon/aipom/anim.asm index 99556d958..74b03e07d 100644 --- a/gfx/pokemon/aipom/anim.asm +++ b/gfx/pokemon/aipom/anim.asm @@ -4,4 +4,3 @@ frame 2, 12 dorepeat 2 endanim -; 0xd1369 diff --git a/gfx/pokemon/aipom/anim_idle.asm b/gfx/pokemon/aipom/anim_idle.asm index 9685b665d..c4a056b01 100644 --- a/gfx/pokemon/aipom/anim_idle.asm +++ b/gfx/pokemon/aipom/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd200b diff --git a/gfx/pokemon/alakazam/anim.asm b/gfx/pokemon/alakazam/anim.asm index fb87afbfe..f858dc298 100644 --- a/gfx/pokemon/alakazam/anim.asm +++ b/gfx/pokemon/alakazam/anim.asm @@ -6,4 +6,3 @@ dorepeat 2 frame 3, 07 endanim -; 0xd0c76 diff --git a/gfx/pokemon/alakazam/anim_idle.asm b/gfx/pokemon/alakazam/anim_idle.asm index 52cf585fb..9818e74f1 100644 --- a/gfx/pokemon/alakazam/anim_idle.asm +++ b/gfx/pokemon/alakazam/anim_idle.asm @@ -2,4 +2,3 @@ frame 5, 45 frame 3, 10 endanim -; 0xd1b48 diff --git a/gfx/pokemon/ampharos/anim.asm b/gfx/pokemon/ampharos/anim.asm index 5e3d6538e..3e09e9b95 100644 --- a/gfx/pokemon/ampharos/anim.asm +++ b/gfx/pokemon/ampharos/anim.asm @@ -7,4 +7,3 @@ frame 1, 06 frame 4, 06 endanim -; 0xd12fa diff --git a/gfx/pokemon/ampharos/anim_idle.asm b/gfx/pokemon/ampharos/anim_idle.asm index 6dcb40d61..087f27bd8 100644 --- a/gfx/pokemon/ampharos/anim_idle.asm +++ b/gfx/pokemon/ampharos/anim_idle.asm @@ -4,4 +4,3 @@ frame 6, 06 dorepeat 2 endanim -; 0xd1fb6 diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 8efba2c30..761e7125c 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -1,4 +1,5 @@ -PicAnimations: +PicAnimations: ; used only for BANK(PicAnimations) + BulbasaurAnimation: INCLUDE "gfx/pokemon/bulbasaur/anim.asm" IvysaurAnimation: INCLUDE "gfx/pokemon/ivysaur/anim.asm" VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm" diff --git a/gfx/pokemon/arbok/anim.asm b/gfx/pokemon/arbok/anim.asm index 0ceceacac..b77e93305 100644 --- a/gfx/pokemon/arbok/anim.asm +++ b/gfx/pokemon/arbok/anim.asm @@ -12,4 +12,3 @@ frame 3, 05 dorepeat 8 endanim -; 0xd09ed diff --git a/gfx/pokemon/arbok/anim_idle.asm b/gfx/pokemon/arbok/anim_idle.asm index c9f85e238..c5e42ab95 100644 --- a/gfx/pokemon/arbok/anim_idle.asm +++ b/gfx/pokemon/arbok/anim_idle.asm @@ -5,4 +5,3 @@ frame 5, 04 frame 4, 06 endanim -; 0xd19a9 diff --git a/gfx/pokemon/arcanine/anim.asm b/gfx/pokemon/arcanine/anim.asm index 0dc0dcacc..d70f01a1c 100644 --- a/gfx/pokemon/arcanine/anim.asm +++ b/gfx/pokemon/arcanine/anim.asm @@ -4,4 +4,3 @@ frame 4, 10 frame 7, 25 endanim -; 0xd0c26 diff --git a/gfx/pokemon/arcanine/anim_idle.asm b/gfx/pokemon/arcanine/anim_idle.asm index e178a2d24..3eb0790ba 100644 --- a/gfx/pokemon/arcanine/anim_idle.asm +++ b/gfx/pokemon/arcanine/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 09 dorepeat 1 endanim -; 0xd1b0c diff --git a/gfx/pokemon/ariados/anim.asm b/gfx/pokemon/ariados/anim.asm index 9a4d30385..00a7a5dcd 100644 --- a/gfx/pokemon/ariados/anim.asm +++ b/gfx/pokemon/ariados/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 24 endanim -; 0xd124d diff --git a/gfx/pokemon/ariados/anim_idle.asm b/gfx/pokemon/ariados/anim_idle.asm index 6b9f416be..bce41a887 100644 --- a/gfx/pokemon/ariados/anim_idle.asm +++ b/gfx/pokemon/ariados/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 08 endanim -; 0xd1f3b diff --git a/gfx/pokemon/articuno/anim.asm b/gfx/pokemon/articuno/anim.asm index ccb583766..6d99becfa 100644 --- a/gfx/pokemon/articuno/anim.asm +++ b/gfx/pokemon/articuno/anim.asm @@ -6,4 +6,3 @@ dorepeat 2 frame 5, 12 endanim -; 0xd10c1 diff --git a/gfx/pokemon/articuno/anim_idle.asm b/gfx/pokemon/articuno/anim_idle.asm index 634d8daff..f9322d352 100644 --- a/gfx/pokemon/articuno/anim_idle.asm +++ b/gfx/pokemon/articuno/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 5, 12 endanim -; 0xd1e41 diff --git a/gfx/pokemon/azumarill/anim.asm b/gfx/pokemon/azumarill/anim.asm index bbe46d4b7..b248a7144 100644 --- a/gfx/pokemon/azumarill/anim.asm +++ b/gfx/pokemon/azumarill/anim.asm @@ -6,4 +6,3 @@ frame 1, 08 frame 4, 08 endanim -; 0xd1329 diff --git a/gfx/pokemon/azumarill/anim_idle.asm b/gfx/pokemon/azumarill/anim_idle.asm index 070e6145f..b7c3a8f8b 100644 --- a/gfx/pokemon/azumarill/anim_idle.asm +++ b/gfx/pokemon/azumarill/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1fd3 diff --git a/gfx/pokemon/bayleef/anim.asm b/gfx/pokemon/bayleef/anim.asm index de54fe495..c6aa43fe1 100644 --- a/gfx/pokemon/bayleef/anim.asm +++ b/gfx/pokemon/bayleef/anim.asm @@ -2,4 +2,3 @@ frame 2, 11 frame 3, 15 endanim -; 0xd116c diff --git a/gfx/pokemon/bayleef/anim_idle.asm b/gfx/pokemon/bayleef/anim_idle.asm index 59d3f1762..b7c3a8f8b 100644 --- a/gfx/pokemon/bayleef/anim_idle.asm +++ b/gfx/pokemon/bayleef/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1ea8 diff --git a/gfx/pokemon/beedrill/anim.asm b/gfx/pokemon/beedrill/anim.asm index 036fbb738..d322e52be 100644 --- a/gfx/pokemon/beedrill/anim.asm +++ b/gfx/pokemon/beedrill/anim.asm @@ -9,4 +9,3 @@ frame 3, 10 dorepeat 7 endanim -; 0xd0954 diff --git a/gfx/pokemon/beedrill/anim_idle.asm b/gfx/pokemon/beedrill/anim_idle.asm index 8205f9a8c..cfe49ab55 100644 --- a/gfx/pokemon/beedrill/anim_idle.asm +++ b/gfx/pokemon/beedrill/anim_idle.asm @@ -7,4 +7,3 @@ frame 0, 25 frame 3, 10 endanim -; 0xd193c diff --git a/gfx/pokemon/bellossom/anim.asm b/gfx/pokemon/bellossom/anim.asm index 7aa2e3568..bec149b23 100644 --- a/gfx/pokemon/bellossom/anim.asm +++ b/gfx/pokemon/bellossom/anim.asm @@ -7,4 +7,3 @@ frame 5, 12 frame 4, 10 endanim -; 0xd130b diff --git a/gfx/pokemon/bellossom/anim_idle.asm b/gfx/pokemon/bellossom/anim_idle.asm index 322fa3758..29e08faf1 100644 --- a/gfx/pokemon/bellossom/anim_idle.asm +++ b/gfx/pokemon/bellossom/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 06 dorepeat 1 endanim -; 0xd1fbf diff --git a/gfx/pokemon/bellsprout/anim.asm b/gfx/pokemon/bellsprout/anim.asm index 9a71b29ac..0ebfba574 100644 --- a/gfx/pokemon/bellsprout/anim.asm +++ b/gfx/pokemon/bellsprout/anim.asm @@ -9,4 +9,3 @@ frame 1, 08 dorepeat 5 endanim -; 0xd0cb2 diff --git a/gfx/pokemon/bellsprout/anim_idle.asm b/gfx/pokemon/bellsprout/anim_idle.asm index 31ad26997..bde3b4173 100644 --- a/gfx/pokemon/bellsprout/anim_idle.asm +++ b/gfx/pokemon/bellsprout/anim_idle.asm @@ -5,4 +5,3 @@ frame 6, 05 dorepeat 3 endanim -; 0xd1b78 diff --git a/gfx/pokemon/blastoise/anim.asm b/gfx/pokemon/blastoise/anim.asm index 2d8b464d0..b5d755035 100644 --- a/gfx/pokemon/blastoise/anim.asm +++ b/gfx/pokemon/blastoise/anim.asm @@ -3,4 +3,3 @@ frame 3, 08 frame 1, 04 endanim -; 0xd0908 diff --git a/gfx/pokemon/blastoise/anim_idle.asm b/gfx/pokemon/blastoise/anim_idle.asm index b25c75e5a..e3c7b1d0d 100644 --- a/gfx/pokemon/blastoise/anim_idle.asm +++ b/gfx/pokemon/blastoise/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 12 dorepeat 1 endanim -; 0xd18f0 diff --git a/gfx/pokemon/blissey/anim.asm b/gfx/pokemon/blissey/anim.asm index 097ecc094..dcdb0a655 100644 --- a/gfx/pokemon/blissey/anim.asm +++ b/gfx/pokemon/blissey/anim.asm @@ -5,4 +5,3 @@ frame 0, 06 frame 3, 08 endanim -; 0xd1607 diff --git a/gfx/pokemon/blissey/anim_idle.asm b/gfx/pokemon/blissey/anim_idle.asm index 846d85003..1ebdbfccd 100644 --- a/gfx/pokemon/blissey/anim_idle.asm +++ b/gfx/pokemon/blissey/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd21c1 diff --git a/gfx/pokemon/bulbasaur/anim.asm b/gfx/pokemon/bulbasaur/anim.asm index e5c1cbe1e..fce9af135 100644 --- a/gfx/pokemon/bulbasaur/anim.asm +++ b/gfx/pokemon/bulbasaur/anim.asm @@ -7,4 +7,3 @@ frame 0, 05 frame 5, 05 endanim -; 0xd089c diff --git a/gfx/pokemon/bulbasaur/anim_idle.asm b/gfx/pokemon/bulbasaur/anim_idle.asm index cfc0f54e9..ab75b5164 100644 --- a/gfx/pokemon/bulbasaur/anim_idle.asm +++ b/gfx/pokemon/bulbasaur/anim_idle.asm @@ -2,4 +2,3 @@ frame 0, 05 frame 5, 05 endanim -; 0xd18a0 diff --git a/gfx/pokemon/butterfree/anim.asm b/gfx/pokemon/butterfree/anim.asm index d31161a28..b1d1e79fe 100644 --- a/gfx/pokemon/butterfree/anim.asm +++ b/gfx/pokemon/butterfree/anim.asm @@ -5,4 +5,3 @@ frame 1, 06 dorepeat 3 endanim -; 0xd0929 diff --git a/gfx/pokemon/butterfree/anim_idle.asm b/gfx/pokemon/butterfree/anim_idle.asm index 1eb152f28..910725fa2 100644 --- a/gfx/pokemon/butterfree/anim_idle.asm +++ b/gfx/pokemon/butterfree/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 10 dorepeat 1 endanim -; 0xd190d diff --git a/gfx/pokemon/caterpie/anim.asm b/gfx/pokemon/caterpie/anim.asm index a5cf5f238..de380adc0 100644 --- a/gfx/pokemon/caterpie/anim.asm +++ b/gfx/pokemon/caterpie/anim.asm @@ -5,4 +5,3 @@ frame 2, 08 frame 1, 08 endanim -; 0xd0915 diff --git a/gfx/pokemon/caterpie/anim_idle.asm b/gfx/pokemon/caterpie/anim_idle.asm index e75b83f5c..faaeffe39 100644 --- a/gfx/pokemon/caterpie/anim_idle.asm +++ b/gfx/pokemon/caterpie/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd18f9 diff --git a/gfx/pokemon/celebi/anim.asm b/gfx/pokemon/celebi/anim.asm index 9f218a43e..ac16a0db2 100644 --- a/gfx/pokemon/celebi/anim.asm +++ b/gfx/pokemon/celebi/anim.asm @@ -13,4 +13,3 @@ frame 13, 05 dorepeat 11 endanim -; 0xd1696 diff --git a/gfx/pokemon/celebi/anim_idle.asm b/gfx/pokemon/celebi/anim_idle.asm index 6162488db..f2e4767d5 100644 --- a/gfx/pokemon/celebi/anim_idle.asm +++ b/gfx/pokemon/celebi/anim_idle.asm @@ -5,4 +5,3 @@ frame 11, 05 dorepeat 3 endanim -; 0xd2222 diff --git a/gfx/pokemon/chansey/anim.asm b/gfx/pokemon/chansey/anim.asm index 75de3b32b..3d07cc3bf 100644 --- a/gfx/pokemon/chansey/anim.asm +++ b/gfx/pokemon/chansey/anim.asm @@ -7,4 +7,3 @@ frame 3, 05 dorepeat 5 endanim -; 0xd0f26 diff --git a/gfx/pokemon/chansey/anim_idle.asm b/gfx/pokemon/chansey/anim_idle.asm index a78f8cf88..8318520e3 100644 --- a/gfx/pokemon/chansey/anim_idle.asm +++ b/gfx/pokemon/chansey/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd1d16 diff --git a/gfx/pokemon/charizard/anim.asm b/gfx/pokemon/charizard/anim.asm index b258e35c7..db965a3b7 100644 --- a/gfx/pokemon/charizard/anim.asm +++ b/gfx/pokemon/charizard/anim.asm @@ -5,4 +5,3 @@ frame 1, 09 dorepeat 3 endanim -; 0xd08e1 diff --git a/gfx/pokemon/charizard/anim_idle.asm b/gfx/pokemon/charizard/anim_idle.asm index daffccb9d..c4a056b01 100644 --- a/gfx/pokemon/charizard/anim_idle.asm +++ b/gfx/pokemon/charizard/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd18d5 diff --git a/gfx/pokemon/charmander/anim.asm b/gfx/pokemon/charmander/anim.asm index 72a0fe83d..ca3d1699d 100644 --- a/gfx/pokemon/charmander/anim.asm +++ b/gfx/pokemon/charmander/anim.asm @@ -6,4 +6,3 @@ frame 0, 10 frame 4, 10 endanim -; 0xd08c5 diff --git a/gfx/pokemon/charmander/anim_idle.asm b/gfx/pokemon/charmander/anim_idle.asm index 219b5407f..c4a056b01 100644 --- a/gfx/pokemon/charmander/anim_idle.asm +++ b/gfx/pokemon/charmander/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd18bf diff --git a/gfx/pokemon/charmeleon/anim.asm b/gfx/pokemon/charmeleon/anim.asm index 30eeae979..3acce4a2b 100644 --- a/gfx/pokemon/charmeleon/anim.asm +++ b/gfx/pokemon/charmeleon/anim.asm @@ -6,4 +6,3 @@ frame 3, 08 frame 4, 30 endanim -; 0xd08d4 diff --git a/gfx/pokemon/charmeleon/anim_idle.asm b/gfx/pokemon/charmeleon/anim_idle.asm index d3320e33c..00a77d123 100644 --- a/gfx/pokemon/charmeleon/anim_idle.asm +++ b/gfx/pokemon/charmeleon/anim_idle.asm @@ -5,4 +5,3 @@ frame 1, 10 dorepeat 3 endanim -; 0xd18cc diff --git a/gfx/pokemon/chikorita/anim.asm b/gfx/pokemon/chikorita/anim.asm index 2b8fa7d35..19f9097ae 100644 --- a/gfx/pokemon/chikorita/anim.asm +++ b/gfx/pokemon/chikorita/anim.asm @@ -7,4 +7,3 @@ frame 4, 05 dorepeat 4 endanim -; 0xd1165 diff --git a/gfx/pokemon/chikorita/anim_idle.asm b/gfx/pokemon/chikorita/anim_idle.asm index 9003c3ff2..cf685d8b0 100644 --- a/gfx/pokemon/chikorita/anim_idle.asm +++ b/gfx/pokemon/chikorita/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 06 dorepeat 1 endanim -; 0xd1e9f diff --git a/gfx/pokemon/chinchou/anim.asm b/gfx/pokemon/chinchou/anim.asm index f765c151a..f386311ac 100644 --- a/gfx/pokemon/chinchou/anim.asm +++ b/gfx/pokemon/chinchou/anim.asm @@ -8,4 +8,3 @@ dorepeat 5 frame 3, 10 endanim -; 0xd1271 diff --git a/gfx/pokemon/chinchou/anim_idle.asm b/gfx/pokemon/chinchou/anim_idle.asm index bf38f8d87..b7c3a8f8b 100644 --- a/gfx/pokemon/chinchou/anim_idle.asm +++ b/gfx/pokemon/chinchou/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1f4d diff --git a/gfx/pokemon/clefable/anim.asm b/gfx/pokemon/clefable/anim.asm index d442807e8..31c49b895 100644 --- a/gfx/pokemon/clefable/anim.asm +++ b/gfx/pokemon/clefable/anim.asm @@ -3,4 +3,3 @@ frame 2, 10 frame 1, 10 endanim -; 0xd0aa7 diff --git a/gfx/pokemon/clefable/anim_idle.asm b/gfx/pokemon/clefable/anim_idle.asm index 2b024ffd8..c30d12eed 100644 --- a/gfx/pokemon/clefable/anim_idle.asm +++ b/gfx/pokemon/clefable/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd1a29 diff --git a/gfx/pokemon/clefairy/anim.asm b/gfx/pokemon/clefairy/anim.asm index 9905c4fcc..6f95adc4d 100644 --- a/gfx/pokemon/clefairy/anim.asm +++ b/gfx/pokemon/clefairy/anim.asm @@ -6,4 +6,3 @@ frame 3, 05 dorepeat 4 endanim -; 0xd0a9e diff --git a/gfx/pokemon/clefairy/anim_idle.asm b/gfx/pokemon/clefairy/anim_idle.asm index c93613467..b931c713b 100644 --- a/gfx/pokemon/clefairy/anim_idle.asm +++ b/gfx/pokemon/clefairy/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 05 frame 3, 05 endanim -; 0xd1a20 diff --git a/gfx/pokemon/cleffa/anim.asm b/gfx/pokemon/cleffa/anim.asm index 37f3da590..50666a065 100644 --- a/gfx/pokemon/cleffa/anim.asm +++ b/gfx/pokemon/cleffa/anim.asm @@ -2,4 +2,3 @@ frame 2, 10 frame 3, 10 endanim -; 0xd1290 diff --git a/gfx/pokemon/cleffa/anim_idle.asm b/gfx/pokemon/cleffa/anim_idle.asm index 129f123c2..ada5030b3 100644 --- a/gfx/pokemon/cleffa/anim_idle.asm +++ b/gfx/pokemon/cleffa/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 08 dorepeat 1 endanim -; 0xd1f68 diff --git a/gfx/pokemon/cloyster/anim.asm b/gfx/pokemon/cloyster/anim.asm index cc338f014..12dc71d73 100644 --- a/gfx/pokemon/cloyster/anim.asm +++ b/gfx/pokemon/cloyster/anim.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 3, 09 endanim -; 0xd0dd0 diff --git a/gfx/pokemon/cloyster/anim_idle.asm b/gfx/pokemon/cloyster/anim_idle.asm index e872bbc59..885fb6822 100644 --- a/gfx/pokemon/cloyster/anim_idle.asm +++ b/gfx/pokemon/cloyster/anim_idle.asm @@ -1,4 +1,3 @@ frame 4, 52 dorepeat 1 endanim -; 0xd1c4e diff --git a/gfx/pokemon/corsola/anim.asm b/gfx/pokemon/corsola/anim.asm index 68182e18e..35ce1e63d 100644 --- a/gfx/pokemon/corsola/anim.asm +++ b/gfx/pokemon/corsola/anim.asm @@ -4,4 +4,3 @@ frame 0, 12 frame 3, 18 endanim -; 0xd1501 diff --git a/gfx/pokemon/corsola/anim_idle.asm b/gfx/pokemon/corsola/anim_idle.asm index 6360176ca..1ebdbfccd 100644 --- a/gfx/pokemon/corsola/anim_idle.asm +++ b/gfx/pokemon/corsola/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd210b diff --git a/gfx/pokemon/crobat/anim.asm b/gfx/pokemon/crobat/anim.asm index 99888ab81..b37885af7 100644 --- a/gfx/pokemon/crobat/anim.asm +++ b/gfx/pokemon/crobat/anim.asm @@ -7,4 +7,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd125e diff --git a/gfx/pokemon/crobat/anim_idle.asm b/gfx/pokemon/crobat/anim_idle.asm index ec1dae2ac..f513910e0 100644 --- a/gfx/pokemon/crobat/anim_idle.asm +++ b/gfx/pokemon/crobat/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd1f44 diff --git a/gfx/pokemon/croconaw/anim.asm b/gfx/pokemon/croconaw/anim.asm index c487abfd9..819a6b0de 100644 --- a/gfx/pokemon/croconaw/anim.asm +++ b/gfx/pokemon/croconaw/anim.asm @@ -4,4 +4,3 @@ frame 1, 05 dorepeat 1 endanim -; 0xd11d2 diff --git a/gfx/pokemon/croconaw/anim_idle.asm b/gfx/pokemon/croconaw/anim_idle.asm index 78bd8518e..952fbb7c9 100644 --- a/gfx/pokemon/croconaw/anim_idle.asm +++ b/gfx/pokemon/croconaw/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 10 dorepeat 1 endanim -; 0xd1ee0 diff --git a/gfx/pokemon/cubone/anim.asm b/gfx/pokemon/cubone/anim.asm index 2af8c522c..2f497e76e 100644 --- a/gfx/pokemon/cubone/anim.asm +++ b/gfx/pokemon/cubone/anim.asm @@ -9,4 +9,3 @@ frame 6, 02 frame 1, 08 endanim -; 0xd0e9f diff --git a/gfx/pokemon/cubone/anim_idle.asm b/gfx/pokemon/cubone/anim_idle.asm index fb3b0b3ba..5721310cf 100644 --- a/gfx/pokemon/cubone/anim_idle.asm +++ b/gfx/pokemon/cubone/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd1cc3 diff --git a/gfx/pokemon/cyndaquil/anim.asm b/gfx/pokemon/cyndaquil/anim.asm index b069cc300..c8b8281cd 100644 --- a/gfx/pokemon/cyndaquil/anim.asm +++ b/gfx/pokemon/cyndaquil/anim.asm @@ -9,4 +9,3 @@ frame 3, 09 frame 1, 03 endanim -; 0xd1194 diff --git a/gfx/pokemon/cyndaquil/anim_idle.asm b/gfx/pokemon/cyndaquil/anim_idle.asm index 43c4d495a..952fbb7c9 100644 --- a/gfx/pokemon/cyndaquil/anim_idle.asm +++ b/gfx/pokemon/cyndaquil/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 10 dorepeat 1 endanim -; 0xd1eba diff --git a/gfx/pokemon/delibird/anim.asm b/gfx/pokemon/delibird/anim.asm index 3431ad1ae..1c48b7989 100644 --- a/gfx/pokemon/delibird/anim.asm +++ b/gfx/pokemon/delibird/anim.asm @@ -9,4 +9,3 @@ frame 0, 05 frame 6, 05 endanim -; 0xd152a diff --git a/gfx/pokemon/delibird/anim_idle.asm b/gfx/pokemon/delibird/anim_idle.asm index 8a416cc61..60587ef17 100644 --- a/gfx/pokemon/delibird/anim_idle.asm +++ b/gfx/pokemon/delibird/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 06 dorepeat 1 endanim -; 0xd2126 diff --git a/gfx/pokemon/dewgong/anim.asm b/gfx/pokemon/dewgong/anim.asm index b7c3efecf..a9d1b16a8 100644 --- a/gfx/pokemon/dewgong/anim.asm +++ b/gfx/pokemon/dewgong/anim.asm @@ -4,4 +4,3 @@ frame 4, 09 frame 5, 14 endanim -; 0xd0daa diff --git a/gfx/pokemon/dewgong/anim_idle.asm b/gfx/pokemon/dewgong/anim_idle.asm index 0357ce660..6f173f10e 100644 --- a/gfx/pokemon/dewgong/anim_idle.asm +++ b/gfx/pokemon/dewgong/anim_idle.asm @@ -6,4 +6,3 @@ frame 9, 06 dorepeat 1 endanim -; 0xd1c2a diff --git a/gfx/pokemon/diglett/anim.asm b/gfx/pokemon/diglett/anim.asm index a4d79bd56..c49b26e55 100644 --- a/gfx/pokemon/diglett/anim.asm +++ b/gfx/pokemon/diglett/anim.asm @@ -4,4 +4,3 @@ frame 1, 09 dorepeat 2 endanim -; 0xd0b97 diff --git a/gfx/pokemon/diglett/anim_idle.asm b/gfx/pokemon/diglett/anim_idle.asm index bd2a27e03..39492188f 100644 --- a/gfx/pokemon/diglett/anim_idle.asm +++ b/gfx/pokemon/diglett/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1aad diff --git a/gfx/pokemon/ditto/anim.asm b/gfx/pokemon/ditto/anim.asm index 53f3f9afa..4e14a015c 100644 --- a/gfx/pokemon/ditto/anim.asm +++ b/gfx/pokemon/ditto/anim.asm @@ -8,4 +8,3 @@ frame 7, 12 frame 8, 12 endanim -; 0xd1029 diff --git a/gfx/pokemon/ditto/anim_idle.asm b/gfx/pokemon/ditto/anim_idle.asm index 195808be1..1ebdbfccd 100644 --- a/gfx/pokemon/ditto/anim_idle.asm +++ b/gfx/pokemon/ditto/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd1dc9 diff --git a/gfx/pokemon/dodrio/anim.asm b/gfx/pokemon/dodrio/anim.asm index 539f896d7..5776036d5 100644 --- a/gfx/pokemon/dodrio/anim.asm +++ b/gfx/pokemon/dodrio/anim.asm @@ -3,4 +3,3 @@ frame 4, 10 frame 1, 09 endanim -; 0xd0d92 diff --git a/gfx/pokemon/dodrio/anim_idle.asm b/gfx/pokemon/dodrio/anim_idle.asm index a921058f3..96cc9d291 100644 --- a/gfx/pokemon/dodrio/anim_idle.asm +++ b/gfx/pokemon/dodrio/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 08 dorepeat 1 endanim -; 0xd1c10 diff --git a/gfx/pokemon/doduo/anim.asm b/gfx/pokemon/doduo/anim.asm index cd38ca192..d9de3ff1b 100644 --- a/gfx/pokemon/doduo/anim.asm +++ b/gfx/pokemon/doduo/anim.asm @@ -6,4 +6,3 @@ frame 1, 08 dorepeat 4 endanim -; 0xd0d89 diff --git a/gfx/pokemon/doduo/anim_idle.asm b/gfx/pokemon/doduo/anim_idle.asm index 89715cae8..1734fe736 100644 --- a/gfx/pokemon/doduo/anim_idle.asm +++ b/gfx/pokemon/doduo/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 30 endanim -; 0xd1c07 diff --git a/gfx/pokemon/donphan/anim.asm b/gfx/pokemon/donphan/anim.asm index fbfbd8d17..2efd255e9 100644 --- a/gfx/pokemon/donphan/anim.asm +++ b/gfx/pokemon/donphan/anim.asm @@ -3,4 +3,3 @@ frame 3, 10 frame 4, 06 endanim -; 0xd1587 diff --git a/gfx/pokemon/donphan/anim_idle.asm b/gfx/pokemon/donphan/anim_idle.asm index 341013ce9..5721310cf 100644 --- a/gfx/pokemon/donphan/anim_idle.asm +++ b/gfx/pokemon/donphan/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd2169 diff --git a/gfx/pokemon/dragonair/anim.asm b/gfx/pokemon/dragonair/anim.asm index b7a2be64d..739174f7d 100644 --- a/gfx/pokemon/dragonair/anim.asm +++ b/gfx/pokemon/dragonair/anim.asm @@ -5,4 +5,3 @@ frame 2, 08 dorepeat 1 endanim -; 0xd10fd diff --git a/gfx/pokemon/dragonair/anim_idle.asm b/gfx/pokemon/dragonair/anim_idle.asm index afea7ab43..e7e9af08b 100644 --- a/gfx/pokemon/dragonair/anim_idle.asm +++ b/gfx/pokemon/dragonair/anim_idle.asm @@ -7,4 +7,3 @@ frame 6, 06 frame 5, 06 endanim -; 0xd1e71 diff --git a/gfx/pokemon/dragonite/anim.asm b/gfx/pokemon/dragonite/anim.asm index 9dd6bf84a..2b2de658c 100644 --- a/gfx/pokemon/dragonite/anim.asm +++ b/gfx/pokemon/dragonite/anim.asm @@ -10,4 +10,3 @@ frame 1, 12 dorepeat 8 endanim -; 0xd1114 diff --git a/gfx/pokemon/dragonite/anim_idle.asm b/gfx/pokemon/dragonite/anim_idle.asm index fe0d7edbb..5f760e82c 100644 --- a/gfx/pokemon/dragonite/anim_idle.asm +++ b/gfx/pokemon/dragonite/anim_idle.asm @@ -5,4 +5,3 @@ frame 5, 05 dorepeat 3 endanim -; 0xd1e7e diff --git a/gfx/pokemon/dratini/anim.asm b/gfx/pokemon/dratini/anim.asm index f844a2eec..4a5d5566b 100644 --- a/gfx/pokemon/dratini/anim.asm +++ b/gfx/pokemon/dratini/anim.asm @@ -5,4 +5,3 @@ frame 2, 09 frame 3, 09 endanim -; 0xd10f0 diff --git a/gfx/pokemon/dratini/anim_idle.asm b/gfx/pokemon/dratini/anim_idle.asm index 441340446..936e90ea1 100644 --- a/gfx/pokemon/dratini/anim_idle.asm +++ b/gfx/pokemon/dratini/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd1e60 diff --git a/gfx/pokemon/drowzee/anim.asm b/gfx/pokemon/drowzee/anim.asm index badc99074..49c2acca7 100644 --- a/gfx/pokemon/drowzee/anim.asm +++ b/gfx/pokemon/drowzee/anim.asm @@ -8,4 +8,3 @@ frame 3, 05 frame 4, 05 endanim -; 0xd0e1b diff --git a/gfx/pokemon/drowzee/anim_idle.asm b/gfx/pokemon/drowzee/anim_idle.asm index 247ecb8fe..d9d0a81f8 100644 --- a/gfx/pokemon/drowzee/anim_idle.asm +++ b/gfx/pokemon/drowzee/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 08 frame 5, 08 endanim -; 0xd1c81 diff --git a/gfx/pokemon/dugtrio/anim.asm b/gfx/pokemon/dugtrio/anim.asm index 7b5038620..180519d9c 100644 --- a/gfx/pokemon/dugtrio/anim.asm +++ b/gfx/pokemon/dugtrio/anim.asm @@ -13,4 +13,3 @@ frame 2, 06 frame 1, 06 endanim -; 0xd0bb4 diff --git a/gfx/pokemon/dugtrio/anim_idle.asm b/gfx/pokemon/dugtrio/anim_idle.asm index 1b32b854c..883fde447 100644 --- a/gfx/pokemon/dugtrio/anim_idle.asm +++ b/gfx/pokemon/dugtrio/anim_idle.asm @@ -7,4 +7,3 @@ dorepeat 4 frame 6, 20 endanim -; 0xd1abe diff --git a/gfx/pokemon/dunsparce/anim.asm b/gfx/pokemon/dunsparce/anim.asm index b4217afbd..542719316 100644 --- a/gfx/pokemon/dunsparce/anim.asm +++ b/gfx/pokemon/dunsparce/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 4, 12 endanim -; 0xd1441 diff --git a/gfx/pokemon/dunsparce/anim_idle.asm b/gfx/pokemon/dunsparce/anim_idle.asm index f5d6d9b05..5721310cf 100644 --- a/gfx/pokemon/dunsparce/anim_idle.asm +++ b/gfx/pokemon/dunsparce/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd2089 diff --git a/gfx/pokemon/eevee/anim.asm b/gfx/pokemon/eevee/anim.asm index 537cefb83..b03f0e570 100644 --- a/gfx/pokemon/eevee/anim.asm +++ b/gfx/pokemon/eevee/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 2, 10 endanim -; 0xd1038 diff --git a/gfx/pokemon/eevee/anim_idle.asm b/gfx/pokemon/eevee/anim_idle.asm index 0f50b3cb8..44516875b 100644 --- a/gfx/pokemon/eevee/anim_idle.asm +++ b/gfx/pokemon/eevee/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 09 frame 5, 13 endanim -; 0xd1dd6 diff --git a/gfx/pokemon/egg/anim.asm b/gfx/pokemon/egg/anim.asm index 1ded66327..e8b56bae7 100644 --- a/gfx/pokemon/egg/anim.asm +++ b/gfx/pokemon/egg/anim.asm @@ -5,4 +5,3 @@ frame 0, 04 dorepeat 1 endanim -; 0xd16a3 diff --git a/gfx/pokemon/egg/anim_idle.asm b/gfx/pokemon/egg/anim_idle.asm index 634736c6b..319d54f71 100644 --- a/gfx/pokemon/egg/anim_idle.asm +++ b/gfx/pokemon/egg/anim_idle.asm @@ -2,4 +2,3 @@ frame 0, 03 frame 2, 03 endanim -; 0xd2229 diff --git a/gfx/pokemon/ekans/anim.asm b/gfx/pokemon/ekans/anim.asm index 9728434c0..cfd686e35 100644 --- a/gfx/pokemon/ekans/anim.asm +++ b/gfx/pokemon/ekans/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 2, 20 endanim -; 0xd09d2 diff --git a/gfx/pokemon/ekans/anim_idle.asm b/gfx/pokemon/ekans/anim_idle.asm index 660a4f971..98c3ebe0c 100644 --- a/gfx/pokemon/ekans/anim_idle.asm +++ b/gfx/pokemon/ekans/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 02 dorepeat 1 endanim -; 0xd199c diff --git a/gfx/pokemon/electabuzz/anim.asm b/gfx/pokemon/electabuzz/anim.asm index 4e2a550ed..8c93e2858 100644 --- a/gfx/pokemon/electabuzz/anim.asm +++ b/gfx/pokemon/electabuzz/anim.asm @@ -10,4 +10,3 @@ dorepeat 7 dorepeat 7 endanim -; 0xd0fcc diff --git a/gfx/pokemon/electabuzz/anim_idle.asm b/gfx/pokemon/electabuzz/anim_idle.asm index efff4b3db..4a3da9a45 100644 --- a/gfx/pokemon/electabuzz/anim_idle.asm +++ b/gfx/pokemon/electabuzz/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 04 dorepeat 1 endanim -; 0xd1d8a diff --git a/gfx/pokemon/electrode/anim.asm b/gfx/pokemon/electrode/anim.asm index 18b31e305..c143a5fd6 100644 --- a/gfx/pokemon/electrode/anim.asm +++ b/gfx/pokemon/electrode/anim.asm @@ -1,4 +1,3 @@ frame 1, 05 frame 2, 40 endanim -; 0xd0e5c diff --git a/gfx/pokemon/electrode/anim_idle.asm b/gfx/pokemon/electrode/anim_idle.asm index 30d1b1788..7f30d940a 100644 --- a/gfx/pokemon/electrode/anim_idle.asm +++ b/gfx/pokemon/electrode/anim_idle.asm @@ -1,3 +1,2 @@ frame 3, 45 endanim -; 0xd1ca8 diff --git a/gfx/pokemon/elekid/anim.asm b/gfx/pokemon/elekid/anim.asm index 590dccf14..8c6a08e67 100644 --- a/gfx/pokemon/elekid/anim.asm +++ b/gfx/pokemon/elekid/anim.asm @@ -8,4 +8,3 @@ frame 3, 03 dorepeat 6 endanim -; 0xd15e0 diff --git a/gfx/pokemon/elekid/anim_idle.asm b/gfx/pokemon/elekid/anim_idle.asm index cd10626f6..9f0c32711 100644 --- a/gfx/pokemon/elekid/anim_idle.asm +++ b/gfx/pokemon/elekid/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 3, 20 endanim -; 0xd21a6 diff --git a/gfx/pokemon/entei/anim.asm b/gfx/pokemon/entei/anim.asm index 66c2c128d..b819654c2 100644 --- a/gfx/pokemon/entei/anim.asm +++ b/gfx/pokemon/entei/anim.asm @@ -3,4 +3,3 @@ frame 2, 12 frame 3, 30 endanim -; 0xd161d diff --git a/gfx/pokemon/entei/anim_idle.asm b/gfx/pokemon/entei/anim_idle.asm index f20e5d072..cf66cab97 100644 --- a/gfx/pokemon/entei/anim_idle.asm +++ b/gfx/pokemon/entei/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd21d7 diff --git a/gfx/pokemon/espeon/anim.asm b/gfx/pokemon/espeon/anim.asm index 8a54a9b97..c228c07a2 100644 --- a/gfx/pokemon/espeon/anim.asm +++ b/gfx/pokemon/espeon/anim.asm @@ -6,4 +6,3 @@ frame 3, 07 dorepeat 3 endanim -; 0xd13af diff --git a/gfx/pokemon/espeon/anim_idle.asm b/gfx/pokemon/espeon/anim_idle.asm index 33c88d1b4..1ebdbfccd 100644 --- a/gfx/pokemon/espeon/anim_idle.asm +++ b/gfx/pokemon/espeon/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd203d diff --git a/gfx/pokemon/exeggcute/anim.asm b/gfx/pokemon/exeggcute/anim.asm index 0f0c10729..d5ab5822d 100644 --- a/gfx/pokemon/exeggcute/anim.asm +++ b/gfx/pokemon/exeggcute/anim.asm @@ -14,4 +14,3 @@ frame 0, 08 frame 3, 08 endanim -; 0xd0e7b diff --git a/gfx/pokemon/exeggcute/anim_idle.asm b/gfx/pokemon/exeggcute/anim_idle.asm index ef839f5d1..c4a056b01 100644 --- a/gfx/pokemon/exeggcute/anim_idle.asm +++ b/gfx/pokemon/exeggcute/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1cb1 diff --git a/gfx/pokemon/exeggutor/anim.asm b/gfx/pokemon/exeggutor/anim.asm index 92f11a117..7eab9a463 100644 --- a/gfx/pokemon/exeggutor/anim.asm +++ b/gfx/pokemon/exeggutor/anim.asm @@ -6,4 +6,3 @@ frame 0, 06 dorepeat 4 endanim -; 0xd0e8a diff --git a/gfx/pokemon/exeggutor/anim_idle.asm b/gfx/pokemon/exeggutor/anim_idle.asm index 3e5542c97..cadaf5e76 100644 --- a/gfx/pokemon/exeggutor/anim_idle.asm +++ b/gfx/pokemon/exeggutor/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 06 dorepeat 1 endanim -; 0xd1cba diff --git a/gfx/pokemon/farfetch_d/anim.asm b/gfx/pokemon/farfetch_d/anim.asm index 4dac6c1a4..922a2bbc1 100644 --- a/gfx/pokemon/farfetch_d/anim.asm +++ b/gfx/pokemon/farfetch_d/anim.asm @@ -3,4 +3,3 @@ frame 3, 14 frame 2, 06 endanim -; 0xd0d7a diff --git a/gfx/pokemon/farfetch_d/anim_idle.asm b/gfx/pokemon/farfetch_d/anim_idle.asm index 5dcfaa89d..205f993a5 100644 --- a/gfx/pokemon/farfetch_d/anim_idle.asm +++ b/gfx/pokemon/farfetch_d/anim_idle.asm @@ -2,4 +2,3 @@ frame 5, 07 frame 4, 07 endanim -; 0xd1bfa diff --git a/gfx/pokemon/fearow/anim.asm b/gfx/pokemon/fearow/anim.asm index 3a689af18..6464fbcbb 100644 --- a/gfx/pokemon/fearow/anim.asm +++ b/gfx/pokemon/fearow/anim.asm @@ -5,4 +5,3 @@ frame 2, 06 dorepeat 2 endanim -; 0xd09c3 diff --git a/gfx/pokemon/fearow/anim_idle.asm b/gfx/pokemon/fearow/anim_idle.asm index 0233782c9..f073ebaf5 100644 --- a/gfx/pokemon/fearow/anim_idle.asm +++ b/gfx/pokemon/fearow/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 05 dorepeat 1 endanim -; 0xd198f diff --git a/gfx/pokemon/feraligatr/anim.asm b/gfx/pokemon/feraligatr/anim.asm index 1a0cebd2e..815689609 100644 --- a/gfx/pokemon/feraligatr/anim.asm +++ b/gfx/pokemon/feraligatr/anim.asm @@ -4,4 +4,3 @@ frame 3, 36 frame 2, 12 endanim -; 0xd11dd diff --git a/gfx/pokemon/feraligatr/anim_idle.asm b/gfx/pokemon/feraligatr/anim_idle.asm index c1c39258d..b7c3a8f8b 100644 --- a/gfx/pokemon/feraligatr/anim_idle.asm +++ b/gfx/pokemon/feraligatr/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1ee9 diff --git a/gfx/pokemon/flaaffy/anim.asm b/gfx/pokemon/flaaffy/anim.asm index c9f1f4e7e..7af3dc9c9 100644 --- a/gfx/pokemon/flaaffy/anim.asm +++ b/gfx/pokemon/flaaffy/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 3, 18 endanim -; 0xd12e9 diff --git a/gfx/pokemon/flaaffy/anim_idle.asm b/gfx/pokemon/flaaffy/anim_idle.asm index b9ec0d483..1ebdbfccd 100644 --- a/gfx/pokemon/flaaffy/anim_idle.asm +++ b/gfx/pokemon/flaaffy/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd1fab diff --git a/gfx/pokemon/flareon/anim.asm b/gfx/pokemon/flareon/anim.asm index dbefae362..fe089c7a5 100644 --- a/gfx/pokemon/flareon/anim.asm +++ b/gfx/pokemon/flareon/anim.asm @@ -4,4 +4,3 @@ frame 3, 08 dorepeat 2 endanim -; 0xd105f diff --git a/gfx/pokemon/flareon/anim_idle.asm b/gfx/pokemon/flareon/anim_idle.asm index 431573106..b7c3a8f8b 100644 --- a/gfx/pokemon/flareon/anim_idle.asm +++ b/gfx/pokemon/flareon/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1df1 diff --git a/gfx/pokemon/forretress/anim.asm b/gfx/pokemon/forretress/anim.asm index 74c8e2e12..1ee6264b3 100644 --- a/gfx/pokemon/forretress/anim.asm +++ b/gfx/pokemon/forretress/anim.asm @@ -8,4 +8,3 @@ frame 2, 25 frame 1, 08 endanim -; 0xd1434 diff --git a/gfx/pokemon/forretress/anim_idle.asm b/gfx/pokemon/forretress/anim_idle.asm index 4fafa1a3e..cf685d8b0 100644 --- a/gfx/pokemon/forretress/anim_idle.asm +++ b/gfx/pokemon/forretress/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 06 dorepeat 1 endanim -; 0xd2080 diff --git a/gfx/pokemon/furret/anim.asm b/gfx/pokemon/furret/anim.asm index 8503d74ec..a49ef2847 100644 --- a/gfx/pokemon/furret/anim.asm +++ b/gfx/pokemon/furret/anim.asm @@ -5,4 +5,3 @@ frame 2, 08 dorepeat 2 endanim -; 0xd11f3 diff --git a/gfx/pokemon/furret/anim_idle.asm b/gfx/pokemon/furret/anim_idle.asm index e175bf7cc..b7c3a8f8b 100644 --- a/gfx/pokemon/furret/anim_idle.asm +++ b/gfx/pokemon/furret/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1efb diff --git a/gfx/pokemon/gastly/anim.asm b/gfx/pokemon/gastly/anim.asm index d9414d188..5ecd42a35 100644 --- a/gfx/pokemon/gastly/anim.asm +++ b/gfx/pokemon/gastly/anim.asm @@ -5,4 +5,3 @@ frame 0, 12 frame 1, 12 endanim -; 0xd0ddd diff --git a/gfx/pokemon/gastly/anim_idle.asm b/gfx/pokemon/gastly/anim_idle.asm index 65dc17abf..c4a056b01 100644 --- a/gfx/pokemon/gastly/anim_idle.asm +++ b/gfx/pokemon/gastly/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1c57 diff --git a/gfx/pokemon/gengar/anim.asm b/gfx/pokemon/gengar/anim.asm index 842c47c76..334e0af0a 100644 --- a/gfx/pokemon/gengar/anim.asm +++ b/gfx/pokemon/gengar/anim.asm @@ -6,4 +6,3 @@ frame 3, 09 dorepeat 4 endanim -; 0xd0df7 diff --git a/gfx/pokemon/gengar/anim_idle.asm b/gfx/pokemon/gengar/anim_idle.asm index 09df5dca3..7ef28705b 100644 --- a/gfx/pokemon/gengar/anim_idle.asm +++ b/gfx/pokemon/gengar/anim_idle.asm @@ -6,4 +6,3 @@ frame 6, 09 frame 5, 09 endanim -; 0xd1c69 diff --git a/gfx/pokemon/geodude/anim.asm b/gfx/pokemon/geodude/anim.asm index 3c54bc94e..9949b1ec8 100644 --- a/gfx/pokemon/geodude/anim.asm +++ b/gfx/pokemon/geodude/anim.asm @@ -5,4 +5,3 @@ frame 1, 07 dorepeat 3 endanim -; 0xd0ceb diff --git a/gfx/pokemon/geodude/anim_idle.asm b/gfx/pokemon/geodude/anim_idle.asm index 4ec72d9b1..e991ac49f 100644 --- a/gfx/pokemon/geodude/anim_idle.asm +++ b/gfx/pokemon/geodude/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1ba9 diff --git a/gfx/pokemon/girafarig/anim.asm b/gfx/pokemon/girafarig/anim.asm index 3a7ebd9fe..d6d99b624 100644 --- a/gfx/pokemon/girafarig/anim.asm +++ b/gfx/pokemon/girafarig/anim.asm @@ -11,4 +11,3 @@ frame 5, 05 frame 3, 05 endanim -; 0xd141c diff --git a/gfx/pokemon/girafarig/anim_idle.asm b/gfx/pokemon/girafarig/anim_idle.asm index 95b1131ca..cf528ab8a 100644 --- a/gfx/pokemon/girafarig/anim_idle.asm +++ b/gfx/pokemon/girafarig/anim_idle.asm @@ -1,4 +1,3 @@ frame 5, 16 frame 3, 16 endanim -; 0xd206e diff --git a/gfx/pokemon/gligar/anim.asm b/gfx/pokemon/gligar/anim.asm index 1dabf6cbd..caae53ed4 100644 --- a/gfx/pokemon/gligar/anim.asm +++ b/gfx/pokemon/gligar/anim.asm @@ -1,3 +1,2 @@ frame 1, 35 endanim -; 0xd1444 diff --git a/gfx/pokemon/gligar/anim_idle.asm b/gfx/pokemon/gligar/anim_idle.asm index 0cc7c0916..caae53ed4 100644 --- a/gfx/pokemon/gligar/anim_idle.asm +++ b/gfx/pokemon/gligar/anim_idle.asm @@ -1,3 +1,2 @@ frame 1, 35 endanim -; 0xd208c diff --git a/gfx/pokemon/gloom/anim.asm b/gfx/pokemon/gloom/anim.asm index 89c6805b9..2e535efc3 100644 --- a/gfx/pokemon/gloom/anim.asm +++ b/gfx/pokemon/gloom/anim.asm @@ -9,4 +9,3 @@ frame 0, 06 frame 5, 06 endanim -; 0xd0b35 diff --git a/gfx/pokemon/gloom/anim_idle.asm b/gfx/pokemon/gloom/anim_idle.asm index cdb6c5191..7f7e5332a 100644 --- a/gfx/pokemon/gloom/anim_idle.asm +++ b/gfx/pokemon/gloom/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 10 dorepeat 1 endanim -; 0xd1a75 diff --git a/gfx/pokemon/golbat/anim.asm b/gfx/pokemon/golbat/anim.asm index cb04c1a3b..27b36f18f 100644 --- a/gfx/pokemon/golbat/anim.asm +++ b/gfx/pokemon/golbat/anim.asm @@ -8,4 +8,3 @@ frame 1, 08 dorepeat 6 endanim -; 0xd0b0d diff --git a/gfx/pokemon/golbat/anim_idle.asm b/gfx/pokemon/golbat/anim_idle.asm index 689aed3fd..ac0d93c61 100644 --- a/gfx/pokemon/golbat/anim_idle.asm +++ b/gfx/pokemon/golbat/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1a63 diff --git a/gfx/pokemon/goldeen/anim.asm b/gfx/pokemon/goldeen/anim.asm index c93141feb..eb66e4dfb 100644 --- a/gfx/pokemon/goldeen/anim.asm +++ b/gfx/pokemon/goldeen/anim.asm @@ -5,4 +5,3 @@ frame 0, 12 dorepeat 3 endanim -; 0xd0f61 diff --git a/gfx/pokemon/goldeen/anim_idle.asm b/gfx/pokemon/goldeen/anim_idle.asm index f31dfd1b2..81583f510 100644 --- a/gfx/pokemon/goldeen/anim_idle.asm +++ b/gfx/pokemon/goldeen/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd1d49 diff --git a/gfx/pokemon/golduck/anim.asm b/gfx/pokemon/golduck/anim.asm index 41ce17c55..035a26426 100644 --- a/gfx/pokemon/golduck/anim.asm +++ b/gfx/pokemon/golduck/anim.asm @@ -10,4 +10,3 @@ frame 6, 10 dorepeat 8 endanim -; 0xd0bf4 diff --git a/gfx/pokemon/golduck/anim_idle.asm b/gfx/pokemon/golduck/anim_idle.asm index a73476ca9..5d2a006f2 100644 --- a/gfx/pokemon/golduck/anim_idle.asm +++ b/gfx/pokemon/golduck/anim_idle.asm @@ -3,4 +3,3 @@ frame 7, 15 dorepeat 1 endanim -; 0xd1ae2 diff --git a/gfx/pokemon/golem/anim.asm b/gfx/pokemon/golem/anim.asm index ef21ec211..3860dd0c4 100644 --- a/gfx/pokemon/golem/anim.asm +++ b/gfx/pokemon/golem/anim.asm @@ -4,4 +4,3 @@ frame 1, 12 frame 3, 12 endanim -; 0xd0d07 diff --git a/gfx/pokemon/golem/anim_idle.asm b/gfx/pokemon/golem/anim_idle.asm index 9d3c23ba3..cf66cab97 100644 --- a/gfx/pokemon/golem/anim_idle.asm +++ b/gfx/pokemon/golem/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1bbd diff --git a/gfx/pokemon/granbull/anim.asm b/gfx/pokemon/granbull/anim.asm index 2f412479f..507b0a1b4 100644 --- a/gfx/pokemon/granbull/anim.asm +++ b/gfx/pokemon/granbull/anim.asm @@ -5,4 +5,3 @@ frame 0, 07 dorepeat 3 endanim -; 0xd146f diff --git a/gfx/pokemon/granbull/anim_idle.asm b/gfx/pokemon/granbull/anim_idle.asm index 22e166977..93bb36fb2 100644 --- a/gfx/pokemon/granbull/anim_idle.asm +++ b/gfx/pokemon/granbull/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 06 dorepeat 1 endanim -; 0xd20a7 diff --git a/gfx/pokemon/graveler/anim.asm b/gfx/pokemon/graveler/anim.asm index 8c0fba1ac..e83aeaebf 100644 --- a/gfx/pokemon/graveler/anim.asm +++ b/gfx/pokemon/graveler/anim.asm @@ -7,4 +7,3 @@ frame 4, 09 dorepeat 5 endanim -; 0xd0cfc diff --git a/gfx/pokemon/graveler/anim_idle.asm b/gfx/pokemon/graveler/anim_idle.asm index e4ebc15e0..f6059c101 100644 --- a/gfx/pokemon/graveler/anim_idle.asm +++ b/gfx/pokemon/graveler/anim_idle.asm @@ -4,4 +4,3 @@ frame 5, 20 dorepeat 2 endanim -; 0xd1bb4 diff --git a/gfx/pokemon/grimer/anim.asm b/gfx/pokemon/grimer/anim.asm index c8edda489..781355ffe 100644 --- a/gfx/pokemon/grimer/anim.asm +++ b/gfx/pokemon/grimer/anim.asm @@ -3,4 +3,3 @@ frame 1, 08 frame 2, 28 endanim -; 0xd0db3 diff --git a/gfx/pokemon/grimer/anim_idle.asm b/gfx/pokemon/grimer/anim_idle.asm index 50829935e..37761165e 100644 --- a/gfx/pokemon/grimer/anim_idle.asm +++ b/gfx/pokemon/grimer/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 2, 16 endanim -; 0xd1c37 diff --git a/gfx/pokemon/growlithe/anim.asm b/gfx/pokemon/growlithe/anim.asm index 333c08e67..7a2d8b752 100644 --- a/gfx/pokemon/growlithe/anim.asm +++ b/gfx/pokemon/growlithe/anim.asm @@ -6,4 +6,3 @@ frame 2, 08 dorepeat 4 endanim -; 0xd0c1b diff --git a/gfx/pokemon/growlithe/anim_idle.asm b/gfx/pokemon/growlithe/anim_idle.asm index bce18fa44..2fdd8e761 100644 --- a/gfx/pokemon/growlithe/anim_idle.asm +++ b/gfx/pokemon/growlithe/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 2, 16 endanim -; 0xd1b03 diff --git a/gfx/pokemon/gyarados/anim.asm b/gfx/pokemon/gyarados/anim.asm index 89195fa31..9c162058e 100644 --- a/gfx/pokemon/gyarados/anim.asm +++ b/gfx/pokemon/gyarados/anim.asm @@ -3,4 +3,3 @@ frame 2, 11 dorepeat 1 endanim -; 0xd100b diff --git a/gfx/pokemon/gyarados/anim_idle.asm b/gfx/pokemon/gyarados/anim_idle.asm index b33c52080..792fead16 100644 --- a/gfx/pokemon/gyarados/anim_idle.asm +++ b/gfx/pokemon/gyarados/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1db7 diff --git a/gfx/pokemon/haunter/anim.asm b/gfx/pokemon/haunter/anim.asm index a46d0f0bc..9170e785c 100644 --- a/gfx/pokemon/haunter/anim.asm +++ b/gfx/pokemon/haunter/anim.asm @@ -4,4 +4,3 @@ frame 2, 10 frame 1, 10 endanim -; 0xd0de8 diff --git a/gfx/pokemon/haunter/anim_idle.asm b/gfx/pokemon/haunter/anim_idle.asm index bf439b1e1..24e1eb64b 100644 --- a/gfx/pokemon/haunter/anim_idle.asm +++ b/gfx/pokemon/haunter/anim_idle.asm @@ -1,3 +1,2 @@ frame 4, 58 endanim -; 0xd1c5a diff --git a/gfx/pokemon/heracross/anim.asm b/gfx/pokemon/heracross/anim.asm index 5bba06fad..6c671d848 100644 --- a/gfx/pokemon/heracross/anim.asm +++ b/gfx/pokemon/heracross/anim.asm @@ -2,4 +2,3 @@ frame 1, 20 frame 2, 18 endanim -; 0xd14a5 diff --git a/gfx/pokemon/heracross/anim_idle.asm b/gfx/pokemon/heracross/anim_idle.asm index 6c402379c..792fead16 100644 --- a/gfx/pokemon/heracross/anim_idle.asm +++ b/gfx/pokemon/heracross/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd20cb diff --git a/gfx/pokemon/hitmonchan/anim.asm b/gfx/pokemon/hitmonchan/anim.asm index b6ddd647e..2899be92e 100644 --- a/gfx/pokemon/hitmonchan/anim.asm +++ b/gfx/pokemon/hitmonchan/anim.asm @@ -8,4 +8,3 @@ frame 1, 40 frame 2, 10 endanim -; 0xd0eda diff --git a/gfx/pokemon/hitmonchan/anim_idle.asm b/gfx/pokemon/hitmonchan/anim_idle.asm index 6f67577a0..2e53779f6 100644 --- a/gfx/pokemon/hitmonchan/anim_idle.asm +++ b/gfx/pokemon/hitmonchan/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 4, 20 endanim -; 0xd1ce2 diff --git a/gfx/pokemon/hitmonlee/anim.asm b/gfx/pokemon/hitmonlee/anim.asm index 4260d7753..97110fe68 100644 --- a/gfx/pokemon/hitmonlee/anim.asm +++ b/gfx/pokemon/hitmonlee/anim.asm @@ -10,4 +10,3 @@ frame 4, 05 frame 1, 08 endanim -; 0xd0ec7 diff --git a/gfx/pokemon/hitmonlee/anim_idle.asm b/gfx/pokemon/hitmonlee/anim_idle.asm index 4d7d191bf..5721310cf 100644 --- a/gfx/pokemon/hitmonlee/anim_idle.asm +++ b/gfx/pokemon/hitmonlee/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd1cd5 diff --git a/gfx/pokemon/hitmontop/anim.asm b/gfx/pokemon/hitmontop/anim.asm index 195f1554b..1c4710796 100644 --- a/gfx/pokemon/hitmontop/anim.asm +++ b/gfx/pokemon/hitmontop/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 4, 25 endanim -; 0xd15c6 diff --git a/gfx/pokemon/hitmontop/anim_idle.asm b/gfx/pokemon/hitmontop/anim_idle.asm index 3b4f17403..89ed2beb6 100644 --- a/gfx/pokemon/hitmontop/anim_idle.asm +++ b/gfx/pokemon/hitmontop/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 4, 30 endanim -; 0xd2192 diff --git a/gfx/pokemon/ho_oh/anim.asm b/gfx/pokemon/ho_oh/anim.asm index 5ae27b487..68fbd386b 100644 --- a/gfx/pokemon/ho_oh/anim.asm +++ b/gfx/pokemon/ho_oh/anim.asm @@ -8,4 +8,3 @@ frame 0, 06 frame 4, 12 endanim -; 0xd1679 diff --git a/gfx/pokemon/ho_oh/anim_idle.asm b/gfx/pokemon/ho_oh/anim_idle.asm index d7808f281..ac0d93c61 100644 --- a/gfx/pokemon/ho_oh/anim_idle.asm +++ b/gfx/pokemon/ho_oh/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd2215 diff --git a/gfx/pokemon/hoothoot/anim.asm b/gfx/pokemon/hoothoot/anim.asm index 813faf909..a3c4197a3 100644 --- a/gfx/pokemon/hoothoot/anim.asm +++ b/gfx/pokemon/hoothoot/anim.asm @@ -9,4 +9,3 @@ frame 5, 05 dorepeat 7 endanim -; 0xd1208 diff --git a/gfx/pokemon/hoothoot/anim_idle.asm b/gfx/pokemon/hoothoot/anim_idle.asm index 4aaf1a124..182b30674 100644 --- a/gfx/pokemon/hoothoot/anim_idle.asm +++ b/gfx/pokemon/hoothoot/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 13 frame 5, 05 endanim -; 0xd1f08 diff --git a/gfx/pokemon/hoppip/anim.asm b/gfx/pokemon/hoppip/anim.asm index 6af60ab0b..d4e15f1ba 100644 --- a/gfx/pokemon/hoppip/anim.asm +++ b/gfx/pokemon/hoppip/anim.asm @@ -3,4 +3,3 @@ frame 2, 10 dorepeat 1 endanim -; 0xd134e diff --git a/gfx/pokemon/hoppip/anim_idle.asm b/gfx/pokemon/hoppip/anim_idle.asm index d0281ca1c..afbcfb43a 100644 --- a/gfx/pokemon/hoppip/anim_idle.asm +++ b/gfx/pokemon/hoppip/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 2, 20 endanim -; 0xd1ff0 diff --git a/gfx/pokemon/horsea/anim.asm b/gfx/pokemon/horsea/anim.asm index 18d51863c..edc827dbd 100644 --- a/gfx/pokemon/horsea/anim.asm +++ b/gfx/pokemon/horsea/anim.asm @@ -5,4 +5,3 @@ frame 3, 03 dorepeat 3 endanim -; 0xd0f49 diff --git a/gfx/pokemon/horsea/anim_idle.asm b/gfx/pokemon/horsea/anim_idle.asm index 2475abfdb..ac0d93c61 100644 --- a/gfx/pokemon/horsea/anim_idle.asm +++ b/gfx/pokemon/horsea/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1d35 diff --git a/gfx/pokemon/houndoom/anim.asm b/gfx/pokemon/houndoom/anim.asm index 60ad08726..6c364ec3e 100644 --- a/gfx/pokemon/houndoom/anim.asm +++ b/gfx/pokemon/houndoom/anim.asm @@ -7,4 +7,3 @@ frame 3, 04 frame 4, 08 endanim -; 0xd1560 diff --git a/gfx/pokemon/houndoom/anim_idle.asm b/gfx/pokemon/houndoom/anim_idle.asm index 78fa8610c..a5fedc7d6 100644 --- a/gfx/pokemon/houndoom/anim_idle.asm +++ b/gfx/pokemon/houndoom/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 12 dorepeat 1 endanim -; 0xd214e diff --git a/gfx/pokemon/houndour/anim.asm b/gfx/pokemon/houndour/anim.asm index 2235850c0..c9913e6bb 100644 --- a/gfx/pokemon/houndour/anim.asm +++ b/gfx/pokemon/houndour/anim.asm @@ -4,4 +4,3 @@ frame 0, 07 frame 3, 07 endanim -; 0xd154f diff --git a/gfx/pokemon/houndour/anim_idle.asm b/gfx/pokemon/houndour/anim_idle.asm index dd8318689..9606f8713 100644 --- a/gfx/pokemon/houndour/anim_idle.asm +++ b/gfx/pokemon/houndour/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 3, 16 endanim -; 0xd2145 diff --git a/gfx/pokemon/hypno/anim.asm b/gfx/pokemon/hypno/anim.asm index b6c3e6463..ad6ba93a8 100644 --- a/gfx/pokemon/hypno/anim.asm +++ b/gfx/pokemon/hypno/anim.asm @@ -4,4 +4,3 @@ frame 3, 15 dorepeat 1 endanim -; 0xd0e26 diff --git a/gfx/pokemon/hypno/anim_idle.asm b/gfx/pokemon/hypno/anim_idle.asm index 4d981c442..4f991f0ca 100644 --- a/gfx/pokemon/hypno/anim_idle.asm +++ b/gfx/pokemon/hypno/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1c8a diff --git a/gfx/pokemon/igglybuff/anim.asm b/gfx/pokemon/igglybuff/anim.asm index 0b2430e44..b0e26078b 100644 --- a/gfx/pokemon/igglybuff/anim.asm +++ b/gfx/pokemon/igglybuff/anim.asm @@ -3,4 +3,3 @@ frame 2, 14 frame 1, 06 endanim -; 0xd1299 diff --git a/gfx/pokemon/igglybuff/anim_idle.asm b/gfx/pokemon/igglybuff/anim_idle.asm index 338a0ab2d..c4a056b01 100644 --- a/gfx/pokemon/igglybuff/anim_idle.asm +++ b/gfx/pokemon/igglybuff/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1f71 diff --git a/gfx/pokemon/ivysaur/anim.asm b/gfx/pokemon/ivysaur/anim.asm index 65e89f5ab..1b5796df3 100644 --- a/gfx/pokemon/ivysaur/anim.asm +++ b/gfx/pokemon/ivysaur/anim.asm @@ -3,4 +3,3 @@ frame 2, 20 frame 1, 06 endanim -; 0xd08a5 diff --git a/gfx/pokemon/ivysaur/anim_idle.asm b/gfx/pokemon/ivysaur/anim_idle.asm index 3df18b2cd..c778f1c55 100644 --- a/gfx/pokemon/ivysaur/anim_idle.asm +++ b/gfx/pokemon/ivysaur/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 08 frame 1, 06 endanim -; 0xd18ad diff --git a/gfx/pokemon/jigglypuff/anim.asm b/gfx/pokemon/jigglypuff/anim.asm index ada7e0d99..d28f3d07f 100644 --- a/gfx/pokemon/jigglypuff/anim.asm +++ b/gfx/pokemon/jigglypuff/anim.asm @@ -8,4 +8,3 @@ frame 4, 05 dorepeat 6 endanim -; 0xd0ade diff --git a/gfx/pokemon/jigglypuff/anim_idle.asm b/gfx/pokemon/jigglypuff/anim_idle.asm index 40584de87..6968ec667 100644 --- a/gfx/pokemon/jigglypuff/anim_idle.asm +++ b/gfx/pokemon/jigglypuff/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd1a46 diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 56ea6eb00..f8e3b3ff5 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -1,4 +1,5 @@ -JohtoFrames: +JohtoFrames: ; used only for BANK(JohtoFrames) + ChikoritaFrames: INCLUDE "gfx/pokemon/chikorita/frames.asm" BayleefFrames: INCLUDE "gfx/pokemon/bayleef/frames.asm" MeganiumFrames: INCLUDE "gfx/pokemon/meganium/frames.asm" diff --git a/gfx/pokemon/jolteon/anim.asm b/gfx/pokemon/jolteon/anim.asm index c4c01e60a..7b5b54213 100644 --- a/gfx/pokemon/jolteon/anim.asm +++ b/gfx/pokemon/jolteon/anim.asm @@ -7,4 +7,3 @@ frame 4, 06 dorepeat 5 endanim -; 0xd1054 diff --git a/gfx/pokemon/jolteon/anim_idle.asm b/gfx/pokemon/jolteon/anim_idle.asm index 0b5481afd..e991ac49f 100644 --- a/gfx/pokemon/jolteon/anim_idle.asm +++ b/gfx/pokemon/jolteon/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1de8 diff --git a/gfx/pokemon/jumpluff/anim.asm b/gfx/pokemon/jumpluff/anim.asm index c4161560e..70bea7b60 100644 --- a/gfx/pokemon/jumpluff/anim.asm +++ b/gfx/pokemon/jumpluff/anim.asm @@ -2,4 +2,3 @@ frame 2, 09 frame 3, 09 endanim -; 0xd135e diff --git a/gfx/pokemon/jumpluff/anim_idle.asm b/gfx/pokemon/jumpluff/anim_idle.asm index 5013b953f..4f991f0ca 100644 --- a/gfx/pokemon/jumpluff/anim_idle.asm +++ b/gfx/pokemon/jumpluff/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd2002 diff --git a/gfx/pokemon/jynx/anim.asm b/gfx/pokemon/jynx/anim.asm index 78f0e63ed..1d640aeff 100644 --- a/gfx/pokemon/jynx/anim.asm +++ b/gfx/pokemon/jynx/anim.asm @@ -5,4 +5,3 @@ frame 1, 16 dorepeat 1 endanim -; 0xd0fb5 diff --git a/gfx/pokemon/jynx/anim_idle.asm b/gfx/pokemon/jynx/anim_idle.asm index 42f42859c..faaeffe39 100644 --- a/gfx/pokemon/jynx/anim_idle.asm +++ b/gfx/pokemon/jynx/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1d81 diff --git a/gfx/pokemon/kabuto/anim.asm b/gfx/pokemon/kabuto/anim.asm index de308c900..af55cca53 100644 --- a/gfx/pokemon/kabuto/anim.asm +++ b/gfx/pokemon/kabuto/anim.asm @@ -3,4 +3,3 @@ frame 1, 16 frame 2, 12 endanim -; 0xd1085 diff --git a/gfx/pokemon/kabuto/anim_idle.asm b/gfx/pokemon/kabuto/anim_idle.asm index 0e347c87d..f9799ccf7 100644 --- a/gfx/pokemon/kabuto/anim_idle.asm +++ b/gfx/pokemon/kabuto/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 18 frame 3, 04 endanim -; 0xd1e19 diff --git a/gfx/pokemon/kabutops/anim.asm b/gfx/pokemon/kabutops/anim.asm index f5812126a..387559bb9 100644 --- a/gfx/pokemon/kabutops/anim.asm +++ b/gfx/pokemon/kabutops/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 25 endanim -; 0xd1092 diff --git a/gfx/pokemon/kabutops/anim_idle.asm b/gfx/pokemon/kabutops/anim_idle.asm index 32a70f827..792fead16 100644 --- a/gfx/pokemon/kabutops/anim_idle.asm +++ b/gfx/pokemon/kabutops/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1e22 diff --git a/gfx/pokemon/kadabra/anim.asm b/gfx/pokemon/kadabra/anim.asm index 9b132e26b..feff6b587 100644 --- a/gfx/pokemon/kadabra/anim.asm +++ b/gfx/pokemon/kadabra/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 12 endanim -; 0xd0c67 diff --git a/gfx/pokemon/kadabra/anim_idle.asm b/gfx/pokemon/kadabra/anim_idle.asm index eabcdb07d..35cae5ee9 100644 --- a/gfx/pokemon/kadabra/anim_idle.asm +++ b/gfx/pokemon/kadabra/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd1b41 diff --git a/gfx/pokemon/kakuna/anim.asm b/gfx/pokemon/kakuna/anim.asm index b67e66e26..fed9aabfb 100644 --- a/gfx/pokemon/kakuna/anim.asm +++ b/gfx/pokemon/kakuna/anim.asm @@ -1,4 +1,3 @@ frame 0, 12 frame 1, 24 endanim -; 0xd093f diff --git a/gfx/pokemon/kakuna/anim_idle.asm b/gfx/pokemon/kakuna/anim_idle.asm index a7ca98540..4cf1be2b0 100644 --- a/gfx/pokemon/kakuna/anim_idle.asm +++ b/gfx/pokemon/kakuna/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd192b diff --git a/gfx/pokemon/kangaskhan/anim.asm b/gfx/pokemon/kangaskhan/anim.asm index 34363f893..04a5dc384 100644 --- a/gfx/pokemon/kangaskhan/anim.asm +++ b/gfx/pokemon/kangaskhan/anim.asm @@ -6,4 +6,3 @@ frame 3, 09 frame 4, 15 endanim -; 0xd0f3c diff --git a/gfx/pokemon/kangaskhan/anim_idle.asm b/gfx/pokemon/kangaskhan/anim_idle.asm index 0da29ec4a..aa1ebd59f 100644 --- a/gfx/pokemon/kangaskhan/anim_idle.asm +++ b/gfx/pokemon/kangaskhan/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 15 frame 4, 25 endanim -; 0xd1d2c diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 9a7aa7c85..67a066156 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -1,4 +1,5 @@ -KantoFrames: +KantoFrames: ; used only for BANK(KantoFrames) + BulbasaurFrames: INCLUDE "gfx/pokemon/bulbasaur/frames.asm" IvysaurFrames: INCLUDE "gfx/pokemon/ivysaur/frames.asm" VenusaurFrames: INCLUDE "gfx/pokemon/venusaur/frames.asm" diff --git a/gfx/pokemon/kingdra/anim.asm b/gfx/pokemon/kingdra/anim.asm index c7bc2991f..14e0e9806 100644 --- a/gfx/pokemon/kingdra/anim.asm +++ b/gfx/pokemon/kingdra/anim.asm @@ -7,4 +7,3 @@ frame 5, 06 dorepeat 5 endanim -; 0xd1571 diff --git a/gfx/pokemon/kingdra/anim_idle.asm b/gfx/pokemon/kingdra/anim_idle.asm index 2ec7e99ae..29e08faf1 100644 --- a/gfx/pokemon/kingdra/anim_idle.asm +++ b/gfx/pokemon/kingdra/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 06 dorepeat 1 endanim -; 0xd2157 diff --git a/gfx/pokemon/kingler/anim.asm b/gfx/pokemon/kingler/anim.asm index 2be7b62be..b100d0b74 100644 --- a/gfx/pokemon/kingler/anim.asm +++ b/gfx/pokemon/kingler/anim.asm @@ -7,4 +7,3 @@ frame 0, 15 frame 2, 15 endanim -; 0xd0e4a diff --git a/gfx/pokemon/kingler/anim_idle.asm b/gfx/pokemon/kingler/anim_idle.asm index 25af73bc9..5cd0200a8 100644 --- a/gfx/pokemon/kingler/anim_idle.asm +++ b/gfx/pokemon/kingler/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 10 dorepeat 1 endanim -; 0xd1c9a diff --git a/gfx/pokemon/koffing/anim.asm b/gfx/pokemon/koffing/anim.asm index fc574f528..5a426a113 100644 --- a/gfx/pokemon/koffing/anim.asm +++ b/gfx/pokemon/koffing/anim.asm @@ -4,4 +4,3 @@ frame 4, 10 frame 5, 15 endanim -; 0xd0ef0 diff --git a/gfx/pokemon/koffing/anim_idle.asm b/gfx/pokemon/koffing/anim_idle.asm index e0e81b4d3..c3ffc2567 100644 --- a/gfx/pokemon/koffing/anim_idle.asm +++ b/gfx/pokemon/koffing/anim_idle.asm @@ -1,3 +1,2 @@ frame 5, 48 endanim -; 0xd1cee diff --git a/gfx/pokemon/krabby/anim.asm b/gfx/pokemon/krabby/anim.asm index 22f5657e5..220098180 100644 --- a/gfx/pokemon/krabby/anim.asm +++ b/gfx/pokemon/krabby/anim.asm @@ -8,4 +8,3 @@ frame 4, 03 dorepeat 3 endanim -; 0xd0e39 diff --git a/gfx/pokemon/krabby/anim_idle.asm b/gfx/pokemon/krabby/anim_idle.asm index 0b89ffc33..d86b856d2 100644 --- a/gfx/pokemon/krabby/anim_idle.asm +++ b/gfx/pokemon/krabby/anim_idle.asm @@ -2,4 +2,3 @@ frame 7, 06 dorepeat 3 endanim -; 0xd1c91 diff --git a/gfx/pokemon/lanturn/anim.asm b/gfx/pokemon/lanturn/anim.asm index 18882deb5..37be49644 100644 --- a/gfx/pokemon/lanturn/anim.asm +++ b/gfx/pokemon/lanturn/anim.asm @@ -6,4 +6,3 @@ frame 4, 05 dorepeat 4 endanim -; 0xd1280 diff --git a/gfx/pokemon/lanturn/anim_idle.asm b/gfx/pokemon/lanturn/anim_idle.asm index d57dd04b1..b7c3a8f8b 100644 --- a/gfx/pokemon/lanturn/anim_idle.asm +++ b/gfx/pokemon/lanturn/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1f56 diff --git a/gfx/pokemon/lapras/anim.asm b/gfx/pokemon/lapras/anim.asm index 9ae8f4e5c..7a3c74f37 100644 --- a/gfx/pokemon/lapras/anim.asm +++ b/gfx/pokemon/lapras/anim.asm @@ -4,4 +4,3 @@ frame 2, 09 frame 1, 10 endanim -; 0xd1016 diff --git a/gfx/pokemon/lapras/anim_idle.asm b/gfx/pokemon/lapras/anim_idle.asm index 790cccf05..936499ff0 100644 --- a/gfx/pokemon/lapras/anim_idle.asm +++ b/gfx/pokemon/lapras/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 12 frame 5, 12 endanim -; 0xd1dc0 diff --git a/gfx/pokemon/larvitar/anim.asm b/gfx/pokemon/larvitar/anim.asm index bb861f733..5e3c68db8 100644 --- a/gfx/pokemon/larvitar/anim.asm +++ b/gfx/pokemon/larvitar/anim.asm @@ -3,4 +3,3 @@ frame 2, 28 frame 3, 08 endanim -; 0xd163d diff --git a/gfx/pokemon/larvitar/anim_idle.asm b/gfx/pokemon/larvitar/anim_idle.asm index 2b87de7be..c4a056b01 100644 --- a/gfx/pokemon/larvitar/anim_idle.asm +++ b/gfx/pokemon/larvitar/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd21eb diff --git a/gfx/pokemon/ledian/anim.asm b/gfx/pokemon/ledian/anim.asm index ece77ff44..5cf6ededa 100644 --- a/gfx/pokemon/ledian/anim.asm +++ b/gfx/pokemon/ledian/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 1, 08 endanim -; 0xd1233 diff --git a/gfx/pokemon/ledian/anim_idle.asm b/gfx/pokemon/ledian/anim_idle.asm index cf5a0e011..936e90ea1 100644 --- a/gfx/pokemon/ledian/anim_idle.asm +++ b/gfx/pokemon/ledian/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd1f25 diff --git a/gfx/pokemon/ledyba/anim.asm b/gfx/pokemon/ledyba/anim.asm index ac4c8e154..28f2becbe 100644 --- a/gfx/pokemon/ledyba/anim.asm +++ b/gfx/pokemon/ledyba/anim.asm @@ -4,4 +4,3 @@ frame 3, 12 dorepeat 2 endanim -; 0xd1224 diff --git a/gfx/pokemon/ledyba/anim_idle.asm b/gfx/pokemon/ledyba/anim_idle.asm index d493c5fbc..21cfa00dd 100644 --- a/gfx/pokemon/ledyba/anim_idle.asm +++ b/gfx/pokemon/ledyba/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 05 dorepeat 2 endanim -; 0xd1f1c diff --git a/gfx/pokemon/lickitung/anim.asm b/gfx/pokemon/lickitung/anim.asm index 2fb31e50b..2157c3ca2 100644 --- a/gfx/pokemon/lickitung/anim.asm +++ b/gfx/pokemon/lickitung/anim.asm @@ -4,4 +4,3 @@ frame 0, 06 frame 3, 06 endanim -; 0xd0ee5 diff --git a/gfx/pokemon/lickitung/anim_idle.asm b/gfx/pokemon/lickitung/anim_idle.asm index cf0355a03..b7c3a8f8b 100644 --- a/gfx/pokemon/lickitung/anim_idle.asm +++ b/gfx/pokemon/lickitung/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1ceb diff --git a/gfx/pokemon/lugia/anim.asm b/gfx/pokemon/lugia/anim.asm index 3c3c021a5..0eaac48c2 100644 --- a/gfx/pokemon/lugia/anim.asm +++ b/gfx/pokemon/lugia/anim.asm @@ -5,4 +5,3 @@ frame 5, 14 frame 6, 11 endanim -; 0xd1666 diff --git a/gfx/pokemon/lugia/anim_idle.asm b/gfx/pokemon/lugia/anim_idle.asm index 31f2ea09c..411c74883 100644 --- a/gfx/pokemon/lugia/anim_idle.asm +++ b/gfx/pokemon/lugia/anim_idle.asm @@ -5,4 +5,3 @@ frame 8, 10 frame 3, 10 endanim -; 0xd220c diff --git a/gfx/pokemon/machamp/anim.asm b/gfx/pokemon/machamp/anim.asm index 6202aefe5..8e015b3b0 100644 --- a/gfx/pokemon/machamp/anim.asm +++ b/gfx/pokemon/machamp/anim.asm @@ -8,4 +8,3 @@ dorepeat 3 frame 7, 08 endanim -; 0xd0c9d diff --git a/gfx/pokemon/machamp/anim_idle.asm b/gfx/pokemon/machamp/anim_idle.asm index 5171d3966..b3dcecd84 100644 --- a/gfx/pokemon/machamp/anim_idle.asm +++ b/gfx/pokemon/machamp/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 07 dorepeat 1 endanim -; 0xd1b6b diff --git a/gfx/pokemon/machoke/anim.asm b/gfx/pokemon/machoke/anim.asm index 6d89ab174..56fd79181 100644 --- a/gfx/pokemon/machoke/anim.asm +++ b/gfx/pokemon/machoke/anim.asm @@ -2,4 +2,3 @@ frame 2, 40 frame 1, 10 endanim -; 0xd0c8a diff --git a/gfx/pokemon/machoke/anim_idle.asm b/gfx/pokemon/machoke/anim_idle.asm index c79f108d7..2116d5ded 100644 --- a/gfx/pokemon/machoke/anim_idle.asm +++ b/gfx/pokemon/machoke/anim_idle.asm @@ -7,4 +7,3 @@ frame 6, 08 dorepeat 5 endanim -; 0xd1b62 diff --git a/gfx/pokemon/machop/anim.asm b/gfx/pokemon/machop/anim.asm index 8fee766ce..3ba58434e 100644 --- a/gfx/pokemon/machop/anim.asm +++ b/gfx/pokemon/machop/anim.asm @@ -5,4 +5,3 @@ frame 1, 12 dorepeat 3 endanim -; 0xd0c83 diff --git a/gfx/pokemon/machop/anim_idle.asm b/gfx/pokemon/machop/anim_idle.asm index 20658284d..c4a056b01 100644 --- a/gfx/pokemon/machop/anim_idle.asm +++ b/gfx/pokemon/machop/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1b51 diff --git a/gfx/pokemon/magby/anim.asm b/gfx/pokemon/magby/anim.asm index b0f8c7a10..17cd1ae9f 100644 --- a/gfx/pokemon/magby/anim.asm +++ b/gfx/pokemon/magby/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 4, 16 endanim -; 0xd15ed diff --git a/gfx/pokemon/magby/anim_idle.asm b/gfx/pokemon/magby/anim_idle.asm index 20b2b7997..1cd973ead 100644 --- a/gfx/pokemon/magby/anim_idle.asm +++ b/gfx/pokemon/magby/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 09 dorepeat 1 endanim -; 0xd21af diff --git a/gfx/pokemon/magcargo/anim.asm b/gfx/pokemon/magcargo/anim.asm index d6bf7543a..a36d96c50 100644 --- a/gfx/pokemon/magcargo/anim.asm +++ b/gfx/pokemon/magcargo/anim.asm @@ -4,4 +4,3 @@ frame 4, 10 frame 1, 25 endanim -; 0xd14e4 diff --git a/gfx/pokemon/magcargo/anim_idle.asm b/gfx/pokemon/magcargo/anim_idle.asm index 3c76a44df..7054543f0 100644 --- a/gfx/pokemon/magcargo/anim_idle.asm +++ b/gfx/pokemon/magcargo/anim_idle.asm @@ -1,3 +1,2 @@ frame 1, 60 endanim -; 0xd20f0 diff --git a/gfx/pokemon/magikarp/anim.asm b/gfx/pokemon/magikarp/anim.asm index f06f21a40..b34075902 100644 --- a/gfx/pokemon/magikarp/anim.asm +++ b/gfx/pokemon/magikarp/anim.asm @@ -4,4 +4,3 @@ frame 2, 07 dorepeat 2 endanim -; 0xd1002 diff --git a/gfx/pokemon/magikarp/anim_idle.asm b/gfx/pokemon/magikarp/anim_idle.asm index 7c3f5cb76..1c84b06d5 100644 --- a/gfx/pokemon/magikarp/anim_idle.asm +++ b/gfx/pokemon/magikarp/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 10 dorepeat 1 endanim -; 0xd1dae diff --git a/gfx/pokemon/magmar/anim.asm b/gfx/pokemon/magmar/anim.asm index 8fde5d3b5..9308cea5c 100644 --- a/gfx/pokemon/magmar/anim.asm +++ b/gfx/pokemon/magmar/anim.asm @@ -4,4 +4,3 @@ frame 3, 07 dorepeat 2 endanim -; 0xd0fd7 diff --git a/gfx/pokemon/magmar/anim_idle.asm b/gfx/pokemon/magmar/anim_idle.asm index 784bdcd3d..35cae5ee9 100644 --- a/gfx/pokemon/magmar/anim_idle.asm +++ b/gfx/pokemon/magmar/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd1d93 diff --git a/gfx/pokemon/magnemite/anim.asm b/gfx/pokemon/magnemite/anim.asm index 4f038b0ed..1c624b40f 100644 --- a/gfx/pokemon/magnemite/anim.asm +++ b/gfx/pokemon/magnemite/anim.asm @@ -5,4 +5,3 @@ frame 0, 08 dorepeat 1 endanim -; 0xd0d5c diff --git a/gfx/pokemon/magnemite/anim_idle.asm b/gfx/pokemon/magnemite/anim_idle.asm index a41239563..81719e6b3 100644 --- a/gfx/pokemon/magnemite/anim_idle.asm +++ b/gfx/pokemon/magnemite/anim_idle.asm @@ -4,4 +4,3 @@ frame 6, 08 dorepeat 1 endanim -; 0xd1be4 diff --git a/gfx/pokemon/magneton/anim.asm b/gfx/pokemon/magneton/anim.asm index 26b34d4ec..06d27a72d 100644 --- a/gfx/pokemon/magneton/anim.asm +++ b/gfx/pokemon/magneton/anim.asm @@ -9,4 +9,3 @@ frame 2, 04 frame 3, 04 endanim -; 0xd0d71 diff --git a/gfx/pokemon/magneton/anim_idle.asm b/gfx/pokemon/magneton/anim_idle.asm index 6045d8fae..d0cba2e01 100644 --- a/gfx/pokemon/magneton/anim_idle.asm +++ b/gfx/pokemon/magneton/anim_idle.asm @@ -6,4 +6,3 @@ frame 2, 24 frame 3, 24 endanim -; 0xd1bf3 diff --git a/gfx/pokemon/mankey/anim.asm b/gfx/pokemon/mankey/anim.asm index 7d6ef1fa5..01b8e3e64 100644 --- a/gfx/pokemon/mankey/anim.asm +++ b/gfx/pokemon/mankey/anim.asm @@ -4,4 +4,3 @@ frame 2, 08 dorepeat 2 endanim -; 0xd0bff diff --git a/gfx/pokemon/mankey/anim_idle.asm b/gfx/pokemon/mankey/anim_idle.asm index c5874fc6d..faaeffe39 100644 --- a/gfx/pokemon/mankey/anim_idle.asm +++ b/gfx/pokemon/mankey/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1aeb diff --git a/gfx/pokemon/mantine/anim.asm b/gfx/pokemon/mantine/anim.asm index d0a51de3e..165d1cfdf 100644 --- a/gfx/pokemon/mantine/anim.asm +++ b/gfx/pokemon/mantine/anim.asm @@ -6,4 +6,3 @@ frame 0, 15 frame 5, 15 endanim -; 0xd1539 diff --git a/gfx/pokemon/mantine/anim_idle.asm b/gfx/pokemon/mantine/anim_idle.asm index f552b1f09..17859c9d5 100644 --- a/gfx/pokemon/mantine/anim_idle.asm +++ b/gfx/pokemon/mantine/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 08 dorepeat 1 endanim -; 0xd212f diff --git a/gfx/pokemon/mareep/anim.asm b/gfx/pokemon/mareep/anim.asm index e74a78cad..0bade86f0 100644 --- a/gfx/pokemon/mareep/anim.asm +++ b/gfx/pokemon/mareep/anim.asm @@ -6,4 +6,3 @@ frame 2, 06 dorepeat 4 endanim -; 0xd12dc diff --git a/gfx/pokemon/mareep/anim_idle.asm b/gfx/pokemon/mareep/anim_idle.asm index 21d7a79f8..51fc59d03 100644 --- a/gfx/pokemon/mareep/anim_idle.asm +++ b/gfx/pokemon/mareep/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 07 dorepeat 1 endanim -; 0xd1fa2 diff --git a/gfx/pokemon/marill/anim.asm b/gfx/pokemon/marill/anim.asm index 5b8c7fc2a..d157bca9a 100644 --- a/gfx/pokemon/marill/anim.asm +++ b/gfx/pokemon/marill/anim.asm @@ -6,4 +6,3 @@ frame 3, 10 dorepeat 4 endanim -; 0xd131a diff --git a/gfx/pokemon/marill/anim_idle.asm b/gfx/pokemon/marill/anim_idle.asm index 3be2dd1dc..690eefa2a 100644 --- a/gfx/pokemon/marill/anim_idle.asm +++ b/gfx/pokemon/marill/anim_idle.asm @@ -4,4 +4,3 @@ frame 5, 08 dorepeat 2 endanim -; 0xd1fca diff --git a/gfx/pokemon/marowak/anim.asm b/gfx/pokemon/marowak/anim.asm index 23c9d2f92..28bf103c1 100644 --- a/gfx/pokemon/marowak/anim.asm +++ b/gfx/pokemon/marowak/anim.asm @@ -7,4 +7,3 @@ frame 4, 07 dorepeat 5 endanim -; 0xd0eb0 diff --git a/gfx/pokemon/marowak/anim_idle.asm b/gfx/pokemon/marowak/anim_idle.asm index 5cdcd7594..512259ece 100644 --- a/gfx/pokemon/marowak/anim_idle.asm +++ b/gfx/pokemon/marowak/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 15 dorepeat 1 endanim -; 0xd1ccc diff --git a/gfx/pokemon/meganium/anim.asm b/gfx/pokemon/meganium/anim.asm index adf80db8f..e5db2c673 100644 --- a/gfx/pokemon/meganium/anim.asm +++ b/gfx/pokemon/meganium/anim.asm @@ -8,4 +8,3 @@ frame 3, 07 dorepeat 6 endanim -; 0xd117f diff --git a/gfx/pokemon/meganium/anim_idle.asm b/gfx/pokemon/meganium/anim_idle.asm index f28c9d97a..b7c3a8f8b 100644 --- a/gfx/pokemon/meganium/anim_idle.asm +++ b/gfx/pokemon/meganium/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1eb1 diff --git a/gfx/pokemon/meowth/anim.asm b/gfx/pokemon/meowth/anim.asm index ff95e9c6d..ed53bad2f 100644 --- a/gfx/pokemon/meowth/anim.asm +++ b/gfx/pokemon/meowth/anim.asm @@ -4,4 +4,3 @@ frame 3, 14 dorepeat 2 endanim -; 0xd0bbf diff --git a/gfx/pokemon/meowth/anim_idle.asm b/gfx/pokemon/meowth/anim_idle.asm index 7f1e9eba8..cf66cab97 100644 --- a/gfx/pokemon/meowth/anim_idle.asm +++ b/gfx/pokemon/meowth/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1ac7 diff --git a/gfx/pokemon/metapod/anim.asm b/gfx/pokemon/metapod/anim.asm index da76c7094..eee484dce 100644 --- a/gfx/pokemon/metapod/anim.asm +++ b/gfx/pokemon/metapod/anim.asm @@ -2,4 +2,3 @@ frame 2, 24 frame 1, 12 endanim -; 0xd091c diff --git a/gfx/pokemon/metapod/anim_idle.asm b/gfx/pokemon/metapod/anim_idle.asm index e22d46cb7..b361670db 100644 --- a/gfx/pokemon/metapod/anim_idle.asm +++ b/gfx/pokemon/metapod/anim_idle.asm @@ -4,4 +4,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1904 diff --git a/gfx/pokemon/mew/anim.asm b/gfx/pokemon/mew/anim.asm index b01e307de..3f8ce9842 100644 --- a/gfx/pokemon/mew/anim.asm +++ b/gfx/pokemon/mew/anim.asm @@ -15,4 +15,3 @@ frame 0, 15 frame 4, 15 endanim -; 0xd1154 diff --git a/gfx/pokemon/mew/anim_idle.asm b/gfx/pokemon/mew/anim_idle.asm index c22e552cb..9e264ee71 100644 --- a/gfx/pokemon/mew/anim_idle.asm +++ b/gfx/pokemon/mew/anim_idle.asm @@ -6,4 +6,3 @@ frame 4, 20 dorepeat 1 endanim -; 0xd1e96 diff --git a/gfx/pokemon/mewtwo/anim.asm b/gfx/pokemon/mewtwo/anim.asm index 78682c111..a84682339 100644 --- a/gfx/pokemon/mewtwo/anim.asm +++ b/gfx/pokemon/mewtwo/anim.asm @@ -14,4 +14,3 @@ frame 5, 14 frame 3, 04 endanim -; 0xd1133 diff --git a/gfx/pokemon/mewtwo/anim_idle.asm b/gfx/pokemon/mewtwo/anim_idle.asm index a80a56899..6b935e77a 100644 --- a/gfx/pokemon/mewtwo/anim_idle.asm +++ b/gfx/pokemon/mewtwo/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 06 dorepeat 1 endanim -; 0xd1e87 diff --git a/gfx/pokemon/miltank/anim.asm b/gfx/pokemon/miltank/anim.asm index 6d12f2d5d..384ef3f61 100644 --- a/gfx/pokemon/miltank/anim.asm +++ b/gfx/pokemon/miltank/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 3, 05 endanim -; 0xd15fa diff --git a/gfx/pokemon/miltank/anim_idle.asm b/gfx/pokemon/miltank/anim_idle.asm index a6a76db7b..8318520e3 100644 --- a/gfx/pokemon/miltank/anim_idle.asm +++ b/gfx/pokemon/miltank/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd21b8 diff --git a/gfx/pokemon/misdreavus/anim.asm b/gfx/pokemon/misdreavus/anim.asm index d833c96fb..fe29627b3 100644 --- a/gfx/pokemon/misdreavus/anim.asm +++ b/gfx/pokemon/misdreavus/anim.asm @@ -2,4 +2,3 @@ frame 2, 13 frame 3, 13 endanim -; 0xd13e9 diff --git a/gfx/pokemon/misdreavus/anim_idle.asm b/gfx/pokemon/misdreavus/anim_idle.asm index 3f0ee9517..270d8a92e 100644 --- a/gfx/pokemon/misdreavus/anim_idle.asm +++ b/gfx/pokemon/misdreavus/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 08 dorepeat 1 endanim -; 0xd205d diff --git a/gfx/pokemon/moltres/anim.asm b/gfx/pokemon/moltres/anim.asm index 220626749..f353d3078 100644 --- a/gfx/pokemon/moltres/anim.asm +++ b/gfx/pokemon/moltres/anim.asm @@ -10,4 +10,3 @@ frame 0, 12 frame 1, 12 endanim -; 0xd10e3 diff --git a/gfx/pokemon/moltres/anim_idle.asm b/gfx/pokemon/moltres/anim_idle.asm index 258191b6e..78dc7190f 100644 --- a/gfx/pokemon/moltres/anim_idle.asm +++ b/gfx/pokemon/moltres/anim_idle.asm @@ -6,4 +6,3 @@ frame 1, 12 frame 5, 12 endanim -; 0xd1e57 diff --git a/gfx/pokemon/mr__mime/anim.asm b/gfx/pokemon/mr__mime/anim.asm index fcb597a5a..d1144520f 100644 --- a/gfx/pokemon/mr__mime/anim.asm +++ b/gfx/pokemon/mr__mime/anim.asm @@ -8,4 +8,3 @@ frame 0, 32 frame 6, 06 endanim -; 0xd0f99 diff --git a/gfx/pokemon/mr__mime/anim_idle.asm b/gfx/pokemon/mr__mime/anim_idle.asm index c3747ac1e..29e08faf1 100644 --- a/gfx/pokemon/mr__mime/anim_idle.asm +++ b/gfx/pokemon/mr__mime/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 06 dorepeat 1 endanim -; 0xd1d6f diff --git a/gfx/pokemon/muk/anim.asm b/gfx/pokemon/muk/anim.asm index 1bacba421..e6b2ecf27 100644 --- a/gfx/pokemon/muk/anim.asm +++ b/gfx/pokemon/muk/anim.asm @@ -3,4 +3,3 @@ frame 3, 12 frame 1, 12 endanim -; 0xd0dbc diff --git a/gfx/pokemon/muk/anim_idle.asm b/gfx/pokemon/muk/anim_idle.asm index db37bf515..58ad3b689 100644 --- a/gfx/pokemon/muk/anim_idle.asm +++ b/gfx/pokemon/muk/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 12 dorepeat 1 endanim -; 0xd1c40 diff --git a/gfx/pokemon/murkrow/anim.asm b/gfx/pokemon/murkrow/anim.asm index 8f0ca6a72..5c286efbf 100644 --- a/gfx/pokemon/murkrow/anim.asm +++ b/gfx/pokemon/murkrow/anim.asm @@ -7,4 +7,3 @@ frame 0, 07 frame 1, 07 endanim -; 0xd13cf diff --git a/gfx/pokemon/murkrow/anim_idle.asm b/gfx/pokemon/murkrow/anim_idle.asm index 85e2f9c56..81583f510 100644 --- a/gfx/pokemon/murkrow/anim_idle.asm +++ b/gfx/pokemon/murkrow/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd204f diff --git a/gfx/pokemon/natu/anim.asm b/gfx/pokemon/natu/anim.asm index 22c2659db..bb60fc477 100644 --- a/gfx/pokemon/natu/anim.asm +++ b/gfx/pokemon/natu/anim.asm @@ -3,4 +3,3 @@ frame 3, 25 frame 2, 10 endanim -; 0xd12bc diff --git a/gfx/pokemon/natu/anim_idle.asm b/gfx/pokemon/natu/anim_idle.asm index a4a974877..7dd5afcf1 100644 --- a/gfx/pokemon/natu/anim_idle.asm +++ b/gfx/pokemon/natu/anim_idle.asm @@ -1,3 +1,2 @@ frame 4, 35 endanim -; 0xd1f86 diff --git a/gfx/pokemon/nidoking/anim.asm b/gfx/pokemon/nidoking/anim.asm index a32945d49..f2441e4e6 100644 --- a/gfx/pokemon/nidoking/anim.asm +++ b/gfx/pokemon/nidoking/anim.asm @@ -3,4 +3,3 @@ frame 2, 36 frame 1, 12 endanim -; 0xd0a8f diff --git a/gfx/pokemon/nidoking/anim_idle.asm b/gfx/pokemon/nidoking/anim_idle.asm index 4e56028e1..faaeffe39 100644 --- a/gfx/pokemon/nidoking/anim_idle.asm +++ b/gfx/pokemon/nidoking/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1a13 diff --git a/gfx/pokemon/nidoqueen/anim.asm b/gfx/pokemon/nidoqueen/anim.asm index bd9d8eee8..37d7d6474 100644 --- a/gfx/pokemon/nidoqueen/anim.asm +++ b/gfx/pokemon/nidoqueen/anim.asm @@ -7,4 +7,3 @@ frame 0, 10 frame 5, 10 endanim -; 0xd0a64 diff --git a/gfx/pokemon/nidoqueen/anim_idle.asm b/gfx/pokemon/nidoqueen/anim_idle.asm index 1cc934c42..fdb7000ca 100644 --- a/gfx/pokemon/nidoqueen/anim_idle.asm +++ b/gfx/pokemon/nidoqueen/anim_idle.asm @@ -4,4 +4,3 @@ frame 6, 07 dorepeat 2 endanim -; 0xd19f4 diff --git a/gfx/pokemon/nidoran_f/anim.asm b/gfx/pokemon/nidoran_f/anim.asm index 623db13d1..28a222147 100644 --- a/gfx/pokemon/nidoran_f/anim.asm +++ b/gfx/pokemon/nidoran_f/anim.asm @@ -5,4 +5,3 @@ frame 0, 05 dorepeat 3 endanim -; 0xd0a44 diff --git a/gfx/pokemon/nidoran_f/anim_idle.asm b/gfx/pokemon/nidoran_f/anim_idle.asm index 348179aac..e31ce4774 100644 --- a/gfx/pokemon/nidoran_f/anim_idle.asm +++ b/gfx/pokemon/nidoran_f/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd19e0 diff --git a/gfx/pokemon/nidoran_m/anim.asm b/gfx/pokemon/nidoran_m/anim.asm index 9b8a38133..2919f0a42 100644 --- a/gfx/pokemon/nidoran_m/anim.asm +++ b/gfx/pokemon/nidoran_m/anim.asm @@ -5,4 +5,3 @@ frame 1, 06 dorepeat 3 endanim -; 0xd0a71 diff --git a/gfx/pokemon/nidoran_m/anim_idle.asm b/gfx/pokemon/nidoran_m/anim_idle.asm index 20b437f6a..faaeffe39 100644 --- a/gfx/pokemon/nidoran_m/anim_idle.asm +++ b/gfx/pokemon/nidoran_m/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd19fd diff --git a/gfx/pokemon/nidorina/anim.asm b/gfx/pokemon/nidorina/anim.asm index 6ab079db4..8d4e323a6 100644 --- a/gfx/pokemon/nidorina/anim.asm +++ b/gfx/pokemon/nidorina/anim.asm @@ -6,4 +6,3 @@ frame 2, 06 dorepeat 2 endanim -; 0xd0a53 diff --git a/gfx/pokemon/nidorina/anim_idle.asm b/gfx/pokemon/nidorina/anim_idle.asm index 6afb1cbc8..2a4625144 100644 --- a/gfx/pokemon/nidorina/anim_idle.asm +++ b/gfx/pokemon/nidorina/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 04 dorepeat 1 endanim -; 0xd19e9 diff --git a/gfx/pokemon/nidorino/anim.asm b/gfx/pokemon/nidorino/anim.asm index 16a6cb1dc..4e9fef35b 100644 --- a/gfx/pokemon/nidorino/anim.asm +++ b/gfx/pokemon/nidorino/anim.asm @@ -9,4 +9,3 @@ frame 3, 06 dorepeat 6 endanim -; 0xd0a86 diff --git a/gfx/pokemon/nidorino/anim_idle.asm b/gfx/pokemon/nidorino/anim_idle.asm index 40e17f454..b9c951a7b 100644 --- a/gfx/pokemon/nidorino/anim_idle.asm +++ b/gfx/pokemon/nidorino/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 06 frame 4, 06 endanim -; 0xd1a0a diff --git a/gfx/pokemon/ninetales/anim.asm b/gfx/pokemon/ninetales/anim.asm index 0d691ee9d..54104dbdd 100644 --- a/gfx/pokemon/ninetales/anim.asm +++ b/gfx/pokemon/ninetales/anim.asm @@ -7,4 +7,3 @@ frame 2, 10 frame 1, 08 endanim -; 0xd0acb diff --git a/gfx/pokemon/ninetales/anim_idle.asm b/gfx/pokemon/ninetales/anim_idle.asm index 68d1e8051..cf685d8b0 100644 --- a/gfx/pokemon/ninetales/anim_idle.asm +++ b/gfx/pokemon/ninetales/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 06 dorepeat 1 endanim -; 0xd1a3d diff --git a/gfx/pokemon/noctowl/anim.asm b/gfx/pokemon/noctowl/anim.asm index ce19c30a5..8e13e19bc 100644 --- a/gfx/pokemon/noctowl/anim.asm +++ b/gfx/pokemon/noctowl/anim.asm @@ -7,4 +7,3 @@ frame 2, 06 dorepeat 5 endanim -; 0xd1219 diff --git a/gfx/pokemon/noctowl/anim_idle.asm b/gfx/pokemon/noctowl/anim_idle.asm index 4fe81f336..5721310cf 100644 --- a/gfx/pokemon/noctowl/anim_idle.asm +++ b/gfx/pokemon/noctowl/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd1f11 diff --git a/gfx/pokemon/octillery/anim.asm b/gfx/pokemon/octillery/anim.asm index 2405d46a1..71dc2031a 100644 --- a/gfx/pokemon/octillery/anim.asm +++ b/gfx/pokemon/octillery/anim.asm @@ -5,4 +5,3 @@ frame 0, 05 dorepeat 3 endanim -; 0xd1515 diff --git a/gfx/pokemon/octillery/anim_idle.asm b/gfx/pokemon/octillery/anim_idle.asm index 0903a867a..c4a056b01 100644 --- a/gfx/pokemon/octillery/anim_idle.asm +++ b/gfx/pokemon/octillery/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd211d diff --git a/gfx/pokemon/oddish/anim.asm b/gfx/pokemon/oddish/anim.asm index 338771fce..c8e0f9d5d 100644 --- a/gfx/pokemon/oddish/anim.asm +++ b/gfx/pokemon/oddish/anim.asm @@ -8,4 +8,3 @@ frame 3, 07 dorepeat 6 endanim -; 0xd0b20 diff --git a/gfx/pokemon/oddish/anim_idle.asm b/gfx/pokemon/oddish/anim_idle.asm index 92d041ff5..936e90ea1 100644 --- a/gfx/pokemon/oddish/anim_idle.asm +++ b/gfx/pokemon/oddish/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd1a6c diff --git a/gfx/pokemon/omanyte/anim.asm b/gfx/pokemon/omanyte/anim.asm index 5863efecc..7581608b7 100644 --- a/gfx/pokemon/omanyte/anim.asm +++ b/gfx/pokemon/omanyte/anim.asm @@ -2,4 +2,3 @@ frame 2, 22 frame 1, 08 endanim -; 0xd1075 diff --git a/gfx/pokemon/omanyte/anim_idle.asm b/gfx/pokemon/omanyte/anim_idle.asm index ffdce5abd..792fead16 100644 --- a/gfx/pokemon/omanyte/anim_idle.asm +++ b/gfx/pokemon/omanyte/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1e03 diff --git a/gfx/pokemon/omastar/anim.asm b/gfx/pokemon/omastar/anim.asm index 76d8c3aa8..a98ae41c8 100644 --- a/gfx/pokemon/omastar/anim.asm +++ b/gfx/pokemon/omastar/anim.asm @@ -2,4 +2,3 @@ frame 2, 40 frame 1, 06 endanim -; 0xd107c diff --git a/gfx/pokemon/omastar/anim_idle.asm b/gfx/pokemon/omastar/anim_idle.asm index 60bcf04d2..abd553e82 100644 --- a/gfx/pokemon/omastar/anim_idle.asm +++ b/gfx/pokemon/omastar/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 11 dorepeat 1 endanim -; 0xd1e0c diff --git a/gfx/pokemon/onix/anim.asm b/gfx/pokemon/onix/anim.asm index a5b18f5b6..31dc30c82 100644 --- a/gfx/pokemon/onix/anim.asm +++ b/gfx/pokemon/onix/anim.asm @@ -7,4 +7,3 @@ frame 5, 12 frame 6, 12 endanim -; 0xd0e08 diff --git a/gfx/pokemon/onix/anim_idle.asm b/gfx/pokemon/onix/anim_idle.asm index e4ae7acac..77aaa10cf 100644 --- a/gfx/pokemon/onix/anim_idle.asm +++ b/gfx/pokemon/onix/anim_idle.asm @@ -4,4 +4,3 @@ frame 8, 10 dorepeat 1 endanim -; 0xd1c74 diff --git a/gfx/pokemon/paras/anim.asm b/gfx/pokemon/paras/anim.asm index 6fcc935e9..d313f1145 100644 --- a/gfx/pokemon/paras/anim.asm +++ b/gfx/pokemon/paras/anim.asm @@ -3,4 +3,3 @@ frame 2, 32 frame 1, 08 endanim -; 0xd0b4f diff --git a/gfx/pokemon/paras/anim_idle.asm b/gfx/pokemon/paras/anim_idle.asm index 3ce495f04..faaeffe39 100644 --- a/gfx/pokemon/paras/anim_idle.asm +++ b/gfx/pokemon/paras/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1a8b diff --git a/gfx/pokemon/parasect/anim.asm b/gfx/pokemon/parasect/anim.asm index e9e253cee..a62c97492 100644 --- a/gfx/pokemon/parasect/anim.asm +++ b/gfx/pokemon/parasect/anim.asm @@ -10,4 +10,3 @@ frame 4, 04 dorepeat 8 endanim -; 0xd0b66 diff --git a/gfx/pokemon/parasect/anim_idle.asm b/gfx/pokemon/parasect/anim_idle.asm index 8275690a6..28575f514 100644 --- a/gfx/pokemon/parasect/anim_idle.asm +++ b/gfx/pokemon/parasect/anim_idle.asm @@ -2,4 +2,3 @@ frame 0, 05 frame 4, 20 endanim -; 0xd1a92 diff --git a/gfx/pokemon/persian/anim.asm b/gfx/pokemon/persian/anim.asm index ae771c09c..a5e86a283 100644 --- a/gfx/pokemon/persian/anim.asm +++ b/gfx/pokemon/persian/anim.asm @@ -7,4 +7,3 @@ frame 3, 08 frame 2, 06 endanim -; 0xd0bd0 diff --git a/gfx/pokemon/persian/anim_idle.asm b/gfx/pokemon/persian/anim_idle.asm index ca9129bfa..936e90ea1 100644 --- a/gfx/pokemon/persian/anim_idle.asm +++ b/gfx/pokemon/persian/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd1ad0 diff --git a/gfx/pokemon/phanpy/anim.asm b/gfx/pokemon/phanpy/anim.asm index 7ec513762..5504c8881 100644 --- a/gfx/pokemon/phanpy/anim.asm +++ b/gfx/pokemon/phanpy/anim.asm @@ -5,4 +5,3 @@ frame 3, 05 dorepeat 3 endanim -; 0xd157e diff --git a/gfx/pokemon/phanpy/anim_idle.asm b/gfx/pokemon/phanpy/anim_idle.asm index 43148da49..8318520e3 100644 --- a/gfx/pokemon/phanpy/anim_idle.asm +++ b/gfx/pokemon/phanpy/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2160 diff --git a/gfx/pokemon/pichu/anim.asm b/gfx/pokemon/pichu/anim.asm index 50a1ae73c..32a1cd806 100644 --- a/gfx/pokemon/pichu/anim.asm +++ b/gfx/pokemon/pichu/anim.asm @@ -3,4 +3,3 @@ frame 2, 12 frame 4, 08 endanim -; 0xd1289 diff --git a/gfx/pokemon/pichu/anim_idle.asm b/gfx/pokemon/pichu/anim_idle.asm index dd39adcab..bd13c427d 100644 --- a/gfx/pokemon/pichu/anim_idle.asm +++ b/gfx/pokemon/pichu/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1f5f diff --git a/gfx/pokemon/pidgeot/anim.asm b/gfx/pokemon/pidgeot/anim.asm index 34d5d3a98..ebb3981b8 100644 --- a/gfx/pokemon/pidgeot/anim.asm +++ b/gfx/pokemon/pidgeot/anim.asm @@ -5,4 +5,3 @@ frame 2, 06 dorepeat 3 endanim -; 0xd0987 diff --git a/gfx/pokemon/pidgeot/anim_idle.asm b/gfx/pokemon/pidgeot/anim_idle.asm index 6ba60e83e..a35d5c00a 100644 --- a/gfx/pokemon/pidgeot/anim_idle.asm +++ b/gfx/pokemon/pidgeot/anim_idle.asm @@ -6,4 +6,3 @@ frame 0, 06 frame 2, 06 endanim -; 0xd1961 diff --git a/gfx/pokemon/pidgeotto/anim.asm b/gfx/pokemon/pidgeotto/anim.asm index 53008855f..5c927ba03 100644 --- a/gfx/pokemon/pidgeotto/anim.asm +++ b/gfx/pokemon/pidgeotto/anim.asm @@ -8,4 +8,3 @@ dorepeat 5 frame 2, 20 endanim -; 0xd097a diff --git a/gfx/pokemon/pidgeotto/anim_idle.asm b/gfx/pokemon/pidgeotto/anim_idle.asm index 95a27bb15..936e90ea1 100644 --- a/gfx/pokemon/pidgeotto/anim_idle.asm +++ b/gfx/pokemon/pidgeotto/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd1952 diff --git a/gfx/pokemon/pidgey/anim.asm b/gfx/pokemon/pidgey/anim.asm index 4ca6553d2..15080a58c 100644 --- a/gfx/pokemon/pidgey/anim.asm +++ b/gfx/pokemon/pidgey/anim.asm @@ -8,4 +8,3 @@ frame 1, 03 dorepeat 4 endanim -; 0xd0967 diff --git a/gfx/pokemon/pidgey/anim_idle.asm b/gfx/pokemon/pidgey/anim_idle.asm index 25a55fb45..cb58c18b8 100644 --- a/gfx/pokemon/pidgey/anim_idle.asm +++ b/gfx/pokemon/pidgey/anim_idle.asm @@ -5,4 +5,3 @@ frame 1, 04 dorepeat 1 endanim -; 0xd1949 diff --git a/gfx/pokemon/pikachu/anim.asm b/gfx/pokemon/pikachu/anim.asm index 6a1ac0954..95e22360c 100644 --- a/gfx/pokemon/pikachu/anim.asm +++ b/gfx/pokemon/pikachu/anim.asm @@ -9,4 +9,3 @@ frame 4, 05 dorepeat 7 endanim -; 0xd0a02 diff --git a/gfx/pokemon/pikachu/anim_idle.asm b/gfx/pokemon/pikachu/anim_idle.asm index 0454a2855..c6473af81 100644 --- a/gfx/pokemon/pikachu/anim_idle.asm +++ b/gfx/pokemon/pikachu/anim_idle.asm @@ -7,4 +7,3 @@ frame 4, 05 dorepeat 5 endanim -; 0xd19ba diff --git a/gfx/pokemon/piloswine/anim.asm b/gfx/pokemon/piloswine/anim.asm index 5b57b3ef9..63cef3eeb 100644 --- a/gfx/pokemon/piloswine/anim.asm +++ b/gfx/pokemon/piloswine/anim.asm @@ -2,4 +2,3 @@ frame 2, 10 frame 3, 10 endanim -; 0xd14f6 diff --git a/gfx/pokemon/piloswine/anim_idle.asm b/gfx/pokemon/piloswine/anim_idle.asm index c1cba5ee2..a0b6ceb80 100644 --- a/gfx/pokemon/piloswine/anim_idle.asm +++ b/gfx/pokemon/piloswine/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 12 dorepeat 1 endanim -; 0xd2102 diff --git a/gfx/pokemon/pineco/anim.asm b/gfx/pokemon/pineco/anim.asm index 4579032ec..7b8a6ed8e 100644 --- a/gfx/pokemon/pineco/anim.asm +++ b/gfx/pokemon/pineco/anim.asm @@ -1,4 +1,3 @@ frame 1, 06 frame 2, 18 endanim -; 0xd1421 diff --git a/gfx/pokemon/pineco/anim_idle.asm b/gfx/pokemon/pineco/anim_idle.asm index f1b4e949e..c4a056b01 100644 --- a/gfx/pokemon/pineco/anim_idle.asm +++ b/gfx/pokemon/pineco/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd2077 diff --git a/gfx/pokemon/pinsir/anim.asm b/gfx/pokemon/pinsir/anim.asm index f45752006..c13e2e27a 100644 --- a/gfx/pokemon/pinsir/anim.asm +++ b/gfx/pokemon/pinsir/anim.asm @@ -5,4 +5,3 @@ frame 4, 12 dorepeat 3 endanim -; 0xd0fe4 diff --git a/gfx/pokemon/pinsir/anim_idle.asm b/gfx/pokemon/pinsir/anim_idle.asm index 73895c2e0..d849824dd 100644 --- a/gfx/pokemon/pinsir/anim_idle.asm +++ b/gfx/pokemon/pinsir/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 08 dorepeat 1 endanim -; 0xd1d9c diff --git a/gfx/pokemon/politoed/anim.asm b/gfx/pokemon/politoed/anim.asm index 72347714f..d1943c1cd 100644 --- a/gfx/pokemon/politoed/anim.asm +++ b/gfx/pokemon/politoed/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 1, 08 endanim -; 0xd1345 diff --git a/gfx/pokemon/politoed/anim_idle.asm b/gfx/pokemon/politoed/anim_idle.asm index 8ec01df37..1ebdbfccd 100644 --- a/gfx/pokemon/politoed/anim_idle.asm +++ b/gfx/pokemon/politoed/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd1fe5 diff --git a/gfx/pokemon/poliwag/anim.asm b/gfx/pokemon/poliwag/anim.asm index 8446897c0..42c6ea774 100644 --- a/gfx/pokemon/poliwag/anim.asm +++ b/gfx/pokemon/poliwag/anim.asm @@ -5,4 +5,3 @@ frame 1, 08 dorepeat 3 endanim -; 0xd0c33 diff --git a/gfx/pokemon/poliwag/anim_idle.asm b/gfx/pokemon/poliwag/anim_idle.asm index 839e57e87..db42dcc3b 100644 --- a/gfx/pokemon/poliwag/anim_idle.asm +++ b/gfx/pokemon/poliwag/anim_idle.asm @@ -7,4 +7,3 @@ frame 2, 10 dorepeat 5 endanim -; 0xd1b1d diff --git a/gfx/pokemon/poliwhirl/anim.asm b/gfx/pokemon/poliwhirl/anim.asm index 14cb89029..f36b75d87 100644 --- a/gfx/pokemon/poliwhirl/anim.asm +++ b/gfx/pokemon/poliwhirl/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 2, 16 endanim -; 0xd0c42 diff --git a/gfx/pokemon/poliwhirl/anim_idle.asm b/gfx/pokemon/poliwhirl/anim_idle.asm index 72ba07245..7561e0be7 100644 --- a/gfx/pokemon/poliwhirl/anim_idle.asm +++ b/gfx/pokemon/poliwhirl/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd1b26 diff --git a/gfx/pokemon/poliwrath/anim.asm b/gfx/pokemon/poliwrath/anim.asm index 2b5fb0eef..8a864158f 100644 --- a/gfx/pokemon/poliwrath/anim.asm +++ b/gfx/pokemon/poliwrath/anim.asm @@ -5,4 +5,3 @@ frame 2, 08 dorepeat 3 endanim -; 0xd0c4f diff --git a/gfx/pokemon/poliwrath/anim_idle.asm b/gfx/pokemon/poliwrath/anim_idle.asm index f709ea35c..c4a056b01 100644 --- a/gfx/pokemon/poliwrath/anim_idle.asm +++ b/gfx/pokemon/poliwrath/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1b2f diff --git a/gfx/pokemon/ponyta/anim.asm b/gfx/pokemon/ponyta/anim.asm index 34c3a82b6..68db9d272 100644 --- a/gfx/pokemon/ponyta/anim.asm +++ b/gfx/pokemon/ponyta/anim.asm @@ -7,4 +7,3 @@ frame 0, 06 frame 3, 06 endanim -; 0xd0d18 diff --git a/gfx/pokemon/ponyta/anim_idle.asm b/gfx/pokemon/ponyta/anim_idle.asm index 10c9f42dd..37e81cb0f 100644 --- a/gfx/pokemon/ponyta/anim_idle.asm +++ b/gfx/pokemon/ponyta/anim_idle.asm @@ -2,4 +2,3 @@ frame 0, 06 frame 5, 06 endanim -; 0xd1bc4 diff --git a/gfx/pokemon/porygon/anim.asm b/gfx/pokemon/porygon/anim.asm index 0246a5621..1130a90c5 100644 --- a/gfx/pokemon/porygon/anim.asm +++ b/gfx/pokemon/porygon/anim.asm @@ -6,4 +6,3 @@ frame 2, 06 frame 1, 06 endanim -; 0xd106e diff --git a/gfx/pokemon/porygon/anim_idle.asm b/gfx/pokemon/porygon/anim_idle.asm index 89af5d13f..81583f510 100644 --- a/gfx/pokemon/porygon/anim_idle.asm +++ b/gfx/pokemon/porygon/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd1dfa diff --git a/gfx/pokemon/porygon2/anim.asm b/gfx/pokemon/porygon2/anim.asm index b94920e29..4c9454b8e 100644 --- a/gfx/pokemon/porygon2/anim.asm +++ b/gfx/pokemon/porygon2/anim.asm @@ -4,4 +4,3 @@ frame 0, 06 dorepeat 1 endanim -; 0xd1592 diff --git a/gfx/pokemon/porygon2/anim_idle.asm b/gfx/pokemon/porygon2/anim_idle.asm index b3a029047..68a1d1a79 100644 --- a/gfx/pokemon/porygon2/anim_idle.asm +++ b/gfx/pokemon/porygon2/anim_idle.asm @@ -1,3 +1,2 @@ frame 3, 30 endanim -; 0xd216c diff --git a/gfx/pokemon/primeape/anim.asm b/gfx/pokemon/primeape/anim.asm index a2a427059..af8513e25 100644 --- a/gfx/pokemon/primeape/anim.asm +++ b/gfx/pokemon/primeape/anim.asm @@ -5,4 +5,3 @@ frame 2, 05 frame 3, 25 endanim -; 0xd0c0c diff --git a/gfx/pokemon/primeape/anim_idle.asm b/gfx/pokemon/primeape/anim_idle.asm index 7d1c8a2d7..51fbcca1c 100644 --- a/gfx/pokemon/primeape/anim_idle.asm +++ b/gfx/pokemon/primeape/anim_idle.asm @@ -5,4 +5,3 @@ frame 3, 06 dorepeat 3 endanim -; 0xd1af8 diff --git a/gfx/pokemon/psyduck/anim.asm b/gfx/pokemon/psyduck/anim.asm index da6f3aec6..2d7677a95 100644 --- a/gfx/pokemon/psyduck/anim.asm +++ b/gfx/pokemon/psyduck/anim.asm @@ -5,4 +5,3 @@ frame 2, 14 dorepeat 3 endanim -; 0xd0bdd diff --git a/gfx/pokemon/psyduck/anim_idle.asm b/gfx/pokemon/psyduck/anim_idle.asm index 2fabc5b19..910725fa2 100644 --- a/gfx/pokemon/psyduck/anim_idle.asm +++ b/gfx/pokemon/psyduck/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 10 dorepeat 1 endanim -; 0xd1ad9 diff --git a/gfx/pokemon/pupitar/anim.asm b/gfx/pokemon/pupitar/anim.asm index c3ea44bc9..9b945e438 100644 --- a/gfx/pokemon/pupitar/anim.asm +++ b/gfx/pokemon/pupitar/anim.asm @@ -5,4 +5,3 @@ frame 2, 04 dorepeat 2 endanim -; 0xd164a diff --git a/gfx/pokemon/pupitar/anim_idle.asm b/gfx/pokemon/pupitar/anim_idle.asm index efc0f3bb4..794117de2 100644 --- a/gfx/pokemon/pupitar/anim_idle.asm +++ b/gfx/pokemon/pupitar/anim_idle.asm @@ -4,4 +4,3 @@ frame 2, 04 dorepeat 1 endanim -; 0xd21f6 diff --git a/gfx/pokemon/quagsire/anim.asm b/gfx/pokemon/quagsire/anim.asm index 852780069..b762e54ee 100644 --- a/gfx/pokemon/quagsire/anim.asm +++ b/gfx/pokemon/quagsire/anim.asm @@ -3,4 +3,3 @@ frame 3, 09 frame 4, 09 endanim -; 0xd13a0 diff --git a/gfx/pokemon/quagsire/anim_idle.asm b/gfx/pokemon/quagsire/anim_idle.asm index f5c2ed31b..258c338de 100644 --- a/gfx/pokemon/quagsire/anim_idle.asm +++ b/gfx/pokemon/quagsire/anim_idle.asm @@ -1,4 +1,3 @@ frame 2, 35 frame 1, 08 endanim -; 0xd2034 diff --git a/gfx/pokemon/quilava/anim.asm b/gfx/pokemon/quilava/anim.asm index b5df67978..542b846ac 100644 --- a/gfx/pokemon/quilava/anim.asm +++ b/gfx/pokemon/quilava/anim.asm @@ -6,4 +6,3 @@ frame 0, 10 frame 4, 08 endanim -; 0xd11a3 diff --git a/gfx/pokemon/quilava/anim_idle.asm b/gfx/pokemon/quilava/anim_idle.asm index 09f187796..c4a056b01 100644 --- a/gfx/pokemon/quilava/anim_idle.asm +++ b/gfx/pokemon/quilava/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1ec3 diff --git a/gfx/pokemon/qwilfish/anim.asm b/gfx/pokemon/qwilfish/anim.asm index 6e5d62d04..ca04aad5f 100644 --- a/gfx/pokemon/qwilfish/anim.asm +++ b/gfx/pokemon/qwilfish/anim.asm @@ -5,4 +5,3 @@ frame 3, 11 dorepeat 3 endanim -; 0xd147c diff --git a/gfx/pokemon/qwilfish/anim_idle.asm b/gfx/pokemon/qwilfish/anim_idle.asm index 4330e80cc..2ff20cc7c 100644 --- a/gfx/pokemon/qwilfish/anim_idle.asm +++ b/gfx/pokemon/qwilfish/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 13 dorepeat 1 endanim -; 0xd20b0 diff --git a/gfx/pokemon/raichu/anim.asm b/gfx/pokemon/raichu/anim.asm index a7312c7ae..781c4a86f 100644 --- a/gfx/pokemon/raichu/anim.asm +++ b/gfx/pokemon/raichu/anim.asm @@ -5,4 +5,3 @@ frame 2, 10 frame 1, 08 endanim -; 0xd0a0f diff --git a/gfx/pokemon/raichu/anim_idle.asm b/gfx/pokemon/raichu/anim_idle.asm index 87f07ce9c..95bdae55e 100644 --- a/gfx/pokemon/raichu/anim_idle.asm +++ b/gfx/pokemon/raichu/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 04 frame 4, 04 endanim -; 0xd19c3 diff --git a/gfx/pokemon/raikou/anim.asm b/gfx/pokemon/raikou/anim.asm index 91931b3ef..d178a1897 100644 --- a/gfx/pokemon/raikou/anim.asm +++ b/gfx/pokemon/raikou/anim.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 2, 35 endanim -; 0xd1614 diff --git a/gfx/pokemon/raikou/anim_idle.asm b/gfx/pokemon/raikou/anim_idle.asm index ec54577cd..e3944e87e 100644 --- a/gfx/pokemon/raikou/anim_idle.asm +++ b/gfx/pokemon/raikou/anim_idle.asm @@ -5,4 +5,3 @@ frame 6, 05 frame 4, 30 endanim -; 0xd21ce diff --git a/gfx/pokemon/rapidash/anim.asm b/gfx/pokemon/rapidash/anim.asm index 6fe29db8f..4bebac366 100644 --- a/gfx/pokemon/rapidash/anim.asm +++ b/gfx/pokemon/rapidash/anim.asm @@ -11,4 +11,3 @@ frame 3, 12 dorepeat 9 endanim -; 0xd0d31 diff --git a/gfx/pokemon/rapidash/anim_idle.asm b/gfx/pokemon/rapidash/anim_idle.asm index 0105673c9..ae6a4e5e5 100644 --- a/gfx/pokemon/rapidash/anim_idle.asm +++ b/gfx/pokemon/rapidash/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 06 frame 4, 06 endanim -; 0xd1bcd diff --git a/gfx/pokemon/raticate/anim.asm b/gfx/pokemon/raticate/anim.asm index ad6450f27..6707340d0 100644 --- a/gfx/pokemon/raticate/anim.asm +++ b/gfx/pokemon/raticate/anim.asm @@ -4,4 +4,3 @@ frame 1, 04 dorepeat 2 endanim -; 0xd09a3 diff --git a/gfx/pokemon/raticate/anim_idle.asm b/gfx/pokemon/raticate/anim_idle.asm index 3ff83aa1c..bd7502133 100644 --- a/gfx/pokemon/raticate/anim_idle.asm +++ b/gfx/pokemon/raticate/anim_idle.asm @@ -7,4 +7,3 @@ frame 1, 04 dorepeat 5 endanim -; 0xd197b diff --git a/gfx/pokemon/rattata/anim.asm b/gfx/pokemon/rattata/anim.asm index 0c72f16f9..c046396df 100644 --- a/gfx/pokemon/rattata/anim.asm +++ b/gfx/pokemon/rattata/anim.asm @@ -7,4 +7,3 @@ frame 4, 05 dorepeat 5 endanim -; 0xd0998 diff --git a/gfx/pokemon/rattata/anim_idle.asm b/gfx/pokemon/rattata/anim_idle.asm index a760b136e..e31ce4774 100644 --- a/gfx/pokemon/rattata/anim_idle.asm +++ b/gfx/pokemon/rattata/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd196a diff --git a/gfx/pokemon/remoraid/anim.asm b/gfx/pokemon/remoraid/anim.asm index 5fca75d12..1d8608d41 100644 --- a/gfx/pokemon/remoraid/anim.asm +++ b/gfx/pokemon/remoraid/anim.asm @@ -2,4 +2,3 @@ frame 2, 10 frame 3, 10 endanim -; 0xd1508 diff --git a/gfx/pokemon/remoraid/anim_idle.asm b/gfx/pokemon/remoraid/anim_idle.asm index cb14bb7a7..3e2b121c1 100644 --- a/gfx/pokemon/remoraid/anim_idle.asm +++ b/gfx/pokemon/remoraid/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 07 dorepeat 1 endanim -; 0xd2114 diff --git a/gfx/pokemon/rhydon/anim.asm b/gfx/pokemon/rhydon/anim.asm index 77d736a55..1ae10cbb3 100644 --- a/gfx/pokemon/rhydon/anim.asm +++ b/gfx/pokemon/rhydon/anim.asm @@ -7,4 +7,3 @@ frame 2, 02 dorepeat 5 endanim -; 0xd0f15 diff --git a/gfx/pokemon/rhydon/anim_idle.asm b/gfx/pokemon/rhydon/anim_idle.asm index b572a54ed..b7c3a8f8b 100644 --- a/gfx/pokemon/rhydon/anim_idle.asm +++ b/gfx/pokemon/rhydon/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1d0d diff --git a/gfx/pokemon/rhyhorn/anim.asm b/gfx/pokemon/rhyhorn/anim.asm index b966557c4..cd944b3d0 100644 --- a/gfx/pokemon/rhyhorn/anim.asm +++ b/gfx/pokemon/rhyhorn/anim.asm @@ -2,4 +2,3 @@ frame 2, 13 frame 1, 40 endanim -; 0xd0f04 diff --git a/gfx/pokemon/rhyhorn/anim_idle.asm b/gfx/pokemon/rhyhorn/anim_idle.asm index 66e53642e..ad96a4b54 100644 --- a/gfx/pokemon/rhyhorn/anim_idle.asm +++ b/gfx/pokemon/rhyhorn/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 13 dorepeat 1 endanim -; 0xd1d04 diff --git a/gfx/pokemon/sandshrew/anim.asm b/gfx/pokemon/sandshrew/anim.asm index 01827dda4..baf231c60 100644 --- a/gfx/pokemon/sandshrew/anim.asm +++ b/gfx/pokemon/sandshrew/anim.asm @@ -10,4 +10,3 @@ frame 4, 05 dorepeat 8 endanim -; 0xd0a26 diff --git a/gfx/pokemon/sandshrew/anim_idle.asm b/gfx/pokemon/sandshrew/anim_idle.asm index 545b445bd..544397943 100644 --- a/gfx/pokemon/sandshrew/anim_idle.asm +++ b/gfx/pokemon/sandshrew/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 4, 13 endanim -; 0xd19ce diff --git a/gfx/pokemon/sandslash/anim.asm b/gfx/pokemon/sandslash/anim.asm index 040c0c429..0e20b7720 100644 --- a/gfx/pokemon/sandslash/anim.asm +++ b/gfx/pokemon/sandslash/anim.asm @@ -7,4 +7,3 @@ frame 4, 07 frame 2, 08 endanim -; 0xd0a37 diff --git a/gfx/pokemon/sandslash/anim_idle.asm b/gfx/pokemon/sandslash/anim_idle.asm index b3480762d..730144654 100644 --- a/gfx/pokemon/sandslash/anim_idle.asm +++ b/gfx/pokemon/sandslash/anim_idle.asm @@ -3,4 +3,3 @@ frame 0, 04 frame 3, 04 endanim -; 0xd19d7 diff --git a/gfx/pokemon/scizor/anim.asm b/gfx/pokemon/scizor/anim.asm index d269c91d1..9edfaa902 100644 --- a/gfx/pokemon/scizor/anim.asm +++ b/gfx/pokemon/scizor/anim.asm @@ -7,4 +7,3 @@ dorepeat 3 frame 6, 18 endanim -; 0xd148d diff --git a/gfx/pokemon/scizor/anim_idle.asm b/gfx/pokemon/scizor/anim_idle.asm index 744d6cafc..cf66cab97 100644 --- a/gfx/pokemon/scizor/anim_idle.asm +++ b/gfx/pokemon/scizor/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd20b9 diff --git a/gfx/pokemon/scyther/anim.asm b/gfx/pokemon/scyther/anim.asm index 572161065..26822a244 100644 --- a/gfx/pokemon/scyther/anim.asm +++ b/gfx/pokemon/scyther/anim.asm @@ -6,4 +6,3 @@ frame 5, 04 dorepeat 4 endanim -; 0xd0fa8 diff --git a/gfx/pokemon/scyther/anim_idle.asm b/gfx/pokemon/scyther/anim_idle.asm index e251a964d..2c7f8593a 100644 --- a/gfx/pokemon/scyther/anim_idle.asm +++ b/gfx/pokemon/scyther/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 04 dorepeat 1 endanim -; 0xd1d78 diff --git a/gfx/pokemon/seadra/anim.asm b/gfx/pokemon/seadra/anim.asm index d06adbdb0..b5e4aa4bd 100644 --- a/gfx/pokemon/seadra/anim.asm +++ b/gfx/pokemon/seadra/anim.asm @@ -4,4 +4,3 @@ frame 2, 10 dorepeat 1 endanim -; 0xd0f54 diff --git a/gfx/pokemon/seadra/anim_idle.asm b/gfx/pokemon/seadra/anim_idle.asm index d4c171276..34165feec 100644 --- a/gfx/pokemon/seadra/anim_idle.asm +++ b/gfx/pokemon/seadra/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 10 dorepeat 1 endanim -; 0xd1d40 diff --git a/gfx/pokemon/seaking/anim.asm b/gfx/pokemon/seaking/anim.asm index a147346e2..76dec6e5d 100644 --- a/gfx/pokemon/seaking/anim.asm +++ b/gfx/pokemon/seaking/anim.asm @@ -4,4 +4,3 @@ frame 2, 12 dorepeat 1 endanim -; 0xd0f6c diff --git a/gfx/pokemon/seaking/anim_idle.asm b/gfx/pokemon/seaking/anim_idle.asm index 3d949a4bb..ec0b06003 100644 --- a/gfx/pokemon/seaking/anim_idle.asm +++ b/gfx/pokemon/seaking/anim_idle.asm @@ -4,4 +4,3 @@ frame 4, 15 dorepeat 1 endanim -; 0xd1d54 diff --git a/gfx/pokemon/seel/anim.asm b/gfx/pokemon/seel/anim.asm index ea92a35be..bb98ac085 100644 --- a/gfx/pokemon/seel/anim.asm +++ b/gfx/pokemon/seel/anim.asm @@ -5,4 +5,3 @@ frame 1, 10 dorepeat 3 endanim -; 0xd0d9f diff --git a/gfx/pokemon/seel/anim_idle.asm b/gfx/pokemon/seel/anim_idle.asm index c601e55e5..ef4561990 100644 --- a/gfx/pokemon/seel/anim_idle.asm +++ b/gfx/pokemon/seel/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 06 dorepeat 2 endanim -; 0xd1c1b diff --git a/gfx/pokemon/sentret/anim.asm b/gfx/pokemon/sentret/anim.asm index 8080c7303..3a5d02370 100644 --- a/gfx/pokemon/sentret/anim.asm +++ b/gfx/pokemon/sentret/anim.asm @@ -3,4 +3,3 @@ frame 1, 15 dorepeat 1 endanim -; 0xd11e6 diff --git a/gfx/pokemon/sentret/anim_idle.asm b/gfx/pokemon/sentret/anim_idle.asm index 9fcaecad0..56d5ae829 100644 --- a/gfx/pokemon/sentret/anim_idle.asm +++ b/gfx/pokemon/sentret/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 07 dorepeat 1 endanim -; 0xd1ef2 diff --git a/gfx/pokemon/shellder/anim.asm b/gfx/pokemon/shellder/anim.asm index 71aa3d358..6968ec667 100644 --- a/gfx/pokemon/shellder/anim.asm +++ b/gfx/pokemon/shellder/anim.asm @@ -3,4 +3,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd0dc5 diff --git a/gfx/pokemon/shellder/anim_idle.asm b/gfx/pokemon/shellder/anim_idle.asm index c32e9d19c..e01b67089 100644 --- a/gfx/pokemon/shellder/anim_idle.asm +++ b/gfx/pokemon/shellder/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1c49 diff --git a/gfx/pokemon/shuckle/anim.asm b/gfx/pokemon/shuckle/anim.asm index 148d2bf7d..56b962447 100644 --- a/gfx/pokemon/shuckle/anim.asm +++ b/gfx/pokemon/shuckle/anim.asm @@ -7,4 +7,3 @@ frame 4, 05 dorepeat 5 endanim -; 0xd149e diff --git a/gfx/pokemon/shuckle/anim_idle.asm b/gfx/pokemon/shuckle/anim_idle.asm index 4dd072951..936e90ea1 100644 --- a/gfx/pokemon/shuckle/anim_idle.asm +++ b/gfx/pokemon/shuckle/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd20c2 diff --git a/gfx/pokemon/skarmory/anim.asm b/gfx/pokemon/skarmory/anim.asm index 64c2bfaf0..315ad5e5e 100644 --- a/gfx/pokemon/skarmory/anim.asm +++ b/gfx/pokemon/skarmory/anim.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 1, 08 endanim -; 0xd1544 diff --git a/gfx/pokemon/skarmory/anim_idle.asm b/gfx/pokemon/skarmory/anim_idle.asm index 1853c881f..4cf1be2b0 100644 --- a/gfx/pokemon/skarmory/anim_idle.asm +++ b/gfx/pokemon/skarmory/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd2138 diff --git a/gfx/pokemon/skiploom/anim.asm b/gfx/pokemon/skiploom/anim.asm index 2ab6422e5..6b4f9f79e 100644 --- a/gfx/pokemon/skiploom/anim.asm +++ b/gfx/pokemon/skiploom/anim.asm @@ -3,4 +3,3 @@ frame 2, 14 frame 3, 14 endanim -; 0xd1357 diff --git a/gfx/pokemon/skiploom/anim_idle.asm b/gfx/pokemon/skiploom/anim_idle.asm index d26d1717e..b7c3a8f8b 100644 --- a/gfx/pokemon/skiploom/anim_idle.asm +++ b/gfx/pokemon/skiploom/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1ff9 diff --git a/gfx/pokemon/slowbro/anim.asm b/gfx/pokemon/slowbro/anim.asm index cc288a464..f2c809ec7 100644 --- a/gfx/pokemon/slowbro/anim.asm +++ b/gfx/pokemon/slowbro/anim.asm @@ -10,4 +10,3 @@ frame 0, 10 frame 4, 10 endanim -; 0xd0d4f diff --git a/gfx/pokemon/slowbro/anim_idle.asm b/gfx/pokemon/slowbro/anim_idle.asm index 9e793ee00..cf66cab97 100644 --- a/gfx/pokemon/slowbro/anim_idle.asm +++ b/gfx/pokemon/slowbro/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1bd9 diff --git a/gfx/pokemon/slowking/anim.asm b/gfx/pokemon/slowking/anim.asm index d7ab700bd..3ecdf5932 100644 --- a/gfx/pokemon/slowking/anim.asm +++ b/gfx/pokemon/slowking/anim.asm @@ -8,4 +8,3 @@ frame 1, 06 dorepeat 6 endanim -; 0xd13e2 diff --git a/gfx/pokemon/slowking/anim_idle.asm b/gfx/pokemon/slowking/anim_idle.asm index 36fd7cd7a..63de841b2 100644 --- a/gfx/pokemon/slowking/anim_idle.asm +++ b/gfx/pokemon/slowking/anim_idle.asm @@ -1,4 +1,3 @@ frame 1, 07 frame 2, 50 endanim -; 0xd2054 diff --git a/gfx/pokemon/slowpoke/anim.asm b/gfx/pokemon/slowpoke/anim.asm index fa391743c..eff22bbc2 100644 --- a/gfx/pokemon/slowpoke/anim.asm +++ b/gfx/pokemon/slowpoke/anim.asm @@ -2,4 +2,3 @@ frame 2, 28 frame 1, 10 endanim -; 0xd0d38 diff --git a/gfx/pokemon/slowpoke/anim_idle.asm b/gfx/pokemon/slowpoke/anim_idle.asm index 805a281c5..63ef32f7c 100644 --- a/gfx/pokemon/slowpoke/anim_idle.asm +++ b/gfx/pokemon/slowpoke/anim_idle.asm @@ -1,3 +1,2 @@ frame 3, 20 endanim -; 0xd1bd0 diff --git a/gfx/pokemon/slugma/anim.asm b/gfx/pokemon/slugma/anim.asm index 1c867ec37..da3f2f4ff 100644 --- a/gfx/pokemon/slugma/anim.asm +++ b/gfx/pokemon/slugma/anim.asm @@ -7,4 +7,3 @@ frame 8, 06 frame 0, 14 endanim -; 0xd14d9 diff --git a/gfx/pokemon/slugma/anim_idle.asm b/gfx/pokemon/slugma/anim_idle.asm index 5bfe4e799..5721310cf 100644 --- a/gfx/pokemon/slugma/anim_idle.asm +++ b/gfx/pokemon/slugma/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd20ed diff --git a/gfx/pokemon/smeargle/anim.asm b/gfx/pokemon/smeargle/anim.asm index 2144197fc..c91168b7a 100644 --- a/gfx/pokemon/smeargle/anim.asm +++ b/gfx/pokemon/smeargle/anim.asm @@ -4,4 +4,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd15ac diff --git a/gfx/pokemon/smeargle/anim_idle.asm b/gfx/pokemon/smeargle/anim_idle.asm index 178b14959..e991ac49f 100644 --- a/gfx/pokemon/smeargle/anim_idle.asm +++ b/gfx/pokemon/smeargle/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd217e diff --git a/gfx/pokemon/smoochum/anim.asm b/gfx/pokemon/smoochum/anim.asm index 39f5e7ebe..ce9aec6ac 100644 --- a/gfx/pokemon/smoochum/anim.asm +++ b/gfx/pokemon/smoochum/anim.asm @@ -2,4 +2,3 @@ frame 2, 08 frame 3, 24 endanim -; 0xd15cd diff --git a/gfx/pokemon/smoochum/anim_idle.asm b/gfx/pokemon/smoochum/anim_idle.asm index 5ba02f113..269e3fad3 100644 --- a/gfx/pokemon/smoochum/anim_idle.asm +++ b/gfx/pokemon/smoochum/anim_idle.asm @@ -3,4 +3,3 @@ frame 1, 06 dorepeat 1 endanim -; 0xd219b diff --git a/gfx/pokemon/sneasel/anim.asm b/gfx/pokemon/sneasel/anim.asm index 5b7f3fb79..7e50e4d73 100644 --- a/gfx/pokemon/sneasel/anim.asm +++ b/gfx/pokemon/sneasel/anim.asm @@ -1,4 +1,3 @@ frame 1, 04 frame 2, 30 endanim -; 0xd14aa diff --git a/gfx/pokemon/sneasel/anim_idle.asm b/gfx/pokemon/sneasel/anim_idle.asm index 1d3e3a41d..5c0fc9f55 100644 --- a/gfx/pokemon/sneasel/anim_idle.asm +++ b/gfx/pokemon/sneasel/anim_idle.asm @@ -2,4 +2,3 @@ frame 0, 09 frame 4, 08 endanim -; 0xd20d2 diff --git a/gfx/pokemon/snorlax/anim.asm b/gfx/pokemon/snorlax/anim.asm index 3825f3bca..76c76173f 100644 --- a/gfx/pokemon/snorlax/anim.asm +++ b/gfx/pokemon/snorlax/anim.asm @@ -7,4 +7,3 @@ frame 3, 09 dorepeat 5 endanim -; 0xd10b2 diff --git a/gfx/pokemon/snorlax/anim_idle.asm b/gfx/pokemon/snorlax/anim_idle.asm index 4969f8f1f..448408fe7 100644 --- a/gfx/pokemon/snorlax/anim_idle.asm +++ b/gfx/pokemon/snorlax/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 10 dorepeat 1 endanim -; 0xd1e34 diff --git a/gfx/pokemon/snubbull/anim.asm b/gfx/pokemon/snubbull/anim.asm index d97f9b354..de1e22ed2 100644 --- a/gfx/pokemon/snubbull/anim.asm +++ b/gfx/pokemon/snubbull/anim.asm @@ -8,4 +8,3 @@ frame 0, 08 dorepeat 6 endanim -; 0xd1462 diff --git a/gfx/pokemon/snubbull/anim_idle.asm b/gfx/pokemon/snubbull/anim_idle.asm index 08cae5b71..4b4e09954 100644 --- a/gfx/pokemon/snubbull/anim_idle.asm +++ b/gfx/pokemon/snubbull/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 12 dorepeat 1 endanim -; 0xd209e diff --git a/gfx/pokemon/spearow/anim.asm b/gfx/pokemon/spearow/anim.asm index 35780c784..ac9318690 100644 --- a/gfx/pokemon/spearow/anim.asm +++ b/gfx/pokemon/spearow/anim.asm @@ -8,4 +8,3 @@ frame 4, 04 dorepeat 6 endanim -; 0xd09b6 diff --git a/gfx/pokemon/spearow/anim_idle.asm b/gfx/pokemon/spearow/anim_idle.asm index ed487ecc3..060340de6 100644 --- a/gfx/pokemon/spearow/anim_idle.asm +++ b/gfx/pokemon/spearow/anim_idle.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 6, 07 endanim -; 0xd1986 diff --git a/gfx/pokemon/spinarak/anim.asm b/gfx/pokemon/spinarak/anim.asm index be299fc49..ecc0e85e8 100644 --- a/gfx/pokemon/spinarak/anim.asm +++ b/gfx/pokemon/spinarak/anim.asm @@ -5,4 +5,3 @@ frame 3, 05 dorepeat 3 endanim -; 0xd1240 diff --git a/gfx/pokemon/spinarak/anim_idle.asm b/gfx/pokemon/spinarak/anim_idle.asm index c605578ef..cf66cab97 100644 --- a/gfx/pokemon/spinarak/anim_idle.asm +++ b/gfx/pokemon/spinarak/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1f2e diff --git a/gfx/pokemon/squirtle/anim.asm b/gfx/pokemon/squirtle/anim.asm index 9969d4263..2b2072d21 100644 --- a/gfx/pokemon/squirtle/anim.asm +++ b/gfx/pokemon/squirtle/anim.asm @@ -7,4 +7,3 @@ frame 3, 15 frame 4, 05 endanim -; 0xd08f2 diff --git a/gfx/pokemon/squirtle/anim_idle.asm b/gfx/pokemon/squirtle/anim_idle.asm index de24c37a6..7561e0be7 100644 --- a/gfx/pokemon/squirtle/anim_idle.asm +++ b/gfx/pokemon/squirtle/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd18de diff --git a/gfx/pokemon/stantler/anim.asm b/gfx/pokemon/stantler/anim.asm index 8f4c133d8..c4a17df01 100644 --- a/gfx/pokemon/stantler/anim.asm +++ b/gfx/pokemon/stantler/anim.asm @@ -6,4 +6,3 @@ frame 0, 08 frame 2, 08 endanim -; 0xd15a1 diff --git a/gfx/pokemon/stantler/anim_idle.asm b/gfx/pokemon/stantler/anim_idle.asm index 7444d761a..792fead16 100644 --- a/gfx/pokemon/stantler/anim_idle.asm +++ b/gfx/pokemon/stantler/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd2175 diff --git a/gfx/pokemon/starmie/anim.asm b/gfx/pokemon/starmie/anim.asm index c81477807..6fc894b78 100644 --- a/gfx/pokemon/starmie/anim.asm +++ b/gfx/pokemon/starmie/anim.asm @@ -5,4 +5,3 @@ frame 2, 07 frame 3, 07 endanim -; 0xd0f86 diff --git a/gfx/pokemon/starmie/anim_idle.asm b/gfx/pokemon/starmie/anim_idle.asm index 7508e6e10..0560a4280 100644 --- a/gfx/pokemon/starmie/anim_idle.asm +++ b/gfx/pokemon/starmie/anim_idle.asm @@ -2,4 +2,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1d66 diff --git a/gfx/pokemon/staryu/anim.asm b/gfx/pokemon/staryu/anim.asm index d257949e7..02c65458d 100644 --- a/gfx/pokemon/staryu/anim.asm +++ b/gfx/pokemon/staryu/anim.asm @@ -5,4 +5,3 @@ frame 3, 04 frame 2, 04 endanim -; 0xd0f79 diff --git a/gfx/pokemon/staryu/anim_idle.asm b/gfx/pokemon/staryu/anim_idle.asm index 184806574..d61a8b356 100644 --- a/gfx/pokemon/staryu/anim_idle.asm +++ b/gfx/pokemon/staryu/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 04 dorepeat 1 endanim -; 0xd1d5f diff --git a/gfx/pokemon/steelix/anim.asm b/gfx/pokemon/steelix/anim.asm index 9acb2af0a..5b6a63c64 100644 --- a/gfx/pokemon/steelix/anim.asm +++ b/gfx/pokemon/steelix/anim.asm @@ -4,4 +4,3 @@ frame 2, 08 frame 1, 06 endanim -; 0xd144f diff --git a/gfx/pokemon/steelix/anim_idle.asm b/gfx/pokemon/steelix/anim_idle.asm index 3c1de78fb..cf66cab97 100644 --- a/gfx/pokemon/steelix/anim_idle.asm +++ b/gfx/pokemon/steelix/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd2095 diff --git a/gfx/pokemon/sudowoodo/anim.asm b/gfx/pokemon/sudowoodo/anim.asm index 8e974a074..0e78f3017 100644 --- a/gfx/pokemon/sudowoodo/anim.asm +++ b/gfx/pokemon/sudowoodo/anim.asm @@ -5,4 +5,3 @@ frame 1, 10 dorepeat 1 endanim -; 0xd1336 diff --git a/gfx/pokemon/sudowoodo/anim_idle.asm b/gfx/pokemon/sudowoodo/anim_idle.asm index e42e960f9..ebed78bc3 100644 --- a/gfx/pokemon/sudowoodo/anim_idle.asm +++ b/gfx/pokemon/sudowoodo/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 09 dorepeat 1 endanim -; 0xd1fdc diff --git a/gfx/pokemon/suicune/anim.asm b/gfx/pokemon/suicune/anim.asm index 0f2528116..b44b77ff3 100644 --- a/gfx/pokemon/suicune/anim.asm +++ b/gfx/pokemon/suicune/anim.asm @@ -10,4 +10,3 @@ frame 0, 03 dorepeat 6 endanim -; 0xd1634 diff --git a/gfx/pokemon/suicune/anim_idle.asm b/gfx/pokemon/suicune/anim_idle.asm index 9e018683a..82df78d5e 100644 --- a/gfx/pokemon/suicune/anim_idle.asm +++ b/gfx/pokemon/suicune/anim_idle.asm @@ -4,4 +4,3 @@ frame 9, 06 dorepeat 2 endanim -; 0xd21e2 diff --git a/gfx/pokemon/sunflora/anim.asm b/gfx/pokemon/sunflora/anim.asm index aad8ddadd..32eade1b7 100644 --- a/gfx/pokemon/sunflora/anim.asm +++ b/gfx/pokemon/sunflora/anim.asm @@ -2,4 +2,3 @@ frame 2, 06 frame 3, 16 endanim -; 0xd137b diff --git a/gfx/pokemon/sunflora/anim_idle.asm b/gfx/pokemon/sunflora/anim_idle.asm index e78d5449e..cf66cab97 100644 --- a/gfx/pokemon/sunflora/anim_idle.asm +++ b/gfx/pokemon/sunflora/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd201d diff --git a/gfx/pokemon/sunkern/anim.asm b/gfx/pokemon/sunkern/anim.asm index c282b1fb2..b5d20276b 100644 --- a/gfx/pokemon/sunkern/anim.asm +++ b/gfx/pokemon/sunkern/anim.asm @@ -4,4 +4,3 @@ frame 2, 04 dorepeat 2 endanim -; 0xd1374 diff --git a/gfx/pokemon/sunkern/anim_idle.asm b/gfx/pokemon/sunkern/anim_idle.asm index f92d267a1..c4a056b01 100644 --- a/gfx/pokemon/sunkern/anim_idle.asm +++ b/gfx/pokemon/sunkern/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd2014 diff --git a/gfx/pokemon/swinub/anim.asm b/gfx/pokemon/swinub/anim.asm index f1d93138a..6fedf291a 100644 --- a/gfx/pokemon/swinub/anim.asm +++ b/gfx/pokemon/swinub/anim.asm @@ -4,4 +4,3 @@ frame 2, 09 dorepeat 2 endanim -; 0xd14ef diff --git a/gfx/pokemon/swinub/anim_idle.asm b/gfx/pokemon/swinub/anim_idle.asm index 5fe97a2ba..81583f510 100644 --- a/gfx/pokemon/swinub/anim_idle.asm +++ b/gfx/pokemon/swinub/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd20f9 diff --git a/gfx/pokemon/tangela/anim.asm b/gfx/pokemon/tangela/anim.asm index 57a237afe..83ef5b724 100644 --- a/gfx/pokemon/tangela/anim.asm +++ b/gfx/pokemon/tangela/anim.asm @@ -2,4 +2,3 @@ frame 0, 24 frame 2, 10 endanim -; 0xd0f2d diff --git a/gfx/pokemon/tangela/anim_idle.asm b/gfx/pokemon/tangela/anim_idle.asm index 7d8b2550f..93bb36fb2 100644 --- a/gfx/pokemon/tangela/anim_idle.asm +++ b/gfx/pokemon/tangela/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 06 dorepeat 1 endanim -; 0xd1d1f diff --git a/gfx/pokemon/tauros/anim.asm b/gfx/pokemon/tauros/anim.asm index 52c9264c3..2fc758437 100644 --- a/gfx/pokemon/tauros/anim.asm +++ b/gfx/pokemon/tauros/anim.asm @@ -8,4 +8,3 @@ dorepeat 5 frame 1, 07 endanim -; 0xd0ff7 diff --git a/gfx/pokemon/tauros/anim_idle.asm b/gfx/pokemon/tauros/anim_idle.asm index ab6608d0d..ac0d93c61 100644 --- a/gfx/pokemon/tauros/anim_idle.asm +++ b/gfx/pokemon/tauros/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd1da5 diff --git a/gfx/pokemon/teddiursa/anim.asm b/gfx/pokemon/teddiursa/anim.asm index 78bbeae60..3491331fa 100644 --- a/gfx/pokemon/teddiursa/anim.asm +++ b/gfx/pokemon/teddiursa/anim.asm @@ -6,4 +6,3 @@ frame 3, 10 dorepeat 4 endanim -; 0xd14b9 diff --git a/gfx/pokemon/teddiursa/anim_idle.asm b/gfx/pokemon/teddiursa/anim_idle.asm index 85cae5284..ac0d93c61 100644 --- a/gfx/pokemon/teddiursa/anim_idle.asm +++ b/gfx/pokemon/teddiursa/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 06 dorepeat 1 endanim -; 0xd20db diff --git a/gfx/pokemon/tentacool/anim.asm b/gfx/pokemon/tentacool/anim.asm index 19b7d3a14..72da38556 100644 --- a/gfx/pokemon/tentacool/anim.asm +++ b/gfx/pokemon/tentacool/anim.asm @@ -3,4 +3,3 @@ frame 4, 10 frame 5, 16 endanim -; 0xd0cd3 diff --git a/gfx/pokemon/tentacool/anim_idle.asm b/gfx/pokemon/tentacool/anim_idle.asm index 4e9ba0b11..792fead16 100644 --- a/gfx/pokemon/tentacool/anim_idle.asm +++ b/gfx/pokemon/tentacool/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 08 dorepeat 1 endanim -; 0xd1b95 diff --git a/gfx/pokemon/tentacruel/anim.asm b/gfx/pokemon/tentacruel/anim.asm index 4fed8e9d4..0aeaa2969 100644 --- a/gfx/pokemon/tentacruel/anim.asm +++ b/gfx/pokemon/tentacruel/anim.asm @@ -4,4 +4,3 @@ dorepeat 1 frame 2, 08 endanim -; 0xd0cde diff --git a/gfx/pokemon/tentacruel/anim_idle.asm b/gfx/pokemon/tentacruel/anim_idle.asm index fd8d510b4..f0f2ae343 100644 --- a/gfx/pokemon/tentacruel/anim_idle.asm +++ b/gfx/pokemon/tentacruel/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 03 dorepeat 2 endanim -; 0xd1ba0 diff --git a/gfx/pokemon/togepi/anim.asm b/gfx/pokemon/togepi/anim.asm index a09192323..56c5c2123 100644 --- a/gfx/pokemon/togepi/anim.asm +++ b/gfx/pokemon/togepi/anim.asm @@ -5,4 +5,3 @@ frame 0, 06 frame 2, 06 endanim -; 0xd12a6 diff --git a/gfx/pokemon/togepi/anim_idle.asm b/gfx/pokemon/togepi/anim_idle.asm index e3bd76591..93bb36fb2 100644 --- a/gfx/pokemon/togepi/anim_idle.asm +++ b/gfx/pokemon/togepi/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 06 dorepeat 1 endanim -; 0xd1f7a diff --git a/gfx/pokemon/togetic/anim.asm b/gfx/pokemon/togetic/anim.asm index cd1ac8f9b..1ed0353ff 100644 --- a/gfx/pokemon/togetic/anim.asm +++ b/gfx/pokemon/togetic/anim.asm @@ -5,4 +5,3 @@ frame 4, 09 dorepeat 3 endanim -; 0xd12b3 diff --git a/gfx/pokemon/togetic/anim_idle.asm b/gfx/pokemon/togetic/anim_idle.asm index 543befa82..c4a056b01 100644 --- a/gfx/pokemon/togetic/anim_idle.asm +++ b/gfx/pokemon/togetic/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1f83 diff --git a/gfx/pokemon/totodile/anim.asm b/gfx/pokemon/totodile/anim.asm index c320f4646..cf77dd699 100644 --- a/gfx/pokemon/totodile/anim.asm +++ b/gfx/pokemon/totodile/anim.asm @@ -7,4 +7,3 @@ frame 2, 10 dorepeat 5 endanim -; 0xd11c7 diff --git a/gfx/pokemon/totodile/anim_idle.asm b/gfx/pokemon/totodile/anim_idle.asm index 35379db93..52df376f0 100644 --- a/gfx/pokemon/totodile/anim_idle.asm +++ b/gfx/pokemon/totodile/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 06 dorepeat 2 endanim -; 0xd1ed7 diff --git a/gfx/pokemon/typhlosion/anim.asm b/gfx/pokemon/typhlosion/anim.asm index bb4b30d6c..576e73373 100644 --- a/gfx/pokemon/typhlosion/anim.asm +++ b/gfx/pokemon/typhlosion/anim.asm @@ -8,4 +8,3 @@ frame 1, 03 dorepeat 6 endanim -; 0xd11b6 diff --git a/gfx/pokemon/typhlosion/anim_idle.asm b/gfx/pokemon/typhlosion/anim_idle.asm index 2f7ed3abc..4da4517c5 100644 --- a/gfx/pokemon/typhlosion/anim_idle.asm +++ b/gfx/pokemon/typhlosion/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 08 dorepeat 1 endanim -; 0xd1ecc diff --git a/gfx/pokemon/tyranitar/anim.asm b/gfx/pokemon/tyranitar/anim.asm index f345bdd8e..c665e088f 100644 --- a/gfx/pokemon/tyranitar/anim.asm +++ b/gfx/pokemon/tyranitar/anim.asm @@ -6,4 +6,3 @@ frame 0, 16 frame 4, 16 endanim -; 0xd1659 diff --git a/gfx/pokemon/tyranitar/anim_idle.asm b/gfx/pokemon/tyranitar/anim_idle.asm index 29788fd1d..5721310cf 100644 --- a/gfx/pokemon/tyranitar/anim_idle.asm +++ b/gfx/pokemon/tyranitar/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 08 dorepeat 1 endanim -; 0xd21ff diff --git a/gfx/pokemon/tyrogue/anim.asm b/gfx/pokemon/tyrogue/anim.asm index e1470d816..3c8a3ee8b 100644 --- a/gfx/pokemon/tyrogue/anim.asm +++ b/gfx/pokemon/tyrogue/anim.asm @@ -4,4 +4,3 @@ frame 3, 06 dorepeat 2 endanim -; 0xd15b7 diff --git a/gfx/pokemon/tyrogue/anim_idle.asm b/gfx/pokemon/tyrogue/anim_idle.asm index da73f62e3..a0c4f2fb1 100644 --- a/gfx/pokemon/tyrogue/anim_idle.asm +++ b/gfx/pokemon/tyrogue/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd2187 diff --git a/gfx/pokemon/umbreon/anim.asm b/gfx/pokemon/umbreon/anim.asm index 541539979..3f0ec81bf 100644 --- a/gfx/pokemon/umbreon/anim.asm +++ b/gfx/pokemon/umbreon/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 2, 30 endanim -; 0xd13be diff --git a/gfx/pokemon/umbreon/anim_idle.asm b/gfx/pokemon/umbreon/anim_idle.asm index adb0158e2..91a8ce13d 100644 --- a/gfx/pokemon/umbreon/anim_idle.asm +++ b/gfx/pokemon/umbreon/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 04 dorepeat 1 endanim -; 0xd2046 diff --git a/gfx/pokemon/unown/anim.asm b/gfx/pokemon/unown/anim.asm index 510d2751c..3756c413d 100644 --- a/gfx/pokemon/unown/anim.asm +++ b/gfx/pokemon/unown/anim.asm @@ -9,4 +9,3 @@ frame 9, 05 frame 10, 05 endanim -; 0xd13fe diff --git a/gfx/pokemon/unown/anim_idle.asm b/gfx/pokemon/unown/anim_idle.asm index 3d0f65488..73db06df1 100644 --- a/gfx/pokemon/unown/anim_idle.asm +++ b/gfx/pokemon/unown/anim_idle.asm @@ -3,4 +3,3 @@ frame 11, 05 dorepeat 1 endanim -; 0xd2066 diff --git a/gfx/pokemon/unown/bitmask.asm b/gfx/pokemon/unown/bitmask.asm index f0ae4e5b2..91a562a1a 100644 --- a/gfx/pokemon/unown/bitmask.asm +++ b/gfx/pokemon/unown/bitmask.asm @@ -28,4 +28,3 @@ db %00010000 db %00000000 db %00000000 -; 0xd36ab diff --git a/gfx/pokemon/unown/frames.asm b/gfx/pokemon/unown/frames.asm index ca996e90a..b176918df 100644 --- a/gfx/pokemon/unown/frames.asm +++ b/gfx/pokemon/unown/frames.asm @@ -42,4 +42,3 @@ .frame11 db $05 ; bitmask db $27 -; 0xd8e5e diff --git a/gfx/pokemon/unown_a/anim.asm b/gfx/pokemon/unown_a/anim.asm index 7243ed0fb..add08b24d 100644 --- a/gfx/pokemon/unown_a/anim.asm +++ b/gfx/pokemon/unown_a/anim.asm @@ -10,4 +10,3 @@ frame 0, 07 dorepeat 6 endanim -; 0xd2274 diff --git a/gfx/pokemon/unown_a/anim_idle.asm b/gfx/pokemon/unown_a/anim_idle.asm index d995ba44d..ec5f6fbcd 100644 --- a/gfx/pokemon/unown_a/anim_idle.asm +++ b/gfx/pokemon/unown_a/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 06 dorepeat 1 endanim -; 0xd240e diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm index ea4d46410..6e8d251d5 100644 --- a/gfx/pokemon/unown_anims.asm +++ b/gfx/pokemon/unown_anims.asm @@ -1,4 +1,5 @@ -UnownAnimations: +UnownAnimations: ; used only for BANK(UnownAnimations) + UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm" UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm" UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm" diff --git a/gfx/pokemon/unown_b/anim.asm b/gfx/pokemon/unown_b/anim.asm index 7683b9e84..abb3bdbfa 100644 --- a/gfx/pokemon/unown_b/anim.asm +++ b/gfx/pokemon/unown_b/anim.asm @@ -6,4 +6,3 @@ frame 5, 04 dorepeat 4 endanim -; 0xd2283 diff --git a/gfx/pokemon/unown_b/anim_idle.asm b/gfx/pokemon/unown_b/anim_idle.asm index b8e03b299..4719fd887 100644 --- a/gfx/pokemon/unown_b/anim_idle.asm +++ b/gfx/pokemon/unown_b/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 04 dorepeat 1 endanim -; 0xd2417 diff --git a/gfx/pokemon/unown_c/anim.asm b/gfx/pokemon/unown_c/anim.asm index 1e8b894ab..8916229c1 100644 --- a/gfx/pokemon/unown_c/anim.asm +++ b/gfx/pokemon/unown_c/anim.asm @@ -6,4 +6,3 @@ frame 2, 04 dorepeat 4 endanim -; 0xd2292 diff --git a/gfx/pokemon/unown_c/anim_idle.asm b/gfx/pokemon/unown_c/anim_idle.asm index fcf07ced3..936e90ea1 100644 --- a/gfx/pokemon/unown_c/anim_idle.asm +++ b/gfx/pokemon/unown_c/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd2420 diff --git a/gfx/pokemon/unown_d/anim.asm b/gfx/pokemon/unown_d/anim.asm index 51c3b2de1..a9a77fef8 100644 --- a/gfx/pokemon/unown_d/anim.asm +++ b/gfx/pokemon/unown_d/anim.asm @@ -5,4 +5,3 @@ frame 0, 08 dorepeat 1 endanim -; 0xd229f diff --git a/gfx/pokemon/unown_d/anim_idle.asm b/gfx/pokemon/unown_d/anim_idle.asm index 17604ce36..8318520e3 100644 --- a/gfx/pokemon/unown_d/anim_idle.asm +++ b/gfx/pokemon/unown_d/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2429 diff --git a/gfx/pokemon/unown_e/anim.asm b/gfx/pokemon/unown_e/anim.asm index 0a58feb4d..3f67806c5 100644 --- a/gfx/pokemon/unown_e/anim.asm +++ b/gfx/pokemon/unown_e/anim.asm @@ -6,4 +6,3 @@ frame 0, 02 dorepeat 4 endanim -; 0xd22ae diff --git a/gfx/pokemon/unown_e/anim_idle.asm b/gfx/pokemon/unown_e/anim_idle.asm index 53db93c1f..8318520e3 100644 --- a/gfx/pokemon/unown_e/anim_idle.asm +++ b/gfx/pokemon/unown_e/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2432 diff --git a/gfx/pokemon/unown_f/anim.asm b/gfx/pokemon/unown_f/anim.asm index f81c298a6..2423675a1 100644 --- a/gfx/pokemon/unown_f/anim.asm +++ b/gfx/pokemon/unown_f/anim.asm @@ -7,4 +7,3 @@ frame 3, 08 dorepeat 5 endanim -; 0xd22bf diff --git a/gfx/pokemon/unown_f/anim_idle.asm b/gfx/pokemon/unown_f/anim_idle.asm index a75176981..936e90ea1 100644 --- a/gfx/pokemon/unown_f/anim_idle.asm +++ b/gfx/pokemon/unown_f/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd243b diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm index 7b7c5bc7e..d5ed3d621 100644 --- a/gfx/pokemon/unown_frames.asm +++ b/gfx/pokemon/unown_frames.asm @@ -1,4 +1,5 @@ -UnownsFrames: +UnownsFrames: ; used only for BANK(UnownsFrames) + UnownAFrames: INCLUDE "gfx/pokemon/unown_a/frames.asm" UnownBFrames: INCLUDE "gfx/pokemon/unown_b/frames.asm" UnownCFrames: INCLUDE "gfx/pokemon/unown_c/frames.asm" diff --git a/gfx/pokemon/unown_g/anim.asm b/gfx/pokemon/unown_g/anim.asm index 48100274f..39310ee33 100644 --- a/gfx/pokemon/unown_g/anim.asm +++ b/gfx/pokemon/unown_g/anim.asm @@ -4,4 +4,3 @@ frame 0, 06 dorepeat 1 endanim -; 0xd22ca diff --git a/gfx/pokemon/unown_g/anim_idle.asm b/gfx/pokemon/unown_g/anim_idle.asm index 45906aed4..8318520e3 100644 --- a/gfx/pokemon/unown_g/anim_idle.asm +++ b/gfx/pokemon/unown_g/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2444 diff --git a/gfx/pokemon/unown_h/anim.asm b/gfx/pokemon/unown_h/anim.asm index fdee3822b..f094dcadb 100644 --- a/gfx/pokemon/unown_h/anim.asm +++ b/gfx/pokemon/unown_h/anim.asm @@ -8,4 +8,3 @@ frame 3, 02 frame 4, 02 endanim -; 0xd22dd diff --git a/gfx/pokemon/unown_h/anim_idle.asm b/gfx/pokemon/unown_h/anim_idle.asm index e6fb90d5e..7561e0be7 100644 --- a/gfx/pokemon/unown_h/anim_idle.asm +++ b/gfx/pokemon/unown_h/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd244d diff --git a/gfx/pokemon/unown_i/anim.asm b/gfx/pokemon/unown_i/anim.asm index 38e19a0c9..8bd24ff25 100644 --- a/gfx/pokemon/unown_i/anim.asm +++ b/gfx/pokemon/unown_i/anim.asm @@ -5,4 +5,3 @@ frame 0, 05 dorepeat 1 endanim -; 0xd22ea diff --git a/gfx/pokemon/unown_i/anim_idle.asm b/gfx/pokemon/unown_i/anim_idle.asm index 1d5ce67ad..8318520e3 100644 --- a/gfx/pokemon/unown_i/anim_idle.asm +++ b/gfx/pokemon/unown_i/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2456 diff --git a/gfx/pokemon/unown_j/anim.asm b/gfx/pokemon/unown_j/anim.asm index 3a7467d45..e93864c00 100644 --- a/gfx/pokemon/unown_j/anim.asm +++ b/gfx/pokemon/unown_j/anim.asm @@ -5,4 +5,3 @@ frame 1, 05 dorepeat 1 endanim -; 0xd22f7 diff --git a/gfx/pokemon/unown_j/anim_idle.asm b/gfx/pokemon/unown_j/anim_idle.asm index d46b36028..8318520e3 100644 --- a/gfx/pokemon/unown_j/anim_idle.asm +++ b/gfx/pokemon/unown_j/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd245f diff --git a/gfx/pokemon/unown_k/anim.asm b/gfx/pokemon/unown_k/anim.asm index 0948f212d..1f707a071 100644 --- a/gfx/pokemon/unown_k/anim.asm +++ b/gfx/pokemon/unown_k/anim.asm @@ -5,4 +5,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd2304 diff --git a/gfx/pokemon/unown_k/anim_idle.asm b/gfx/pokemon/unown_k/anim_idle.asm index 8f8a4acb1..8318520e3 100644 --- a/gfx/pokemon/unown_k/anim_idle.asm +++ b/gfx/pokemon/unown_k/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2468 diff --git a/gfx/pokemon/unown_l/anim.asm b/gfx/pokemon/unown_l/anim.asm index 7b4e5e21c..d724203ca 100644 --- a/gfx/pokemon/unown_l/anim.asm +++ b/gfx/pokemon/unown_l/anim.asm @@ -9,4 +9,3 @@ frame 4, 12 frame 3, 11 endanim -; 0xd2319 diff --git a/gfx/pokemon/unown_l/anim_idle.asm b/gfx/pokemon/unown_l/anim_idle.asm index 859dec2ec..7561e0be7 100644 --- a/gfx/pokemon/unown_l/anim_idle.asm +++ b/gfx/pokemon/unown_l/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd2471 diff --git a/gfx/pokemon/unown_m/anim.asm b/gfx/pokemon/unown_m/anim.asm index bb5292446..150048150 100644 --- a/gfx/pokemon/unown_m/anim.asm +++ b/gfx/pokemon/unown_m/anim.asm @@ -9,4 +9,3 @@ frame 1, 02 dorepeat 5 endanim -; 0xd232e diff --git a/gfx/pokemon/unown_m/anim_idle.asm b/gfx/pokemon/unown_m/anim_idle.asm index 710300f20..8318520e3 100644 --- a/gfx/pokemon/unown_m/anim_idle.asm +++ b/gfx/pokemon/unown_m/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd247a diff --git a/gfx/pokemon/unown_n/anim.asm b/gfx/pokemon/unown_n/anim.asm index 1f6924926..2e8377dff 100644 --- a/gfx/pokemon/unown_n/anim.asm +++ b/gfx/pokemon/unown_n/anim.asm @@ -7,4 +7,3 @@ frame 2, 04 frame 1, 03 endanim -; 0xd233f diff --git a/gfx/pokemon/unown_n/anim_idle.asm b/gfx/pokemon/unown_n/anim_idle.asm index 5275e3463..8318520e3 100644 --- a/gfx/pokemon/unown_n/anim_idle.asm +++ b/gfx/pokemon/unown_n/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2483 diff --git a/gfx/pokemon/unown_o/anim.asm b/gfx/pokemon/unown_o/anim.asm index 581d47b9d..16bc02e0e 100644 --- a/gfx/pokemon/unown_o/anim.asm +++ b/gfx/pokemon/unown_o/anim.asm @@ -5,4 +5,3 @@ frame 1, 10 frame 3, 04 endanim -; 0xd234c diff --git a/gfx/pokemon/unown_o/anim_idle.asm b/gfx/pokemon/unown_o/anim_idle.asm index fec231c84..8318520e3 100644 --- a/gfx/pokemon/unown_o/anim_idle.asm +++ b/gfx/pokemon/unown_o/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd248c diff --git a/gfx/pokemon/unown_p/anim.asm b/gfx/pokemon/unown_p/anim.asm index 0cbaf30ed..84c929db6 100644 --- a/gfx/pokemon/unown_p/anim.asm +++ b/gfx/pokemon/unown_p/anim.asm @@ -2,4 +2,3 @@ frame 2, 36 frame 1, 06 endanim -; 0xd2353 diff --git a/gfx/pokemon/unown_p/anim_idle.asm b/gfx/pokemon/unown_p/anim_idle.asm index 51e0e0941..8318520e3 100644 --- a/gfx/pokemon/unown_p/anim_idle.asm +++ b/gfx/pokemon/unown_p/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd2495 diff --git a/gfx/pokemon/unown_q/anim.asm b/gfx/pokemon/unown_q/anim.asm index 555f61cf3..09b5462f7 100644 --- a/gfx/pokemon/unown_q/anim.asm +++ b/gfx/pokemon/unown_q/anim.asm @@ -5,4 +5,3 @@ frame 1, 05 dorepeat 1 endanim -; 0xd2360 diff --git a/gfx/pokemon/unown_q/anim_idle.asm b/gfx/pokemon/unown_q/anim_idle.asm index a17caa474..8318520e3 100644 --- a/gfx/pokemon/unown_q/anim_idle.asm +++ b/gfx/pokemon/unown_q/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd249e diff --git a/gfx/pokemon/unown_r/anim.asm b/gfx/pokemon/unown_r/anim.asm index fde5a58ab..1f707a071 100644 --- a/gfx/pokemon/unown_r/anim.asm +++ b/gfx/pokemon/unown_r/anim.asm @@ -5,4 +5,3 @@ frame 1, 07 dorepeat 1 endanim -; 0xd236d diff --git a/gfx/pokemon/unown_r/anim_idle.asm b/gfx/pokemon/unown_r/anim_idle.asm index b1db8166a..8318520e3 100644 --- a/gfx/pokemon/unown_r/anim_idle.asm +++ b/gfx/pokemon/unown_r/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24a7 diff --git a/gfx/pokemon/unown_s/anim.asm b/gfx/pokemon/unown_s/anim.asm index 9cac3910d..d662b7dfe 100644 --- a/gfx/pokemon/unown_s/anim.asm +++ b/gfx/pokemon/unown_s/anim.asm @@ -7,4 +7,3 @@ frame 2, 03 dorepeat 5 endanim -; 0xd237e diff --git a/gfx/pokemon/unown_s/anim_idle.asm b/gfx/pokemon/unown_s/anim_idle.asm index 49483f8f5..8318520e3 100644 --- a/gfx/pokemon/unown_s/anim_idle.asm +++ b/gfx/pokemon/unown_s/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24b0 diff --git a/gfx/pokemon/unown_t/anim.asm b/gfx/pokemon/unown_t/anim.asm index feba7be07..8e1d948a2 100644 --- a/gfx/pokemon/unown_t/anim.asm +++ b/gfx/pokemon/unown_t/anim.asm @@ -5,4 +5,3 @@ frame 0, 05 dorepeat 1 endanim -; 0xd238b diff --git a/gfx/pokemon/unown_t/anim_idle.asm b/gfx/pokemon/unown_t/anim_idle.asm index d295d6830..8318520e3 100644 --- a/gfx/pokemon/unown_t/anim_idle.asm +++ b/gfx/pokemon/unown_t/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24b9 diff --git a/gfx/pokemon/unown_u/anim.asm b/gfx/pokemon/unown_u/anim.asm index 12c53636d..8475cb979 100644 --- a/gfx/pokemon/unown_u/anim.asm +++ b/gfx/pokemon/unown_u/anim.asm @@ -3,4 +3,3 @@ frame 2, 14 frame 1, 12 endanim -; 0xd2394 diff --git a/gfx/pokemon/unown_u/anim_idle.asm b/gfx/pokemon/unown_u/anim_idle.asm index 834e75999..8318520e3 100644 --- a/gfx/pokemon/unown_u/anim_idle.asm +++ b/gfx/pokemon/unown_u/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24c2 diff --git a/gfx/pokemon/unown_v/anim.asm b/gfx/pokemon/unown_v/anim.asm index acc500009..75dec7486 100644 --- a/gfx/pokemon/unown_v/anim.asm +++ b/gfx/pokemon/unown_v/anim.asm @@ -3,4 +3,3 @@ frame 2, 10 frame 1, 10 endanim -; 0xd239d diff --git a/gfx/pokemon/unown_v/anim_idle.asm b/gfx/pokemon/unown_v/anim_idle.asm index 818f727ea..8318520e3 100644 --- a/gfx/pokemon/unown_v/anim_idle.asm +++ b/gfx/pokemon/unown_v/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24cb diff --git a/gfx/pokemon/unown_w/anim.asm b/gfx/pokemon/unown_w/anim.asm index 620ff03e5..e46f6d4f8 100644 --- a/gfx/pokemon/unown_w/anim.asm +++ b/gfx/pokemon/unown_w/anim.asm @@ -3,4 +3,3 @@ frame 0, 06 frame 2, 12 endanim -; 0xd23a6 diff --git a/gfx/pokemon/unown_w/anim_idle.asm b/gfx/pokemon/unown_w/anim_idle.asm index b43d44bbc..8318520e3 100644 --- a/gfx/pokemon/unown_w/anim_idle.asm +++ b/gfx/pokemon/unown_w/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24d4 diff --git a/gfx/pokemon/unown_x/anim.asm b/gfx/pokemon/unown_x/anim.asm index 0bb204da6..803892a28 100644 --- a/gfx/pokemon/unown_x/anim.asm +++ b/gfx/pokemon/unown_x/anim.asm @@ -5,4 +5,3 @@ frame 2, 06 dorepeat 1 endanim -; 0xd23b3 diff --git a/gfx/pokemon/unown_x/anim_idle.asm b/gfx/pokemon/unown_x/anim_idle.asm index 22b15a504..8318520e3 100644 --- a/gfx/pokemon/unown_x/anim_idle.asm +++ b/gfx/pokemon/unown_x/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 05 dorepeat 1 endanim -; 0xd24dd diff --git a/gfx/pokemon/unown_y/anim.asm b/gfx/pokemon/unown_y/anim.asm index e65aa4134..21fcd64ab 100644 --- a/gfx/pokemon/unown_y/anim.asm +++ b/gfx/pokemon/unown_y/anim.asm @@ -6,4 +6,3 @@ frame 2, 05 dorepeat 4 endanim -; 0xd23c2 diff --git a/gfx/pokemon/unown_y/anim_idle.asm b/gfx/pokemon/unown_y/anim_idle.asm index e1a9a2acb..936e90ea1 100644 --- a/gfx/pokemon/unown_y/anim_idle.asm +++ b/gfx/pokemon/unown_y/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd24e6 diff --git a/gfx/pokemon/unown_z/anim.asm b/gfx/pokemon/unown_z/anim.asm index 197978f9b..a907ac849 100644 --- a/gfx/pokemon/unown_z/anim.asm +++ b/gfx/pokemon/unown_z/anim.asm @@ -6,4 +6,3 @@ frame 0, 03 frame 3, 03 endanim -; 0xd23d1 diff --git a/gfx/pokemon/unown_z/anim_idle.asm b/gfx/pokemon/unown_z/anim_idle.asm index 4eb7513f6..936e90ea1 100644 --- a/gfx/pokemon/unown_z/anim_idle.asm +++ b/gfx/pokemon/unown_z/anim_idle.asm @@ -3,4 +3,3 @@ frame 4, 05 dorepeat 1 endanim -; 0xd24ef diff --git a/gfx/pokemon/ursaring/anim.asm b/gfx/pokemon/ursaring/anim.asm index f571913ea..06ff8fd7e 100644 --- a/gfx/pokemon/ursaring/anim.asm +++ b/gfx/pokemon/ursaring/anim.asm @@ -6,4 +6,3 @@ dorepeat 3 frame 1, 10 endanim -; 0xd14c8 diff --git a/gfx/pokemon/ursaring/anim_idle.asm b/gfx/pokemon/ursaring/anim_idle.asm index 01ebc0f1a..8989074ca 100644 --- a/gfx/pokemon/ursaring/anim_idle.asm +++ b/gfx/pokemon/ursaring/anim_idle.asm @@ -3,4 +3,3 @@ frame 5, 09 dorepeat 1 endanim -; 0xd20e4 diff --git a/gfx/pokemon/vaporeon/anim.asm b/gfx/pokemon/vaporeon/anim.asm index d13f1dd94..b92a229aa 100644 --- a/gfx/pokemon/vaporeon/anim.asm +++ b/gfx/pokemon/vaporeon/anim.asm @@ -4,4 +4,3 @@ frame 2, 10 dorepeat 2 endanim -; 0xd1043 diff --git a/gfx/pokemon/vaporeon/anim_idle.asm b/gfx/pokemon/vaporeon/anim_idle.asm index 79c386650..faaeffe39 100644 --- a/gfx/pokemon/vaporeon/anim_idle.asm +++ b/gfx/pokemon/vaporeon/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1ddf diff --git a/gfx/pokemon/venomoth/anim.asm b/gfx/pokemon/venomoth/anim.asm index ba6014d59..ec7e2f5fa 100644 --- a/gfx/pokemon/venomoth/anim.asm +++ b/gfx/pokemon/venomoth/anim.asm @@ -3,4 +3,3 @@ frame 1, 06 dorepeat 1 endanim -; 0xd0b8c diff --git a/gfx/pokemon/venomoth/anim_idle.asm b/gfx/pokemon/venomoth/anim_idle.asm index 619c19b73..33fbd44f5 100644 --- a/gfx/pokemon/venomoth/anim_idle.asm +++ b/gfx/pokemon/venomoth/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 04 dorepeat 1 endanim -; 0xd1aa4 diff --git a/gfx/pokemon/venonat/anim.asm b/gfx/pokemon/venonat/anim.asm index 508cbd84a..f742d4e15 100644 --- a/gfx/pokemon/venonat/anim.asm +++ b/gfx/pokemon/venonat/anim.asm @@ -13,4 +13,3 @@ frame 0, 02 dorepeat 11 endanim -; 0xd0b83 diff --git a/gfx/pokemon/venonat/anim_idle.asm b/gfx/pokemon/venonat/anim_idle.asm index ecd7a45f1..2c14af5c3 100644 --- a/gfx/pokemon/venonat/anim_idle.asm +++ b/gfx/pokemon/venonat/anim_idle.asm @@ -3,4 +3,3 @@ frame 2, 16 dorepeat 1 endanim -; 0xd1a9b diff --git a/gfx/pokemon/venusaur/anim.asm b/gfx/pokemon/venusaur/anim.asm index 9ee74b6c0..aed7cc2ee 100644 --- a/gfx/pokemon/venusaur/anim.asm +++ b/gfx/pokemon/venusaur/anim.asm @@ -7,4 +7,3 @@ frame 5, 10 dorepeat 5 endanim -; 0xd08b6 diff --git a/gfx/pokemon/venusaur/anim_idle.asm b/gfx/pokemon/venusaur/anim_idle.asm index 6eebd7cd3..0d86cd77f 100644 --- a/gfx/pokemon/venusaur/anim_idle.asm +++ b/gfx/pokemon/venusaur/anim_idle.asm @@ -3,4 +3,3 @@ frame 6, 13 frame 7, 13 endanim -; 0xd18b6 diff --git a/gfx/pokemon/victreebel/anim.asm b/gfx/pokemon/victreebel/anim.asm index ec490f7fb..6e62911cb 100644 --- a/gfx/pokemon/victreebel/anim.asm +++ b/gfx/pokemon/victreebel/anim.asm @@ -4,4 +4,3 @@ frame 4, 10 frame 5, 10 endanim -; 0xd0cca diff --git a/gfx/pokemon/victreebel/anim_idle.asm b/gfx/pokemon/victreebel/anim_idle.asm index 121550865..bc7504d4a 100644 --- a/gfx/pokemon/victreebel/anim_idle.asm +++ b/gfx/pokemon/victreebel/anim_idle.asm @@ -4,4 +4,3 @@ frame 5, 05 dorepeat 1 endanim -; 0xd1b8c diff --git a/gfx/pokemon/vileplume/anim.asm b/gfx/pokemon/vileplume/anim.asm index 98c2a86de..9d44e17d8 100644 --- a/gfx/pokemon/vileplume/anim.asm +++ b/gfx/pokemon/vileplume/anim.asm @@ -7,4 +7,3 @@ frame 0, 07 frame 1, 07 endanim -; 0xd0b46 diff --git a/gfx/pokemon/vileplume/anim_idle.asm b/gfx/pokemon/vileplume/anim_idle.asm index e57622363..3b93ca3e7 100644 --- a/gfx/pokemon/vileplume/anim_idle.asm +++ b/gfx/pokemon/vileplume/anim_idle.asm @@ -5,4 +5,3 @@ frame 0, 12 frame 3, 07 endanim -; 0xd1a82 diff --git a/gfx/pokemon/voltorb/anim.asm b/gfx/pokemon/voltorb/anim.asm index fdb49b9af..424e6846e 100644 --- a/gfx/pokemon/voltorb/anim.asm +++ b/gfx/pokemon/voltorb/anim.asm @@ -5,4 +5,3 @@ frame 1, 04 dorepeat 3 endanim -; 0xd0e57 diff --git a/gfx/pokemon/voltorb/anim_idle.asm b/gfx/pokemon/voltorb/anim_idle.asm index be799fe4a..d98c6c698 100644 --- a/gfx/pokemon/voltorb/anim_idle.asm +++ b/gfx/pokemon/voltorb/anim_idle.asm @@ -4,4 +4,3 @@ frame 0, 08 dorepeat 2 endanim -; 0xd1ca5 diff --git a/gfx/pokemon/vulpix/anim.asm b/gfx/pokemon/vulpix/anim.asm index 878054202..357413304 100644 --- a/gfx/pokemon/vulpix/anim.asm +++ b/gfx/pokemon/vulpix/anim.asm @@ -8,4 +8,3 @@ frame 3, 05 dorepeat 6 endanim -; 0xd0aba diff --git a/gfx/pokemon/vulpix/anim_idle.asm b/gfx/pokemon/vulpix/anim_idle.asm index f7c9e3671..3cc6ee572 100644 --- a/gfx/pokemon/vulpix/anim_idle.asm +++ b/gfx/pokemon/vulpix/anim_idle.asm @@ -4,4 +4,3 @@ frame 0, 05 frame 3, 05 endanim -; 0xd1a34 diff --git a/gfx/pokemon/wartortle/anim.asm b/gfx/pokemon/wartortle/anim.asm index 832b87b88..4e7e41f92 100644 --- a/gfx/pokemon/wartortle/anim.asm +++ b/gfx/pokemon/wartortle/anim.asm @@ -5,4 +5,3 @@ frame 1, 09 dorepeat 3 endanim -; 0xd08ff diff --git a/gfx/pokemon/wartortle/anim_idle.asm b/gfx/pokemon/wartortle/anim_idle.asm index 40c4fcd14..c4a056b01 100644 --- a/gfx/pokemon/wartortle/anim_idle.asm +++ b/gfx/pokemon/wartortle/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd18e7 diff --git a/gfx/pokemon/weedle/anim.asm b/gfx/pokemon/weedle/anim.asm index 5d959a772..59a5d5daf 100644 --- a/gfx/pokemon/weedle/anim.asm +++ b/gfx/pokemon/weedle/anim.asm @@ -7,4 +7,3 @@ frame 3, 06 dorepeat 3 endanim -; 0xd093a diff --git a/gfx/pokemon/weedle/anim_idle.asm b/gfx/pokemon/weedle/anim_idle.asm index 30dcb9185..d2e8d6349 100644 --- a/gfx/pokemon/weedle/anim_idle.asm +++ b/gfx/pokemon/weedle/anim_idle.asm @@ -9,4 +9,3 @@ frame 3, 05 dorepeat 5 endanim -; 0xd1922 diff --git a/gfx/pokemon/weepinbell/anim.asm b/gfx/pokemon/weepinbell/anim.asm index 6f710d29a..becc11604 100644 --- a/gfx/pokemon/weepinbell/anim.asm +++ b/gfx/pokemon/weepinbell/anim.asm @@ -5,4 +5,3 @@ dorepeat 1 frame 3, 12 endanim -; 0xd0cbf diff --git a/gfx/pokemon/weepinbell/anim_idle.asm b/gfx/pokemon/weepinbell/anim_idle.asm index 0e56c9cc1..81583f510 100644 --- a/gfx/pokemon/weepinbell/anim_idle.asm +++ b/gfx/pokemon/weepinbell/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 07 dorepeat 1 endanim -; 0xd1b81 diff --git a/gfx/pokemon/weezing/anim.asm b/gfx/pokemon/weezing/anim.asm index e64ca5d37..1328f5535 100644 --- a/gfx/pokemon/weezing/anim.asm +++ b/gfx/pokemon/weezing/anim.asm @@ -5,4 +5,3 @@ frame 4, 10 dorepeat 2 endanim -; 0xd0efd diff --git a/gfx/pokemon/weezing/anim_idle.asm b/gfx/pokemon/weezing/anim_idle.asm index 1ba31dd74..ad7c9d3c7 100644 --- a/gfx/pokemon/weezing/anim_idle.asm +++ b/gfx/pokemon/weezing/anim_idle.asm @@ -5,4 +5,3 @@ dorepeat 2 frame 1, 12 endanim -; 0xd1cfb diff --git a/gfx/pokemon/wigglytuff/anim.asm b/gfx/pokemon/wigglytuff/anim.asm index 53b468fdd..9ff3829af 100644 --- a/gfx/pokemon/wigglytuff/anim.asm +++ b/gfx/pokemon/wigglytuff/anim.asm @@ -6,4 +6,3 @@ frame 0, 06 frame 2, 04 endanim -; 0xd0aed diff --git a/gfx/pokemon/wigglytuff/anim_idle.asm b/gfx/pokemon/wigglytuff/anim_idle.asm index b99bf002c..faaeffe39 100644 --- a/gfx/pokemon/wigglytuff/anim_idle.asm +++ b/gfx/pokemon/wigglytuff/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd1a4f diff --git a/gfx/pokemon/wobbuffet/anim.asm b/gfx/pokemon/wobbuffet/anim.asm index 340f3df46..57abe207b 100644 --- a/gfx/pokemon/wobbuffet/anim.asm +++ b/gfx/pokemon/wobbuffet/anim.asm @@ -1,4 +1,3 @@ frame 1, 07 frame 2, 30 endanim -; 0xd1403 diff --git a/gfx/pokemon/wobbuffet/anim_idle.asm b/gfx/pokemon/wobbuffet/anim_idle.asm index 8a3564daa..576f48298 100644 --- a/gfx/pokemon/wobbuffet/anim_idle.asm +++ b/gfx/pokemon/wobbuffet/anim_idle.asm @@ -1,3 +1,2 @@ frame 0, 30 endanim -; 0xd2069 diff --git a/gfx/pokemon/wooper/anim.asm b/gfx/pokemon/wooper/anim.asm index 2c9becf9e..f491cbe78 100644 --- a/gfx/pokemon/wooper/anim.asm +++ b/gfx/pokemon/wooper/anim.asm @@ -5,4 +5,3 @@ frame 0, 08 frame 4, 08 endanim -; 0xd1397 diff --git a/gfx/pokemon/wooper/anim_idle.asm b/gfx/pokemon/wooper/anim_idle.asm index 3f152d035..c4a056b01 100644 --- a/gfx/pokemon/wooper/anim_idle.asm +++ b/gfx/pokemon/wooper/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 06 dorepeat 1 endanim -; 0xd202f diff --git a/gfx/pokemon/xatu/anim.asm b/gfx/pokemon/xatu/anim.asm index 002f905b8..13cbbe6be 100644 --- a/gfx/pokemon/xatu/anim.asm +++ b/gfx/pokemon/xatu/anim.asm @@ -7,4 +7,3 @@ frame 4, 12 dorepeat 5 endanim -; 0xd12cd diff --git a/gfx/pokemon/xatu/anim_idle.asm b/gfx/pokemon/xatu/anim_idle.asm index 3fa8d7875..fe2221a6a 100644 --- a/gfx/pokemon/xatu/anim_idle.asm +++ b/gfx/pokemon/xatu/anim_idle.asm @@ -8,4 +8,3 @@ frame 2, 08 dorepeat 6 endanim -; 0xd1f99 diff --git a/gfx/pokemon/yanma/anim.asm b/gfx/pokemon/yanma/anim.asm index 4f1aaa929..6da78ff64 100644 --- a/gfx/pokemon/yanma/anim.asm +++ b/gfx/pokemon/yanma/anim.asm @@ -6,4 +6,3 @@ frame 2, 03 dorepeat 4 endanim -; 0xd138a diff --git a/gfx/pokemon/yanma/anim_idle.asm b/gfx/pokemon/yanma/anim_idle.asm index 75464b3f1..66c12fb01 100644 --- a/gfx/pokemon/yanma/anim_idle.asm +++ b/gfx/pokemon/yanma/anim_idle.asm @@ -3,4 +3,3 @@ frame 3, 04 dorepeat 1 endanim -; 0xd2026 diff --git a/gfx/pokemon/zapdos/anim.asm b/gfx/pokemon/zapdos/anim.asm index a22540c2a..67d6f0e7c 100644 --- a/gfx/pokemon/zapdos/anim.asm +++ b/gfx/pokemon/zapdos/anim.asm @@ -4,4 +4,3 @@ frame 3, 10 dorepeat 2 endanim -; 0xd10cc diff --git a/gfx/pokemon/zapdos/anim_idle.asm b/gfx/pokemon/zapdos/anim_idle.asm index 3d8c8fd57..0f59e637c 100644 --- a/gfx/pokemon/zapdos/anim_idle.asm +++ b/gfx/pokemon/zapdos/anim_idle.asm @@ -2,4 +2,3 @@ frame 2, 50 frame 1, 06 endanim -; 0xd1e48 diff --git a/gfx/pokemon/zubat/anim.asm b/gfx/pokemon/zubat/anim.asm index a34a66671..9c4d6712a 100644 --- a/gfx/pokemon/zubat/anim.asm +++ b/gfx/pokemon/zubat/anim.asm @@ -5,4 +5,3 @@ frame 3, 07 frame 0, 07 endanim -; 0xd0afa diff --git a/gfx/pokemon/zubat/anim_idle.asm b/gfx/pokemon/zubat/anim_idle.asm index cfba587f9..838feac3f 100644 --- a/gfx/pokemon/zubat/anim_idle.asm +++ b/gfx/pokemon/zubat/anim_idle.asm @@ -4,4 +4,3 @@ frame 3, 12 dorepeat 2 endanim -; 0xd1a5a diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index a50decd34..92c6cb437 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -13,7 +13,6 @@ attr_blk_data: MACRO db \5, \6, \7, \8 ; x1, y1, x2, y2 ENDM - BlkPacket_9a86: attr_blk 1 attr_blk_data %011, 0,0,0, 00,00, 19,17 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index fa3b386da..1d5ae7e5e 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -16,15 +16,14 @@ sgb_pal23: MACRO db (SGB_PAL23 << 3) + 1 ENDM - PalPacket_GSTitleScreen: sgb_pal_set GS_TITLE_SCREEN_0, GS_TITLE_SCREEN_1, GS_TITLE_SCREEN_2, GS_TITLE_SCREEN_3 PalPacket_SCGB_13: - sgb_pal_set GREENMON_NITE, CGB_BADGE, RB_BROWNMON, 00 + sgb_pal_set BETA_SHINY_GREENMON, CGB_BADGE, RB_BROWNMON, 00 -PalPacket_SCGB_11: - sgb_pal_set SCGB_11_0, SCGB_11_1, SCGB_11_2, SCGB_11_3 +PalPacket_BetaPoker: + sgb_pal_set BETA_POKER_0, BETA_POKER_1, BETA_POKER_2, BETA_POKER_3 PalPacket_UnownPuzzle: sgb_pal_set UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE, UNOWN_PUZZLE @@ -35,8 +34,8 @@ PalPacket_9bd6: PalPacket_GSIntroShellderLapras: sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, 00, 00, 00 -UnreferencedPalPacket_9bf6: - sgb_pal_set 37, 00, 00, 00 +UnreferencedPalPacket_BetaIntroLapras: + sgb_pal_set BETA_INTRO_LAPRAS, 00, 00, 00 PalPacket_GSIntroJigglypuffPikachu: sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00 @@ -44,13 +43,13 @@ PalPacket_GSIntroJigglypuffPikachu: PalPacket_GSIntroStartersTransition: sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00 -PalPacket_Function8b4d: - sgb_pal_set 3B, 00, 00, 00 +PalPacket_BetaIntroVenusaur: + sgb_pal_set BETA_INTRO_VENUSAUR, 00, 00, 00 PalPacket_Pack: sgb_pal_set PACK, 00, 00, 00 -PalPacket_SCGB_0F: +PalPacket_BetaPikachuMinigame: sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00 PalPacket_PartyMenu: @@ -69,7 +68,7 @@ PalPacket_SlotMachine: sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3 PalPacket_SCGB_06: - sgb_pal_set 33, 34, DIPLOMA, RB_PURPLEMON + sgb_pal_set BETA_LOGO_1, BETA_LOGO_2, DIPLOMA, RB_PURPLEMON PalPacket_Diploma: sgb_pal_set DIPLOMA, 00, 00, 00 @@ -80,7 +79,6 @@ PalPacket_TradeTube: PalPacket_GamefreakLogo: sgb_pal_set GS_INTRO_GAMEFREAK_LOGO, 00, 00, 00 - PalPacket_9ce6: sgb_pal01 RGB 31, 31, 31 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 67d19baec..9c86e2459 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -35,40 +35,40 @@ RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_RB_PINKMON RGB 31,31,31, 31,28,14, 26,20,00, 00,00,00 ; PREDEFPAL_RB_YELLOWMON RGB 31,31,31, 26,21,22, 15,15,18, 00,00,00 ; PREDEFPAL_CGB_BADGE - RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_MEWMON_NITE - RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_BLUEMON_NITE - RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_REDMON_NITE - RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_CYANMON_NITE - RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_PURPLEMON_NITE - RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_BROWNMON_NITE - RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_GREENMON_NITE - RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_PINKMON_NITE - RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_YELLOWMON_NITE + RGB 31,31,31, 23,19,13, 14,12,17, 00,00,00 ; PREDEFPAL_SHINY_MEWMON + RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_SHINY_BLUEMON + RGB 31,31,31, 22,15,16, 17,02,05, 00,00,00 ; PREDEFPAL_SHINY_REDMON + RGB 31,31,31, 15,20,20, 05,16,16, 00,00,00 ; PREDEFPAL_SHINY_CYANMON + RGB 31,31,31, 23,15,19, 14,04,12, 00,00,00 ; PREDEFPAL_SHINY_PURPLEMON + RGB 31,31,31, 20,17,18, 18,13,11, 00,00,00 ; PREDEFPAL_SHINY_BROWNMON + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_SHINY_GREENMON + RGB 31,31,31, 21,25,29, 30,22,24, 00,00,00 ; PREDEFPAL_SHINY_PINKMON + RGB 31,31,31, 26,23,16, 29,14,09, 00,00,00 ; PREDEFPAL_SHINY_YELLOWMON RGB 31,31,31, 18,18,18, 10,10,10, 00,00,00 ; PREDEFPAL_PARTY_ICON RGB 31,31,31, 30,26,15, 00,23,00, 00,00,00 ; PREDEFPAL_HP_GREEN RGB 31,31,31, 30,26,15, 31,23,00, 00,00,00 ; PREDEFPAL_HP_YELLOW RGB 31,31,31, 30,26,15, 31,00,00, 00,00,00 ; PREDEFPAL_HP_RED RGB 31,31,31, 29,26,19, 27,20,14, 00,00,00 ; PREDEFPAL_POKEGEAR - RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_33 - RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_34 + RGB 31,31,31, 24,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_1 + RGB 31,31,31, 31,20,10, 21,00,04, 00,00,00 ; PREDEFPAL_BETA_LOGO_2 RGB 31,31,31, 30,26,16, 16,12,09, 00,00,00 ; PREDEFPAL_GS_INTRO_GAMEFREAK_LOGO RGB 31,31,31, 15,28,26, 12,22,26, 03,16,14 ; PREDEFPAL_GS_INTRO_SHELLDER_LAPRAS - RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37 + RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_BETA_INTRO_LAPRAS RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION - RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B + RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_BETA_INTRO_VENUSAUR RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_PACK RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0 RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1 RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2 RGB 31,31,31, 16,19,29, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_3 - RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_0 - RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_1 - RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_2 - RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_SCGB_11_3 - RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_45 - RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_46 + RGB 31,31,31, 30,22,24, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_0 + RGB 31,31,31, 21,25,29, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_1 + RGB 31,31,31, 20,26,16, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_2 + RGB 31,31,31, 31,28,14, 18,18,18, 16,10,07 ; PREDEFPAL_BETA_POKER_3 + RGB 31,31,31, 18,18,18, 26,10,06, 00,00,00 ; PREDEFPAL_BETA_RADIO + RGB 31,31,31, 30,22,24, 28,15,21, 00,00,00 ; PREDEFPAL_BETA_POKEGEAR RGB 31,31,31, 26,20,00, 16,19,29, 00,00,00 ; PREDEFPAL_47 RGB 31,31,31, 16,02,30, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_0 RGB 31,31,31, 16,13,04, 15,20,31, 00,00,00 ; PREDEFPAL_GS_TITLE_SCREEN_1 diff --git a/gfx/sprites.asm b/gfx/sprites.asm index 318f7506e..f84ae77d6 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -1,108 +1,108 @@ SECTION "Sprites 1", ROMX -ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp" ; c0000 -ChrisBikeSpriteGFX:: INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180 -GameboyKidSpriteGFX:: INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300 -SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" ; c03c0 -OakSpriteGFX:: INCBIN "gfx/sprites/oak.2bpp" ; c0540 -RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" ; c06c0 -BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" ; c0840 -BillSpriteGFX:: INCBIN "gfx/sprites/bill.2bpp" ; c09c0 -ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" ; c0b40 -JanineSpriteGFX:: INCBIN "gfx/sprites/janine.2bpp" ; c0cc0 -KurtSpriteGFX:: INCBIN "gfx/sprites/kurt.2bpp" ; c0e40 -MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" ; c0fc0 -BlaineSpriteGFX:: INCBIN "gfx/sprites/blaine.2bpp" ; c1140 -RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0 -DaisySpriteGFX:: INCBIN "gfx/sprites/daisy.2bpp" ; c1440 -ElmSpriteGFX:: INCBIN "gfx/sprites/elm.2bpp" ; c15c0 -WillSpriteGFX:: INCBIN "gfx/sprites/will.2bpp" ; c1740 -FalknerSpriteGFX:: INCBIN "gfx/sprites/falkner.2bpp" ; c1800 -WhitneySpriteGFX:: INCBIN "gfx/sprites/whitney.2bpp" ; c1980 -BugsySpriteGFX:: INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00 -MortySpriteGFX:: INCBIN "gfx/sprites/morty.2bpp" ; c1c80 -ChuckSpriteGFX:: INCBIN "gfx/sprites/chuck.2bpp" ; c1e00 -JasmineSpriteGFX:: INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80 -PryceSpriteGFX:: INCBIN "gfx/sprites/pryce.2bpp" ; c2100 -ClairSpriteGFX:: INCBIN "gfx/sprites/clair.2bpp" ; c2280 -BrockSpriteGFX:: INCBIN "gfx/sprites/brock.2bpp" ; c2400 -KarenSpriteGFX:: INCBIN "gfx/sprites/karen.2bpp" ; c2580 -BrunoSpriteGFX:: INCBIN "gfx/sprites/bruno.2bpp" ; c2640 -MistySpriteGFX:: INCBIN "gfx/sprites/misty.2bpp" ; c27c0 -LanceSpriteGFX:: INCBIN "gfx/sprites/lance.2bpp" ; c2940 -SurgeSpriteGFX:: INCBIN "gfx/sprites/surge.2bpp" ; c2ac0 -ErikaSpriteGFX:: INCBIN "gfx/sprites/erika.2bpp" ; c2c40 -KogaSpriteGFX:: INCBIN "gfx/sprites/koga.2bpp" ; c2dc0 -SabrinaSpriteGFX:: INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40 -CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0 -CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240 -BugCatcherSpriteGFX:: INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0 -TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" ; c3540 -YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" ; c36c0 -LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" ; c3840 -TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" ; c39c0 -BuenaSpriteGFX:: INCBIN "gfx/sprites/buena.2bpp" ; c3b40 -SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0 -RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" ; c3e40 +ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp" +ChrisBikeSpriteGFX:: INCBIN "gfx/sprites/chris_bike.2bpp" +GameboyKidSpriteGFX:: INCBIN "gfx/sprites/gameboy_kid.2bpp" +SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp" +OakSpriteGFX:: INCBIN "gfx/sprites/oak.2bpp" +RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp" +BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp" +BillSpriteGFX:: INCBIN "gfx/sprites/bill.2bpp" +ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp" +JanineSpriteGFX:: INCBIN "gfx/sprites/janine.2bpp" +KurtSpriteGFX:: INCBIN "gfx/sprites/kurt.2bpp" +MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp" +BlaineSpriteGFX:: INCBIN "gfx/sprites/blaine.2bpp" +RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp" +DaisySpriteGFX:: INCBIN "gfx/sprites/daisy.2bpp" +ElmSpriteGFX:: INCBIN "gfx/sprites/elm.2bpp" +WillSpriteGFX:: INCBIN "gfx/sprites/will.2bpp" +FalknerSpriteGFX:: INCBIN "gfx/sprites/falkner.2bpp" +WhitneySpriteGFX:: INCBIN "gfx/sprites/whitney.2bpp" +BugsySpriteGFX:: INCBIN "gfx/sprites/bugsy.2bpp" +MortySpriteGFX:: INCBIN "gfx/sprites/morty.2bpp" +ChuckSpriteGFX:: INCBIN "gfx/sprites/chuck.2bpp" +JasmineSpriteGFX:: INCBIN "gfx/sprites/jasmine.2bpp" +PryceSpriteGFX:: INCBIN "gfx/sprites/pryce.2bpp" +ClairSpriteGFX:: INCBIN "gfx/sprites/clair.2bpp" +BrockSpriteGFX:: INCBIN "gfx/sprites/brock.2bpp" +KarenSpriteGFX:: INCBIN "gfx/sprites/karen.2bpp" +BrunoSpriteGFX:: INCBIN "gfx/sprites/bruno.2bpp" +MistySpriteGFX:: INCBIN "gfx/sprites/misty.2bpp" +LanceSpriteGFX:: INCBIN "gfx/sprites/lance.2bpp" +SurgeSpriteGFX:: INCBIN "gfx/sprites/surge.2bpp" +ErikaSpriteGFX:: INCBIN "gfx/sprites/erika.2bpp" +KogaSpriteGFX:: INCBIN "gfx/sprites/koga.2bpp" +SabrinaSpriteGFX:: INCBIN "gfx/sprites/sabrina.2bpp" +CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp" +CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp" +BugCatcherSpriteGFX:: INCBIN "gfx/sprites/bug_catcher.2bpp" +TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp" +YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp" +LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp" +TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp" +BuenaSpriteGFX:: INCBIN "gfx/sprites/buena.2bpp" +SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp" +RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp" SECTION "Sprites 2", ROMX -PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000 -PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180 -GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" ; c4300 -GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" ; c4480 -SwimmerGuySpriteGFX:: INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600 -SwimmerGirlSpriteGFX:: INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780 -BigSnorlaxSpriteGFX:: INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900 -SurfingPikachuSpriteGFX:: INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980 -RocketSpriteGFX:: INCBIN "gfx/sprites/rocket.2bpp" ; c4b00 -RocketGirlSpriteGFX:: INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80 -NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" ; c4e00 -LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0 -ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" ; c5040 -FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" ; c51c0 -FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340 -ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" ; c54c0 -KimonoGirlSpriteGFX:: INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640 -SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" ; c57c0 -UnusedGuySpriteGFX:: INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940 -GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0 -BlackBeltSpriteGFX:: INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40 -ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0 -OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" ; c5f40 -CalSpriteGFX:: INCBIN "gfx/sprites/cal.2bpp" ; c60c0 -SlowpokeSpriteGFX:: INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240 -CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" ; c6280 -BigLaprasSpriteGFX:: INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400 -GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480 -SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" ; c6600 -BikerSpriteGFX:: INCBIN "gfx/sprites/biker.2bpp" ; c6780 -PharmacistSpriteGFX:: INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900 -MonsterSpriteGFX:: INCBIN "gfx/sprites/monster.2bpp" ; c6a80 -FairySpriteGFX:: INCBIN "gfx/sprites/fairy.2bpp" ; c6c00 -BirdSpriteGFX:: INCBIN "gfx/sprites/bird.2bpp" ; c6d80 -DragonSpriteGFX:: INCBIN "gfx/sprites/dragon.2bpp" ; c6f00 -BigOnixSpriteGFX:: INCBIN "gfx/sprites/big_onix.2bpp" ; c7080 -N64SpriteGFX:: INCBIN "gfx/sprites/n64.2bpp" ; c7140 -SudowoodoSpriteGFX:: INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180 -SurfSpriteGFX:: INCBIN "gfx/sprites/surf.2bpp" ; c7200 -PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380 -PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" ; c7500 -PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" ; c7680 -VirtualBoySpriteGFX:: INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800 -OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840 -RockSpriteGFX:: INCBIN "gfx/sprites/rock.2bpp" ; c7880 -BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" ; c78c0 -SnesSpriteGFX:: INCBIN "gfx/sprites/snes.2bpp" ; c7900 -FamicomSpriteGFX:: INCBIN "gfx/sprites/famicom.2bpp" ; c7940 -FruitTreeSpriteGFX:: INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980 -GoldTrophySpriteGFX:: INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0 -SilverTrophySpriteGFX:: INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00 -KrisSpriteGFX:: INCBIN "gfx/sprites/kris.2bpp" ; c7a40 -KrisBikeSpriteGFX:: INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0 -KurtOutsideSpriteGFX:: INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40 -SuicuneSpriteGFX:: INCBIN "gfx/sprites/suicune.2bpp" ; c7e00 -EnteiSpriteGFX:: INCBIN "gfx/sprites/entei.2bpp" ; c7e40 -RaikouSpriteGFX:: INCBIN "gfx/sprites/raikou.2bpp" ; c7e80 -StandingYoungsterSpriteGFX:: INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0 +PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp" +PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp" +GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp" +GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp" +SwimmerGuySpriteGFX:: INCBIN "gfx/sprites/swimmer_guy.2bpp" +SwimmerGirlSpriteGFX:: INCBIN "gfx/sprites/swimmer_girl.2bpp" +BigSnorlaxSpriteGFX:: INCBIN "gfx/sprites/big_snorlax.2bpp" +SurfingPikachuSpriteGFX:: INCBIN "gfx/sprites/surfing_pikachu.2bpp" +RocketSpriteGFX:: INCBIN "gfx/sprites/rocket.2bpp" +RocketGirlSpriteGFX:: INCBIN "gfx/sprites/rocket_girl.2bpp" +NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp" +LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp" +ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp" +FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp" +FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp" +ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp" +KimonoGirlSpriteGFX:: INCBIN "gfx/sprites/kimono_girl.2bpp" +SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp" +UnusedGuySpriteGFX:: INCBIN "gfx/sprites/unused_guy.2bpp" +GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp" +BlackBeltSpriteGFX:: INCBIN "gfx/sprites/black_belt.2bpp" +ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp" +OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp" +CalSpriteGFX:: INCBIN "gfx/sprites/cal.2bpp" +SlowpokeSpriteGFX:: INCBIN "gfx/sprites/slowpoke.2bpp" +CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp" +BigLaprasSpriteGFX:: INCBIN "gfx/sprites/big_lapras.2bpp" +GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp" +SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp" +BikerSpriteGFX:: INCBIN "gfx/sprites/biker.2bpp" +PharmacistSpriteGFX:: INCBIN "gfx/sprites/pharmacist.2bpp" +MonsterSpriteGFX:: INCBIN "gfx/sprites/monster.2bpp" +FairySpriteGFX:: INCBIN "gfx/sprites/fairy.2bpp" +BirdSpriteGFX:: INCBIN "gfx/sprites/bird.2bpp" +DragonSpriteGFX:: INCBIN "gfx/sprites/dragon.2bpp" +BigOnixSpriteGFX:: INCBIN "gfx/sprites/big_onix.2bpp" +N64SpriteGFX:: INCBIN "gfx/sprites/n64.2bpp" +SudowoodoSpriteGFX:: INCBIN "gfx/sprites/sudowoodo.2bpp" +SurfSpriteGFX:: INCBIN "gfx/sprites/surf.2bpp" +PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp" +PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp" +PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp" +VirtualBoySpriteGFX:: INCBIN "gfx/sprites/virtual_boy.2bpp" +OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp" +RockSpriteGFX:: INCBIN "gfx/sprites/rock.2bpp" +BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp" +SnesSpriteGFX:: INCBIN "gfx/sprites/snes.2bpp" +FamicomSpriteGFX:: INCBIN "gfx/sprites/famicom.2bpp" +FruitTreeSpriteGFX:: INCBIN "gfx/sprites/fruit_tree.2bpp" +GoldTrophySpriteGFX:: INCBIN "gfx/sprites/gold_trophy.2bpp" +SilverTrophySpriteGFX:: INCBIN "gfx/sprites/silver_trophy.2bpp" +KrisSpriteGFX:: INCBIN "gfx/sprites/kris.2bpp" +KrisBikeSpriteGFX:: INCBIN "gfx/sprites/kris_bike.2bpp" +KurtOutsideSpriteGFX:: INCBIN "gfx/sprites/kurt_outside.2bpp" +SuicuneSpriteGFX:: INCBIN "gfx/sprites/suicune.2bpp" +EnteiSpriteGFX:: INCBIN "gfx/sprites/entei.2bpp" +RaikouSpriteGFX:: INCBIN "gfx/sprites/raikou.2bpp" +StandingYoungsterSpriteGFX:: INCBIN "gfx/sprites/standing_youngster.2bpp" diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index b3b2f5b98..41f71ff0b 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -9,141 +9,107 @@ rept (_NARG + -1) / 2 endr ENDM - -TilesetKantoPalMap: ; 0x4c075 +TilesetKantoPalMap: INCLUDE "gfx/tilesets/kanto_palette_map.asm" -; 0x4c0e5 -Tileset0PalMap: ; 0x4c0e5 -TilesetJohtoPalMap: ; 0x4c0e5 +Tileset0PalMap: +TilesetJohtoPalMap: INCLUDE "gfx/tilesets/johto_palette_map.asm" -; 0x4c155 -TilesetJohtoModernPalMap: ; 0x4c155 +TilesetJohtoModernPalMap: INCLUDE "gfx/tilesets/johto_modern_palette_map.asm" -; 0x4c1c5 -TilesetHousePalMap: ; 0x4c1c5 +TilesetHousePalMap: INCLUDE "gfx/tilesets/house_palette_map.asm" -; 0x4c235 -TilesetPlayersHousePalMap: ; 0x4c235 +TilesetPlayersHousePalMap: INCLUDE "gfx/tilesets/players_house_palette_map.asm" -; 0x4c2a5 -TilesetPokecenterPalMap: ; 0x4c2a5 +TilesetPokecenterPalMap: INCLUDE "gfx/tilesets/pokecenter_palette_map.asm" -; 0x4c315 -TilesetGatePalMap: ; 0x4c315 +TilesetGatePalMap: INCLUDE "gfx/tilesets/gate_palette_map.asm" -; 0x4c385 -TilesetPortPalMap: ; 0x4c385 +TilesetPortPalMap: INCLUDE "gfx/tilesets/port_palette_map.asm" -; 0x4c3f5 -TilesetLabPalMap: ; 0x4c3f5 +TilesetLabPalMap: INCLUDE "gfx/tilesets/lab_palette_map.asm" -; 0x4c465 -TilesetFacilityPalMap: ; 0x4c465 +TilesetFacilityPalMap: INCLUDE "gfx/tilesets/facility_palette_map.asm" -; 0x4c4d5 -TilesetMartPalMap: ; 0x4c4d5 +TilesetMartPalMap: INCLUDE "gfx/tilesets/mart_palette_map.asm" -; 0x4c545 -TilesetMansionPalMap: ; 0x4c545 +TilesetMansionPalMap: INCLUDE "gfx/tilesets/mansion_palette_map.asm" -; 0x4c5b5 -TilesetGameCornerPalMap: ; 0x4c5b5 +TilesetGameCornerPalMap: INCLUDE "gfx/tilesets/game_corner_palette_map.asm" -; 0x4c625 -TilesetEliteFourRoomPalMap: ; 0x4c625 +TilesetEliteFourRoomPalMap: INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm" -; 0x4c695 -TilesetTraditionalHousePalMap: ; 0x4c695 +TilesetTraditionalHousePalMap: INCLUDE "gfx/tilesets/traditional_house_palette_map.asm" -; 0x4c705 -TilesetTowerPalMap: ; 0x4c705 +TilesetTowerPalMap: INCLUDE "gfx/tilesets/tower_palette_map.asm" -; 0x4c775 -TilesetCavePalMap: ; 0x4c775 -TilesetDarkCavePalMap: ; 0x4c775 +TilesetCavePalMap: +TilesetDarkCavePalMap: INCLUDE "gfx/tilesets/cave_palette_map.asm" -; 0x4c7e5 -TilesetParkPalMap: ; 0x4c7e5 +TilesetParkPalMap: INCLUDE "gfx/tilesets/park_palette_map.asm" -; 0x4c855 - -TilesetRuinsOfAlphPalMap: ; 0x4c855 -TilesetBetaWordRoomPalMap: ; 0x4c855 -TilesetHoOhWordRoomPalMap: ; 0x4c855 -TilesetKabutoWordRoomPalMap: ; 0x4c855 -TilesetOmanyteWordRoomPalMap: ; 0x4c855 -TilesetAerodactylWordRoomPalMap: ; 0x4c855 + +TilesetRuinsOfAlphPalMap: +TilesetBetaWordRoomPalMap: +TilesetHoOhWordRoomPalMap: +TilesetKabutoWordRoomPalMap: +TilesetOmanyteWordRoomPalMap: +TilesetAerodactylWordRoomPalMap: INCLUDE "gfx/tilesets/ruins_of_alph_palette_map.asm" -; 0x4c8c5 -TilesetRadioTowerPalMap: ; 0x4c8c5 +TilesetRadioTowerPalMap: INCLUDE "gfx/tilesets/radio_tower_palette_map.asm" -; 0x4c935 -TilesetTrainStationPalMap: ; 0x4c935 +TilesetTrainStationPalMap: INCLUDE "gfx/tilesets/train_station_palette_map.asm" -; 0x4c9a5 -TilesetUndergroundPalMap: ; 0x4c9a5 +TilesetUndergroundPalMap: INCLUDE "gfx/tilesets/underground_palette_map.asm" -; 0x4ca15 -TilesetChampionsRoomPalMap: ; 0x4ca15 +TilesetChampionsRoomPalMap: INCLUDE "gfx/tilesets/champions_room_palette_map.asm" -; 0x4ca85 -TilesetLighthousePalMap: ; 0x4ca85 +TilesetLighthousePalMap: INCLUDE "gfx/tilesets/lighthouse_palette_map.asm" -; 0x4caf5 -TilesetPlayersRoomPalMap: ; 0x4caf5 +TilesetPlayersRoomPalMap: INCLUDE "gfx/tilesets/players_room_palette_map.asm" -; 0x4cb65 -UnusedMuseumPalMap: ; 0x4cb65 +UnusedMuseumPalMap: INCLUDE "gfx/tilesets/unused_museum_palette_map.asm" -; 4cbd5 -TilesetIcePathPalMap: ; 0x4cbd5 +TilesetIcePathPalMap: INCLUDE "gfx/tilesets/ice_path_palette_map.asm" -; 0x4cc45 -TilesetForestPalMap: ; 0x4cc45 +TilesetForestPalMap: INCLUDE "gfx/tilesets/forest_palette_map.asm" -; 0x4ccb5 -TilesetPokeComCenterPalMap: ; 0x4ccb5 +TilesetPokeComCenterPalMap: INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm" -; 0x4cd25 -TilesetBattleTowerPalMap: ; 0x4cd25 +TilesetBattleTowerPalMap: INCLUDE "gfx/tilesets/battle_tower_palette_map.asm" -; 0x4cd95 -TilesetBattleTowerOutsidePalMap: ; 0x4cd95 +TilesetBattleTowerOutsidePalMap: INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" -; 0x4ce05 ; unused -; 0x4ce05 rept 26 db $06 endr -; 0x4ce1f diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index f6d6b465f..c4071349c 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -6,430 +6,332 @@ ENDM SECTION "Tileset Data 1", ROMX -TilesetKantoGFX: ; 0x18000 +TilesetKantoGFX: INCBIN "gfx/tilesets/kanto.2bpp.lz" -; 0x18606 -TilesetKantoMeta: ; 0x18606 +TilesetKantoMeta: INCBIN "data/tilesets/kanto_metatiles.bin" -; 0x18e06 -TilesetKantoColl: ; 0x18e06 +TilesetKantoColl: INCLUDE "data/tilesets/kanto_collision.asm" -; 0x19006 -Tileset0GFX: ; 0x19006 -TilesetJohtoGFX: ; 0x19006 +Tileset0GFX: +TilesetJohtoGFX: INCBIN "gfx/tilesets/johto.2bpp.lz" -; 0x19c0e -Tileset0Meta: ; 0x19c0e -TilesetJohtoMeta: ; 0x19c0e +Tileset0Meta: +TilesetJohtoMeta: INCBIN "data/tilesets/johto_metatiles.bin" -; 0x1a40e -Tileset0Coll: ; 0x1a40e -TilesetJohtoColl: ; 0x1a40e +Tileset0Coll: +TilesetJohtoColl: INCLUDE "data/tilesets/johto_collision.asm" -; 0x1a60e -TilesetIcePathGFX: ; 0x1a60e +TilesetIcePathGFX: INCBIN "gfx/tilesets/ice_path.2bpp.lz" -; 0x1af3e -TilesetIcePathMeta: ; 0x1af3e +TilesetIcePathMeta: INCBIN "data/tilesets/ice_path_metatiles.bin" -; 0x1b33e -TilesetIcePathColl: ; 0x1b33e +TilesetIcePathColl: INCLUDE "data/tilesets/ice_path_collision.asm" -; 0x1b43e -TilesetPlayersRoomGFX: ; 0x1b43e +TilesetPlayersRoomGFX: INCBIN "gfx/tilesets/players_room.2bpp.lz" -; 0x1b8fe -TilesetPlayersRoomMeta: ; 0x1b8fe +TilesetPlayersRoomMeta: INCBIN "data/tilesets/players_room_metatiles.bin" -; 0x1bcfe -TilesetPlayersRoomColl: ; 0x1bcfe +TilesetPlayersRoomColl: INCLUDE "data/tilesets/players_room_collision.asm" -; 0x1bdfe SECTION "Tileset Data 2", ROMX -TilesetPokecenterGFX: ; 0x1c30c +TilesetPokecenterGFX: INCBIN "gfx/tilesets/pokecenter.2bpp.lz" -; 0x1c73c -TilesetPokecenterMeta: ; 0x1c73c +TilesetPokecenterMeta: INCBIN "data/tilesets/pokecenter_metatiles.bin" -; 0x1cb3c -TilesetPokecenterColl: ; 0x1cb3c +TilesetPokecenterColl: INCLUDE "data/tilesets/pokecenter_collision.asm" -; 0x1cc3c -TilesetPortGFX: ; 0x1cc3c +TilesetPortGFX: INCBIN "gfx/tilesets/port.2bpp.lz" -; 0x1d04c -TilesetPortMeta: ; 0x1d04c +TilesetPortMeta: INCBIN "data/tilesets/port_metatiles.bin" -; 0x1d44c -TilesetPortColl: ; 0x1d44c +TilesetPortColl: INCLUDE "data/tilesets/port_collision.asm" -; 0x1d54c -TilesetPlayersHouseGFX: ; 0x1d54c +TilesetPlayersHouseGFX: INCBIN "gfx/tilesets/players_house.2bpp.lz" -; 0x1d92c -TilesetPlayersHouseMeta: ; 0x1d92c +TilesetPlayersHouseMeta: INCBIN "data/tilesets/players_house_metatiles.bin" -; 0x1dd2c -TilesetPlayersHouseColl: ; 0x1dd2c +TilesetPlayersHouseColl: INCLUDE "data/tilesets/players_house_collision.asm" -; 0x1de2c -TilesetMansionGFX: ; 0x1de2c +TilesetMansionGFX: INCBIN "gfx/tilesets/mansion.2bpp.lz" -; 0x1e58c -TilesetMansionMeta: ; 0x1e58c +TilesetMansionMeta: INCBIN "data/tilesets/mansion_metatiles.bin" -; 0x1e98c -TilesetMansionColl: ; 0x1e98c +TilesetMansionColl: INCLUDE "data/tilesets/mansion_collision.asm" -; 0x1ea8c -TilesetCaveGFX: ; 0x1ea8c +TilesetCaveGFX: INCBIN "gfx/tilesets/cave.2bpp.lz" -; 0x1ee1c -TilesetCaveMeta: ; 0x1ee1c -TilesetDarkCaveMeta: ; 0x1ee1c +TilesetCaveMeta: +TilesetDarkCaveMeta: INCBIN "data/tilesets/cave_metatiles.bin" -; 0x1f21c -TilesetCaveColl: ; 0x1f21c -TilesetDarkCaveColl: ; 0x1f21c +TilesetCaveColl: +TilesetDarkCaveColl: INCLUDE "data/tilesets/cave_collision.asm" -; 0x1f31c SECTION "Tileset Data 3", ROMX -TilesetTowerGFX: ; 0x20181 +TilesetTowerGFX: INCBIN "gfx/tilesets/tower.2bpp.lz" -; 0x206e1 -TilesetTowerMeta: ; 0x206e1 +TilesetTowerMeta: INCBIN "data/tilesets/tower_metatiles.bin" -; 0x20ae1 -TilesetTowerColl: ; 0x20ae1 +TilesetTowerColl: INCLUDE "data/tilesets/tower_collision.asm" -; 0x20be1 -TilesetLabGFX: ; 0x20be1 +TilesetLabGFX: INCBIN "gfx/tilesets/lab.2bpp.lz" -; 0x213e1 -TilesetLabMeta: ; 0x213e1 +TilesetLabMeta: INCBIN "data/tilesets/lab_metatiles.bin" -; 0x217e1 -TilesetLabColl: ; 0x217e1 +TilesetLabColl: INCLUDE "data/tilesets/lab_collision.asm" -; 0x218e1 -TilesetMartGFX: ; 0x218e1 +TilesetMartGFX: INCBIN "gfx/tilesets/mart.2bpp.lz" -; 0x22031 -TilesetMartMeta: ; 0x22031 +TilesetMartMeta: INCBIN "data/tilesets/mart_metatiles.bin" -; 0x22431 -TilesetMartColl: ; 0x22431 +TilesetMartColl: INCLUDE "data/tilesets/mart_collision.asm" -; 0x22531 -TilesetGameCornerGFX: ; 0x22531 +TilesetGameCornerGFX: INCBIN "gfx/tilesets/game_corner.2bpp.lz" -; 0x22af1 -TilesetGameCornerMeta: ; 0x22af1 +TilesetGameCornerMeta: INCBIN "data/tilesets/game_corner_metatiles.bin" -; 0x22ef1 -TilesetGameCornerColl: ; 0x22ef1 +TilesetGameCornerColl: INCLUDE "data/tilesets/game_corner_collision.asm" -; 0x22ff1 -TilesetTrainStationGFX: ; 0x22ff1 +TilesetTrainStationGFX: INCBIN "gfx/tilesets/train_station.2bpp.lz" -; 0x23391 -TilesetTrainStationMeta: ; 0x23391 +TilesetTrainStationMeta: INCBIN "data/tilesets/train_station_metatiles.bin" -; 0x23791 -TilesetTrainStationColl: ; 0x23791 +TilesetTrainStationColl: INCLUDE "data/tilesets/train_station_collision.asm" -; 0x23891 -TilesetForestMeta: ; 0x23891 +TilesetForestMeta: INCBIN "data/tilesets/forest_metatiles.bin" -; 0x23b11 SECTION "Tileset Data 4", ROMX -TilesetEliteFourRoomGFX: ; 0x30000 +TilesetEliteFourRoomGFX: INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" -; 0x304e0 -TilesetEliteFourRoomMeta: ; 0x304e0 +TilesetEliteFourRoomMeta: INCBIN "data/tilesets/elite_four_room_metatiles.bin" -; 0x308e0 -TilesetEliteFourRoomColl: ; 0x308e0 +TilesetEliteFourRoomColl: INCLUDE "data/tilesets/elite_four_room_collision.asm" -; 0x309e0 -TilesetParkGFX: ; 0x309e0 +TilesetParkGFX: INCBIN "gfx/tilesets/park.2bpp.lz" -; 0x30e80 -TilesetParkMeta: ; 0x30e80 +TilesetParkMeta: INCBIN "data/tilesets/park_metatiles.bin" -; 0x31280 -TilesetParkColl: ; 0x31280 +TilesetParkColl: INCLUDE "data/tilesets/park_collision.asm" -; 0x31380 -TilesetRadioTowerGFX: ; 0x31380 +TilesetRadioTowerGFX: INCBIN "gfx/tilesets/radio_tower.2bpp.lz" -; 0x318e0 -TilesetRadioTowerMeta: ; 0x318e0 +TilesetRadioTowerMeta: INCBIN "data/tilesets/radio_tower_metatiles.bin" -; 0x31ce0 -TilesetRadioTowerColl: ; 0x31ce0 +TilesetRadioTowerColl: INCLUDE "data/tilesets/radio_tower_collision.asm" -; 0x31de0 -TilesetUndergroundGFX: ; 0x31de0 +TilesetUndergroundGFX: INCBIN "gfx/tilesets/underground.2bpp.lz" -; 0x321b0 -TilesetUndergroundMeta: ; 0x321b0 +TilesetUndergroundMeta: INCBIN "data/tilesets/underground_metatiles.bin" -; 0x325b0 -TilesetUndergroundColl: ; 0x325b0 +TilesetUndergroundColl: INCLUDE "data/tilesets/underground_collision.asm" -; 0x326b0 -TilesetDarkCaveGFX: ; 0x326b0 +TilesetDarkCaveGFX: INCBIN "gfx/tilesets/dark_cave.2bpp.lz" -; 0x329f0 -UnusedTilesetDarkCaveMeta: ; 0x329f0 +UnusedTilesetDarkCaveMeta: INCBIN "data/tilesets/unused_dark_cave_metatiles.bin" -; 0x331f0 -UnusedTilesetDarkCaveColl: ; 0x331f0 +UnusedTilesetDarkCaveColl: INCLUDE "data/tilesets/unused_dark_cave_collision.asm" -; 0x333f0 SECTION "Tileset Data 5", ROMX -TilesetPokeComCenterGFX: ; 0xb4000 +TilesetPokeComCenterGFX: INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" -; 0xb48a0 -TilesetPokeComCenterMeta: ; 0xb48a0 +TilesetPokeComCenterMeta: INCBIN "data/tilesets/pokecom_center_metatiles.bin" -; 0xb4ca0 -TilesetPokeComCenterColl: ; 0xb4ca0 +TilesetPokeComCenterColl: INCLUDE "data/tilesets/pokecom_center_collision.asm" -; 0xb4da0 -TilesetBattleTowerGFX: ; 0xb4da0 +TilesetBattleTowerGFX: INCBIN "gfx/tilesets/battle_tower.2bpp.lz" -; 0xb50e0 -TilesetBattleTowerMeta: ; 0xb50e0 +TilesetBattleTowerMeta: INCBIN "data/tilesets/battle_tower_metatiles.bin" -; 0xb54e0 -TilesetBattleTowerColl: ; 0xb54e0 +TilesetBattleTowerColl: INCLUDE "data/tilesets/battle_tower_collision.asm" -; 0xb55e0 -TilesetGateGFX: ; 0xb55e0 +TilesetGateGFX: INCBIN "gfx/tilesets/gate.2bpp.lz" -; 0xb59e0 -TilesetGateMeta: ; 0xb59e0 +TilesetGateMeta: INCBIN "data/tilesets/gate_metatiles.bin" -; 0xb5de0 -TilesetGateColl: ; 0xb5de0 +TilesetGateColl: INCLUDE "data/tilesets/gate_collision.asm" -; 0xb5ee0 -TilesetJohtoModernGFX: ; 0xb5ee0 -TilesetBattleTowerOutsideGFX: ; 0xb5ee0 +TilesetJohtoModernGFX: +TilesetBattleTowerOutsideGFX: INCBIN "gfx/tilesets/johto_modern.2bpp.lz" -; 0xb6ae8 -TilesetJohtoModernMeta: ; 0xb6ae8 +TilesetJohtoModernMeta: INCBIN "data/tilesets/johto_modern_metatiles.bin" -; 0xb72e8 -TilesetJohtoModernColl: ; 0xb72e8 +TilesetJohtoModernColl: INCLUDE "data/tilesets/johto_modern_collision.asm" -; 0xb74e8 -TilesetTraditionalHouseGFX: ; 0xb74e8 +TilesetTraditionalHouseGFX: INCBIN "gfx/tilesets/traditional_house.2bpp.lz" -; 0xb79a8 -TilesetTraditionalHouseMeta: ; 0xb79a8 +TilesetTraditionalHouseMeta: INCBIN "data/tilesets/traditional_house_metatiles.bin" -; 0xb7da8 -TilesetTraditionalHouseColl: ; 0xb7da8 +TilesetTraditionalHouseColl: INCLUDE "data/tilesets/traditional_house_collision.asm" -; 0xb7ea8 SECTION "Tileset Data 6", ROMX -TilesetForestGFX: ; 0xdc000 +TilesetForestGFX: INCBIN "gfx/tilesets/forest.2bpp.lz" -; 0xdc3d0 -TilesetChampionsRoomGFX: ; 0xdc3d0 +TilesetChampionsRoomGFX: INCBIN "gfx/tilesets/champions_room.2bpp.lz" -; 0xdcc50 -TilesetChampionsRoomMeta: ; 0xdcc50 +TilesetChampionsRoomMeta: INCBIN "data/tilesets/champions_room_metatiles.bin" -; 0xdd050 -TilesetChampionsRoomColl: ; 0xdd050 +TilesetChampionsRoomColl: INCLUDE "data/tilesets/champions_room_collision.asm" -; 0xdd150 -TilesetHouseGFX: ; 0xdd150 +TilesetHouseGFX: INCBIN "gfx/tilesets/house.2bpp.lz" -; 0xdd600 -TilesetHouseMeta: ; 0xdd600 +TilesetHouseMeta: INCBIN "data/tilesets/house_metatiles.bin" -; 0xdda00 -TilesetHouseColl: ; 0xdda00 +TilesetHouseColl: INCLUDE "data/tilesets/house_collision.asm" -; 0xddb00 -TilesetLighthouseGFX: ; 0xddb00 +TilesetLighthouseGFX: INCBIN "gfx/tilesets/lighthouse.2bpp.lz" -; 0xddf70 -TilesetLighthouseMeta: ; 0xddf70 +TilesetLighthouseMeta: INCBIN "data/tilesets/lighthouse_metatiles.bin" -; 0xde370 -TilesetLighthouseColl: ; 0xde370 +TilesetLighthouseColl: INCLUDE "data/tilesets/lighthouse_collision.asm" -; 0xde470 -TilesetForestColl: ; 0xde470 +TilesetForestColl: INCLUDE "data/tilesets/forest_collision.asm" -; 0xde570 -TilesetFacilityGFX: ; 0xde570 +TilesetFacilityGFX: INCBIN "gfx/tilesets/facility.2bpp.lz" -; 0xde990 -TilesetFacilityMeta: ; 0xde990 +TilesetFacilityMeta: INCBIN "data/tilesets/facility_metatiles.bin" -; 0xded90 -TilesetFacilityColl: ; 0xded90 +TilesetFacilityColl: INCLUDE "data/tilesets/facility_collision.asm" -; 0xdee90 -TilesetBattleTowerOutsideMeta: ; 0xdee90 +TilesetBattleTowerOutsideMeta: INCBIN "data/tilesets/battle_tower_outside_metatiles.bin" -; 0xdf690 -TilesetBattleTowerOutsideColl: ; 0xdf690 +TilesetBattleTowerOutsideColl: INCLUDE "data/tilesets/battle_tower_outside_collision.asm" -; 0xdf890 -TilesetBetaWordRoomMeta: ; 0xdf890 +TilesetBetaWordRoomMeta: INCBIN "data/tilesets/beta_word_room_metatiles.bin" -; 0xdfc90 -TilesetBetaWordRoomColl: ; 0xdfc90 -TilesetHoOhWordRoomColl: ; 0xdfc90 -TilesetKabutoWordRoomColl: ; 0xdfc90 -TilesetOmanyteWordRoomColl: ; 0xdfc90 -TilesetAerodactylWordRoomColl: ; 0xdfc90 +TilesetBetaWordRoomColl: +TilesetHoOhWordRoomColl: +TilesetKabutoWordRoomColl: +TilesetOmanyteWordRoomColl: +TilesetAerodactylWordRoomColl: INCLUDE "data/tilesets/beta_word_room_collision.asm" -; 0xdfd90 SECTION "Tileset Data 7", ROMX -TilesetRuinsOfAlphGFX: ; 0x1dc5a1 -TilesetBetaWordRoomGFX: ; 0x1dc5a1 -TilesetHoOhWordRoomGFX: ; 0x1dc5a1 -TilesetKabutoWordRoomGFX: ; 0x1dc5a1 -TilesetOmanyteWordRoomGFX: ; 0x1dc5a1 -TilesetAerodactylWordRoomGFX: ; 0x1dc5a1 +TilesetRuinsOfAlphGFX: +TilesetBetaWordRoomGFX: +TilesetHoOhWordRoomGFX: +TilesetKabutoWordRoomGFX: +TilesetOmanyteWordRoomGFX: +TilesetAerodactylWordRoomGFX: INCBIN "gfx/tilesets/ruins_of_alph.2bpp.lz" -; 0x1dd1a9 -TilesetRuinsOfAlphMeta: ; 0x1dd1a9 +TilesetRuinsOfAlphMeta: INCBIN "data/tilesets/ruins_of_alph_metatiles.bin" -; 0x1dd5a9 -TilesetRuinsOfAlphColl: ; 0x1dd5a9 +TilesetRuinsOfAlphColl: INCLUDE "data/tilesets/ruins_of_alph_collision.asm" -; 0x1dd6a9 SECTION "Tileset Data 8", ROMX -TilesetHoOhWordRoomMeta: ; 0x1e0000 +TilesetHoOhWordRoomMeta: INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin" -; 0x1e0400 -TilesetKabutoWordRoomMeta: ; 0x1e0400 +TilesetKabutoWordRoomMeta: INCBIN "data/tilesets/kabuto_word_room_metatiles.bin" -; 0x1e0800 -TilesetOmanyteWordRoomMeta: ; 0x1e0800 +TilesetOmanyteWordRoomMeta: INCBIN "data/tilesets/omanyte_word_room_metatiles.bin" -; 0x1e0c00 -TilesetAerodactylWordRoomMeta: ; 0x1e0c00 +TilesetAerodactylWordRoomMeta: INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" -; 0x1e1000 diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index 6daf87cb6..652b152c1 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -1,107 +1,107 @@ ; group 0 (unused) RGB 21,21,21, 11,11,11 ; morn/day - RGB 21,21,21, 11,11,11; nite + RGB 21,21,21, 11,11,11 ; nite ; group 1 (Olivine) RGB 14,17,31, 07,11,15 ; morn/day - RGB 09,09,17, 05,07,13; nite + RGB 09,09,17, 05,07,13 ; nite ; group 2 (Mahogany) RGB 12,19,00, 06,10,00 ; morn/day - RGB 06,09,07, 04,05,06; nite + RGB 06,09,07, 04,05,06 ; nite ; group 3 (dungeons) RGB 21,21,21, 11,11,11 ; morn/day - RGB 21,21,21, 17,08,07; nite + RGB 21,21,21, 17,08,07 ; nite ; group 4 (Ecruteak) RGB 31,19,00, 27,10,05 ; morn/day - RGB 15,07,02, 11,04,02; nite + RGB 15,07,02, 11,04,02 ; nite ; group 5 (Blackthorn) RGB 11,10,16, 05,06,07 ; morn/day - RGB 03,04,08, 00,00,00; nite + RGB 03,04,08, 00,00,00 ; nite ; group 6 (Cinnabar) RGB 31,10,00, 18,06,00 ; morn/day - RGB 18,05,09, 17,08,07; nite + RGB 18,05,09, 17,08,07 ; nite ; group 7 (Cerulean) RGB 17,27,31, 05,15,31 ; morn/day - RGB 07,08,22, 07,07,16; nite + RGB 07,08,22, 07,07,16 ; nite ; group 8 (Azalea) RGB 22,20,10, 17,14,03 ; morn/day - RGB 11,11,05, 10,09,07; nite + RGB 11,11,05, 10,09,07 ; nite ; group 9 (Lake of Rage) RGB 31,08,04, 09,09,08 ; morn/day - RGB 18,05,09, 09,09,08; nite + RGB 18,05,09, 09,09,08 ; nite ; group 10 (Violet) RGB 24,14,31, 13,07,21 ; morn/day - RGB 12,03,18, 09,03,15; nite + RGB 12,03,18, 09,03,15 ; nite ; group 11 (Goldenrod) RGB 25,25,00, 20,17,08 ; morn/day - RGB 12,12,00, 10,09,05; nite + RGB 12,12,00, 10,09,05 ; nite ; group 12 (Vermilion) RGB 27,23,01, 23,11,00 ; morn/day - RGB 15,11,01, 11,10,01; nite + RGB 15,11,01, 11,10,01 ; nite ; group 13 (Pallet) RGB 27,28,31, 17,19,22 ; morn/day - RGB 14,14,18, 10,09,13; nite + RGB 14,14,18, 10,09,13 ; nite ; group 14 (Pewter) RGB 19,19,16, 10,12,15 ; morn/day - RGB 09,09,11, 04,05,07; nite + RGB 09,09,11, 04,05,07 ; nite ; group 15 (Mount Moon Square) RGB 14,17,31, 07,11,15 ; morn/day - RGB 09,13,19, 07,07,16; nite + RGB 09,13,19, 07,07,16 ; nite ; group 16 (Indigo) RGB 21,21,21, 13,13,13 ; morn/day - RGB 11,11,19, 07,07,12; nite + RGB 11,11,19, 07,07,12 ; nite ; group 17 (Fuchsia) RGB 31,18,29, 17,13,20 ; morn/day - RGB 14,06,12, 11,03,10; nite + RGB 14,06,12, 11,03,10 ; nite ; group 18 (Lavender) RGB 23,15,31, 16,05,31 ; morn/day - RGB 12,07,17, 08,06,10; nite + RGB 12,07,17, 08,06,10 ; nite ; group 19 (Silver Cave) RGB 21,21,25, 16,16,16 ; morn/day - RGB 13,13,13, 07,07,07; nite + RGB 13,13,13, 07,07,07 ; nite ; group 20 (Cable Club) RGB 21,21,21, 11,11,11 ; morn/day - RGB 21,21,21, 11,11,11; nite + RGB 21,21,21, 11,11,11 ; nite ; group 21 (Celadon) RGB 19,31,15, 31,22,02 ; morn/day - RGB 12,13,09, 09,12,03; nite + RGB 12,13,09, 09,12,03 ; nite ; group 22 (Cianwood) RGB 15,10,31, 07,05,15 ; morn/day - RGB 06,05,17, 02,02,08; nite + RGB 06,05,17, 02,02,08 ; nite ; group 23 (Viridian) RGB 21,31,07, 13,25,04 ; morn/day - RGB 09,14,08, 06,10,04; nite + RGB 09,14,08, 06,10,04 ; nite ; group 24 (New Bark) RGB 20,31,14, 11,23,05 ; morn/day - RGB 09,13,08, 06,09,04; nite + RGB 09,13,08, 06,09,04 ; nite ; group 25 (Saffron) RGB 31,26,00, 31,15,00 ; morn/day - RGB 13,13,01, 08,08,01; nite + RGB 13,13,01, 08,08,01 ; nite ; group 26 (Cherrygrove) RGB 31,14,28, 31,05,21 ; morn/day - RGB 14,07,17, 13,00,08; nite + RGB 14,07,17, 13,00,08 ; nite |
