Move graphics through mail to src

3 files changed, 52 insertions, 164 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 31cd6e887..5702ab599 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1,170 +1,6 @@
 	.section gfx_data, "aw", %progbits
 
 	.align 2
-gBattleAnimSpritePal_Shock3:: @ 8E93748
-	.incbin "graphics/battle_anims/sprites/shock_3.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Shock3:: @ 8E93770
-	.incbin "graphics/battle_anims/sprites/shock_3.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_WhiteFeather:: @ 8E93958
-	.incbin "graphics/battle_anims/sprites/white_feather.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_WhiteFeather:: @ 8E93974
-	.incbin "graphics/battle_anims/sprites/white_feather.4bpp.lz"
-
-	.align 2
-gBattleAnimSpritePal_Sparkle6:: @ 8E93A9C
-	.incbin "graphics/battle_anims/sprites/sparkle_6.gbapal.lz"
-
-	.align 2
-gBattleAnimSpriteGfx_Sparkle6:: @ 8E93AB4
-	.incbin "graphics/battle_anims/sprites/sparkle_6.4bpp.lz"
-
-	.align 2
-gGhostPalette:: @ 8E93B14
-	.incbin "graphics/pokemon/ghost/front.gbapal.lz"
-
-	.align 2
-gGhostFrontPic:: @ 8E93B38
-	.incbin "graphics/pokemon/ghost/front.4bpp.lz"
-
-gFile_graphics_mail_orange_palette_pal:: @ 8E93EA0
-	.incbin "graphics/mail/orange/palette.gbapal"
-
-gFile_graphics_mail_harbor_palette_pal:: @ 8E93EC0
-	.incbin "graphics/mail/harbor/palette.gbapal"
-
-gFile_graphics_mail_glitter_palette_pal:: @ 8E93EE0
-	.incbin "graphics/mail/glitter/palette.gbapal"
-
-gFile_graphics_mail_mech_palette_pal:: @ 8E93F00
-	.incbin "graphics/mail/mech/palette.gbapal"
-
-gFile_graphics_mail_wood_palette_pal:: @ 8E93F20
-	.incbin "graphics/mail/wood/palette.gbapal"
-
-gFile_graphics_mail_wave_palette_pal:: @ 8E93F40
-	.incbin "graphics/mail/wave/palette.gbapal"
-
-gFile_graphics_mail_bead_palette_pal:: @ 8E93F60
-	.incbin "graphics/mail/bead/palette.gbapal"
-
-gFile_graphics_mail_shadow_palette_pal:: @ 8E93F80
-	.incbin "graphics/mail/shadow/palette.gbapal"
-
-gFile_graphics_mail_tropic_palette_pal:: @ 8E93FA0
-	.incbin "graphics/mail/tropic/palette.gbapal"
-
-gFile_graphics_mail_dream_palette_pal:: @ 8E93FC0
-	.incbin "graphics/mail/dream/palette.gbapal"
-
-gFile_graphics_mail_fab_palette_pal:: @ 8E93FE0
-	.incbin "graphics/mail/fab/palette.gbapal"
-
-gFile_graphics_mail_retro_palette_pal:: @ 8E94000
-	.incbin "graphics/mail/retro/palette.gbapal"
-
-	.align 2
-gFile_graphics_mail_orange_tiles_sheet:: @ 8E94020
-	.incbin "graphics/mail/orange/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_harbor_tiles_sheet:: @ 8E941C0
-	.incbin "graphics/mail/harbor/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_glitter_tiles_sheet:: @ 8E942FC
-	.incbin "graphics/mail/glitter/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_mech_tiles_sheet:: @ 8E9450C
-	.incbin "graphics/mail/mech/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_wood_tiles_sheet:: @ 8E945E4
-	.incbin "graphics/mail/wood/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_wave_tiles_sheet:: @ 8E947DC
-	.incbin "graphics/mail/wave/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_bead_tiles_sheet:: @ 8E9495C
-	.incbin "graphics/mail/bead/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_shadow_tiles_sheet:: @ 8E94A04
-	.incbin "graphics/mail/shadow/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_tropic_tiles_sheet:: @ 8E94B94
-	.incbin "graphics/mail/tropic/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_dream_tiles_sheet:: @ 8E94CD4
-	.incbin "graphics/mail/dream/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_fab_tiles_sheet:: @ 8E94E3C
-	.incbin "graphics/mail/fab/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_retro_tiles_sheet:: @ 8E94F8C
-	.incbin "graphics/mail/retro/tiles.4bpp.lz"
-
-	.align 2
-gFile_graphics_mail_orange_map_tilemap:: @ 8E9522C
-	.incbin "graphics/mail/orange/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_harbor_map_tilemap:: @ 8E95304
-	.incbin "graphics/mail/harbor/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_glitter_map_tilemap:: @ 8E953E4
-	.incbin "graphics/mail/glitter/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_mech_map_tilemap:: @ 8E954F0
-	.incbin "graphics/mail/mech/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_wood_map_tilemap:: @ 8E955CC
-	.incbin "graphics/mail/wood/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_wave_map_tilemap:: @ 8E956BC
-	.incbin "graphics/mail/wave/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_bead_map_tilemap:: @ 8E9579C
-	.incbin "graphics/mail/bead/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_shadow_map_tilemap:: @ 8E9587C
-	.incbin "graphics/mail/shadow/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_tropic_map_tilemap:: @ 8E95988
-	.incbin "graphics/mail/tropic/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_dream_map_tilemap:: @ 8E95A78
-	.incbin "graphics/mail/dream/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_fab_map_tilemap:: @ 8E95B70
-	.incbin "graphics/mail/fab/map.bin.lz"
-
-	.align 2
-gFile_graphics_mail_retro_map_tilemap:: @ 8E95C88
-	.incbin "graphics/mail/retro/map.bin.lz"
-
-	.align 2
 gFireRedMenuElements1_Pal:: @ 8E95D9C
 	.incbin "graphics/interface/dex_caught_pokeball.gbapal"
 
diff --git a/src/data/graphics/mail.h b/src/data/graphics/mail.h
new file mode 100644
index 000000000..86d827b49
--- /dev/null
+++ b/src/data/graphics/mail.h
@@ -0,0 +1,38 @@
+const u16 gFile_graphics_mail_orange_palette_pal[] = INCBIN_U16("graphics/mail/orange/palette.gbapal");
+const u16 gFile_graphics_mail_harbor_palette_pal[] = INCBIN_U16("graphics/mail/harbor/palette.gbapal");
+const u16 gFile_graphics_mail_glitter_palette_pal[] = INCBIN_U16("graphics/mail/glitter/palette.gbapal");
+const u16 gFile_graphics_mail_mech_palette_pal[] = INCBIN_U16("graphics/mail/mech/palette.gbapal");
+const u16 gFile_graphics_mail_wood_palette_pal[] = INCBIN_U16("graphics/mail/wood/palette.gbapal");
+const u16 gFile_graphics_mail_wave_palette_pal[] = INCBIN_U16("graphics/mail/wave/palette.gbapal");
+const u16 gFile_graphics_mail_bead_palette_pal[] = INCBIN_U16("graphics/mail/bead/palette.gbapal");
+const u16 gFile_graphics_mail_shadow_palette_pal[] = INCBIN_U16("graphics/mail/shadow/palette.gbapal");
+const u16 gFile_graphics_mail_tropic_palette_pal[] = INCBIN_U16("graphics/mail/tropic/palette.gbapal");
+const u16 gFile_graphics_mail_dream_palette_pal[] = INCBIN_U16("graphics/mail/dream/palette.gbapal");
+const u16 gFile_graphics_mail_fab_palette_pal[] = INCBIN_U16("graphics/mail/fab/palette.gbapal");
+const u16 gFile_graphics_mail_retro_palette_pal[] = INCBIN_U16("graphics/mail/retro/palette.gbapal");
+
+const u32 gFile_graphics_mail_orange_tiles_sheet[] = INCBIN_U32("graphics/mail/orange/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_harbor_tiles_sheet[] = INCBIN_U32("graphics/mail/harbor/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_glitter_tiles_sheet[] = INCBIN_U32("graphics/mail/glitter/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_mech_tiles_sheet[] = INCBIN_U32("graphics/mail/mech/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_wood_tiles_sheet[] = INCBIN_U32("graphics/mail/wood/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_wave_tiles_sheet[] = INCBIN_U32("graphics/mail/wave/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_bead_tiles_sheet[] = INCBIN_U32("graphics/mail/bead/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_shadow_tiles_sheet[] = INCBIN_U32("graphics/mail/shadow/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_tropic_tiles_sheet[] = INCBIN_U32("graphics/mail/tropic/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_dream_tiles_sheet[] = INCBIN_U32("graphics/mail/dream/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_fab_tiles_sheet[] = INCBIN_U32("graphics/mail/fab/tiles.4bpp.lz");
+const u32 gFile_graphics_mail_retro_tiles_sheet[] = INCBIN_U32("graphics/mail/retro/tiles.4bpp.lz");
+
+const u32 gFile_graphics_mail_orange_map_tilemap[] = INCBIN_U32("graphics/mail/orange/map.bin.lz");
+const u32 gFile_graphics_mail_harbor_map_tilemap[] = INCBIN_U32("graphics/mail/harbor/map.bin.lz");
+const u32 gFile_graphics_mail_glitter_map_tilemap[] = INCBIN_U32("graphics/mail/glitter/map.bin.lz");
+const u32 gFile_graphics_mail_mech_map_tilemap[] = INCBIN_U32("graphics/mail/mech/map.bin.lz");
+const u32 gFile_graphics_mail_wood_map_tilemap[] = INCBIN_U32("graphics/mail/wood/map.bin.lz");
+const u32 gFile_graphics_mail_wave_map_tilemap[] = INCBIN_U32("graphics/mail/wave/map.bin.lz");
+const u32 gFile_graphics_mail_bead_map_tilemap[] = INCBIN_U32("graphics/mail/bead/map.bin.lz");
+const u32 gFile_graphics_mail_shadow_map_tilemap[] = INCBIN_U32("graphics/mail/shadow/map.bin.lz");
+const u32 gFile_graphics_mail_tropic_map_tilemap[] = INCBIN_U32("graphics/mail/tropic/map.bin.lz");
+const u32 gFile_graphics_mail_dream_map_tilemap[] = INCBIN_U32("graphics/mail/dream/map.bin.lz");
+const u32 gFile_graphics_mail_fab_map_tilemap[] = INCBIN_U32("graphics/mail/fab/map.bin.lz");
+const u32 gFile_graphics_mail_retro_map_tilemap[] = INCBIN_U32("graphics/mail/retro/map.bin.lz");
diff --git a/src/graphics.c b/src/graphics.c
index ad18a62b8..1001f509e 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1158,3 +1158,17 @@ const u32 gUnknown_8E86F98[] = INCBIN_U32("graphics/teachy_tv/palettes.gbapal.lz
 const u32 gUnknown_8E87010[] = INCBIN_U32("graphics/unknown/unknown_E87010.gbapal.lz");
 
 #include "data/graphics/items.h"
+
+const u32 gBattleAnimSpritePal_Shock3[] = INCBIN_U32("graphics/battle_anims/sprites/shock_3.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Shock3[] = INCBIN_U32("graphics/battle_anims/sprites/shock_3.4bpp.lz");
+
+const u32 gBattleAnimSpritePal_WhiteFeather[] = INCBIN_U32("graphics/battle_anims/sprites/white_feather.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_WhiteFeather[] = INCBIN_U32("graphics/battle_anims/sprites/white_feather.4bpp.lz");
+
+const u32 gBattleAnimSpritePal_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.gbapal.lz");
+const u32 gBattleAnimSpriteGfx_Sparkle6[] = INCBIN_U32("graphics/battle_anims/sprites/sparkle_6.4bpp.lz");
+
+const u32 gGhostPalette[] = INCBIN_U32("graphics/pokemon/ghost/front.gbapal.lz");
+const u32 gGhostFrontPic[] = INCBIN_U32("graphics/pokemon/ghost/front.4bpp.lz");
+
+#include "data/graphics/mail.h"