diff options
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/battle_anims.asm | 3 | ||||
| -rw-r--r-- | gfx/font.asm | 42 | ||||
| -rw-r--r-- | gfx/mail.asm | 74 | ||||
| -rw-r--r-- | gfx/pics.asm | 18 | ||||
| -rw-r--r-- | gfx/sprites.asm | 204 | ||||
| -rw-r--r-- | gfx/tileset_palette_maps.asm | 1 |
6 files changed, 153 insertions, 189 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/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/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/pics.asm b/gfx/pics.asm index 043e41489..5c5b85a26 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -34,7 +34,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 @@ -55,7 +54,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 @@ -78,7 +76,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 @@ -103,7 +100,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 @@ -129,7 +125,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 @@ -157,7 +152,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 @@ -187,7 +181,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 @@ -219,7 +212,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 @@ -255,7 +247,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 @@ -295,7 +286,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 @@ -338,7 +328,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 @@ -384,7 +373,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 @@ -432,7 +420,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 @@ -483,7 +470,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 @@ -537,7 +523,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 @@ -595,7 +580,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 @@ -661,7 +645,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 @@ -726,7 +709,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 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..29eefc4e2 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -119,7 +119,6 @@ INCLUDE "gfx/tilesets/players_room_palette_map.asm" UnusedMuseumPalMap: ; 0x4cb65 INCLUDE "gfx/tilesets/unused_museum_palette_map.asm" -; 4cbd5 TilesetIcePathPalMap: ; 0x4cbd5 INCLUDE "gfx/tilesets/ice_path_palette_map.asm" |