diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9ca2f99876..067a23e747 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -69,4 +69,5 @@
     "black-formatter.args": [
         "-l 120"
     ],
+    "search.useIgnoreFiles": false,
 }
diff --git a/include/include_asset.h b/include/include_asset.h
new file mode 100644
index 0000000000..0e53e62e52
--- /dev/null
+++ b/include/include_asset.h
@@ -0,0 +1,32 @@
+#ifndef _H_INCLUDE_ASSET
+
+#define ASTRINGIFY_(x) #x
+#define ASTRINGIFY(x) ASTRINGIFY_(x)
+
+#define _INCLUDE_IMG(FILENAME, SYMBOLNAME) \
+    extern unsigned char SYMBOLNAME[]; \
+    __asm__( \
+        ".globl " #SYMBOLNAME"\n" \
+        ".data\n" \
+        ".align 2\n" \
+        ".type " #SYMBOLNAME", @object\n" \
+        #SYMBOLNAME":\n" \
+        ".incbin \"ver/"ASTRINGIFY(VERSION)"/build/" FILENAME ".bin\"\n" \
+    )
+
+// two macros are needed for N() usage
+#define INCLUDE_IMG(FILENAME, SYMBOLNAME) \
+    _INCLUDE_IMG(FILENAME, SYMBOLNAME)
+
+#define INCLUDE_PAL(FILENAME, SYMBOLNAME) \
+    extern unsigned short SYMBOLNAME[]; \
+    __asm__( \
+        ".globl " #SYMBOLNAME"\n" \
+        ".data\n" \
+        ".align 2\n" \
+        ".type " #SYMBOLNAME", @object\n" \
+        #SYMBOLNAME":\n" \
+        ".incbin \"ver/"ASTRINGIFY(VERSION)"/build/" FILENAME ".bin\"\n" \
+    )
+
+#endif // _H_INCLUDE_ASSET
diff --git a/src/8a160_len_700.c b/src/8a160_len_700.c
index 66b75fd202..42d2ef45bc 100644
--- a/src/8a160_len_700.c
+++ b/src/8a160_len_700.c
@@ -1,6 +1,7 @@
 #include "common.h"
+#include "include_asset.h"
 
-#include "A2960.png.inc.c"
+INCLUDE_IMG("A2960.png", D_801094B0);
 
 Vp D_801096B0 = {
     .vp = {
diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c
index c18fbd9cde..6e06e39be8 100644
--- a/src/battle/action_cmd/water_block.c
+++ b/src/battle/action_cmd/water_block.c
@@ -1,31 +1,32 @@
 #include "common.h"
 #include "battle/action_cmd.h"
+#include "include_asset.h"
 
 #define NAMESPACE action_command_water_block
 
-#include "battle/action_cmd/water_block_1.png.inc.c"
-#include "battle/action_cmd/water_block_1.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_1.png", battle_action_cmd_water_block_1_png);
+INCLUDE_PAL("battle/action_cmd/water_block_1.pal", battle_action_cmd_water_block_1_pal);
 
-#include "battle/action_cmd/water_block_2.png.inc.c"
-#include "battle/action_cmd/water_block_2.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_2.png", battle_action_cmd_water_block_2_png);
+INCLUDE_PAL("battle/action_cmd/water_block_2.pal", battle_action_cmd_water_block_2_pal);
 
-#include "battle/action_cmd/water_block_3.png.inc.c"
-#include "battle/action_cmd/water_block_3.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_3.png", battle_action_cmd_water_block_3_png);
+INCLUDE_PAL("battle/action_cmd/water_block_3.pal", battle_action_cmd_water_block_3_pal);
 
-#include "battle/action_cmd/water_block_0.png.inc.c"
-#include "battle/action_cmd/water_block_0.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_0.png", battle_action_cmd_water_block_0_png);
+INCLUDE_PAL("battle/action_cmd/water_block_0.pal", battle_action_cmd_water_block_0_pal);
 
-#include "battle/action_cmd/water_block_block.png.inc.c"
-#include "battle/action_cmd/water_block_block.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_block.png", battle_action_cmd_water_block_block_png);
+INCLUDE_PAL("battle/action_cmd/water_block_block.pal", battle_action_cmd_water_block_block_pal);
 
-#include "battle/action_cmd/water_block_circle.png.inc.c"
-#include "battle/action_cmd/water_block_circle.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_circle.png", battle_action_cmd_water_block_circle_png);
+INCLUDE_PAL("battle/action_cmd/water_block_circle.pal", battle_action_cmd_water_block_circle_pal);
 
-#include "battle/action_cmd/water_block_cloud.png.inc.c"
-#include "battle/action_cmd/water_block_cloud.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_cloud.png", battle_action_cmd_water_block_cloud_png);
+INCLUDE_PAL("battle/action_cmd/water_block_cloud.pal", battle_action_cmd_water_block_cloud_pal);
 
-#include "battle/action_cmd/water_block_4.png.inc.c"
-#include "battle/action_cmd/water_block_4.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/water_block_4.png", battle_action_cmd_water_block_4_png);
+INCLUDE_PAL("battle/action_cmd/water_block_4.pal", battle_action_cmd_water_block_4_pal);
 
 HudScript HES_WaterBlock1 = {
     HUD_ELEMENT_OP_SetVisible,
diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c
index 682f901a09..f181957014 100644
--- a/src/battle/action_cmd/whirlwind.c
+++ b/src/battle/action_cmd/whirlwind.c
@@ -1,32 +1,33 @@
 #include "common.h"
 #include "battle/action_cmd.h"
 #include "battle/action_cmd/whirlwind_bubble.png.h"
+#include "include_asset.h"
 
 #define NAMESPACE action_command_whirlwind
 
-#include "battle/action_cmd/whirlwind_1.png.inc.c"
-#include "battle/action_cmd/whirlwind_1.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_1.png", battle_action_cmd_whirlwind_1_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_1.pal", battle_action_cmd_whirlwind_1_pal);
 
-#include "battle/action_cmd/whirlwind_2.png.inc.c"
-#include "battle/action_cmd/whirlwind_2.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_2.png", battle_action_cmd_whirlwind_2_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_2.pal", battle_action_cmd_whirlwind_2_pal);
 
-#include "battle/action_cmd/whirlwind_3.png.inc.c"
-#include "battle/action_cmd/whirlwind_3.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_3.png", battle_action_cmd_whirlwind_3_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_3.pal", battle_action_cmd_whirlwind_3_pal);
 
-#include "battle/action_cmd/whirlwind_4.png.inc.c"
-#include "battle/action_cmd/whirlwind_4.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_4.png", battle_action_cmd_whirlwind_4_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_4.pal", battle_action_cmd_whirlwind_4_pal);
 
-#include "battle/action_cmd/whirlwind_5.png.inc.c"
-#include "battle/action_cmd/whirlwind_5.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_5.png", battle_action_cmd_whirlwind_5_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_5.pal", battle_action_cmd_whirlwind_5_pal);
 
-#include "battle/action_cmd/whirlwind_6.png.inc.c"
-#include "battle/action_cmd/whirlwind_6.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_6.png", battle_action_cmd_whirlwind_6_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_6.pal", battle_action_cmd_whirlwind_6_pal);
 
-#include "battle/action_cmd/whirlwind_7.png.inc.c"
-#include "battle/action_cmd/whirlwind_7.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_7.png", battle_action_cmd_whirlwind_7_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_7.pal", battle_action_cmd_whirlwind_7_pal);
 
-#include "battle/action_cmd/whirlwind_bubble.png.inc.c"
-#include "battle/action_cmd/whirlwind_bubble.pal.inc.c"
+INCLUDE_IMG("battle/action_cmd/whirlwind_bubble.png", battle_action_cmd_whirlwind_bubble_png);
+INCLUDE_PAL("battle/action_cmd/whirlwind_bubble.pal", battle_action_cmd_whirlwind_bubble_pal);
 
 HudScript HES_Whirlwind1 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind_1, 24, 24);
 
diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c
index 562f595e0d..d176c08e6b 100644
--- a/src/battle/area/kzn2/actor/lava_piranha.c
+++ b/src/battle/area/kzn2/actor/lava_piranha.c
@@ -9,6 +9,7 @@
 #include "ld_addrs.h"
 #include "boss_common.h"
 #include "mapfs/kzn_bt05_shape.h"
+#include "include_asset.h"
 
 #define NAMESPACE A(lava_piranha)
 
@@ -104,8 +105,8 @@ EntityModelScript N(ModelScript4) = {
     ems_End
 };
 
-#include "battle/area/kzn2/lava_piranha_vine.png.inc.c"
-#include "battle/area/kzn2/lava_piranha_vine.pal.inc.c"
+INCLUDE_IMG("battle/area/kzn2/lava_piranha_vine.png", D_8021C940_5A3020);
+INCLUDE_PAL("battle/area/kzn2/lava_piranha_vine.pal", D_8021CD40_5A3420);
 #include "battle/area/kzn2/lava_piranha_vine.gfx.inc.c"
 
 extern EvtScript N(EVS_Init);
diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c
index cbb3f60301..b6cde7d5ad 100644
--- a/src/battle/area/sam2/actor/monstar.c
+++ b/src/battle/area/sam2/actor/monstar.c
@@ -2,6 +2,7 @@
 #include "sprite.h"
 #include "sprite/npc/Monstar.h"
 #include "battle/area/sam2/actor/img.png.h"
+#include "include_asset.h"
 
 #define NAMESPACE A(monstar)
 
@@ -143,8 +144,8 @@ EvtScript N(EVS_Init) = {
     EVT_END
 };
 
-#include "battle/area/sam2/actor/img.png.inc.c"
-#include "battle/area/sam2/actor/img.pal.inc.c"
+INCLUDE_IMG("battle/area/sam2/actor/img.png", battle_area_sam2_actor_img_png);
+INCLUDE_PAL("battle/area/sam2/actor/img.pal", battle_area_sam2_actor_img_pal);
 
 ImgFXOverlayTexture N(MonstarDetailTexture) = {
     .raster = battle_area_sam2_actor_img_png,
diff --git a/src/battle/entity_model_icons.c b/src/battle/entity_model_icons.c
index 4f42b43afd..944542f760 100644
--- a/src/battle/entity_model_icons.c
+++ b/src/battle/entity_model_icons.c
@@ -1,13 +1,14 @@
 #include "common.h"
 #include "entity.h"
+#include "include_asset.h"
 
 extern IMG_BIN ui_battle_menu_spirits_png[];
 extern PAL_BIN ui_battle_menu_spirits_pal[];
 extern IMG_BIN ui_battle_solid_star_png[];
 extern PAL_BIN ui_battle_solid_star_pal[];
 
-#include "ui/battle/cursor_hand.png.inc.c"
-#include "ui/battle/cursor_hand.pal.inc.c"
+INCLUDE_IMG("ui/battle/cursor_hand.png", ui_battle_cursor_hand_png);
+INCLUDE_PAL("ui/battle/cursor_hand.pal", ui_battle_cursor_hand_pal);
 
 Vtx BtlCursorModelVtx[] = {
     {{{ -22, -6, 0 }, 0, { 1024, 1024 }, { 0, 0, 0, 255 }}},
diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c
index 1baed53772..8b6e4f1f16 100644
--- a/src/battle/move/hammer/hammer_throw.c
+++ b/src/battle/move/hammer/hammer_throw.c
@@ -2,6 +2,7 @@
 #include "effects.h"
 #include "entity.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_move_hammer_throw
 
@@ -9,17 +10,17 @@
 
 static s32 pad_images = 0;
 
-#include "battle/move/hammer/dusty_hammer.png.inc.c"
-#include "battle/move/hammer/dusty_hammer.pal.inc.c"
+INCLUDE_IMG("battle/move/hammer/dusty_hammer.png", battle_move_hammer_throw_dusty_hammer_png);
+INCLUDE_PAL("battle/move/hammer/dusty_hammer.pal", battle_move_hammer_throw_dusty_hammer_pal);
 
-#include "battle/move/hammer/basic_hammer.png.inc.c"
-#include "battle/move/hammer/basic_hammer.pal.inc.c"
+INCLUDE_IMG("battle/move/hammer/basic_hammer.png", battle_move_hammer_throw_basic_hammer_png);
+INCLUDE_PAL("battle/move/hammer/basic_hammer.pal", battle_move_hammer_throw_basic_hammer_pal);
 
-#include "battle/move/hammer/super_hammer.png.inc.c"
-#include "battle/move/hammer/super_hammer.pal.inc.c"
+INCLUDE_IMG("battle/move/hammer/super_hammer.png", battle_move_hammer_throw_super_hammer_png);
+INCLUDE_PAL("battle/move/hammer/super_hammer.pal", battle_move_hammer_throw_super_hammer_pal);
 
-#include "battle/move/hammer/ultra_hammer.png.inc.c"
-#include "battle/move/hammer/ultra_hammer.pal.inc.c"
+INCLUDE_IMG("battle/move/hammer/ultra_hammer.png", battle_move_hammer_throw_ultra_hammer_png);
+INCLUDE_PAL("battle/move/hammer/ultra_hammer.pal", battle_move_hammer_throw_ultra_hammer_pal);
 
 #include "battle/move/hammer/hammer_throw.vtx.inc.c"
 
diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c
index 102ad64f96..f4254b3eb0 100644
--- a/src/battle/move/item/coconut.c
+++ b/src/battle/move/item/coconut.c
@@ -3,6 +3,7 @@
 #include "entity.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_coconut
 
@@ -12,8 +13,8 @@
 static s32 _pad = 0;
 
 #include "battle/move/item/coconut.png.h"
-#include "battle/move/item/coconut.png.inc.c"
-#include "battle/move/item/coconut.pal.inc.c"
+INCLUDE_IMG("battle/move/item/coconut.png", battle_item_coconut_png);
+INCLUDE_PAL("battle/move/item/coconut.pal", battle_item_coconut_pal);
 
 /// 32x32 square.
 Vtx N(model)[] = {
diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c
index bb1ea730b7..a055de0b53 100644
--- a/src/battle/move/item/dusty_hammer.c
+++ b/src/battle/move/item/dusty_hammer.c
@@ -3,6 +3,7 @@
 #include "entity.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_dusty_hammer
 
@@ -12,8 +13,8 @@
 static s32 _pad = 0; // XXX
 
 #include "battle/move/item/dusty_hammer.png.h"
-#include "battle/move/item/dusty_hammer.png.inc.c"
-#include "battle/move/item/dusty_hammer.pal.inc.c"
+INCLUDE_IMG("battle/move/item/dusty_hammer.png", battle_item_dusty_hammer_png);
+INCLUDE_PAL("battle/move/item/dusty_hammer.pal", battle_item_dusty_hammer_pal);
 
 Vtx N(DustyHammerVtx)[] = {
     { .v = {{ -16, -16, 0 }, FALSE, { 0,    0    }, { 0, 0, 0, 255 }}},
diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c
index 8078d0b08a..9deae51fa6 100644
--- a/src/battle/move/item/egg_missile.c
+++ b/src/battle/move/item/egg_missile.c
@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_egg_missile
 
@@ -26,20 +27,20 @@ API_CALLABLE(N(func_802A123C_71CF1C)) {
 static s32 _pad = 0;
 
 #include "battle/move/item/egg_missile1.png.h"
-#include "battle/move/item/egg_missile1.png.inc.c"
-#include "battle/move/item/egg_missile1.pal.inc.c"
+INCLUDE_IMG("battle/move/item/egg_missile1.png", battle_item_egg_missile1_png);
+INCLUDE_PAL("battle/move/item/egg_missile1.pal", battle_item_egg_missile1_pal);
 
 #include "battle/move/item/egg_missile2.png.h"
-#include "battle/move/item/egg_missile2.png.inc.c"
-#include "battle/move/item/egg_missile2.pal.inc.c"
+INCLUDE_IMG("battle/move/item/egg_missile2.png", battle_item_egg_missile2_png);
+INCLUDE_PAL("battle/move/item/egg_missile2.pal", battle_item_egg_missile2_pal);
 
 #include "battle/move/item/egg_missile3.png.h"
-#include "battle/move/item/egg_missile3.png.inc.c"
-#include "battle/move/item/egg_missile3.pal.inc.c"
+INCLUDE_IMG("battle/move/item/egg_missile3.png", battle_item_egg_missile3_png);
+INCLUDE_PAL("battle/move/item/egg_missile3.pal", battle_item_egg_missile3_pal);
 
 #include "battle/move/item/egg_missile4.png.h"
-#include "battle/move/item/egg_missile4.png.inc.c"
-#include "battle/move/item/egg_missile4.pal.inc.c"
+INCLUDE_IMG("battle/move/item/egg_missile4.png", battle_item_egg_missile4_png);
+INCLUDE_PAL("battle/move/item/egg_missile4.pal", battle_item_egg_missile4_pal);
 
 Vtx N(EggMissileVtx)[] = {
     { .v = {{ -16, -16, 0 }, FALSE, { 0,    0    }, { 0, 0, 0, 255 }}},
diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c
index 3698c187eb..9e05445653 100644
--- a/src/battle/move/item/insecticide_herb.c
+++ b/src/battle/move/item/insecticide_herb.c
@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_insecticide_herb
 
@@ -57,8 +58,8 @@ API_CALLABLE(N(func_802A12E0_72AA30)) {
 static s32 _pad = 0; // XXX
 
 #include "battle/move/item/insecticide_herb.png.h"
-#include "battle/move/item/insecticide_herb.png.inc.c"
-#include "battle/move/item/insecticide_herb.pal.inc.c"
+INCLUDE_IMG("battle/move/item/insecticide_herb.png", battle_item_insecticide_herb_png);
+INCLUDE_PAL("battle/move/item/insecticide_herb.pal", battle_item_insecticide_herb_pal);
 
 Vtx N(model)[] = {
     { .v = { .ob = {-16, -16, 0}, FALSE, .tc = {0,    0},    .cn = {0, 0, 0, 255} } },
diff --git a/src/battle/move/item/mystery.c b/src/battle/move/item/mystery.c
index 98c5636342..d379a38069 100644
--- a/src/battle/move/item/mystery.c
+++ b/src/battle/move/item/mystery.c
@@ -3,6 +3,7 @@
 #include "effects.h"
 #include "entity.h"
 #include "ld_addrs.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_mystery
 
@@ -13,8 +14,8 @@
 static s32 _pad = 0;
 
 #include "battle/move/item/mystery.png.h"
-#include "battle/move/item/mystery.png.inc.c"
-#include "battle/move/item/mystery.pal.inc.c"
+INCLUDE_IMG("battle/move/item/mystery.png", battle_item_mystery_png);
+INCLUDE_PAL("battle/move/item/mystery.pal", battle_item_mystery_pal);
 
 Vtx N(model)[] = {
     { .v = {{ -16, -16, 0 }, FALSE, { 0,    0    }, { 0, 0, 0, 255 }}},
diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c
index 90dc1919e6..ddfa5f2c92 100644
--- a/src/battle/move/item/pebble.c
+++ b/src/battle/move/item/pebble.c
@@ -3,6 +3,7 @@
 #include "ld_addrs.h"
 #include "entity.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_pebble
 
@@ -12,8 +13,8 @@
 static s32 _pad = 0;
 
 #include "battle/move/item/pebble.png.h"
-#include "battle/move/item/pebble.png.inc.c"
-#include "battle/move/item/pebble.pal.inc.c"
+INCLUDE_IMG("battle/move/item/pebble.png", battle_item_pebble_png);
+INCLUDE_PAL("battle/move/item/pebble.pal", battle_item_pebble_pal);
 
 Vtx N(model)[] = {
     { .v = { { -16, -16, 0 }, FALSE, { 0,    0 },    { 0, 0, 0, 255 } } },
diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c
index 6256dc60ef..fc008c8976 100644
--- a/src/battle/move/item/sleepy_sheep.c
+++ b/src/battle/move/item/sleepy_sheep.c
@@ -4,6 +4,7 @@
 #include "ld_addrs.h"
 #include "effects.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_sleepy_sheep
 
@@ -172,16 +173,16 @@ API_CALLABLE(N(func_802A1848_71EE98)) {
 static s32 _pad = 0;
 
 #include "battle/move/item/sleepy_sheep1.png.h"
-#include "battle/move/item/sleepy_sheep1.png.inc.c"
-#include "battle/move/item/sleepy_sheep1.pal.inc.c"
+INCLUDE_IMG("battle/move/item/sleepy_sheep1.png", battle_item_sleepy_sheep1_png);
+INCLUDE_PAL("battle/move/item/sleepy_sheep1.pal", battle_item_sleepy_sheep1_pal);
 
 #include "battle/move/item/sleepy_sheep2.png.h"
-#include "battle/move/item/sleepy_sheep2.png.inc.c"
-#include "battle/move/item/sleepy_sheep2.pal.inc.c"
+INCLUDE_IMG("battle/move/item/sleepy_sheep2.png", battle_item_sleepy_sheep2_png);
+INCLUDE_PAL("battle/move/item/sleepy_sheep2.pal", battle_item_sleepy_sheep2_pal);
 
 #include "battle/move/item/sleepy_sheep3.png.h"
-#include "battle/move/item/sleepy_sheep3.png.inc.c"
-#include "battle/move/item/sleepy_sheep3.pal.inc.c"
+INCLUDE_IMG("battle/move/item/sleepy_sheep3.png", battle_item_sleepy_sheep3_png);
+INCLUDE_PAL("battle/move/item/sleepy_sheep3.pal", battle_item_sleepy_sheep3_pal);
 
 Vtx N(model)[] = {
     { .v = {{ -28,  0,  0 }, FALSE, { 0,    1536 }, { 0, 0, 0, 255 }}},
diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c
index a5170f514d..102b6418ca 100644
--- a/src/battle/move/item/strange_cake.c
+++ b/src/battle/move/item/strange_cake.c
@@ -3,6 +3,7 @@
 #include "effects.h"
 #include "hud_element.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #define NAMESPACE battle_item_strange_cake
 
@@ -12,16 +13,16 @@
 static s32 _pad = 0; // XXX
 
 #include "battle/move/item/strange_cake1.png.h"
-#include "battle/move/item/strange_cake1.png.inc.c"
-#include "battle/move/item/strange_cake1.pal.inc.c"
+INCLUDE_IMG("battle/move/item/strange_cake1.png", battle_item_strange_cake1_png);
+INCLUDE_PAL("battle/move/item/strange_cake1.pal", battle_item_strange_cake1_pal);
 
 #include "battle/move/item/strange_cake2.png.h"
-#include "battle/move/item/strange_cake2.png.inc.c"
-#include "battle/move/item/strange_cake2.pal.inc.c"
+INCLUDE_IMG("battle/move/item/strange_cake2.png", battle_item_strange_cake2_png);
+INCLUDE_PAL("battle/move/item/strange_cake2.pal", battle_item_strange_cake2_pal);
 
 #include "battle/move/item/strange_cake3.png.h"
-#include "battle/move/item/strange_cake3.png.inc.c"
-#include "battle/move/item/strange_cake3.pal.inc.c"
+INCLUDE_IMG("battle/move/item/strange_cake3.png", battle_item_strange_cake3_png);
+INCLUDE_PAL("battle/move/item/strange_cake3.pal", battle_item_strange_cake3_pal);
 
 HudScript N(D_802A27D0) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake1, 32, 32);
 HudScript N(D_802A27F8) = HES_TEMPLATE_CI_ENUM_SIZE(battle_item_strange_cake2, 32, 32);
diff --git a/src/battle_ui_gfx.c b/src/battle_ui_gfx.c
index 43fd3dfc0e..e92f89ab1b 100644
--- a/src/battle_ui_gfx.c
+++ b/src/battle_ui_gfx.c
@@ -1,251 +1,252 @@
 #include "common.h"
 #include "hud_element.h"
+#include "include_asset.h"
 
-#include "ui/battle/menu/unused.png.inc.c"
-#include "ui/battle/menu/unused.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/unused.png", ui_battle_menu_unused_png);
+INCLUDE_PAL("ui/battle/menu/unused.pal", ui_battle_menu_unused_pal);
 #define ui_battle_menu_unused_disabled_png ui_battle_menu_unused_png
-#include "ui/battle/menu/unused.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/unused.disabled.pal", ui_battle_menu_unused_disabled_pal);
 
-#include "ui/battle/menu/flee.png.inc.c"
-#include "ui/battle/menu/flee.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/flee.png", ui_battle_menu_flee_png);
+INCLUDE_PAL("ui/battle/menu/flee.pal", ui_battle_menu_flee_pal);
 #define ui_battle_menu_flee_disabled_png ui_battle_menu_flee_png
-#include "ui/battle/menu/flee.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/flee.disabled.pal", ui_battle_menu_flee_disabled_pal);
 
-#include "ui/battle/menu/defend.png.inc.c"
-#include "ui/battle/menu/defend.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/defend.png", ui_battle_menu_defend_png);
+INCLUDE_PAL("ui/battle/menu/defend.pal", ui_battle_menu_defend_pal);
 #define ui_battle_menu_defend_disabled_png ui_battle_menu_defend_png
-#include "ui/battle/menu/defend.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/defend.disabled.pal", ui_battle_menu_defend_disabled_pal);
 
-#include "ui/battle/menu/strategies.png.inc.c"
-#include "ui/battle/menu/strategies.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/strategies.png", ui_battle_menu_strategies_png);
+INCLUDE_PAL("ui/battle/menu/strategies.pal", ui_battle_menu_strategies_pal);
 #define ui_battle_menu_strategies_disabled_png ui_battle_menu_strategies_png
-#include "ui/battle/menu/strategies.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/strategies.disabled.pal", ui_battle_menu_strategies_disabled_pal);
 
-#include "ui/battle/menu/nothing.png.inc.c"
-#include "ui/battle/menu/nothing.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/nothing.png", ui_battle_menu_nothing_png);
+INCLUDE_PAL("ui/battle/menu/nothing.pal", ui_battle_menu_nothing_pal);
 #define ui_battle_menu_nothing_disabled_png ui_battle_menu_nothing_png
-#include "ui/battle/menu/nothing.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/nothing.disabled.pal", ui_battle_menu_nothing_disabled_pal);
 
-#include "ui/battle/menu/pouch.png.inc.c"
-#include "ui/battle/menu/pouch.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/pouch.png", ui_battle_menu_pouch_png);
+INCLUDE_PAL("ui/battle/menu/pouch.pal", ui_battle_menu_pouch_pal);
 #define ui_battle_menu_pouch_disabled_png ui_battle_menu_pouch_png
-#include "ui/battle/menu/pouch.disabled.pal.inc.c"
+INCLUDE_PAL("ui/battle/menu/pouch.disabled.pal", ui_battle_menu_pouch_disabled_pal);
 
-#include "ui/battle/swap_Z.png.inc.c"
-#include "ui/battle/swap_Z.pal.inc.c"
+INCLUDE_IMG("ui/battle/swap_Z.png", ui_battle_swap_Z_png);
+INCLUDE_PAL("ui/battle/swap_Z.pal", ui_battle_swap_Z_pal);
 
-#include "ui/battle/swap_arrow_left.png.inc.c"
-#include "ui/battle/swap_arrow_left.pal.inc.c"
+INCLUDE_IMG("ui/battle/swap_arrow_left.png", ui_battle_swap_arrow_left_png);
+INCLUDE_PAL("ui/battle/swap_arrow_left.pal", ui_battle_swap_arrow_left_pal);
 
-#include "ui/battle/swap_arrow_right.png.inc.c"
-#include "ui/battle/swap_arrow_right.pal.inc.c"
+INCLUDE_IMG("ui/battle/swap_arrow_right.png", ui_battle_swap_arrow_right_png);
+INCLUDE_PAL("ui/battle/swap_arrow_right.pal", ui_battle_swap_arrow_right_pal);
 
-#include "ui/battle/menu/spirits.png.inc.c"
-#include "ui/battle/menu/spirits.pal.inc.c"
+INCLUDE_IMG("ui/battle/menu/spirits.png", ui_battle_menu_spirits_png);
+INCLUDE_PAL("ui/battle/menu/spirits.pal", ui_battle_menu_spirits_pal);
 
-#include "ui/battle/yellow_arrow.png.inc.c"
-#include "ui/battle/yellow_arrow.pal.inc.c"
+INCLUDE_IMG("ui/battle/yellow_arrow.png", ui_battle_yellow_arrow_png);
+INCLUDE_PAL("ui/battle/yellow_arrow.pal", ui_battle_yellow_arrow_pal);
 
-#include "ui/battle/hp_bar.png.inc.c"
-#include "ui/battle/hp_bar.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_bar.png", ui_battle_hp_bar_png);
+INCLUDE_PAL("ui/battle/hp_bar.pal", ui_battle_hp_bar_pal);
 
-#include "ui/battle/hp_0.png.inc.c"
-#include "ui/battle/hp_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_0.png", ui_battle_hp_0_png);
+INCLUDE_PAL("ui/battle/hp_0.pal", ui_battle_hp_0_pal);
 
-#include "ui/battle/hp_1.png.inc.c"
-#include "ui/battle/hp_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_1.png", ui_battle_hp_1_png);
+INCLUDE_PAL("ui/battle/hp_1.pal", ui_battle_hp_1_pal);
 
-#include "ui/battle/hp_2.png.inc.c"
-#include "ui/battle/hp_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_2.png", ui_battle_hp_2_png);
+INCLUDE_PAL("ui/battle/hp_2.pal", ui_battle_hp_2_pal);
 
-#include "ui/battle/hp_3.png.inc.c"
-#include "ui/battle/hp_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_3.png", ui_battle_hp_3_png);
+INCLUDE_PAL("ui/battle/hp_3.pal", ui_battle_hp_3_pal);
 
-#include "ui/battle/hp_4.png.inc.c"
-#include "ui/battle/hp_4.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_4.png", ui_battle_hp_4_png);
+INCLUDE_PAL("ui/battle/hp_4.pal", ui_battle_hp_4_pal);
 
-#include "ui/battle/hp_5.png.inc.c"
-#include "ui/battle/hp_5.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_5.png", ui_battle_hp_5_png);
+INCLUDE_PAL("ui/battle/hp_5.pal", ui_battle_hp_5_pal);
 
-#include "ui/battle/hp_6.png.inc.c"
-#include "ui/battle/hp_6.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_6.png", ui_battle_hp_6_png);
+INCLUDE_PAL("ui/battle/hp_6.pal", ui_battle_hp_6_pal);
 
-#include "ui/battle/hp_7.png.inc.c"
-#include "ui/battle/hp_7.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_7.png", ui_battle_hp_7_png);
+INCLUDE_PAL("ui/battle/hp_7.pal", ui_battle_hp_7_pal);
 
-#include "ui/battle/hp_8.png.inc.c"
-#include "ui/battle/hp_8.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_8.png", ui_battle_hp_8_png);
+INCLUDE_PAL("ui/battle/hp_8.pal", ui_battle_hp_8_pal);
 
-#include "ui/battle/hp_9.png.inc.c"
-#include "ui/battle/hp_9.pal.inc.c"
+INCLUDE_IMG("ui/battle/hp_9.png", ui_battle_hp_9_png);
+INCLUDE_PAL("ui/battle/hp_9.pal", ui_battle_hp_9_pal);
 
-#include "ui/battle/cont/b_up.png.inc.c"
-#include "ui/battle/cont/b_up.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/b_up.png", ui_battle_cont_b_up_png);
+INCLUDE_PAL("ui/battle/cont/b_up.pal", ui_battle_cont_b_up_pal);
 
-#include "ui/battle/cont/b_down.png.inc.c"
-#include "ui/battle/cont/b_down.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/b_down.png", ui_battle_cont_b_down_png);
+INCLUDE_PAL("ui/battle/cont/b_down.pal", ui_battle_cont_b_down_pal);
 
-#include "ui/battle/cont/c_left_up.png.inc.c"
-#include "ui/battle/cont/c_left_up.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_left_up.png", ui_battle_cont_c_left_up_png);
+INCLUDE_PAL("ui/battle/cont/c_left_up.pal", ui_battle_cont_c_left_up_pal);
 
-#include "ui/battle/cont/c_left_down.png.inc.c"
-#include "ui/battle/cont/c_left_down.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_left_down.png", ui_battle_cont_c_left_down_png);
+INCLUDE_PAL("ui/battle/cont/c_left_down.pal", ui_battle_cont_c_left_down_pal);
 
-#include "ui/battle/cont/c_right_up.png.inc.c"
-#include "ui/battle/cont/c_right_up.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_right_up.png", ui_battle_cont_c_right_up_png);
+INCLUDE_PAL("ui/battle/cont/c_right_up.pal", ui_battle_cont_c_right_up_pal);
 
-#include "ui/battle/cont/c_right_down.png.inc.c"
-#include "ui/battle/cont/c_right_down.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_right_down.png", ui_battle_cont_c_right_down_png);
+INCLUDE_PAL("ui/battle/cont/c_right_down.pal", ui_battle_cont_c_right_down_pal);
 
-#include "ui/battle/cont/c_up_up.png.inc.c"
-#include "ui/battle/cont/c_up_up.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_up_up.png", ui_battle_cont_c_up_up_png);
+INCLUDE_PAL("ui/battle/cont/c_up_up.pal", ui_battle_cont_c_up_up_pal);
 
-#include "ui/battle/cont/c_up_down.png.inc.c"
-#include "ui/battle/cont/c_up_down.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_up_down.png", ui_battle_cont_c_up_down_png);
+INCLUDE_PAL("ui/battle/cont/c_up_down.pal", ui_battle_cont_c_up_down_pal);
 
-#include "ui/battle/cont/c_down_up.png.inc.c"
-#include "ui/battle/cont/c_down_up.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_down_up.png", ui_battle_cont_c_down_up_png);
+INCLUDE_PAL("ui/battle/cont/c_down_up.pal", ui_battle_cont_c_down_up_pal);
 
-#include "ui/battle/cont/c_down_down.png.inc.c"
-#include "ui/battle/cont/c_down_down.pal.inc.c"
+INCLUDE_IMG("ui/battle/cont/c_down_down.png", ui_battle_cont_c_down_down_png);
+INCLUDE_PAL("ui/battle/cont/c_down_down.pal", ui_battle_cont_c_down_down_pal);
 
-#include "ui/battle/cmd/timing_1_chance.png.inc.c"
-#include "ui/battle/cmd/timing_1_chance.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_1_chance.png", ui_battle_cmd_timing_1_chance_png);
+INCLUDE_PAL("ui/battle/cmd/timing_1_chance.pal", ui_battle_cmd_timing_1_chance_pal);
 
-#include "ui/battle/cmd/timing_ready.png.inc.c"
-#include "ui/battle/cmd/timing_ready.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_ready.png", ui_battle_cmd_timing_ready_png);
+INCLUDE_PAL("ui/battle/cmd/timing_ready.pal", ui_battle_cmd_timing_ready_pal);
 
-#include "ui/battle/cmd/timing_wait.png.inc.c"
-#include "ui/battle/cmd/timing_wait.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_wait.png", ui_battle_cmd_timing_wait_png);
+INCLUDE_PAL("ui/battle/cmd/timing_wait.pal", ui_battle_cmd_timing_wait_pal);
 
-#include "ui/battle/cmd/charge_1.png.inc.c"
-#include "ui/battle/cmd/charge_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/charge_1.png", ui_battle_cmd_charge_1_png);
+INCLUDE_PAL("ui/battle/cmd/charge_1.pal", ui_battle_cmd_charge_1_pal);
 
-#include "ui/battle/cmd/charge_2.png.inc.c"
-#include "ui/battle/cmd/charge_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/charge_2.png", ui_battle_cmd_charge_2_png);
+INCLUDE_PAL("ui/battle/cmd/charge_2.pal", ui_battle_cmd_charge_2_pal);
 
-#include "ui/battle/cmd/charge_3.png.inc.c"
-#include "ui/battle/cmd/charge_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/charge_3.png", ui_battle_cmd_charge_3_png);
+INCLUDE_PAL("ui/battle/cmd/charge_3.pal", ui_battle_cmd_charge_3_pal);
 
-#include "ui/battle/cmd/charge_4.png.inc.c"
-#include "ui/battle/cmd/charge_4.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/charge_4.png", ui_battle_cmd_charge_4_png);
+INCLUDE_PAL("ui/battle/cmd/charge_4.pal", ui_battle_cmd_charge_4_pal);
 
-#include "ui/battle/cmd/timing_3_chances.png.inc.c"
-#include "ui/battle/cmd/timing_3_chances.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_3_chances.png", ui_battle_cmd_timing_3_chances_png);
+INCLUDE_PAL("ui/battle/cmd/timing_3_chances.pal", ui_battle_cmd_timing_3_chances_pal);
 
-#include "ui/battle/cmd/gauge_result.png.inc.c"
-#include "ui/battle/cmd/gauge_result.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/gauge_result.png", ui_battle_cmd_gauge_result_png);
+INCLUDE_PAL("ui/battle/cmd/gauge_result.pal", ui_battle_cmd_gauge_result_pal);
 
-#include "ui/battle/cmd/timing_ok.png.inc.c"
-#include "ui/battle/cmd/timing_ok.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_ok.png", ui_battle_cmd_timing_ok_png);
+INCLUDE_PAL("ui/battle/cmd/timing_ok.pal", ui_battle_cmd_timing_ok_pal);
 
-#include "ui/battle/cmd/timing_miss.png.inc.c"
-#include "ui/battle/cmd/timing_miss.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/timing_miss.png", ui_battle_cmd_timing_miss_png);
+INCLUDE_PAL("ui/battle/cmd/timing_miss.pal", ui_battle_cmd_timing_miss_pal);
 
-#include "ui/battle/cmd/flee_0.png.inc.c"
-#include "ui/battle/cmd/flee_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/flee_0.png", ui_battle_cmd_flee_0_png);
+INCLUDE_PAL("ui/battle/cmd/flee_0.pal", ui_battle_cmd_flee_0_pal);
 
-#include "ui/battle/cmd/flee_1.png.inc.c"
-#include "ui/battle/cmd/flee_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/flee_1.png", ui_battle_cmd_flee_1_png);
+INCLUDE_PAL("ui/battle/cmd/flee_1.pal", ui_battle_cmd_flee_1_pal);
 
-#include "ui/battle/cmd/flee_2.png.inc.c"
-#include "ui/battle/cmd/flee_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/flee_2.png", ui_battle_cmd_flee_2_png);
+INCLUDE_PAL("ui/battle/cmd/flee_2.pal", ui_battle_cmd_flee_2_pal);
 
-#include "ui/battle/cmd/100pct.png.inc.c"
-#include "ui/battle/cmd/100pct.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/100pct.png", ui_battle_cmd_100pct_png);
+INCLUDE_PAL("ui/battle/cmd/100pct.pal", ui_battle_cmd_100pct_pal);
 
-#include "ui/battle/cmd/right_on.png.inc.c"
-#include "ui/battle/cmd/right_on.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/right_on.png", ui_battle_cmd_right_on_png);
+INCLUDE_PAL("ui/battle/cmd/right_on.pal", ui_battle_cmd_right_on_pal);
 
-#include "ui/battle/cmd/fill_result.png.inc.c"
-#include "ui/battle/cmd/fill_result.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/fill_result.png", ui_battle_cmd_fill_result_png);
+INCLUDE_PAL("ui/battle/cmd/fill_result.pal", ui_battle_cmd_fill_result_pal);
 
-#include "ui/battle/cmd/aim/marker_0.png.inc.c"
-#include "ui/battle/cmd/aim/marker_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_0.png", ui_battle_cmd_aim_marker_0_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_0.pal", ui_battle_cmd_aim_marker_0_pal);
 
-#include "ui/battle/cmd/aim/marker_1.png.inc.c"
-#include "ui/battle/cmd/aim/marker_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_1.png", ui_battle_cmd_aim_marker_1_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_1.pal", ui_battle_cmd_aim_marker_1_pal);
 
-#include "ui/battle/cmd/aim/marker_2.png.inc.c"
-#include "ui/battle/cmd/aim/marker_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_2.png", ui_battle_cmd_aim_marker_2_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_2.pal", ui_battle_cmd_aim_marker_2_pal);
 
-#include "ui/battle/cmd/aim/marker_3.png.inc.c"
-#include "ui/battle/cmd/aim/marker_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_3.png", ui_battle_cmd_aim_marker_3_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_3.pal", ui_battle_cmd_aim_marker_3_pal);
 
-#include "ui/battle/cmd/aim/marker_4.png.inc.c"
-#include "ui/battle/cmd/aim/marker_4.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_4.png", ui_battle_cmd_aim_marker_4_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_4.pal", ui_battle_cmd_aim_marker_4_pal);
 
-#include "ui/battle/cmd/aim/marker_5.png.inc.c"
-#include "ui/battle/cmd/aim/marker_5.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_5.png", ui_battle_cmd_aim_marker_5_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_5.pal", ui_battle_cmd_aim_marker_5_pal);
 
-#include "ui/battle/cmd/aim/marker_6.png.inc.c"
-#include "ui/battle/cmd/aim/marker_6.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_6.png", ui_battle_cmd_aim_marker_6_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_6.pal", ui_battle_cmd_aim_marker_6_pal);
 
-#include "ui/battle/cmd/aim/marker_7.png.inc.c"
-#include "ui/battle/cmd/aim/marker_7.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/marker_7.png", ui_battle_cmd_aim_marker_7_png);
+INCLUDE_PAL("ui/battle/cmd/aim/marker_7.pal", ui_battle_cmd_aim_marker_7_pal);
 
-#include "ui/battle/cmd/aim/shimmer_0.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_0.png", ui_battle_cmd_aim_shimmer_0_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_0.pal", ui_battle_cmd_aim_shimmer_0_pal);
 
-#include "ui/battle/cmd/aim/shimmer_1.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_1.png", ui_battle_cmd_aim_shimmer_1_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_1.pal", ui_battle_cmd_aim_shimmer_1_pal);
 
-#include "ui/battle/cmd/aim/shimmer_2.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_2.png", ui_battle_cmd_aim_shimmer_2_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_2.pal", ui_battle_cmd_aim_shimmer_2_pal);
 
-#include "ui/battle/cmd/aim/shimmer_3.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_3.png", ui_battle_cmd_aim_shimmer_3_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_3.pal", ui_battle_cmd_aim_shimmer_3_pal);
 
-#include "ui/battle/cmd/aim/shimmer_4.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_4.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_4.png", ui_battle_cmd_aim_shimmer_4_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_4.pal", ui_battle_cmd_aim_shimmer_4_pal);
 
-#include "ui/battle/cmd/aim/shimmer_5.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_5.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_5.png", ui_battle_cmd_aim_shimmer_5_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_5.pal", ui_battle_cmd_aim_shimmer_5_pal);
 
-#include "ui/battle/cmd/aim/shimmer_6.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_6.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_6.png", ui_battle_cmd_aim_shimmer_6_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_6.pal", ui_battle_cmd_aim_shimmer_6_pal);
 
-#include "ui/battle/cmd/aim/shimmer_7.png.inc.c"
-#include "ui/battle/cmd/aim/shimmer_7.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/shimmer_7.png", ui_battle_cmd_aim_shimmer_7_png);
+INCLUDE_PAL("ui/battle/cmd/aim/shimmer_7.pal", ui_battle_cmd_aim_shimmer_7_pal);
 
-#include "ui/battle/cmd/aim/reticle_0.png.inc.c"
-#include "ui/battle/cmd/aim/reticle_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/reticle_0.png", ui_battle_cmd_aim_reticle_0_png);
+INCLUDE_PAL("ui/battle/cmd/aim/reticle_0.pal", ui_battle_cmd_aim_reticle_0_pal);
 
-#include "ui/battle/cmd/aim/reticle_1.png.inc.c"
-#include "ui/battle/cmd/aim/reticle_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/reticle_1.png", ui_battle_cmd_aim_reticle_1_png);
+INCLUDE_PAL("ui/battle/cmd/aim/reticle_1.pal", ui_battle_cmd_aim_reticle_1_pal);
 
-#include "ui/battle/cmd/aim/target_0.png.inc.c"
-#include "ui/battle/cmd/aim/target_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/target_0.png", ui_battle_cmd_aim_target_0_png);
+INCLUDE_PAL("ui/battle/cmd/aim/target_0.pal", ui_battle_cmd_aim_target_0_pal);
 
-#include "ui/battle/cmd/aim/target_1.png.inc.c"
-#include "ui/battle/cmd/aim/target_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/cmd/aim/target_1.png", ui_battle_cmd_aim_target_1_png);
+INCLUDE_PAL("ui/battle/cmd/aim/target_1.pal", ui_battle_cmd_aim_target_1_pal);
 
-#include "ui/battle/solid_star.png.inc.c"
-#include "ui/battle/solid_star.pal.inc.c"
+INCLUDE_IMG("ui/battle/solid_star.png", ui_battle_solid_star_png);
+INCLUDE_PAL("ui/battle/solid_star.pal", ui_battle_solid_star_pal);
 
 Gfx D_8028F860[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/battle/projector_spot.png.inc.c"
+INCLUDE_IMG("ui/battle/projector_spot.png", ui_battle_projector_spot_png);
 
 Gfx D_8028FC68[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/battle/projector_beam.png.inc.c"
+INCLUDE_IMG("ui/battle/projector_beam.png", ui_battle_projector_beam_png);
 
 Gfx D_80290C70[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/battle/projector_reel.png.inc.c"
+INCLUDE_IMG("ui/battle/projector_reel.png", ui_battle_projector_reel_png);
 
 Gfx D_80291C78[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/battle/swap_background.png.inc.c"
+INCLUDE_IMG("ui/battle/swap_background.png", ui_battle_swap_background_png);
 
 HudScript HES_HPBar = HES_TEMPLATE_CI_ENUM_SIZE(ui_battle_hp_bar, 32, 16);
 
diff --git a/src/curtains.c b/src/curtains.c
index 42b2ec26c7..7cf4e59500 100644
--- a/src/curtains.c
+++ b/src/curtains.c
@@ -6,8 +6,9 @@
 #include "ld_addrs.h"
 #include "nu/nusys.h"
 #include "game_modes.h"
+#include "include_asset.h"
 
-#include "theater/walls.png.inc.c"
+INCLUDE_IMG("theater/walls.png", theater_walls_png);
 
 Gfx D_800746E0[] = {
     gsDPSetTextureLUT(G_TT_NONE),
@@ -17,7 +18,7 @@ Gfx D_800746E0[] = {
     gsSPEndDisplayList(),
 };
 
-#include "theater/curtains.png.inc.c"
+INCLUDE_IMG("theater/curtains.png", theater_curtains_png);
 
 Gfx D_80075730[] = {
     gsDPSetTextureLUT(G_TT_NONE),
@@ -27,8 +28,8 @@ Gfx D_80075730[] = {
     gsSPEndDisplayList(),
 };
 
-#include "theater/floor.png.inc.c"
-#include "theater/floor.pal.inc.c"
+INCLUDE_IMG("theater/floor.png", theater_floor_png);
+INCLUDE_PAL("theater/floor.pal", theater_floor_pal);
 
 Gfx D_800758A0[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
@@ -172,7 +173,7 @@ Gfx TheaterInitGfx[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/no_controller.png.inc.c"
+INCLUDE_IMG("ui/no_controller.png", ui_no_controller_png);
 
 Gfx NoControllerSetupTexGfx[] = {
     gsDPPipeSync(),
diff --git a/src/draw_box.c b/src/draw_box.c
index ee5c9e4205..2c322ed72d 100644
--- a/src/draw_box.c
+++ b/src/draw_box.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "nu/nusys.h"
+#include "include_asset.h"
 
 #define INTEGER_LOG2(x) ((x) <= 1 ? 0 : (x) <= 2 ? 1 : (x) <= 4 ? 2 : (x) <= 8 ? 3 : (x) <= 16 ? 4 : (x) <= 32 ? 5 : (x) <= 64 ? 6 : (x) <= 128 ? 7 : (x) <= 256 ? 8 : (x) <= 512 ? 9 : 10)
 
@@ -178,17 +179,17 @@ DefaultWindowStyle gBoxDefaultStyles[] = {
     }
 };
 
-#include "ui/box/corners9.png.inc.c"
-#include "ui/box/corners8.png.inc.c"
-#include "ui/box/corners6.png.inc.c"
-#include "ui/box/corners7.png.inc.c"
-#include "ui/box/corners3.png.inc.c"
-#include "ui/box/corners5.png.inc.c"
-#include "ui/box/corners4.png.inc.c"
-#include "ui/box/bg_tile.png.inc.c"
-#include "ui/box/corners1.png.inc.c"
-#include "ui/box/corners2.png.inc.c"
-#include "ui/box/bg_flat.png.inc.c"
+INCLUDE_IMG("ui/box/corners9.png", ui_box_corners9_png);
+INCLUDE_IMG("ui/box/corners8.png", ui_box_corners8_png);
+INCLUDE_IMG("ui/box/corners6.png", ui_box_corners6_png);
+INCLUDE_IMG("ui/box/corners7.png", ui_box_corners7_png);
+INCLUDE_IMG("ui/box/corners3.png", ui_box_corners3_png);
+INCLUDE_IMG("ui/box/corners5.png", ui_box_corners5_png);
+INCLUDE_IMG("ui/box/corners4.png", ui_box_corners4_png);
+INCLUDE_IMG("ui/box/bg_tile.png", ui_box_bg_tile_png);
+INCLUDE_IMG("ui/box/corners1.png", ui_box_corners1_png);
+INCLUDE_IMG("ui/box/corners2.png", ui_box_corners2_png);
+INCLUDE_IMG("ui/box/bg_flat.png", ui_box_bg_flat_png);
 
 WindowBackground gBoxBackground[] = {
     {
diff --git a/src/effects/gfx/attack_result_text.c b/src/effects/gfx/attack_result_text.c
index 9348343795..fb12ddea83 100644
--- a/src/effects/gfx/attack_result_text.c
+++ b/src/effects/gfx/attack_result_text.c
@@ -1,9 +1,11 @@
-#include "effects/gfx/battle/lucky.png.inc.c"
-#include "effects/gfx/battle/miss.png.inc.c"
-#include "effects/gfx/battle/good.png.inc.c"
-#include "effects/gfx/battle/nice.png.inc.c"
-#include "effects/gfx/battle/super.png.inc.c"
-#include "effects/gfx/D_09001400_3917D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/battle/lucky.png", D_09000000_3903D0);
+INCLUDE_IMG("effects/gfx/battle/miss.png", D_09000400_3907D0);
+INCLUDE_IMG("effects/gfx/battle/good.png", D_09000800_390BD0);
+INCLUDE_IMG("effects/gfx/battle/nice.png", D_09000C00_390FD0);
+INCLUDE_IMG("effects/gfx/battle/super.png", D_09001000_3913D0);
+INCLUDE_IMG("effects/gfx/D_09001400_3917D0.png", D_09001400_3917D0);
 
 #include "effects/gfx/D_09001500_3918D0.gfx.inc.c"
 #include "effects/gfx/D_090015A8_391978.gfx.inc.c"
diff --git a/src/effects/gfx/aura.c b/src/effects/gfx/aura.c
index 15fd929709..345845699b 100644
--- a/src/effects/gfx/aura.c
+++ b/src/effects/gfx/aura.c
@@ -1,8 +1,10 @@
-#include "effects/gfx/D_09000000_377F80.png.inc.c"
-#include "effects/gfx/D_09000400_378380.png.inc.c"
-#include "effects/gfx/D_09000800_378780.png.inc.c"
-#include "effects/gfx/D_09001000_378F80.png.inc.c"
-#include "effects/gfx/D_09001800_379780.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_377F80.png", D_09000000_377F80);
+INCLUDE_IMG("effects/gfx/D_09000400_378380.png", D_09000400_378380);
+INCLUDE_IMG("effects/gfx/D_09000800_378780.png", D_09000800_378780);
+INCLUDE_IMG("effects/gfx/D_09001000_378F80.png", D_09001000_378F80);
+INCLUDE_IMG("effects/gfx/D_09001800_379780.png", D_09001800_379780);
 
 #include "effects/gfx/D_09002000_379F80.gfx.inc.c"
 #include "effects/gfx/D_090020E8_37A068.gfx.inc.c"
diff --git a/src/effects/gfx/balloon.c b/src/effects/gfx/balloon.c
index 9874bad18f..f0714dd594 100644
--- a/src/effects/gfx/balloon.c
+++ b/src/effects/gfx/balloon.c
@@ -1,20 +1,22 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_394670.png.inc.c"
-#include "effects/gfx/D_09000200_394870.png.inc.c"
-#include "effects/gfx/D_09000000_394670.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_394670.png", D_09000000_394670);
+INCLUDE_IMG("effects/gfx/D_09000200_394870.png", D_09000200_394870);
+INCLUDE_PAL("effects/gfx/D_09000000_394670.pal", D_09000400_394A70);
 
 u8 D_09000420_394A90[0x1E0] = {};
 
-#include "effects/gfx/D_09000600_394C70.png.inc.c"
-#include "effects/gfx/D_09000800_394E70.png.inc.c"
-#include "effects/gfx/D_09000600_394C70.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000600_394C70.png", D_09000600_394C70);
+INCLUDE_IMG("effects/gfx/D_09000800_394E70.png", D_09000800_394E70);
+INCLUDE_PAL("effects/gfx/D_09000600_394C70.pal", D_09000A00_395070);
 
 u8 D_09000A20_395090[0x1E0] = {};
 
-#include "effects/gfx/D_09000C00_395270.png.inc.c"
-#include "effects/gfx/D_09000E00_395470.png.inc.c"
-#include "effects/gfx/D_09000C00_395270.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000C00_395270.png", D_09000C00_395270);
+INCLUDE_IMG("effects/gfx/D_09000E00_395470.png", D_09000E00_395470);
+INCLUDE_PAL("effects/gfx/D_09000C00_395270.pal", D_09001000_395670);
 
 u8 D_09001020_395690[0x1E0] = {};
 
diff --git a/src/effects/gfx/big_smoke_puff.c b/src/effects/gfx/big_smoke_puff.c
index a63f5de177..ba278ba3eb 100644
--- a/src/effects/gfx/big_smoke_puff.c
+++ b/src/effects/gfx/big_smoke_puff.c
@@ -1,19 +1,21 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_326410.png.inc.c"
-#include "effects/gfx/D_09000000_326410.pal.inc.c"
-#include "effects/gfx/D_09000220_326630.png.inc.c"
-#include "effects/gfx/D_09000220_326630.pal.inc.c"
-#include "effects/gfx/D_09000440_326850.png.inc.c"
-#include "effects/gfx/D_09000440_326850.pal.inc.c"
-#include "effects/gfx/D_09000660_326A70.png.inc.c"
-#include "effects/gfx/D_09000660_326A70.pal.inc.c"
-#include "effects/gfx/D_09000880_326C90.png.inc.c"
-#include "effects/gfx/D_09000880_326C90.pal.inc.c"
-#include "effects/gfx/D_09000AA0_326EB0.png.inc.c"
-#include "effects/gfx/D_09000AA0_326EB0.pal.inc.c"
-#include "effects/gfx/D_09000CC0_3270D0.png.inc.c"
-#include "effects/gfx/D_09000CC0_3270D0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_326410.png", D_09000000_326410);
+INCLUDE_PAL("effects/gfx/D_09000000_326410.pal", D_09000200_326610);
+INCLUDE_IMG("effects/gfx/D_09000220_326630.png", D_09000220_326630);
+INCLUDE_PAL("effects/gfx/D_09000220_326630.pal", D_09000420_326830);
+INCLUDE_IMG("effects/gfx/D_09000440_326850.png", D_09000440_326850);
+INCLUDE_PAL("effects/gfx/D_09000440_326850.pal", D_09000640_326A50);
+INCLUDE_IMG("effects/gfx/D_09000660_326A70.png", D_09000660_326A70);
+INCLUDE_PAL("effects/gfx/D_09000660_326A70.pal", D_09000860_326C70);
+INCLUDE_IMG("effects/gfx/D_09000880_326C90.png", D_09000880_326C90);
+INCLUDE_PAL("effects/gfx/D_09000880_326C90.pal", D_09000A80_326E90);
+INCLUDE_IMG("effects/gfx/D_09000AA0_326EB0.png", D_09000AA0_326EB0);
+INCLUDE_PAL("effects/gfx/D_09000AA0_326EB0.pal", D_09000CA0_3270B0);
+INCLUDE_IMG("effects/gfx/D_09000CC0_3270D0.png", D_09000CC0_3270D0);
+INCLUDE_PAL("effects/gfx/D_09000CC0_3270D0.pal", D_09000EC0_3272D0);
 
 #include "effects/gfx/D_09000EE0_3272F0.vtx.inc.c"
 
diff --git a/src/effects/gfx/big_snowflakes.c b/src/effects/gfx/big_snowflakes.c
index 960e2dd0df..c2873bd7cb 100644
--- a/src/effects/gfx/big_snowflakes.c
+++ b/src/effects/gfx/big_snowflakes.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3638C0.png.inc.c"
-#include "effects/gfx/D_09000080_363940.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3638C0.png", D_09000000_3638C0);
+INCLUDE_IMG("effects/gfx/D_09000080_363940.png", D_09000080_363940);
 
 #include "effects/gfx/D_09000880_364140.vtx.inc.c"
 #include "effects/gfx/D_090008C0_364180.vtx.inc.c"
diff --git a/src/effects/gfx/blast.c b/src/effects/gfx/blast.c
index c5fe938408..0920bd31fc 100644
--- a/src/effects/gfx/blast.c
+++ b/src/effects/gfx/blast.c
@@ -1,12 +1,14 @@
-#include "effects/gfx/D_09000000_37D9D0.png.inc.c"
-#include "effects/gfx/D_09000200_37DBD0.png.inc.c"
-#include "effects/gfx/D_09000400_37DDD0.png.inc.c"
-#include "effects/gfx/D_09000600_37DFD0.png.inc.c"
-#include "effects/gfx/D_09000800_37E1D0.png.inc.c"
-#include "effects/gfx/D_09000A00_37E3D0.png.inc.c"
-#include "effects/gfx/D_09000C00_37E5D0.png.inc.c"
-#include "effects/gfx/D_09000E00_37E7D0.png.inc.c"
-#include "effects/gfx/D_09001000_37E9D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_37D9D0.png", D_09000000_37D9D0);
+INCLUDE_IMG("effects/gfx/D_09000200_37DBD0.png", D_09000200_37DBD0);
+INCLUDE_IMG("effects/gfx/D_09000400_37DDD0.png", D_09000400_37DDD0);
+INCLUDE_IMG("effects/gfx/D_09000600_37DFD0.png", D_09000600_37DFD0);
+INCLUDE_IMG("effects/gfx/D_09000800_37E1D0.png", D_09000800_37E1D0);
+INCLUDE_IMG("effects/gfx/D_09000A00_37E3D0.png", D_09000A00_37E3D0);
+INCLUDE_IMG("effects/gfx/D_09000C00_37E5D0.png", D_09000C00_37E5D0);
+INCLUDE_IMG("effects/gfx/D_09000E00_37E7D0.png", D_09000E00_37E7D0);
+INCLUDE_IMG("effects/gfx/D_09001000_37E9D0.png", D_09001000_37E9D0);
 
 #include "effects/gfx/D_09001200_37EBD0.vtx.inc.c"
 #include "effects/gfx/D_09001240_37EC10.vtx.inc.c"
diff --git a/src/effects/gfx/breaking_junk.c b/src/effects/gfx/breaking_junk.c
index 0ae2840741..0a9cafa47c 100644
--- a/src/effects/gfx/breaking_junk.c
+++ b/src/effects/gfx/breaking_junk.c
@@ -1,9 +1,11 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_403BF0.png.inc.c"
-#include "effects/gfx/D_09000100_403CF0.png.inc.c"
-#include "effects/gfx/D_09000200_403DF0.png.inc.c"
-#include "effects/gfx/D_09000300_403EF0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_403BF0.png", D_09000000_403BF0);
+INCLUDE_IMG("effects/gfx/D_09000100_403CF0.png", D_09000100_403CF0);
+INCLUDE_IMG("effects/gfx/D_09000200_403DF0.png", D_09000200_403DF0);
+INCLUDE_IMG("effects/gfx/D_09000300_403EF0.png", D_09000300_403EF0);
 
 #include "effects/gfx/D_09000400_403FF0.gfx.inc.c"
 #include "effects/gfx/D_090004A8_404098.vtx.inc.c"
diff --git a/src/effects/gfx/bulb_glow.c b/src/effects/gfx/bulb_glow.c
index 796416d0f9..b195b323c2 100644
--- a/src/effects/gfx/bulb_glow.c
+++ b/src/effects/gfx/bulb_glow.c
@@ -1,6 +1,8 @@
-#include "effects/gfx/D_09000000_37ADD0.png.inc.c"
-#include "effects/gfx/D_09000800_37B5D0.png.inc.c"
-#include "effects/gfx/D_09000C00_37B9D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_37ADD0.png", D_09000000_37ADD0);
+INCLUDE_IMG("effects/gfx/D_09000800_37B5D0.png", D_09000800_37B5D0);
+INCLUDE_IMG("effects/gfx/D_09000C00_37B9D0.png", D_09000C00_37B9D0);
 
 #include "effects/gfx/D_09001400_37C1D0.gfx.inc.c"
 #include "effects/gfx/D_090014B8_37C288.gfx.inc.c"
diff --git a/src/effects/gfx/butterflies.c b/src/effects/gfx/butterflies.c
index 6cecc4efdc..2fa61134ad 100644
--- a/src/effects/gfx/butterflies.c
+++ b/src/effects/gfx/butterflies.c
@@ -1,27 +1,29 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3AB030.png.inc.c"
-#include "effects/gfx/D_09000000_3AB030.pal.inc.c"
-#include "effects/gfx/D_09000420_3AB450.png.inc.c"
-#include "effects/gfx/D_09000420_3AB450.pal.inc.c"
-#include "effects/gfx/D_09000840_3AB870.png.inc.c"
-#include "effects/gfx/D_09000840_3AB870.pal.inc.c"
-#include "effects/gfx/D_09000C50_3ABC80.png.inc.c"
-#include "effects/gfx/D_09000C50_3ABC80.pal.inc.c"
-#include "effects/gfx/D_09001070_3AC0A0.png.inc.c"
-#include "effects/gfx/D_09001070_3AC0A0.pal.inc.c"
-#include "effects/gfx/D_09001480_3AC4B0.png.inc.c"
-#include "effects/gfx/D_09001480_3AC4B0.pal.inc.c"
-#include "effects/gfx/D_090018A0_3AC8D0.png.inc.c"
-#include "effects/gfx/D_090018A0_3AC8D0.pal.inc.c"
-#include "effects/gfx/D_09001CC0_3ACCF0.png.inc.c"
-#include "effects/gfx/D_09001CC0_3ACCF0.pal.inc.c"
-#include "effects/gfx/D_090020E0_3AD110.png.inc.c"
-#include "effects/gfx/D_090020E0_3AD110.pal.inc.c"
-#include "effects/gfx/D_09002500_3AD530.png.inc.c"
-#include "effects/gfx/D_09002500_3AD530.pal.inc.c"
-#include "effects/gfx/D_09002920_3AD950.png.inc.c"
-#include "effects/gfx/D_09002920_3AD950.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3AB030.png", D_09000000_3AB030);
+INCLUDE_PAL("effects/gfx/D_09000000_3AB030.pal", D_09000400_3AB430);
+INCLUDE_IMG("effects/gfx/D_09000420_3AB450.png", D_09000420_3AB450);
+INCLUDE_PAL("effects/gfx/D_09000420_3AB450.pal", D_09000820_3AB850);
+INCLUDE_IMG("effects/gfx/D_09000840_3AB870.png", D_09000840_3AB870);
+INCLUDE_PAL("effects/gfx/D_09000840_3AB870.pal", D_09000C40_3ABC70);
+INCLUDE_IMG("effects/gfx/D_09000C50_3ABC80.png", D_09000C50_3ABC80);
+INCLUDE_PAL("effects/gfx/D_09000C50_3ABC80.pal", D_09001050_3AC080);
+INCLUDE_IMG("effects/gfx/D_09001070_3AC0A0.png", D_09001070_3AC0A0);
+INCLUDE_PAL("effects/gfx/D_09001070_3AC0A0.pal", D_09001470_3AC4A0);
+INCLUDE_IMG("effects/gfx/D_09001480_3AC4B0.png", D_09001480_3AC4B0);
+INCLUDE_PAL("effects/gfx/D_09001480_3AC4B0.pal", D_09001880_3AC8B0);
+INCLUDE_IMG("effects/gfx/D_090018A0_3AC8D0.png", D_090018A0_3AC8D0);
+INCLUDE_PAL("effects/gfx/D_090018A0_3AC8D0.pal", D_09001CA0_3ACCD0);
+INCLUDE_IMG("effects/gfx/D_09001CC0_3ACCF0.png", D_09001CC0_3ACCF0);
+INCLUDE_PAL("effects/gfx/D_09001CC0_3ACCF0.pal", D_090020C0_3AD0F0);
+INCLUDE_IMG("effects/gfx/D_090020E0_3AD110.png", D_090020E0_3AD110);
+INCLUDE_PAL("effects/gfx/D_090020E0_3AD110.pal", D_090024E0_3AD510);
+INCLUDE_IMG("effects/gfx/D_09002500_3AD530.png", D_09002500_3AD530);
+INCLUDE_PAL("effects/gfx/D_09002500_3AD530.pal", D_09002900_3AD930);
+INCLUDE_IMG("effects/gfx/D_09002920_3AD950.png", D_09002920_3AD950);
+INCLUDE_PAL("effects/gfx/D_09002920_3AD950.pal", D_09002D20_3ADD50);
 
 #include "effects/gfx/D_09002D40_3ADD70.vtx.inc.c"
 
diff --git a/src/effects/gfx/chapter_change.c b/src/effects/gfx/chapter_change.c
index ce0c4f38cf..31a7062fa9 100644
--- a/src/effects/gfx/chapter_change.c
+++ b/src/effects/gfx/chapter_change.c
@@ -1,20 +1,22 @@
-#include "effects/gfx/world/ch0.png.inc.c"
-#include "effects/gfx/D_09000B40_3EC9A0.png.inc.c"
-#include "effects/gfx/world/text_chapter.png.inc.c"
-#include "effects/gfx/D_09001B80_3ED9E0.png.inc.c"
-#include "effects/gfx/D_09002080_3EDEE0.png.inc.c"
-#include "effects/gfx/D_09002580_3EE3E0.png.inc.c"
-#include "effects/gfx/world/text_end_of.png.inc.c"
-#include "effects/gfx/world/exclamation_point.png.inc.c"
-#include "effects/gfx/world/ch1.png.inc.c"
-#include "effects/gfx/world/ch2.png.inc.c"
-#include "effects/gfx/world/ch3.png.inc.c"
-#include "effects/gfx/world/ch4.png.inc.c"
-#include "effects/gfx/world/ch5.png.inc.c"
-#include "effects/gfx/world/ch6.png.inc.c"
-#include "effects/gfx/world/ch7.png.inc.c"
-#include "effects/gfx/world/ch8.png.inc.c"
-#include "effects/gfx/world/chapter_rainbow.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/world/ch0.png", D_09000000_3EBE60);
+INCLUDE_IMG("effects/gfx/D_09000B40_3EC9A0.png", D_09000B40_3EC9A0);
+INCLUDE_IMG("effects/gfx/world/text_chapter.png", D_09001680_3ED4E0);
+INCLUDE_IMG("effects/gfx/D_09001B80_3ED9E0.png", D_09001B80_3ED9E0);
+INCLUDE_IMG("effects/gfx/D_09002080_3EDEE0.png", D_09002080_3EDEE0);
+INCLUDE_IMG("effects/gfx/D_09002580_3EE3E0.png", D_09002580_3EE3E0);
+INCLUDE_IMG("effects/gfx/world/text_end_of.png", D_09002A80_3EE8E0);
+INCLUDE_IMG("effects/gfx/world/exclamation_point.png", D_09003AC0_3EF920);
+INCLUDE_IMG("effects/gfx/world/ch1.png", D_09003D40_3EFBA0);
+INCLUDE_IMG("effects/gfx/world/ch2.png", D_09004D40_3F0BA0);
+INCLUDE_IMG("effects/gfx/world/ch3.png", D_09005D40_3F1BA0);
+INCLUDE_IMG("effects/gfx/world/ch4.png", D_09006D40_3F2BA0);
+INCLUDE_IMG("effects/gfx/world/ch5.png", D_09007D40_3F3BA0);
+INCLUDE_IMG("effects/gfx/world/ch6.png", D_09008D40_3F4BA0);
+INCLUDE_IMG("effects/gfx/world/ch7.png", D_09009D40_3F5BA0);
+INCLUDE_IMG("effects/gfx/world/ch8.png", D_0900AD40_3F6BA0);
+INCLUDE_IMG("effects/gfx/world/chapter_rainbow.png", D_0900BD40_3F7BA0);
 
 #include "effects/gfx/D_0900BE40_3F7CA0.gfx.inc.c"
 #include "effects/gfx/D_0900BE88_3F7CE8.gfx.inc.c"
diff --git a/src/effects/gfx/chomp_drop.c b/src/effects/gfx/chomp_drop.c
index 9e5eae7ec1..eb026fae65 100644
--- a/src/effects/gfx/chomp_drop.c
+++ b/src/effects/gfx/chomp_drop.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_397040.png.inc.c"
-#include "effects/gfx/D_09000800_397840.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_397040.png", D_09000000_397040);
+INCLUDE_IMG("effects/gfx/D_09000800_397840.png", D_09000800_397840);
 
 #include "effects/gfx/D_09001000_398040.vtx.inc.c"
 
diff --git a/src/effects/gfx/cloud_puff_trail.c b/src/effects/gfx/cloud_puff_trail.c
index c7eb5b62df..bd2a36fae4 100644
--- a/src/effects/gfx/cloud_puff_trail.c
+++ b/src/effects/gfx/cloud_puff_trail.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_32EC50.png.inc.c"
-#include "effects/gfx/D_09000000_32EC50.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_32EC50.png", D_09000000_32EC50);
+INCLUDE_PAL("effects/gfx/D_09000000_32EC50.pal", D_09000080_32ECD0);
 
 #include "effects/gfx/D_090000A0_32ECF0.vtx.inc.c"
 
diff --git a/src/effects/gfx/cold_breath.c b/src/effects/gfx/cold_breath.c
index 5d0e17457e..6cdb3adb5b 100644
--- a/src/effects/gfx/cold_breath.c
+++ b/src/effects/gfx/cold_breath.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3D9100.png.inc.c"
-#include "effects/gfx/D_09001000_3DA100.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D9100.png", D_09000000_3D9100);
+INCLUDE_IMG("effects/gfx/D_09001000_3DA100.png", D_09001000_3DA100);
 
 #include "effects/gfx/D_09002000_3DB100.gfx.inc.c"
 
diff --git a/src/effects/gfx/confetti.c b/src/effects/gfx/confetti.c
index db85d4c794..483c5a5227 100644
--- a/src/effects/gfx/confetti.c
+++ b/src/effects/gfx/confetti.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_38BBA0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_38BBA0.png", D_09000000_38BBA0);
 
 #include "effects/gfx/D_09000800_38C3A0.vtx.inc.c"
 #include "effects/gfx/D_09000840_38C3E0.vtx.inc.c"
diff --git a/src/effects/gfx/damage_indicator.c b/src/effects/gfx/damage_indicator.c
index 192121bc62..8f563fefb2 100644
--- a/src/effects/gfx/damage_indicator.c
+++ b/src/effects/gfx/damage_indicator.c
@@ -1,19 +1,21 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_350220.png.inc.c"
-#include "effects/gfx/D_09000200_350420.png.inc.c"
-#include "effects/gfx/D_09000400_350620.png.inc.c"
-#include "effects/gfx/D_09000600_350820.png.inc.c"
-#include "effects/gfx/D_09000800_350A20.png.inc.c"
-#include "effects/gfx/D_09000A00_350C20.png.inc.c"
-#include "effects/gfx/D_09000C00_350E20.png.inc.c"
-#include "effects/gfx/D_09000E00_351020.png.inc.c"
-#include "effects/gfx/D_09001000_351220.png.inc.c"
-#include "effects/gfx/D_09001200_351420.png.inc.c"
-#include "effects/gfx/D_09001400_351620.png.inc.c"
-#include "effects/gfx/D_09001600_351820.png.inc.c"
-#include "effects/gfx/D_09001800_351A20.png.inc.c"
-#include "effects/gfx/D_09001A00_351C20.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_350220.png", D_09000000_350220);
+INCLUDE_IMG("effects/gfx/D_09000200_350420.png", D_09000200_350420);
+INCLUDE_IMG("effects/gfx/D_09000400_350620.png", D_09000400_350620);
+INCLUDE_IMG("effects/gfx/D_09000600_350820.png", D_09000600_350820);
+INCLUDE_IMG("effects/gfx/D_09000800_350A20.png", D_09000800_350A20);
+INCLUDE_IMG("effects/gfx/D_09000A00_350C20.png", D_09000A00_350C20);
+INCLUDE_IMG("effects/gfx/D_09000C00_350E20.png", D_09000C00_350E20);
+INCLUDE_IMG("effects/gfx/D_09000E00_351020.png", D_09000E00_351020);
+INCLUDE_IMG("effects/gfx/D_09001000_351220.png", D_09001000_351220);
+INCLUDE_IMG("effects/gfx/D_09001200_351420.png", D_09001200_351420);
+INCLUDE_IMG("effects/gfx/D_09001400_351620.png", D_09001400_351620);
+INCLUDE_IMG("effects/gfx/D_09001600_351820.png", D_09001600_351820);
+INCLUDE_IMG("effects/gfx/D_09001800_351A20.png", D_09001800_351A20);
+INCLUDE_IMG("effects/gfx/D_09001A00_351C20.png", D_09001A00_351C20);
 
 #include "effects/gfx/D_09001C00_351E20.vtx.inc.c"
 #include "effects/gfx/D_09001C10_351E30.vtx.inc.c"
diff --git a/src/effects/gfx/damage_stars.c b/src/effects/gfx/damage_stars.c
index 871f21b096..0caa310d7e 100644
--- a/src/effects/gfx/damage_stars.c
+++ b/src/effects/gfx/damage_stars.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_343040.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_343040.png", D_09000000_343040);
 
 #include "effects/gfx/D_09000400_343440.vtx.inc.c"
 #include "effects/gfx/D_09000440_343480.vtx.inc.c"
diff --git a/src/effects/gfx/debuff.c b/src/effects/gfx/debuff.c
index 47395e6b43..ee699733ce 100644
--- a/src/effects/gfx/debuff.c
+++ b/src/effects/gfx/debuff.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_364C00.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_364C00.png", D_09000000_364C00);
 
 #include "effects/gfx/D_09000200_364E00.vtx.inc.c"
 
diff --git a/src/effects/gfx/disable_x.c b/src/effects/gfx/disable_x.c
index d62237debe..3c41f79009 100644
--- a/src/effects/gfx/disable_x.c
+++ b/src/effects/gfx/disable_x.c
@@ -1,18 +1,20 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3863B0.png.inc.c"
-#include "effects/gfx/D_09000200_3865B0.png.inc.c"
-#include "effects/gfx/D_09000400_3867B0.png.inc.c"
-#include "effects/gfx/D_09000600_3869B0.png.inc.c"
-#include "effects/gfx/D_09000800_386BB0.png.inc.c"
-#include "effects/gfx/D_09000A00_386DB0.png.inc.c"
-#include "effects/gfx/D_09000C00_386FB0.png.inc.c"
-#include "effects/gfx/D_09000E00_3871B0.png.inc.c"
-#include "effects/gfx/D_09001000_3873B0.png.inc.c"
-#include "effects/gfx/D_09001200_3875B0.png.inc.c"
-#include "effects/gfx/D_09001400_3877B0.png.inc.c"
-#include "effects/gfx/D_09001600_3879B0.png.inc.c"
-#include "effects/gfx/D_09001800_387BB0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3863B0.png", D_09000000_3863B0);
+INCLUDE_IMG("effects/gfx/D_09000200_3865B0.png", D_09000200_3865B0);
+INCLUDE_IMG("effects/gfx/D_09000400_3867B0.png", D_09000400_3867B0);
+INCLUDE_IMG("effects/gfx/D_09000600_3869B0.png", D_09000600_3869B0);
+INCLUDE_IMG("effects/gfx/D_09000800_386BB0.png", D_09000800_386BB0);
+INCLUDE_IMG("effects/gfx/D_09000A00_386DB0.png", D_09000A00_386DB0);
+INCLUDE_IMG("effects/gfx/D_09000C00_386FB0.png", D_09000C00_386FB0);
+INCLUDE_IMG("effects/gfx/D_09000E00_3871B0.png", D_09000E00_3871B0);
+INCLUDE_IMG("effects/gfx/D_09001000_3873B0.png", D_09001000_3873B0);
+INCLUDE_IMG("effects/gfx/D_09001200_3875B0.png", D_09001200_3875B0);
+INCLUDE_IMG("effects/gfx/D_09001400_3877B0.png", D_09001400_3877B0);
+INCLUDE_IMG("effects/gfx/D_09001600_3879B0.png", D_09001600_3879B0);
+INCLUDE_IMG("effects/gfx/D_09001800_387BB0.png", D_09001800_387BB0);
 
 #include "effects/gfx/D_09002000_3883B0.vtx.inc.c"
 #include "effects/gfx/D_09002040_3883F0.vtx.inc.c"
diff --git a/src/effects/gfx/drop_leaves.c b/src/effects/gfx/drop_leaves.c
index b0f43db89a..cbf964058f 100644
--- a/src/effects/gfx/drop_leaves.c
+++ b/src/effects/gfx/drop_leaves.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_33D610.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_33D610.png", D_09000000_33D610);
 
 #include "effects/gfx/D_09001000_33E610.vtx.inc.c"
 #include "effects/gfx/D_09001080_33E690.vtx.inc.c"
diff --git a/src/effects/gfx/dust.c b/src/effects/gfx/dust.c
index 08388c1127..52897178af 100644
--- a/src/effects/gfx/dust.c
+++ b/src/effects/gfx/dust.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_33F000.png.inc.c"
-#include "effects/gfx/D_09000600_33F600.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_33F000.png", D_09000000_33F000);
+INCLUDE_IMG("effects/gfx/D_09000600_33F600.png", D_09000600_33F600);
 
 #include "effects/gfx/D_09000C00_33FC00.vtx.inc.c"
 #include "effects/gfx/D_09000C40_33FC40.vtx.inc.c"
diff --git a/src/effects/gfx/effect_3D.c b/src/effects/gfx/effect_3D.c
index 50053b048d..9b44f1f380 100644
--- a/src/effects/gfx/effect_3D.c
+++ b/src/effects/gfx/effect_3D.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_37D180.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_37D180.png", D_09000000_37D180);
 
 #include "effects/gfx/D_09000200_37D380.vtx.inc.c"
 
diff --git a/src/effects/gfx/effect_46.c b/src/effects/gfx/effect_46.c
index 16ad9b0cfb..9835cf1a5b 100644
--- a/src/effects/gfx/effect_46.c
+++ b/src/effects/gfx/effect_46.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_38E990.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_38E990.png", D_09000000_38E990);
 
 #include "effects/gfx/D_09000200_38EB90.vtx.inc.c"
 
diff --git a/src/effects/gfx/effect_63.c b/src/effects/gfx/effect_63.c
index bf77418576..5666451d57 100644
--- a/src/effects/gfx/effect_63.c
+++ b/src/effects/gfx/effect_63.c
@@ -1,7 +1,9 @@
-#include "effects/gfx/D_09000000_3CD6E0.png.inc.c"
-#include "effects/gfx/D_09000400_3CDAE0.png.inc.c"
-#include "effects/gfx/D_09000C00_3CE2E0.png.inc.c"
-#include "effects/gfx/D_09001000_3CE6E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3CD6E0.png", D_09000000_3CD6E0);
+INCLUDE_IMG("effects/gfx/D_09000400_3CDAE0.png", D_09000400_3CDAE0);
+INCLUDE_IMG("effects/gfx/D_09000C00_3CE2E0.png", D_09000C00_3CE2E0);
+INCLUDE_IMG("effects/gfx/D_09001000_3CE6E0.png", D_09001000_3CE6E0);
 
 #include "effects/gfx/D_09001800_3CEEE0.vtx.inc.c"
 #include "effects/gfx/D_09001840_3CEF20.vtx.inc.c"
diff --git a/src/effects/gfx/effect_65.c b/src/effects/gfx/effect_65.c
index 0a92525e27..a1c2a4a9d6 100644
--- a/src/effects/gfx/effect_65.c
+++ b/src/effects/gfx/effect_65.c
@@ -1,2 +1,4 @@
-#include "effects/gfx/D_09000000_3D11E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D11E0.png", D_09000000_3D11E0);
 #include "effects/gfx/D_09000400_3D15E0.gfx.inc.c"
diff --git a/src/effects/gfx/effect_75.c b/src/effects/gfx/effect_75.c
index 83d4961f44..3b51946880 100644
--- a/src/effects/gfx/effect_75.c
+++ b/src/effects/gfx/effect_75.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3E2960.png.inc.c"
-#include "effects/gfx/D_09000800_3E3160.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3E2960.png", D_09000000_3E2960);
+INCLUDE_IMG("effects/gfx/D_09000800_3E3160.png", D_09000800_3E3160);
 
 #include "effects/gfx/D_09001000_3E3960.vtx.inc.c"
 #include "effects/gfx/D_09001070_3E39D0.vtx.inc.c"
diff --git a/src/effects/gfx/effect_86.c b/src/effects/gfx/effect_86.c
index 185a945a4d..bede89b4c5 100644
--- a/src/effects/gfx/effect_86.c
+++ b/src/effects/gfx/effect_86.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_415060.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_415060.png", D_09000000_415060);
 
 #include "effects/gfx/D_09000800_415860.gfx.inc.c"
 
diff --git a/src/effects/gfx/embers.c b/src/effects/gfx/embers.c
index c2588dd8b4..a5218f5168 100644
--- a/src/effects/gfx/embers.c
+++ b/src/effects/gfx/embers.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3DBF40.png.inc.c"
-#include "effects/gfx/D_09000200_3DC140.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3DBF40.png", D_09000000_3DBF40);
+INCLUDE_IMG("effects/gfx/D_09000200_3DC140.png", D_09000200_3DC140);
 
 #include "effects/gfx/D_09000280_3DC1C0.gfx.inc.c"
 
diff --git a/src/effects/gfx/emote.c b/src/effects/gfx/emote.c
index 482769acb6..e5c36aba2e 100644
--- a/src/effects/gfx/emote.c
+++ b/src/effects/gfx/emote.c
@@ -1,8 +1,10 @@
-#include "effects/gfx/D_09000000_334C70.png.inc.c"
-#include "effects/gfx/D_09000400_335070.png.inc.c"
-#include "effects/gfx/D_09000A00_335670.png.inc.c"
-#include "effects/gfx/D_09001600_336270.png.inc.c"
-#include "effects/gfx/D_09001E00_336A70.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_334C70.png", D_09000000_334C70);
+INCLUDE_IMG("effects/gfx/D_09000400_335070.png", D_09000400_335070);
+INCLUDE_IMG("effects/gfx/D_09000A00_335670.png", D_09000A00_335670);
+INCLUDE_IMG("effects/gfx/D_09001600_336270.png", D_09001600_336270);
+INCLUDE_IMG("effects/gfx/D_09001E00_336A70.png", D_09001E00_336A70);
 
 #include "effects/gfx/D_09002000_336C70.vtx.inc.c"
 #include "effects/gfx/D_09002040_336CB0.vtx.inc.c"
diff --git a/src/effects/gfx/ending_decals.c b/src/effects/gfx/ending_decals.c
index 016e88ee7c..b530f75577 100644
--- a/src/effects/gfx/ending_decals.c
+++ b/src/effects/gfx/ending_decals.c
@@ -1,10 +1,12 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_36AEE0.png.inc.c"
-#include "effects/gfx/D_09001000_36BEE0.png.inc.c"
-#include "effects/gfx/D_09001400_36C2E0.png.inc.c"
-#include "effects/gfx/D_09001800_36C6E0.png.inc.c"
-#include "effects/gfx/D_09001000_36BEE0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_36AEE0.png", D_09000000_36AEE0);
+INCLUDE_IMG("effects/gfx/D_09001000_36BEE0.png", D_09001000_36BEE0);
+INCLUDE_IMG("effects/gfx/D_09001400_36C2E0.png", D_09001400_36C2E0);
+INCLUDE_IMG("effects/gfx/D_09001800_36C6E0.png", D_09001800_36C6E0);
+INCLUDE_PAL("effects/gfx/D_09001000_36BEE0.pal", D_09001C00_36CAE0);
 
 u8 D_09001C20_36CB00[0x1E0] = {};
 
diff --git a/src/effects/gfx/energy_in_out.c b/src/effects/gfx/energy_in_out.c
index 8774d706ca..918265ecc0 100644
--- a/src/effects/gfx/energy_in_out.c
+++ b/src/effects/gfx/energy_in_out.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3D5F30.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D5F30.png", D_09000000_3D5F30);
 
 #include "effects/gfx/D_09000200_3D6130.gfx.inc.c"
 
diff --git a/src/effects/gfx/energy_orb_wave.c b/src/effects/gfx/energy_orb_wave.c
index 7245532388..f7c65255fb 100644
--- a/src/effects/gfx/energy_orb_wave.c
+++ b/src/effects/gfx/energy_orb_wave.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3A4320.png.inc.c"
-#include "effects/gfx/D_09000800_3A4B20.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A4320.png", D_09000000_3A4320);
+INCLUDE_IMG("effects/gfx/D_09000800_3A4B20.png", D_09000800_3A4B20);
 
 #include "effects/gfx/D_09001000_3A5320.gfx.inc.c"
 #include "effects/gfx/D_090010A8_3A53C8.gfx.inc.c"
diff --git a/src/effects/gfx/energy_shockwave.c b/src/effects/gfx/energy_shockwave.c
index b8a6209dc8..2d434d6c06 100644
--- a/src/effects/gfx/energy_shockwave.c
+++ b/src/effects/gfx/energy_shockwave.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_375510.png.inc.c"
-#include "effects/gfx/D_09000800_375D10.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_375510.png", D_09000000_375510);
+INCLUDE_IMG("effects/gfx/D_09000800_375D10.png", D_09000800_375D10);
 
 #include "effects/gfx/D_09000A00_375F10.vtx.inc.c"
 #include "effects/gfx/D_09000C00_376110.vtx.inc.c"
diff --git a/src/effects/gfx/explosion.c b/src/effects/gfx/explosion.c
index 376e6645c8..b378e2bfd2 100644
--- a/src/effects/gfx/explosion.c
+++ b/src/effects/gfx/explosion.c
@@ -1,7 +1,9 @@
-#include "effects/gfx/D_09000000_343F70.png.inc.c"
-#include "effects/gfx/D_09000200_344170.png.inc.c"
-#include "effects/gfx/D_09000400_344370.png.inc.c"
-#include "effects/gfx/D_09000600_344570.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_343F70.png", D_09000000_343F70);
+INCLUDE_IMG("effects/gfx/D_09000200_344170.png", D_09000200_344170);
+INCLUDE_IMG("effects/gfx/D_09000400_344370.png", D_09000400_344370);
+INCLUDE_IMG("effects/gfx/D_09000600_344570.png", D_09000600_344570);
 
 #include "effects/gfx/D_09000800_344770.vtx.inc.c"
 
diff --git a/src/effects/gfx/falling_leaves.c b/src/effects/gfx/falling_leaves.c
index 4f59b5ddac..54dc5570b5 100644
--- a/src/effects/gfx/falling_leaves.c
+++ b/src/effects/gfx/falling_leaves.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_35F0E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_35F0E0.png", D_09000000_35F0E0);
 
 #include "effects/gfx/D_09001000_3600E0.vtx.inc.c"
 
diff --git a/src/effects/gfx/fire_breath.c b/src/effects/gfx/fire_breath.c
index b53601b060..a8c5f90508 100644
--- a/src/effects/gfx/fire_breath.c
+++ b/src/effects/gfx/fire_breath.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3733E0.png.inc.c"
-#include "effects/gfx/D_09000800_373BE0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3733E0.png", D_09000000_3733E0);
+INCLUDE_IMG("effects/gfx/D_09000800_373BE0.png", D_09000800_373BE0);
 #include "effects/gfx/D_09000A00_373DE0.gfx.inc.c"
 #include "effects/gfx/D_09000AE8_373EC8.vtx.inc.c"
 #include "effects/gfx/D_09000B38_373F18.vtx.inc.c"
diff --git a/src/effects/gfx/fire_flower.c b/src/effects/gfx/fire_flower.c
index 1c5b79c1d6..6401bbe40f 100644
--- a/src/effects/gfx/fire_flower.c
+++ b/src/effects/gfx/fire_flower.c
@@ -1,17 +1,19 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3803A0.png.inc.c"
-#include "effects/gfx/D_09000200_3805A0.png.inc.c"
-#include "effects/gfx/D_09000400_3807A0.png.inc.c"
-#include "effects/gfx/D_09000600_3809A0.png.inc.c"
-#include "effects/gfx/D_09000000_3803A0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3803A0.png", D_09000000_3803A0);
+INCLUDE_IMG("effects/gfx/D_09000200_3805A0.png", D_09000200_3805A0);
+INCLUDE_IMG("effects/gfx/D_09000400_3807A0.png", D_09000400_3807A0);
+INCLUDE_IMG("effects/gfx/D_09000600_3809A0.png", D_09000600_3809A0);
+INCLUDE_PAL("effects/gfx/D_09000000_3803A0.pal", D_09000800_380BA0);
 
 u8 D_09000820_380BC0[] = {
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 };
 
-#include "effects/gfx/D_09000A00_380DA0.png.inc.c"
-#include "effects/gfx/D_09000A00_380DA0.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000A00_380DA0.png", D_09000A00_380DA0);
+INCLUDE_PAL("effects/gfx/D_09000A00_380DA0.pal", D_09000A80_380E20);
 
 u8 D_09000AA0_380E40[] = {
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
diff --git a/src/effects/gfx/firework.c b/src/effects/gfx/firework.c
index 3595810c61..f94db9939d 100644
--- a/src/effects/gfx/firework.c
+++ b/src/effects/gfx/firework.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_38A350.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_38A350.png", D_09000000_38A350);
 
 #include "effects/gfx/D_09000800_38AB50.vtx.inc.c"
 #include "effects/gfx/D_09000840_38AB90.vtx.inc.c"
diff --git a/src/effects/gfx/firework_rocket.c b/src/effects/gfx/firework_rocket.c
index d90a0a599e..90a2f979d1 100644
--- a/src/effects/gfx/firework_rocket.c
+++ b/src/effects/gfx/firework_rocket.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3E5350.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3E5350.png", D_09000000_3E5350);
 #include "effects/gfx/D_09000080_3E53D0.gfx.inc.c"
 
 #include "effects/gfx/D_09000128_3E5478.vtx.inc.c"
diff --git a/src/effects/gfx/flame.c b/src/effects/gfx/flame.c
index 8fae6a95e0..ce8156ced7 100644
--- a/src/effects/gfx/flame.c
+++ b/src/effects/gfx/flame.c
@@ -1,7 +1,9 @@
-#include "effects/gfx/D_09000000_353BB0.png.inc.c"
-#include "effects/gfx/D_09000200_353DB0.png.inc.c"
-#include "effects/gfx/D_09000400_353FB0.png.inc.c"
-#include "effects/gfx/D_09000600_3541B0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_353BB0.png", D_09000000_353BB0);
+INCLUDE_IMG("effects/gfx/D_09000200_353DB0.png", D_09000200_353DB0);
+INCLUDE_IMG("effects/gfx/D_09000400_353FB0.png", D_09000400_353FB0);
+INCLUDE_IMG("effects/gfx/D_09000600_3541B0.png", D_09000600_3541B0);
 
 extern unsigned char D_800B32E0[];
 extern unsigned char D_800B3AE0[];
diff --git a/src/effects/gfx/flashing_box_shockwave.c b/src/effects/gfx/flashing_box_shockwave.c
index 771042ff63..e1de35b413 100644
--- a/src/effects/gfx/flashing_box_shockwave.c
+++ b/src/effects/gfx/flashing_box_shockwave.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3930A0.png.inc.c"
-#include "effects/gfx/D_09000200_3932A0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3930A0.png", D_09000000_3930A0);
+INCLUDE_IMG("effects/gfx/D_09000200_3932A0.png", D_09000200_3932A0);
 
 #include "effects/gfx/D_09000600_3936A0.gfx.inc.c"
 
diff --git a/src/effects/gfx/floating_cloud_puff.c b/src/effects/gfx/floating_cloud_puff.c
index 592ef7d291..a8dda21b10 100644
--- a/src/effects/gfx/floating_cloud_puff.c
+++ b/src/effects/gfx/floating_cloud_puff.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3D4E90.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D4E90.png", D_09000000_3D4E90);
 #include "effects/gfx/D_09000080_3D4F10.gfx.inc.c"
 #include "effects/gfx/D_09000128_3D4FB8.vtx.inc.c"
 #include "effects/gfx/D_09000168_3D4FF8.gfx.inc.c"
diff --git a/src/effects/gfx/floating_flower.c b/src/effects/gfx/floating_flower.c
index b9e693bfd0..3c9a47530e 100644
--- a/src/effects/gfx/floating_flower.c
+++ b/src/effects/gfx/floating_flower.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_330460.png.inc.c"
-#include "effects/gfx/D_09000000_330460.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_330460.png", D_09000000_330460);
+INCLUDE_PAL("effects/gfx/D_09000000_330460.pal", D_09000080_3304E0);
 
 #include "effects/gfx/D_090000A0_330500.vtx.inc.c"
 #include "effects/gfx/D_09000170_3305D0.vtx.inc.c"
diff --git a/src/effects/gfx/flower_splash_trail.c b/src/effects/gfx/flower_splash_trail.c
index 2528351a99..87cb2b04f2 100644
--- a/src/effects/gfx/flower_splash_trail.c
+++ b/src/effects/gfx/flower_splash_trail.c
@@ -1,9 +1,11 @@
-#include "common.h"
 
-#include "effects/gfx/D_09000000_32CEC0.png.inc.c"
-#include "effects/gfx/D_09000000_32CEC0.pal.inc.c"
-#include "effects/gfx/D_09000000_32CEC0.yellow.pal.inc.c"
-#include "effects/gfx/D_090000C0_32CF80.png.inc.c"
+#include "common.h"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_32CEC0.png", D_09000000_32CEC0);
+INCLUDE_PAL("effects/gfx/D_09000000_32CEC0.pal", D_09000080_32CF40);
+INCLUDE_PAL("effects/gfx/D_09000000_32CEC0.yellow.pal", D_090000A0_32CF60);
+INCLUDE_IMG("effects/gfx/D_090000C0_32CF80.png", D_090000C0_32CF80);
 
 #include "effects/gfx/D_090008C0_32D780.vtx.inc.c"
 #include "effects/gfx/D_09000A30_32D8F0.vtx.inc.c"
diff --git a/src/effects/gfx/footprint.c b/src/effects/gfx/footprint.c
index 94f60ffb63..9e6d5e86dc 100644
--- a/src/effects/gfx/footprint.c
+++ b/src/effects/gfx/footprint.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_32FB50.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_32FB50.png", D_09000000_32FB50);
 
 #include "effects/gfx/D_09000200_32FD50.vtx.inc.c"
 
diff --git a/src/effects/gfx/fright_jar.c b/src/effects/gfx/fright_jar.c
index 6339194776..a1a3e468f7 100644
--- a/src/effects/gfx/fright_jar.c
+++ b/src/effects/gfx/fright_jar.c
@@ -1,7 +1,9 @@
-#include "effects/gfx/D_09000000_3C1BA0.png.inc.c"
-#include "effects/gfx/D_09000000_3C1BA0.pal.inc.c"
-#include "effects/gfx/D_09002020_3C3BC0.png.inc.c"
-#include "effects/gfx/D_09002020_3C3BC0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3C1BA0.png", D_09000000_3C1BA0);
+INCLUDE_PAL("effects/gfx/D_09000000_3C1BA0.pal", D_09002000_3C3BA0);
+INCLUDE_IMG("effects/gfx/D_09002020_3C3BC0.png", D_09002020_3C3BC0);
+INCLUDE_PAL("effects/gfx/D_09002020_3C3BC0.pal", D_09004020_3C5BC0);
 
 #include "effects/gfx/D_09004040_3C5BE0.vtx.inc.c"
 #include "effects/gfx/D_090043B0_3C5F50.vtx.inc.c"
diff --git a/src/effects/gfx/gather_energy_pink.c b/src/effects/gfx/gather_energy_pink.c
index 5b861c5ccc..4f52b1687d 100644
--- a/src/effects/gfx/gather_energy_pink.c
+++ b/src/effects/gfx/gather_energy_pink.c
@@ -1,6 +1,8 @@
-#include "effects/gfx/D_09000000_33BBD0.png.inc.c"
-#include "effects/gfx/D_09000200_33BDD0.png.inc.c"
-#include "effects/gfx/D_09000400_33BFD0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_33BBD0.png", D_09000000_33BBD0);
+INCLUDE_IMG("effects/gfx/D_09000200_33BDD0.png", D_09000200_33BDD0);
+INCLUDE_IMG("effects/gfx/D_09000400_33BFD0.png", D_09000400_33BFD0);
 
 #include "effects/gfx/D_09000C00_33C7D0.vtx.inc.c"
 
diff --git a/src/effects/gfx/gather_magic.c b/src/effects/gfx/gather_magic.c
index 35b5fed749..11d8be9a7f 100644
--- a/src/effects/gfx/gather_magic.c
+++ b/src/effects/gfx/gather_magic.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_38F710.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_38F710.png", D_09000000_38F710);
 
 #include "effects/gfx/D_09000080_38F790.gfx.inc.c"
 
diff --git a/src/effects/gfx/got_item_outline.c b/src/effects/gfx/got_item_outline.c
index d0999beb67..8edb9e3bbc 100644
--- a/src/effects/gfx/got_item_outline.c
+++ b/src/effects/gfx/got_item_outline.c
@@ -1,11 +1,13 @@
-#include "effects/gfx/D_09000000_345B40.png.inc.c"
-#include "effects/gfx/D_09001000_346B40.png.inc.c"
-#include "effects/gfx/D_09002000_347B40.png.inc.c"
-#include "effects/gfx/D_09003000_348B40.png.inc.c"
-#include "effects/gfx/D_09004000_349B40.png.inc.c"
-#include "effects/gfx/D_09005000_34AB40.png.inc.c"
-#include "effects/gfx/D_09006000_34BB40.png.inc.c"
-#include "effects/gfx/D_09007000_34CB40.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_345B40.png", D_09000000_345B40);
+INCLUDE_IMG("effects/gfx/D_09001000_346B40.png", D_09001000_346B40);
+INCLUDE_IMG("effects/gfx/D_09002000_347B40.png", D_09002000_347B40);
+INCLUDE_IMG("effects/gfx/D_09003000_348B40.png", D_09003000_348B40);
+INCLUDE_IMG("effects/gfx/D_09004000_349B40.png", D_09004000_349B40);
+INCLUDE_IMG("effects/gfx/D_09005000_34AB40.png", D_09005000_34AB40);
+INCLUDE_IMG("effects/gfx/D_09006000_34BB40.png", D_09006000_34BB40);
+INCLUDE_IMG("effects/gfx/D_09007000_34CB40.png", D_09007000_34CB40);
 
 #include "effects/gfx/D_09008000_34DB40.vtx.inc.c"
 
diff --git a/src/effects/gfx/green_impact.c b/src/effects/gfx/green_impact.c
index 3f70146a6c..ca1765650e 100644
--- a/src/effects/gfx/green_impact.c
+++ b/src/effects/gfx/green_impact.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3659B0.png.inc.c"
-#include "effects/gfx/D_09000200_365BB0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3659B0.png", D_09000000_3659B0);
+INCLUDE_IMG("effects/gfx/D_09000200_365BB0.png", D_09000200_365BB0);
 
 #include "effects/gfx/D_09000400_365DB0.vtx.inc.c"
 
diff --git a/src/effects/gfx/hieroglyphs.c b/src/effects/gfx/hieroglyphs.c
index 637275ebc5..6bf5ea7cca 100644
--- a/src/effects/gfx/hieroglyphs.c
+++ b/src/effects/gfx/hieroglyphs.c
@@ -1,3 +1,5 @@
-#include "effects/gfx/D_09000000_3DCD50.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3DCD50.png", D_09000000_3DCD50);
 #include "effects/gfx/D_09001000_3DDD50.gfx.inc.c"
 #include "effects/gfx/D_090010A8_3DDDF8.vtx.inc.c"
diff --git a/src/effects/gfx/huff_puff_breath.c b/src/effects/gfx/huff_puff_breath.c
index 8f029bac5f..7f2cbe4a48 100644
--- a/src/effects/gfx/huff_puff_breath.c
+++ b/src/effects/gfx/huff_puff_breath.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3D80C0.png.inc.c"
-#include "effects/gfx/D_09000200_3D82C0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D80C0.png", D_09000000_3D80C0);
+INCLUDE_IMG("effects/gfx/D_09000200_3D82C0.png", D_09000200_3D82C0);
 
 #include "effects/gfx/D_09000400_3D84C0.gfx.inc.c"
 
diff --git a/src/effects/gfx/ice_pillar.c b/src/effects/gfx/ice_pillar.c
index 9cfac2f1e8..0c6e9a5743 100644
--- a/src/effects/gfx/ice_pillar.c
+++ b/src/effects/gfx/ice_pillar.c
@@ -1,7 +1,9 @@
-#include "effects/gfx/D_09000000_40A1C0.png.inc.c"
-#include "effects/gfx/D_09000400_40A5C0.png.inc.c"
-#include "effects/gfx/D_09000800_40A9C0.png.inc.c"
-#include "effects/gfx/D_09000C00_40ADC0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_40A1C0.png", D_09000000_40A1C0);
+INCLUDE_IMG("effects/gfx/D_09000400_40A5C0.png", D_09000400_40A5C0);
+INCLUDE_IMG("effects/gfx/D_09000800_40A9C0.png", D_09000800_40A9C0);
+INCLUDE_IMG("effects/gfx/D_09000C00_40ADC0.png", D_09000C00_40ADC0);
 
 #include "effects/gfx/D_09001000_40B1C0.gfx.inc.c"
 #include "effects/gfx/D_090010A8_40B268.vtx.inc.c"
diff --git a/src/effects/gfx/ice_shard.c b/src/effects/gfx/ice_shard.c
index 63924b8452..3786240fcb 100644
--- a/src/effects/gfx/ice_shard.c
+++ b/src/effects/gfx/ice_shard.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3F8CC0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3F8CC0.png", D_09000000_3F8CC0);
 
 #include "effects/gfx/D_09001000_3F9CC0.gfx.inc.c"
 
diff --git a/src/effects/gfx/landing_dust.c b/src/effects/gfx/landing_dust.c
index 72a6d4c120..ad8b02fed9 100644
--- a/src/effects/gfx/landing_dust.c
+++ b/src/effects/gfx/landing_dust.c
@@ -1,6 +1,8 @@
-#include "effects/gfx/D_09000000_328EA0.png.inc.c"
-#include "effects/gfx/D_09001000_329EA0.png.inc.c"
-#include "effects/gfx/D_09001840_32A6E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_328EA0.png", D_09000000_328EA0);
+INCLUDE_IMG("effects/gfx/D_09001000_329EA0.png", D_09001000_329EA0);
+INCLUDE_IMG("effects/gfx/D_09001840_32A6E0.png", D_09001840_32A6E0);
 
 #include "effects/gfx/D_09002640_32B4E0.vtx.inc.c"
 #include "effects/gfx/D_09002680_32B520.vtx.inc.c"
@@ -21,11 +23,11 @@
 
 #include "effects/gfx/D_09002C60_32BB00.gfx.inc.c"
 
-#include "effects/gfx/D_09002C90_32BB30.png.inc.c"
-#include "effects/gfx/D_09002D10_32BBB0.png.inc.c"
-#include "effects/gfx/D_09002D90_32BC30.png.inc.c"
-#include "effects/gfx/D_09002E10_32BCB0.png.inc.c"
-#include "effects/gfx/D_09002C90_32BB30.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002C90_32BB30.png", D_09002C90_32BB30);
+INCLUDE_IMG("effects/gfx/D_09002D10_32BBB0.png", D_09002D10_32BBB0);
+INCLUDE_IMG("effects/gfx/D_09002D90_32BC30.png", D_09002D90_32BC30);
+INCLUDE_IMG("effects/gfx/D_09002E10_32BCB0.png", D_09002E10_32BCB0);
+INCLUDE_PAL("effects/gfx/D_09002C90_32BB30.pal", D_09002E90_32BD30);
 
 #include "effects/gfx/D_09002EB0_32BD50.vtx.inc.c"
 
diff --git a/src/effects/gfx/lens_flare.c b/src/effects/gfx/lens_flare.c
index e6874f78b5..4ffb61ad17 100644
--- a/src/effects/gfx/lens_flare.c
+++ b/src/effects/gfx/lens_flare.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3451E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3451E0.png", D_09000000_3451E0);
 
 #include "effects/gfx/D_09000200_3453E0.vtx.inc.c"
 
diff --git a/src/effects/gfx/light_rays.c b/src/effects/gfx/light_rays.c
index f3d62e966f..310b1934c3 100644
--- a/src/effects/gfx/light_rays.c
+++ b/src/effects/gfx/light_rays.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_36DF90.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_36DF90.png", D_09000000_36DF90);
 
 #include "effects/gfx/D_09000080_36E010.vtx.inc.c"
 #include "effects/gfx/D_090000B0_36E040.gfx.inc.c"
diff --git a/src/effects/gfx/lightning.c b/src/effects/gfx/lightning.c
index 515b08002c..0ce5438e5a 100644
--- a/src/effects/gfx/lightning.c
+++ b/src/effects/gfx/lightning.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_36ED60.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_36ED60.png", D_09000000_36ED60);
 
 #include "effects/gfx/D_09001000_36FD60.vtx.inc.c"
 #include "effects/gfx/D_090011E0_36FF40.vtx.inc.c"
diff --git a/src/effects/gfx/lightning_bolt.c b/src/effects/gfx/lightning_bolt.c
index dc4b222a6f..d23c1ca110 100644
--- a/src/effects/gfx/lightning_bolt.c
+++ b/src/effects/gfx/lightning_bolt.c
@@ -1,2 +1,4 @@
-#include "effects/gfx/D_09000000_3BAEA0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3BAEA0.png", D_09000000_3BAEA0);
 #include "effects/gfx/D_09001000_3BBEA0.gfx.inc.c"
diff --git a/src/effects/gfx/lil_oink.c b/src/effects/gfx/lil_oink.c
index 9034abf6f3..3d7e39a5a2 100644
--- a/src/effects/gfx/lil_oink.c
+++ b/src/effects/gfx/lil_oink.c
@@ -1,3 +1,5 @@
+#include "include_asset.h"
+
 #include "effects/gfx/D_09000000_3FF250.vtx.inc.c"
 #include "effects/gfx/D_09000080_3FF2D0.vtx.inc.c"
 #include "effects/gfx/D_090000A0_3FF2F0.vtx.inc.c"
@@ -63,48 +65,48 @@
 
 u8 D_090017A8_4009F8[8] = {};
 
-#include "effects/gfx/D_090017B0_400A00.png.inc.c"
-#include "effects/gfx/D_090017B0_400A00.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090017B0_400A00.png", D_090017B0_400A00);
+INCLUDE_PAL("effects/gfx/D_090017B0_400A00.pal", D_090017F0_400A40);
 
 u8 D_09001810_400A60[0x1E0] = {};
 
-#include "effects/gfx/D_090019F0_400C40.png.inc.c"
-#include "effects/gfx/D_090019F0_400C40.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090019F0_400C40.png", D_090019F0_400C40);
+INCLUDE_PAL("effects/gfx/D_090019F0_400C40.pal", D_09001A30_400C80);
 
 u8 D_09001A50_400CA0[0x1E0] = {};
 
-#include "effects/gfx/D_09001C30_400E80.png.inc.c"
-#include "effects/gfx/D_09001C30_400E80.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001C30_400E80.png", D_09001C30_400E80);
+INCLUDE_PAL("effects/gfx/D_09001C30_400E80.pal", D_09001C70_400EC0);
 
 u8 D_09001C90_400EE0[0x1E0] = {};
 
-#include "effects/gfx/D_09001E70_4010C0.png.inc.c"
-#include "effects/gfx/D_09001E70_4010C0.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001E70_4010C0.png", D_09001E70_4010C0);
+INCLUDE_PAL("effects/gfx/D_09001E70_4010C0.pal", D_09001EB0_401100);
 
 u8 D_09001ED0_401120[0x1E0] = {};
 
-#include "effects/gfx/D_090020B0_401300.png.inc.c"
-#include "effects/gfx/D_090020B0_401300.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090020B0_401300.png", D_090020B0_401300);
+INCLUDE_PAL("effects/gfx/D_090020B0_401300.pal", D_090020F0_401340);
 
 u8 D_09002110_401360[0x1E0] = {};
 
-#include "effects/gfx/D_090022F0_401540.png.inc.c"
-#include "effects/gfx/D_090022F0_401540.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090022F0_401540.png", D_090022F0_401540);
+INCLUDE_PAL("effects/gfx/D_090022F0_401540.pal", D_09002330_401580);
 
 u8 D_09002350_4015A0[0x1E0] = {};
 
-#include "effects/gfx/D_09002530_401780.png.inc.c"
-#include "effects/gfx/D_09002530_401780.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002530_401780.png", D_09002530_401780);
+INCLUDE_PAL("effects/gfx/D_09002530_401780.pal", D_09002570_4017C0);
 
 u8 D_09002590_4017E0[0x1E0] = {};
 
-#include "effects/gfx/D_09002770_4019C0.png.inc.c"
-#include "effects/gfx/D_09002770_4019C0.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002770_4019C0.png", D_09002770_4019C0);
+INCLUDE_PAL("effects/gfx/D_09002770_4019C0.pal", D_09002870_401AC0);
 
 u8 D_09002890_401AE0[0x1E0] = {};
 
-#include "effects/gfx/D_09002A70_401CC0.png.inc.c"
-#include "effects/gfx/D_09002A70_401CC0.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002A70_401CC0.png", D_09002A70_401CC0);
+INCLUDE_PAL("effects/gfx/D_09002A70_401CC0.pal", D_09002B70_401DC0);
 
 u8 D_09002B90_401DE0[0x1E0] = {};
 
diff --git a/src/effects/gfx/merlin_house_stars.c b/src/effects/gfx/merlin_house_stars.c
index 6d22d3590f..19a2e5e2f2 100644
--- a/src/effects/gfx/merlin_house_stars.c
+++ b/src/effects/gfx/merlin_house_stars.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3A5BE0.png.inc.c"
-#include "effects/gfx/D_09000800_3A63E0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A5BE0.png", D_09000000_3A5BE0);
+INCLUDE_IMG("effects/gfx/D_09000800_3A63E0.png", D_09000800_3A63E0);
 
 #include "effects/gfx/D_09001000_3A6BE0.gfx.inc.c"
 
diff --git a/src/effects/gfx/misc_particles.c b/src/effects/gfx/misc_particles.c
index 2ca38fd3d9..32ba3619e8 100644
--- a/src/effects/gfx/misc_particles.c
+++ b/src/effects/gfx/misc_particles.c
@@ -1,8 +1,10 @@
-#include "effects/gfx/D_09000000_3DEE60.png.inc.c"
-#include "effects/gfx/D_09001000_3DFE60.png.inc.c"
-#include "effects/gfx/D_09001080_3DFEE0.png.inc.c"
-#include "effects/gfx/D_09001100_3DFF60.png.inc.c"
-#include "effects/gfx/D_09001180_3DFFE0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3DEE60.png", D_09000000_3DEE60);
+INCLUDE_IMG("effects/gfx/D_09001000_3DFE60.png", D_09001000_3DFE60);
+INCLUDE_IMG("effects/gfx/D_09001080_3DFEE0.png", D_09001080_3DFEE0);
+INCLUDE_IMG("effects/gfx/D_09001100_3DFF60.png", D_09001100_3DFF60);
+INCLUDE_IMG("effects/gfx/D_09001180_3DFFE0.png", D_09001180_3DFFE0);
 
 #include "effects/gfx/D_09001580_3E03E0.gfx.inc.c"
 #include "effects/gfx/D_09001670_3E04D0.gfx.inc.c"
diff --git a/src/effects/gfx/motion_blur_flame.c b/src/effects/gfx/motion_blur_flame.c
index fff65b193c..5ce59a8562 100644
--- a/src/effects/gfx/motion_blur_flame.c
+++ b/src/effects/gfx/motion_blur_flame.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3A33D0.png.inc.c"
-#include "effects/gfx/D_09000100_3A34D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A33D0.png", D_09000000_3A33D0);
+INCLUDE_IMG("effects/gfx/D_09000100_3A34D0.png", D_09000100_3A34D0);
 #include "effects/gfx/D_09000200_3A35D0.gfx.inc.c"
 #include "effects/gfx/D_090002A8_3A3678.gfx.inc.c"
 #include "effects/gfx/D_09000358_3A3728.gfx.inc.c"
diff --git a/src/effects/gfx/moving_cloud.c b/src/effects/gfx/moving_cloud.c
index c1c16f623d..8a0e5517b4 100644
--- a/src/effects/gfx/moving_cloud.c
+++ b/src/effects/gfx/moving_cloud.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3E1CD0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3E1CD0.png", D_09000000_3E1CD0);
 #include "effects/gfx/D_09000100_3E1DD0.gfx.inc.c"
 
 #include "effects/gfx/D_090001A8_3E1E78.vtx.inc.c"
diff --git a/src/effects/gfx/music_note.c b/src/effects/gfx/music_note.c
index 6467379df9..93ef844cf5 100644
--- a/src/effects/gfx/music_note.c
+++ b/src/effects/gfx/music_note.c
@@ -1,18 +1,20 @@
-#include "effects/gfx/D_09000000_35A5E0.png.inc.c"
-#include "effects/gfx/D_09000100_35A6E0.png.inc.c"
-#include "effects/gfx/D_09000200_35A7E0.png.inc.c"
-#include "effects/gfx/D_09000300_35A8E0.png.inc.c"
-#include "effects/gfx/D_09000400_35A9E0.png.inc.c"
-#include "effects/gfx/D_09000500_35AAE0.png.inc.c"
-#include "effects/gfx/D_09000600_35ABE0.png.inc.c"
+#include "include_asset.h"
 
-#include "effects/gfx/D_09000700_35ACE0.png.inc.c"
-#include "effects/gfx/D_09000800_35ADE0.png.inc.c"
-#include "effects/gfx/D_09000900_35AEE0.png.inc.c"
-#include "effects/gfx/D_09000A00_35AFE0.png.inc.c"
-#include "effects/gfx/D_09000B00_35B0E0.png.inc.c"
-#include "effects/gfx/D_09000C00_35B1E0.png.inc.c"
-#include "effects/gfx/D_09000D00_35B2E0.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000000_35A5E0.png", D_09000000_35A5E0);
+INCLUDE_IMG("effects/gfx/D_09000100_35A6E0.png", D_09000100_35A6E0);
+INCLUDE_IMG("effects/gfx/D_09000200_35A7E0.png", D_09000200_35A7E0);
+INCLUDE_IMG("effects/gfx/D_09000300_35A8E0.png", D_09000300_35A8E0);
+INCLUDE_IMG("effects/gfx/D_09000400_35A9E0.png", D_09000400_35A9E0);
+INCLUDE_IMG("effects/gfx/D_09000500_35AAE0.png", D_09000500_35AAE0);
+INCLUDE_IMG("effects/gfx/D_09000600_35ABE0.png", D_09000600_35ABE0);
+
+INCLUDE_IMG("effects/gfx/D_09000700_35ACE0.png", D_09000700_35ACE0);
+INCLUDE_IMG("effects/gfx/D_09000800_35ADE0.png", D_09000800_35ADE0);
+INCLUDE_IMG("effects/gfx/D_09000900_35AEE0.png", D_09000900_35AEE0);
+INCLUDE_IMG("effects/gfx/D_09000A00_35AFE0.png", D_09000A00_35AFE0);
+INCLUDE_IMG("effects/gfx/D_09000B00_35B0E0.png", D_09000B00_35B0E0);
+INCLUDE_IMG("effects/gfx/D_09000C00_35B1E0.png", D_09000C00_35B1E0);
+INCLUDE_IMG("effects/gfx/D_09000D00_35B2E0.png", D_09000D00_35B2E0);
 
 #include "effects/gfx/D_09000E00_35B3E0.vtx.inc.c"
 
diff --git a/src/effects/gfx/partner_buff.c b/src/effects/gfx/partner_buff.c
index e667ca45a3..bf3426aeab 100644
--- a/src/effects/gfx/partner_buff.c
+++ b/src/effects/gfx/partner_buff.c
@@ -1,26 +1,28 @@
 #include "common.h"
 
-#include "effects/gfx/world/cloud.png.inc.c"
-#include "effects/gfx/world/cloud.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/world/cloud.png", D_09000000_404F40);
+INCLUDE_PAL("effects/gfx/world/cloud.pal", D_09000200_405140);
 
 char D_09000220_405160[0x1E0] = { 0x0 };
 
-#include "effects/gfx/world/waterblock.png.inc.c"
-#include "effects/gfx/world/waterblock.pal.inc.c"
+INCLUDE_IMG("effects/gfx/world/waterblock.png", D_09000400_405340);
+INCLUDE_PAL("effects/gfx/world/waterblock.pal", D_09000600_405540);
 
 char D_09000620_405560[0x1E0] = { 0x0 };
 
-#include "effects/gfx/world/yellow_carpet.png.inc.c"
-#include "effects/gfx/world/yellow_carpet.pal.inc.c"
+INCLUDE_IMG("effects/gfx/world/yellow_carpet.png", D_09000800_405740);
+INCLUDE_PAL("effects/gfx/world/yellow_carpet.pal", D_09000A00_405940);
 
 char D_09000A20_405960[0x1E0] = { 0x0 };
 
-#include "effects/gfx/world/numbers.png.inc.c"
-#include "effects/gfx/world/number1.png.inc.c"
-#include "effects/gfx/world/number2.png.inc.c"
-#include "effects/gfx/world/number3.png.inc.c"
-#include "effects/gfx/world/number4.png.inc.c"
-#include "effects/gfx/world/numbers.pal.inc.c"
+INCLUDE_IMG("effects/gfx/world/numbers.png", D_09000C00_405B40);
+INCLUDE_IMG("effects/gfx/world/number1.png", D_09000E00_405D40);
+INCLUDE_IMG("effects/gfx/world/number2.png", D_09001000_405F40);
+INCLUDE_IMG("effects/gfx/world/number3.png", D_09001200_406140);
+INCLUDE_IMG("effects/gfx/world/number4.png", D_09001400_406340);
+INCLUDE_PAL("effects/gfx/world/numbers.pal", D_09001600_406540);
 
 char D_09001620_406560[0x1E0] = { 0x0 };
 
diff --git a/src/effects/gfx/peach_star_beam.c b/src/effects/gfx/peach_star_beam.c
index ee81d3f019..88d4d66aa1 100644
--- a/src/effects/gfx/peach_star_beam.c
+++ b/src/effects/gfx/peach_star_beam.c
@@ -1,5 +1,7 @@
 #include "common.h"
 
+#include "include_asset.h"
+
 #include "effects/gfx/D_09000000_3E5F30.vtx.inc.c"
 #include "effects/gfx/D_090001A0_3E60D0.vtx.inc.c"
 #include "effects/gfx/D_090001C0_3E60F0.vtx.inc.c"
@@ -17,44 +19,44 @@
 
 u8 D_090003E0_3E6310[8] = {};
 
-#include "effects/gfx/D_090003E8_3E6318.png.inc.c"
-#include "effects/gfx/D_090005E8_3E6518.png.inc.c"
-#include "effects/gfx/D_090005E8_3E6518.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090003E8_3E6318.png", D_090003E8_3E6318);
+INCLUDE_IMG("effects/gfx/D_090005E8_3E6518.png", D_090005E8_3E6518);
+INCLUDE_PAL("effects/gfx/D_090005E8_3E6518.pal", D_090007E8_3E6718);
 
 u8 D_09000808_3E6738[0x1E0] = {};
 
-#include "effects/gfx/D_090009E8_3E6918.png.inc.c"
-#include "effects/gfx/D_090009E8_3E6918.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090009E8_3E6918.png", D_090009E8_3E6918);
+INCLUDE_PAL("effects/gfx/D_090009E8_3E6918.pal", D_090011E8_3E7118);
 
 u8 D_09001208_3E7138[0x1E0] = {};
 
-#include "effects/gfx/D_090013E8_3E7318.png.inc.c"
-#include "effects/gfx/D_090013E8_3E7318.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090013E8_3E7318.png", D_090013E8_3E7318);
+INCLUDE_PAL("effects/gfx/D_090013E8_3E7318.pal", D_09001BE8_3E7B18);
 
 u8 D_09001C08_3E7B38[0x1E0] = {};
 
-#include "effects/gfx/D_09001DE8_3E7D18.png.inc.c"
-#include "effects/gfx/D_09001DE8_3E7D18.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001DE8_3E7D18.png", D_09001DE8_3E7D18);
+INCLUDE_PAL("effects/gfx/D_09001DE8_3E7D18.pal", D_090025E8_3E8518);
 
 u8 D_09002608_3E8538[0x1E0] = {};
 
-#include "effects/gfx/D_090027E8_3E8718.png.inc.c"
-#include "effects/gfx/D_090027E8_3E8718.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090027E8_3E8718.png", D_090027E8_3E8718);
+INCLUDE_PAL("effects/gfx/D_090027E8_3E8718.pal", D_09002FE8_3E8F18);
 
 u8 D_09003008_3E8F38[0x1E0] = {};
 
-#include "effects/gfx/D_090031E8_3E9118.png.inc.c"
-#include "effects/gfx/D_090031E8_3E9118.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090031E8_3E9118.png", D_090031E8_3E9118);
+INCLUDE_PAL("effects/gfx/D_090031E8_3E9118.pal", D_090039E8_3E9918);
 
 u8 D_09003A08_3E9938[0x1E0] = {};
 
-#include "effects/gfx/D_09003BE8_3E9B18.png.inc.c"
-#include "effects/gfx/D_09003BE8_3E9B18.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09003BE8_3E9B18.png", D_09003BE8_3E9B18);
+INCLUDE_PAL("effects/gfx/D_09003BE8_3E9B18.pal", D_090043E8_3EA318);
 
 u8 D_09004408_3EA338[0x1E0] = {};
 
-#include "effects/gfx/D_090045E8_3EA518.png.inc.c"
-#include "effects/gfx/D_090045E8_3EA518.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090045E8_3EA518.png", D_090045E8_3EA518);
+INCLUDE_PAL("effects/gfx/D_090045E8_3EA518.pal", D_09004DE8_3EAD18);
 
 u8 D_09004E08_3EAD38[0x1E0] = {};
 
diff --git a/src/effects/gfx/purple_ring.c b/src/effects/gfx/purple_ring.c
index 9389ce00e2..5945b6f8ed 100644
--- a/src/effects/gfx/purple_ring.c
+++ b/src/effects/gfx/purple_ring.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_352CE0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_352CE0.png", D_09000000_352CE0);
 
 #include "effects/gfx/D_09000200_352EE0.gfx.inc.c"
 
diff --git a/src/effects/gfx/quizmo_answer.c b/src/effects/gfx/quizmo_answer.c
index 17fd2de53d..c4d541eb1f 100644
--- a/src/effects/gfx/quizmo_answer.c
+++ b/src/effects/gfx/quizmo_answer.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3A2440.png.inc.c"
-#include "effects/gfx/D_09000200_3A2640.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A2440.png", D_09000000_3A2440);
+INCLUDE_IMG("effects/gfx/D_09000200_3A2640.png", D_09000200_3A2640);
 
 #include "effects/gfx/D_09000400_3A2840.gfx.inc.c"
 #include "effects/gfx/D_090004A8_3A28E8.gfx.inc.c"
diff --git a/src/effects/gfx/quizmo_assistant.c b/src/effects/gfx/quizmo_assistant.c
index 27ecf076ee..bf5c2516d1 100644
--- a/src/effects/gfx/quizmo_assistant.c
+++ b/src/effects/gfx/quizmo_assistant.c
@@ -1,22 +1,24 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_407080.png.inc.c"
-#include "effects/gfx/D_09000000_407080.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_407080.png", D_09000000_407080);
+INCLUDE_PAL("effects/gfx/D_09000000_407080.pal", D_09000800_407880);
 
 u8 D_09000820_4078A0[0x1E0] = {};
 
-#include "effects/gfx/D_09000A00_407A80.png.inc.c"
-#include "effects/gfx/D_09000A00_407A80.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000A00_407A80.png", D_09000A00_407A80);
+INCLUDE_PAL("effects/gfx/D_09000A00_407A80.pal", D_09000E00_407E80);
 
 u8 D_09000E20_407EA0[0x1E0] = {};
 
-#include "effects/gfx/D_09001000_408080.png.inc.c"
-#include "effects/gfx/D_09001000_408080.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001000_408080.png", D_09001000_408080);
+INCLUDE_PAL("effects/gfx/D_09001000_408080.pal", D_09001800_408880);
 
 u8 D_09001820_4088A0[0x1E0] = {};
 
-#include "effects/gfx/D_09001A00_408A80.png.inc.c"
-#include "effects/gfx/D_09001A00_408A80.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001A00_408A80.png", D_09001A00_408A80);
+INCLUDE_PAL("effects/gfx/D_09001A00_408A80.pal", D_09002200_409280);
 
 u8 D_09002220_4092A0[0x1E0] = {};
 
diff --git a/src/effects/gfx/quizmo_audience.c b/src/effects/gfx/quizmo_audience.c
index 8282e24545..158e0c7063 100644
--- a/src/effects/gfx/quizmo_audience.c
+++ b/src/effects/gfx/quizmo_audience.c
@@ -1,22 +1,24 @@
-#include "effects/gfx/D_09000000_3A77A0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A77A0.png", D_09000000_3A77A0);
 #include "effects/gfx/D_09000400_3A7BA0.gfx.inc.c"
-#include "effects/gfx/D_09000470_3A7C10.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000470_3A7C10.png", D_09000470_3A7C10);
 #include "effects/gfx/D_09000870_3A8010.gfx.inc.c"
-#include "effects/gfx/D_090008E0_3A8080.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_090008E0_3A8080.png", D_090008E0_3A8080);
 #include "effects/gfx/D_09000CE0_3A8480.gfx.inc.c"
-#include "effects/gfx/D_09000D50_3A84F0.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000D50_3A84F0.png", D_09000D50_3A84F0);
 #include "effects/gfx/D_09001150_3A88F0.gfx.inc.c"
-#include "effects/gfx/D_090011C0_3A8960.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_090011C0_3A8960.png", D_090011C0_3A8960);
 #include "effects/gfx/D_090015C0_3A8D60.gfx.inc.c"
-#include "effects/gfx/D_09001630_3A8DD0.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001630_3A8DD0.png", D_09001630_3A8DD0);
 #include "effects/gfx/D_09001A30_3A91D0.gfx.inc.c"
-#include "effects/gfx/D_09001AA0_3A9240.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001AA0_3A9240.png", D_09001AA0_3A9240);
 #include "effects/gfx/D_09001EA0_3A9640.gfx.inc.c"
-#include "effects/gfx/D_09001F10_3A96B0.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001F10_3A96B0.png", D_09001F10_3A96B0);
 #include "effects/gfx/D_09002310_3A9AB0.gfx.inc.c"
-#include "effects/gfx/D_09002380_3A9B20.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002380_3A9B20.png", D_09002380_3A9B20);
 #include "effects/gfx/D_09002780_3A9F20.gfx.inc.c"
-#include "effects/gfx/D_090027F0_3A9F90.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_090027F0_3A9F90.png", D_090027F0_3A9F90);
 #include "effects/gfx/D_09002BF0_3AA390.gfx.inc.c"
 
 #include "effects/gfx/D_09002C60_3AA400.vtx.inc.c"
diff --git a/src/effects/gfx/quizmo_stage.c b/src/effects/gfx/quizmo_stage.c
index 9c3f5c6d86..1877d07d9c 100644
--- a/src/effects/gfx/quizmo_stage.c
+++ b/src/effects/gfx/quizmo_stage.c
@@ -1,28 +1,30 @@
+#include "include_asset.h"
+
 #include "PR/gbi.h"
 
 Lights1 D_09000000_398BC0 = gdSPDefLights1(255, 255, 255, 255, 255, 255, 255, 65, 109);
 
-#include "effects/gfx/D_09000018_398BD8.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000018_398BD8.png", D_09000018_398BD8);
 #include "effects/gfx/D_09000218_398DD8.gfx.inc.c"
-#include "effects/gfx/D_09000288_398E48.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000288_398E48.png", D_09000288_398E48);
 #include "effects/gfx/D_09001288_399E48.gfx.inc.c"
-#include "effects/gfx/D_090012F8_399EB8.png.inc.c"
-#include "effects/gfx/D_090012F8_399EB8.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_090012F8_399EB8.png", D_090012F8_399EB8);
+INCLUDE_PAL("effects/gfx/D_090012F8_399EB8.pal", D_090014F8_39A0B8);
 #include "effects/gfx/D_09001518_39A0D8.gfx.inc.c"
-#include "effects/gfx/D_090015B8_39A178.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_090015B8_39A178.png", D_090015B8_39A178);
 #include "effects/gfx/D_090017B8_39A378.gfx.inc.c"
-#include "effects/gfx/D_09001828_39A3E8.png.inc.c"
-#include "effects/gfx/D_09001828_39A3E8.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001828_39A3E8.png", D_09001828_39A3E8);
+INCLUDE_PAL("effects/gfx/D_09001828_39A3E8.pal", D_09001C28_39A7E8);
 #include "effects/gfx/D_09001C48_39A808.gfx.inc.c"
-#include "effects/gfx/D_09001CE8_39A8A8.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09001CE8_39A8A8.png", D_09001CE8_39A8A8);
 #include "effects/gfx/D_09002CE8_39B8A8.gfx.inc.c"
-#include "effects/gfx/D_09002D58_39B918.png.inc.c"
-#include "effects/gfx/D_09002D58_39B918.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09002D58_39B918.png", D_09002D58_39B918);
+INCLUDE_PAL("effects/gfx/D_09002D58_39B918.pal", D_09003558_39C118);
 #include "effects/gfx/D_09003578_39C138.gfx.inc.c"
-#include "effects/gfx/D_09003618_39C1D8.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09003618_39C1D8.png", D_09003618_39C1D8);
 #include "effects/gfx/D_09003E18_39C9D8.gfx.inc.c"
-#include "effects/gfx/D_09003E88_39CA48.png.inc.c"
-#include "effects/gfx/D_09003E88_39CA48.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09003E88_39CA48.png", D_09003E88_39CA48);
+INCLUDE_PAL("effects/gfx/D_09003E88_39CA48.pal", D_09004088_39CC48);
 #include "effects/gfx/D_090040A8_39CC68.gfx.inc.c"
 
 // what's this?
@@ -45,12 +47,12 @@ char D_09004148_39CD08[] = {
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 };
 
-#include "effects/gfx/D_09004248_39CE08.png.inc.c"
-#include "effects/gfx/D_09004248_39CE08.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09004248_39CE08.png", D_09004248_39CE08);
+INCLUDE_PAL("effects/gfx/D_09004248_39CE08.pal", D_09004A48_39D608);
 #include "effects/gfx/D_09004A68_39D628.gfx.inc.c"
-#include "effects/gfx/D_09004B08_39D6C8.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09004B08_39D6C8.png", D_09004B08_39D6C8);
 #include "effects/gfx/D_09005308_39DEC8.gfx.inc.c"
-#include "effects/gfx/D_09005378_39DF38.png.inc.c"
+INCLUDE_IMG("effects/gfx/D_09005378_39DF38.png", D_09005378_39DF38);
 #include "effects/gfx/D_09006378_39EF38.gfx.inc.c"
 #include "effects/gfx/D_090063E8_39EFA8.vtx.inc.c"
 #include "effects/gfx/D_09006428_39EFE8.vtx.inc.c"
diff --git a/src/effects/gfx/radial_shimmer.c b/src/effects/gfx/radial_shimmer.c
index 96467de657..2a19d00231 100644
--- a/src/effects/gfx/radial_shimmer.c
+++ b/src/effects/gfx/radial_shimmer.c
@@ -1,12 +1,14 @@
-#include "effects/gfx/D_09000000_366D60.png.inc.c"
-#include "effects/gfx/D_09000200_366F60.png.inc.c"
-#include "effects/gfx/D_09000400_367160.png.inc.c"
-#include "effects/gfx/D_09000C00_367960.png.inc.c"
-#include "effects/gfx/D_09000E00_367B60.png.inc.c"
-#include "effects/gfx/D_09001600_368360.png.inc.c"
-#include "effects/gfx/D_09001E00_368B60.png.inc.c"
-#include "effects/gfx/D_09002600_369360.png.inc.c"
-#include "effects/gfx/D_09002E00_369B60.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_366D60.png", D_09000000_366D60);
+INCLUDE_IMG("effects/gfx/D_09000200_366F60.png", D_09000200_366F60);
+INCLUDE_IMG("effects/gfx/D_09000400_367160.png", D_09000400_367160);
+INCLUDE_IMG("effects/gfx/D_09000C00_367960.png", D_09000C00_367960);
+INCLUDE_IMG("effects/gfx/D_09000E00_367B60.png", D_09000E00_367B60);
+INCLUDE_IMG("effects/gfx/D_09001600_368360.png", D_09001600_368360);
+INCLUDE_IMG("effects/gfx/D_09001E00_368B60.png", D_09001E00_368B60);
+INCLUDE_IMG("effects/gfx/D_09002600_369360.png", D_09002600_369360);
+INCLUDE_IMG("effects/gfx/D_09002E00_369B60.png", D_09002E00_369B60);
 
 #include "effects/gfx/D_09003000_369D60.vtx.inc.c"
 #include "effects/gfx/D_090031A0_369F00.vtx.inc.c"
diff --git a/src/effects/gfx/radiating_energy_orb.c b/src/effects/gfx/radiating_energy_orb.c
index c0ab73863a..15f4b5e9e8 100644
--- a/src/effects/gfx/radiating_energy_orb.c
+++ b/src/effects/gfx/radiating_energy_orb.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3A0D60.png.inc.c"
-#include "effects/gfx/D_09000200_3A0F60.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3A0D60.png", D_09000000_3A0D60);
+INCLUDE_IMG("effects/gfx/D_09000200_3A0F60.png", D_09000200_3A0F60);
 
 #include "effects/gfx/D_09001200_3A1F60.gfx.inc.c"
 #include "effects/gfx/D_090012A8_3A2008.gfx.inc.c"
diff --git a/src/effects/gfx/recover.c b/src/effects/gfx/recover.c
index 1fba55a408..3f0d11042d 100644
--- a/src/effects/gfx/recover.c
+++ b/src/effects/gfx/recover.c
@@ -1,18 +1,20 @@
-#include "effects/gfx/D_09000000_381E00.png.inc.c"
-#include "effects/gfx/D_09000200_382000.png.inc.c"
-#include "effects/gfx/D_09000400_382200.png.inc.c"
-#include "effects/gfx/D_09000600_382400.png.inc.c"
-#include "effects/gfx/D_09000800_382600.png.inc.c"
-#include "effects/gfx/D_09000A00_382800.png.inc.c"
-#include "effects/gfx/D_09000C00_382A00.png.inc.c"
-#include "effects/gfx/D_09000E00_382C00.png.inc.c"
-#include "effects/gfx/D_09001000_382E00.png.inc.c"
-#include "effects/gfx/D_09001200_383000.png.inc.c"
-#include "effects/gfx/D_09001400_383200.png.inc.c"
-#include "effects/gfx/D_09001600_383400.png.inc.c"
-#include "effects/gfx/D_09001800_383600.png.inc.c"
-#include "effects/gfx/D_09002000_383E00.png.inc.c"
-#include "effects/gfx/D_09002800_384600.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_381E00.png", D_09000000_381E00);
+INCLUDE_IMG("effects/gfx/D_09000200_382000.png", D_09000200_382000);
+INCLUDE_IMG("effects/gfx/D_09000400_382200.png", D_09000400_382200);
+INCLUDE_IMG("effects/gfx/D_09000600_382400.png", D_09000600_382400);
+INCLUDE_IMG("effects/gfx/D_09000800_382600.png", D_09000800_382600);
+INCLUDE_IMG("effects/gfx/D_09000A00_382800.png", D_09000A00_382800);
+INCLUDE_IMG("effects/gfx/D_09000C00_382A00.png", D_09000C00_382A00);
+INCLUDE_IMG("effects/gfx/D_09000E00_382C00.png", D_09000E00_382C00);
+INCLUDE_IMG("effects/gfx/D_09001000_382E00.png", D_09001000_382E00);
+INCLUDE_IMG("effects/gfx/D_09001200_383000.png", D_09001200_383000);
+INCLUDE_IMG("effects/gfx/D_09001400_383200.png", D_09001400_383200);
+INCLUDE_IMG("effects/gfx/D_09001600_383400.png", D_09001600_383400);
+INCLUDE_IMG("effects/gfx/D_09001800_383600.png", D_09001800_383600);
+INCLUDE_IMG("effects/gfx/D_09002000_383E00.png", D_09002000_383E00);
+INCLUDE_IMG("effects/gfx/D_09002800_384600.png", D_09002800_384600);
 
 #include "effects/gfx/D_09003000_384E00.vtx.inc.c"
 #include "effects/gfx/D_09003040_384E40.vtx.inc.c"
diff --git a/src/effects/gfx/ring_blast.c b/src/effects/gfx/ring_blast.c
index 3d4e5b0479..2799b3a614 100644
--- a/src/effects/gfx/ring_blast.c
+++ b/src/effects/gfx/ring_blast.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3573A0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3573A0.png", D_09000000_3573A0);
 
 #include "effects/gfx/D_09001000_3583A0.vtx.inc.c"
 
diff --git a/src/effects/gfx/rising_bubble.c b/src/effects/gfx/rising_bubble.c
index df4ceb5754..84b5334f69 100644
--- a/src/effects/gfx/rising_bubble.c
+++ b/src/effects/gfx/rising_bubble.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_356530.png.inc.c"
-#include "effects/gfx/D_09000080_3565B0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_356530.png", D_09000000_356530);
+INCLUDE_IMG("effects/gfx/D_09000080_3565B0.png", D_09000080_3565B0);
 
 #include "effects/gfx/D_09000100_356630.vtx.inc.c"
 #include "effects/gfx/D_09000140_356670.vtx.inc.c"
diff --git a/src/effects/gfx/shape_spell.c b/src/effects/gfx/shape_spell.c
index 5c10f366e4..71e802d352 100644
--- a/src/effects/gfx/shape_spell.c
+++ b/src/effects/gfx/shape_spell.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_339F60.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_339F60.png", D_09000000_339F60);
 
 #include "effects/gfx/D_09001000_33AF60.vtx.inc.c"
 #include "effects/gfx/D_09001040_33AFA0.vtx.inc.c"
diff --git a/src/effects/gfx/shattering_stones.c b/src/effects/gfx/shattering_stones.c
index 30e167680b..01de0047fb 100644
--- a/src/effects/gfx/shattering_stones.c
+++ b/src/effects/gfx/shattering_stones.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_340880.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_340880.png", D_09000000_340880);
 
 #include "effects/gfx/D_09000C00_341480.gfx.inc.c"
 
diff --git a/src/effects/gfx/shiny_flare.c b/src/effects/gfx/shiny_flare.c
index dcb8d7995f..b536008b9a 100644
--- a/src/effects/gfx/shiny_flare.c
+++ b/src/effects/gfx/shiny_flare.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3D7770.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D7770.png", D_09000000_3D7770);
 
 #include "effects/gfx/D_09000200_3D7970.vtx.inc.c"
 
diff --git a/src/effects/gfx/shockwave.c b/src/effects/gfx/shockwave.c
index 36973ce075..36fbd66ff7 100644
--- a/src/effects/gfx/shockwave.c
+++ b/src/effects/gfx/shockwave.c
@@ -1,6 +1,8 @@
-#include "effects/gfx/D_09000000_3593B0.png.inc.c"
-#include "effects/gfx/D_09000200_3595B0.png.inc.c"
-#include "effects/gfx/D_09000600_3599B0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3593B0.png", D_09000000_3593B0);
+INCLUDE_IMG("effects/gfx/D_09000200_3595B0.png", D_09000200_3595B0);
+INCLUDE_IMG("effects/gfx/D_09000600_3599B0.png", D_09000600_3599B0);
 
 #include "effects/gfx/D_09000800_359BB0.vtx.inc.c"
 
diff --git a/src/effects/gfx/sleep_bubble.c b/src/effects/gfx/sleep_bubble.c
index b9e7929db3..ed436b6f16 100644
--- a/src/effects/gfx/sleep_bubble.c
+++ b/src/effects/gfx/sleep_bubble.c
@@ -1,8 +1,10 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_35D510.png.inc.c"
-#include "effects/gfx/D_09000080_35D590.png.inc.c"
-#include "effects/gfx/D_09000100_35D610.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_35D510.png", D_09000000_35D510);
+INCLUDE_IMG("effects/gfx/D_09000080_35D590.png", D_09000080_35D590);
+INCLUDE_IMG("effects/gfx/D_09000100_35D610.png", D_09000100_35D610);
 
 #include "effects/gfx/D_09000180_35D690.vtx.inc.c"
 
diff --git a/src/effects/gfx/small_gold_sparkle.c b/src/effects/gfx/small_gold_sparkle.c
index 7bffcbe10a..5963fd7c26 100644
--- a/src/effects/gfx/small_gold_sparkle.c
+++ b/src/effects/gfx/small_gold_sparkle.c
@@ -1,10 +1,12 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_392440.png.inc.c"
-#include "effects/gfx/D_09000080_3924C0.png.inc.c"
-#include "effects/gfx/D_09000100_392540.png.inc.c"
-#include "effects/gfx/D_09000180_3925C0.png.inc.c"
-#include "effects/gfx/D_09000200_392640.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_392440.png", D_09000000_392440);
+INCLUDE_IMG("effects/gfx/D_09000080_3924C0.png", D_09000080_3924C0);
+INCLUDE_IMG("effects/gfx/D_09000100_392540.png", D_09000100_392540);
+INCLUDE_IMG("effects/gfx/D_09000180_3925C0.png", D_09000180_3925C0);
+INCLUDE_IMG("effects/gfx/D_09000200_392640.png", D_09000200_392640);
 
 #include "effects/gfx/D_09000280_3926C0.vtx.inc.c"
 
diff --git a/src/effects/gfx/snaking_static.c b/src/effects/gfx/snaking_static.c
index 9d12c919bb..29b407aa62 100644
--- a/src/effects/gfx/snaking_static.c
+++ b/src/effects/gfx/snaking_static.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3B2D90.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B2D90.png", D_09000000_3B2D90);
 #include "effects/gfx/D_09001000_3B3D90.gfx.inc.c"
 #include "effects/gfx/D_090010B8_3B3E48.vtx.inc.c"
 #include "effects/gfx/D_090010F8_3B3E88.gfx.inc.c"
diff --git a/src/effects/gfx/snowfall.c b/src/effects/gfx/snowfall.c
index b713403ff3..1c05f8ed82 100644
--- a/src/effects/gfx/snowfall.c
+++ b/src/effects/gfx/snowfall.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_38D070.png.inc.c"
-#include "effects/gfx/D_09000080_38D0F0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_38D070.png", D_09000000_38D070);
+INCLUDE_IMG("effects/gfx/D_09000080_38D0F0.png", D_09000080_38D0F0);
 #include "effects/gfx/D_09000880_38D8F0.vtx.inc.c"
 #include "effects/gfx/D_09000A00_38DA70.vtx.inc.c"
 
diff --git a/src/effects/gfx/snowflake.c b/src/effects/gfx/snowflake.c
index b577fc366e..b542323d11 100644
--- a/src/effects/gfx/snowflake.c
+++ b/src/effects/gfx/snowflake.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_330F00.png.inc.c"
-#include "effects/gfx/D_09000080_330F80.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_330F00.png", D_09000000_330F00);
+INCLUDE_IMG("effects/gfx/D_09000080_330F80.png", D_09000080_330F80);
 
 #include "effects/gfx/D_09000880_331780.vtx.inc.c"
 #include "effects/gfx/D_090008C0_3317C0.vtx.inc.c"
diff --git a/src/effects/gfx/snowman_doll.c b/src/effects/gfx/snowman_doll.c
index 78ea75cd6b..6383de8058 100644
--- a/src/effects/gfx/snowman_doll.c
+++ b/src/effects/gfx/snowman_doll.c
@@ -1,11 +1,13 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3BD9A0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3BD9A0.png", D_09000000_3BD9A0);
 
 #include "effects/gfx/D_09000800_3BE1A0.gfx.inc.c"
 
-#include "effects/gfx/D_09000878_3BE218.png.inc.c"
-#include "effects/gfx/D_09000878_3BE218.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000878_3BE218.png", D_09000878_3BE218);
+INCLUDE_PAL("effects/gfx/D_09000878_3BE218.pal", D_09000A78_3BE418);
 
 #include "effects/gfx/D_09000A98_3BE438.gfx.inc.c"
 
diff --git a/src/effects/gfx/sparkles.c b/src/effects/gfx/sparkles.c
index ac42f857ea..08733b9bd5 100644
--- a/src/effects/gfx/sparkles.c
+++ b/src/effects/gfx/sparkles.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_337FC0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_337FC0.png", D_09000000_337FC0);
 
 #include "effects/gfx/D_09000F20_338EE0.gfx.inc.c"
 
diff --git a/src/effects/gfx/spiky_white_aura.c b/src/effects/gfx/spiky_white_aura.c
index 447fd66456..a091603604 100644
--- a/src/effects/gfx/spiky_white_aura.c
+++ b/src/effects/gfx/spiky_white_aura.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_34E770.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_34E770.png", D_09000000_34E770);
 
 #include "effects/gfx/D_09000400_34EB70.vtx.inc.c"
 
diff --git a/src/effects/gfx/spirit_card.c b/src/effects/gfx/spirit_card.c
index 81759b991f..4505368267 100644
--- a/src/effects/gfx/spirit_card.c
+++ b/src/effects/gfx/spirit_card.c
@@ -1,57 +1,59 @@
+#include "include_asset.h"
+
 #include "PR/gbi.h"
 
-#include "effects/gfx/star_cards/card_front.png.inc.c"
-#include "effects/gfx/star_cards/card_front.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/card_front.png", D_09000000_3FA4B0);
+INCLUDE_PAL("effects/gfx/star_cards/card_front.pal", D_09000200_3FA6B0);
 
 char D_09000220_3FA6D0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/card_back.png.inc.c"
-#include "effects/gfx/star_cards/card_back.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/card_back.png", D_09000400_3FA8B0);
+INCLUDE_PAL("effects/gfx/star_cards/card_back.pal", D_09000800_3FACB0);
 
 char D_09000820_3FACD0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/wave.png.inc.c"
-#include "effects/gfx/star_cards/wave.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/wave.png", D_09000A00_3FAEB0);
+INCLUDE_PAL("effects/gfx/star_cards/wave.pal", D_09000C00_3FB0B0);
 
 char D_09000C20_3FB0D0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/squares.png.inc.c"
-#include "effects/gfx/star_cards/squares.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/squares.png", D_09000E00_3FB2B0);
+INCLUDE_PAL("effects/gfx/star_cards/squares.pal", D_09000E80_3FB330);
 
 char D_09000EA0_3FB350[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/eldstar.png.inc.c"
-#include "effects/gfx/star_cards/eldstar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/eldstar.png", D_09001080_3FB530);
+INCLUDE_PAL("effects/gfx/star_cards/eldstar.pal", D_09001500_3FB9B0);
 
 char D_09001520_3FB9D0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/mamar.png.inc.c"
-#include "effects/gfx/star_cards/mamar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/mamar.png", D_09001700_3FBBB0);
+INCLUDE_PAL("effects/gfx/star_cards/mamar.pal", D_09001B80_3FC030);
 
 char D_09001BA0_3FC050[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/skolar.png.inc.c"
-#include "effects/gfx/star_cards/skolar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/skolar.png", D_09001D80_3FC230);
+INCLUDE_PAL("effects/gfx/star_cards/skolar.pal", D_09002200_3FC6B0);
 
 char D_09002220_3FC6D0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/muskular.png.inc.c"
-#include "effects/gfx/star_cards/muskular.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/muskular.png", D_09002400_3FC8B0);
+INCLUDE_PAL("effects/gfx/star_cards/muskular.pal", D_09002880_3FCD30);
 
 char D_090028A0_3FCD50[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/misstar.png.inc.c"
-#include "effects/gfx/star_cards/misstar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/misstar.png", D_09002A80_3FCF30);
+INCLUDE_PAL("effects/gfx/star_cards/misstar.pal", D_09002F00_3FD3B0);
 
 char D_09002F20_3FD3D0[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/klevar.png.inc.c"
-#include "effects/gfx/star_cards/klevar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/klevar.png", D_09003100_3FD5B0);
+INCLUDE_PAL("effects/gfx/star_cards/klevar.pal", D_09003580_3FDA30);
 
 char D_090035A0_3FDA50[0x1E0] = { 0 };
 
-#include "effects/gfx/star_cards/kalmar.png.inc.c"
-#include "effects/gfx/star_cards/kalmar.pal.inc.c"
+INCLUDE_IMG("effects/gfx/star_cards/kalmar.png", D_09003780_3FDC30);
+INCLUDE_PAL("effects/gfx/star_cards/kalmar.pal", D_09003C00_3FE0B0);
 
 char D_09003C20_3FE0D0[0x1E0] = { 0 };
 
diff --git a/src/effects/gfx/squirt.c b/src/effects/gfx/squirt.c
index 7c25d5ec78..09642d5645 100644
--- a/src/effects/gfx/squirt.c
+++ b/src/effects/gfx/squirt.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3B5340.png.inc.c"
-#include "effects/gfx/D_09000400_3B5740.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B5340.png", D_09000000_3B5340);
+INCLUDE_IMG("effects/gfx/D_09000400_3B5740.png", D_09000400_3B5740);
 #include "effects/gfx/D_09000800_3B5B40.gfx.inc.c"
 #include "effects/gfx/D_090008A8_3B5BE8.gfx.inc.c"
 #include "effects/gfx/D_09000950_3B5C90.vtx.inc.c"
diff --git a/src/effects/gfx/star.c b/src/effects/gfx/star.c
index 6237a07f6c..0ce6cb751b 100644
--- a/src/effects/gfx/star.c
+++ b/src/effects/gfx/star.c
@@ -1,6 +1,8 @@
-#include "effects/gfx/D_09000000_3326A0.png.inc.c"
-#include "effects/gfx/D_09001000_3336A0.png.inc.c"
-#include "effects/gfx/D_09001200_3338A0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3326A0.png", D_09000000_3326A0);
+INCLUDE_IMG("effects/gfx/D_09001000_3336A0.png", D_09001000_3336A0);
+INCLUDE_IMG("effects/gfx/D_09001200_3338A0.png", D_09001200_3338A0);
 
 #include "effects/gfx/D_09001400_333AA0.vtx.inc.c"
 #include "effects/gfx/D_090014A0_333B40.vtx.inc.c"
diff --git a/src/effects/gfx/star_outline.c b/src/effects/gfx/star_outline.c
index a02d0f4a4e..232570477e 100644
--- a/src/effects/gfx/star_outline.c
+++ b/src/effects/gfx/star_outline.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_413FA0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_413FA0.png", D_09000000_413FA0);
 
 #include "effects/gfx/D_09000800_4147A0.gfx.inc.c"
 
diff --git a/src/effects/gfx/star_spirits_energy.c b/src/effects/gfx/star_spirits_energy.c
index 79ab3d34e8..983f855d77 100644
--- a/src/effects/gfx/star_spirits_energy.c
+++ b/src/effects/gfx/star_spirits_energy.c
@@ -1,10 +1,12 @@
-#include "effects/gfx/D_09000000_40D290.png.inc.c"
-#include "effects/gfx/D_09000200_40D490.png.inc.c"
-#include "effects/gfx/D_09001200_40E490.png.inc.c"
-#include "effects/gfx/D_09002200_40F490.png.inc.c"
-#include "effects/gfx/D_09003200_410490.png.inc.c"
-#include "effects/gfx/D_09004200_411490.png.inc.c"
-#include "effects/gfx/D_09004A00_411C90.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_40D290.png", D_09000000_40D290);
+INCLUDE_IMG("effects/gfx/D_09000200_40D490.png", D_09000200_40D490);
+INCLUDE_IMG("effects/gfx/D_09001200_40E490.png", D_09001200_40E490);
+INCLUDE_IMG("effects/gfx/D_09002200_40F490.png", D_09002200_40F490);
+INCLUDE_IMG("effects/gfx/D_09003200_410490.png", D_09003200_410490);
+INCLUDE_IMG("effects/gfx/D_09004200_411490.png", D_09004200_411490);
+INCLUDE_IMG("effects/gfx/D_09004A00_411C90.png", D_09004A00_411C90);
 
 #include "effects/gfx/D_09004E00_412090.gfx.inc.c"
 
diff --git a/src/effects/gfx/stars_orbiting.c b/src/effects/gfx/stars_orbiting.c
index e110c00b17..84c2d79463 100644
--- a/src/effects/gfx/stars_orbiting.c
+++ b/src/effects/gfx/stars_orbiting.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_362C50.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_362C50.png", D_09000000_362C50);
 #include "effects/gfx/D_09000400_363050.vtx.inc.c"
 #include "effects/gfx/D_09000440_363090.gfx.inc.c"
 #include "effects/gfx/D_090004F0_363140.gfx.inc.c"
diff --git a/src/effects/gfx/stars_spread.c b/src/effects/gfx/stars_spread.c
index a659968eb2..959d2d8ec0 100644
--- a/src/effects/gfx/stars_spread.c
+++ b/src/effects/gfx/stars_spread.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_360A30.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_360A30.png", D_09000000_360A30);
 
 #include "effects/gfx/D_09000400_360E30.vtx.inc.c"
 
diff --git a/src/effects/gfx/stat_change.c b/src/effects/gfx/stat_change.c
index 2bf2775bf2..dd5622ab19 100644
--- a/src/effects/gfx/stat_change.c
+++ b/src/effects/gfx/stat_change.c
@@ -1,19 +1,21 @@
-#include "effects/gfx/D_09000000_3AF700.png.inc.c"
-#include "effects/gfx/D_09000200_3AF900.png.inc.c"
-#include "effects/gfx/D_09000400_3AFB00.png.inc.c"
-#include "effects/gfx/D_09000600_3AFD00.png.inc.c"
-#include "effects/gfx/D_09000800_3AFF00.png.inc.c"
-#include "effects/gfx/D_09000A00_3B0100.png.inc.c"
-#include "effects/gfx/D_09000C00_3B0300.png.inc.c"
-#include "effects/gfx/D_09000E00_3B0500.png.inc.c"
-#include "effects/gfx/D_09001000_3B0700.png.inc.c"
-#include "effects/gfx/D_09001200_3B0900.png.inc.c"
-#include "effects/gfx/D_09001400_3B0B00.png.inc.c"
-#include "effects/gfx/D_09001600_3B0D00.png.inc.c"
-#include "effects/gfx/D_09001800_3B0F00.png.inc.c"
+#include "include_asset.h"
 
-#include "effects/gfx/D_09002000_3B1700.png.inc.c"
-#include "effects/gfx/D_09002000_3B1700.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000000_3AF700.png", D_09000000_3AF700);
+INCLUDE_IMG("effects/gfx/D_09000200_3AF900.png", D_09000200_3AF900);
+INCLUDE_IMG("effects/gfx/D_09000400_3AFB00.png", D_09000400_3AFB00);
+INCLUDE_IMG("effects/gfx/D_09000600_3AFD00.png", D_09000600_3AFD00);
+INCLUDE_IMG("effects/gfx/D_09000800_3AFF00.png", D_09000800_3AFF00);
+INCLUDE_IMG("effects/gfx/D_09000A00_3B0100.png", D_09000A00_3B0100);
+INCLUDE_IMG("effects/gfx/D_09000C00_3B0300.png", D_09000C00_3B0300);
+INCLUDE_IMG("effects/gfx/D_09000E00_3B0500.png", D_09000E00_3B0500);
+INCLUDE_IMG("effects/gfx/D_09001000_3B0700.png", D_09001000_3B0700);
+INCLUDE_IMG("effects/gfx/D_09001200_3B0900.png", D_09001200_3B0900);
+INCLUDE_IMG("effects/gfx/D_09001400_3B0B00.png", D_09001400_3B0B00);
+INCLUDE_IMG("effects/gfx/D_09001600_3B0D00.png", D_09001600_3B0D00);
+INCLUDE_IMG("effects/gfx/D_09001800_3B0F00.png", D_09001800_3B0F00);
+
+INCLUDE_IMG("effects/gfx/D_09002000_3B1700.png", D_09002000_3B1700);
+INCLUDE_PAL("effects/gfx/D_09002000_3B1700.pal", D_09002400_3B1B00);
 
 #include "effects/gfx/D_09002600_3B1D00.vtx.inc.c"
 #include "effects/gfx/D_09002640_3B1D40.vtx.inc.c"
diff --git a/src/effects/gfx/static_status.c b/src/effects/gfx/static_status.c
index 0147d00ef1..1b16f02f5e 100644
--- a/src/effects/gfx/static_status.c
+++ b/src/effects/gfx/static_status.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3E12D0.png.inc.c"
-#include "effects/gfx/D_09000000_3E12D0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3E12D0.png", D_09000000_3E12D0);
+INCLUDE_PAL("effects/gfx/D_09000000_3E12D0.pal", D_09000080_3E1350);
 
 u8 D_090000A0_3E1370[0x1E0] = {};
 
diff --git a/src/effects/gfx/steam_burst.c b/src/effects/gfx/steam_burst.c
index 2c03aa57fb..f8f0b5da5f 100644
--- a/src/effects/gfx/steam_burst.c
+++ b/src/effects/gfx/steam_burst.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_361670.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_361670.png", D_09000000_361670);
 #include "effects/gfx/D_09000E00_362470.gfx.inc.c"
 
 #include "effects/gfx/D_09000EF0_362560.vtx.inc.c"
diff --git a/src/effects/gfx/stop_watch.c b/src/effects/gfx/stop_watch.c
index e32638effa..5f06aa1b63 100644
--- a/src/effects/gfx/stop_watch.c
+++ b/src/effects/gfx/stop_watch.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3CB890.png.inc.c"
-#include "effects/gfx/D_09000800_3CC090.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3CB890.png", D_09000000_3CB890);
+INCLUDE_IMG("effects/gfx/D_09000800_3CC090.png", D_09000800_3CC090);
 
 #include "effects/gfx/D_09001000_3CC890.gfx.inc.c"
 
diff --git a/src/effects/gfx/sun.c b/src/effects/gfx/sun.c
index ee026a50dc..a04ea4a933 100644
--- a/src/effects/gfx/sun.c
+++ b/src/effects/gfx/sun.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_40BBA0.png.inc.c"
-#include "effects/gfx/D_09000200_40BDA0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_40BBA0.png", D_09000000_40BBA0);
+INCLUDE_IMG("effects/gfx/D_09000200_40BDA0.png", D_09000200_40BDA0);
 
 #include "effects/gfx/D_09000600_40C1A0.vtx.inc.c"
 #include "effects/gfx/D_09000680_40C220.vtx.inc.c"
diff --git a/src/effects/gfx/sweat.c b/src/effects/gfx/sweat.c
index 14b5b608b1..41c60ff65a 100644
--- a/src/effects/gfx/sweat.c
+++ b/src/effects/gfx/sweat.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_35C550.png.inc.c"
-#include "effects/gfx/D_09000080_35C5D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_35C550.png", D_09000000_35C550);
+INCLUDE_IMG("effects/gfx/D_09000080_35C5D0.png", D_09000080_35C5D0);
 
 #include "effects/gfx/D_09000180_35C6D0.vtx.inc.c"
 #include "effects/gfx/D_090001C0_35C710.vtx.inc.c"
diff --git a/src/effects/gfx/tattle_window.c b/src/effects/gfx/tattle_window.c
index 9d2a529f98..c9b1a3d4b7 100644
--- a/src/effects/gfx/tattle_window.c
+++ b/src/effects/gfx/tattle_window.c
@@ -1 +1,3 @@
-#include "effects/gfx/D_09000000_3D7040.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D7040.png", D_09000000_3D7040);
diff --git a/src/effects/gfx/throw_spiny.c b/src/effects/gfx/throw_spiny.c
index 90427766c8..c42c38900d 100644
--- a/src/effects/gfx/throw_spiny.c
+++ b/src/effects/gfx/throw_spiny.c
@@ -1,12 +1,14 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3CFAF0.png.inc.c"
-#include "effects/gfx/D_09000000_3CFAF0.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3CFAF0.png", D_09000000_3CFAF0);
+INCLUDE_PAL("effects/gfx/D_09000000_3CFAF0.pal", D_09000200_3CFCF0);
 
 u8 D_09000220_3CFD10[0x1E0] = {};
 
-#include "effects/gfx/D_09000400_3CFEF0.png.inc.c"
-#include "effects/gfx/D_09000400_3CFEF0.pal.inc.c"
+INCLUDE_IMG("effects/gfx/D_09000400_3CFEF0.png", D_09000400_3CFEF0);
+INCLUDE_PAL("effects/gfx/D_09000400_3CFEF0.pal", D_09000600_3D00F0);
 
 u8 D_09000620_3D0110[0x1E0] = {};
 
diff --git a/src/effects/gfx/tubba_heart_attack.c b/src/effects/gfx/tubba_heart_attack.c
index cb3c57ad0c..a775208e59 100644
--- a/src/effects/gfx/tubba_heart_attack.c
+++ b/src/effects/gfx/tubba_heart_attack.c
@@ -1,7 +1,9 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3D2580.png.inc.c"
-#include "effects/gfx/D_09000000_3D2580.pal.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D2580.png", D_09000000_3D2580);
+INCLUDE_PAL("effects/gfx/D_09000000_3D2580.pal", D_09000200_3D2780);
 
 u8 D_09000220_3D27A0[0x1E0] = {};
 
diff --git a/src/effects/gfx/underwater.c b/src/effects/gfx/underwater.c
index 8eff063ccb..e901d0a942 100644
--- a/src/effects/gfx/underwater.c
+++ b/src/effects/gfx/underwater.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3B9A70.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B9A70.png", D_09000000_3B9A70);
 #include "effects/gfx/D_09000080_3B9AF0.vtx.inc.c"
 #include "effects/gfx/D_09000200_3B9C70.gfx.inc.c"
 #include "effects/gfx/D_09000248_3B9CB8.gfx.inc.c"
diff --git a/src/effects/gfx/water_block.c b/src/effects/gfx/water_block.c
index cf8a5d1089..c0b11c1085 100644
--- a/src/effects/gfx/water_block.c
+++ b/src/effects/gfx/water_block.c
@@ -1,5 +1,7 @@
-#include "effects/gfx/D_09000000_3B6BF0.png.inc.c"
-#include "effects/gfx/D_09000100_3B6CF0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B6BF0.png", D_09000000_3B6BF0);
+INCLUDE_IMG("effects/gfx/D_09000100_3B6CF0.png", D_09000100_3B6CF0);
 #include "effects/gfx/D_09000300_3B6EF0.gfx.inc.c"
 #include "effects/gfx/D_090003B0_3B6FA0.gfx.inc.c"
 #include "effects/gfx/D_09000460_3B7050.vtx.inc.c"
diff --git a/src/effects/gfx/water_fountain.c b/src/effects/gfx/water_fountain.c
index 045d7be5a8..c1971ed880 100644
--- a/src/effects/gfx/water_fountain.c
+++ b/src/effects/gfx/water_fountain.c
@@ -1,4 +1,6 @@
-#include "effects/gfx/D_09000000_3B8860.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B8860.png", D_09000000_3B8860);
 
 #include "effects/gfx/D_09000200_3B8A60.vtx.inc.c"
 #include "effects/gfx/D_09000240_3B8AA0.vtx.inc.c"
diff --git a/src/effects/gfx/water_splash.c b/src/effects/gfx/water_splash.c
index c9b05ed0ad..e5f3835970 100644
--- a/src/effects/gfx/water_splash.c
+++ b/src/effects/gfx/water_splash.c
@@ -1,6 +1,8 @@
 #include "common.h"
 
-#include "effects/gfx/D_09000000_3BCA90.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3BCA90.png", D_09000000_3BCA90);
 #include "effects/gfx/D_09000100_3BCB90.gfx.inc.c"
 
 #include "effects/gfx/D_090001A8_3BCC38.vtx.inc.c"
diff --git a/src/effects/gfx/waterfall.c b/src/effects/gfx/waterfall.c
index 1d6636a9bf..2c788842f7 100644
--- a/src/effects/gfx/waterfall.c
+++ b/src/effects/gfx/waterfall.c
@@ -1,2 +1,4 @@
-#include "effects/gfx/D_09000000_3B78D0.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3B78D0.png", D_09000000_3B78D0);
 #include "effects/gfx/D_09000200_3B7AD0.gfx.inc.c"
diff --git a/src/effects/gfx/whirlwind.c b/src/effects/gfx/whirlwind.c
index ef36fedbd0..1308ce9081 100644
--- a/src/effects/gfx/whirlwind.c
+++ b/src/effects/gfx/whirlwind.c
@@ -1,2 +1,4 @@
-#include "effects/gfx/D_09000000_3D3930.png.inc.c"
+#include "include_asset.h"
+
+INCLUDE_IMG("effects/gfx/D_09000000_3D3930.png", D_09000000_3D3930);
 #include "effects/gfx/D_09000400_3D3D30.gfx.inc.c"
diff --git a/src/entity/Shadow.c b/src/entity/Shadow.c
index 9a3f9406c8..f8c58f65ab 100644
--- a/src/entity/Shadow.c
+++ b/src/entity/Shadow.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "entity.h"
+#include "include_asset.h"
 
 void entity_Shadow_init(Shadow* shadow) {
     shadow->scale.x = 0.1f;
@@ -16,12 +17,12 @@ s32 entity_can_collide_with_jumping_player(Entity* entity) {
     return FALSE;
 }
 
-#include "entity/shadow/square.png.inc.c"
-#include "entity/shadow/circle.png.inc.c"
+INCLUDE_IMG("entity/shadow/square.png", D_802E9170);
+INCLUDE_IMG("entity/shadow/circle.png", D_802E91F0);
 #include "entity/vtx/shadow1.vtx.inc.c"
 #include "entity/vtx/shadow2.vtx.inc.c"
-#include "entity/shadow/square_big.png.inc.c"
-#include "entity/shadow/circle_big.png.inc.c"
+INCLUDE_IMG("entity/shadow/square_big.png", D_802E92F0);
+INCLUDE_IMG("entity/shadow/circle_big.png", D_802E94F0);
 
 Gfx Entity_Shadow_GfxCommon[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/ArrowSign.c b/src/entity/model/ArrowSign.c
index 5678839b86..c89166bb1a 100644
--- a/src/entity/model/ArrowSign.c
+++ b/src/entity/model/ArrowSign.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 Vtx Entity_ArrowSign_vtxSign[] = {
     {{{   -10,   -10,     0 }, 0, {     0,     0 }, { 255, 255, 255, 255 }}},
@@ -13,8 +14,8 @@ Vtx Entity_ArrowSign_vtxPole[] = {
     {{{    -2,    19,    -1 }, 0, {     0,     0 }, {  25,  20,   0, 255 }}},
 };
 
-#include "entity/model/ArrowSign.png.inc.c"
-#include "entity/model/ArrowSign.pal.inc.c"
+INCLUDE_IMG("entity/model/ArrowSign.png", D_0A000080_E59F80);
+INCLUDE_PAL("entity/model/ArrowSign.pal", D_0A000880_E5A780);
 Gfx Entity_ArrowSign_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000880_E5A780),
diff --git a/src/entity/model/BellbellPlant_gfx.c b/src/entity/model/BellbellPlant_gfx.c
index 0c8744223c..2f95d36804 100644
--- a/src/entity/model/BellbellPlant_gfx.c
+++ b/src/entity/model/BellbellPlant_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A001090_E6C240[];
 
@@ -173,4 +174,4 @@ Gfx Entity_BellbellPlant_RenderNode1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/BellbellPlant.png.inc.c"
+INCLUDE_IMG("entity/model/BellbellPlant.png", D_0A001090_E6C240);
diff --git a/src/entity/model/BlueSwitch.c b/src/entity/model/BlueSwitch.c
index 8b976f96e9..0b1fcc00ab 100644
--- a/src/entity/model/BlueSwitch.c
+++ b/src/entity/model/BlueSwitch.c
@@ -1,12 +1,13 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/BlueSwitch_1.vtx.inc.c"
 #include "entity/model/BlueSwitch_2.vtx.inc.c"
 #include "entity/model/BlueSwitch_3.vtx.inc.c"
 #include "entity/model/BlueSwitch_4.vtx.inc.c"
 
-#include "entity/model/BlueSwitch_tex.png.inc.c"
-#include "entity/model/BlueSwitch_tex.pal.inc.c"
+INCLUDE_IMG("entity/model/BlueSwitch_tex.png", D_0A0005D0_E63F90);
+INCLUDE_PAL("entity/model/BlueSwitch_tex.pal", D_0A0006D0_E64090);
 Gfx Entity_BlueSwitch_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0006D0_E64090),
@@ -20,7 +21,7 @@ Gfx Entity_BlueSwitch_LoadTexture[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/BlueSwitch_exclamationMark.png.inc.c"
+INCLUDE_IMG("entity/model/BlueSwitch_exclamationMark.png", D_0A000978_E64338);
 Gfx Entity_BlueSwitch_LoadExclMark[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/BlueWarpPipe.c b/src/entity/model/BlueWarpPipe.c
index 09edf47136..72660ec674 100644
--- a/src/entity/model/BlueWarpPipe.c
+++ b/src/entity/model/BlueWarpPipe.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/BlueWarpPipe_1.vtx.inc.c"
 #include "entity/model/BlueWarpPipe_2.vtx.inc.c"
 #include "entity/model/BlueWarpPipe_3.vtx.inc.c"
 
-#include "entity/model/BlueWarpPipe_texBase.png.inc.c"
-#include "entity/model/BlueWarpPipe_texBase.pal.inc.c"
+INCLUDE_IMG("entity/model/BlueWarpPipe_texBase.png", D_0A000320_E58FF0);
+INCLUDE_PAL("entity/model/BlueWarpPipe_texBase.pal", D_0A0003A0_E59070);
 Gfx Entity_BlueWarpPipe_LoadTextureBase[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -20,8 +21,8 @@ Gfx Entity_BlueWarpPipe_LoadTextureBase[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/BlueWarpPipe_texPipe.png.inc.c"
-#include "entity/model/BlueWarpPipe_texPipe.pal.inc.c"
+INCLUDE_IMG("entity/model/BlueWarpPipe_texPipe.png", D_0A000470_E59140);
+INCLUDE_PAL("entity/model/BlueWarpPipe_texPipe.pal", D_0A000570_E59240);
 Gfx Entity_BlueWarpPipe_LoadTexturePipe[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/BoardedFloor.c b/src/entity/model/BoardedFloor.c
index a7704761d7..3e97a6f462 100644
--- a/src/entity/model/BoardedFloor.c
+++ b/src/entity/model/BoardedFloor.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/BoardedFloor_1.vtx.inc.c"
 #include "entity/model/BoardedFloor_2.vtx.inc.c"
@@ -13,7 +14,7 @@
 #include "entity/model/BoardedFloor_B.vtx.inc.c"
 #include "entity/model/BoardedFloor_C.vtx.inc.c"
 
-#include "entity/model/BoardedFloor.png.inc.c"
+INCLUDE_IMG("entity/model/BoardedFloor.png", D_0A001400_E4FBF0);
 Gfx D_0A002400_E50BF0[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/BombableRock.c b/src/entity/model/BombableRock.c
index 66fb8c88c8..689dec4842 100644
--- a/src/entity/model/BombableRock.c
+++ b/src/entity/model/BombableRock.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/BombableRock_1.vtx.inc.c"
 #include "entity/model/BombableRock_2.vtx.inc.c"
@@ -6,8 +7,8 @@
 #include "entity/model/BombableRock_4.vtx.inc.c"
 #include "entity/model/BombableRock_5.vtx.inc.c"
 
-#include "entity/model/BombableRock.png.inc.c"
-#include "entity/model/BombableRock.pal.inc.c"
+INCLUDE_IMG("entity/model/BombableRock.png", D_0A000840_E9DE90);
+INCLUDE_PAL("entity/model/BombableRock.pal", D_0A001040_E9E690);
 Gfx D_0A001060_E9E6B0[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/BrickBlock.c b/src/entity/model/BrickBlock.c
index b9883fbd9c..28beeef566 100644
--- a/src/entity/model/BrickBlock.c
+++ b/src/entity/model/BrickBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/BrickBlock.vtx.inc.c"
 
-#include "entity/model/BrickBlock_face.png.inc.c"
-#include "entity/model/BrickBlock_face.pal.inc.c"
+INCLUDE_IMG("entity/model/BrickBlock_face.png", D_0A000140_E3DEF0);
+INCLUDE_PAL("entity/model/BrickBlock_face.pal", D_0A000340_E3E0F0);
 Gfx Entity_BrickBlock_LoadTexture[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/Chest.c b/src/entity/model/Chest.c
index 8527e7dc29..3203afb824 100644
--- a/src/entity/model/Chest.c
+++ b/src/entity/model/Chest.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Chest_1.vtx.inc.c"
 #include "entity/model/Chest_2.vtx.inc.c"
 #include "entity/model/Chest_3.vtx.inc.c"
 #include "entity/model/Chest_4.vtx.inc.c"
 
-#include "entity/model/Chest_tex1.png.inc.c"
+INCLUDE_IMG("entity/model/Chest_tex1.png", D_0A000410_E64CE0);
 Gfx Entity_Chest_LoadTexture1[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -20,8 +21,8 @@ Gfx Entity_Chest_LoadTexture1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/Chest_tex2.png.inc.c"
-#include "entity/model/Chest_tex2.pal.inc.c"
+INCLUDE_IMG("entity/model/Chest_tex2.png", D_0A000898_E65168);
+INCLUDE_PAL("entity/model/Chest_tex2.pal", D_0A000998_E65268);
 Gfx Entity_Chest_LoadTexture2[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -37,8 +38,8 @@ Gfx Entity_Chest_LoadTexture2[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/Chest_lock.png.inc.c"
-#include "entity/model/Chest_lock.pal.inc.c"
+INCLUDE_IMG("entity/model/Chest_lock.png", D_0A000A70_E65340);
+INCLUDE_PAL("entity/model/Chest_lock.pal", D_0A000B70_E65440);
 Gfx Entity_Chest_LoadTextureLock[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/CymbalPlant_gfx.c b/src/entity/model/CymbalPlant_gfx.c
index cd158418ee..4bea6986e2 100644
--- a/src/entity/model/CymbalPlant_gfx.c
+++ b/src/entity/model/CymbalPlant_gfx.c
@@ -1,7 +1,8 @@
 #include "common.h"
+#include "include_asset.h"
 
-#include "entity/model/CymbalPlant.png.inc.c"
-#include "entity/model/CymbalPlant.pal.inc.c"
+INCLUDE_IMG("entity/model/CymbalPlant.png", D_0A000000_E992F0);
+INCLUDE_PAL("entity/model/CymbalPlant.pal", D_0A000800_E99AF0);
 Gfx Entity_CymbalPlant_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000800_E99AF0),
diff --git a/src/entity/model/GreenStompSwitch.c b/src/entity/model/GreenStompSwitch.c
index 55d769b6a7..9a988f3337 100644
--- a/src/entity/model/GreenStompSwitch.c
+++ b/src/entity/model/GreenStompSwitch.c
@@ -1,10 +1,11 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/GreenStompSwitch_1.vtx.inc.c"
 #include "entity/model/GreenStompSwitch_2.vtx.inc.c"
 
-#include "entity/model/GreenStompSwitch_tex.png.inc.c"
-#include "entity/model/GreenStompSwitch_tex.pal.inc.c"
+INCLUDE_IMG("entity/model/GreenStompSwitch_tex.png", D_0A000280_E625F0);
+INCLUDE_PAL("entity/model/GreenStompSwitch_tex.pal", D_0A000300_E62670);
 Gfx Entity_GreenStompSwitch_LoadTexture[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -20,8 +21,8 @@ Gfx Entity_GreenStompSwitch_LoadTexture[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/GreenStompSwitch_exclamationMark.png.inc.c"
-#include "entity/model/GreenStompSwitch_exclamationMark.pal.inc.c"
+INCLUDE_IMG("entity/model/GreenStompSwitch_exclamationMark.png", D_0A0003D8_E62748);
+INCLUDE_PAL("entity/model/GreenStompSwitch_exclamationMark.pal", D_0A0004D8_E62848);
 Gfx Entity_GreenStompSwitch_LoadExclMark[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/Hammer1Block.c b/src/entity/model/Hammer1Block.c
index 95b46db20a..ad84f683ae 100644
--- a/src/entity/model/Hammer1Block.c
+++ b/src/entity/model/Hammer1Block.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Hammer1Block.vtx.inc.c"
 
-#include "entity/model/Hammer1Block_face.png.inc.c"
-#include "entity/model/Hammer1Block_face.pal.inc.c"
+INCLUDE_IMG("entity/model/Hammer1Block_face.png", D_0A000280_E317B0);
+INCLUDE_PAL("entity/model/Hammer1Block_face.pal", D_0A000380_E318B0);
 Gfx Entity_Hammer1Block_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000380_E318B0),
diff --git a/src/entity/model/Hammer2Block.c b/src/entity/model/Hammer2Block.c
index 297a74a173..8b8a228d3d 100644
--- a/src/entity/model/Hammer2Block.c
+++ b/src/entity/model/Hammer2Block.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Hammer2Block.vtx.inc.c"
 
-#include "entity/model/Hammer2Block_face.png.inc.c"
-#include "entity/model/Hammer2Block_face.pal.inc.c"
+INCLUDE_IMG("entity/model/Hammer2Block_face.png", D_0A000280_E31CB0);
+INCLUDE_PAL("entity/model/Hammer2Block_face.pal", D_0A000380_E31DB0);
 Gfx Entity_Hammer2Block_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000380_E31DB0),
diff --git a/src/entity/model/Hammer3Block.c b/src/entity/model/Hammer3Block.c
index 60d9deb494..53fad5caf6 100644
--- a/src/entity/model/Hammer3Block.c
+++ b/src/entity/model/Hammer3Block.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Hammer3Block.vtx.inc.c"
 
-#include "entity/model/Hammer3Block_face.png.inc.c"
-#include "entity/model/Hammer3Block_face.pal.inc.c"
+INCLUDE_IMG("entity/model/Hammer3Block_face.png", D_0A000280_E321B0);
+INCLUDE_PAL("entity/model/Hammer3Block_face.pal", D_0A000380_E322B0);
 Gfx Entity_Hammer3Block_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000380_E322B0),
diff --git a/src/entity/model/HeartBlock.c b/src/entity/model/HeartBlock.c
index b374cd6d72..5406e96456 100644
--- a/src/entity/model/HeartBlock.c
+++ b/src/entity/model/HeartBlock.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/HeartBlock.vtx.inc.c"
 
-#include "entity/model/HeartBlock_face.png.inc.c"
+INCLUDE_IMG("entity/model/HeartBlock_face.png", D_0A0003C0_E435B0);
 Gfx Entity_HeartBlock_LoadTexture[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/HitFloatingYellowBlock_gfx.c b/src/entity/model/HitFloatingYellowBlock_gfx.c
index 8d7e287883..ab5b255bc5 100644
--- a/src/entity/model/HitFloatingYellowBlock_gfx.c
+++ b/src/entity/model/HitFloatingYellowBlock_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/HitFloatingYellowBlock_1.vtx.inc.c"
 #include "entity/model/HitFloatingYellowBlock_2.vtx.inc.c"
@@ -44,5 +45,5 @@ Gfx Entity_HitFloatingYellowBlock_RenderBlock1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/HitFloatingYellowBlock_face1.png.inc.c"
-#include "entity/model/HitFloatingYellowBlock_face2.png.inc.c"
+INCLUDE_IMG("entity/model/HitFloatingYellowBlock_face1.png", D_0A000440_E474F0);
+INCLUDE_IMG("entity/model/HitFloatingYellowBlock_face2.png", D_0A000C40_E47CF0);
diff --git a/src/entity/model/HitRedBlock_gfx.c b/src/entity/model/HitRedBlock_gfx.c
index a9ab4ac497..000172f623 100644
--- a/src/entity/model/HitRedBlock_gfx.c
+++ b/src/entity/model/HitRedBlock_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/HitRedBlock_1.vtx.inc.c"
 #include "entity/model/HitRedBlock_2.vtx.inc.c"
@@ -52,5 +53,5 @@ Gfx Entity_HitRedBlock_RenderBlock1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/HitRedBlock_face1.png.inc.c"
-#include "entity/model/HitRedBlock_face2.png.inc.c"
+INCLUDE_IMG("entity/model/HitRedBlock_face1.png", D_0A000460_E48BE0);
+INCLUDE_IMG("entity/model/HitRedBlock_face2.png", D_0A000C60_E493E0);
diff --git a/src/entity/model/HitYellowBlock_gfx.c b/src/entity/model/HitYellowBlock_gfx.c
index 91bb1e9fd5..ec94600c5f 100644
--- a/src/entity/model/HitYellowBlock_gfx.c
+++ b/src/entity/model/HitYellowBlock_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/HitYellowBlock_1.vtx.inc.c"
 #include "entity/model/HitYellowBlock_2.vtx.inc.c"
@@ -44,5 +45,5 @@ Gfx Entity_HitYellowBlock_RenderBlock1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/HitYellowBlock_face1.png.inc.c"
-#include "entity/model/HitYellowBlock_face2.png.inc.c"
+INCLUDE_IMG("entity/model/HitYellowBlock_face1.png", D_0A000420_E45E10);
+INCLUDE_IMG("entity/model/HitYellowBlock_face2.png", D_0A000C20_E46610);
diff --git a/src/entity/model/InertRedBlock.c b/src/entity/model/InertRedBlock.c
index a485937778..3c45dfa8e6 100644
--- a/src/entity/model/InertRedBlock.c
+++ b/src/entity/model/InertRedBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/InertRedBlock_1.vtx.inc.c"
 #include "entity/model/InertRedBlock_2.vtx.inc.c"
 
-#include "entity/model/InertRedBlock_face.png.inc.c"
+INCLUDE_IMG("entity/model/InertRedBlock_face.png", D_0A000180_E428C0);
 Gfx Entity_InertRedBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/InertYellowBlock.c b/src/entity/model/InertYellowBlock.c
index 6610f3a175..9d0d449d95 100644
--- a/src/entity/model/InertYellowBlock.c
+++ b/src/entity/model/InertYellowBlock.c
@@ -1,10 +1,11 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/InertYellowBlock_1.vtx.inc.c"
 #include "entity/model/InertYellowBlock_2.vtx.inc.c"
 
-#include "entity/model/InertYellowBlock_face.png.inc.c"
-#include "entity/model/InertYellowBlock_face.pal.inc.c"
+INCLUDE_IMG("entity/model/InertYellowBlock_face.png", D_0A000180_E423C0);
+INCLUDE_PAL("entity/model/InertYellowBlock_face.pal", D_0A000380_E425C0);
 Gfx Entity_InertYellowBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000380_E425C0),
diff --git a/src/entity/model/MunchlesiaBeginChew_gfx.c b/src/entity/model/MunchlesiaBeginChew_gfx.c
index e8800422ee..0a40291374 100644
--- a/src/entity/model/MunchlesiaBeginChew_gfx.c
+++ b/src/entity/model/MunchlesiaBeginChew_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A006840_E87E30[];
 
@@ -3340,4 +3341,4 @@ Gfx Entity_MunchlesiaBeginChew_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaBeginChew.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaBeginChew.png", D_0A006840_E87E30);
diff --git a/src/entity/model/MunchlesiaChewing_gfx.c b/src/entity/model/MunchlesiaChewing_gfx.c
index 2260d488ec..730792884d 100644
--- a/src/entity/model/MunchlesiaChewing_gfx.c
+++ b/src/entity/model/MunchlesiaChewing_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A001D70_E8A210[];
 
@@ -145,4 +146,4 @@ Gfx Entity_MunchlesiaChewing_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaChewing.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaChewing.png", D_0A001D70_E8A210);
diff --git a/src/entity/model/MunchlesiaEnvelop_gfx.c b/src/entity/model/MunchlesiaEnvelop_gfx.c
index e56fc9c39b..a05ab31232 100644
--- a/src/entity/model/MunchlesiaEnvelop_gfx.c
+++ b/src/entity/model/MunchlesiaEnvelop_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A005EE8_E80FC8[];
 
@@ -2941,4 +2942,4 @@ Gfx Entity_MunchlesiaEnvelop_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaEnvelop.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaEnvelop.png", D_0A005EE8_E80FC8);
diff --git a/src/entity/model/MunchlesiaGrab_gfx.c b/src/entity/model/MunchlesiaGrab_gfx.c
index f92be1f4c2..fcb5a4fb12 100644
--- a/src/entity/model/MunchlesiaGrab_gfx.c
+++ b/src/entity/model/MunchlesiaGrab_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A005EE8_E7AAB8[];
 
@@ -2941,4 +2942,4 @@ Gfx Entity_MunchlesiaGrab_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaGrab.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaGrab.png", D_0A005EE8_E7AAB8);
diff --git a/src/entity/model/MunchlesiaReset1_gfx.c b/src/entity/model/MunchlesiaReset1_gfx.c
index 9f38bc45d6..7c7447202d 100644
--- a/src/entity/model/MunchlesiaReset1_gfx.c
+++ b/src/entity/model/MunchlesiaReset1_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A006840_E980D0[];
 
@@ -3340,4 +3341,4 @@ Gfx Entity_MunchlesiaReset1_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaReset1.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaReset1.png", D_0A006840_E980D0);
diff --git a/src/entity/model/MunchlesiaReset_gfx.c b/src/entity/model/MunchlesiaReset_gfx.c
index 4875f726b4..f13430acf8 100644
--- a/src/entity/model/MunchlesiaReset_gfx.c
+++ b/src/entity/model/MunchlesiaReset_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A005EE8_E74548[];
 
@@ -2941,4 +2942,4 @@ Gfx Entity_MunchlesiaReset_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaReset.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaReset.png", D_0A005EE8_E74548);
diff --git a/src/entity/model/MunchlesiaSpitOut_gfx.c b/src/entity/model/MunchlesiaSpitOut_gfx.c
index d8304fdf09..0692a1e9c7 100644
--- a/src/entity/model/MunchlesiaSpitOut_gfx.c
+++ b/src/entity/model/MunchlesiaSpitOut_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A006840_E91220[];
 
@@ -3340,4 +3341,4 @@ Gfx Entity_MunchlesiaSpitOut_Render[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/MunchlesiaSpitOut.png.inc.c"
+INCLUDE_IMG("entity/model/MunchlesiaSpitOut.png", D_0A006840_E91220);
diff --git a/src/entity/model/Padlock.c b/src/entity/model/Padlock.c
index 9c23685ea5..a940a57a5e 100644
--- a/src/entity/model/Padlock.c
+++ b/src/entity/model/Padlock.c
@@ -1,12 +1,13 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Padlock_1.vtx.inc.c"
 #include "entity/model/Padlock_2.vtx.inc.c"
 #include "entity/model/Padlock_3.vtx.inc.c"
 #include "entity/model/Padlock_4.vtx.inc.c"
 
-#include "entity/model/Padlock_face.png.inc.c"
-#include "entity/model/Padlock_face.pal.inc.c"
+INCLUDE_IMG("entity/model/Padlock_face.png", D_0A000700_E5B250);
+INCLUDE_PAL("entity/model/Padlock_face.pal", D_0A000B00_E5B650);
 Gfx Entity_Padlock_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000B00_E5B650),
@@ -20,8 +21,8 @@ Gfx Entity_Padlock_LoadTextureFace[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/Padlock_keyhole.png.inc.c"
-#include "entity/model/Padlock_keyhole.pal.inc.c"
+INCLUDE_IMG("entity/model/Padlock_keyhole.png", D_0A000DA8_E5B8F8);
+INCLUDE_PAL("entity/model/Padlock_keyhole.pal", D_0A0015A8_E5C0F8);
 Gfx Entity_Padlock_LoadTextureKeyhole[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0015A8_E5C0F8),
@@ -35,8 +36,8 @@ Gfx Entity_Padlock_LoadTextureKeyhole[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/Padlock_body.png.inc.c"
-#include "entity/model/Padlock_body.pal.inc.c"
+INCLUDE_IMG("entity/model/Padlock_body.png", D_0A001850_E5C3A0);
+INCLUDE_PAL("entity/model/Padlock_body.pal", D_0A001C50_E5C7A0);
 Gfx Entity_Padlock_LoadTextureBody[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001C50_E5C7A0),
diff --git a/src/entity/model/PadlockBlueFace.c b/src/entity/model/PadlockBlueFace.c
index 3959bc40ed..2ac84b46e3 100644
--- a/src/entity/model/PadlockBlueFace.c
+++ b/src/entity/model/PadlockBlueFace.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PadlockBlueFace_1.vtx.inc.c"
 #include "entity/model/PadlockBlueFace_2.vtx.inc.c"
 #include "entity/model/PadlockBlueFace_3.vtx.inc.c"
 #include "entity/model/PadlockBlueFace_4.vtx.inc.c"
 
-#include "entity/model/PadlockBlueFace_face.png.inc.c"
+INCLUDE_IMG("entity/model/PadlockBlueFace_face.png", D_0A000700_E60C50);
 Gfx Entity_PadlockBlueFace_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -18,8 +19,8 @@ Gfx Entity_PadlockBlueFace_LoadTextureFace[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PadlockBlueFace_keyhole.png.inc.c"
-#include "entity/model/PadlockBlueFace_keyhole.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockBlueFace_keyhole.png", D_0A000978_E60EC8);
+INCLUDE_PAL("entity/model/PadlockBlueFace_keyhole.pal", D_0A001178_E616C8);
 Gfx Entity_PadlockBlueFace_LoadTextureKeyhole[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001178_E616C8),
@@ -33,8 +34,8 @@ Gfx Entity_PadlockBlueFace_LoadTextureKeyhole[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PadlockBlueFace_body.png.inc.c"
-#include "entity/model/PadlockBlueFace_body.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockBlueFace_body.png", D_0A001420_E61970);
+INCLUDE_PAL("entity/model/PadlockBlueFace_body.pal", D_0A001820_E61D70);
 Gfx Entity_PadlockBlueFace_LoadTextureBody[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001820_E61D70),
diff --git a/src/entity/model/PadlockRedFace.c b/src/entity/model/PadlockRedFace.c
index 78f12dac25..eec065ce7a 100644
--- a/src/entity/model/PadlockRedFace.c
+++ b/src/entity/model/PadlockRedFace.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PadlockRedFace_1.vtx.inc.c"
 #include "entity/model/PadlockRedFace_2.vtx.inc.c"
 #include "entity/model/PadlockRedFace_3.vtx.inc.c"
 #include "entity/model/PadlockRedFace_4.vtx.inc.c"
 
-#include "entity/model/PadlockRedFace_face.png.inc.c"
+INCLUDE_IMG("entity/model/PadlockRedFace_face.png", D_0A000700_E5EE30);
 Gfx Entity_PadlockRedFace_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -18,8 +19,8 @@ Gfx Entity_PadlockRedFace_LoadTextureFace[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PadlockRedFace_keyhole.png.inc.c"
-#include "entity/model/PadlockRedFace_keyhole.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockRedFace_keyhole.png", D_0A000978_E5F0A8);
+INCLUDE_PAL("entity/model/PadlockRedFace_keyhole.pal", D_0A001178_E5F8A8);
 Gfx Entity_PadlockRedFace_LoadTextureKeyhole[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001178_E5F8A8),
@@ -33,8 +34,8 @@ Gfx Entity_PadlockRedFace_LoadTextureKeyhole[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PadlockRedFace_body.png.inc.c"
-#include "entity/model/PadlockRedFace_body.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockRedFace_body.png", D_0A001420_E5FB50);
+INCLUDE_PAL("entity/model/PadlockRedFace_body.pal", D_0A001820_E5FF50);
 Gfx Entity_PadlockRedFace_LoadTextureBody[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001820_E5FF50),
diff --git a/src/entity/model/PadlockRedFrame.c b/src/entity/model/PadlockRedFrame.c
index 45d81fe921..509fcac2fc 100644
--- a/src/entity/model/PadlockRedFrame.c
+++ b/src/entity/model/PadlockRedFrame.c
@@ -1,12 +1,13 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PadlockRedFrame_1.vtx.inc.c"
 #include "entity/model/PadlockRedFrame_2.vtx.inc.c"
 #include "entity/model/PadlockRedFrame_3.vtx.inc.c"
 #include "entity/model/PadlockRedFrame_4.vtx.inc.c"
 
-#include "entity/model/PadlockRedFrame_keyhole.png.inc.c"
-#include "entity/model/PadlockRedFrame_keyhole.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockRedFrame_keyhole.png", D_0A000540_E5D2C0);
+INCLUDE_PAL("entity/model/PadlockRedFrame_keyhole.pal", D_0A000D40_E5DAC0);
 Gfx Entity_PadlockRedFrame_LoadTextureKeyhole[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000D40_E5DAC0),
@@ -20,8 +21,8 @@ Gfx Entity_PadlockRedFrame_LoadTextureKeyhole[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PadlockRedFrame_face.png.inc.c"
-#include "entity/model/PadlockRedFrame_face.pal.inc.c"
+INCLUDE_IMG("entity/model/PadlockRedFrame_face.png", D_0A000FE8_E5DD68);
+INCLUDE_PAL("entity/model/PadlockRedFrame_face.pal", D_0A0013E8_E5E168);
 Gfx Entity_PadlockRedFrame_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0013E8_E5E168),
diff --git a/src/entity/model/PinkFlower_gfx.c b/src/entity/model/PinkFlower_gfx.c
index bbeaae4d34..f9d5fcb1ba 100644
--- a/src/entity/model/PinkFlower_gfx.c
+++ b/src/entity/model/PinkFlower_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PinkFlower_1.vtx.inc.c"
 #include "entity/model/PinkFlower_2.vtx.inc.c"
@@ -6,7 +7,7 @@
 #include "entity/model/PinkFlower_4.vtx.inc.c"
 #include "entity/model/PinkFlower_5.vtx.inc.c"
 
-#include "entity/model/PinkFlower_light.png.inc.c"
+INCLUDE_IMG("entity/model/PinkFlower_light.png", D_0A0005B0_E9BAB0);
 Gfx D_0A0007B0_E9BCB0[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -18,7 +19,7 @@ Gfx D_0A0007B0_E9BCB0[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/PinkFlower_tex.png.inc.c"
+INCLUDE_IMG("entity/model/PinkFlower_tex.png", D_0A000820_E9BD20);
 Gfx D_0A001020_E9C520[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/PowBlock.c b/src/entity/model/PowBlock.c
index 8bbd487468..1de6961a77 100644
--- a/src/entity/model/PowBlock.c
+++ b/src/entity/model/PowBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PowBlock.vtx.inc.c"
 
-#include "entity/model/PowBlock_face.png.inc.c"
-#include "entity/model/PowBlock_face.pal.inc.c"
+INCLUDE_IMG("entity/model/PowBlock_face.png", D_0A000100_E43C20);
+INCLUDE_PAL("entity/model/PowBlock_face.pal", D_0A000900_E44420);
 Gfx Entity_PowBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000900_E44420),
diff --git a/src/entity/model/PushBlock.c b/src/entity/model/PushBlock.c
index 4e6e315a30..75a22519f3 100644
--- a/src/entity/model/PushBlock.c
+++ b/src/entity/model/PushBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/PushBlock.vtx.inc.c"
 
-#include "entity/model/PushBlock_face.png.inc.c"
-#include "entity/model/PushBlock_face.pal.inc.c"
+INCLUDE_IMG("entity/model/PushBlock_face.png", D_0A000120_E3DB80);
+INCLUDE_PAL("entity/model/PushBlock_face.pal", D_0A0001A0_E3DC00);
 Gfx Entity_PushBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A0001A0_E3DC00),
diff --git a/src/entity/model/RedBlock.c b/src/entity/model/RedBlock.c
index 201fc055af..5b49c925e8 100644
--- a/src/entity/model/RedBlock.c
+++ b/src/entity/model/RedBlock.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/RedBlock.vtx.inc.c"
 
-#include "entity/model/RedBlock_face.png.inc.c"
+INCLUDE_IMG("entity/model/RedBlock_face.png", D_0A000180_E3C4A0);
 Gfx Entity_RedBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/RedSwitch.c b/src/entity/model/RedSwitch.c
index 51c68d573d..995a699a09 100644
--- a/src/entity/model/RedSwitch.c
+++ b/src/entity/model/RedSwitch.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/RedSwitch_1.vtx.inc.c"
 #include "entity/model/RedSwitch_2.vtx.inc.c"
 #include "entity/model/RedSwitch_3.vtx.inc.c"
 
-#include "entity/model/RedSwitch_tex.png.inc.c"
-#include "entity/model/RedSwitch_tex.pal.inc.c"
+INCLUDE_IMG("entity/model/RedSwitch_tex.png", D_0A0005D0_E63090);
+INCLUDE_PAL("entity/model/RedSwitch_tex.pal", D_0A0006D0_E63190);
 Gfx Entity_RedSwitch_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0006D0_E63190),
@@ -19,7 +20,7 @@ Gfx Entity_RedSwitch_LoadTexture[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/RedSwitch_exclamationMark.png.inc.c"
+INCLUDE_IMG("entity/model/RedSwitch_exclamationMark.png", D_0A000978_E63438);
 Gfx Entity_RedSwitch_LoadExclMark[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/SaveBlock.c b/src/entity/model/SaveBlock.c
index 404878fb4b..dd56b7af5e 100644
--- a/src/entity/model/SaveBlock.c
+++ b/src/entity/model/SaveBlock.c
@@ -1,10 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
+#include "include_asset.h"
 
 #include "entity/model/SaveBlock_1.vtx.inc.c"
 #include "entity/model/SaveBlock_2.vtx.inc.c"
 #include "entity/model/SaveBlock_3.vtx.inc.c"
 
-#include "entity/model/SaveBlock_star.png.inc.c"
+INCLUDE_IMG("entity/model/SaveBlock_star.png", D_0A000900_E4BBE0);
 Gfx Entity_SaveBlock_LoadTextureStar[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -17,7 +19,7 @@ Gfx Entity_SaveBlock_LoadTextureStar[] = {
 };
 
 #if !VERSION_PAL
-#include "entity/model/SaveBlock_face.png.inc.c"
+INCLUDE_IMG("entity/model/SaveBlock_face.png", D_0A001170_E4C450);
 Gfx Entity_SaveBlock_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -31,9 +33,9 @@ Gfx Entity_SaveBlock_LoadTextureFace[] = {
 };
 #endif
 
-#include "entity/model/SaveBlock_letterS.png.inc.c"
+INCLUDE_IMG("entity/model/SaveBlock_letterS.png", D_0A0021E8_E4D4C8);
 #if VERSION_PAL
-#include "entity/model/SaveBlock_letterG.png.inc.c"
+INCLUDE_IMG("entity/model/SaveBlock_letterG.png", D_PAL_0A002170_EBA460);
 #endif
 
 Gfx Entity_SaveBlock_LoadTextureLetterS[] = {
diff --git a/src/entity/model/ScriptSpring_gfx.c b/src/entity/model/ScriptSpring_gfx.c
index 1c11fd80d9..7fd24d32ad 100644
--- a/src/entity/model/ScriptSpring_gfx.c
+++ b/src/entity/model/ScriptSpring_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/ScriptSpring_1.vtx.inc.c"
 #include "entity/model/ScriptSpring_2.vtx.inc.c"
@@ -8,8 +9,8 @@
 #include "entity/model/ScriptSpring_6.vtx.inc.c"
 #include "entity/model/ScriptSpring_7.vtx.inc.c"
 
-#include "entity/model/ScriptSpring_tex1.png.inc.c"
-#include "entity/model/ScriptSpring_tex1.pal.inc.c"
+INCLUDE_IMG("entity/model/ScriptSpring_tex1.png", D_0A000860_E66000);
+INCLUDE_PAL("entity/model/ScriptSpring_tex1.pal", D_0A000960_E66100);
 Gfx Entity_ScriptSpring_LoadTexture1[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000960_E66100),
@@ -23,8 +24,8 @@ Gfx Entity_ScriptSpring_LoadTexture1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/ScriptSpring_tex2.png.inc.c"
-#include "entity/model/ScriptSpring_tex2.pal.inc.c"
+INCLUDE_IMG("entity/model/ScriptSpring_tex2.png", D_0A000C08_E663A8);
+INCLUDE_PAL("entity/model/ScriptSpring_tex2.pal", D_0A000D08_E664A8);
 Gfx Entity_ScriptSpring_LoadTexture2[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A000D08_E664A8),
@@ -38,8 +39,8 @@ Gfx Entity_ScriptSpring_LoadTexture2[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/ScriptSpring_star.png.inc.c"
-#include "entity/model/ScriptSpring_star.pal.inc.c"
+INCLUDE_IMG("entity/model/ScriptSpring_star.png", D_0A000FB0_E66750);
+INCLUDE_PAL("entity/model/ScriptSpring_star.pal", D_0A0013B0_E66B50);
 Gfx Entity_ScriptSpring_LoadTextureStar[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0013B0_E66B50),
diff --git a/src/entity/model/ShatteringBrickBlock.c b/src/entity/model/ShatteringBrickBlock.c
index c668411e60..f577d5b14b 100644
--- a/src/entity/model/ShatteringBrickBlock.c
+++ b/src/entity/model/ShatteringBrickBlock.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/ShatteringBrickBlock.vtx.inc.c"
 
-#include "entity/model/ShatteringBrickBlock_texture.png.inc.c"
+INCLUDE_IMG("entity/model/ShatteringBrickBlock_texture.png", D_0A001AA0_E3FD00);
 Gfx D_0A0022A0_E40500[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/ShatteringHammer1Block.c b/src/entity/model/ShatteringHammer1Block.c
index b6d50f0c8a..3a082fc22c 100644
--- a/src/entity/model/ShatteringHammer1Block.c
+++ b/src/entity/model/ShatteringHammer1Block.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/ShatteringHammer1Block.vtx.inc.c"
 
-#include "entity/model/ShatteringHammer1Block_texture.png.inc.c"
-#include "entity/model/ShatteringHammer1Block_texture.pal.inc.c"
+INCLUDE_IMG("entity/model/ShatteringHammer1Block_texture.png", D_0A001060_E33480);
+INCLUDE_PAL("entity/model/ShatteringHammer1Block_texture.pal", D_0A001260_E33680);
 Gfx D_0A001460_E33880[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001260_E33680),
diff --git a/src/entity/model/ShatteringHammer2Block.c b/src/entity/model/ShatteringHammer2Block.c
index 8425540eb6..96ed1f77b1 100644
--- a/src/entity/model/ShatteringHammer2Block.c
+++ b/src/entity/model/ShatteringHammer2Block.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/ShatteringHammer2Block.vtx.inc.c"
 
-#include "entity/model/ShatteringHammer2Block_texture.png.inc.c"
+INCLUDE_IMG("entity/model/ShatteringHammer2Block_texture.png", D_0A001060_E366D0);
 Gfx D_0A001460_E36AD0[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/ShatteringHammer3Block.c b/src/entity/model/ShatteringHammer3Block.c
index e1cce7a800..5a0b3e0744 100644
--- a/src/entity/model/ShatteringHammer3Block.c
+++ b/src/entity/model/ShatteringHammer3Block.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/ShatteringHammer3Block.vtx.inc.c"
 
-#include "entity/model/ShatteringHammer3Block_texture.png.inc.c"
-#include "entity/model/ShatteringHammer3Block_texture.pal.inc.c"
+INCLUDE_IMG("entity/model/ShatteringHammer3Block_texture.png", D_0A001050_E398E0);
+INCLUDE_PAL("entity/model/ShatteringHammer3Block_texture.pal", D_0A001150_E399E0);
 Gfx D_0A001170_E39A00[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A001150_E399E0),
diff --git a/src/entity/model/Signpost.c b/src/entity/model/Signpost.c
index 636d816fad..5b4b2fa830 100644
--- a/src/entity/model/Signpost.c
+++ b/src/entity/model/Signpost.c
@@ -1,10 +1,11 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Signpost_1.vtx.inc.c"
 #include "entity/model/Signpost_2.vtx.inc.c"
 
-#include "entity/model/Signpost.png.inc.c"
-#include "entity/model/Signpost.pal.inc.c"
+INCLUDE_IMG("entity/model/Signpost.png", D_0A000580_E59A00);
+INCLUDE_PAL("entity/model/Signpost.pal", D_0A000780_E59C00);
 Gfx Entity_Signpost_LoadTexture[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/SimpleSpring_gfx.c b/src/entity/model/SimpleSpring_gfx.c
index 4b0aec5267..182ca07725 100644
--- a/src/entity/model/SimpleSpring_gfx.c
+++ b/src/entity/model/SimpleSpring_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/SimpleSpring_1.vtx.inc.c"
 #include "entity/model/SimpleSpring_2.vtx.inc.c"
@@ -7,8 +8,8 @@
 #include "entity/model/SimpleSpring_5.vtx.inc.c"
 #include "entity/model/SimpleSpring_6.vtx.inc.c"
 
-#include "entity/model/SimpleSpring_tex1.png.inc.c"
-#include "entity/model/SimpleSpring_tex1.pal.inc.c"
+INCLUDE_IMG("entity/model/SimpleSpring_tex1.png", D_0A0007E0_E68D60);
+INCLUDE_PAL("entity/model/SimpleSpring_tex1.pal", D_0A0008E0_E68E60);
 Gfx Entity_SimpleSpring_LoadTexture1[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A0008E0_E68E60),
@@ -22,7 +23,7 @@ Gfx Entity_SimpleSpring_LoadTexture1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/SimpleSpring_tex2.png.inc.c"
+INCLUDE_IMG("entity/model/SimpleSpring_tex2.png", D_0A000B88_E69108);
 Gfx Entity_SimpleSpring_LoadTexture2[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -35,8 +36,8 @@ Gfx Entity_SimpleSpring_LoadTexture2[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/SimpleSpring_star.png.inc.c"
-#include "entity/model/SimpleSpring_star.pal.inc.c"
+INCLUDE_IMG("entity/model/SimpleSpring_star.png", D_0A000E00_E69380);
+INCLUDE_PAL("entity/model/SimpleSpring_star.pal", D_0A001200_E69780);
 Gfx Entity_SimpleSpring_LoadTextureStar[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal256(D_0A001200_E69780),
diff --git a/src/entity/model/SpinningFlower.c b/src/entity/model/SpinningFlower.c
index a7d1d72f92..ac22f60e8e 100644
--- a/src/entity/model/SpinningFlower.c
+++ b/src/entity/model/SpinningFlower.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/SpinningFlower_1.vtx.inc.c"
 #include "entity/model/SpinningFlower_2.vtx.inc.c"
 #include "entity/model/SpinningFlower_3.vtx.inc.c"
 #include "entity/model/SpinningFlower_4.vtx.inc.c"
 
-#include "entity/model/SpinningFlower_img1.png.inc.c"
+INCLUDE_IMG("entity/model/SpinningFlower_img1.png", D_0A000180_E9CA80);
 Gfx D_0A000280_E9CB80[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -18,7 +19,7 @@ Gfx D_0A000280_E9CB80[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/SpinningFlower_petal.png.inc.c"
+INCLUDE_IMG("entity/model/SpinningFlower_petal.png", D_0A0002F8_E9CBF8);
 Gfx D_0A000AF8_E9D3F8[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/entity/model/StarBoxLauncher.c b/src/entity/model/StarBoxLauncher.c
index ef50d8bcb1..5f57029733 100644
--- a/src/entity/model/StarBoxLauncher.c
+++ b/src/entity/model/StarBoxLauncher.c
@@ -1,11 +1,12 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/StarBoxLauncher_1.vtx.inc.c"
 #include "entity/model/StarBoxLauncher_2.vtx.inc.c"
 #include "entity/model/StarBoxLauncher_3.vtx.inc.c"
 #include "entity/model/StarBoxLauncher_4.vtx.inc.c"
 
-#include "entity/model/StarBoxLauncher_link.png.inc.c"
+INCLUDE_IMG("entity/model/StarBoxLauncher_link.png", D_0A000290_E55CD0);
 Gfx Entity_StarBoxLauncher_LoadTextureLink[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -18,8 +19,8 @@ Gfx Entity_StarBoxLauncher_LoadTextureLink[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/StarBoxLauncher_face.png.inc.c"
-#include "entity/model/StarBoxLauncher_face.pal.inc.c"
+INCLUDE_IMG("entity/model/StarBoxLauncher_face.png", D_0A000508_E55F48);
+INCLUDE_PAL("entity/model/StarBoxLauncher_face.pal", D_0A000D08_E56748);
 Gfx Entity_StarBoxLauncher_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000D08_E56748),
@@ -33,8 +34,8 @@ Gfx Entity_StarBoxLauncher_LoadTextureFace[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/StarBoxLauncher_box.png.inc.c"
-#include "entity/model/StarBoxLauncher_box.pal.inc.c"
+INCLUDE_IMG("entity/model/StarBoxLauncher_box.png", D_0A000DD0_E56810);
+INCLUDE_PAL("entity/model/StarBoxLauncher_box.pal", D_0A000ED0_E56910);
 Gfx Entity_StarBoxLauncher_LoadTextureBox[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000ED0_E56910),
diff --git a/src/entity/model/SuperBlock.c b/src/entity/model/SuperBlock.c
index 13e814501d..cb5be6fba2 100644
--- a/src/entity/model/SuperBlock.c
+++ b/src/entity/model/SuperBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/SuperBlock.vtx.inc.c"
 
-#include "entity/model/SuperBlock_tex.png.inc.c"
-#include "entity/model/SuperBlock_tex.pal.inc.c"
+INCLUDE_IMG("entity/model/SuperBlock_tex.png", D_0A000480_E44C80);
+INCLUDE_PAL("entity/model/SuperBlock_tex.pal", D_0A000580_E44D80);
 Gfx Entity_SuperBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000580_E44D80),
diff --git a/src/entity/model/SuperBlockContent.c b/src/entity/model/SuperBlockContent.c
index f709622dd7..0c4baca732 100644
--- a/src/entity/model/SuperBlockContent.c
+++ b/src/entity/model/SuperBlockContent.c
@@ -1,10 +1,11 @@
 #include "common.h"
+#include "include_asset.h"
 
-#include "entity/model/SuperBlockContent.png.inc.c"
-#include "entity/model/SuperBlockContent.pal.inc.c"
-#include "entity/model/SuperBlockContent.pal2.pal.inc.c"
-#include "entity/model/SuperBlockContent.pal3.pal.inc.c"
-#include "entity/model/SuperBlockContent.pal4.pal.inc.c"
+INCLUDE_IMG("entity/model/SuperBlockContent.png", D_0A000000_E4A6A0);
+INCLUDE_PAL("entity/model/SuperBlockContent.pal", D_0A000200_E4A8A0);
+INCLUDE_PAL("entity/model/SuperBlockContent.pal2.pal", D_0A000220_E4A8C0);
+INCLUDE_PAL("entity/model/SuperBlockContent.pal3.pal", D_0A000240_E4A8E0);
+INCLUDE_PAL("entity/model/SuperBlockContent.pal4.pal", D_0A000260_E4A900);
 
 Vtx Entity_SuperBlockContent_vtx[] = {
     {{{    13,    13,     0 }, 0, {     0,     0 }, { 255, 255, 255, 255 }}},
diff --git a/src/entity/model/TrumpetPlant_gfx.c b/src/entity/model/TrumpetPlant_gfx.c
index 3c1e6e86fb..12e578311d 100644
--- a/src/entity/model/TrumpetPlant_gfx.c
+++ b/src/entity/model/TrumpetPlant_gfx.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 extern unsigned char D_0A000D40_E6E0D0[];
 
@@ -113,4 +114,4 @@ Gfx Entity_TrumpetPlant_RenderNode1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/TrumpetPlant.png.inc.c"
+INCLUDE_IMG("entity/model/TrumpetPlant.png", D_0A000D40_E6E0D0);
diff --git a/src/entity/model/Tweester.c b/src/entity/model/Tweester.c
index 8a4163c0d3..5ecd3c340a 100644
--- a/src/entity/model/Tweester.c
+++ b/src/entity/model/Tweester.c
@@ -1,12 +1,13 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/Tweester_1.vtx.inc.c"
 #include "entity/model/Tweester_2.vtx.inc.c"
 #include "entity/model/Tweester_3.vtx.inc.c"
 #include "entity/model/Tweester_4.vtx.inc.c"
 
-#include "entity/model/Tweester_img1.png.inc.c"
-#include "entity/model/Tweester_img2.png.inc.c"
+INCLUDE_IMG("entity/model/Tweester_img1.png", D_0A000BF0_E57A50);
+INCLUDE_IMG("entity/model/Tweester_img2.png", D_0A000FF0_E57E50);
 Gfx Entity_Tweester_LoadTextures[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@@ -32,8 +33,8 @@ Gfx Entity_Tweester_LoadTextures[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/Tweester_img3.png.inc.c"
-#include "entity/model/Tweester_img3.pal.inc.c"
+INCLUDE_IMG("entity/model/Tweester_img3.png", D_0A0014A0_E58300);
+INCLUDE_PAL("entity/model/Tweester_img3.pal", D_0A0018A0_E58700);
 Gfx Entity_Tweester_LoadTextureFace[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A0018A0_E58700),
diff --git a/src/entity/model/UltraBlock.c b/src/entity/model/UltraBlock.c
index b4bab0e053..b3e6eb89d0 100644
--- a/src/entity/model/UltraBlock.c
+++ b/src/entity/model/UltraBlock.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/UltraBlock.vtx.inc.c"
 
-#include "entity/model/UltraBlock_tex.png.inc.c"
-#include "entity/model/UltraBlock_tex.pal.inc.c"
+INCLUDE_IMG("entity/model/UltraBlock_tex.png", D_0A000480_E45590);
+INCLUDE_PAL("entity/model/UltraBlock_tex.pal", D_0A000580_E45690);
 Gfx Entity_UltraBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A000580_E45690),
diff --git a/src/entity/model/UnusedBlock.c b/src/entity/model/UnusedBlock.c
index dea2430165..fd799bd598 100644
--- a/src/entity/model/UnusedBlock.c
+++ b/src/entity/model/UnusedBlock.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/UnusedBlock.vtx.inc.c"
 
-#include "entity/model/UnusedBlock_img1.png.inc.c"
+INCLUDE_IMG("entity/model/UnusedBlock_img1.png", D_0A0003C0_E3D190);
 Gfx D_0A0007C0_E3D590[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
@@ -17,8 +18,8 @@ Gfx D_0A0007C0_E3D590[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/UnusedBlock_img2.png.inc.c"
-#include "entity/model/UnusedBlock_img2.pal.inc.c"
+INCLUDE_IMG("entity/model/UnusedBlock_img2.png", D_0A000848_E3D618);
+INCLUDE_PAL("entity/model/UnusedBlock_img2.pal", D_0A000948_E3D718);
 Gfx D_0A000968_E3D738[] = {
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
     gsDPPipeSync(),
diff --git a/src/entity/model/WoodenCrate.c b/src/entity/model/WoodenCrate.c
index 58c93dfa3b..c7cd351b7f 100644
--- a/src/entity/model/WoodenCrate.c
+++ b/src/entity/model/WoodenCrate.c
@@ -1,9 +1,10 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/WoodenCrate.vtx.inc.c"
 
-#include "entity/model/WoodenCrate_img1.png.inc.c"
-#include "entity/model/WoodenCrate_img1.pal.inc.c"
+INCLUDE_IMG("entity/model/WoodenCrate_img1.png", D_0A001560_E52BA0);
+INCLUDE_PAL("entity/model/WoodenCrate_img1.pal", D_0A001D60_E533A0);
 Gfx Entity_WoodenCrate_LoadTexture1[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A001D60_E533A0),
@@ -17,8 +18,8 @@ Gfx Entity_WoodenCrate_LoadTexture1[] = {
     gsSPEndDisplayList(),
 };
 
-#include "entity/model/WoodenCrate_img2.png.inc.c"
-#include "entity/model/WoodenCrate_img2.pal.inc.c"
+INCLUDE_IMG("entity/model/WoodenCrate_img2.png", D_0A001E28_E53468);
+INCLUDE_PAL("entity/model/WoodenCrate_img2.pal", D_0A002628_E53C68);
 Gfx Entity_WoodenCrate_LoadTexture2[] = {
     gsDPSetTextureLUT(G_TT_RGBA16),
     gsDPLoadTLUT_pal16(0, D_0A002628_E53C68),
diff --git a/src/entity/model/YellowBlock.c b/src/entity/model/YellowBlock.c
index 08de503ec3..799a3095ab 100644
--- a/src/entity/model/YellowBlock.c
+++ b/src/entity/model/YellowBlock.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
 #include "entity/model/YellowBlock.vtx.inc.c"
 
-#include "entity/model/YellowBlock_face.png.inc.c"
+INCLUDE_IMG("entity/model/YellowBlock_face.png", D_0A000180_E3B9F0);
 Gfx Entity_YellowBlock_LoadTexture[] = {
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
diff --git a/src/filemenu/filemenu_gfx.c b/src/filemenu/filemenu_gfx.c
index a423540b49..151101e9ff 100644
--- a/src/filemenu/filemenu_gfx.c
+++ b/src/filemenu/filemenu_gfx.c
@@ -1,8 +1,9 @@
 #include "common.h"
+#include "include_asset.h"
 
-#include "filemenu/copyarrow.png.inc.c"
-#include "filemenu/corners_yellow.png.inc.c"
-#include "filemenu/corners_gray.png.inc.c"
+INCLUDE_IMG("filemenu/copyarrow.png", D_8024A200);
+INCLUDE_IMG("filemenu/corners_yellow.png", D_8024A400);
+INCLUDE_IMG("filemenu/corners_gray.png", D_8024B400);
 
 Gfx filemenu_dl_copyarrow[] = {
     gsDPPipeSync(),
diff --git a/src/global_hud_scripts.c b/src/global_hud_scripts.c
index 6599c766f6..b22a8d44c2 100644
--- a/src/global_hud_scripts.c
+++ b/src/global_hud_scripts.c
@@ -1,722 +1,724 @@
 #include "common.h"
 #include "hud_element.h"
 #include "sparkle_script.h"
+#include "include_asset.h"
+#include "include_asset.h"
 
-#include "ui/input/a_button_unpressed.png.inc.c"
-#include "ui/input/a_button_unpressed.pal.inc.c"
+INCLUDE_IMG("ui/input/a_button_unpressed.png", ui_input_a_button_unpressed_png);
+INCLUDE_PAL("ui/input/a_button_unpressed.pal", ui_input_a_button_unpressed_pal);
 
-#include "ui/input/a_button_pressed.png.inc.c"
-#include "ui/input/a_button_pressed.pal.inc.c"
+INCLUDE_IMG("ui/input/a_button_pressed.png", ui_input_a_button_pressed_png);
+INCLUDE_PAL("ui/input/a_button_pressed.pal", ui_input_a_button_pressed_pal);
 
-#include "ui/input/analog_stick.png.inc.c"
-#include "ui/input/analog_stick.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick.png", ui_input_analog_stick_png);
+INCLUDE_PAL("ui/input/analog_stick.pal", ui_input_analog_stick_pal);
 
-#include "ui/input/analog_stick_left.png.inc.c"
-#include "ui/input/analog_stick_left.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick_left.png", ui_input_analog_stick_left_png);
+INCLUDE_PAL("ui/input/analog_stick_left.pal", ui_input_analog_stick_left_pal);
 
-#include "ui/input/analog_stick2.png.inc.c"
-#include "ui/input/analog_stick2.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick2.png", ui_input_analog_stick2_png);
+INCLUDE_PAL("ui/input/analog_stick2.pal", ui_input_analog_stick2_pal);
 
-#include "ui/input/analog_stick_right.png.inc.c"
-#include "ui/input/analog_stick_right.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick_right.png", ui_input_analog_stick_right_png);
+INCLUDE_PAL("ui/input/analog_stick_right.pal", ui_input_analog_stick_right_pal);
 
-#include "ui/input/analog_stick3.png.inc.c"
-#include "ui/input/analog_stick3.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick3.png", ui_input_analog_stick3_png);
+INCLUDE_PAL("ui/input/analog_stick3.pal", ui_input_analog_stick3_pal);
 
-#include "ui/input/analog_stick_down.png.inc.c"
-#include "ui/input/analog_stick_down.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick_down.png", ui_input_analog_stick_down_png);
+INCLUDE_PAL("ui/input/analog_stick_down.pal", ui_input_analog_stick_down_pal);
 
-#include "ui/input/analog_stick_up.png.inc.c"
-#include "ui/input/analog_stick_up.pal.inc.c"
+INCLUDE_IMG("ui/input/analog_stick_up.png", ui_input_analog_stick_up_png);
+INCLUDE_PAL("ui/input/analog_stick_up.pal", ui_input_analog_stick_up_pal);
 
-#include "ui/unk_bar.png.inc.c"
-#include "ui/unk_bar.pal.inc.c"
+INCLUDE_IMG("ui/unk_bar.png", ui_unk_bar_png);
+INCLUDE_PAL("ui/unk_bar.pal", ui_unk_bar_pal);
 
-#include "ui/ok.png.inc.c"
-#include "ui/ok.pal.inc.c"
+INCLUDE_IMG("ui/ok.png", ui_ok_png);
+INCLUDE_PAL("ui/ok.pal", ui_ok_pal);
 
-#include "ui/input/start_button.png.inc.c"
-#include "ui/input/start_button.pal.inc.c"
+INCLUDE_IMG("ui/input/start_button.png", ui_input_start_button_png);
+INCLUDE_PAL("ui/input/start_button.pal", ui_input_start_button_pal);
 
-#include "ui/input/start_button2.png.inc.c"
-#include "ui/input/start_button2.pal.inc.c"
+INCLUDE_IMG("ui/input/start_button2.png", ui_input_start_button2_png);
+INCLUDE_PAL("ui/input/start_button2.pal", ui_input_start_button2_pal);
 
-#include "ui/input/start_text.png.inc.c"
-#include "ui/input/start_text.pal.inc.c"
+INCLUDE_IMG("ui/input/start_text.png", ui_input_start_text_png);
+INCLUDE_PAL("ui/input/start_text.pal", ui_input_start_text_pal);
 
-#include "ui/hammer.png.inc.c"
-#include "ui/hammer.pal.inc.c"
+INCLUDE_IMG("ui/hammer.png", ui_hammer_png);
+INCLUDE_PAL("ui/hammer.pal", ui_hammer_pal);
 #define ui_hammer_disabled_png ui_hammer_png
-#include "ui/hammer.disabled.pal.inc.c"
+INCLUDE_PAL("ui/hammer.disabled.pal", ui_hammer_disabled_pal);
 
-#include "ui/super_hammer.png.inc.c"
-#include "ui/super_hammer.pal.inc.c"
+INCLUDE_IMG("ui/super_hammer.png", ui_super_hammer_png);
+INCLUDE_PAL("ui/super_hammer.pal", ui_super_hammer_pal);
 #define ui_super_hammer_disabled_png ui_super_hammer_png
-#include "ui/super_hammer.disabled.pal.inc.c"
+INCLUDE_PAL("ui/super_hammer.disabled.pal", ui_super_hammer_disabled_pal);
 
-#include "ui/ultra_hammer.png.inc.c"
-#include "ui/ultra_hammer.pal.inc.c"
+INCLUDE_IMG("ui/ultra_hammer.png", ui_ultra_hammer_png);
+INCLUDE_PAL("ui/ultra_hammer.pal", ui_ultra_hammer_pal);
 #define ui_ultra_hammer_disabled_png ui_ultra_hammer_png
-#include "ui/ultra_hammer.disabled.pal.inc.c"
+INCLUDE_PAL("ui/ultra_hammer.disabled.pal", ui_ultra_hammer_disabled_pal);
 
-#include "ui/boots.png.inc.c"
-#include "ui/boots.pal.inc.c"
+INCLUDE_IMG("ui/boots.png", ui_boots_png);
+INCLUDE_PAL("ui/boots.pal", ui_boots_pal);
 #define ui_boots_disabled_png ui_boots_png
-#include "ui/boots.disabled.pal.inc.c"
+INCLUDE_PAL("ui/boots.disabled.pal", ui_boots_disabled_pal);
 
-#include "ui/super_boots.png.inc.c"
-#include "ui/super_boots.pal.inc.c"
+INCLUDE_IMG("ui/super_boots.png", ui_super_boots_png);
+INCLUDE_PAL("ui/super_boots.pal", ui_super_boots_pal);
 #define ui_super_boots_disabled_png ui_super_boots_png
-#include "ui/super_boots.disabled.pal.inc.c"
+INCLUDE_PAL("ui/super_boots.disabled.pal", ui_super_boots_disabled_pal);
 
-#include "ui/ultra_boots.png.inc.c"
-#include "ui/ultra_boots.pal.inc.c"
+INCLUDE_IMG("ui/ultra_boots.png", ui_ultra_boots_png);
+INCLUDE_PAL("ui/ultra_boots.pal", ui_ultra_boots_pal);
 #define ui_ultra_boots_disabled_png ui_ultra_boots_png
-#include "ui/ultra_boots.disabled.pal.inc.c"
+INCLUDE_PAL("ui/ultra_boots.disabled.pal", ui_ultra_boots_disabled_pal);
 
-#include "ui/item.png.inc.c"
-#include "ui/item.pal.inc.c"
+INCLUDE_IMG("ui/item.png", ui_item_png);
+INCLUDE_PAL("ui/item.pal", ui_item_pal);
 #define ui_item_disabled_png ui_item_png
-#include "ui/item.disabled.pal.inc.c"
+INCLUDE_PAL("ui/item.disabled.pal", ui_item_disabled_pal);
 
-#include "ui/star_spirit.png.inc.c"
-#include "ui/star_spirit.pal.inc.c"
+INCLUDE_IMG("ui/star_spirit.png", ui_star_spirit_png);
+INCLUDE_PAL("ui/star_spirit.pal", ui_star_spirit_pal);
 #define ui_star_spirit_disabled_png ui_star_spirit_png
-#include "ui/star_spirit.disabled.pal.inc.c"
+INCLUDE_PAL("ui/star_spirit.disabled.pal", ui_star_spirit_disabled_pal);
 
-#include "ui/arrow_left.png.inc.c"
-#include "ui/arrow_left.pal.inc.c"
+INCLUDE_IMG("ui/arrow_left.png", ui_arrow_left_png);
+INCLUDE_PAL("ui/arrow_left.pal", ui_arrow_left_pal);
 
-#include "ui/arrow_right.png.inc.c"
-#include "ui/arrow_right.pal.inc.c"
+INCLUDE_IMG("ui/arrow_right.png", ui_arrow_right_png);
+INCLUDE_PAL("ui/arrow_right.pal", ui_arrow_right_pal);
 
-#include "ui/point_right.png.inc.c"
-#include "ui/point_right.pal.inc.c"
+INCLUDE_IMG("ui/point_right.png", ui_point_right_png);
+INCLUDE_PAL("ui/point_right.pal", ui_point_right_pal);
 
-#include "ui/pip.png.inc.c"
-#include "ui/pip.pal.inc.c"
+INCLUDE_IMG("ui/pip.png", ui_pip_png);
+INCLUDE_PAL("ui/pip.pal", ui_pip_pal);
 
-#include "ui/pip2.png.inc.c"
-#include "ui/pip2.pal.inc.c"
+INCLUDE_IMG("ui/pip2.png", ui_pip2_png);
+INCLUDE_PAL("ui/pip2.pal", ui_pip2_pal);
 
-#include "ui/coin_sparkle_0.png.inc.c"
-#include "ui/coin_sparkle_0.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_0.png", ui_coin_sparkle_0_png);
+INCLUDE_PAL("ui/coin_sparkle_0.pal", ui_coin_sparkle_0_pal);
 
-#include "ui/coin_sparkle_1.png.inc.c"
-#include "ui/coin_sparkle_1.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_1.png", ui_coin_sparkle_1_png);
+INCLUDE_PAL("ui/coin_sparkle_1.pal", ui_coin_sparkle_1_pal);
 
-#include "ui/coin_sparkle_2.png.inc.c"
-#include "ui/coin_sparkle_2.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_2.png", ui_coin_sparkle_2_png);
+INCLUDE_PAL("ui/coin_sparkle_2.pal", ui_coin_sparkle_2_pal);
 
-#include "ui/coin_sparkle_3.png.inc.c"
-#include "ui/coin_sparkle_3.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_3.png", ui_coin_sparkle_3_png);
+INCLUDE_PAL("ui/coin_sparkle_3.pal", ui_coin_sparkle_3_pal);
 
-#include "ui/coin_sparkle_4.png.inc.c"
-#include "ui/coin_sparkle_4.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_4.png", ui_coin_sparkle_4_png);
+INCLUDE_PAL("ui/coin_sparkle_4.pal", ui_coin_sparkle_4_pal);
 
-#include "ui/coin_sparkle_5.png.inc.c"
-#include "ui/coin_sparkle_5.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_5.png", ui_coin_sparkle_5_png);
+INCLUDE_PAL("ui/coin_sparkle_5.pal", ui_coin_sparkle_5_pal);
 
-#include "ui/coin_sparkle_none.png.inc.c"
-#include "ui/coin_sparkle_none.pal.inc.c"
+INCLUDE_IMG("ui/coin_sparkle_none.png", ui_coin_sparkle_none_png);
+INCLUDE_PAL("ui/coin_sparkle_none.pal", ui_coin_sparkle_none_pal);
 
-#include "ui/status/star_point_shine.png.inc.c"
+INCLUDE_IMG("ui/status/star_point_shine.png", ui_status_star_point_shine_png);
 
-#include "ui/status/star_piece_0.png.inc.c"
-#include "ui/status/star_piece_0.pal.inc.c"
+INCLUDE_IMG("ui/status/star_piece_0.png", ui_status_star_piece_0_png);
+INCLUDE_PAL("ui/status/star_piece_0.pal", ui_status_star_piece_0_pal);
 
-#include "ui/status/star_piece_1.png.inc.c"
-#include "ui/status/star_piece_1.pal.inc.c"
+INCLUDE_IMG("ui/status/star_piece_1.png", ui_status_star_piece_1_png);
+INCLUDE_PAL("ui/status/star_piece_1.pal", ui_status_star_piece_1_pal);
 
-#include "ui/status/star_piece_2.png.inc.c"
-#include "ui/status/star_piece_2.pal.inc.c"
+INCLUDE_IMG("ui/status/star_piece_2.png", ui_status_star_piece_2_png);
+INCLUDE_PAL("ui/status/star_piece_2.pal", ui_status_star_piece_2_pal);
 
-#include "ui/menu_times.png.inc.c"
-#include "ui/menu_times.pal.inc.c"
+INCLUDE_IMG("ui/menu_times.png", ui_menu_times_png);
+INCLUDE_PAL("ui/menu_times.pal", ui_menu_times_pal);
 
-#include "ui/fp_cost.png.inc.c"
-#include "ui/fp_cost.pal.inc.c"
+INCLUDE_IMG("ui/fp_cost.png", ui_fp_cost_png);
+INCLUDE_PAL("ui/fp_cost.pal", ui_fp_cost_pal);
 #define ui_fp_cost_reduced_png ui_fp_cost_png
-#include "ui/fp_cost.reduced.pal.inc.c"
+INCLUDE_PAL("ui/fp_cost.reduced.pal", ui_fp_cost_reduced_pal);
 #define ui_fp_cost_reduced_twice_png ui_fp_cost_png
-#include "ui/fp_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("ui/fp_cost.reduced_twice.pal", ui_fp_cost_reduced_twice_pal);
 #define ui_fp_cost_notenough_png ui_fp_cost_png
-#include "ui/fp_cost.notenough.pal.inc.c"
+INCLUDE_PAL("ui/fp_cost.notenough.pal", ui_fp_cost_notenough_pal);
 
-#include "ui/pow_cost.png.inc.c"
-#include "ui/pow_cost.pal.inc.c"
+INCLUDE_IMG("ui/pow_cost.png", ui_pow_cost_png);
+INCLUDE_PAL("ui/pow_cost.pal", ui_pow_cost_pal);
 #define ui_pow_cost_reduced_png ui_pow_cost_png
-#include "ui/pow_cost.reduced.pal.inc.c"
+INCLUDE_PAL("ui/pow_cost.reduced.pal", ui_pow_cost_reduced_pal);
 #define ui_pow_cost_reduced_twice_png ui_pow_cost_png
-#include "ui/pow_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("ui/pow_cost.reduced_twice.pal", ui_pow_cost_reduced_twice_pal);
 #define ui_pow_cost_notenough_png ui_pow_cost_png
-#include "ui/pow_cost.notenough.pal.inc.c"
+INCLUDE_PAL("ui/pow_cost.notenough.pal", ui_pow_cost_notenough_pal);
 
 #if VERSION_PAL
-#include "de/ui/fp_cost.png.inc.c"
-#include "de/ui/fp_cost.pal.inc.c"
+INCLUDE_IMG("de/ui/fp_cost.png", ui_fp_cost_de_png);
+INCLUDE_PAL("de/ui/fp_cost.pal", ui_fp_cost_de_pal);
 #define ui_fp_cost_de_reduced_png ui_fp_cost_de_png
-#include "de/ui/fp_cost.reduced.pal.inc.c"
+INCLUDE_PAL("de/ui/fp_cost.reduced.pal", ui_fp_cost_de_reduced_pal);
 #define ui_fp_cost_de_reduced_twice_png ui_fp_cost_de_png
-#include "de/ui/fp_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("de/ui/fp_cost.reduced_twice.pal", ui_fp_cost_de_reduced_twice_pal);
 #define ui_fp_cost_de_notenough_png ui_fp_cost_de_png
-#include "de/ui/fp_cost.notenough.pal.inc.c"
+INCLUDE_PAL("de/ui/fp_cost.notenough.pal", ui_fp_cost_de_notenough_pal);
 
-#include "de/ui/pow_cost.png.inc.c"
-#include "de/ui/pow_cost.pal.inc.c"
+INCLUDE_IMG("de/ui/pow_cost.png", ui_pow_cost_de_png);
+INCLUDE_PAL("de/ui/pow_cost.pal", ui_pow_cost_de_pal);
 #define ui_pow_cost_de_reduced_png ui_pow_cost_de_png
-#include "de/ui/pow_cost.reduced.pal.inc.c"
+INCLUDE_PAL("de/ui/pow_cost.reduced.pal", ui_pow_cost_de_reduced_pal);
 #define ui_pow_cost_de_reduced_twice_png ui_pow_cost_de_png
-#include "de/ui/pow_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("de/ui/pow_cost.reduced_twice.pal", ui_pow_cost_de_reduced_twice_pal);
 #define ui_pow_cost_de_notenough_png ui_pow_cost_de_png
-#include "de/ui/pow_cost.notenough.pal.inc.c"
+INCLUDE_PAL("de/ui/pow_cost.notenough.pal", ui_pow_cost_de_notenough_pal);
 
-#include "fr/ui/fp_cost.png.inc.c"
-#include "fr/ui/fp_cost.pal.inc.c"
+INCLUDE_IMG("fr/ui/fp_cost.png", ui_fp_cost_fr_png);
+INCLUDE_PAL("fr/ui/fp_cost.pal", ui_fp_cost_fr_pal);
 #define ui_fp_cost_fr_reduced_png ui_fp_cost_fr_png
-#include "fr/ui/fp_cost.reduced.pal.inc.c"
+INCLUDE_PAL("fr/ui/fp_cost.reduced.pal", ui_fp_cost_fr_reduced_pal);
 #define ui_fp_cost_fr_reduced_twice_png ui_fp_cost_fr_png
-#include "fr/ui/fp_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("fr/ui/fp_cost.reduced_twice.pal", ui_fp_cost_fr_reduced_twice_pal);
 #define ui_fp_cost_fr_notenough_png ui_fp_cost_fr_png
-#include "fr/ui/fp_cost.notenough.pal.inc.c"
+INCLUDE_PAL("fr/ui/fp_cost.notenough.pal", ui_fp_cost_fr_notenough_pal);
 
-#include "fr/ui/pow_cost.png.inc.c"
-#include "fr/ui/pow_cost.pal.inc.c"
+INCLUDE_IMG("fr/ui/pow_cost.png", ui_pow_cost_fr_png);
+INCLUDE_PAL("fr/ui/pow_cost.pal", ui_pow_cost_fr_pal);
 #define ui_pow_cost_fr_reduced_png ui_pow_cost_fr_png
-#include "fr/ui/pow_cost.reduced.pal.inc.c"
+INCLUDE_PAL("fr/ui/pow_cost.reduced.pal", ui_pow_cost_fr_reduced_pal);
 #define ui_pow_cost_fr_reduced_twice_png ui_pow_cost_fr_png
-#include "fr/ui/pow_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("fr/ui/pow_cost.reduced_twice.pal", ui_pow_cost_fr_reduced_twice_pal);
 #define ui_pow_cost_fr_notenough_png ui_pow_cost_fr_png
-#include "fr/ui/pow_cost.notenough.pal.inc.c"
+INCLUDE_PAL("fr/ui/pow_cost.notenough.pal", ui_pow_cost_fr_notenough_pal);
 
-#include "es/ui/fp_cost.png.inc.c"
-#include "es/ui/fp_cost.pal.inc.c"
+INCLUDE_IMG("es/ui/fp_cost.png", ui_fp_cost_es_png);
+INCLUDE_PAL("es/ui/fp_cost.pal", ui_fp_cost_es_pal);
 #define ui_fp_cost_es_reduced_png ui_fp_cost_es_png
-#include "es/ui/fp_cost.reduced.pal.inc.c"
+INCLUDE_PAL("es/ui/fp_cost.reduced.pal", ui_fp_cost_es_reduced_pal);
 #define ui_fp_cost_es_reduced_twice_png ui_fp_cost_es_png
-#include "es/ui/fp_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("es/ui/fp_cost.reduced_twice.pal", ui_fp_cost_es_reduced_twice_pal);
 #define ui_fp_cost_es_notenough_png ui_fp_cost_es_png
-#include "es/ui/fp_cost.notenough.pal.inc.c"
+INCLUDE_PAL("es/ui/fp_cost.notenough.pal", ui_fp_cost_es_notenough_pal);
 
-#include "es/ui/pow_cost.png.inc.c"
-#include "es/ui/pow_cost.pal.inc.c"
+INCLUDE_IMG("es/ui/pow_cost.png", ui_pow_cost_es_png);
+INCLUDE_PAL("es/ui/pow_cost.pal", ui_pow_cost_es_pal);
 #define ui_pow_cost_es_reduced_png ui_pow_cost_es_png
-#include "es/ui/pow_cost.reduced.pal.inc.c"
+INCLUDE_PAL("es/ui/pow_cost.reduced.pal", ui_pow_cost_es_reduced_pal);
 #define ui_pow_cost_es_reduced_twice_png ui_pow_cost_es_png
-#include "es/ui/pow_cost.reduced_twice.pal.inc.c"
+INCLUDE_PAL("es/ui/pow_cost.reduced_twice.pal", ui_pow_cost_es_reduced_twice_pal);
 #define ui_pow_cost_es_notenough_png ui_pow_cost_es_png
-#include "es/ui/pow_cost.notenough.pal.inc.c"
+INCLUDE_PAL("es/ui/pow_cost.notenough.pal", ui_pow_cost_es_notenough_pal);
 #endif
 
-#include "ui/green_arrow_down.png.inc.c"
-#include "ui/green_arrow_down.pal.inc.c"
+INCLUDE_IMG("ui/green_arrow_down.png", ui_green_arrow_down_png);
+INCLUDE_PAL("ui/green_arrow_down.pal", ui_green_arrow_down_pal);
 
-#include "ui/green_arrow_up.png.inc.c"
-#include "ui/green_arrow_up.pal.inc.c"
+INCLUDE_IMG("ui/green_arrow_up.png", ui_green_arrow_up_png);
+INCLUDE_PAL("ui/green_arrow_up.pal", ui_green_arrow_up_pal);
 
-#include "ui/kaime.png.inc.c"
-#include "ui/kaime.pal.inc.c"
+INCLUDE_IMG("ui/kaime.png", ui_kaime_png);
+INCLUDE_PAL("ui/kaime.pal", ui_kaime_pal);
 
-#include "ui/unused_1.png.inc.c"
-#include "ui/unused_1.pal.inc.c"
+INCLUDE_IMG("ui/unused_1.png", ui_unused_1_png);
+INCLUDE_PAL("ui/unused_1.pal", ui_unused_1_pal);
 
-#include "ui/unused_2.png.inc.c"
-#include "ui/unused_2.pal.inc.c"
+INCLUDE_IMG("ui/unused_2.png", ui_unused_2_png);
+INCLUDE_PAL("ui/unused_2.pal", ui_unused_2_pal);
 
-#include "ui/unused_3.png.inc.c"
-#include "ui/unused_3.pal.inc.c"
+INCLUDE_IMG("ui/unused_3.png", ui_unused_3_png);
+INCLUDE_PAL("ui/unused_3.pal", ui_unused_3_pal);
 
-#include "ui/red_bar1.png.inc.c"
-#include "ui/red_bar1.pal.inc.c"
+INCLUDE_IMG("ui/red_bar1.png", ui_red_bar1_png);
+INCLUDE_PAL("ui/red_bar1.pal", ui_red_bar1_pal);
 
-#include "ui/empty_bar.png.inc.c"
-#include "ui/empty_bar.pal.inc.c"
+INCLUDE_IMG("ui/empty_bar.png", ui_empty_bar_png);
+INCLUDE_PAL("ui/empty_bar.pal", ui_empty_bar_pal);
 
-#include "ui/red_bar2.png.inc.c"
-#include "ui/red_bar2.pal.inc.c"
+INCLUDE_IMG("ui/red_bar2.png", ui_red_bar2_png);
+INCLUDE_PAL("ui/red_bar2.pal", ui_red_bar2_pal);
 
-#include "ui/eldstar.png.inc.c"
-#include "ui/eldstar.pal.inc.c"
+INCLUDE_IMG("ui/eldstar.png", ui_eldstar_png);
+INCLUDE_PAL("ui/eldstar.pal", ui_eldstar_pal);
 #define ui_eldstar_disabled_png ui_eldstar_png
-#include "ui/eldstar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/eldstar.disabled.pal", ui_eldstar_disabled_pal);
 
-#include "ui/mamar.png.inc.c"
-#include "ui/mamar.pal.inc.c"
+INCLUDE_IMG("ui/mamar.png", ui_mamar_png);
+INCLUDE_PAL("ui/mamar.pal", ui_mamar_pal);
 #define ui_mamar_disabled_png ui_mamar_png
-#include "ui/mamar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/mamar.disabled.pal", ui_mamar_disabled_pal);
 
-#include "ui/skolar.png.inc.c"
-#include "ui/skolar.pal.inc.c"
+INCLUDE_IMG("ui/skolar.png", ui_skolar_png);
+INCLUDE_PAL("ui/skolar.pal", ui_skolar_pal);
 #define ui_skolar_disabled_png ui_skolar_png
-#include "ui/skolar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/skolar.disabled.pal", ui_skolar_disabled_pal);
 
-#include "ui/muskular.png.inc.c"
-#include "ui/muskular.pal.inc.c"
+INCLUDE_IMG("ui/muskular.png", ui_muskular_png);
+INCLUDE_PAL("ui/muskular.pal", ui_muskular_pal);
 #define ui_muskular_disabled_png ui_muskular_png
-#include "ui/muskular.disabled.pal.inc.c"
+INCLUDE_PAL("ui/muskular.disabled.pal", ui_muskular_disabled_pal);
 
-#include "ui/misstar.png.inc.c"
-#include "ui/misstar.pal.inc.c"
+INCLUDE_IMG("ui/misstar.png", ui_misstar_png);
+INCLUDE_PAL("ui/misstar.pal", ui_misstar_pal);
 #define ui_misstar_disabled_png ui_misstar_png
-#include "ui/misstar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/misstar.disabled.pal", ui_misstar_disabled_pal);
 
-#include "ui/klevar.png.inc.c"
-#include "ui/klevar.pal.inc.c"
+INCLUDE_IMG("ui/klevar.png", ui_klevar_png);
+INCLUDE_PAL("ui/klevar.pal", ui_klevar_pal);
 #define ui_klevar_disabled_png ui_klevar_png
-#include "ui/klevar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/klevar.disabled.pal", ui_klevar_disabled_pal);
 
-#include "ui/kalmar.png.inc.c"
-#include "ui/kalmar.pal.inc.c"
+INCLUDE_IMG("ui/kalmar.png", ui_kalmar_png);
+INCLUDE_PAL("ui/kalmar.pal", ui_kalmar_pal);
 #define ui_kalmar_disabled_png ui_kalmar_png
-#include "ui/kalmar.disabled.pal.inc.c"
+INCLUDE_PAL("ui/kalmar.disabled.pal", ui_kalmar_disabled_pal);
 
-#include "ui/star_beam.png.inc.c"
-#include "ui/star_beam.pal.inc.c"
+INCLUDE_IMG("ui/star_beam.png", ui_star_beam_png);
+INCLUDE_PAL("ui/star_beam.pal", ui_star_beam_pal);
 #define ui_star_beam_disabled_png ui_star_beam_png
-#include "ui/star_beam.disabled.pal.inc.c"
+INCLUDE_PAL("ui/star_beam.disabled.pal", ui_star_beam_disabled_pal);
 
-#include "ui/peach_beam.png.inc.c"
-#include "ui/peach_beam.pal.inc.c"
+INCLUDE_IMG("ui/peach_beam.png", ui_peach_beam_png);
+INCLUDE_PAL("ui/peach_beam.pal", ui_peach_beam_pal);
 #define ui_peach_beam_disabled_png ui_peach_beam_png
-#include "ui/peach_beam.disabled.pal.inc.c"
+INCLUDE_PAL("ui/peach_beam.disabled.pal", ui_peach_beam_disabled_pal);
 
-#include "ui/mario_head.png.inc.c"
-#include "ui/mario_head.pal.inc.c"
+INCLUDE_IMG("ui/mario_head.png", ui_mario_head_png);
+INCLUDE_PAL("ui/mario_head.pal", ui_mario_head_pal);
 
-#include "ui/partner0.png.inc.c"
-#include "ui/partner0.pal.inc.c"
+INCLUDE_IMG("ui/partner0.png", ui_partner0_png);
+INCLUDE_PAL("ui/partner0.pal", ui_partner0_pal);
 #define ui_partner0_disabled_png ui_partner0_png
-#include "ui/partner0.disabled.pal.inc.c"
+INCLUDE_PAL("ui/partner0.disabled.pal", ui_partner0_disabled_pal);
 
-#include "ui/goombario.png.inc.c"
-#include "ui/goombario.pal.inc.c"
+INCLUDE_IMG("ui/goombario.png", ui_goombario_png);
+INCLUDE_PAL("ui/goombario.pal", ui_goombario_pal);
 #define ui_goombario_disabled_png ui_goombario_png
-#include "ui/goombario.disabled.pal.inc.c"
+INCLUDE_PAL("ui/goombario.disabled.pal", ui_goombario_disabled_pal);
 
-#include "ui/kooper.png.inc.c"
-#include "ui/kooper.pal.inc.c"
+INCLUDE_IMG("ui/kooper.png", ui_kooper_png);
+INCLUDE_PAL("ui/kooper.pal", ui_kooper_pal);
 #define ui_kooper_disabled_png ui_kooper_png
-#include "ui/kooper.disabled.pal.inc.c"
+INCLUDE_PAL("ui/kooper.disabled.pal", ui_kooper_disabled_pal);
 
-#include "ui/bombette.png.inc.c"
-#include "ui/bombette.pal.inc.c"
+INCLUDE_IMG("ui/bombette.png", ui_bombette_png);
+INCLUDE_PAL("ui/bombette.pal", ui_bombette_pal);
 #define ui_bombette_disabled_png ui_bombette_png
-#include "ui/bombette.disabled.pal.inc.c"
+INCLUDE_PAL("ui/bombette.disabled.pal", ui_bombette_disabled_pal);
 
-#include "ui/parakarry.png.inc.c"
-#include "ui/parakarry.pal.inc.c"
+INCLUDE_IMG("ui/parakarry.png", ui_parakarry_png);
+INCLUDE_PAL("ui/parakarry.pal", ui_parakarry_pal);
 #define ui_parakarry_disabled_png ui_parakarry_png
-#include "ui/parakarry.disabled.pal.inc.c"
+INCLUDE_PAL("ui/parakarry.disabled.pal", ui_parakarry_disabled_pal);
 
-#include "ui/bow.png.inc.c"
-#include "ui/bow.pal.inc.c"
+INCLUDE_IMG("ui/bow.png", ui_bow_png);
+INCLUDE_PAL("ui/bow.pal", ui_bow_pal);
 #define ui_bow_disabled_png ui_bow_png
-#include "ui/bow.disabled.pal.inc.c"
+INCLUDE_PAL("ui/bow.disabled.pal", ui_bow_disabled_pal);
 
-#include "ui/watt.png.inc.c"
-#include "ui/watt.pal.inc.c"
+INCLUDE_IMG("ui/watt.png", ui_watt_png);
+INCLUDE_PAL("ui/watt.pal", ui_watt_pal);
 #define ui_watt_disabled_png ui_watt_png
-#include "ui/watt.disabled.pal.inc.c"
+INCLUDE_PAL("ui/watt.disabled.pal", ui_watt_disabled_pal);
 
-#include "ui/sushie.png.inc.c"
-#include "ui/sushie.pal.inc.c"
+INCLUDE_IMG("ui/sushie.png", ui_sushie_png);
+INCLUDE_PAL("ui/sushie.pal", ui_sushie_pal);
 #define ui_sushie_disabled_png ui_sushie_png
-#include "ui/sushie.disabled.pal.inc.c"
+INCLUDE_PAL("ui/sushie.disabled.pal", ui_sushie_disabled_pal);
 
-#include "ui/lakilester.png.inc.c"
-#include "ui/lakilester.pal.inc.c"
+INCLUDE_IMG("ui/lakilester.png", ui_lakilester_png);
+INCLUDE_PAL("ui/lakilester.pal", ui_lakilester_pal);
 #define ui_lakilester_disabled_png ui_lakilester_png
-#include "ui/lakilester.disabled.pal.inc.c"
+INCLUDE_PAL("ui/lakilester.disabled.pal", ui_lakilester_disabled_pal);
 
-#include "ui/partner9.png.inc.c"
-#include "ui/partner9.pal.inc.c"
+INCLUDE_IMG("ui/partner9.png", ui_partner9_png);
+INCLUDE_PAL("ui/partner9.pal", ui_partner9_pal);
 #define ui_partner9_disabled_png ui_partner9_png
-#include "ui/partner9.disabled.pal.inc.c"
+INCLUDE_PAL("ui/partner9.disabled.pal", ui_partner9_disabled_pal);
 
-#include "ui/partner10.png.inc.c"
-#include "ui/partner10.pal.inc.c"
+INCLUDE_IMG("ui/partner10.png", ui_partner10_png);
+INCLUDE_PAL("ui/partner10.pal", ui_partner10_pal);
 #define ui_partner10_disabled_png ui_partner10_png
-#include "ui/partner10.disabled.pal.inc.c"
+INCLUDE_PAL("ui/partner10.disabled.pal", ui_partner10_disabled_pal);
 
-#include "ui/partner11.png.inc.c"
-#include "ui/partner11.pal.inc.c"
+INCLUDE_IMG("ui/partner11.png", ui_partner11_png);
+INCLUDE_PAL("ui/partner11.pal", ui_partner11_pal);
 #define ui_partner11_disabled_png ui_partner11_png
-#include "ui/partner11.disabled.pal.inc.c"
+INCLUDE_PAL("ui/partner11.disabled.pal", ui_partner11_disabled_pal);
 
-#include "ui/status/text_times.png.inc.c"
-#include "ui/status/text_times.pal.inc.c"
+INCLUDE_IMG("ui/status/text_times.png", ui_status_text_times_png);
+INCLUDE_PAL("ui/status/text_times.pal", ui_status_text_times_pal);
 
-#include "ui/status/text_slash.png.inc.c"
-#include "ui/status/text_slash.pal.inc.c"
+INCLUDE_IMG("ui/status/text_slash.png", ui_status_text_slash_png);
+INCLUDE_PAL("ui/status/text_slash.pal", ui_status_text_slash_pal);
 
-#include "ui/status/text_0.png.inc.c"
-#include "ui/status/text_0.pal.inc.c"
+INCLUDE_IMG("ui/status/text_0.png", ui_status_text_0_png);
+INCLUDE_PAL("ui/status/text_0.pal", ui_status_text_0_pal);
 
-#include "ui/status/text_1.png.inc.c"
-#include "ui/status/text_1.pal.inc.c"
+INCLUDE_IMG("ui/status/text_1.png", ui_status_text_1_png);
+INCLUDE_PAL("ui/status/text_1.pal", ui_status_text_1_pal);
 
-#include "ui/status/text_2.png.inc.c"
-#include "ui/status/text_2.pal.inc.c"
+INCLUDE_IMG("ui/status/text_2.png", ui_status_text_2_png);
+INCLUDE_PAL("ui/status/text_2.pal", ui_status_text_2_pal);
 
-#include "ui/status/text_3.png.inc.c"
-#include "ui/status/text_3.pal.inc.c"
+INCLUDE_IMG("ui/status/text_3.png", ui_status_text_3_png);
+INCLUDE_PAL("ui/status/text_3.pal", ui_status_text_3_pal);
 
-#include "ui/status/text_4.png.inc.c"
-#include "ui/status/text_4.pal.inc.c"
+INCLUDE_IMG("ui/status/text_4.png", ui_status_text_4_png);
+INCLUDE_PAL("ui/status/text_4.pal", ui_status_text_4_pal);
 
-#include "ui/status/text_5.png.inc.c"
-#include "ui/status/text_5.pal.inc.c"
+INCLUDE_IMG("ui/status/text_5.png", ui_status_text_5_png);
+INCLUDE_PAL("ui/status/text_5.pal", ui_status_text_5_pal);
 
-#include "ui/status/text_6.png.inc.c"
-#include "ui/status/text_6.pal.inc.c"
+INCLUDE_IMG("ui/status/text_6.png", ui_status_text_6_png);
+INCLUDE_PAL("ui/status/text_6.pal", ui_status_text_6_pal);
 
-#include "ui/status/text_7.png.inc.c"
-#include "ui/status/text_7.pal.inc.c"
+INCLUDE_IMG("ui/status/text_7.png", ui_status_text_7_png);
+INCLUDE_PAL("ui/status/text_7.pal", ui_status_text_7_pal);
 
-#include "ui/status/text_8.png.inc.c"
-#include "ui/status/text_8.pal.inc.c"
+INCLUDE_IMG("ui/status/text_8.png", ui_status_text_8_png);
+INCLUDE_PAL("ui/status/text_8.pal", ui_status_text_8_pal);
 
-#include "ui/status/text_9.png.inc.c"
-#include "ui/status/text_9.pal.inc.c"
+INCLUDE_IMG("ui/status/text_9.png", ui_status_text_9_png);
+INCLUDE_PAL("ui/status/text_9.pal", ui_status_text_9_pal);
 
-#include "ui/status/text_hp.png.inc.c"
-#include "ui/status/text_hp.pal.inc.c"
+INCLUDE_IMG("ui/status/text_hp.png", ui_status_text_hp_png);
+INCLUDE_PAL("ui/status/text_hp.pal", ui_status_text_hp_pal);
 
-#include "ui/status/text_fp.png.inc.c"
-#include "ui/status/text_fp.pal.inc.c"
+INCLUDE_IMG("ui/status/text_fp.png", ui_status_text_fp_png);
+INCLUDE_PAL("ui/status/text_fp.pal", ui_status_text_fp_pal);
 
 #if VERSION_PAL
-#include "de/ui/status/text_hp.png.inc.c"
-#include "de/ui/status/text_hp.pal.inc.c"
+INCLUDE_IMG("de/ui/status/text_hp.png", ui_status_text_hp_de_png);
+INCLUDE_PAL("de/ui/status/text_hp.pal", ui_status_text_hp_de_pal);
 
-#include "de/ui/status/text_fp.png.inc.c"
-#include "de/ui/status/text_fp.pal.inc.c"
+INCLUDE_IMG("de/ui/status/text_fp.png", ui_status_text_fp_de_png);
+INCLUDE_PAL("de/ui/status/text_fp.pal", ui_status_text_fp_de_pal);
 
-#include "fr/ui/status/text_hp.png.inc.c"
-#include "fr/ui/status/text_hp.pal.inc.c"
+INCLUDE_IMG("fr/ui/status/text_hp.png", ui_status_text_hp_fr_png);
+INCLUDE_PAL("fr/ui/status/text_hp.pal", ui_status_text_hp_fr_pal);
 
-#include "fr/ui/status/text_fp.png.inc.c"
-#include "fr/ui/status/text_fp.pal.inc.c"
+INCLUDE_IMG("fr/ui/status/text_fp.png", ui_status_text_fp_fr_png);
+INCLUDE_PAL("fr/ui/status/text_fp.pal", ui_status_text_fp_fr_pal);
 
-#include "es/ui/status/text_hp.png.inc.c"
-#include "es/ui/status/text_hp.pal.inc.c"
+INCLUDE_IMG("es/ui/status/text_hp.png", ui_status_text_hp_es_png);
+INCLUDE_PAL("es/ui/status/text_hp.pal", ui_status_text_hp_es_pal);
 
-#include "es/ui/status/text_fp.png.inc.c"
-#include "es/ui/status/text_fp.pal.inc.c"
+INCLUDE_IMG("es/ui/status/text_fp.png", ui_status_text_fp_es_png);
+INCLUDE_PAL("es/ui/status/text_fp.pal", ui_status_text_fp_es_pal);
 #endif
 
-#include "ui/status/pow_unit_1.png.inc.c"
-#include "ui/status/pow_unit_1.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_1.png", ui_status_pow_unit_1_png);
+INCLUDE_PAL("ui/status/pow_unit_1.pal", ui_status_pow_unit_1_pal);
 
-#include "ui/status/pow_unit_2.png.inc.c"
-#include "ui/status/pow_unit_2.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_2.png", ui_status_pow_unit_2_png);
+INCLUDE_PAL("ui/status/pow_unit_2.pal", ui_status_pow_unit_2_pal);
 
-#include "ui/status/pow_unit_3.png.inc.c"
-#include "ui/status/pow_unit_3.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_3.png", ui_status_pow_unit_3_png);
+INCLUDE_PAL("ui/status/pow_unit_3.pal", ui_status_pow_unit_3_pal);
 
-#include "ui/status/pow_unit_4.png.inc.c"
-#include "ui/status/pow_unit_4.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_4.png", ui_status_pow_unit_4_png);
+INCLUDE_PAL("ui/status/pow_unit_4.pal", ui_status_pow_unit_4_pal);
 
-#include "ui/status/pow_unit_5.png.inc.c"
-#include "ui/status/pow_unit_5.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_5.png", ui_status_pow_unit_5_png);
+INCLUDE_PAL("ui/status/pow_unit_5.pal", ui_status_pow_unit_5_pal);
 
-#include "ui/status/pow_unit_6.png.inc.c"
-#include "ui/status/pow_unit_6.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_6.png", ui_status_pow_unit_6_png);
+INCLUDE_PAL("ui/status/pow_unit_6.pal", ui_status_pow_unit_6_pal);
 
-#include "ui/status/pow_unit_7.png.inc.c"
-#include "ui/status/pow_unit_7.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_7.png", ui_status_pow_unit_7_png);
+INCLUDE_PAL("ui/status/pow_unit_7.pal", ui_status_pow_unit_7_pal);
 
-#include "ui/status/pow_unit_empty.png.inc.c"
-#include "ui/status/pow_unit_empty.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_unit_empty.png", ui_status_pow_unit_empty_png);
+INCLUDE_PAL("ui/status/pow_unit_empty.pal", ui_status_pow_unit_empty_pal);
 
-#include "ui/status/pow_star_1.png.inc.c"
-#include "ui/status/pow_star_1.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_1.png", ui_status_pow_star_1_png);
+INCLUDE_PAL("ui/status/pow_star_1.pal", ui_status_pow_star_1_pal);
 
-#include "ui/status/pow_star_2.png.inc.c"
-#include "ui/status/pow_star_2.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_2.png", ui_status_pow_star_2_png);
+INCLUDE_PAL("ui/status/pow_star_2.pal", ui_status_pow_star_2_pal);
 
-#include "ui/status/pow_star_3.png.inc.c"
-#include "ui/status/pow_star_3.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_3.png", ui_status_pow_star_3_png);
+INCLUDE_PAL("ui/status/pow_star_3.pal", ui_status_pow_star_3_pal);
 
-#include "ui/status/pow_star_4.png.inc.c"
-#include "ui/status/pow_star_4.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_4.png", ui_status_pow_star_4_png);
+INCLUDE_PAL("ui/status/pow_star_4.pal", ui_status_pow_star_4_pal);
 
-#include "ui/status/pow_star_5.png.inc.c"
-#include "ui/status/pow_star_5.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_5.png", ui_status_pow_star_5_png);
+INCLUDE_PAL("ui/status/pow_star_5.pal", ui_status_pow_star_5_pal);
 
-#include "ui/status/pow_star_6.png.inc.c"
-#include "ui/status/pow_star_6.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_6.png", ui_status_pow_star_6_png);
+INCLUDE_PAL("ui/status/pow_star_6.pal", ui_status_pow_star_6_pal);
 
-#include "ui/status/pow_star_7.png.inc.c"
-#include "ui/status/pow_star_7.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_7.png", ui_status_pow_star_7_png);
+INCLUDE_PAL("ui/status/pow_star_7.pal", ui_status_pow_star_7_pal);
 
-#include "ui/status/pow_star_empty.png.inc.c"
-#include "ui/status/pow_star_empty.pal.inc.c"
+INCLUDE_IMG("ui/status/pow_star_empty.png", ui_status_pow_star_empty_png);
+INCLUDE_PAL("ui/status/pow_star_empty.pal", ui_status_pow_star_empty_pal);
 
-#include "ui/status/coin_0.png.inc.c"
-#include "ui/status/coin_0.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_0.png", ui_status_coin_0_png);
+INCLUDE_PAL("ui/status/coin_0.pal", ui_status_coin_0_pal);
 
-#include "ui/status/coin_1.png.inc.c"
-#include "ui/status/coin_1.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_1.png", ui_status_coin_1_png);
+INCLUDE_PAL("ui/status/coin_1.pal", ui_status_coin_1_pal);
 
-#include "ui/status/coin_2.png.inc.c"
-#include "ui/status/coin_2.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_2.png", ui_status_coin_2_png);
+INCLUDE_PAL("ui/status/coin_2.pal", ui_status_coin_2_pal);
 
-#include "ui/status/coin_3.png.inc.c"
-#include "ui/status/coin_3.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_3.png", ui_status_coin_3_png);
+INCLUDE_PAL("ui/status/coin_3.pal", ui_status_coin_3_pal);
 
-#include "ui/status/coin_4.png.inc.c"
-#include "ui/status/coin_4.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_4.png", ui_status_coin_4_png);
+INCLUDE_PAL("ui/status/coin_4.pal", ui_status_coin_4_pal);
 
-#include "ui/status/coin_5.png.inc.c"
-#include "ui/status/coin_5.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_5.png", ui_status_coin_5_png);
+INCLUDE_PAL("ui/status/coin_5.pal", ui_status_coin_5_pal);
 
-#include "ui/status/coin_6.png.inc.c"
-#include "ui/status/coin_6.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_6.png", ui_status_coin_6_png);
+INCLUDE_PAL("ui/status/coin_6.pal", ui_status_coin_6_pal);
 
-#include "ui/status/coin_7.png.inc.c"
-#include "ui/status/coin_7.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_7.png", ui_status_coin_7_png);
+INCLUDE_PAL("ui/status/coin_7.pal", ui_status_coin_7_pal);
 
-#include "ui/status/coin_8.png.inc.c"
-#include "ui/status/coin_8.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_8.png", ui_status_coin_8_png);
+INCLUDE_PAL("ui/status/coin_8.pal", ui_status_coin_8_pal);
 
-#include "ui/status/coin_9.png.inc.c"
-#include "ui/status/coin_9.pal.inc.c"
+INCLUDE_IMG("ui/status/coin_9.png", ui_status_coin_9_png);
+INCLUDE_PAL("ui/status/coin_9.pal", ui_status_coin_9_pal);
 
-#include "ui/status/star_point_0.png.inc.c"
-#include "ui/status/star_point_0.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_0.png", ui_status_star_point_0_png);
+INCLUDE_PAL("ui/status/star_point_0.pal", ui_status_star_point_0_pal);
 
-#include "ui/status/star_point_1.png.inc.c"
-#include "ui/status/star_point_1.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_1.png", ui_status_star_point_1_png);
+INCLUDE_PAL("ui/status/star_point_1.pal", ui_status_star_point_1_pal);
 
-#include "ui/status/star_point_2.png.inc.c"
-#include "ui/status/star_point_2.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_2.png", ui_status_star_point_2_png);
+INCLUDE_PAL("ui/status/star_point_2.pal", ui_status_star_point_2_pal);
 
-#include "ui/status/star_point_3.png.inc.c"
-#include "ui/status/star_point_3.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_3.png", ui_status_star_point_3_png);
+INCLUDE_PAL("ui/status/star_point_3.pal", ui_status_star_point_3_pal);
 
-#include "ui/status/star_point_4.png.inc.c"
-#include "ui/status/star_point_4.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_4.png", ui_status_star_point_4_png);
+INCLUDE_PAL("ui/status/star_point_4.pal", ui_status_star_point_4_pal);
 
-#include "ui/status/star_point_5.png.inc.c"
-#include "ui/status/star_point_5.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_5.png", ui_status_star_point_5_png);
+INCLUDE_PAL("ui/status/star_point_5.pal", ui_status_star_point_5_pal);
 
-#include "ui/status/star_point_6.png.inc.c"
-#include "ui/status/star_point_6.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_6.png", ui_status_star_point_6_png);
+INCLUDE_PAL("ui/status/star_point_6.pal", ui_status_star_point_6_pal);
 
-#include "ui/status/star_point_7.png.inc.c"
-#include "ui/status/star_point_7.pal.inc.c"
+INCLUDE_IMG("ui/status/star_point_7.png", ui_status_star_point_7_png);
+INCLUDE_PAL("ui/status/star_point_7.pal", ui_status_star_point_7_pal);
 
-#include "ui/bluepip.png.inc.c"
-#include "ui/bluepip.pal.inc.c"
+INCLUDE_IMG("ui/bluepip.png", ui_bluepip_png);
+INCLUDE_PAL("ui/bluepip.pal", ui_bluepip_pal);
 
-#include "ui/bluepip2.png.inc.c"
-#include "ui/bluepip2.pal.inc.c"
+INCLUDE_IMG("ui/bluepip2.png", ui_bluepip2_png);
+INCLUDE_PAL("ui/bluepip2.pal", ui_bluepip2_pal);
 
-#include "ui/battle/status/charge_jump.png.inc.c"
-#include "ui/battle/status/charge_jump.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/charge_jump.png", ui_battle_status_charge_jump_png);
+INCLUDE_PAL("ui/battle/status/charge_jump.pal", ui_battle_status_charge_jump_pal);
 
-#include "ui/battle/status/charge_hammer.png.inc.c"
-#include "ui/battle/status/charge_hammer.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/charge_hammer.png", ui_battle_status_charge_hammer_png);
+INCLUDE_PAL("ui/battle/status/charge_hammer.pal", ui_battle_status_charge_hammer_pal);
 
-#include "ui/battle/status/charge_goombario.png.inc.c"
-#include "ui/battle/status/charge_goombario.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/charge_goombario.png", ui_battle_status_charge_goombario_png);
+INCLUDE_PAL("ui/battle/status/charge_goombario.pal", ui_battle_status_charge_goombario_pal);
 
-#include "ui/battle/status/exclamation.png.inc.c"
-#include "ui/battle/status/exclamation.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/exclamation.png", ui_battle_status_exclamation_png);
+INCLUDE_PAL("ui/battle/status/exclamation.pal", ui_battle_status_exclamation_pal);
 
-#include "ui/battle/status/sleep_0.png.inc.c"
-#include "ui/battle/status/sleep_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/sleep_0.png", ui_battle_status_sleep_0_png);
+INCLUDE_PAL("ui/battle/status/sleep_0.pal", ui_battle_status_sleep_0_pal);
 
-#include "ui/battle/status/sleep_1.png.inc.c"
-#include "ui/battle/status/sleep_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/sleep_1.png", ui_battle_status_sleep_1_png);
+INCLUDE_PAL("ui/battle/status/sleep_1.pal", ui_battle_status_sleep_1_pal);
 
-#include "ui/battle/status/sleep_2.png.inc.c"
-#include "ui/battle/status/sleep_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/sleep_2.png", ui_battle_status_sleep_2_png);
+INCLUDE_PAL("ui/battle/status/sleep_2.pal", ui_battle_status_sleep_2_pal);
 
-#include "ui/battle/status/static_0.png.inc.c"
-#include "ui/battle/status/static_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/static_0.png", ui_battle_status_static_0_png);
+INCLUDE_PAL("ui/battle/status/static_0.pal", ui_battle_status_static_0_pal);
 
-#include "ui/battle/status/static_1.png.inc.c"
-#include "ui/battle/status/static_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/static_1.png", ui_battle_status_static_1_png);
+INCLUDE_PAL("ui/battle/status/static_1.pal", ui_battle_status_static_1_pal);
 
-#include "ui/battle/status/paralyze_0.png.inc.c"
-#include "ui/battle/status/paralyze_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/paralyze_0.png", ui_battle_status_paralyze_0_png);
+INCLUDE_PAL("ui/battle/status/paralyze_0.pal", ui_battle_status_paralyze_0_pal);
 
-#include "ui/battle/status/paralyze_1.png.inc.c"
-#include "ui/battle/status/paralyze_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/paralyze_1.png", ui_battle_status_paralyze_1_png);
+INCLUDE_PAL("ui/battle/status/paralyze_1.pal", ui_battle_status_paralyze_1_pal);
 
-#include "ui/battle/status/dizzy_0.png.inc.c"
-#include "ui/battle/status/dizzy_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/dizzy_0.png", ui_battle_status_dizzy_0_png);
+INCLUDE_PAL("ui/battle/status/dizzy_0.pal", ui_battle_status_dizzy_0_pal);
 
-#include "ui/battle/status/dizzy_1.png.inc.c"
-#include "ui/battle/status/dizzy_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/dizzy_1.png", ui_battle_status_dizzy_1_png);
+INCLUDE_PAL("ui/battle/status/dizzy_1.pal", ui_battle_status_dizzy_1_pal);
 
-#include "ui/battle/status/dizzy_2.png.inc.c"
-#include "ui/battle/status/dizzy_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/dizzy_2.png", ui_battle_status_dizzy_2_png);
+INCLUDE_PAL("ui/battle/status/dizzy_2.pal", ui_battle_status_dizzy_2_pal);
 
-#include "ui/battle/status/dizzy_3.png.inc.c"
-#include "ui/battle/status/dizzy_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/dizzy_3.png", ui_battle_status_dizzy_3_png);
+INCLUDE_PAL("ui/battle/status/dizzy_3.pal", ui_battle_status_dizzy_3_pal);
 
-#include "ui/battle/status/poison_0.png.inc.c"
-#include "ui/battle/status/poison_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/poison_0.png", ui_battle_status_poison_0_png);
+INCLUDE_PAL("ui/battle/status/poison_0.pal", ui_battle_status_poison_0_pal);
 
-#include "ui/battle/status/poison_1.png.inc.c"
-#include "ui/battle/status/poison_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/poison_1.png", ui_battle_status_poison_1_png);
+INCLUDE_PAL("ui/battle/status/poison_1.pal", ui_battle_status_poison_1_pal);
 
-#include "ui/battle/status/frozen_0.png.inc.c"
-#include "ui/battle/status/frozen_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/frozen_0.png", ui_battle_status_frozen_0_png);
+INCLUDE_PAL("ui/battle/status/frozen_0.pal", ui_battle_status_frozen_0_pal);
 
-#include "ui/battle/status/frozen_1.png.inc.c"
-#include "ui/battle/status/frozen_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/frozen_1.png", ui_battle_status_frozen_1_png);
+INCLUDE_PAL("ui/battle/status/frozen_1.pal", ui_battle_status_frozen_1_pal);
 
-#include "ui/battle/status/frozen_2.png.inc.c"
-#include "ui/battle/status/frozen_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/frozen_2.png", ui_battle_status_frozen_2_png);
+INCLUDE_PAL("ui/battle/status/frozen_2.pal", ui_battle_status_frozen_2_pal);
 
-#include "ui/battle/status/frozen_3.png.inc.c"
-#include "ui/battle/status/frozen_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/frozen_3.png", ui_battle_status_frozen_3_png);
+INCLUDE_PAL("ui/battle/status/frozen_3.pal", ui_battle_status_frozen_3_pal);
 
-#include "ui/battle/status/stop_0.png.inc.c"
-#include "ui/battle/status/stop_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/stop_0.png", ui_battle_status_stop_0_png);
+INCLUDE_PAL("ui/battle/status/stop_0.pal", ui_battle_status_stop_0_pal);
 
-#include "ui/battle/status/stop_1.png.inc.c"
-#include "ui/battle/status/stop_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/stop_1.png", ui_battle_status_stop_1_png);
+INCLUDE_PAL("ui/battle/status/stop_1.pal", ui_battle_status_stop_1_pal);
 
-#include "ui/battle/status/stop_2.png.inc.c"
-#include "ui/battle/status/stop_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/stop_2.png", ui_battle_status_stop_2_png);
+INCLUDE_PAL("ui/battle/status/stop_2.pal", ui_battle_status_stop_2_pal);
 
-#include "ui/battle/status/stop_3.png.inc.c"
-#include "ui/battle/status/stop_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/stop_3.png", ui_battle_status_stop_3_png);
+INCLUDE_PAL("ui/battle/status/stop_3.pal", ui_battle_status_stop_3_pal);
 
-#include "ui/battle/status/pdown_0.png.inc.c"
-#include "ui/battle/status/pdown_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/pdown_0.png", ui_battle_status_pdown_0_png);
+INCLUDE_PAL("ui/battle/status/pdown_0.pal", ui_battle_status_pdown_0_pal);
 
-#include "ui/battle/status/pdown_1.png.inc.c"
-#include "ui/battle/status/pdown_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/pdown_1.png", ui_battle_status_pdown_1_png);
+INCLUDE_PAL("ui/battle/status/pdown_1.pal", ui_battle_status_pdown_1_pal);
 
-#include "ui/battle/status/shrink_0.png.inc.c"
-#include "ui/battle/status/shrink_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/shrink_0.png", ui_battle_status_shrink_0_png);
+INCLUDE_PAL("ui/battle/status/shrink_0.pal", ui_battle_status_shrink_0_pal);
 
-#include "ui/battle/status/shrink_1.png.inc.c"
-#include "ui/battle/status/shrink_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/shrink_1.png", ui_battle_status_shrink_1_png);
+INCLUDE_PAL("ui/battle/status/shrink_1.pal", ui_battle_status_shrink_1_pal);
 
-#include "ui/battle/status/shrink_2.png.inc.c"
-#include "ui/battle/status/shrink_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/shrink_2.png", ui_battle_status_shrink_2_png);
+INCLUDE_PAL("ui/battle/status/shrink_2.pal", ui_battle_status_shrink_2_pal);
 
-#include "ui/battle/status/shrink_3.png.inc.c"
-#include "ui/battle/status/shrink_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/shrink_3.png", ui_battle_status_shrink_3_png);
+INCLUDE_PAL("ui/battle/status/shrink_3.pal", ui_battle_status_shrink_3_pal);
 
-#include "ui/battle/status/transparent_0.png.inc.c"
-#include "ui/battle/status/transparent_0.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_0.png", ui_battle_status_transparent_0_png);
+INCLUDE_PAL("ui/battle/status/transparent_0.pal", ui_battle_status_transparent_0_pal);
 
-#include "ui/battle/status/transparent_1.png.inc.c"
-#include "ui/battle/status/transparent_1.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_1.png", ui_battle_status_transparent_1_png);
+INCLUDE_PAL("ui/battle/status/transparent_1.pal", ui_battle_status_transparent_1_pal);
 
-#include "ui/battle/status/transparent_2.png.inc.c"
-#include "ui/battle/status/transparent_2.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_2.png", ui_battle_status_transparent_2_png);
+INCLUDE_PAL("ui/battle/status/transparent_2.pal", ui_battle_status_transparent_2_pal);
 
-#include "ui/battle/status/transparent_3.png.inc.c"
-#include "ui/battle/status/transparent_3.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_3.png", ui_battle_status_transparent_3_png);
+INCLUDE_PAL("ui/battle/status/transparent_3.pal", ui_battle_status_transparent_3_pal);
 
-#include "ui/battle/status/transparent_4.png.inc.c"
-#include "ui/battle/status/transparent_4.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_4.png", ui_battle_status_transparent_4_png);
+INCLUDE_PAL("ui/battle/status/transparent_4.pal", ui_battle_status_transparent_4_pal);
 
-#include "ui/battle/status/transparent_5.png.inc.c"
-#include "ui/battle/status/transparent_5.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/transparent_5.png", ui_battle_status_transparent_5_png);
+INCLUDE_PAL("ui/battle/status/transparent_5.pal", ui_battle_status_transparent_5_pal);
 
-#include "ui/battle/status/peril.png.inc.c"
-#include "ui/battle/status/peril.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/peril.png", ui_battle_status_peril_png);
+INCLUDE_PAL("ui/battle/status/peril.pal", ui_battle_status_peril_pal);
 
-#include "ui/battle/status/danger.png.inc.c"
-#include "ui/battle/status/danger.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/danger.png", ui_battle_status_danger_png);
+INCLUDE_PAL("ui/battle/status/danger.pal", ui_battle_status_danger_pal);
 
-#include "ui/battle/status/refund.png.inc.c"
-#include "ui/battle/status/refund.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/refund.png", ui_battle_status_refund_png);
+INCLUDE_PAL("ui/battle/status/refund.pal", ui_battle_status_refund_pal);
 
-#include "ui/battle/status/happy.png.inc.c"
-#include "ui/battle/status/happy.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/happy.png", ui_battle_status_happy_png);
+INCLUDE_PAL("ui/battle/status/happy.pal", ui_battle_status_happy_pal);
 
-#include "ui/battle/status/hp_drain.png.inc.c"
-#include "ui/battle/status/hp_drain.pal.inc.c"
+INCLUDE_IMG("ui/battle/status/hp_drain.png", ui_battle_status_hp_drain_png);
+INCLUDE_PAL("ui/battle/status/hp_drain.pal", ui_battle_status_hp_drain_pal);
 
 #if VERSION_PAL
-#include "de/ui/battle/status/peril.png.inc.c"
-#include "de/ui/battle/status/peril.pal.inc.c"
+INCLUDE_IMG("de/ui/battle/status/peril.png", ui_battle_status_peril_de_png);
+INCLUDE_PAL("de/ui/battle/status/peril.pal", ui_battle_status_peril_de_pal);
 
-#include "de/ui/battle/status/danger.png.inc.c"
-#include "de/ui/battle/status/danger.pal.inc.c"
+INCLUDE_IMG("de/ui/battle/status/danger.png", ui_battle_status_danger_de_png);
+INCLUDE_PAL("de/ui/battle/status/danger.pal", ui_battle_status_danger_de_pal);
 
-#include "de/ui/battle/status/refund.png.inc.c"
-#include "de/ui/battle/status/refund.pal.inc.c"
+INCLUDE_IMG("de/ui/battle/status/refund.png", ui_battle_status_refund_de_png);
+INCLUDE_PAL("de/ui/battle/status/refund.pal", ui_battle_status_refund_de_pal);
 
-#include "de/ui/battle/status/happy.png.inc.c"
-#include "de/ui/battle/status/happy.pal.inc.c"
+INCLUDE_IMG("de/ui/battle/status/happy.png", ui_battle_status_happy_de_png);
+INCLUDE_PAL("de/ui/battle/status/happy.pal", ui_battle_status_happy_de_pal);
 
-#include "de/ui/battle/status/hp_drain.png.inc.c"
-#include "de/ui/battle/status/hp_drain.pal.inc.c"
+INCLUDE_IMG("de/ui/battle/status/hp_drain.png", ui_battle_status_hp_drain_de_png);
+INCLUDE_PAL("de/ui/battle/status/hp_drain.pal", ui_battle_status_hp_drain_de_pal);
 
-#include "fr/ui/battle/status/peril.png.inc.c"
-#include "fr/ui/battle/status/peril.pal.inc.c"
+INCLUDE_IMG("fr/ui/battle/status/peril.png", ui_battle_status_peril_fr_png);
+INCLUDE_PAL("fr/ui/battle/status/peril.pal", ui_battle_status_peril_fr_pal);
 
-#include "fr/ui/battle/status/danger.png.inc.c"
-#include "fr/ui/battle/status/danger.pal.inc.c"
+INCLUDE_IMG("fr/ui/battle/status/danger.png", ui_battle_status_danger_fr_png);
+INCLUDE_PAL("fr/ui/battle/status/danger.pal", ui_battle_status_danger_fr_pal);
 
-#include "fr/ui/battle/status/refund.png.inc.c"
-#include "fr/ui/battle/status/refund.pal.inc.c"
+INCLUDE_IMG("fr/ui/battle/status/refund.png", ui_battle_status_refund_fr_png);
+INCLUDE_PAL("fr/ui/battle/status/refund.pal", ui_battle_status_refund_fr_pal);
 
-#include "fr/ui/battle/status/happy.png.inc.c"
-#include "fr/ui/battle/status/happy.pal.inc.c"
+INCLUDE_IMG("fr/ui/battle/status/happy.png", ui_battle_status_happy_fr_png);
+INCLUDE_PAL("fr/ui/battle/status/happy.pal", ui_battle_status_happy_fr_pal);
 
-#include "fr/ui/battle/status/hp_drain.png.inc.c"
-#include "fr/ui/battle/status/hp_drain.pal.inc.c"
+INCLUDE_IMG("fr/ui/battle/status/hp_drain.png", ui_battle_status_hp_drain_fr_png);
+INCLUDE_PAL("fr/ui/battle/status/hp_drain.pal", ui_battle_status_hp_drain_fr_pal);
 
-#include "es/ui/battle/status/peril.png.inc.c"
-#include "es/ui/battle/status/peril.pal.inc.c"
+INCLUDE_IMG("es/ui/battle/status/peril.png", ui_battle_status_peril_es_png);
+INCLUDE_PAL("es/ui/battle/status/peril.pal", ui_battle_status_peril_es_pal);
 
-#include "es/ui/battle/status/danger.png.inc.c"
-#include "es/ui/battle/status/danger.pal.inc.c"
+INCLUDE_IMG("es/ui/battle/status/danger.png", ui_battle_status_danger_es_png);
+INCLUDE_PAL("es/ui/battle/status/danger.pal", ui_battle_status_danger_es_pal);
 
-#include "es/ui/battle/status/refund.png.inc.c"
-#include "es/ui/battle/status/refund.pal.inc.c"
+INCLUDE_IMG("es/ui/battle/status/refund.png", ui_battle_status_refund_es_png);
+INCLUDE_PAL("es/ui/battle/status/refund.pal", ui_battle_status_refund_es_pal);
 
-#include "es/ui/battle/status/happy.png.inc.c"
-#include "es/ui/battle/status/happy.pal.inc.c"
+INCLUDE_IMG("es/ui/battle/status/happy.png", ui_battle_status_happy_es_png);
+INCLUDE_PAL("es/ui/battle/status/happy.pal", ui_battle_status_happy_es_pal);
 
-#include "es/ui/battle/status/hp_drain.png.inc.c"
-#include "es/ui/battle/status/hp_drain.pal.inc.c"
+INCLUDE_IMG("es/ui/battle/status/hp_drain.png", ui_battle_status_hp_drain_es_png);
+INCLUDE_PAL("es/ui/battle/status/hp_drain.pal", ui_battle_status_hp_drain_es_pal);
 #endif
 
-#include "ui/move_basic.png.inc.c"
-#include "ui/move_basic.pal.inc.c"
+INCLUDE_IMG("ui/move_basic.png", ui_move_basic_png);
+INCLUDE_PAL("ui/move_basic.pal", ui_move_basic_pal);
 #define ui_move_basic_disabled_png ui_move_basic_png
-#include "ui/move_basic.disabled.pal.inc.c"
+INCLUDE_PAL("ui/move_basic.disabled.pal", ui_move_basic_disabled_pal);
 
-#include "ui/move_partner_1.png.inc.c"
-#include "ui/move_partner_1.pal.inc.c"
+INCLUDE_IMG("ui/move_partner_1.png", ui_move_partner_1_png);
+INCLUDE_PAL("ui/move_partner_1.pal", ui_move_partner_1_pal);
 #define ui_move_partner_1_disabled_png ui_move_partner_1_png
-#include "ui/move_partner_1.disabled.pal.inc.c"
+INCLUDE_PAL("ui/move_partner_1.disabled.pal", ui_move_partner_1_disabled_pal);
 
-#include "ui/move_partner_2.png.inc.c"
-#include "ui/move_partner_2.pal.inc.c"
+INCLUDE_IMG("ui/move_partner_2.png", ui_move_partner_2_png);
+INCLUDE_PAL("ui/move_partner_2.pal", ui_move_partner_2_pal);
 #define ui_move_partner_2_disabled_png ui_move_partner_2_png
-#include "ui/move_partner_2.disabled.pal.inc.c"
+INCLUDE_PAL("ui/move_partner_2.disabled.pal", ui_move_partner_2_disabled_pal);
 
-#include "ui/move_partner_3.png.inc.c"
-#include "ui/move_partner_3.pal.inc.c"
+INCLUDE_IMG("ui/move_partner_3.png", ui_move_partner_3_png);
+INCLUDE_PAL("ui/move_partner_3.pal", ui_move_partner_3_pal);
 #define ui_move_partner_3_disabled_png ui_move_partner_3_png
-#include "ui/move_partner_3.disabled.pal.inc.c"
+INCLUDE_PAL("ui/move_partner_3.disabled.pal", ui_move_partner_3_disabled_pal);
 
 Gfx D_801041A0[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/stat_heart.png.inc.c"
+INCLUDE_IMG("ui/stat_heart.png", ui_stat_heart_png);
 
 Gfx D_801045A8[] = {
     gsSPEndDisplayList(),
 };
 
-#include "ui/stat_flower.png.inc.c"
+INCLUDE_IMG("ui/stat_flower.png", ui_stat_flower_png);
 
 HudScript HES_ArrowLeft = HES_TEMPLATE_CI_ENUM_SIZE(ui_arrow_left, 16, 16);
 
diff --git a/src/i_spy.c b/src/i_spy.c
index b8c7afbfbe..30a19e452f 100644
--- a/src/i_spy.c
+++ b/src/i_spy.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 typedef struct ISpyNotification {
     /* 0x00 */ Vec3f pos;
@@ -19,10 +20,10 @@ enum {
 };
 
 #include "ispy_icon.png.h"
-#include "ispy_icon.png.inc.c"
-#include "ispy_icon.pal.inc.c"
-#include "ispy_icon.2.pal.inc.c"
-#include "ispy_icon.3.pal.inc.c"
+INCLUDE_IMG("ispy_icon.png", ispy_icon_img);
+INCLUDE_PAL("ispy_icon.pal", ispy_icon_1_pal);
+INCLUDE_PAL("ispy_icon.2.pal", ispy_icon_2_pal);
+INCLUDE_PAL("ispy_icon.3.pal", ispy_icon_3_pal);
 #include "ispy_icon.gfx.inc.c"
 
 BSS ISpyNotification ISpyData;
diff --git a/src/inspect_icon.c b/src/inspect_icon.c
index 96db5a64ce..9c4842e5d5 100644
--- a/src/inspect_icon.c
+++ b/src/inspect_icon.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #define NAMESPACE inspect_icon
 
@@ -25,8 +26,8 @@ enum {
 };
 
 #include "inspect_icon.png.h"
-#include "inspect_icon.png.inc.c"
-#include "inspect_icon.pal.inc.c"
+INCLUDE_IMG("inspect_icon.png", inspect_icon_img);
+INCLUDE_PAL("inspect_icon.pal", inspect_icon_pal);
 #include "inspect_icon.gfx.inc.c"
 
 BSS InspectIconData InspectIcon;
diff --git a/src/level_up.c b/src/level_up.c
index bffc0ce13d..a2174c201c 100644
--- a/src/level_up.c
+++ b/src/level_up.c
@@ -1,6 +1,7 @@
 #include "common.h"
 #include "hud_element.h"
 #include "entity.h"
+#include "include_asset.h"
 
 Lights1 level_up_lights = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
 
@@ -13,17 +14,17 @@ Lights1 level_up_lights = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
 #include "level_up/draw_U.vtx.inc.c"
 #include "level_up/draw_exclamation_mark.vtx.inc.c"
 
-#include "level_up/big_V.png.inc.c"
+INCLUDE_IMG("level_up/big_V.png", D_802A1418_79F358);
 #include "level_up/big_V.gfx.inc.c"
-#include "level_up/big_P.png.inc.c"
+INCLUDE_IMG("level_up/big_P.png", D_802A2490_7A03D0);
 #include "level_up/big_P.gfx.inc.c"
-#include "level_up/big_exclamation_mark.png.inc.c"
+INCLUDE_IMG("level_up/big_exclamation_mark.png", D_802A3508_7A1448);
 #include "level_up/big_exclamation_mark.gfx.inc.c"
-#include "level_up/big_U.png.inc.c"
+INCLUDE_IMG("level_up/big_U.png", D_802A4580_7A24C0);
 #include "level_up/big_U.gfx.inc.c"
-#include "level_up/big_L.png.inc.c"
+INCLUDE_IMG("level_up/big_L.png", D_802A55F8_7A3538);
 #include "level_up/big_L.gfx.inc.c"
-#include "level_up/big_E.png.inc.c"
+INCLUDE_IMG("level_up/big_E.png", D_802A6670_7A45B0);
 #include "level_up/big_E.gfx.inc.c"
 
 Gfx D_802A76E8_7A5628[] = {
@@ -169,155 +170,155 @@ Gfx D_802A7A88_7A59C8[] = {
     gsSPEndDisplayList(),
 };
 
-#include "level_up/heart.png.inc.c"
-#include "level_up/heart.pal.inc.c"
-#include "level_up/flower.png.inc.c"
-#include "level_up/flower.pal.inc.c"
-#include "level_up/leaves.png.inc.c"
-#include "level_up/leaves.pal.inc.c"
-#include "level_up/badge.png.inc.c"
-#include "level_up/badge.pal.inc.c"
-#include "level_up/FP.png.inc.c"
-#include "level_up/FP.pal.inc.c"
-#include "level_up/BP.png.inc.c"
-#include "level_up/BP.pal.inc.c"
-#include "level_up/HP.png.inc.c"
-#include "level_up/HP.pal.inc.c"
+INCLUDE_IMG("level_up/heart.png", level_up_heart_png);
+INCLUDE_PAL("level_up/heart.pal", level_up_heart_pal);
+INCLUDE_IMG("level_up/flower.png", level_up_flower_png);
+INCLUDE_PAL("level_up/flower.pal", level_up_flower_pal);
+INCLUDE_IMG("level_up/leaves.png", level_up_leaves_png);
+INCLUDE_PAL("level_up/leaves.pal", level_up_leaves_pal);
+INCLUDE_IMG("level_up/badge.png", level_up_badge_png);
+INCLUDE_PAL("level_up/badge.pal", level_up_badge_pal);
+INCLUDE_IMG("level_up/FP.png", level_up_FP_png);
+INCLUDE_PAL("level_up/FP.pal", level_up_FP_pal);
+INCLUDE_IMG("level_up/BP.png", level_up_BP_png);
+INCLUDE_PAL("level_up/BP.pal", level_up_BP_pal);
+INCLUDE_IMG("level_up/HP.png", level_up_HP_png);
+INCLUDE_PAL("level_up/HP.pal", level_up_HP_pal);
 
-#include "level_up/digit_0.png.inc.c"
-#include "level_up/digit_0.pal.inc.c"
-#include "level_up/digit_1.png.inc.c"
-#include "level_up/digit_1.pal.inc.c"
-#include "level_up/digit_2.png.inc.c"
-#include "level_up/digit_2.pal.inc.c"
-#include "level_up/digit_3.png.inc.c"
-#include "level_up/digit_3.pal.inc.c"
-#include "level_up/digit_4.png.inc.c"
-#include "level_up/digit_4.pal.inc.c"
-#include "level_up/digit_5.png.inc.c"
-#include "level_up/digit_5.pal.inc.c"
-#include "level_up/digit_6.png.inc.c"
-#include "level_up/digit_6.pal.inc.c"
-#include "level_up/digit_7.png.inc.c"
-#include "level_up/digit_7.pal.inc.c"
-#include "level_up/digit_8.png.inc.c"
-#include "level_up/digit_8.pal.inc.c"
-#include "level_up/digit_9.png.inc.c"
-#include "level_up/digit_9.pal.inc.c"
+INCLUDE_IMG("level_up/digit_0.png", level_up_digit_0_png);
+INCLUDE_PAL("level_up/digit_0.pal", level_up_digit_0_pal);
+INCLUDE_IMG("level_up/digit_1.png", level_up_digit_1_png);
+INCLUDE_PAL("level_up/digit_1.pal", level_up_digit_1_pal);
+INCLUDE_IMG("level_up/digit_2.png", level_up_digit_2_png);
+INCLUDE_PAL("level_up/digit_2.pal", level_up_digit_2_pal);
+INCLUDE_IMG("level_up/digit_3.png", level_up_digit_3_png);
+INCLUDE_PAL("level_up/digit_3.pal", level_up_digit_3_pal);
+INCLUDE_IMG("level_up/digit_4.png", level_up_digit_4_png);
+INCLUDE_PAL("level_up/digit_4.pal", level_up_digit_4_pal);
+INCLUDE_IMG("level_up/digit_5.png", level_up_digit_5_png);
+INCLUDE_PAL("level_up/digit_5.pal", level_up_digit_5_pal);
+INCLUDE_IMG("level_up/digit_6.png", level_up_digit_6_png);
+INCLUDE_PAL("level_up/digit_6.pal", level_up_digit_6_pal);
+INCLUDE_IMG("level_up/digit_7.png", level_up_digit_7_png);
+INCLUDE_PAL("level_up/digit_7.pal", level_up_digit_7_pal);
+INCLUDE_IMG("level_up/digit_8.png", level_up_digit_8_png);
+INCLUDE_PAL("level_up/digit_8.pal", level_up_digit_8_pal);
+INCLUDE_IMG("level_up/digit_9.png", level_up_digit_9_png);
+INCLUDE_PAL("level_up/digit_9.pal", level_up_digit_9_pal);
 
-#include "level_up/small_digit_0.png.inc.c"
-#include "level_up/small_digit_0.pal.inc.c"
-#include "level_up/small_digit_1.png.inc.c"
-#include "level_up/small_digit_1.pal.inc.c"
-#include "level_up/small_digit_2.png.inc.c"
-#include "level_up/small_digit_2.pal.inc.c"
-#include "level_up/small_digit_3.png.inc.c"
-#include "level_up/small_digit_3.pal.inc.c"
-#include "level_up/small_digit_4.png.inc.c"
-#include "level_up/small_digit_4.pal.inc.c"
-#include "level_up/small_digit_5.png.inc.c"
-#include "level_up/small_digit_5.pal.inc.c"
-#include "level_up/small_digit_6.png.inc.c"
-#include "level_up/small_digit_6.pal.inc.c"
-#include "level_up/small_digit_7.png.inc.c"
-#include "level_up/small_digit_7.pal.inc.c"
-#include "level_up/small_digit_8.png.inc.c"
-#include "level_up/small_digit_8.pal.inc.c"
-#include "level_up/small_digit_9.png.inc.c"
-#include "level_up/small_digit_9.pal.inc.c"
-#include "level_up/small_arrow.png.inc.c"
-#include "level_up/small_arrow.pal.inc.c"
+INCLUDE_IMG("level_up/small_digit_0.png", level_up_small_digit_0_png);
+INCLUDE_PAL("level_up/small_digit_0.pal", level_up_small_digit_0_pal);
+INCLUDE_IMG("level_up/small_digit_1.png", level_up_small_digit_1_png);
+INCLUDE_PAL("level_up/small_digit_1.pal", level_up_small_digit_1_pal);
+INCLUDE_IMG("level_up/small_digit_2.png", level_up_small_digit_2_png);
+INCLUDE_PAL("level_up/small_digit_2.pal", level_up_small_digit_2_pal);
+INCLUDE_IMG("level_up/small_digit_3.png", level_up_small_digit_3_png);
+INCLUDE_PAL("level_up/small_digit_3.pal", level_up_small_digit_3_pal);
+INCLUDE_IMG("level_up/small_digit_4.png", level_up_small_digit_4_png);
+INCLUDE_PAL("level_up/small_digit_4.pal", level_up_small_digit_4_pal);
+INCLUDE_IMG("level_up/small_digit_5.png", level_up_small_digit_5_png);
+INCLUDE_PAL("level_up/small_digit_5.pal", level_up_small_digit_5_pal);
+INCLUDE_IMG("level_up/small_digit_6.png", level_up_small_digit_6_png);
+INCLUDE_PAL("level_up/small_digit_6.pal", level_up_small_digit_6_pal);
+INCLUDE_IMG("level_up/small_digit_7.png", level_up_small_digit_7_png);
+INCLUDE_PAL("level_up/small_digit_7.pal", level_up_small_digit_7_pal);
+INCLUDE_IMG("level_up/small_digit_8.png", level_up_small_digit_8_png);
+INCLUDE_PAL("level_up/small_digit_8.pal", level_up_small_digit_8_pal);
+INCLUDE_IMG("level_up/small_digit_9.png", level_up_small_digit_9_png);
+INCLUDE_PAL("level_up/small_digit_9.pal", level_up_small_digit_9_pal);
+INCLUDE_IMG("level_up/small_arrow.png", level_up_small_arrow_png);
+INCLUDE_PAL("level_up/small_arrow.pal", level_up_small_arrow_pal);
 
 #define level_up_digit_0_red_png level_up_digit_0_png
-#include "level_up/digit_0.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_0.red.pal", level_up_digit_0_red_pal);
 #define level_up_digit_1_red_png level_up_digit_1_png
-#include "level_up/digit_1.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_1.red.pal", level_up_digit_1_red_pal);
 #define level_up_digit_2_red_png level_up_digit_2_png
-#include "level_up/digit_2.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_2.red.pal", level_up_digit_2_red_pal);
 #define level_up_digit_3_red_png level_up_digit_3_png
-#include "level_up/digit_3.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_3.red.pal", level_up_digit_3_red_pal);
 #define level_up_digit_4_red_png level_up_digit_4_png
-#include "level_up/digit_4.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_4.red.pal", level_up_digit_4_red_pal);
 #define level_up_digit_5_red_png level_up_digit_5_png
-#include "level_up/digit_5.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_5.red.pal", level_up_digit_5_red_pal);
 #define level_up_digit_6_red_png level_up_digit_6_png
-#include "level_up/digit_6.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_6.red.pal", level_up_digit_6_red_pal);
 #define level_up_digit_7_red_png level_up_digit_7_png
-#include "level_up/digit_7.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_7.red.pal", level_up_digit_7_red_pal);
 #define level_up_digit_8_red_png level_up_digit_8_png
-#include "level_up/digit_8.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_8.red.pal", level_up_digit_8_red_pal);
 #define level_up_digit_9_red_png level_up_digit_9_png
-#include "level_up/digit_9.red.pal.inc.c"
+INCLUDE_PAL("level_up/digit_9.red.pal", level_up_digit_9_red_pal);
 
 #define level_up_small_digit_0_red_png level_up_small_digit_0_png
-#include "level_up/small_digit_0.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_0.red.pal", level_up_small_digit_0_red_pal);
 #define level_up_small_digit_1_red_png level_up_small_digit_1_png
-#include "level_up/small_digit_1.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_1.red.pal", level_up_small_digit_1_red_pal);
 #define level_up_small_digit_2_red_png level_up_small_digit_2_png
-#include "level_up/small_digit_2.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_2.red.pal", level_up_small_digit_2_red_pal);
 #define level_up_small_digit_3_red_png level_up_small_digit_3_png
-#include "level_up/small_digit_3.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_3.red.pal", level_up_small_digit_3_red_pal);
 #define level_up_small_digit_4_red_png level_up_small_digit_4_png
-#include "level_up/small_digit_4.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_4.red.pal", level_up_small_digit_4_red_pal);
 #define level_up_small_digit_5_red_png level_up_small_digit_5_png
-#include "level_up/small_digit_5.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_5.red.pal", level_up_small_digit_5_red_pal);
 #define level_up_small_digit_6_red_png level_up_small_digit_6_png
-#include "level_up/small_digit_6.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_6.red.pal", level_up_small_digit_6_red_pal);
 #define level_up_small_digit_7_red_png level_up_small_digit_7_png
-#include "level_up/small_digit_7.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_7.red.pal", level_up_small_digit_7_red_pal);
 #define level_up_small_digit_8_red_png level_up_small_digit_8_png
-#include "level_up/small_digit_8.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_8.red.pal", level_up_small_digit_8_red_pal);
 #define level_up_small_digit_9_red_png level_up_small_digit_9_png
-#include "level_up/small_digit_9.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_9.red.pal", level_up_small_digit_9_red_pal);
 #define level_up_small_arrow_red_png level_up_small_arrow_png
-#include "level_up/small_arrow.red.pal.inc.c"
+INCLUDE_PAL("level_up/small_arrow.red.pal", level_up_small_arrow_red_pal);
 
 #define level_up_digit_0_blue_png level_up_digit_0_png
-#include "level_up/digit_0.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_0.blue.pal", level_up_digit_0_blue_pal);
 #define level_up_digit_1_blue_png level_up_digit_1_png
-#include "level_up/digit_1.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_1.blue.pal", level_up_digit_1_blue_pal);
 #define level_up_digit_2_blue_png level_up_digit_2_png
-#include "level_up/digit_2.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_2.blue.pal", level_up_digit_2_blue_pal);
 #define level_up_digit_3_blue_png level_up_digit_3_png
-#include "level_up/digit_3.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_3.blue.pal", level_up_digit_3_blue_pal);
 #define level_up_digit_4_blue_png level_up_digit_4_png
-#include "level_up/digit_4.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_4.blue.pal", level_up_digit_4_blue_pal);
 #define level_up_digit_5_blue_png level_up_digit_5_png
-#include "level_up/digit_5.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_5.blue.pal", level_up_digit_5_blue_pal);
 #define level_up_digit_6_blue_png level_up_digit_6_png
-#include "level_up/digit_6.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_6.blue.pal", level_up_digit_6_blue_pal);
 #define level_up_digit_7_blue_png level_up_digit_7_png
-#include "level_up/digit_7.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_7.blue.pal", level_up_digit_7_blue_pal);
 #define level_up_digit_8_blue_png level_up_digit_8_png
-#include "level_up/digit_8.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_8.blue.pal", level_up_digit_8_blue_pal);
 #define level_up_digit_9_blue_png level_up_digit_9_png
-#include "level_up/digit_9.blue.pal.inc.c"
+INCLUDE_PAL("level_up/digit_9.blue.pal", level_up_digit_9_blue_pal);
 
 #define level_up_small_digit_0_blue_png level_up_small_digit_0_png
-#include "level_up/small_digit_0.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_0.blue.pal", level_up_small_digit_0_blue_pal);
 #define level_up_small_digit_1_blue_png level_up_small_digit_1_png
-#include "level_up/small_digit_1.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_1.blue.pal", level_up_small_digit_1_blue_pal);
 #define level_up_small_digit_2_blue_png level_up_small_digit_2_png
-#include "level_up/small_digit_2.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_2.blue.pal", level_up_small_digit_2_blue_pal);
 #define level_up_small_digit_3_blue_png level_up_small_digit_3_png
-#include "level_up/small_digit_3.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_3.blue.pal", level_up_small_digit_3_blue_pal);
 #define level_up_small_digit_4_blue_png level_up_small_digit_4_png
-#include "level_up/small_digit_4.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_4.blue.pal", level_up_small_digit_4_blue_pal);
 #define level_up_small_digit_5_blue_png level_up_small_digit_5_png
-#include "level_up/small_digit_5.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_5.blue.pal", level_up_small_digit_5_blue_pal);
 #define level_up_small_digit_6_blue_png level_up_small_digit_6_png
-#include "level_up/small_digit_6.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_6.blue.pal", level_up_small_digit_6_blue_pal);
 #define level_up_small_digit_7_blue_png level_up_small_digit_7_png
-#include "level_up/small_digit_7.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_7.blue.pal", level_up_small_digit_7_blue_pal);
 #define level_up_small_digit_8_blue_png level_up_small_digit_8_png
-#include "level_up/small_digit_8.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_8.blue.pal", level_up_small_digit_8_blue_pal);
 #define level_up_small_digit_9_blue_png level_up_small_digit_9_png
-#include "level_up/small_digit_9.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_digit_9.blue.pal", level_up_small_digit_9_blue_pal);
 #define level_up_small_arrow_blue_png level_up_small_arrow_png
-#include "level_up/small_arrow.blue.pal.inc.c"
+INCLUDE_PAL("level_up/small_arrow.blue.pal", level_up_small_arrow_blue_pal);
 
-#include "level_up/select_one_to_upgrade.png.inc.c"
-#include "level_up/select_one_to_upgrade.pal.inc.c"
+INCLUDE_IMG("level_up/select_one_to_upgrade.png", level_up_select_one_to_upgrade_png);
+INCLUDE_PAL("level_up/select_one_to_upgrade.pal", level_up_select_one_to_upgrade_pal);
 
 EntityModelScript EMS_level_up = STANDARD_ENTITY_MODEL_SCRIPT(D_802A7A88_7A59C8, RENDER_MODE_CLOUD_NO_ZCMP);
 
diff --git a/src/main_pre.c b/src/main_pre.c
index 096d7eaef3..946383cc39 100644
--- a/src/main_pre.c
+++ b/src/main_pre.c
@@ -1,4 +1,5 @@
 #include "PR/ultratypes.h"
+#include "include_asset.h"
 
 s32 ResetGameState = 0;
 u16* ResetSavedFrameImg = NULL;
@@ -7,4 +8,4 @@ s16 D_80073E0A = 0;
 
 s32 D_80073E0C = 0; // unused?
 
-#include "reset_tiles.png.inc.c"
+INCLUDE_IMG("reset_tiles.png", ResetTilesImg);
diff --git a/src/msg_img.c b/src/msg_img.c
index 1414f9e491..308e29dcfd 100644
--- a/src/msg_img.c
+++ b/src/msg_img.c
@@ -1,41 +1,42 @@
 #include "common.h"
+#include "include_asset.h"
 
-#include "ui/msg/bubble_left.png.inc.c"
-#include "ui/msg/bubble_mid.png.inc.c"
-#include "ui/msg/bubble_right.png.inc.c"
-#include "ui/msg/arrow.png.inc.c"
-#include "ui/msg/frame_a_1_1.png.inc.c"
-#include "ui/msg/frame_a_1_2.png.inc.c"
-#include "ui/msg/frame_a_1_3.png.inc.c"
-#include "ui/msg/frame_a_1_4.png.inc.c"
-#include "ui/msg/frame_a_1_5.png.inc.c"
-#include "ui/msg/frame_a_2_1.png.inc.c"
-#include "ui/msg/frame_a_2_5.png.inc.c"
-#include "ui/msg/frame_a_3_1.png.inc.c"
-#include "ui/msg/frame_a_3_5.png.inc.c"
-#include "ui/msg/frame_a_4_1.png.inc.c"
-#include "ui/msg/frame_a_4_5.png.inc.c"
-#include "ui/msg/frame_a_5_1.png.inc.c"
-#include "ui/msg/frame_a_5_2.png.inc.c"
-#include "ui/msg/frame_a_5_3.png.inc.c"
-#include "ui/msg/frame_a_5_4.png.inc.c"
-#include "ui/msg/frame_a_5_5.png.inc.c"
-#include "ui/msg/frame_b_1_1.png.inc.c"
-#include "ui/msg/frame_b_1_2.png.inc.c"
-#include "ui/msg/frame_b_1_3.png.inc.c"
-#include "ui/msg/frame_b_1_4.png.inc.c"
-#include "ui/msg/frame_b_1_5.png.inc.c"
-#include "ui/msg/frame_b_2_1.png.inc.c"
-#include "ui/msg/frame_b_2_5.png.inc.c"
-#include "ui/msg/frame_b_3_1.png.inc.c"
-#include "ui/msg/frame_b_3_5.png.inc.c"
-#include "ui/msg/frame_b_4_1.png.inc.c"
-#include "ui/msg/frame_b_4_5.png.inc.c"
-#include "ui/msg/frame_b_5_1.png.inc.c"
-#include "ui/msg/frame_b_5_2.png.inc.c"
-#include "ui/msg/frame_b_5_3.png.inc.c"
-#include "ui/msg/frame_b_5_4.png.inc.c"
-#include "ui/msg/frame_b_5_5.png.inc.c"
+INCLUDE_IMG("ui/msg/bubble_left.png", ui_msg_bubble_left_png);
+INCLUDE_IMG("ui/msg/bubble_mid.png", ui_msg_bubble_mid_png);
+INCLUDE_IMG("ui/msg/bubble_right.png", ui_msg_bubble_right_png);
+INCLUDE_IMG("ui/msg/arrow.png", ui_msg_arrow_png);
+INCLUDE_IMG("ui/msg/frame_a_1_1.png", ui_msg_frame_a_1_1_png);
+INCLUDE_IMG("ui/msg/frame_a_1_2.png", ui_msg_frame_a_1_2_png);
+INCLUDE_IMG("ui/msg/frame_a_1_3.png", ui_msg_frame_a_1_3_png);
+INCLUDE_IMG("ui/msg/frame_a_1_4.png", ui_msg_frame_a_1_4_png);
+INCLUDE_IMG("ui/msg/frame_a_1_5.png", ui_msg_frame_a_1_5_png);
+INCLUDE_IMG("ui/msg/frame_a_2_1.png", ui_msg_frame_a_2_1_png);
+INCLUDE_IMG("ui/msg/frame_a_2_5.png", ui_msg_frame_a_2_5_png);
+INCLUDE_IMG("ui/msg/frame_a_3_1.png", ui_msg_frame_a_3_1_png);
+INCLUDE_IMG("ui/msg/frame_a_3_5.png", ui_msg_frame_a_3_5_png);
+INCLUDE_IMG("ui/msg/frame_a_4_1.png", ui_msg_frame_a_4_1_png);
+INCLUDE_IMG("ui/msg/frame_a_4_5.png", ui_msg_frame_a_4_5_png);
+INCLUDE_IMG("ui/msg/frame_a_5_1.png", ui_msg_frame_a_5_1_png);
+INCLUDE_IMG("ui/msg/frame_a_5_2.png", ui_msg_frame_a_5_2_png);
+INCLUDE_IMG("ui/msg/frame_a_5_3.png", ui_msg_frame_a_5_3_png);
+INCLUDE_IMG("ui/msg/frame_a_5_4.png", ui_msg_frame_a_5_4_png);
+INCLUDE_IMG("ui/msg/frame_a_5_5.png", ui_msg_frame_a_5_5_png);
+INCLUDE_IMG("ui/msg/frame_b_1_1.png", ui_msg_frame_b_1_1_png);
+INCLUDE_IMG("ui/msg/frame_b_1_2.png", ui_msg_frame_b_1_2_png);
+INCLUDE_IMG("ui/msg/frame_b_1_3.png", ui_msg_frame_b_1_3_png);
+INCLUDE_IMG("ui/msg/frame_b_1_4.png", ui_msg_frame_b_1_4_png);
+INCLUDE_IMG("ui/msg/frame_b_1_5.png", ui_msg_frame_b_1_5_png);
+INCLUDE_IMG("ui/msg/frame_b_2_1.png", ui_msg_frame_b_2_1_png);
+INCLUDE_IMG("ui/msg/frame_b_2_5.png", ui_msg_frame_b_2_5_png);
+INCLUDE_IMG("ui/msg/frame_b_3_1.png", ui_msg_frame_b_3_1_png);
+INCLUDE_IMG("ui/msg/frame_b_3_5.png", ui_msg_frame_b_3_5_png);
+INCLUDE_IMG("ui/msg/frame_b_4_1.png", ui_msg_frame_b_4_1_png);
+INCLUDE_IMG("ui/msg/frame_b_4_5.png", ui_msg_frame_b_4_5_png);
+INCLUDE_IMG("ui/msg/frame_b_5_1.png", ui_msg_frame_b_5_1_png);
+INCLUDE_IMG("ui/msg/frame_b_5_2.png", ui_msg_frame_b_5_2_png);
+INCLUDE_IMG("ui/msg/frame_b_5_3.png", ui_msg_frame_b_5_3_png);
+INCLUDE_IMG("ui/msg/frame_b_5_4.png", ui_msg_frame_b_5_4_png);
+INCLUDE_IMG("ui/msg/frame_b_5_5.png", ui_msg_frame_b_5_5_png);
 
 // TODO: make assets
 unsigned char ui_msg_palettes[16][32] = {
@@ -57,23 +58,23 @@ unsigned char ui_msg_palettes[16][32] = {
     {115,158,231,57,230,29,155,75,168,63,196,79,205,23,168,63,168,63,168,63,168,63,168,63,168,63,130,137,65,1,0,1},
 };
 
-#include "ui/msg/sign_corner_topleft.png.inc.c"
-#include "ui/msg/sign_corner_topright.png.inc.c"
-#include "ui/msg/sign_corner_bottomleft.png.inc.c"
-#include "ui/msg/sign_corner_bottomright.png.inc.c"
-#include "ui/msg/lamppost_corner_bottomright.png.inc.c"
-#include "ui/msg/sign_side_top.png.inc.c"
-#include "ui/msg/sign_side_left.png.inc.c"
-#include "ui/msg/sign_side_right.png.inc.c"
-#include "ui/msg/sign_side_bottom.png.inc.c"
-#include "ui/msg/sign_fill.png.inc.c"
-#include "ui/msg/sign_corner_topleft.pal.inc.c"
-#include "ui/msg/lamppost_corner_bottomright.pal.inc.c"
-#include "ui/msg/background.png.inc.c"
-#include "ui/msg/rewind_arrow.png.inc.c"
-#include "ui/msg/rewind_arrow.pal.inc.c"
-#include "ui/msg/star.png.inc.c"
-#include "ui/msg/star_silhouette.png.inc.c"
+INCLUDE_IMG("ui/msg/sign_corner_topleft.png", ui_msg_sign_corner_topleft_png);
+INCLUDE_IMG("ui/msg/sign_corner_topright.png", ui_msg_sign_corner_topright_png);
+INCLUDE_IMG("ui/msg/sign_corner_bottomleft.png", ui_msg_sign_corner_bottomleft_png);
+INCLUDE_IMG("ui/msg/sign_corner_bottomright.png", ui_msg_sign_corner_bottomright_png);
+INCLUDE_IMG("ui/msg/lamppost_corner_bottomright.png", ui_msg_lamppost_corner_bottomright_png);
+INCLUDE_IMG("ui/msg/sign_side_top.png", ui_msg_sign_side_top_png);
+INCLUDE_IMG("ui/msg/sign_side_left.png", ui_msg_sign_side_left_png);
+INCLUDE_IMG("ui/msg/sign_side_right.png", ui_msg_sign_side_right_png);
+INCLUDE_IMG("ui/msg/sign_side_bottom.png", ui_msg_sign_side_bottom_png);
+INCLUDE_IMG("ui/msg/sign_fill.png", ui_msg_sign_fill_png);
+INCLUDE_PAL("ui/msg/sign_corner_topleft.pal", ui_msg_sign_pal);
+INCLUDE_PAL("ui/msg/lamppost_corner_bottomright.pal", ui_msg_lamppost_pal);
+INCLUDE_IMG("ui/msg/background.png", ui_msg_background_png);
+INCLUDE_IMG("ui/msg/rewind_arrow.png", ui_msg_rewind_arrow_png);
+INCLUDE_PAL("ui/msg/rewind_arrow.pal", ui_msg_rewind_arrow_pal);
+INCLUDE_IMG("ui/msg/star.png", ui_msg_star_png);
+INCLUDE_IMG("ui/msg/star_silhouette.png", ui_msg_star_silhouette_png);
 
 BSS IMG_BIN MsgCharImgTitle[0xF60];
 BSS IMG_BIN MsgCharImgNormal[0x5100];
diff --git a/src/pause/pause_gfx.c b/src/pause/pause_gfx.c
index bb32439e55..81ab9bc8d0 100644
--- a/src/pause/pause_gfx.c
+++ b/src/pause/pause_gfx.c
@@ -1,5 +1,6 @@
 #include "pause_common.h"
 #include "message_ids.h"
+#include "include_asset.h"
 
 #include "pause/image_143BF0.png.h"
 #include "pause/image_143FF0.png.h"
@@ -20,37 +21,37 @@
 #include "pause/prompt_check_abilities.png.h"
 #include "pause/stats_bar.png.h"
 
-#include "pause/image_1439F0.png.inc.c"
-#include "pause/image_143BF0.png.inc.c"
-#include "pause/image_143FF0.png.inc.c"
-#include "pause/world_map.png.inc.c"
-#include "pause/world_map.pal.inc.c"
-#include "pause/spirits_bg.png.inc.c"
-#include "pause/spirits_bg.pal.inc.c"
-#include "pause/orbs.png.inc.c"
-#include "pause/map_location.png.inc.c"
-#include "pause/map_path_marker.png.inc.c"
-#include "pause/map_arrows.png.inc.c"
+INCLUDE_IMG("pause/image_1439F0.png", pause_image_1439F0_png);
+INCLUDE_IMG("pause/image_143BF0.png", pause_image_143BF0_png);
+INCLUDE_IMG("pause/image_143FF0.png", pause_image_143FF0_png);
+INCLUDE_IMG("pause/world_map.png", pause_world_map_png);
+INCLUDE_PAL("pause/world_map.pal", pause_world_map_pal);
+INCLUDE_IMG("pause/spirits_bg.png", pause_spirits_bg_png);
+INCLUDE_PAL("pause/spirits_bg.pal", pause_spirits_bg_pal);
+INCLUDE_IMG("pause/orbs.png", pause_orbs_png);
+INCLUDE_IMG("pause/map_location.png", pause_map_location_png);
+INCLUDE_IMG("pause/map_path_marker.png", pause_map_path_marker_png);
+INCLUDE_IMG("pause/map_arrows.png", pause_arrows_png);
 #if !VERSION_PAL
-#include "pause/banner_hp.png.inc.c"
-#include "pause/banner_hp.pal.inc.c"
-#include "pause/banner_fp.png.inc.c"
-#include "pause/banner_fp.pal.inc.c"
-#include "pause/banner_bp.png.inc.c"
-#include "pause/banner_bp.pal.inc.c"
-#include "pause/banner_boots.png.inc.c"
-#include "pause/banner_boots.pal.inc.c"
-#include "pause/banner_hammer.png.inc.c"
-#include "pause/banner_hammer.pal.inc.c"
-#include "pause/banner_star_energy.png.inc.c"
-#include "pause/banner_star_energy.pal.inc.c"
-#include "pause/available.png.inc.c"
-#include "pause/available.pal.inc.c"
-#include "pause/prompt_check_abilities.png.inc.c"
-#include "pause/prompt_check_abilities.pal.inc.c"
+INCLUDE_IMG("pause/banner_hp.png", pause_banner_hp_png);
+INCLUDE_PAL("pause/banner_hp.pal", pause_banner_hp_pal);
+INCLUDE_IMG("pause/banner_fp.png", pause_banner_fp_png);
+INCLUDE_PAL("pause/banner_fp.pal", pause_banner_fp_pal);
+INCLUDE_IMG("pause/banner_bp.png", pause_banner_bp_png);
+INCLUDE_PAL("pause/banner_bp.pal", pause_banner_bp_pal);
+INCLUDE_IMG("pause/banner_boots.png", pause_banner_boots_png);
+INCLUDE_PAL("pause/banner_boots.pal", pause_banner_boots_pal);
+INCLUDE_IMG("pause/banner_hammer.png", pause_banner_hammer_png);
+INCLUDE_PAL("pause/banner_hammer.pal", pause_banner_hammer_pal);
+INCLUDE_IMG("pause/banner_star_energy.png", pause_banner_star_energy_png);
+INCLUDE_PAL("pause/banner_star_energy.pal", pause_banner_star_energy_pal);
+INCLUDE_IMG("pause/available.png", pause_available_png);
+INCLUDE_PAL("pause/available.pal", pause_available_pal);
+INCLUDE_IMG("pause/prompt_check_abilities.png", pause_prompt_check_abilities_png);
+INCLUDE_PAL("pause/prompt_check_abilities.pal", pause_prompt_check_abilities_pal);
 #endif
-#include "pause/stats_bar.png.inc.c"
-#include "pause/stats_bar.pal.inc.c"
+INCLUDE_IMG("pause/stats_bar.png", pause_stats_bar_png);
+INCLUDE_PAL("pause/stats_bar.pal", pause_stats_bar_pal);
 
 #if VERSION_PAL
 extern u8 pause_prompt_check_abilities_png[];
diff --git a/src/pause/pause_gfx_en.c b/src/pause/pause_gfx_en.c
index dfe095fc0c..25dbffa3f3 100644
--- a/src/pause/pause_gfx_en.c
+++ b/src/pause/pause_gfx_en.c
@@ -1,16 +1,17 @@
-#include "pause/banner_hp.png.inc.c"
-#include "pause/banner_hp.pal.inc.c"
-#include "pause/banner_fp.png.inc.c"
-#include "pause/banner_fp.pal.inc.c"
-#include "pause/banner_bp.png.inc.c"
-#include "pause/banner_bp.pal.inc.c"
-#include "pause/banner_boots.png.inc.c"
-#include "pause/banner_boots.pal.inc.c"
-#include "pause/banner_hammer.png.inc.c"
-#include "pause/banner_hammer.pal.inc.c"
-#include "pause/banner_star_energy.png.inc.c"
-#include "pause/banner_star_energy.pal.inc.c"
-#include "pause/available.png.inc.c"
-#include "pause/available.pal.inc.c"
-#include "pause/prompt_check_abilities.png.inc.c"
-#include "pause/prompt_check_abilities.pal.inc.c"
+#include "include_asset.h"
+INCLUDE_IMG("pause/banner_hp.png", pause_banner_hp_png);
+INCLUDE_PAL("pause/banner_hp.pal", pause_banner_hp_pal);
+INCLUDE_IMG("pause/banner_fp.png", pause_banner_fp_png);
+INCLUDE_PAL("pause/banner_fp.pal", pause_banner_fp_pal);
+INCLUDE_IMG("pause/banner_bp.png", pause_banner_bp_png);
+INCLUDE_PAL("pause/banner_bp.pal", pause_banner_bp_pal);
+INCLUDE_IMG("pause/banner_boots.png", pause_banner_boots_png);
+INCLUDE_PAL("pause/banner_boots.pal", pause_banner_boots_pal);
+INCLUDE_IMG("pause/banner_hammer.png", pause_banner_hammer_png);
+INCLUDE_PAL("pause/banner_hammer.pal", pause_banner_hammer_pal);
+INCLUDE_IMG("pause/banner_star_energy.png", pause_banner_star_energy_png);
+INCLUDE_PAL("pause/banner_star_energy.pal", pause_banner_star_energy_pal);
+INCLUDE_IMG("pause/available.png", pause_available_png);
+INCLUDE_PAL("pause/available.pal", pause_available_pal);
+INCLUDE_IMG("pause/prompt_check_abilities.png", pause_prompt_check_abilities_png);
+INCLUDE_PAL("pause/prompt_check_abilities.pal", pause_prompt_check_abilities_pal);
diff --git a/src/pulse_stone.c b/src/pulse_stone.c
index 527293554a..4bcf346d7f 100644
--- a/src/pulse_stone.c
+++ b/src/pulse_stone.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 typedef struct PulseStoneData {
     /* 0x00 */ Vec3f pos;
@@ -17,9 +18,9 @@ enum {
 };
 
 #include "pulse_stone_icon.png.h"
-#include "pulse_stone_icon.png.inc.c"
-#include "pulse_stone_icon.pal.inc.c"
-#include "pulse_stone_icon.flash.pal.inc.c"
+INCLUDE_IMG("pulse_stone_icon.png", pulse_stone_icon_img);
+INCLUDE_PAL("pulse_stone_icon.pal", pulse_stone_icon_1_pal);
+INCLUDE_PAL("pulse_stone_icon.flash.pal", pulse_stone_icon_2_pal);
 #include "pulse_stone_icon.gfx.inc.c"
 
 BSS PulseStoneData PulseStoneNotification;
diff --git a/src/screen_overlays.c b/src/screen_overlays.c
index 552fddc3e6..6d55ebce94 100644
--- a/src/screen_overlays.c
+++ b/src/screen_overlays.c
@@ -1,5 +1,6 @@
 #include "common.h"
 #include "overlay.h"
+#include "include_asset.h"
 
 SHIFT_BSS s32 screen_overlay_frontType;
 SHIFT_BSS f32 screen_overlay_frontZoom;
@@ -13,13 +14,13 @@ ScreenTransition CurrentScreenTransition = TRANSITION_END_DEMO_SCENE_BLACK;
 // padding?
 s32 D_8014C6F4[] = { 0x00000000, 0x00000000, 0x00000000 };
 
-#include "ui/stencil/star.png.inc.c"
+INCLUDE_IMG("ui/stencil/star.png", ui_stencil_star_png);
 
-#include "ui/stencil/mario.png.inc.c"
+INCLUDE_IMG("ui/stencil/mario.png", ui_stencil_mario_png);
 
-#include "ui/stencil/sharp_circle.png.inc.c"
+INCLUDE_IMG("ui/stencil/sharp_circle.png", ui_stencil_sharp_circle_png);
 
-#include "ui/stencil/blurry_circle.png.inc.c"
+INCLUDE_IMG("ui/stencil/blurry_circle.png", ui_stencil_blurry_circle_png);
 
 #include "vtx/stencil1.vtx.inc.c"
 
diff --git a/src/speech_bubble.c b/src/speech_bubble.c
index a56d7a7c06..ffed884f09 100644
--- a/src/speech_bubble.c
+++ b/src/speech_bubble.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "include_asset.h"
 
 #define NAMESPACE speech_bubble
 
@@ -10,8 +11,8 @@ enum {
 };
 
 #include "speech_bubble.png.h"
-#include "speech_bubble.png.inc.c"
-#include "speech_bubble.pal.inc.c"
+INCLUDE_IMG("speech_bubble.png", speech_bubble_img);
+INCLUDE_PAL("speech_bubble.pal", speech_bubble_pal);
 #include "speech_bubble.gfx.inc.c"
 
 BSS SpeechBubbleData SpeechBubble;
diff --git a/src/starpoint.c b/src/starpoint.c
index c9affb6748..55925fba79 100644
--- a/src/starpoint.c
+++ b/src/starpoint.c
@@ -1,8 +1,9 @@
 #include "common.h"
 #include "entity.h"
+#include "include_asset.h"
 
 Lights1 starpoint_lights1 = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
-#include "starpoint/starpoint.png.inc.c"
+INCLUDE_IMG("starpoint/starpoint.png", D_802A1018_7A89B8);
 #include "starpoint/load_starpoint.gfx.inc.c"
 #include "starpoint/starpoint.vtx.inc.c"
 Gfx D_802A20D0_7A9A70[] = {
@@ -30,7 +31,7 @@ Gfx D_802A2158_7A9AF8[] = {
 
 Lights1 starpoint_lights2 = gdSPDefLights1(0, 0, 0, 0, 0, 0, 0, 0, 0);
 #include "starpoint/starpoints.vtx.inc.c"
-#include "starpoint/starpoints.png.inc.c"
+INCLUDE_IMG("starpoint/starpoints.png", D_802A21D8_7A9B78);
 #include "starpoint/load_starpoints.gfx.inc.c"
 
 Gfx D_802A3250_7AABF0[] = {
@@ -57,70 +58,70 @@ Gfx D_802A32D8_7AAC78[] = {
 };
 
 #include "starpoint/digit_0.vtx.inc.c"
-#include "starpoint/digit_0.png.inc.c"
+INCLUDE_IMG("starpoint/digit_0.png", D_802A3340_7AACE0);
 #include "starpoint/load_digit_0.gfx.inc.c"
 #include "starpoint/__render_digit_0.gfx.inc.c"
 #include "starpoint/_render_digit_0.gfx.inc.c"
 #include "starpoint/render_digit_0.gfx.inc.c"
 
 #include "starpoint/digit_1.vtx.inc.c"
-#include "starpoint/digit_1.png.inc.c"
+INCLUDE_IMG("starpoint/digit_1.png", D_802A4460_7ABE00);
 #include "starpoint/load_digit_1.gfx.inc.c"
 #include "starpoint/__render_digit_1.gfx.inc.c"
 #include "starpoint/_render_digit_1.gfx.inc.c"
 #include "starpoint/render_digit_1.gfx.inc.c"
 
 #include "starpoint/digit_2.vtx.inc.c"
-#include "starpoint/digit_2.png.inc.c"
+INCLUDE_IMG("starpoint/digit_2.png", D_802A5580_7ACF20);
 #include "starpoint/load_digit_2.gfx.inc.c"
 #include "starpoint/__render_digit_2.gfx.inc.c"
 #include "starpoint/_render_digit_2.gfx.inc.c"
 #include "starpoint/render_digit_2.gfx.inc.c"
 
 #include "starpoint/digit_3.vtx.inc.c"
-#include "starpoint/digit_3.png.inc.c"
+INCLUDE_IMG("starpoint/digit_3.png", D_802A66A0_7AE040);
 #include "starpoint/load_digit_3.gfx.inc.c"
 #include "starpoint/__render_digit_3.gfx.inc.c"
 #include "starpoint/_render_digit_3.gfx.inc.c"
 #include "starpoint/render_digit_3.gfx.inc.c"
 
 #include "starpoint/digit_4.vtx.inc.c"
-#include "starpoint/digit_4.png.inc.c"
+INCLUDE_IMG("starpoint/digit_4.png", D_802A77C0_7AF160);
 #include "starpoint/load_digit_4.gfx.inc.c"
 #include "starpoint/__render_digit_4.gfx.inc.c"
 #include "starpoint/_render_digit_4.gfx.inc.c"
 #include "starpoint/render_digit_4.gfx.inc.c"
 
 #include "starpoint/digit_5.vtx.inc.c"
-#include "starpoint/digit_5.png.inc.c"
+INCLUDE_IMG("starpoint/digit_5.png", D_802A88E0_7B0280);
 #include "starpoint/load_digit_5.gfx.inc.c"
 #include "starpoint/__render_digit_5.gfx.inc.c"
 #include "starpoint/_render_digit_5.gfx.inc.c"
 #include "starpoint/render_digit_5.gfx.inc.c"
 
 #include "starpoint/digit_6.vtx.inc.c"
-#include "starpoint/digit_6.png.inc.c"
+INCLUDE_IMG("starpoint/digit_6.png", D_802A9A00_7B13A0);
 #include "starpoint/load_digit_6.gfx.inc.c"
 #include "starpoint/__render_digit_6.gfx.inc.c"
 #include "starpoint/_render_digit_6.gfx.inc.c"
 #include "starpoint/render_digit_6.gfx.inc.c"
 
 #include "starpoint/digit_7.vtx.inc.c"
-#include "starpoint/digit_7.png.inc.c"
+INCLUDE_IMG("starpoint/digit_7.png", D_802AAB20_7B24C0);
 #include "starpoint/load_digit_7.gfx.inc.c"
 #include "starpoint/__render_digit_7.gfx.inc.c"
 #include "starpoint/_render_digit_7.gfx.inc.c"
 #include "starpoint/render_digit_7.gfx.inc.c"
 
 #include "starpoint/digit_8.vtx.inc.c"
-#include "starpoint/digit_8.png.inc.c"
+INCLUDE_IMG("starpoint/digit_8.png", D_802ABC40_7B35E0);
 #include "starpoint/load_digit_8.gfx.inc.c"
 #include "starpoint/__render_digit_8.gfx.inc.c"
 #include "starpoint/_render_digit_8.gfx.inc.c"
 #include "starpoint/render_digit_8.gfx.inc.c"
 
 #include "starpoint/digit_9.vtx.inc.c"
-#include "starpoint/digit_9.png.inc.c"
+INCLUDE_IMG("starpoint/digit_9.png", D_802ACD60_7B4700);
 #include "starpoint/load_digit_9.gfx.inc.c"
 #include "starpoint/__render_digit_9.gfx.inc.c"
 #include "starpoint/_render_digit_9.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img0.c b/src/world/area_dgb/dgb_01/dgb_01_6_img0.c
index 8684fc3ad5..9c7473d907 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img0.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img0.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img0.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img0.png", dgb_01_img0_png);
 #include "world/area_dgb/dgb_01/img0.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img1.c b/src/world/area_dgb/dgb_01/dgb_01_6_img1.c
index 018e55bf1b..e931037f5f 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img1.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img1.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img1.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img1.png", dgb_01_img1_png);
 #include "world/area_dgb/dgb_01/img1.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img2.c b/src/world/area_dgb/dgb_01/dgb_01_6_img2.c
index 1049a71d6c..29d0dd9693 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img2.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img2.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img2.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img2.png", dgb_01_img2_png);
 #include "world/area_dgb/dgb_01/img2.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img3.c b/src/world/area_dgb/dgb_01/dgb_01_6_img3.c
index 72a707495d..cb14eff463 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img3.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img3.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img3.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img3.png", dgb_01_img3_png);
 #include "world/area_dgb/dgb_01/img3.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img4.c b/src/world/area_dgb/dgb_01/dgb_01_6_img4.c
index 8b005dd97e..be4018aeb9 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img4.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img4.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img4.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img4.png", dgb_01_img4_png);
 #include "world/area_dgb/dgb_01/img4.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img5.c b/src/world/area_dgb/dgb_01/dgb_01_6_img5.c
index bf6f30c681..4f97873434 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img5.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img5.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img5.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img5.png", dgb_01_img5_png);
 #include "world/area_dgb/dgb_01/img5.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img6.c b/src/world/area_dgb/dgb_01/dgb_01_6_img6.c
index aab290e5ae..a2c900b4ad 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img6.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img6.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img6.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img6.png", dgb_01_img6_png);
 #include "world/area_dgb/dgb_01/img6.gfx.inc.c"
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img7.c b/src/world/area_dgb/dgb_01/dgb_01_6_img7.c
index 578397d1a4..d54cd36bda 100644
--- a/src/world/area_dgb/dgb_01/dgb_01_6_img7.c
+++ b/src/world/area_dgb/dgb_01/dgb_01_6_img7.c
@@ -1,4 +1,5 @@
 #include "dgb_01.h"
+#include "include_asset.h"
 
-#include "world/area_dgb/dgb_01/img7.png.inc.c"
+INCLUDE_IMG("world/area_dgb/dgb_01/img7.png", dgb_01_img7_png);
 #include "world/area_dgb/dgb_01/img7.gfx.inc.c"
diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c
index 2588373c81..4d68523c4f 100644
--- a/src/world/area_dro/dro_02/npc_merlee.c
+++ b/src/world/area_dro/dro_02/npc_merlee.c
@@ -1,6 +1,7 @@
 #include "dro_02.h"
 #include "model.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 // cards used during Merlee's ritual
 typedef struct RitualCard {
@@ -64,8 +65,8 @@ s8 N(MerleeCoinCosts)[] = {
 s32 N(pad_XX111)[] = { 0 };
 #endif
 
-#include "world/area_dro/dro_02/card.png.inc.c"
-#include "world/area_dro/dro_02/card.pal.inc.c"
+INCLUDE_IMG("world/area_dro/dro_02/card.png", dro_02_card);
+INCLUDE_PAL("world/area_dro/dro_02/card.pal", dro_02_card_pal);
 #include "world/area_dro/dro_02/card_1.vtx.inc.c"
 #include "world/area_dro/dro_02/card_2.vtx.inc.c"
 #include "world/area_dro/dro_02/card_setup.gfx.inc.c"
diff --git a/src/world/area_end/end_00/end_00_2_credits.c b/src/world/area_end/end_00/end_00_2_credits.c
index ab3c0ff191..ac0a01058f 100644
--- a/src/world/area_end/end_00/end_00_2_credits.c
+++ b/src/world/area_end/end_00/end_00_2_credits.c
@@ -1,4 +1,6 @@
 #include "end_00.h"
+#include "include_asset.h"
+#include "include_asset.h"
 
 #include "../common/Credits.inc.c"
 
diff --git a/src/world/area_end/end_01/end_01_2_credits.c b/src/world/area_end/end_01/end_01_2_credits.c
index bdccaeba44..e6056a8d71 100644
--- a/src/world/area_end/end_01/end_01_2_credits.c
+++ b/src/world/area_end/end_01/end_01_2_credits.c
@@ -1,4 +1,6 @@
 #include "end_01.h"
+#include "include_asset.h"
+#include "include_asset.h"
 
 #include "../common/Credits.inc.c"
 
diff --git a/src/world/area_iwa/iwa_01/iwa_01_3_splash.c b/src/world/area_iwa/iwa_01/iwa_01_3_splash.c
index 67da3f6772..abcb4e7943 100644
--- a/src/world/area_iwa/iwa_01/iwa_01_3_splash.c
+++ b/src/world/area_iwa/iwa_01/iwa_01_3_splash.c
@@ -1,6 +1,7 @@
 #include "iwa_01.h"
+#include "include_asset.h"
 
-#include "world/area_iwa/iwa_01/splash.png.inc.c"
+INCLUDE_IMG("world/area_iwa/iwa_01/splash.png", iwa_01_splash_img);
 #include "world/area_iwa/iwa_01/splash.vtx.inc.c"
 #include "world/area_iwa/iwa_01/splash.gfx.inc.c"
 
diff --git a/src/world/area_kmr/kmr_02/kmr_02_9_images.c b/src/world/area_kmr/kmr_02/kmr_02_9_images.c
index bb03c4fd40..4281e14155 100644
--- a/src/world/area_kmr/kmr_02/kmr_02_9_images.c
+++ b/src/world/area_kmr/kmr_02/kmr_02_9_images.c
@@ -1,7 +1,8 @@
 #include "kmr_02.h"
+#include "include_asset.h"
 
-#include "world/area_kmr/kmr_02/heart_block.png.inc.c"
-#include "world/area_kmr/kmr_02/heart_block.pal.inc.c"
+INCLUDE_IMG("world/area_kmr/kmr_02/heart_block.png", kmr_02_heart_block_img);
+INCLUDE_PAL("world/area_kmr/kmr_02/heart_block.pal", kmr_02_heart_block_pal);
 
 #define PARTY_IMAGE "party_kurio"
 #include "world/common/todo/LoadPartyImage.inc.c"
diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
index f884cccda8..c42f0cc737 100644
--- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
+++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
@@ -1,9 +1,10 @@
 #include "kmr_04.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #include "world/area_kmr/kmr_04/hammer_block_message.png.h"
-#include "world/area_kmr/kmr_04/hammer_block_message.png.inc.c"
-#include "world/area_kmr/kmr_04/hammer_block_message.pal.inc.c"
+INCLUDE_IMG("world/area_kmr/kmr_04/hammer_block_message.png", kmr_04_hammer_block_message_img);
+INCLUDE_PAL("world/area_kmr/kmr_04/hammer_block_message.pal", kmr_04_hammer_block_message_pal);
 
 #include "common/foliage.inc.c"
 
diff --git a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c
index 161ae623ee..2285184575 100644
--- a/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c
+++ b/src/world/area_kmr/kmr_22/npc/lava_piranha.inc.c
@@ -1,10 +1,11 @@
+#include "include_asset.h"
 
 #include "world/common/enemy/LavaPiranha.h"
 
 #include "world/common/lava_piranha/part1.inc.c"
 
-#include "world/area_kmr/kmr_22/lava_piranha_vine.png.inc.c"
-#include "world/area_kmr/kmr_22/lava_piranha_vine.pal.inc.c"
+INCLUDE_IMG("world/area_kmr/kmr_22/lava_piranha_vine.png", D_80241900);
+INCLUDE_PAL("world/area_kmr/kmr_22/lava_piranha_vine.pal", D_80241D00);
 #include "world/area_kmr/kmr_22/lava_piranha_vine.gfx.inc.c"
 
 #include "world/common/lava_piranha/part2.inc.c"
diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
index e12600433d..ece7df82c8 100644
--- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
+++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
@@ -1,5 +1,6 @@
 #include "kmr_23.h"
 #include "effects.h"
+#include "include_asset.h"
 
 void func_80240DA4_9087D4(void);
 
@@ -39,10 +40,10 @@ AnimID N(StarSpiritAnimations)[][2] = {
 
 s32 imgPadding = 0;
 
-#include "world/area_kmr/kmr_23/window_ul.png.inc.c"
-#include "world/area_kmr/kmr_23/window_ur.png.inc.c"
-#include "world/area_kmr/kmr_23/window_ll.png.inc.c"
-#include "world/area_kmr/kmr_23/window_lr.png.inc.c"
+INCLUDE_IMG("world/area_kmr/kmr_23/window_ul.png", kmr_23_window_ul_img);
+INCLUDE_IMG("world/area_kmr/kmr_23/window_ur.png", kmr_23_window_ur_img);
+INCLUDE_IMG("world/area_kmr/kmr_23/window_ll.png", kmr_23_window_ll_img);
+INCLUDE_IMG("world/area_kmr/kmr_23/window_lr.png", kmr_23_window_lr_img);
 
 s32 D_802417C8_9091F8 = 0;
 
diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c
index 38c3803b5c..f70f2ebd6a 100644
--- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c
+++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c
@@ -1,6 +1,7 @@
 #include "kzn_19.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #include "world/common/npc/Kolorado.h"
 #include "world/common/npc/StarSpirit.h"
@@ -8,8 +9,8 @@
 
 #include "world/common/lava_piranha/part1.inc.c"
 
-#include "world/lava_piranha/vine.png.inc.c"
-#include "world/lava_piranha/vine.pal.inc.c"
+INCLUDE_IMG("world/lava_piranha/vine.png", kzn_19_lava_piranha_vine_img);
+INCLUDE_PAL("world/lava_piranha/vine.pal", kzn_19_lava_piranha_vine_pal);
 #include "world/lava_piranha/vine.gfx.inc.c"
 
 #include "world/common/lava_piranha/part2.inc.c"
diff --git a/src/world/area_mgm/mgm_01/mgm_01_4_images.c b/src/world/area_mgm/mgm_01/mgm_01_4_images.c
index 3c31dba34f..c864236537 100644
--- a/src/world/area_mgm/mgm_01/mgm_01_4_images.c
+++ b/src/world/area_mgm/mgm_01/mgm_01_4_images.c
@@ -1,20 +1,21 @@
 #include "mgm_01.h"
+#include "include_asset.h"
 
 #include "world/area_mgm/mgm_01/panel_1_coin.png.h"
-#include "world/area_mgm/mgm_01/panel_1_coin.png.inc.c"
-#include "world/area_mgm/mgm_01/panel_1_coin.pal.inc.c"
+INCLUDE_IMG("world/area_mgm/mgm_01/panel_1_coin.png", mgm_01_panel_1_coin_img);
+INCLUDE_PAL("world/area_mgm/mgm_01/panel_1_coin.pal", mgm_01_panel_1_coin_pal);
 
 #include "world/area_mgm/mgm_01/panel_5_coins.png.h"
-#include "world/area_mgm/mgm_01/panel_5_coins.png.inc.c"
-#include "world/area_mgm/mgm_01/panel_5_coins.pal.inc.c"
+INCLUDE_IMG("world/area_mgm/mgm_01/panel_5_coins.png", mgm_01_panel_5_coins_img);
+INCLUDE_PAL("world/area_mgm/mgm_01/panel_5_coins.pal", mgm_01_panel_5_coins_pal);
 
 #include "world/area_mgm/mgm_01/panel_times_5.png.h"
-#include "world/area_mgm/mgm_01/panel_times_5.png.inc.c"
-#include "world/area_mgm/mgm_01/panel_times_5.pal.inc.c"
+INCLUDE_IMG("world/area_mgm/mgm_01/panel_times_5.png", mgm_01_panel_times_5_img);
+INCLUDE_PAL("world/area_mgm/mgm_01/panel_times_5.pal", mgm_01_panel_times_5_pal);
 
 #include "world/area_mgm/mgm_01/panel_bowser.png.h"
-#include "world/area_mgm/mgm_01/panel_bowser.png.inc.c"
-#include "world/area_mgm/mgm_01/panel_bowser.pal.inc.c"
+INCLUDE_IMG("world/area_mgm/mgm_01/panel_bowser.png", mgm_01_panel_bowser_img);
+INCLUDE_PAL("world/area_mgm/mgm_01/panel_bowser.pal", mgm_01_panel_bowser_pal);
 
 MessageImageData N(MsgImgs_Panels)[] = {
     {
diff --git a/src/world/area_mgm/mgm_02/mgm_02_3_images.c b/src/world/area_mgm/mgm_02/mgm_02_3_images.c
index ed941c931a..f58e7fa9ac 100644
--- a/src/world/area_mgm/mgm_02/mgm_02_3_images.c
+++ b/src/world/area_mgm/mgm_02/mgm_02_3_images.c
@@ -1,8 +1,9 @@
 #include "mgm_02.h"
+#include "include_asset.h"
 
 #include "world/area_mgm/mgm_02/panel_peach.png.h"
-#include "world/area_mgm/mgm_02/panel_peach.png.inc.c"
-#include "world/area_mgm/mgm_02/panel_peach.pal.inc.c"
+INCLUDE_IMG("world/area_mgm/mgm_02/panel_peach.png", mgm_02_panel_peach_img);
+INCLUDE_PAL("world/area_mgm/mgm_02/panel_peach.pal", mgm_02_panel_peach_pal);
 
 MessageImageData N(MsgImg_PeachPanel)[] = {
     {
diff --git a/src/world/area_pra/pra_31/pra_31_5_texture_1.c b/src/world/area_pra/pra_31/pra_31_5_texture_1.c
index 1f92f5a13f..f673764429 100644
--- a/src/world/area_pra/pra_31/pra_31_5_texture_1.c
+++ b/src/world/area_pra/pra_31/pra_31_5_texture_1.c
@@ -1,6 +1,7 @@
 #include "pra_31.h"
+#include "include_asset.h"
 
-#include "world/area_pra/pra_31/texture_1.png.inc.c"
-#include "world/area_pra/pra_31/texture_1.pal.inc.c"
+INCLUDE_IMG("world/area_pra/pra_31/texture_1.png", pra_31_texture_1_img);
+INCLUDE_PAL("world/area_pra/pra_31/texture_1.pal", pra_31_texture_1_pal);
 
 #include "world/area_pra/pra_31/texture_1.gfx.inc.c"
diff --git a/src/world/area_pra/pra_31/pra_31_6_texture_2.c b/src/world/area_pra/pra_31/pra_31_6_texture_2.c
index 5b197877f6..4a54f9a34b 100644
--- a/src/world/area_pra/pra_31/pra_31_6_texture_2.c
+++ b/src/world/area_pra/pra_31/pra_31_6_texture_2.c
@@ -1,6 +1,7 @@
 #include "pra_31.h"
+#include "include_asset.h"
 
-#include "world/area_pra/pra_31/texture_2.png.inc.c"
-#include "world/area_pra/pra_31/texture_2.pal.inc.c"
+INCLUDE_IMG("world/area_pra/pra_31/texture_2.png", pra_31_texture_2_img);
+INCLUDE_PAL("world/area_pra/pra_31/texture_2.pal", pra_31_texture_2_pal);
 
 #include "world/area_pra/pra_31/texture_2.gfx.inc.c"
diff --git a/src/world/area_pra/pra_31/pra_31_7_texture_3.c b/src/world/area_pra/pra_31/pra_31_7_texture_3.c
index d1b8cd3ba5..d31d76f8e1 100644
--- a/src/world/area_pra/pra_31/pra_31_7_texture_3.c
+++ b/src/world/area_pra/pra_31/pra_31_7_texture_3.c
@@ -1,5 +1,6 @@
 #include "pra_31.h"
+#include "include_asset.h"
 
-#include "world/area_pra/pra_31/texture_3.png.inc.c"
+INCLUDE_IMG("world/area_pra/pra_31/texture_3.png", pra_31_texture_3_img);
 
 #include "world/area_pra/pra_31/texture_3.gfx.inc.c"
diff --git a/src/world/area_sam/sam_05/sam_05_4_npc.c b/src/world/area_sam/sam_05/sam_05_4_npc.c
index c17da96969..bbf4eabea9 100644
--- a/src/world/area_sam/sam_05/sam_05_4_npc.c
+++ b/src/world/area_sam/sam_05/sam_05_4_npc.c
@@ -1,5 +1,6 @@
 #include "sam_05.h"
 #include "sprite.h"
+#include "include_asset.h"
 
 NpcSettings N(NpcSettings_Monstar) = {
     .height = 150,
@@ -41,11 +42,11 @@ EvtScript N(EVS_NpcDefeat_Monstar) = {
     EVT_END
 };
 
-#include "world/area_sam/sam_05/monstar.png.inc.c"
-#include "world/area_sam/sam_05/monstar_blank1.png.inc.c"
-#include "world/area_sam/sam_05/monstar_blank2.png.inc.c"
-#include "world/area_sam/sam_05/monstar_blank3.png.inc.c"
-#include "world/area_sam/sam_05/monstar.pal.inc.c"
+INCLUDE_IMG("world/area_sam/sam_05/monstar.png", sam_05_monstar_png);
+INCLUDE_IMG("world/area_sam/sam_05/monstar_blank1.png", D_80242970);
+INCLUDE_IMG("world/area_sam/sam_05/monstar_blank2.png", D_80242B70);
+INCLUDE_IMG("world/area_sam/sam_05/monstar_blank3.png", D_80242D70);
+INCLUDE_PAL("world/area_sam/sam_05/monstar.pal", sam_05_monstar_pal);
 #include "world/area_sam/sam_05/monstar.png.h"
 
 ImgFXOverlayTexture N(MonstarDetailTexture) = {
diff --git a/src/world/common/complete/ToadHouseBlanketAnim.inc.c b/src/world/common/complete/ToadHouseBlanketAnim.inc.c
index f82aaecdfb..c4b285256e 100644
--- a/src/world/common/complete/ToadHouseBlanketAnim.inc.c
+++ b/src/world/common/complete/ToadHouseBlanketAnim.inc.c
@@ -1,4 +1,5 @@
 #include "animation_script.h"
+#include "include_asset.h"
 
 extern Gfx N(toad_house_blanket_gfx)[];
 extern Vtx N(toad_house_blanket_vtx)[];
@@ -130,7 +131,7 @@ StaticAnimatorNode* N(D_80248D8C_971F4C)[] = {
 
 #include "world/toad_house/blanket.vtx.inc.c"
 #include "world/toad_house/blanket.gfx.inc.c"
-#include "world/toad_house/blanket.png.inc.c"
+INCLUDE_IMG("world/toad_house/blanket.png", N(toad_house_blanket_img));
 
 AnimScript N(ANS_ToadHouseBlanket) = {
         as_DisableMirroring
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
index 2f5aeab766..a008c7b652 100644
--- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
+++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
@@ -1,6 +1,7 @@
 #include "kzn_19.h"
 #include "ld_addrs.h"
 #include "sprite/player.h"
+#include "include_asset.h"
 
 #include "world/common/npc/Kolorado.h"
 #include "world/common/npc/StarSpirit.h"
@@ -34,31 +35,10 @@ extern Addr D_8020A000;
 #include "./kzn_19_anim2.c"
 #include "./kzn_19_anim3.c"
 
-unsigned char N(lava_piranha_vine_img)[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x31, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x13, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x12, 0x22, 0x22, 0x22, 0x22, 0x21, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x11, 0x22, 0x22, 0x22, 0x22, 0x11, 0x33, 0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x22, 0x22, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x22, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x22, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x22, 0x22, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 0x21, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-unsigned short N(lava_piranha_vine_pal)[] = { 0x0140, 0x41C1, 0xE739, 0x0241, 0x044F, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 };
-//#include "world/area_kzn/kzn_19/lava_piranha_vine.png.inc.c"
-//#include "world/area_kzn/kzn_19/lava_piranha_vine.pal.inc.c"
-
-Gfx N(lava_piranha_vine_gfx)[] = {
-    gsDPPipeSync(),
-    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPSetCycleType(G_CYC_1CYCLE),
-    gsDPSetTexturePersp(G_TP_PERSP),
-    gsDPSetTextureDetail(G_TD_CLAMP),
-    gsDPSetTextureLOD(G_TL_TILE),
-    gsDPSetTextureFilter(G_TF_BILERP),
-    gsDPSetTextureConvert(G_TC_FILT),
-    gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)),
-    gsDPSetCombineMode(PM_CC_2D, PM_CC_2D),
-    gsDPSetPrimColor(0, 0, 0xFF, 0xA0, 0xA0, 0x00),
-    gsDPSetTextureLUT(G_TT_RGBA16),
-    gsDPLoadTLUT_pal16(0, N(lava_piranha_vine_pal)),
-    gsDPLoadTextureTile_4b(N(lava_piranha_vine_img), G_IM_FMT_CI, 64, 0, 0, 0, 63, 31, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 5, G_TX_NOLOD, G_TX_NOLOD),
-    gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA),
-    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE),
-    gsSPEndDisplayList(),
-};
+INCLUDE_IMG("world/lava_piranha/vine.png", dead_kzn_19_lava_piranha_vine_img);
+INCLUDE_PAL("world/lava_piranha/vine.pal", dead_kzn_19_lava_piranha_vine_pal);
 
+#include "world/lava_piranha/vine.gfx.inc.c"
 #define DEAD_ROM_OFFSET (0x211EB0)
 
 #define PIRANHA_DMA_ENTRY(name) \
diff --git a/tools/build/bin_inc_c.py b/tools/build/bin_inc_c.py
deleted file mode 100755
index 9a78c307cc..0000000000
--- a/tools/build/bin_inc_c.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-
-from pathlib import Path
-from sys import argv
-import re
-
-if __name__ == "__main__":
-    infile, outfile, cname = argv[1:]
-
-    with open(outfile, "w") as f:
-        f.write(f"unsigned char {cname}[] = {{ ")
-
-        with open(infile, "rb") as i:
-            for char in i.read():
-                f.write(f"0x{char:02X}, ")
-
-        f.write(f"}};\n")
diff --git a/tools/build/configure.py b/tools/build/configure.py
index 7d1f6a16b7..cc1a8a719f 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -220,18 +220,6 @@ def write_ninja_rules(
         command=f'$python {BUILD_TOOLS}/img/header.py $in $out "$c_name"',
     )
 
-    ninja.rule(
-        "bin_inc_c",
-        description="bin_inc_c $out",
-        command=f'$python {BUILD_TOOLS}/bin_inc_c.py $in $out "$c_name"',
-    )
-
-    ninja.rule(
-        "pal_inc_c",
-        description="pal_inc_c $out",
-        command=f'$python {BUILD_TOOLS}/pal_inc_c.py $in $out "$c_name"',
-    )
-
     ninja.rule(
         "yay0",
         description="yay0 $in",
@@ -504,6 +492,7 @@ class Configure:
 
         built_objects = set()
         generated_code = []
+        inc_img_bins = []
 
         def build(
             object_paths: Union[Path, List[Path]],
@@ -524,6 +513,8 @@ class Configure:
                     built_objects.add(str(object_path))
                 elif object_path.suffix.endswith(".h") or object_path.suffix.endswith(".c"):
                     generated_code.append(str(object_path))
+                elif object_path.name.endswith(".png.bin") or object_path.name.endswith(".pal.bin"):
+                    inc_img_bins.append(str(object_path))
 
                 # don't rebuild objects if we've already seen all of them
                 if not str(object_path) in skip_outputs:
@@ -543,6 +534,7 @@ class Configure:
                     implicit.append(YAY0_COMPRESS_TOOL)
                 elif task in ["cc", "cxx", "cc_modern"]:
                     order_only.append("generated_code_" + self.version)
+                    order_only.append("inc_img_bins_" + self.version)
 
                 inputs = self.resolve_src_paths(src_paths)
                 for dir in asset_deps:
@@ -724,7 +716,7 @@ class Configure:
                         },
                     )
 
-                # images embedded inside data aren't linked, but they do need to be built into .inc.c files
+                # images embedded inside data aren't linked, but they do need to be built into .bin files
                 if isinstance(seg, splat.segtypes.common.group.CommonSegGroup):
                     for seg in seg.subsegments:
                         if isinstance(seg, splat.segtypes.n64.img.N64SegImg):
@@ -766,12 +758,6 @@ class Configure:
                                 "img_header",
                                 vars,
                             )
-                            build(
-                                inc_dir / (seg.name + ".png.inc.c"),
-                                [bin_path],
-                                "bin_inc_c",
-                                vars,
-                            )
                         elif isinstance(seg, splat.segtypes.n64.palette.N64SegPalette):
                             src_paths = [seg.out_path().relative_to(ROOT)]
                             inc_dir = self.build_path() / "include" / seg.dir
@@ -794,13 +780,6 @@ class Configure:
                                 type="data",
                                 define=True,
                             )
-                            vars = {"c_name": c_sym.name}
-                            build(
-                                inc_dir / (seg.name + ".pal.inc.c"),
-                                [bin_path],
-                                "pal_inc_c",
-                                vars,
-                            )
             elif (
                 isinstance(seg, splat.segtypes.common.bin.CommonSegBin)
                 or isinstance(seg, splat.segtypes.common.textbin.CommonSegTextbin)
@@ -1221,6 +1200,7 @@ class Configure:
             )
 
         ninja.build("generated_code_" + self.version, "phony", generated_code)
+        ninja.build("inc_img_bins_" + self.version, "phony", inc_img_bins)
 
     def make_current(self, ninja: ninja_syntax.Writer):
         current = Path("ver/current")
diff --git a/tools/build/pal_inc_c.py b/tools/build/pal_inc_c.py
deleted file mode 100755
index 1299e0f1ed..0000000000
--- a/tools/build/pal_inc_c.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python3
-
-from sys import argv
-import struct
-
-if __name__ == "__main__":
-    infile, outfile, cname = argv[1:]
-
-    with open(outfile, "w") as f:
-        f.write(f"unsigned short {cname}[] = {{ ")
-
-        with open(infile, "rb") as i:
-            while short := i.read(2):
-                color = struct.unpack(">H", short)[0]
-                f.write(f"0x{color:04X}, ")
-
-        f.write("};\n")
diff --git a/tools/old/asset_rework.py b/tools/old/asset_rework.py
new file mode 100644
index 0000000000..4d40780317
--- /dev/null
+++ b/tools/old/asset_rework.py
@@ -0,0 +1,63 @@
+import os
+import re
+import sys
+
+IMG_C_RE = re.compile(r"#include \".*png\.inc\.c\"")
+PAL_C_RE = re.compile(r"#include \".*pal\.inc\.c\"")
+
+
+def img_replacer(match):
+    s = match.group(0)
+
+    png_inc_c_path = s.split('"')[1]
+    png_inc_c_content = None
+
+    for version in ["us", "pal", "ique", "jp"]:
+        try:
+            with open(f"ver/{version}/build/include/" + png_inc_c_path, "r") as f:
+                png_inc_c_content = f.read()
+            break
+        except FileNotFoundError:
+            pass
+
+    if png_inc_c_content is None:
+        print(f"Could not find {png_inc_c_path} in any version")
+        return s
+
+    symbol_name = png_inc_c_content.split()[2][:-2]
+    path_bin = png_inc_c_path.replace(".inc.c", ".bin")
+
+    inc_type = "INCLUDE_IMG" if ".png" in png_inc_c_path else "INCLUDE_PAL"
+
+    return f'{inc_type}("{path_bin}", {symbol_name});'
+
+
+for dirs, subdirs, files in os.walk("src"):
+    for file in files:
+        if file.endswith(".c"):
+            with open(os.path.join(dirs, file), "r") as f:
+                source_lines = f.readlines()
+
+            if any(IMG_C_RE.match(l) or PAL_C_RE.match(l) for l in source_lines):
+                # Find first empty line in file and put the include there
+                first_line_idx = 0
+
+                if "effects/gfx" in dirs:
+                    source_lines.insert(0, '#include "include_asset.h"\n')
+                    source_lines.insert(1, "\n")
+                else:
+                    try:
+                        first_line_idx = source_lines.index("\n")
+                        if first_line_idx > 11:
+                            print("File {} has more than 11 lines before first empty line".format(file))
+                            continue
+                    except ValueError:
+                        first_line_idx = 0
+                    source_lines.insert(first_line_idx, '#include "include_asset.h"\n')
+
+                for i in range(len(source_lines)):
+                    source_lines[i] = re.sub(IMG_C_RE, img_replacer, source_lines[i])
+                    source_lines[i] = re.sub(PAL_C_RE, img_replacer, source_lines[i])
+
+                with open(os.path.join(dirs, file), "w") as f:
+                    f.writelines(source_lines)
diff --git a/ver/ique/symbol_addrs.txt b/ver/ique/symbol_addrs.txt
index 34767c32c9..b9b5055f3e 100644
--- a/ver/ique/symbol_addrs.txt
+++ b/ver/ique/symbol_addrs.txt
@@ -1761,8 +1761,8 @@ kmr_02_heart_block_pal = 0x80257D00; // segment:kmr_02 rom:0x9107A0
 kmr_04_hammer_block_message_img = 0x80241BF0; // segment:kmr_04 rom:0x914F20
 kmr_04_hammer_block_message_pal = 0x80242070; // segment:kmr_04 rom:0x9153A0
 kmr_20_records_screen_gfx = 0x80252D50; // segment:kmr_20 rom:0x9475A0
-D_80241900_900F70 = 0x80241900; // segment:kmr_22 rom:0x9499A0
-D_80241D00_901370 = 0x80241D00; // segment:kmr_22 rom:0x949DA0
+D_80241900 = 0x80241900; // segment:kmr_22 rom:0x9499A0
+D_80241D00 = 0x80241D00; // segment:kmr_22 rom:0x949DA0
 kmr_22_lava_piranha_vine_gfx = 0x80241F00; // segment:kmr_22 rom:0x949FA0
 kmr_23_window_ul_img = 0x802416C8; // segment:kmr_23 rom:0x951B28
 kmr_23_window_ur_img = 0x80241708; // segment:kmr_23 rom:0x951B68
@@ -2113,13 +2113,6 @@ battle_action_cmd_whirlwind_bubble_png = 0x802AA1A0; // rom:0x46D860
 battle_action_cmd_whirlwind_bubble_pal = 0x802AA6E0; // rom:0x46DDA0
 
 // effects data
-D_09000000_326410 = 0x09000000; // rom:0x36EE60
-D_09000220_326630 = 0x09000220; // rom:0x36F080
-D_09000440_326850 = 0x09000440; // rom:0x36F2A0
-D_09000660_326A70 = 0x09000660; // rom:0x36F4C0
-D_09000880_326C90 = 0x09000880; // rom:0x36F6E0
-D_09000AA0_326EB0 = 0x09000AA0; // rom:0x36F900
-D_09000CC0_3270D0 = 0x09000CC0; // rom:0x36FB20
 D_09000EE0_3272F0 = 0x09000EE0; // rom:0x36FD40
 D_09000F20_327330 = 0x09000F20; // rom:0x36FD80
 D_09000F88_327398 = 0x09000F88; // rom:0x36FDE8
@@ -2871,29 +2864,14 @@ D_09001000_398040 = 0x09001000; // rom:0x3E0A90
 D_09001040_398080 = 0x09001040; // rom:0x3E0AD0
 D_090010E8_398128 = 0x090010E8; // rom:0x3E0B78
 D_09001190_3981D0 = 0x09001190; // rom:0x3E0C20
-D_09000018_398BD8 = 0x09000018; // rom:0x3E1628
-D_09000218_398DD8 = 0x09000218; // rom:0x3E1828
-D_09000288_398E48 = 0x09000288; // rom:0x3E1898
-D_09001288_399E48 = 0x09001288; // rom:0x3E2898
-D_090012F8_399EB8 = 0x090012F8; // rom:0x3E2908
-D_09001518_39A0D8 = 0x09001518; // rom:0x3E2B28
-D_090015B8_39A178 = 0x090015B8; // rom:0x3E2BC8
 D_090017B8_39A378 = 0x090017B8; // rom:0x3E2DC8
-D_09001828_39A3E8 = 0x09001828; // rom:0x3E2E38
 D_09001C48_39A808 = 0x09001C48; // rom:0x3E3258
-D_09001CE8_39A8A8 = 0x09001CE8; // rom:0x3E32F8
 D_09002CE8_39B8A8 = 0x09002CE8; // rom:0x3E42F8
-D_09002D58_39B918 = 0x09002D58; // rom:0x3E4368
 D_09003578_39C138 = 0x09003578; // rom:0x3E4B88
-D_09003618_39C1D8 = 0x09003618; // rom:0x3E4C28
 D_09003E18_39C9D8 = 0x09003E18; // rom:0x3E5428
-D_09003E88_39CA48 = 0x09003E88; // rom:0x3E5498
 D_090040A8_39CC68 = 0x090040A8; // rom:0x3E56B8
-D_09004248_39CE08 = 0x09004248; // rom:0x3E5858
 D_09004A68_39D628 = 0x09004A68; // rom:0x3E6078
-D_09004B08_39D6C8 = 0x09004B08; // rom:0x3E6118
 D_09005308_39DEC8 = 0x09005308; // rom:0x3E6918
-D_09005378_39DF38 = 0x09005378; // rom:0x3E6988
 D_09006378_39EF38 = 0x09006378; // rom:0x3E7988
 D_090063E8_39EFA8 = 0x090063E8; // rom:0x3E79F8
 D_09006428_39EFE8 = 0x09006428; // rom:0x3E7A38
@@ -3024,17 +3002,6 @@ D_09003068_3AA808 = 0x09003068; // rom:0x3F3258
 D_090030A0_3AA840 = 0x090030A0; // rom:0x3F3290
 D_090030D8_3AA878 = 0x090030D8; // rom:0x3F32C8
 D_09003110_3AA8B0 = 0x09003110; // rom:0x3F3300
-D_09000000_3AB030 = 0x09000000; // rom:0x3F3A80
-D_09000420_3AB450 = 0x09000420; // rom:0x3F3EA0
-D_09000840_3AB870 = 0x09000840; // rom:0x3F42C0
-D_09000C50_3ABC80 = 0x09000C50; // rom:0x3F46D0
-D_09001070_3AC0A0 = 0x09001070; // rom:0x3F4AF0
-D_09001480_3AC4B0 = 0x09001480; // rom:0x3F4F00
-D_090018A0_3AC8D0 = 0x090018A0; // rom:0x3F5320
-D_09001CC0_3ACCF0 = 0x09001CC0; // rom:0x3F5740
-D_090020E0_3AD110 = 0x090020E0; // rom:0x3F5B60
-D_09002500_3AD530 = 0x09002500; // rom:0x3F5F80
-D_09002920_3AD950 = 0x09002920; // rom:0x3F63A0
 D_09002D40_3ADD70 = 0x09002D40; // rom:0x3F67C0
 D_09003880_3AE8B0 = 0x09003880; // rom:0x3F7300
 D_090038F8_3AE928 = 0x090038F8; // rom:0x3F7378
@@ -3141,7 +3108,7 @@ D_090002A8_3BCD38 = 0x090002A8; // rom:0x405788
 D_09000000_3BD9A0 = 0x09000000; // rom:0x4063F0
 D_09000800_3BE1A0 = 0x09000800; // rom:0x406BF0
 D_09000878_3BE218 = 0x09000878; // rom:0x406C68
-D_09000A98_3BE438 = 0x09000A98; // rom:0x406E88
+D_09000A78_3BE418 = 0x09000A78; // rom:0x406E68
 D_09000B40_3BE4E0 = 0x09000B40; // rom:0x406F30
 D_09000BC0_3BE560 = 0x09000BC0; // rom:0x406FB0
 D_09000BF0_3BE590 = 0x09000BF0; // rom:0x406FE0
@@ -3243,8 +3210,6 @@ D_09003778_3C1118 = 0x09003778; // rom:0x409B68
 D_09003790_3C1130 = 0x09003790; // rom:0x409B80
 D_090037A8_3C1148 = 0x090037A8; // rom:0x409B98
 D_09003818_3C11B8 = 0x09003818; // rom:0x409C08
-D_09000000_3C1BA0 = 0x09000000; // rom:0x40A5F0
-D_09002020_3C3BC0 = 0x09002020; // rom:0x40C610
 D_09004040_3C5BE0 = 0x09004040; // rom:0x40E630
 D_090043B0_3C5F50 = 0x090043B0; // rom:0x40E9A0
 D_09004720_3C62C0 = 0x09004720; // rom:0x40ED10
@@ -3422,15 +3387,6 @@ D_090002E8_3E6218 = 0x090002E8; // rom:0x42EC68
 D_090003A0_3E62D0 = 0x090003A0; // rom:0x42ED20
 D_090003C0_3E62F0 = 0x090003C0; // rom:0x42ED40
 D_090003D0_3E6300 = 0x090003D0; // rom:0x42ED50
-D_090003E8_3E6318 = 0x090003E8; // rom:0x42ED68
-D_090005E8_3E6518 = 0x090005E8; // rom:0x42EF68
-D_090009E8_3E6918 = 0x090009E8; // rom:0x42F368
-D_090013E8_3E7318 = 0x090013E8; // rom:0x42FD68
-D_09001DE8_3E7D18 = 0x09001DE8; // rom:0x430768
-D_090027E8_3E8718 = 0x090027E8; // rom:0x431168
-D_090031E8_3E9118 = 0x090031E8; // rom:0x431B68
-D_09003BE8_3E9B18 = 0x09003BE8; // rom:0x432568
-D_090045E8_3EA518 = 0x090045E8; // rom:0x432F68
 D_09004FE8_3EAF18 = 0x09004FE8; // rom:0x433968
 D_09005090_3EAFC0 = 0x09005090; // rom:0x433A10
 D_090050F0_3EB020 = 0x090050F0; // rom:0x433A70
@@ -3486,17 +3442,6 @@ D_090010B8_3F9D78 = 0x090010B8; // rom:0x4427C8
 D_090010F8_3F9DB8 = 0x090010F8; // rom:0x442808
 D_09001148_3F9E08 = 0x09001148; // rom:0x442858
 D_09001168_3F9E28 = 0x09001168; // rom:0x442878
-D_09000000_3FA4B0 = 0x09000000; // rom:0x442F00
-D_09000400_3FA8B0 = 0x09000400; // rom:0x443300
-D_09000A00_3FAEB0 = 0x09000A00; // rom:0x443900
-D_09000E00_3FB2B0 = 0x09000E00; // rom:0x443D00
-D_09001080_3FB530 = 0x09001080; // rom:0x443F80
-D_09001700_3FBBB0 = 0x09001700; // rom:0x444600
-D_09001D80_3FC230 = 0x09001D80; // rom:0x444C80
-D_09002400_3FC8B0 = 0x09002400; // rom:0x445300
-D_09002A80_3FCF30 = 0x09002A80; // rom:0x445980
-D_09003100_3FD5B0 = 0x09003100; // rom:0x446000
-D_09003780_3FDC30 = 0x09003780; // rom:0x446680
 D_09003E00_3FE2B0 = 0x09003E00; // rom:0x446D00
 D_09003F98_3FE448 = 0x09003F98; // rom:0x446E98
 D_09004010_3FE4C0 = 0x09004010; // rom:0x446F10
@@ -3572,15 +3517,6 @@ D_09001758_4009A8 = 0x09001758; // rom:0x4493F8
 D_09001778_4009C8 = 0x09001778; // rom:0x449418
 D_09001788_4009D8 = 0x09001788; // rom:0x449428
 D_09001798_4009E8 = 0x09001798; // rom:0x449438
-D_090017B0_400A00 = 0x090017B0; // rom:0x449450
-D_090019F0_400C40 = 0x090019F0; // rom:0x449690
-D_09001C30_400E80 = 0x09001C30; // rom:0x4498D0
-D_09001E70_4010C0 = 0x09001E70; // rom:0x449B10
-D_090020B0_401300 = 0x090020B0; // rom:0x449D50
-D_090022F0_401540 = 0x090022F0; // rom:0x449F90
-D_09002530_401780 = 0x09002530; // rom:0x44A1D0
-D_09002770_4019C0 = 0x09002770; // rom:0x44A410
-D_09002A70_401CC0 = 0x09002A70; // rom:0x44A710
 D_09002D70_401FC0 = 0x09002D70; // rom:0x44AA10
 D_09002DD8_402028 = 0x09002DD8; // rom:0x44AA78
 D_09002E70_4020C0 = 0x09002E70; // rom:0x44AB10
@@ -3611,24 +3547,12 @@ D_090005A8_404198 = 0x090005A8; // rom:0x44CBE8
 D_090005C8_4041B8 = 0x090005C8; // rom:0x44CC08
 D_090005E8_4041D8 = 0x090005E8; // rom:0x44CC28
 D_09000608_4041F8 = 0x09000608; // rom:0x44CC48
-D_09000000_404F40 = 0x09000000; // rom:0x44D990
-D_09000400_405340 = 0x09000400; // rom:0x44DD90
-D_09000800_405740 = 0x09000800; // rom:0x44E190
-D_09000C00_405B40 = 0x09000C00; // rom:0x44E590
-D_09000E00_405D40 = 0x09000E00; // rom:0x44E790
-D_09001000_405F40 = 0x09001000; // rom:0x44E990
-D_09001200_406140 = 0x09001200; // rom:0x44EB90
-D_09001400_406340 = 0x09001400; // rom:0x44ED90
 D_09001800_406740 = 0x09001800; // rom:0x44F190
 D_090019A0_4068E0 = 0x090019A0; // rom:0x44F330
 D_09001A18_406958 = 0x09001A18; // rom:0x44F3A8
 D_09001A90_4069D0 = 0x09001A90; // rom:0x44F420
 D_09001B08_406A48 = 0x09001B08; // rom:0x44F498
 D_09001B80_406AC0 = 0x09001B80; // rom:0x44F510
-D_09000000_407080 = 0x09000000; // rom:0x44FAD0
-D_09000A00_407A80 = 0x09000A00; // rom:0x4504D0
-D_09001000_408080 = 0x09001000; // rom:0x450AD0
-D_09001A00_408A80 = 0x09001A00; // rom:0x4514D0
 D_09002400_409480 = 0x09002400; // rom:0x451ED0
 D_09002468_4094E8 = 0x09002468; // rom:0x451F38
 D_090024A8_409528 = 0x090024A8; // rom:0x451F78
@@ -4735,3 +4659,176 @@ ui_battle_cursor_hand_png = 0x802838C0; // rom:0x1FB260
 ui_battle_cursor_hand_pal = 0x80283AC0; // rom:0x1FB460
 ResetTilesImg = 0x80072A80; // rom:0x4DE80
 
+D_090017B0_400A00 = 0x090017B0; // rom:0x449450
+D_090017F0_400A40 = 0x090017F0; // rom:0x449490
+D_090019F0_400C40 = 0x090019F0; // rom:0x449690
+D_09001A30_400C80 = 0x09001A30; // rom:0x4496D0
+D_09001C30_400E80 = 0x09001C30; // rom:0x4498D0
+D_09001C70_400EC0 = 0x09001C70; // rom:0x449910
+D_09001E70_4010C0 = 0x09001E70; // rom:0x449B10
+D_09001EB0_401100 = 0x09001EB0; // rom:0x449B50
+D_090020B0_401300 = 0x090020B0; // rom:0x449D50
+D_090020F0_401340 = 0x090020F0; // rom:0x449D90
+D_090022F0_401540 = 0x090022F0; // rom:0x449F90
+D_09002330_401580 = 0x09002330; // rom:0x449FD0
+D_09002530_401780 = 0x09002530; // rom:0x44A1D0
+D_09002570_4017C0 = 0x09002570; // rom:0x44A210
+D_09002770_4019C0 = 0x09002770; // rom:0x44A410
+D_09002870_401AC0 = 0x09002870; // rom:0x44A510
+D_09002A70_401CC0 = 0x09002A70; // rom:0x44A710
+D_09002B70_401DC0 = 0x09002B70; // rom:0x44A810
+
+D_09000000_3C1BA0 = 0x09000000; // rom:0x40A5F0
+D_09002000_3C3BA0 = 0x09002000; // rom:0x40C5F0
+D_09002020_3C3BC0 = 0x09002020; // rom:0x40C610
+D_09004020_3C5BC0 = 0x09004020; // rom:0x40E610
+
+D_09000018_398BD8 = 0x09000018; // rom:0x3E1628
+D_09000288_398E48 = 0x09000288; // rom:0x3E1898
+D_090012F8_399EB8 = 0x090012F8; // rom:0x3E2908
+D_090014F8_39A0B8 = 0x090014F8; // rom:0x3E2B08
+D_090015B8_39A178 = 0x090015B8; // rom:0x3E2BC8
+D_09001828_39A3E8 = 0x09001828; // rom:0x3E2E38
+D_09001C28_39A7E8 = 0x09001C28; // rom:0x3E3238
+D_09001CE8_39A8A8 = 0x09001CE8; // rom:0x3E32F8
+D_09002D58_39B918 = 0x09002D58; // rom:0x3E4368
+D_09003558_39C118 = 0x09003558; // rom:0x3E4B68
+D_09003618_39C1D8 = 0x09003618; // rom:0x3E4C28
+D_09003E88_39CA48 = 0x09003E88; // rom:0x3E5498
+D_09004088_39CC48 = 0x09004088; // rom:0x3E5698
+D_09004248_39CE08 = 0x09004248; // rom:0x3E5858
+D_09004A48_39D608 = 0x09004A48; // rom:0x3E6058
+D_09004B08_39D6C8 = 0x09004B08; // rom:0x3E6118
+D_09005378_39DF38 = 0x09005378; // rom:0x3E6988
+
+D_09000000_3AB030 = 0x09000000; // rom:0x3F3A80
+D_09000400_3AB430 = 0x09000400; // rom:0x3F3E80
+D_09000420_3AB450 = 0x09000420; // rom:0x3F3EA0
+D_09000820_3AB850 = 0x09000820; // rom:0x3F42A0
+D_09000840_3AB870 = 0x09000840; // rom:0x3F42C0
+D_09000C40_3ABC70 = 0x09000C40; // rom:0x3F46C0
+D_09000C50_3ABC80 = 0x09000C50; // rom:0x3F46D0
+D_09001050_3AC080 = 0x09001050; // rom:0x3F4AD0
+D_09001070_3AC0A0 = 0x09001070; // rom:0x3F4AF0
+D_09001470_3AC4A0 = 0x09001470; // rom:0x3F4EF0
+D_09001480_3AC4B0 = 0x09001480; // rom:0x3F4F00
+D_09001880_3AC8B0 = 0x09001880; // rom:0x3F5300
+D_090018A0_3AC8D0 = 0x090018A0; // rom:0x3F5320
+D_09001CA0_3ACCD0 = 0x09001CA0; // rom:0x3F5720
+D_09001CC0_3ACCF0 = 0x09001CC0; // rom:0x3F5740
+D_090020C0_3AD0F0 = 0x090020C0; // rom:0x3F5B40
+D_090020E0_3AD110 = 0x090020E0; // rom:0x3F5B60
+D_090024E0_3AD510 = 0x090024E0; // rom:0x3F5F60
+D_09002500_3AD530 = 0x09002500; // rom:0x3F5F80
+D_09002900_3AD930 = 0x09002900; // rom:0x3F6380
+D_09002920_3AD950 = 0x09002920; // rom:0x3F63A0
+D_09002D20_3ADD50 = 0x09002D20; // rom:0x3F67A0
+
+D_09000000_3FA4B0 = 0x09000000; // rom:0x442F00
+D_09000200_3FA6B0 = 0x09000200; // rom:0x443100
+D_09000400_3FA8B0 = 0x09000400; // rom:0x443300
+D_09000800_3FACB0 = 0x09000800; // rom:0x443700
+D_09000A00_3FAEB0 = 0x09000A00; // rom:0x443900
+D_09000C00_3FB0B0 = 0x09000C00; // rom:0x443B00
+D_09000E00_3FB2B0 = 0x09000E00; // rom:0x443D00
+D_09000E80_3FB330 = 0x09000E80; // rom:0x443D80
+D_09001080_3FB530 = 0x09001080; // rom:0x443F80
+D_09001500_3FB9B0 = 0x09001500; // rom:0x444400
+D_09001700_3FBBB0 = 0x09001700; // rom:0x444600
+D_09001B80_3FC030 = 0x09001B80; // rom:0x444A80
+D_09001D80_3FC230 = 0x09001D80; // rom:0x444C80
+D_09002200_3FC6B0 = 0x09002200; // rom:0x445100
+D_09002400_3FC8B0 = 0x09002400; // rom:0x445300
+D_09002880_3FCD30 = 0x09002880; // rom:0x445780
+D_09002A80_3FCF30 = 0x09002A80; // rom:0x445980
+D_09002F00_3FD3B0 = 0x09002F00; // rom:0x445E00
+D_09003100_3FD5B0 = 0x09003100; // rom:0x446000
+D_09003580_3FDA30 = 0x09003580; // rom:0x446480
+D_09003780_3FDC30 = 0x09003780; // rom:0x446680
+D_09003C00_3FE0B0 = 0x09003C00; // rom:0x446B00
+
+D_090003E8_3E6318 = 0x090003E8; // rom:0x42ED68
+D_090005E8_3E6518 = 0x090005E8; // rom:0x42EF68
+D_090007E8_3E6718 = 0x090007E8; // rom:0x42F168
+D_090009E8_3E6918 = 0x090009E8; // rom:0x42F368
+D_090011E8_3E7118 = 0x090011E8; // rom:0x42FB68
+D_090013E8_3E7318 = 0x090013E8; // rom:0x42FD68
+D_09001BE8_3E7B18 = 0x09001BE8; // rom:0x430568
+D_09001DE8_3E7D18 = 0x09001DE8; // rom:0x430768
+D_090025E8_3E8518 = 0x090025E8; // rom:0x430F68
+D_090027E8_3E8718 = 0x090027E8; // rom:0x431168
+D_09002FE8_3E8F18 = 0x09002FE8; // rom:0x431968
+D_090031E8_3E9118 = 0x090031E8; // rom:0x431B68
+D_090039E8_3E9918 = 0x090039E8; // rom:0x432368
+D_09003BE8_3E9B18 = 0x09003BE8; // rom:0x432568
+D_090043E8_3EA318 = 0x090043E8; // rom:0x432D68
+D_090045E8_3EA518 = 0x090045E8; // rom:0x432F68
+D_09004DE8_3EAD18 = 0x09004DE8; // rom:0x433768
+
+D_09000000_407080 = 0x09000000; // rom:0x44FAD0
+D_09000800_407880 = 0x09000800; // rom:0x4502D0
+D_09000A00_407A80 = 0x09000A00; // rom:0x4504D0
+D_09000E00_407E80 = 0x09000E00; // rom:0x4508D0
+D_09001000_408080 = 0x09001000; // rom:0x450AD0
+D_09001800_408880 = 0x09001800; // rom:0x4512D0
+D_09001A00_408A80 = 0x09001A00; // rom:0x4514D0
+D_09002200_409280 = 0x09002200; // rom:0x451CD0
+
+D_09002E90_32BD30 = 0x09002E90; // rom:0x374780
+D_09000080_3E1350 = 0x09000080; // rom:0x429DA0
+D_09000080_32CF40 = 0x09000080; // rom:0x375990
+D_090000A0_32CF60 = 0x090000A0; // rom:0x3759B0
+D_09000080_3304E0 = 0x09000080; // rom:0x378F30
+D_09001C00_36CAE0 = 0x09001C00; // rom:0x3B5530
+
+D_09002400_3B1B00 = 0x09002400; // rom:0x3FA550
+
+D_09000800_380BA0 = 0x09000800; // rom:0x3C95F0
+D_09000A80_380E20 = 0x09000A80; // rom:0x3C9870
+
+D_09000080_32ECD0 = 0x09000080; // rom:0x377720
+D_09000200_3D2780 = 0x09000200; // rom:0x41B1D0
+D_09000200_3CFCF0 = 0x09000200; // rom:0x418740
+D_09000600_3D00F0 = 0x09000600; // rom:0x418B40
+
+D_09000400_394A70 = 0x09000400; // rom:0x3DD4C0
+D_09000A00_395070 = 0x09000A00; // rom:0x3DDAC0
+D_09001000_395670 = 0x09001000; // rom:0x3DE0C0
+
+D_09000000_404F40 = 0x09000000; // rom:0x44D990
+D_09000200_405140 = 0x09000200; // rom:0x44DB90
+D_09000400_405340 = 0x09000400; // rom:0x44DD90
+D_09000600_405540 = 0x09000600; // rom:0x44DF90
+D_09000800_405740 = 0x09000800; // rom:0x44E190
+D_09000A00_405940 = 0x09000A00; // rom:0x44E390
+D_09000C00_405B40 = 0x09000C00; // rom:0x44E590
+D_09000E00_405D40 = 0x09000E00; // rom:0x44E790
+D_09001000_405F40 = 0x09001000; // rom:0x44E990
+D_09001200_406140 = 0x09001200; // rom:0x44EB90
+D_09001400_406340 = 0x09001400; // rom:0x44ED90
+D_09001600_406540 = 0x09001600; // rom:0x44EF90
+
+D_09000000_326410 = 0x09000000; // rom:0x36EE60
+D_09000200_326610 = 0x09000200; // rom:0x36F060
+D_09000220_326630 = 0x09000220; // rom:0x36F080
+D_09000420_326830 = 0x09000420; // rom:0x36F280
+D_09000440_326850 = 0x09000440; // rom:0x36F2A0
+D_09000640_326A50 = 0x09000640; // rom:0x36F4A0
+D_09000660_326A70 = 0x09000660; // rom:0x36F4C0
+D_09000860_326C70 = 0x09000860; // rom:0x36F6C0
+D_09000880_326C90 = 0x09000880; // rom:0x36F6E0
+D_09000A80_326E90 = 0x09000A80; // rom:0x36F8E0
+D_09000AA0_326EB0 = 0x09000AA0; // rom:0x36F900
+D_09000CA0_3270B0 = 0x09000CA0; // rom:0x36FB00
+D_09000CC0_3270D0 = 0x09000CC0; // rom:0x36FB20
+D_09000EC0_3272D0 = 0x09000EC0; // rom:0x36FD20
+
+D_802A1418_79F358 = 0x802A1418; // rom:0x7E7DA8
+D_802A2490_7A03D0 = 0x802A2490; // rom:0x7E8E20
+D_802A3508_7A1448 = 0x802A3508; // rom:0x7E9E98
+D_802A4580_7A24C0 = 0x802A4580; // rom:0x7EAF10
+D_802A55F8_7A3538 = 0x802A55F8; // rom:0x7EBF88
+D_802A6670_7A45B0 = 0x802A6670; // rom:0x7ED000
+
+D_09000218_398DD8 = 0x09000218; // rom:0x3E1828
+D_09001518_39A0D8 = 0x09001518; // rom:0x3E2B28
diff --git a/ver/pal/symbol_addrs.txt b/ver/pal/symbol_addrs.txt
index e9b6d4e50c..3e346bbe9a 100644
--- a/ver/pal/symbol_addrs.txt
+++ b/ver/pal/symbol_addrs.txt
@@ -2184,6 +2184,7 @@ mgm_01_panel_bowser_img = 0x80243380; // rom:0xE82510
 mgm_01_panel_bowser_pal = 0x80243580; // rom:0xE82710
 mgm_02_panel_peach_img = 0x80248380; // rom:0xE8AB70
 mgm_02_panel_peach_pal = 0x80248580; // rom:0xE8AD70
+D_801094B0 = 0x80108050; // rom:0xA1160
 D_80109710 = 0x801082B0; // rom:0xA13C0
 D_801097D8 = 0x80108378; // rom:0xA1488
 ui_box_corners9_png = 0x80108580; // rom:0xA1690
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index faa7954393..ffc8cdc1e2 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -14774,6 +14774,21 @@ segments:
     - [auto, c, kzn_19_4_npc]
     - [auto, c, kzn_19_5_eruption]
     - [auto, c, kzn_19_6_entity]
+    - [auto, .data, kzn_19_0_header]
+    - [auto, .data, kzn_19_1_music]
+    - [auto, .data, kzn_19_2_main]
+    - [auto, .data, kzn_19_3_npc_settings]
+    - start: 0xEABB20
+      type: .data
+      name: kzn_19_4_npc
+      subsegments:
+      - [0xEABB20]
+      - [0xEABFB8, ci4, ../../lava_piranha/vine, 64, 32]
+      - [0xEAC3B8, palette, ../../lava_piranha/vine]
+      - [0xEAC5B8, gfx_common, ../../lava_piranha/vine]
+      - [0xEAC698]
+    - [auto, .data, kzn_19_5_eruption]
+    - [auto, .data, kzn_19_6_entity]
   - name: dead_kzn_20
     dir: world/dead/area_kzn/kzn_20
     type: code