Move data/palettes/ .pal files into gfx/

12 files changed, 44 insertions, 44 deletions

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