Converted all textures to use string paths

actors/amp/model.inc.c

@@ -1,20 +1,12 @@
 // Amp
 
-ALIGNED8 static const Texture dAmpElectricityTexture[] = {
-#include "actors/amp/amp_electricity.rgba16.inc.c"
-};
+ALIGNED8 static const Texture dAmpElectricityTexture[] = "__OTR__actors/amp/amp_electricity";
 
-ALIGNED8 static const Texture dAmpEyesTexture[] = {
-#include "actors/amp/amp_eyes.rgba16.inc.c"
-};
+ALIGNED8 static const Texture dAmpEyesTexture[] = "__OTR__actors/amp/amp_eyes";
 
-ALIGNED8 static const Texture dAmpBodyTexture[] = {
-#include "actors/amp/amp_body.rgba16.inc.c"
-};
+ALIGNED8 static const Texture dAmpBodyTexture[] = "__OTR__actors/amp/amp_body";
 
-ALIGNED8 static const Texture dAmpMouthTexture[] = {
-#include "actors/amp/amp_mouth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture dAmpMouthTexture[] = "__OTR__actors/amp/amp_mouth";
 
 static const Vtx dAmpElectricityVertices[] = {
     {{{   224,      0,    -89}, 0, {     0,    480}, {0xff, 0xff, 0xff, 0xff}}},

actors/blue_coin_switch/model.inc.c

@@ -7,14 +7,10 @@ static const Lights1 blue_coin_switch_seg8_lights_08000000 = gdSPDefLights1(
 );
 
 // 0x08000018
-ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000018[] = {
-#include "actors/blue_coin_switch/blue_coin_switch_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000018[] = "__OTR__actors/blue_coin_switch/blue_coin_switch_side";
 
 // 0x08000418
-ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000418[] = {
-#include "actors/blue_coin_switch/blue_coin_switch_top.rgba16.inc.c"
-};
+ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000418[] = "__OTR__actors/blue_coin_switch/blue_coin_switch_top";
 
 // 0x08000C18
 static const Vtx blue_coin_switch_seg8_vertex_08000C18[] = {

actors/blue_fish/model.inc.c

@@ -7,9 +7,7 @@ static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1(
 );
 
 // 0x0301B5E0
-ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = {
-#include "actors/blue_fish/blue_fish.rgba16.inc.c"
-};
+ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = "__OTR__actors/blue_fish/blue_fish";
 
 // 0x0301BDE0
 static const Vtx blue_fish_seg3_vertex_0301BDE0[] = {

actors/bobomb/model.inc.c

@@ -1,34 +1,22 @@
 // Bobomb
 
 // 0x0801DA60
-ALIGNED8 static const Texture bobomb_seg8_texture_0801DA60[] = {
-#include "actors/bobomb/bob-omb_left_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_0801DA60[] = "__OTR__actors/bobomb/bob-omb_left_side";
 
 // 0x0801EA60
-ALIGNED8 static const Texture bobomb_seg8_texture_0801EA60[] = {
-#include "actors/bobomb/bob-omb_right_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_0801EA60[] = "__OTR__actors/bobomb/bob-omb_right_side";
 
 // 0x0801FA60
-ALIGNED8 static const Texture bobomb_seg8_texture_0801FA60[] = {
-#include "actors/bobomb/bob-omb_buddy_left_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_0801FA60[] = "__OTR__actors/bobomb/bob-omb_buddy_left_side";
 
 // 0x08020A60
-ALIGNED8 static const Texture bobomb_seg8_texture_08020A60[] = {
-#include "actors/bobomb/bob-omb_buddy_right_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_08020A60[] = "__OTR__actors/bobomb/bob-omb_buddy_right_side";
 
 // 0x08021A60
-ALIGNED8 static const Texture bobomb_seg8_texture_08021A60[] = {
-#include "actors/bobomb/bob-omb_eyes.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_08021A60[] = "__OTR__actors/bobomb/bob-omb_eyes";
 
 // 0x08022260
-ALIGNED8 static const Texture bobomb_seg8_texture_08022260[] = {
-#include "actors/bobomb/bob-omb_eyes_blink.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bobomb_seg8_texture_08022260[] = "__OTR__actors/bobomb/bob-omb_eyes_blink";
 
 // 0x08022A60
 static const Vtx bobomb_seg8_vertex_08022A60[] = {

actors/bomb/model.inc.c

@@ -7,19 +7,13 @@ static const Lights1 bomb_seg6_lights_06057AA8 = gdSPDefLights1(
 );
 
 // 0x06057AC0
-ALIGNED8 static const Texture bomb_seg6_texture_06057AC0[] = {
-#include "actors/bomb/bomb_left_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bomb_seg6_texture_06057AC0[] = "__OTR__actors/bomb/bomb_left_side";
 
 // 0x06058AC0
-ALIGNED8 static const Texture bomb_seg6_texture_06058AC0[] = {
-#include "actors/bomb/bomb_right_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bomb_seg6_texture_06058AC0[] = "__OTR__actors/bomb/bomb_right_side";
 
 // 0x06059AC0
-ALIGNED8 static const Texture bomb_seg6_texture_06059AC0[] = {
-#include "actors/bomb/bomb_spike.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bomb_seg6_texture_06059AC0[] = "__OTR__actors/bomb/bomb_spike";
 
 // 0x0605A2C0
 static const Vtx bomb_seg6_vertex_0605A2C0[] = {

actors/boo/model.inc.c

@@ -7,14 +7,10 @@ static const Lights1 boo_seg5_lights_05009B28 = gdSPDefLights1(
 );
 
 // 0x05009B40
-ALIGNED8 static const Texture boo_seg5_texture_05009B40[] = {
-#include "actors/boo/boo_eyes.rgba16.inc.c"
-};
+ALIGNED8 static const Texture boo_seg5_texture_05009B40[] = "__OTR__actors/boo/boo_eyes";
 
 // 0x0500AB40
-ALIGNED8 static const Texture boo_seg5_texture_0500AB40[] = {
-#include "actors/boo/boo_mouth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture boo_seg5_texture_0500AB40[] = "__OTR__actors/boo/boo_mouth";
 
 // 0x0500B340
 static const Vtx boo_seg5_vertex_0500B340[] = {

actors/boo_castle/model.inc.c

@@ -7,14 +7,10 @@ static const Lights1 boo_castle_seg6_lights_06015658 = gdSPDefLights1(
 );
 
 // 0x06015670
-ALIGNED8 static const Texture boo_castle_seg6_texture_06015670[] = {
-#include "actors/boo_castle/bbh_boo_eyes.rgba16.inc.c"
-};
+ALIGNED8 static const Texture boo_castle_seg6_texture_06015670[] = "__OTR__actors/boo_castle/bbh_boo_eyes";
 
 // 0x06016670
-ALIGNED8 static const Texture boo_castle_seg6_texture_06016670[] = {
-#include "actors/boo_castle/bbh_boo_mouth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture boo_castle_seg6_texture_06016670[] = "__OTR__actors/boo_castle/bbh_boo_mouth";
 
 // 0x06016E70
 static const Vtx boo_castle_seg6_vertex_06016E70[] = {

actors/book/model.inc.c

@@ -9,9 +9,7 @@ static const Lights1 book_seg5_lights_05002558 = gdSPDefLights1(
 );
 
 // 0x05002570
-ALIGNED8 static const Texture book_seg5_texture_05002570[] = {
-#include "actors/book/book_cover.rgba16.inc.c"
-};
+ALIGNED8 static const Texture book_seg5_texture_05002570[] = "__OTR__actors/book/book_cover";
 
 // 0x05002D70
 static const Vtx book_seg5_vertex_05002D70[] = {

actors/bookend/model.inc.c

@@ -25,29 +25,19 @@ UNUSED static const Lights1 bookend_lights_unused4 = gdSPDefLights1(
 );
 
 // 0x05000060
-ALIGNED8 static const Texture bookend_seg5_texture_05000060[] = {
-#include "actors/bookend/bookend_spine.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bookend_seg5_texture_05000060[] = "__OTR__actors/bookend/bookend_spine";
 
 // 0x05000460
-ALIGNED8 static const Texture bookend_seg5_texture_05000460[] = {
-#include "actors/bookend/bookend_tooth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bookend_seg5_texture_05000460[] = "__OTR__actors/bookend/bookend_tooth";
 
 // 0x05000860
-ALIGNED8 static const Texture bookend_seg5_texture_05000860[] = {
-#include "actors/bookend/bookend_mouth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bookend_seg5_texture_05000860[] = "__OTR__actors/bookend/bookend_mouth";
 
 // 0x05000C60
-ALIGNED8 static const Texture bookend_seg5_texture_05000C60[] = {
-#include "actors/bookend/bookend_pages.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bookend_seg5_texture_05000C60[] = "__OTR__actors/bookend/bookend_pages";
 
 // 0x05001060
-ALIGNED8 static const Texture bookend_seg5_texture_05001060[] = {
-#include "actors/bookend/bookend_cover.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bookend_seg5_texture_05001060[] = "__OTR__actors/bookend/bookend_cover";
 
 // 0x05001860
 static const Lights1 bookend_seg5_lights_05001860 = gdSPDefLights1(

actors/bowser/model.inc.c

@@ -1,151 +1,93 @@
 // Bowser (King Koopa)
 
 // 0x0601F438
-ALIGNED8 static const Texture bowser_seg6_texture_0601F438[] = {
-#include "actors/bowser/bowser_shell.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0601F438[] = "__OTR__actors/bowser/bowser_shell";
 
 // 0x0601FC38
-ALIGNED8 static const Texture bowser_seg6_texture_0601FC38[] = {
-#include "actors/bowser/bowser_eyebrow.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0601FC38[] = "__OTR__actors/bowser/bowser_eyebrow";
 
 // 0x06020C38
-ALIGNED8 static const Texture bowser_seg6_texture_06020C38[] = {
-#include "actors/bowser/bowser_muzzle.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06020C38[] = "__OTR__actors/bowser/bowser_muzzle";
 
 // 0x06021438
-ALIGNED8 static const Texture bowser_seg6_texture_06021438[] = {
-#include "actors/bowser/bowser_nostrils.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06021438[] = "__OTR__actors/bowser/bowser_nostrils";
 
 // 0x06022438
-ALIGNED8 static const Texture bowser_seg6_texture_06022438[] = {
-#include "actors/bowser/bowser_body.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06022438[] = "__OTR__actors/bowser/bowser_body";
 
 // 0x06022C38
-ALIGNED8 static const Texture bowser_seg6_texture_06022C38[] = {
-#include "actors/bowser/bowser_armband_spike.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06022C38[] = "__OTR__actors/bowser/bowser_armband_spike";
 
 // 0x06023C38
-ALIGNED8 static const Texture bowser_seg6_texture_06023C38[] = {
-#include "actors/bowser/bowser_armband.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06023C38[] = "__OTR__actors/bowser/bowser_armband";
 
 // 0x06024438
-ALIGNED8 static const Texture bowser_seg6_texture_06024438[] = {
-#include "actors/bowser/bowser_tongue.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06024438[] = "__OTR__actors/bowser/bowser_tongue";
 
 // 0x06025438
-ALIGNED8 static const Texture bowser_seg6_texture_06025438[] = {
-#include "actors/bowser/bowser_chest.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06025438[] = "__OTR__actors/bowser/bowser_chest";
 
 // 0x06025C38
-ALIGNED8 static const Texture bowser_seg6_texture_06025C38[] = {
-#include "actors/bowser/bowser_shell_edge.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06025C38[] = "__OTR__actors/bowser/bowser_shell_edge";
 
 // unreferenced, seen in pre-Spaceworld 1995 B-roll footage build
 // 0x06026438
-ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = {
-#include "actors/bowser/bowser_blue_eye_unused.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = "__OTR__actors/bowser/bowser_blue_eye_unused";
 
 // unreferenced (stubbed texture? possibly original texture for mouth)
 // 0x06027438
-ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = {
-#include "actors/bowser/bowser_mouth_unused.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = "__OTR__actors/bowser/bowser_mouth_unused";
 
 // 0x06028438
-ALIGNED8 static const Texture bowser_seg6_texture_06028438[] = {
-#include "actors/bowser/bowser_upper_face.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06028438[] = "__OTR__actors/bowser/bowser_upper_face";
 
 // 0x06028C38
-ALIGNED8 static const Texture bowser_seg6_texture_06028C38[] = {
-#include "actors/bowser/bowser_hair.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06028C38[] = "__OTR__actors/bowser/bowser_hair";
 
 // 0x06029C38
-ALIGNED8 static const Texture bowser_seg6_texture_06029C38[] = {
-#include "actors/bowser/bowser_claw_edge.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06029C38[] = "__OTR__actors/bowser/bowser_claw_edge";
 
 // 0x0602AC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602AC38[] = {
-#include "actors/bowser/bowser_claw_horn_tooth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602AC38[] = "__OTR__actors/bowser/bowser_claw_horn_tooth";
 
 // 0x0602BC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602BC38[] = {
-#include "actors/bowser/bowser_claw_horn_angle.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602BC38[] = "__OTR__actors/bowser/bowser_claw_horn_angle";
 
 // 0x0602CC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602CC38[] = {
-#include "actors/bowser/bowser_eye_left_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602CC38[] = "__OTR__actors/bowser/bowser_eye_left_0";
 
 // 0x0602DC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602DC38[] = {
-#include "actors/bowser/bowser_eye_half_closed_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602DC38[] = "__OTR__actors/bowser/bowser_eye_half_closed_0";
 
 // 0x0602EC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602EC38[] = {
-#include "actors/bowser/bowser_eye_closed_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602EC38[] = "__OTR__actors/bowser/bowser_eye_closed_0";
 
 // 0x0602FC38
-ALIGNED8 static const Texture bowser_seg6_texture_0602FC38[] = {
-#include "actors/bowser/bowser_eye_center_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_0602FC38[] = "__OTR__actors/bowser/bowser_eye_center_0";
 
 // 0x06030C38
-ALIGNED8 static const Texture bowser_seg6_texture_06030C38[] = {
-#include "actors/bowser/bowser_eye_right_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06030C38[] = "__OTR__actors/bowser/bowser_eye_right_0";
 
 // 0x06031C38
-ALIGNED8 static const Texture bowser_seg6_texture_06031C38[] = {
-#include "actors/bowser/bowser_eye_far_left_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06031C38[] = "__OTR__actors/bowser/bowser_eye_far_left_0";
 
 // 0x06032C38
-ALIGNED8 static const Texture bowser_seg6_texture_06032C38[] = {
-#include "actors/bowser/bowser_eye_left_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06032C38[] = "__OTR__actors/bowser/bowser_eye_left_1";
 
 // 0x06033C38
-ALIGNED8 static const Texture bowser_seg6_texture_06033C38[] = {
-#include "actors/bowser/bowser_eye_half_closed_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06033C38[] = "__OTR__actors/bowser/bowser_eye_half_closed_1";
 
 // 0x06034C38
-ALIGNED8 static const Texture bowser_seg6_texture_06034C38[] = {
-#include "actors/bowser/bowser_eye_closed_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06034C38[] = "__OTR__actors/bowser/bowser_eye_closed_1";
 
 // 0x06035C38
-ALIGNED8 static const Texture bowser_seg6_texture_06035C38[] = {
-#include "actors/bowser/bowser_eye_center_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06035C38[] = "__OTR__actors/bowser/bowser_eye_center_1";
 
 // 0x06036C38
-ALIGNED8 static const Texture bowser_seg6_texture_06036C38[] = {
-#include "actors/bowser/bowser_eye_right_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06036C38[] = "__OTR__actors/bowser/bowser_eye_right_1";
 
 // 0x06037C38
-ALIGNED8 static const Texture bowser_seg6_texture_06037C38[] = {
-#include "actors/bowser/bowser_eye_far_left_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bowser_seg6_texture_06037C38[] = "__OTR__actors/bowser/bowser_eye_far_left_1";
 
 // 0x06038C38
 static const Lights1 bowser_seg6_lights_06038C38 = gdSPDefLights1(

actors/bowser_flame/model.inc.c

@@ -3,74 +3,46 @@
 // TODO: These 64x64 textures are referenced as two different texture addresses in the DLs
 
 // 0x06000000
-ALIGNED8 static const Texture flame_seg6_texture_06000000[] = {
-#include "actors/bowser_flame/bowser_flame_0.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06000000[] = "__OTR__actors/bowser_flame/bowser_flame_0";
 
 // 0x06002000
-ALIGNED8 static const Texture flame_seg6_texture_06002000[] = {
-#include "actors/bowser_flame/bowser_flame_1.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06002000[] = "__OTR__actors/bowser_flame/bowser_flame_1";
 
 // 0x06004000
-ALIGNED8 static const Texture flame_seg6_texture_06004000[] = {
-#include "actors/bowser_flame/bowser_flame_2.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06004000[] = "__OTR__actors/bowser_flame/bowser_flame_2";
 
 // 0x06006000
-ALIGNED8 static const Texture flame_seg6_texture_06006000[] = {
-#include "actors/bowser_flame/bowser_flame_3.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06006000[] = "__OTR__actors/bowser_flame/bowser_flame_3";
 
 // 0x06008000
-ALIGNED8 static const Texture flame_seg6_texture_06008000[] = {
-#include "actors/bowser_flame/bowser_flame_4.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06008000[] = "__OTR__actors/bowser_flame/bowser_flame_4";
 
 // 0x0600A000
-ALIGNED8 static const Texture flame_seg6_texture_0600A000[] = {
-#include "actors/bowser_flame/bowser_flame_5.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_0600A000[] = "__OTR__actors/bowser_flame/bowser_flame_5";
 
 // 0x0600C000
-ALIGNED8 static const Texture flame_seg6_texture_0600C000[] = {
-#include "actors/bowser_flame/bowser_flame_6.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_0600C000[] = "__OTR__actors/bowser_flame/bowser_flame_6";
 
 // 0x0600E000
-ALIGNED8 static const Texture flame_seg6_texture_0600E000[] = {
-#include "actors/bowser_flame/bowser_flame_7.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_0600E000[] = "__OTR__actors/bowser_flame/bowser_flame_7";
 
 // 0x06010000
-ALIGNED8 static const Texture flame_seg6_texture_06010000[] = {
-#include "actors/bowser_flame/bowser_flame_8.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06010000[] = "__OTR__actors/bowser_flame/bowser_flame_8";
 
 // 0x06012000
-ALIGNED8 static const Texture flame_seg6_texture_06012000[] = {
-#include "actors/bowser_flame/bowser_flame_9.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06012000[] = "__OTR__actors/bowser_flame/bowser_flame_9";
 
 // 0x06014000
-ALIGNED8 static const Texture flame_seg6_texture_06014000[] = {
-#include "actors/bowser_flame/bowser_flame_10.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06014000[] = "__OTR__actors/bowser_flame/bowser_flame_10";
 
 // 0x06016000
-ALIGNED8 static const Texture flame_seg6_texture_06016000[] = {
-#include "actors/bowser_flame/bowser_flame_11.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06016000[] = "__OTR__actors/bowser_flame/bowser_flame_11";
 
 // 0x06018000
-ALIGNED8 static const Texture flame_seg6_texture_06018000[] = {
-#include "actors/bowser_flame/bowser_flame_12.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_06018000[] = "__OTR__actors/bowser_flame/bowser_flame_12";
 
 // 0x0601A000
-ALIGNED8 static const Texture flame_seg6_texture_0601A000[] = {
-#include "actors/bowser_flame/bowser_flame_13.rgba16.inc.c"
-};
+ALIGNED8 static const Texture flame_seg6_texture_0601A000[] = "__OTR__actors/bowser_flame/bowser_flame_13";
 
 // 0x0601C000
 static const Vtx flame_seg6_vertex_0601C000[] = {

actors/breakable_box/model.inc.c

@@ -7,14 +7,10 @@ static const Lights1 breakable_box_seg8_lights_08011A80 = gdSPDefLights1(
 );
 
 // 0x08011A90
-ALIGNED8 static const Texture breakable_box_seg8_texture_08011A90[] = {
-#include "actors/breakable_box/crazy_box_surface.rgba16.inc.c"
-};
+ALIGNED8 static const Texture breakable_box_seg8_texture_08011A90[] = "__OTR__actors/breakable_box/crazy_box_surface";
 
 // 0x08012290
-ALIGNED8 static const Texture breakable_box_seg8_texture_08012290[] = {
-#include "actors/breakable_box/cork_box_surface.rgba16.inc.c"
-};
+ALIGNED8 static const Texture breakable_box_seg8_texture_08012290[] = "__OTR__actors/breakable_box/cork_box_surface";
 
 // 0x08012A90
 static const Vtx breakable_box_seg8_vertex_08012A90[] = {

actors/bub/model.inc.c

@@ -13,24 +13,16 @@ static const Lights1 bub_seg6_lights_0600E290 = gdSPDefLights1(
 );
 
 // 0x0600E2A8
-ALIGNED8 static const Texture bub_seg6_texture_0600E2A8[] = {
-#include "actors/bub/bub_eye_border.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bub_seg6_texture_0600E2A8[] = "__OTR__actors/bub/bub_eye_border";
 
 // 0x0600EAA8
-ALIGNED8 static const Texture bub_seg6_texture_0600EAA8[] = {
-#include "actors/bub/bub_fins.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bub_seg6_texture_0600EAA8[] = "__OTR__actors/bub/bub_fins";
 
 // 0x0600F2A8
-ALIGNED8 static const Texture bub_seg6_texture_0600F2A8[] = {
-#include "actors/bub/bub_eyes.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bub_seg6_texture_0600F2A8[] = "__OTR__actors/bub/bub_eyes";
 
 // 0x060102A8
-ALIGNED8 static const Texture bub_seg6_texture_060102A8[] = {
-#include "actors/bub/bub_scales.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bub_seg6_texture_060102A8[] = "__OTR__actors/bub/bub_scales";
 
 // 0x060112A8
 static const Vtx bub_seg6_vertex_060112A8[] = {

actors/bubba/model.inc.c

@@ -8,30 +8,20 @@ UNUSED static const u64 bubba_unused_1 = 0;
 // Bubba
 
 // 0x05000008
-ALIGNED8 static const Texture bubba_seg5_texture_05000008[] = {
-#include "actors/bubba/bubba_sunglasses.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubba_seg5_texture_05000008[] = "__OTR__actors/bubba/bubba_sunglasses";
 
 // unused eye texture, assumed leftover from when actor file was copied from bub
 // 0x05000408
-ALIGNED8 static const Texture bubba_seg5_texture_05000408[] = {
-#include "actors/bubba/bubba_eyes_unused.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubba_seg5_texture_05000408[] = "__OTR__actors/bubba/bubba_eyes_unused";
 
 // 0x05001408
-ALIGNED8 static const Texture bubba_seg5_texture_05001408[] = {
-#include "actors/bubba/bubba_eye_border.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubba_seg5_texture_05001408[] = "__OTR__actors/bubba/bubba_eye_border";
 
 // 0x05001C08
-ALIGNED8 static const Texture bubba_seg5_texture_05001C08[] = {
-#include "actors/bubba/bubba_fins.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubba_seg5_texture_05001C08[] = "__OTR__actors/bubba/bubba_fins";
 
 // 0x05002408
-ALIGNED8 static const Texture bubba_seg5_texture_05002408[] = {
-#include "actors/bubba/bubba_scales.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubba_seg5_texture_05002408[] = "__OTR__actors/bubba/bubba_scales";
 
 // 0x05004408
 static const Lights1 bubba_seg5_lights_05004408 = gdSPDefLights1(

actors/bubble/model.inc.c

@@ -9,14 +9,10 @@ static const Vtx bubble_seg4_vertex_0401CD20[] = {
 };
 
 // 0x0401CD60
-ALIGNED8 static const Texture bubble_seg4_texture_0401CD60[] = {
-#include "actors/bubble/bubble.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubble_seg4_texture_0401CD60[] = "__OTR__actors/bubble/bubble";
 
 // 0x0401D560
-ALIGNED8 static const Texture bubble_seg4_texture_0401D560[] = {
-#include "actors/bubble/mr_i_bubble.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bubble_seg4_texture_0401D560[] = "__OTR__actors/bubble/mr_i_bubble";
 
 // 0x0401DD60 - 0x0401DDE0
 const Gfx bubble_seg4_dl_0401DD60[] = {

actors/bullet_bill/model.inc.c

@@ -7,14 +7,10 @@ static const Lights1 bullet_bill_seg5_lights_0500BA90 = gdSPDefLights1(
 );
 
 // 0x0500BAA8
-ALIGNED8 static const Texture bullet_bill_seg5_texture_0500BAA8[] = {
-#include "actors/bullet_bill/bullet_bill_eye.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bullet_bill_seg5_texture_0500BAA8[] = "__OTR__actors/bullet_bill/bullet_bill_eye";
 
 // 0x0500CAA8
-ALIGNED8 static const Texture bullet_bill_seg5_texture_0500CAA8[] = {
-#include "actors/bullet_bill/bullet_bill_mouth.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bullet_bill_seg5_texture_0500CAA8[] = "__OTR__actors/bullet_bill/bullet_bill_mouth";
 
 // 0x0500DAA8
 static const Vtx bullet_bill_seg5_vertex_0500DAA8[] = {

actors/bully/model.inc.c

@@ -19,9 +19,7 @@ static const Vtx bully_seg5_vertex_05000000[] = {
 };
 
 // 0x050000E0
-ALIGNED8 static const Texture bully_seg5_texture_050000E0[] = {
-#include "actors/bully/bully_horn.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bully_seg5_texture_050000E0[] = "__OTR__actors/bully/bully_horn";
 
 // 0x050002E0 - 0x05000398
 const Gfx bully_seg5_dl_050002E0[] = {
@@ -85,19 +83,13 @@ static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1(
 
 // //! There's another malformed light entry here.
 // 0x05000468
-ALIGNED8 static const Texture bully_seg5_texture_05000468[] = {
-#include "actors/bully/bully_left_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bully_seg5_texture_05000468[] = "__OTR__actors/bully/bully_left_side";
 
 // 0x05001468
-ALIGNED8 static const Texture bully_seg5_texture_05001468[] = {
-#include "actors/bully/bully_right_side.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bully_seg5_texture_05001468[] = "__OTR__actors/bully/bully_right_side";
 
 // 0x05002468
-ALIGNED8 static const Texture bully_seg5_texture_05002468[] = {
-#include "actors/bully/bully_eye.rgba16.inc.c"
-};
+ALIGNED8 static const Texture bully_seg5_texture_05002468[] = "__OTR__actors/bully/bully_eye";
 
 // 0x05002C68
 static const Vtx bully_seg5_vertex_05002C68[] = {

actors/burn_smoke/model.inc.c

@@ -12,9 +12,7 @@ static const Vtx burn_smoke_seg4_vertex_040217C0[] = {
 //     as a transparent black burn smoke. Probably meant to show up as white-ish
 //     burn smoke, but mistakened for being intended as black smoke.
 // 0x04021800
-ALIGNED8 static const Texture burn_smoke_seg4_texture_04021800[] = {
-#include "actors/burn_smoke/burn_smoke.ia16.inc.c"
-};
+ALIGNED8 static const Texture burn_smoke_seg4_texture_04021800[] = "__OTR__actors/burn_smoke/burn_smoke";
 
 // 0x04022000 - 0x04022028
 const Gfx burn_smoke_seg4_dl_04022000[] = {

actors/butterfly/model.inc.c

@@ -11,9 +11,7 @@ static const Vtx butterfly_seg3_vertex_03004348[] = {
 };
 
 // 0x030043A8
-ALIGNED8 static const Texture butterfly_seg3_texture_030043A8[] = {
-#include "actors/butterfly/butterfly_wing.rgba16.inc.c"
-};
+ALIGNED8 static const Texture butterfly_seg3_texture_030043A8[] = "__OTR__actors/butterfly/butterfly_wing";
 
 // 0x030053A8
 static const Vtx butterfly_seg3_vertex_030053A8[] = {

actors/cannon_barrel/model.inc.c

@@ -13,9 +13,7 @@ static const Lights1 cannon_barrel_seg8_lights_08005890 = gdSPDefLights1(
 );
 
 // 0x080058A8
-ALIGNED8 static const Texture cannon_barrel_seg8_texture_080058A8[] = {
-#include "actors/cannon_barrel/cannon_barrel.rgba16.inc.c"
-};
+ALIGNED8 static const Texture cannon_barrel_seg8_texture_080058A8[] = "__OTR__actors/cannon_barrel/cannon_barrel";
 
 // 0x080060A8
 static const Vtx cannon_barrel_seg8_vertex_080060A8[] = {