From 5c5f8b325fe5900a3800a976a1a31e99934f6815 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 23:21:32 -0500 Subject: [PATCH] Move data/palettes/ .pal files into gfx/ --- data/palettes/unknown/4985a.asm | 15 ---- engine/card_flip.asm | 2 +- engine/cgb_layouts.asm | 4 +- engine/color.asm | 38 ++++----- engine/credits.asm | 2 +- engine/crystal_colors.asm | 10 +-- engine/crystal_intro.asm | 14 ++-- engine/debug.asm | 4 +- engine/mon_icons.asm | 4 +- engine/namingscreen.asm | 2 +- engine/pokegear.asm | 2 +- engine/title.asm | 2 +- engine/unused_title.asm | 4 +- {data/palettes => gfx/battle}/exp_bar.pal | 0 {data/palettes => gfx/battle}/hp_bar.pal | 0 .../battle_anims/battle_anims.pal | 0 .../palettes => gfx/card_flip}/card_flip.pal | 0 {data/palettes => gfx/credits}/credits.pal | 0 {data/palettes => gfx}/debug/bg.pal | 0 {data/palettes => gfx}/debug/ob.pal | 0 {data/palettes => gfx/diploma}/diploma.pal | 0 .../overworld => gfx/font}/bg_text.pal | 0 gfx/icons.asm | 76 +++++++++--------- gfx/{icon => icons}/bat.png | Bin gfx/{icon => icons}/bigmon.png | Bin gfx/{icon => icons}/bird.png | Bin gfx/{icon => icons}/blob.png | Bin gfx/{icon => icons}/bug.png | Bin gfx/{icon => icons}/bulbasaur.png | Bin gfx/{icon => icons}/caterpillar.png | Bin gfx/{icon => icons}/charmander.png | Bin gfx/{icon => icons}/clefairy.png | Bin gfx/{icon => icons}/diglett.png | Bin gfx/{icon => icons}/egg.png | Bin gfx/{icon => icons}/equine.png | Bin gfx/{icon => icons}/fighter.png | Bin gfx/{icon => icons}/fish.png | Bin gfx/{icon => icons}/fox.png | Bin gfx/{icon => icons}/geodude.png | Bin gfx/{icon => icons}/ghost.png | Bin gfx/{icon => icons}/gyarados.png | Bin gfx/{icon => icons}/ho_oh.png | Bin gfx/{icon => icons}/humanshape.png | Bin gfx/{icon => icons}/item.png | Bin gfx/{icon => icons}/jellyfish.png | Bin gfx/{icon => icons}/jigglypuff.png | Bin gfx/{icon => icons}/lapras.png | Bin gfx/{icon => icons}/lugia.png | Bin gfx/{icon => icons}/mail.png | Bin gfx/{icon => icons}/mail2.png | Bin gfx/{icon => icons}/monster.png | Bin gfx/{icon => icons}/moth.png | Bin gfx/{icon => icons}/oddish.png | Bin {data/palettes => gfx/icons}/party_menu.pal | 0 gfx/{icon => icons}/pikachu.png | Bin gfx/{icon => icons}/poliwag.png | Bin gfx/{icon => icons}/serpent.png | Bin gfx/{icon => icons}/shell.png | Bin gfx/{icon => icons}/slowpoke.png | Bin gfx/{icon => icons}/snorlax.png | Bin gfx/{icon => icons}/squirtle.png | Bin gfx/{icon => icons}/staryu.png | Bin gfx/{icon => icons}/sudowoodo.png | Bin gfx/{icon => icons}/unown.png | Bin gfx/{icon => icons}/voltorb.png | Bin .../crystal_intro => gfx/intro}/fade.pal | 0 .../intro}/gamefreak_logo.pal | 0 .../crystal_intro => gfx/intro}/intro_1.pal | 0 .../crystal_intro => gfx/intro}/intro_2.pal | 0 .../crystal_intro => gfx/intro}/intro_3.pal | 0 .../crystal_intro => gfx/intro}/intro_4.pal | 0 .../crystal_intro => gfx/intro}/intro_5.pal | 0 {data/palettes => gfx/mail}/mail.pal | 0 .../mystery_gift}/mg_mobile.pal | 0 {data/palettes => gfx/pack}/pack.pal | 0 {data/palettes => gfx/pack}/pack_f.pal | 0 {data/palettes => gfx/pokegear}/pokegear.pal | 0 .../palettes => gfx/pokegear}/pokegear_f.pal | 0 .../pokegear}/town_map_palette_map.asm | 0 {data/palettes => gfx/sgb}/blk_packets.asm | 0 {data/palettes => gfx/sgb}/pal_packets.asm | 2 + {data/palettes => gfx/sgb}/predef.pal | 0 {data/palettes => gfx/sgb}/sgb_border.pal | 0 .../slot_machine.pal => gfx/slots/slots.pal | 0 .../overworld => gfx/sprites}/map_objects.pal | 0 .../tilesets/battle_tower.pal | 0 .../tilesets/bg_tiles.pal | 0 {data/palettes => gfx}/tilesets/house_1.pal | 0 {data/palettes => gfx}/tilesets/ice_path.pal | 0 .../tilesets/pokecom_center.pal | 0 .../palettes => gfx}/tilesets/radio_tower.pal | 0 .../overworld => gfx/tilesets}/roofs.pal | 0 .../bg.pal => gfx/title/old_bg.pal | 0 .../ob.pal => gfx/title/old_fg.pal | 0 {data/palettes => gfx/title}/title.pal | 0 .../trade_room.pal => gfx/trade/border.pal | 0 {data/palettes => gfx}/unknown/49757.pal | 0 gfx/unknown/4985a.asm | 8 ++ {data/palettes => gfx}/unknown/b6f1.pal | 0 {data/palettes => gfx}/unknown/b719.pal | 0 {data/palettes => gfx}/unknown/b789.pal | 0 tilesets/special_palettes.asm | 10 +-- 102 files changed, 97 insertions(+), 102 deletions(-) delete mode 100644 data/palettes/unknown/4985a.asm rename {data/palettes => gfx/battle}/exp_bar.pal (100%) rename {data/palettes => gfx/battle}/hp_bar.pal (100%) rename data/palettes/battle_objects.pal => gfx/battle_anims/battle_anims.pal (100%) rename {data/palettes => gfx/card_flip}/card_flip.pal (100%) rename {data/palettes => gfx/credits}/credits.pal (100%) rename {data/palettes => gfx}/debug/bg.pal (100%) rename {data/palettes => gfx}/debug/ob.pal (100%) rename {data/palettes => gfx/diploma}/diploma.pal (100%) rename {data/palettes/overworld => gfx/font}/bg_text.pal (100%) rename gfx/{icon => icons}/bat.png (100%) rename gfx/{icon => icons}/bigmon.png (100%) rename gfx/{icon => icons}/bird.png (100%) rename gfx/{icon => icons}/blob.png (100%) rename gfx/{icon => icons}/bug.png (100%) rename gfx/{icon => icons}/bulbasaur.png (100%) rename gfx/{icon => icons}/caterpillar.png (100%) rename gfx/{icon => icons}/charmander.png (100%) rename gfx/{icon => icons}/clefairy.png (100%) rename gfx/{icon => icons}/diglett.png (100%) rename gfx/{icon => icons}/egg.png (100%) rename gfx/{icon => icons}/equine.png (100%) rename gfx/{icon => icons}/fighter.png (100%) rename gfx/{icon => icons}/fish.png (100%) rename gfx/{icon => icons}/fox.png (100%) rename gfx/{icon => icons}/geodude.png (100%) rename gfx/{icon => icons}/ghost.png (100%) rename gfx/{icon => icons}/gyarados.png (100%) rename gfx/{icon => icons}/ho_oh.png (100%) rename gfx/{icon => icons}/humanshape.png (100%) rename gfx/{icon => icons}/item.png (100%) rename gfx/{icon => icons}/jellyfish.png (100%) rename gfx/{icon => icons}/jigglypuff.png (100%) rename gfx/{icon => icons}/lapras.png (100%) rename gfx/{icon => icons}/lugia.png (100%) rename gfx/{icon => icons}/mail.png (100%) rename gfx/{icon => icons}/mail2.png (100%) rename gfx/{icon => icons}/monster.png (100%) rename gfx/{icon => icons}/moth.png (100%) rename gfx/{icon => icons}/oddish.png (100%) rename {data/palettes => gfx/icons}/party_menu.pal (100%) rename gfx/{icon => icons}/pikachu.png (100%) rename gfx/{icon => icons}/poliwag.png (100%) rename gfx/{icon => icons}/serpent.png (100%) rename gfx/{icon => icons}/shell.png (100%) rename gfx/{icon => icons}/slowpoke.png (100%) rename gfx/{icon => icons}/snorlax.png (100%) rename gfx/{icon => icons}/squirtle.png (100%) rename gfx/{icon => icons}/staryu.png (100%) rename gfx/{icon => icons}/sudowoodo.png (100%) rename gfx/{icon => icons}/unown.png (100%) rename gfx/{icon => icons}/voltorb.png (100%) rename {data/palettes/crystal_intro => gfx/intro}/fade.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/gamefreak_logo.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/intro_1.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/intro_2.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/intro_3.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/intro_4.pal (100%) rename {data/palettes/crystal_intro => gfx/intro}/intro_5.pal (100%) rename {data/palettes => gfx/mail}/mail.pal (100%) rename {data/palettes => gfx/mystery_gift}/mg_mobile.pal (100%) rename {data/palettes => gfx/pack}/pack.pal (100%) rename {data/palettes => gfx/pack}/pack_f.pal (100%) rename {data/palettes => gfx/pokegear}/pokegear.pal (100%) rename {data/palettes => gfx/pokegear}/pokegear_f.pal (100%) rename {data/palettes => gfx/pokegear}/town_map_palette_map.asm (100%) rename {data/palettes => gfx/sgb}/blk_packets.asm (100%) rename {data/palettes => gfx/sgb}/pal_packets.asm (98%) rename {data/palettes => gfx/sgb}/predef.pal (100%) rename {data/palettes => gfx/sgb}/sgb_border.pal (100%) rename data/palettes/slot_machine.pal => gfx/slots/slots.pal (100%) rename {data/palettes/overworld => gfx/sprites}/map_objects.pal (100%) rename {data/palettes => gfx}/tilesets/battle_tower.pal (100%) rename data/palettes/overworld/tileset_bg.pal => gfx/tilesets/bg_tiles.pal (100%) rename {data/palettes => gfx}/tilesets/house_1.pal (100%) rename {data/palettes => gfx}/tilesets/ice_path.pal (100%) rename {data/palettes => gfx}/tilesets/pokecom_center.pal (100%) rename {data/palettes => gfx}/tilesets/radio_tower.pal (100%) rename {data/palettes/overworld => gfx/tilesets}/roofs.pal (100%) rename data/palettes/unused_title/bg.pal => gfx/title/old_bg.pal (100%) rename data/palettes/unused_title/ob.pal => gfx/title/old_fg.pal (100%) rename {data/palettes => gfx/title}/title.pal (100%) rename data/palettes/trade_room.pal => gfx/trade/border.pal (100%) rename {data/palettes => gfx}/unknown/49757.pal (100%) create mode 100644 gfx/unknown/4985a.asm rename {data/palettes => gfx}/unknown/b6f1.pal (100%) rename {data/palettes => gfx}/unknown/b719.pal (100%) rename {data/palettes => gfx}/unknown/b789.pal (100%) diff --git a/data/palettes/unknown/4985a.asm b/data/palettes/unknown/4985a.asm deleted file mode 100644 index 35f272227..000000000 --- a/data/palettes/unknown/4985a.asm +++ /dev/null @@ -1,15 +0,0 @@ - db $ab, $03, $57, $24, $ac, $0e, $13, $32 - - db $be, $30, $5b, $4c, $47, $60, $ed, $f2 - - db $ab, $03, $55, $26, $aa, $0a, $13, $3a - - db $be, $28, $33, $24, $6e, $71, $df, $b0 - - db $a8, $00, $e5, $e0, $9a, $fc, $f4, $2c - - db $fe, $4c, $a3, $5e, $c6, $3a, $ab, $4d - - db $a8, $00, $b5, $b0, $de, $e8, $fc, $1c - - db $ba, $66, $f7, $0e, $ba, $5e, $43, $bd diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 3d635a204..8c55991bb 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -1662,7 +1662,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37) ; e0c93 (38:4c93) .palettes ; e0c93 -INCLUDE "data/palettes/card_flip.pal" +INCLUDE "gfx/card_flip/card_flip.pal" ; e0cdb CardFlipLZ03: ; e0cdb diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 74d476dec..97477367d 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -891,11 +891,11 @@ _CGB_PackPals: ; 93d3 ; 9439 .ChrisPackPals: ; 9439 -INCLUDE "data/palettes/pack.pal" +INCLUDE "gfx/pack/pack.pal" ; 9469 .KrisPackPals: ; 9469 -INCLUDE "data/palettes/pack_f.pal" +INCLUDE "gfx/pack/pack_f.pal" ; 9499 _CGB_Pokepic: ; 9499 diff --git a/engine/color.asm b/engine/color.asm index ecf4eab68..8bd79fd3b 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -451,7 +451,7 @@ LoadMailPalettes: ret .MailPals: -INCLUDE "data/palettes/mail.pal" +INCLUDE "gfx/mail/mail.pal" INCLUDE "engine/cgb_layouts.asm" @@ -766,7 +766,7 @@ Function9779: mobile ret BattleObjectPals: -INCLUDE "data/palettes/battle_objects.pal" +INCLUDE "gfx/battle_anims/battle_anims.pal" Function97cc: ; XXX @@ -1197,27 +1197,27 @@ SGBDelayCycles: jr nz, .wait ret -INCLUDE "data/palettes/blk_packets.asm" +INCLUDE "gfx/sgb/blk_packets.asm" -INCLUDE "data/palettes/pal_packets.asm" +INCLUDE "gfx/sgb/pal_packets.asm" PredefPals: -INCLUDE "data/palettes/predef.pal" +INCLUDE "gfx/sgb/predef.pal" SGBBorderMap: INCBIN "gfx/sgb/sgb_border.tilemap" SGBBorderPalettes: -INCLUDE "data/palettes/sgb_border.pal" +INCLUDE "gfx/sgb/sgb_border.pal" SGBBorder: INCBIN "gfx/sgb/sgb_border.2bpp" HPBarPals: -INCLUDE "data/palettes/hp_bar.pal" +INCLUDE "gfx/battle/hp_bar.pal" ExpBarPalette: -INCLUDE "data/palettes/exp_bar.pal" +INCLUDE "gfx/battle/exp_bar.pal" INCLUDE "data/pokemon/palettes.asm" @@ -1338,34 +1338,34 @@ Palette_b311: ; b311 not mobile RGB 00, 00, 00 TilesetBGPalette: -INCLUDE "data/palettes/overworld/tileset_bg.pal" +INCLUDE "gfx/tilesets/bg_tiles.pal" MapObjectPals:: -INCLUDE "data/palettes/overworld/map_objects.pal" +INCLUDE "gfx/sprites/map_objects.pal" RoofPals: -INCLUDE "data/palettes/overworld/roofs.pal" +INCLUDE "gfx/tilesets/roofs.pal" DiplomaPalettes: -INCLUDE "data/palettes/diploma.pal" +INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: -INCLUDE "data/palettes/party_menu.pal" +INCLUDE "gfx/icons/party_menu.pal" Palettes_b6f1: -INCLUDE "data/palettes/unknown/b6f1.pal" +INCLUDE "gfx/unknown/b6f1.pal" Palettes_b719: -INCLUDE "data/palettes/unknown/b719.pal" +INCLUDE "gfx/unknown/b719.pal" MalePokegearPals: -INCLUDE "data/palettes/pokegear.pal" +INCLUDE "gfx/pokegear/pokegear.pal" FemalePokegearPals: -INCLUDE "data/palettes/pokegear_f.pal" +INCLUDE "gfx/pokegear/pokegear_f.pal" Palettes_b789: -INCLUDE "data/palettes/unknown/b789.pal" +INCLUDE "gfx/unknown/b789.pal" SlotMachinePals: -INCLUDE "data/palettes/slot_machine.pal" +INCLUDE "gfx/slots/slots.pal" diff --git a/engine/credits.asm b/engine/credits.asm index 564422db3..5d34ba2f4 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -540,7 +540,7 @@ GetCreditsPalette: ; 109b2c ret CreditsPalettes: -INCLUDE "data/palettes/credits.pal" +INCLUDE "gfx/credits/credits.pal" ; 109bca Credits_LoadBorderGFX: ; 109bca (42:5bca) diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm index 5d2ba236c..e4783619c 100755 --- a/engine/crystal_colors.asm +++ b/engine/crystal_colors.asm @@ -113,7 +113,7 @@ MG_Mobile_Layout_CreatePalBoxes: ; 49384 (12:5384) ; 493e1 (12:53e1) Palette_493e1: ; 493e1 -INCLUDE "data/palettes/mg_mobile.pal" +INCLUDE "gfx/mystery_gift/mg_mobile.pal" ; 49409 LoadOW_BGPal7:: ; 49409 @@ -126,7 +126,7 @@ LoadOW_BGPal7:: ; 49409 ; 49418 Palette_TextBG7: ; 49418 -INCLUDE "data/palettes/overworld/bg_text.pal" +INCLUDE "gfx/font/bg_text.pal" ; 49420 Function49420:: ; 49420 (12:5420) @@ -248,7 +248,7 @@ Function49742: ; 49742 ; 49757 .Palette_49757: ; 49757 -INCLUDE "data/palettes/unknown/49757.pal" +INCLUDE "gfx/unknown/49757.pal" ; 49797 _InitMG_Mobile_LinkTradePalMap: ; 49797 @@ -314,7 +314,7 @@ LoadTradeRoomBGPals: ; 49811 ; 49826 TradeRoomPalette: ; 49826 -INCLUDE "data/palettes/trade_room.pal" +INCLUDE "gfx/trade/border.pal" ; 49856 InitMG_Mobile_LinkTradePalMap: ; 49856 @@ -323,4 +323,4 @@ InitMG_Mobile_LinkTradePalMap: ; 49856 ; 4985a Unknown_4985a: ; unreferenced -INCLUDE "data/palettes/unknown/4985a.asm" +INCLUDE "gfx/unknown/4985a.asm" diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 302490a3b..84ab86113 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -341,7 +341,7 @@ GameFreakLogoScene5: ; e47ab (39:47ab) ; e47ac (39:47ac) GameFreakLogoPalettes: ; e47ac -INCLUDE "data/palettes/crystal_intro/gamefreak_logo.pal" +INCLUDE "gfx/intro/gamefreak_logo.pal" ; e47cc GameFreakLogo: ; e47cc @@ -1550,7 +1550,7 @@ Intro_Scene24_ApplyPaletteFade: ; e5172 (39:5172) ; e519c (39:519c) .FadePals: ; e519c -INCLUDE "data/palettes/crystal_intro/fade.pal" +INCLUDE "gfx/intro/fade.pal" ; e51dc CrystalIntro_InitUnownAnim: ; e51dc (39:51dc) @@ -2088,7 +2088,7 @@ INCBIN "gfx/intro/003.tilemap.lz" ; e5edd Palette_e5edd: ; e5edd -INCLUDE "data/palettes/crystal_intro/intro_1.pal" +INCLUDE "gfx/intro/intro_1.pal" ; e5f5d IntroUnownsGFX: ; e5f5d @@ -2124,7 +2124,7 @@ INCBIN "gfx/intro/007.tilemap.lz" ; e65ad Palette_365ad: ; e65ad -INCLUDE "data/palettes/crystal_intro/intro_2.pal" +INCLUDE "gfx/intro/intro_2.pal" ; e662d IntroCrystalUnownsGFX: ; e662d @@ -2140,7 +2140,7 @@ INCBIN "gfx/intro/015.tilemap.lz" ; e679d Palette_e679d: ; e679d -INCLUDE "data/palettes/crystal_intro/intro_3.pal" +INCLUDE "gfx/intro/intro_3.pal" ; e681d IntroSuicuneCloseGFX: ; e681d @@ -2156,7 +2156,7 @@ INCBIN "gfx/intro/011.tilemap.lz" ; e6d6d Palette_e6d6d: ; e6d6d -INCLUDE "data/palettes/crystal_intro/intro_4.pal" +INCLUDE "gfx/intro/intro_4.pal" ; e6ded IntroSuicuneJumpGFX: ; e6ded @@ -2184,7 +2184,7 @@ INCBIN "gfx/intro/013.tilemap.lz" ; e77dd Palette_e77dd: ; e77dd -INCLUDE "data/palettes/crystal_intro/intro_5.pal" +INCLUDE "gfx/intro/intro_5.pal" IntroUnownBackGFX: ; e785d INCBIN "gfx/intro/unown_back.2bpp.lz" diff --git a/engine/debug.asm b/engine/debug.asm index 1e0d042e0..c1c8eb284 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -193,10 +193,10 @@ Function819a7: ; 819a7 ; 819f4 Palette_819f4: ; 819f4 -INCLUDE "data/palettes/debug/bg.pal" +INCLUDE "gfx/debug/bg.pal" Palette_81a34: ; 81a34 -INCLUDE "data/palettes/debug/ob.pal" +INCLUDE "gfx/debug/ob.pal" ; 81a74 Function81a74: ; 81a74 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 316ff3bac..660ab8512 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -307,8 +307,8 @@ GetIconGFX: ; 8e9de ret HeldItemIcons: -INCBIN "gfx/icon/mail.2bpp" -INCBIN "gfx/icon/item.2bpp" +INCBIN "gfx/icons/mail.2bpp" +INCBIN "gfx/icons/item.2bpp" ; 8ea17 GetIcon_de: ; 8ea17 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 177f06f73..c81934d27 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -1041,7 +1041,7 @@ _ComposeMailMessage: ; 11e75 (mail?) ; 11ef4 (4:5ef4) .MailIcon: ; 11ef4 -INCBIN "gfx/icon/mail2.2bpp" +INCBIN "gfx/icons/mail2.2bpp" ; 11f74 .initwNamingScreenMaxNameLength ; 11f74 (4:5f74) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 93ee5a79f..c8063c830 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2834,7 +2834,7 @@ TownMapPals: ; 91f13 ret .PalMap: -INCLUDE "data/palettes/town_map_palette_map.asm" +INCLUDE "gfx/pokegear/town_map_palette_map.asm" ; 91f7b TownMapMon: ; 91f7b diff --git a/engine/title.asm b/engine/title.asm index 9d8ce1d3f..5f9ca82f7 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -399,4 +399,4 @@ INCBIN "gfx/title/crystal.2bpp.lz" ; 10fede TitleScreenPalettes: -INCLUDE "data/palettes/title.pal" +INCLUDE "gfx/title/title.pal" diff --git a/engine/unused_title.asm b/engine/unused_title.asm index ac1e0ade1..b9e31cdae 100644 --- a/engine/unused_title.asm +++ b/engine/unused_title.asm @@ -108,7 +108,7 @@ INCBIN "gfx/title/old_bg.tilemap" ; 10d8b1 UnusedTitleBG_Palettes: ; 10d8b1 -INCLUDE "data/palettes/unused_title/bg.pal" +INCLUDE "gfx/title/old_bg.pal" ; 10dab1 UnusedTitleFG_GFX: ; 10dab1 @@ -116,7 +116,7 @@ INCBIN "gfx/title/old_fg.2bpp" ; 10eab1 UnusedTitleFG_Palettes: ; 10eab1 -INCLUDE "data/palettes/unused_title/ob.pal" +INCLUDE "gfx/title/old_fg.pal" ; 10ecb1 UnusedTitleFG_OAM: ; 10ecb1 diff --git a/data/palettes/exp_bar.pal b/gfx/battle/exp_bar.pal similarity index 100% rename from data/palettes/exp_bar.pal rename to gfx/battle/exp_bar.pal diff --git a/data/palettes/hp_bar.pal b/gfx/battle/hp_bar.pal similarity index 100% rename from data/palettes/hp_bar.pal rename to gfx/battle/hp_bar.pal diff --git a/data/palettes/battle_objects.pal b/gfx/battle_anims/battle_anims.pal similarity index 100% rename from data/palettes/battle_objects.pal rename to gfx/battle_anims/battle_anims.pal diff --git a/data/palettes/card_flip.pal b/gfx/card_flip/card_flip.pal similarity index 100% rename from data/palettes/card_flip.pal rename to gfx/card_flip/card_flip.pal diff --git a/data/palettes/credits.pal b/gfx/credits/credits.pal similarity index 100% rename from data/palettes/credits.pal rename to gfx/credits/credits.pal diff --git a/data/palettes/debug/bg.pal b/gfx/debug/bg.pal similarity index 100% rename from data/palettes/debug/bg.pal rename to gfx/debug/bg.pal diff --git a/data/palettes/debug/ob.pal b/gfx/debug/ob.pal similarity index 100% rename from data/palettes/debug/ob.pal rename to gfx/debug/ob.pal diff --git a/data/palettes/diploma.pal b/gfx/diploma/diploma.pal similarity index 100% rename from data/palettes/diploma.pal rename to gfx/diploma/diploma.pal diff --git a/data/palettes/overworld/bg_text.pal b/gfx/font/bg_text.pal similarity index 100% rename from data/palettes/overworld/bg_text.pal rename to gfx/font/bg_text.pal diff --git a/gfx/icons.asm b/gfx/icons.asm index 5b28a99cd..0733c26f6 100644 --- a/gfx/icons.asm +++ b/gfx/icons.asm @@ -1,40 +1,40 @@ Icons: NullIcon: -PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d -JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d -DiglettIcon: INCBIN "gfx/icon/diglett.2bpp" ; 0x8ed0d -PikachuIcon: INCBIN "gfx/icon/pikachu.2bpp" ; 0x8ed8d -StaryuIcon: INCBIN "gfx/icon/staryu.2bpp" ; 0x8ee0d -FishIcon: INCBIN "gfx/icon/fish.2bpp" ; 0x8ee8d -BirdIcon: INCBIN "gfx/icon/bird.2bpp" ; 0x8ef0d -MonsterIcon: INCBIN "gfx/icon/monster.2bpp" ; 0x8ef8d -ClefairyIcon: INCBIN "gfx/icon/clefairy.2bpp" ; 0x8f00d -OddishIcon: INCBIN "gfx/icon/oddish.2bpp" ; 0x8f08d -BugIcon: INCBIN "gfx/icon/bug.2bpp" ; 0x8f10d -GhostIcon: INCBIN "gfx/icon/ghost.2bpp" ; 0x8f18d -LaprasIcon: INCBIN "gfx/icon/lapras.2bpp" ; 0x8f20d -HumanshapeIcon: INCBIN "gfx/icon/humanshape.2bpp" ; 0x8f28d -FoxIcon: INCBIN "gfx/icon/fox.2bpp" ; 0x8f30d -EquineIcon: INCBIN "gfx/icon/equine.2bpp" ; 0x8f38d -ShellIcon: INCBIN "gfx/icon/shell.2bpp" ; 0x8f40d -BlobIcon: INCBIN "gfx/icon/blob.2bpp" ; 0x8f48d -SerpentIcon: INCBIN "gfx/icon/serpent.2bpp" ; 0x8f50d -VoltorbIcon: INCBIN "gfx/icon/voltorb.2bpp" ; 0x8f58d -SquirtleIcon: INCBIN "gfx/icon/squirtle.2bpp" ; 0x8f60d -BulbasaurIcon: INCBIN "gfx/icon/bulbasaur.2bpp" ; 0x8f68d -CharmanderIcon: INCBIN "gfx/icon/charmander.2bpp" ; 0x8f70d -CaterpillarIcon: INCBIN "gfx/icon/caterpillar.2bpp" ; 0x8f78d -UnownIcon: INCBIN "gfx/icon/unown.2bpp" ; 0x8f80d -GeodudeIcon: INCBIN "gfx/icon/geodude.2bpp" ; 0x8f88d -FighterIcon: INCBIN "gfx/icon/fighter.2bpp" ; 0x8f90d -EggIcon: INCBIN "gfx/icon/egg.2bpp" ; 0x8f98d -JellyfishIcon: INCBIN "gfx/icon/jellyfish.2bpp" ; 0x8fa0d -MothIcon: INCBIN "gfx/icon/moth.2bpp" ; 0x8fa8d -BatIcon: INCBIN "gfx/icon/bat.2bpp" ; 0x8fb0d -SnorlaxIcon: INCBIN "gfx/icon/snorlax.2bpp" ; 0x8fb8d -HoOhIcon: INCBIN "gfx/icon/ho_oh.2bpp" ; 0x8fc0d -LugiaIcon: INCBIN "gfx/icon/lugia.2bpp" ; 0x8fc8d -GyaradosIcon: INCBIN "gfx/icon/gyarados.2bpp" ; 0x8fd0d -SlowpokeIcon: INCBIN "gfx/icon/slowpoke.2bpp" ; 0x8fd8d -SudowoodoIcon: INCBIN "gfx/icon/sudowoodo.2bpp" ; 0x8fe0d -BigmonIcon: INCBIN "gfx/icon/bigmon.2bpp" ; 0x8fe8d +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 diff --git a/gfx/icon/bat.png b/gfx/icons/bat.png similarity index 100% rename from gfx/icon/bat.png rename to gfx/icons/bat.png diff --git a/gfx/icon/bigmon.png b/gfx/icons/bigmon.png similarity index 100% rename from gfx/icon/bigmon.png rename to gfx/icons/bigmon.png diff --git a/gfx/icon/bird.png b/gfx/icons/bird.png similarity index 100% rename from gfx/icon/bird.png rename to gfx/icons/bird.png diff --git a/gfx/icon/blob.png b/gfx/icons/blob.png similarity index 100% rename from gfx/icon/blob.png rename to gfx/icons/blob.png diff --git a/gfx/icon/bug.png b/gfx/icons/bug.png similarity index 100% rename from gfx/icon/bug.png rename to gfx/icons/bug.png diff --git a/gfx/icon/bulbasaur.png b/gfx/icons/bulbasaur.png similarity index 100% rename from gfx/icon/bulbasaur.png rename to gfx/icons/bulbasaur.png diff --git a/gfx/icon/caterpillar.png b/gfx/icons/caterpillar.png similarity index 100% rename from gfx/icon/caterpillar.png rename to gfx/icons/caterpillar.png diff --git a/gfx/icon/charmander.png b/gfx/icons/charmander.png similarity index 100% rename from gfx/icon/charmander.png rename to gfx/icons/charmander.png diff --git a/gfx/icon/clefairy.png b/gfx/icons/clefairy.png similarity index 100% rename from gfx/icon/clefairy.png rename to gfx/icons/clefairy.png diff --git a/gfx/icon/diglett.png b/gfx/icons/diglett.png similarity index 100% rename from gfx/icon/diglett.png rename to gfx/icons/diglett.png diff --git a/gfx/icon/egg.png b/gfx/icons/egg.png similarity index 100% rename from gfx/icon/egg.png rename to gfx/icons/egg.png diff --git a/gfx/icon/equine.png b/gfx/icons/equine.png similarity index 100% rename from gfx/icon/equine.png rename to gfx/icons/equine.png diff --git a/gfx/icon/fighter.png b/gfx/icons/fighter.png similarity index 100% rename from gfx/icon/fighter.png rename to gfx/icons/fighter.png diff --git a/gfx/icon/fish.png b/gfx/icons/fish.png similarity index 100% rename from gfx/icon/fish.png rename to gfx/icons/fish.png diff --git a/gfx/icon/fox.png b/gfx/icons/fox.png similarity index 100% rename from gfx/icon/fox.png rename to gfx/icons/fox.png diff --git a/gfx/icon/geodude.png b/gfx/icons/geodude.png similarity index 100% rename from gfx/icon/geodude.png rename to gfx/icons/geodude.png diff --git a/gfx/icon/ghost.png b/gfx/icons/ghost.png similarity index 100% rename from gfx/icon/ghost.png rename to gfx/icons/ghost.png diff --git a/gfx/icon/gyarados.png b/gfx/icons/gyarados.png similarity index 100% rename from gfx/icon/gyarados.png rename to gfx/icons/gyarados.png diff --git a/gfx/icon/ho_oh.png b/gfx/icons/ho_oh.png similarity index 100% rename from gfx/icon/ho_oh.png rename to gfx/icons/ho_oh.png diff --git a/gfx/icon/humanshape.png b/gfx/icons/humanshape.png similarity index 100% rename from gfx/icon/humanshape.png rename to gfx/icons/humanshape.png diff --git a/gfx/icon/item.png b/gfx/icons/item.png similarity index 100% rename from gfx/icon/item.png rename to gfx/icons/item.png diff --git a/gfx/icon/jellyfish.png b/gfx/icons/jellyfish.png similarity index 100% rename from gfx/icon/jellyfish.png rename to gfx/icons/jellyfish.png diff --git a/gfx/icon/jigglypuff.png b/gfx/icons/jigglypuff.png similarity index 100% rename from gfx/icon/jigglypuff.png rename to gfx/icons/jigglypuff.png diff --git a/gfx/icon/lapras.png b/gfx/icons/lapras.png similarity index 100% rename from gfx/icon/lapras.png rename to gfx/icons/lapras.png diff --git a/gfx/icon/lugia.png b/gfx/icons/lugia.png similarity index 100% rename from gfx/icon/lugia.png rename to gfx/icons/lugia.png diff --git a/gfx/icon/mail.png b/gfx/icons/mail.png similarity index 100% rename from gfx/icon/mail.png rename to gfx/icons/mail.png diff --git a/gfx/icon/mail2.png b/gfx/icons/mail2.png similarity index 100% rename from gfx/icon/mail2.png rename to gfx/icons/mail2.png diff --git a/gfx/icon/monster.png b/gfx/icons/monster.png similarity index 100% rename from gfx/icon/monster.png rename to gfx/icons/monster.png diff --git a/gfx/icon/moth.png b/gfx/icons/moth.png similarity index 100% rename from gfx/icon/moth.png rename to gfx/icons/moth.png diff --git a/gfx/icon/oddish.png b/gfx/icons/oddish.png similarity index 100% rename from gfx/icon/oddish.png rename to gfx/icons/oddish.png diff --git a/data/palettes/party_menu.pal b/gfx/icons/party_menu.pal similarity index 100% rename from data/palettes/party_menu.pal rename to gfx/icons/party_menu.pal diff --git a/gfx/icon/pikachu.png b/gfx/icons/pikachu.png similarity index 100% rename from gfx/icon/pikachu.png rename to gfx/icons/pikachu.png diff --git a/gfx/icon/poliwag.png b/gfx/icons/poliwag.png similarity index 100% rename from gfx/icon/poliwag.png rename to gfx/icons/poliwag.png diff --git a/gfx/icon/serpent.png b/gfx/icons/serpent.png similarity index 100% rename from gfx/icon/serpent.png rename to gfx/icons/serpent.png diff --git a/gfx/icon/shell.png b/gfx/icons/shell.png similarity index 100% rename from gfx/icon/shell.png rename to gfx/icons/shell.png diff --git a/gfx/icon/slowpoke.png b/gfx/icons/slowpoke.png similarity index 100% rename from gfx/icon/slowpoke.png rename to gfx/icons/slowpoke.png diff --git a/gfx/icon/snorlax.png b/gfx/icons/snorlax.png similarity index 100% rename from gfx/icon/snorlax.png rename to gfx/icons/snorlax.png diff --git a/gfx/icon/squirtle.png b/gfx/icons/squirtle.png similarity index 100% rename from gfx/icon/squirtle.png rename to gfx/icons/squirtle.png diff --git a/gfx/icon/staryu.png b/gfx/icons/staryu.png similarity index 100% rename from gfx/icon/staryu.png rename to gfx/icons/staryu.png diff --git a/gfx/icon/sudowoodo.png b/gfx/icons/sudowoodo.png similarity index 100% rename from gfx/icon/sudowoodo.png rename to gfx/icons/sudowoodo.png diff --git a/gfx/icon/unown.png b/gfx/icons/unown.png similarity index 100% rename from gfx/icon/unown.png rename to gfx/icons/unown.png diff --git a/gfx/icon/voltorb.png b/gfx/icons/voltorb.png similarity index 100% rename from gfx/icon/voltorb.png rename to gfx/icons/voltorb.png diff --git a/data/palettes/crystal_intro/fade.pal b/gfx/intro/fade.pal similarity index 100% rename from data/palettes/crystal_intro/fade.pal rename to gfx/intro/fade.pal diff --git a/data/palettes/crystal_intro/gamefreak_logo.pal b/gfx/intro/gamefreak_logo.pal similarity index 100% rename from data/palettes/crystal_intro/gamefreak_logo.pal rename to gfx/intro/gamefreak_logo.pal diff --git a/data/palettes/crystal_intro/intro_1.pal b/gfx/intro/intro_1.pal similarity index 100% rename from data/palettes/crystal_intro/intro_1.pal rename to gfx/intro/intro_1.pal diff --git a/data/palettes/crystal_intro/intro_2.pal b/gfx/intro/intro_2.pal similarity index 100% rename from data/palettes/crystal_intro/intro_2.pal rename to gfx/intro/intro_2.pal diff --git a/data/palettes/crystal_intro/intro_3.pal b/gfx/intro/intro_3.pal similarity index 100% rename from data/palettes/crystal_intro/intro_3.pal rename to gfx/intro/intro_3.pal diff --git a/data/palettes/crystal_intro/intro_4.pal b/gfx/intro/intro_4.pal similarity index 100% rename from data/palettes/crystal_intro/intro_4.pal rename to gfx/intro/intro_4.pal diff --git a/data/palettes/crystal_intro/intro_5.pal b/gfx/intro/intro_5.pal similarity index 100% rename from data/palettes/crystal_intro/intro_5.pal rename to gfx/intro/intro_5.pal diff --git a/data/palettes/mail.pal b/gfx/mail/mail.pal similarity index 100% rename from data/palettes/mail.pal rename to gfx/mail/mail.pal diff --git a/data/palettes/mg_mobile.pal b/gfx/mystery_gift/mg_mobile.pal similarity index 100% rename from data/palettes/mg_mobile.pal rename to gfx/mystery_gift/mg_mobile.pal diff --git a/data/palettes/pack.pal b/gfx/pack/pack.pal similarity index 100% rename from data/palettes/pack.pal rename to gfx/pack/pack.pal diff --git a/data/palettes/pack_f.pal b/gfx/pack/pack_f.pal similarity index 100% rename from data/palettes/pack_f.pal rename to gfx/pack/pack_f.pal diff --git a/data/palettes/pokegear.pal b/gfx/pokegear/pokegear.pal similarity index 100% rename from data/palettes/pokegear.pal rename to gfx/pokegear/pokegear.pal diff --git a/data/palettes/pokegear_f.pal b/gfx/pokegear/pokegear_f.pal similarity index 100% rename from data/palettes/pokegear_f.pal rename to gfx/pokegear/pokegear_f.pal diff --git a/data/palettes/town_map_palette_map.asm b/gfx/pokegear/town_map_palette_map.asm similarity index 100% rename from data/palettes/town_map_palette_map.asm rename to gfx/pokegear/town_map_palette_map.asm diff --git a/data/palettes/blk_packets.asm b/gfx/sgb/blk_packets.asm similarity index 100% rename from data/palettes/blk_packets.asm rename to gfx/sgb/blk_packets.asm diff --git a/data/palettes/pal_packets.asm b/gfx/sgb/pal_packets.asm similarity index 98% rename from data/palettes/pal_packets.asm rename to gfx/sgb/pal_packets.asm index 57cd9e492..7ab27d359 100644 --- a/data/palettes/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -1,3 +1,5 @@ +; indexes correspond to PredefPals palettes (see gfx/sgb/predef.pal) + PalPacket_9b96: db $51, $48, $00, $49, $00, $4a, $00, $4b, $00, $00, $00, $00, $00, $00, $00, $00 diff --git a/data/palettes/predef.pal b/gfx/sgb/predef.pal similarity index 100% rename from data/palettes/predef.pal rename to gfx/sgb/predef.pal diff --git a/data/palettes/sgb_border.pal b/gfx/sgb/sgb_border.pal similarity index 100% rename from data/palettes/sgb_border.pal rename to gfx/sgb/sgb_border.pal diff --git a/data/palettes/slot_machine.pal b/gfx/slots/slots.pal similarity index 100% rename from data/palettes/slot_machine.pal rename to gfx/slots/slots.pal diff --git a/data/palettes/overworld/map_objects.pal b/gfx/sprites/map_objects.pal similarity index 100% rename from data/palettes/overworld/map_objects.pal rename to gfx/sprites/map_objects.pal diff --git a/data/palettes/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower.pal similarity index 100% rename from data/palettes/tilesets/battle_tower.pal rename to gfx/tilesets/battle_tower.pal diff --git a/data/palettes/overworld/tileset_bg.pal b/gfx/tilesets/bg_tiles.pal similarity index 100% rename from data/palettes/overworld/tileset_bg.pal rename to gfx/tilesets/bg_tiles.pal diff --git a/data/palettes/tilesets/house_1.pal b/gfx/tilesets/house_1.pal similarity index 100% rename from data/palettes/tilesets/house_1.pal rename to gfx/tilesets/house_1.pal diff --git a/data/palettes/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal similarity index 100% rename from data/palettes/tilesets/ice_path.pal rename to gfx/tilesets/ice_path.pal diff --git a/data/palettes/tilesets/pokecom_center.pal b/gfx/tilesets/pokecom_center.pal similarity index 100% rename from data/palettes/tilesets/pokecom_center.pal rename to gfx/tilesets/pokecom_center.pal diff --git a/data/palettes/tilesets/radio_tower.pal b/gfx/tilesets/radio_tower.pal similarity index 100% rename from data/palettes/tilesets/radio_tower.pal rename to gfx/tilesets/radio_tower.pal diff --git a/data/palettes/overworld/roofs.pal b/gfx/tilesets/roofs.pal similarity index 100% rename from data/palettes/overworld/roofs.pal rename to gfx/tilesets/roofs.pal diff --git a/data/palettes/unused_title/bg.pal b/gfx/title/old_bg.pal similarity index 100% rename from data/palettes/unused_title/bg.pal rename to gfx/title/old_bg.pal diff --git a/data/palettes/unused_title/ob.pal b/gfx/title/old_fg.pal similarity index 100% rename from data/palettes/unused_title/ob.pal rename to gfx/title/old_fg.pal diff --git a/data/palettes/title.pal b/gfx/title/title.pal similarity index 100% rename from data/palettes/title.pal rename to gfx/title/title.pal diff --git a/data/palettes/trade_room.pal b/gfx/trade/border.pal similarity index 100% rename from data/palettes/trade_room.pal rename to gfx/trade/border.pal diff --git a/data/palettes/unknown/49757.pal b/gfx/unknown/49757.pal similarity index 100% rename from data/palettes/unknown/49757.pal rename to gfx/unknown/49757.pal diff --git a/gfx/unknown/4985a.asm b/gfx/unknown/4985a.asm new file mode 100644 index 000000000..8449d6a1a --- /dev/null +++ b/gfx/unknown/4985a.asm @@ -0,0 +1,8 @@ + db $ab,$03, $57,$24, $ac,$0e, $13,$32 + db $be,$30, $5b,$4c, $47,$60, $ed,$f2 + db $ab,$03, $55,$26, $aa,$0a, $13,$3a + db $be,$28, $33,$24, $6e,$71, $df,$b0 + db $a8,$00, $e5,$e0, $9a,$fc, $f4,$2c + db $fe,$4c, $a3,$5e, $c6,$3a, $ab,$4d + db $a8,$00, $b5,$b0, $de,$e8, $fc,$1c + db $ba,$66, $f7,$0e, $ba,$5e, $43,$bd diff --git a/data/palettes/unknown/b6f1.pal b/gfx/unknown/b6f1.pal similarity index 100% rename from data/palettes/unknown/b6f1.pal rename to gfx/unknown/b6f1.pal diff --git a/data/palettes/unknown/b719.pal b/gfx/unknown/b719.pal similarity index 100% rename from data/palettes/unknown/b719.pal rename to gfx/unknown/b719.pal diff --git a/data/palettes/unknown/b789.pal b/gfx/unknown/b789.pal similarity index 100% rename from data/palettes/unknown/b789.pal rename to gfx/unknown/b789.pal diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm index 761b15348..458d8e440 100644 --- a/tilesets/special_palettes.asm +++ b/tilesets/special_palettes.asm @@ -63,7 +63,7 @@ LoadPokeComPalette: ; 494f2 ; 49501 PokeComPalette: ; 49501 -INCLUDE "data/palettes/tilesets/pokecom_center.pal" +INCLUDE "gfx/tilesets/pokecom_center.pal" ; 49541 LoadBattleTowerPalette: ; 49541 @@ -76,7 +76,7 @@ LoadBattleTowerPalette: ; 49541 ; 49550 BattleTowerPalette: ; 49550 -INCLUDE "data/palettes/tilesets/battle_tower.pal" +INCLUDE "gfx/tilesets/battle_tower.pal" ; 49590 LoadIcePathPalette: ; 49590 @@ -89,7 +89,7 @@ LoadIcePathPalette: ; 49590 ; 4959f IcePathPalette: ; 4959f -INCLUDE "data/palettes/tilesets/ice_path.pal" +INCLUDE "gfx/tilesets/ice_path.pal" ; 495df LoadHousePalette: ; 495df @@ -102,7 +102,7 @@ LoadHousePalette: ; 495df ; 495ee HousePalette: ; 495ee -INCLUDE "data/palettes/tilesets/house_1.pal" +INCLUDE "gfx/tilesets/house_1.pal" ; 4962e LoadRadioTowerPalette: ; 4962e @@ -115,7 +115,7 @@ LoadRadioTowerPalette: ; 4962e ; 4963d RadioTowerPalette: ; 4963d -INCLUDE "data/palettes/tilesets/radio_tower.pal" +INCLUDE "gfx/tilesets/radio_tower.pal" ; 4967d MansionPalette1: ; 4967d