102 files changed, 97 insertions, 102 deletions

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
index 831bbda95..831bbda95 100644
--- a/data/palettes/exp_bar.pal
+++ b/gfx/battle/exp_bar.pal
diff --git a/data/palettes/hp_bar.pal b/gfx/battle/hp_bar.pal
index 909be8efd..909be8efd 100644
--- a/data/palettes/hp_bar.pal
+++ b/gfx/battle/hp_bar.pal
diff --git a/data/palettes/battle_objects.pal b/gfx/battle_anims/battle_anims.pal
index d2ebb6cef..d2ebb6cef 100644
--- a/data/palettes/battle_objects.pal
+++ b/gfx/battle_anims/battle_anims.pal
diff --git a/data/palettes/card_flip.pal b/gfx/card_flip/card_flip.pal
index 24c5566f8..24c5566f8 100644
--- a/data/palettes/card_flip.pal
+++ b/gfx/card_flip/card_flip.pal
diff --git a/data/palettes/credits.pal b/gfx/credits/credits.pal
index c473f0414..c473f0414 100644
--- a/data/palettes/credits.pal
+++ b/gfx/credits/credits.pal
diff --git a/data/palettes/debug/bg.pal b/gfx/debug/bg.pal
index d0b573598..d0b573598 100644
--- a/data/palettes/debug/bg.pal
+++ b/gfx/debug/bg.pal
diff --git a/data/palettes/debug/ob.pal b/gfx/debug/ob.pal
index 2a03f4e8f..2a03f4e8f 100644
--- a/data/palettes/debug/ob.pal
+++ b/gfx/debug/ob.pal
diff --git a/data/palettes/diploma.pal b/gfx/diploma/diploma.pal
index 2c9ec6453..2c9ec6453 100644
--- a/data/palettes/diploma.pal
+++ b/gfx/diploma/diploma.pal
diff --git a/data/palettes/overworld/bg_text.pal b/gfx/font/bg_text.pal
index 39a4a194c..39a4a194c 100644
--- a/data/palettes/overworld/bg_text.pal
+++ b/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
index 3ea2ea832..3ea2ea832 100644
--- a/gfx/icon/bat.png
+++ b/gfx/icons/bat.png
diff --git a/gfx/icon/bigmon.png b/gfx/icons/bigmon.png
index 4a77f1ece..4a77f1ece 100644
--- a/gfx/icon/bigmon.png
+++ b/gfx/icons/bigmon.png
diff --git a/gfx/icon/bird.png b/gfx/icons/bird.png
index e13bc6cba..e13bc6cba 100644
--- a/gfx/icon/bird.png
+++ b/gfx/icons/bird.png
diff --git a/gfx/icon/blob.png b/gfx/icons/blob.png
index aef74ae64..aef74ae64 100644
--- a/gfx/icon/blob.png
+++ b/gfx/icons/blob.png
diff --git a/gfx/icon/bug.png b/gfx/icons/bug.png
index 97504f721..97504f721 100644
--- a/gfx/icon/bug.png
+++ b/gfx/icons/bug.png
diff --git a/gfx/icon/bulbasaur.png b/gfx/icons/bulbasaur.png
index 1de6636f8..1de6636f8 100644
--- a/gfx/icon/bulbasaur.png
+++ b/gfx/icons/bulbasaur.png
diff --git a/gfx/icon/caterpillar.png b/gfx/icons/caterpillar.png
index 85558104b..85558104b 100644
--- a/gfx/icon/caterpillar.png
+++ b/gfx/icons/caterpillar.png
diff --git a/gfx/icon/charmander.png b/gfx/icons/charmander.png
index 3d85f1316..3d85f1316 100644
--- a/gfx/icon/charmander.png
+++ b/gfx/icons/charmander.png
diff --git a/gfx/icon/clefairy.png b/gfx/icons/clefairy.png
index 0017d9ddb..0017d9ddb 100644
--- a/gfx/icon/clefairy.png
+++ b/gfx/icons/clefairy.png
diff --git a/gfx/icon/diglett.png b/gfx/icons/diglett.png
index 307181f71..307181f71 100644
--- a/gfx/icon/diglett.png
+++ b/gfx/icons/diglett.png
diff --git a/gfx/icon/egg.png b/gfx/icons/egg.png
index 129346fd9..129346fd9 100644
--- a/gfx/icon/egg.png
+++ b/gfx/icons/egg.png
diff --git a/gfx/icon/equine.png b/gfx/icons/equine.png
index b3da7181b..b3da7181b 100644
--- a/gfx/icon/equine.png
+++ b/gfx/icons/equine.png
diff --git a/gfx/icon/fighter.png b/gfx/icons/fighter.png
index 9deab976f..9deab976f 100644
--- a/gfx/icon/fighter.png
+++ b/gfx/icons/fighter.png
diff --git a/gfx/icon/fish.png b/gfx/icons/fish.png
index 35dbb1d2f..35dbb1d2f 100644
--- a/gfx/icon/fish.png
+++ b/gfx/icons/fish.png
diff --git a/gfx/icon/fox.png b/gfx/icons/fox.png
index 0419c87c7..0419c87c7 100644
--- a/gfx/icon/fox.png
+++ b/gfx/icons/fox.png
diff --git a/gfx/icon/geodude.png b/gfx/icons/geodude.png
index 02db8771d..02db8771d 100644
--- a/gfx/icon/geodude.png
+++ b/gfx/icons/geodude.png
diff --git a/gfx/icon/ghost.png b/gfx/icons/ghost.png
index 7ecf8ed0f..7ecf8ed0f 100644
--- a/gfx/icon/ghost.png
+++ b/gfx/icons/ghost.png
diff --git a/gfx/icon/gyarados.png b/gfx/icons/gyarados.png
index fad5d8ae3..fad5d8ae3 100644
--- a/gfx/icon/gyarados.png
+++ b/gfx/icons/gyarados.png
diff --git a/gfx/icon/ho_oh.png b/gfx/icons/ho_oh.png
index 6ee91781e..6ee91781e 100644
--- a/gfx/icon/ho_oh.png
+++ b/gfx/icons/ho_oh.png
diff --git a/gfx/icon/humanshape.png b/gfx/icons/humanshape.png
index f5d0b9290..f5d0b9290 100644
--- a/gfx/icon/humanshape.png
+++ b/gfx/icons/humanshape.png
diff --git a/gfx/icon/item.png b/gfx/icons/item.png
index a47d55009..a47d55009 100644
--- a/gfx/icon/item.png
+++ b/gfx/icons/item.png
diff --git a/gfx/icon/jellyfish.png b/gfx/icons/jellyfish.png
index 8583d5cdc..8583d5cdc 100644
--- a/gfx/icon/jellyfish.png
+++ b/gfx/icons/jellyfish.png
diff --git a/gfx/icon/jigglypuff.png b/gfx/icons/jigglypuff.png
index 70f87b0df..70f87b0df 100644
--- a/gfx/icon/jigglypuff.png
+++ b/gfx/icons/jigglypuff.png
diff --git a/gfx/icon/lapras.png b/gfx/icons/lapras.png
index 89ad063d0..89ad063d0 100644
--- a/gfx/icon/lapras.png
+++ b/gfx/icons/lapras.png
diff --git a/gfx/icon/lugia.png b/gfx/icons/lugia.png
index 56dbf283b..56dbf283b 100644
--- a/gfx/icon/lugia.png
+++ b/gfx/icons/lugia.png
diff --git a/gfx/icon/mail.png b/gfx/icons/mail.png
index 53db461e5..53db461e5 100644
--- a/gfx/icon/mail.png
+++ b/gfx/icons/mail.png
diff --git a/gfx/icon/mail2.png b/gfx/icons/mail2.png
index 7ad25edbf..7ad25edbf 100644
--- a/gfx/icon/mail2.png
+++ b/gfx/icons/mail2.png
diff --git a/gfx/icon/monster.png b/gfx/icons/monster.png
index f97c67b64..f97c67b64 100644
--- a/gfx/icon/monster.png
+++ b/gfx/icons/monster.png
diff --git a/gfx/icon/moth.png b/gfx/icons/moth.png
index f44440f5c..f44440f5c 100644
--- a/gfx/icon/moth.png
+++ b/gfx/icons/moth.png
diff --git a/gfx/icon/oddish.png b/gfx/icons/oddish.png
index c069bd444..c069bd444 100644
--- a/gfx/icon/oddish.png
+++ b/gfx/icons/oddish.png
diff --git a/data/palettes/party_menu.pal b/gfx/icons/party_menu.pal
index 70af517be..70af517be 100644
--- a/data/palettes/party_menu.pal
+++ b/gfx/icons/party_menu.pal
diff --git a/gfx/icon/pikachu.png b/gfx/icons/pikachu.png
index 7b7d23dbd..7b7d23dbd 100644
--- a/gfx/icon/pikachu.png
+++ b/gfx/icons/pikachu.png
diff --git a/gfx/icon/poliwag.png b/gfx/icons/poliwag.png
index b6b63a81e..b6b63a81e 100644
--- a/gfx/icon/poliwag.png
+++ b/gfx/icons/poliwag.png
diff --git a/gfx/icon/serpent.png b/gfx/icons/serpent.png
index de575f088..de575f088 100644
--- a/gfx/icon/serpent.png
+++ b/gfx/icons/serpent.png
diff --git a/gfx/icon/shell.png b/gfx/icons/shell.png
index 4daf27634..4daf27634 100644
--- a/gfx/icon/shell.png
+++ b/gfx/icons/shell.png
diff --git a/gfx/icon/slowpoke.png b/gfx/icons/slowpoke.png
index 221f3f7a5..221f3f7a5 100644
--- a/gfx/icon/slowpoke.png
+++ b/gfx/icons/slowpoke.png
diff --git a/gfx/icon/snorlax.png b/gfx/icons/snorlax.png
index f2c1b0b74..f2c1b0b74 100644
--- a/gfx/icon/snorlax.png
+++ b/gfx/icons/snorlax.png
diff --git a/gfx/icon/squirtle.png b/gfx/icons/squirtle.png
index 614aa21b2..614aa21b2 100644
--- a/gfx/icon/squirtle.png
+++ b/gfx/icons/squirtle.png
diff --git a/gfx/icon/staryu.png b/gfx/icons/staryu.png
index 52361c780..52361c780 100644
--- a/gfx/icon/staryu.png
+++ b/gfx/icons/staryu.png
diff --git a/gfx/icon/sudowoodo.png b/gfx/icons/sudowoodo.png
index d115356bb..d115356bb 100644
--- a/gfx/icon/sudowoodo.png
+++ b/gfx/icons/sudowoodo.png
diff --git a/gfx/icon/unown.png b/gfx/icons/unown.png
index 0a4d0e426..0a4d0e426 100644
--- a/gfx/icon/unown.png
+++ b/gfx/icons/unown.png
diff --git a/gfx/icon/voltorb.png b/gfx/icons/voltorb.png
index ef289541a..ef289541a 100644
--- a/gfx/icon/voltorb.png
+++ b/gfx/icons/voltorb.png
diff --git a/data/palettes/crystal_intro/fade.pal b/gfx/intro/fade.pal
index 8e03cbc43..8e03cbc43 100644
--- a/data/palettes/crystal_intro/fade.pal
+++ b/gfx/intro/fade.pal
diff --git a/data/palettes/crystal_intro/gamefreak_logo.pal b/gfx/intro/gamefreak_logo.pal
index c3a526b82..c3a526b82 100644
--- a/data/palettes/crystal_intro/gamefreak_logo.pal
+++ b/gfx/intro/gamefreak_logo.pal
diff --git a/data/palettes/crystal_intro/intro_1.pal b/gfx/intro/intro_1.pal
index ae0faadac..ae0faadac 100644
--- a/data/palettes/crystal_intro/intro_1.pal
+++ b/gfx/intro/intro_1.pal
diff --git a/data/palettes/crystal_intro/intro_2.pal b/gfx/intro/intro_2.pal
index 5f83df020..5f83df020 100644
--- a/data/palettes/crystal_intro/intro_2.pal
+++ b/gfx/intro/intro_2.pal
diff --git a/data/palettes/crystal_intro/intro_3.pal b/gfx/intro/intro_3.pal
index 95f3e052a..95f3e052a 100644
--- a/data/palettes/crystal_intro/intro_3.pal
+++ b/gfx/intro/intro_3.pal
diff --git a/data/palettes/crystal_intro/intro_4.pal b/gfx/intro/intro_4.pal
index fdcf058de..fdcf058de 100644
--- a/data/palettes/crystal_intro/intro_4.pal
+++ b/gfx/intro/intro_4.pal
diff --git a/data/palettes/crystal_intro/intro_5.pal b/gfx/intro/intro_5.pal
index 5b1be1a5f..5b1be1a5f 100644
--- a/data/palettes/crystal_intro/intro_5.pal
+++ b/gfx/intro/intro_5.pal
diff --git a/data/palettes/mail.pal b/gfx/mail/mail.pal
index 4096ffae1..4096ffae1 100644
--- a/data/palettes/mail.pal
+++ b/gfx/mail/mail.pal
diff --git a/data/palettes/mg_mobile.pal b/gfx/mystery_gift/mg_mobile.pal
index c77e8c63f..c77e8c63f 100644
--- a/data/palettes/mg_mobile.pal
+++ b/gfx/mystery_gift/mg_mobile.pal
diff --git a/data/palettes/pack.pal b/gfx/pack/pack.pal
index e8b4979bb..e8b4979bb 100644
--- a/data/palettes/pack.pal
+++ b/gfx/pack/pack.pal
diff --git a/data/palettes/pack_f.pal b/gfx/pack/pack_f.pal
index a962d97d1..a962d97d1 100644
--- a/data/palettes/pack_f.pal
+++ b/gfx/pack/pack_f.pal
diff --git a/data/palettes/pokegear.pal b/gfx/pokegear/pokegear.pal
index 397986dec..397986dec 100644
--- a/data/palettes/pokegear.pal
+++ b/gfx/pokegear/pokegear.pal
diff --git a/data/palettes/pokegear_f.pal b/gfx/pokegear/pokegear_f.pal
index 3f797c866..3f797c866 100644
--- a/data/palettes/pokegear_f.pal
+++ b/gfx/pokegear/pokegear_f.pal
diff --git a/data/palettes/town_map_palette_map.asm b/gfx/pokegear/town_map_palette_map.asm
index 67ca7fbdd..67ca7fbdd 100644
--- a/data/palettes/town_map_palette_map.asm
+++ b/gfx/pokegear/town_map_palette_map.asm
diff --git a/data/palettes/blk_packets.asm b/gfx/sgb/blk_packets.asm
index 38f68ad1d..38f68ad1d 100644
--- a/data/palettes/blk_packets.asm
+++ b/gfx/sgb/blk_packets.asm
diff --git a/data/palettes/pal_packets.asm b/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
index 15d9000fb..15d9000fb 100644
--- a/data/palettes/predef.pal
+++ b/gfx/sgb/predef.pal
diff --git a/data/palettes/sgb_border.pal b/gfx/sgb/sgb_border.pal
index fd5aec402..fd5aec402 100644
--- a/data/palettes/sgb_border.pal
+++ b/gfx/sgb/sgb_border.pal
diff --git a/data/palettes/slot_machine.pal b/gfx/slots/slots.pal
index 0eec479f2..0eec479f2 100644
--- a/data/palettes/slot_machine.pal
+++ b/gfx/slots/slots.pal
diff --git a/data/palettes/overworld/map_objects.pal b/gfx/sprites/map_objects.pal
index b0f33479a..b0f33479a 100644
--- a/data/palettes/overworld/map_objects.pal
+++ b/gfx/sprites/map_objects.pal
diff --git a/data/palettes/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower.pal
index 4e71a5575..4e71a5575 100644
--- a/data/palettes/tilesets/battle_tower.pal
+++ b/gfx/tilesets/battle_tower.pal
diff --git a/data/palettes/overworld/tileset_bg.pal b/gfx/tilesets/bg_tiles.pal
index e56746536..e56746536 100644
--- a/data/palettes/overworld/tileset_bg.pal
+++ b/gfx/tilesets/bg_tiles.pal
diff --git a/data/palettes/tilesets/house_1.pal b/gfx/tilesets/house_1.pal
index a9f8b74b6..a9f8b74b6 100644
--- a/data/palettes/tilesets/house_1.pal
+++ b/gfx/tilesets/house_1.pal
diff --git a/data/palettes/tilesets/ice_path.pal b/gfx/tilesets/ice_path.pal
index cb7659f50..cb7659f50 100644
--- a/data/palettes/tilesets/ice_path.pal
+++ b/gfx/tilesets/ice_path.pal
diff --git a/data/palettes/tilesets/pokecom_center.pal b/gfx/tilesets/pokecom_center.pal
index 9fe7b765a..9fe7b765a 100644
--- a/data/palettes/tilesets/pokecom_center.pal
+++ b/gfx/tilesets/pokecom_center.pal
diff --git a/data/palettes/tilesets/radio_tower.pal b/gfx/tilesets/radio_tower.pal
index 5799b6f77..5799b6f77 100644
--- a/data/palettes/tilesets/radio_tower.pal
+++ b/gfx/tilesets/radio_tower.pal
diff --git a/data/palettes/overworld/roofs.pal b/gfx/tilesets/roofs.pal
index ba65fc7d2..ba65fc7d2 100644
--- a/data/palettes/overworld/roofs.pal
+++ b/gfx/tilesets/roofs.pal
diff --git a/data/palettes/unused_title/bg.pal b/gfx/title/old_bg.pal
index 307eb76a1..307eb76a1 100644
--- a/data/palettes/unused_title/bg.pal
+++ b/gfx/title/old_bg.pal
diff --git a/data/palettes/unused_title/ob.pal b/gfx/title/old_fg.pal
index 80e7d9896..80e7d9896 100644
--- a/data/palettes/unused_title/ob.pal
+++ b/gfx/title/old_fg.pal
diff --git a/data/palettes/title.pal b/gfx/title/title.pal
index 95bc2a394..95bc2a394 100644
--- a/data/palettes/title.pal
+++ b/gfx/title/title.pal
diff --git a/data/palettes/trade_room.pal b/gfx/trade/border.pal
index b5615248e..b5615248e 100644
--- a/data/palettes/trade_room.pal
+++ b/gfx/trade/border.pal
diff --git a/data/palettes/unknown/49757.pal b/gfx/unknown/49757.pal
index 93e884046..93e884046 100644
--- a/data/palettes/unknown/49757.pal
+++ b/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
index 1dd56f50f..1dd56f50f 100644
--- a/data/palettes/unknown/b6f1.pal
+++ b/gfx/unknown/b6f1.pal
diff --git a/data/palettes/unknown/b719.pal b/gfx/unknown/b719.pal
index 09dd9a364..09dd9a364 100644
--- a/data/palettes/unknown/b719.pal
+++ b/gfx/unknown/b719.pal
diff --git a/data/palettes/unknown/b789.pal b/gfx/unknown/b789.pal
index cce760662..cce760662 100644
--- a/data/palettes/unknown/b789.pal
+++ b/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