From 36d41a7f949d39a6519eecb7bccbb1193fc8f568 Mon Sep 17 00:00:00 2001
From: Arceveti <73617174+Arceveti@users.noreply.github.com>
Date: Sun, 16 Jan 2022 21:30:06 -0800
Subject: [PATCH] Renamed HackerSM64 modified assets so they don't conflict
 with vanilla assets (#293)

---
 ...ace.rgba16.png => flyguy_face.custom.rgba16.png} | Bin
 actors/flyguy/model.inc.c                           |   2 +-
 actors/warp_pipe/model.inc.c                        |   2 +-
 ....rgba16.png => warp_pipe_side.custom.rgba16.png} | Bin
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename actors/flyguy/{flyguy_face.rgba16.png => flyguy_face.custom.rgba16.png} (100%)
 rename actors/warp_pipe/{warp_pipe_side.rgba16.png => warp_pipe_side.custom.rgba16.png} (100%)

diff --git a/actors/flyguy/flyguy_face.rgba16.png b/actors/flyguy/flyguy_face.custom.rgba16.png
similarity index 100%
rename from actors/flyguy/flyguy_face.rgba16.png
rename to actors/flyguy/flyguy_face.custom.rgba16.png
diff --git a/actors/flyguy/model.inc.c b/actors/flyguy/model.inc.c
index c9fc0648..a651ce1b 100644
--- a/actors/flyguy/model.inc.c
+++ b/actors/flyguy/model.inc.c
@@ -10,7 +10,7 @@ ALIGNED8 static const Texture flyguy_seg8_texture_0800E088[] = {
 
 // 0x0800F088
 ALIGNED8 static const Texture flyguy_seg8_texture_0800F088[] = {
-#include "actors/flyguy/flyguy_face.rgba16.inc.c"
+#include "actors/flyguy/flyguy_face.custom.rgba16.inc.c"
 };
 
 // 0x0800F888
diff --git a/actors/warp_pipe/model.inc.c b/actors/warp_pipe/model.inc.c
index 418bd7c9..6e6ec952 100644
--- a/actors/warp_pipe/model.inc.c
+++ b/actors/warp_pipe/model.inc.c
@@ -96,7 +96,7 @@ static const Vtx warp_pipe_seg3_vertex_03007DC0[] = {
 
 // 0x03007E40
 ALIGNED8 static const Texture warp_pipe_seg3_texture_03007E40[] = {
-#include "actors/warp_pipe/warp_pipe_side.rgba16.inc.c"
+#include "actors/warp_pipe/warp_pipe_side.custom.rgba16.inc.c"
 };
 
 // 0x03008E40 - 0x03008F98
diff --git a/actors/warp_pipe/warp_pipe_side.rgba16.png b/actors/warp_pipe/warp_pipe_side.custom.rgba16.png
similarity index 100%
rename from actors/warp_pipe/warp_pipe_side.rgba16.png
rename to actors/warp_pipe/warp_pipe_side.custom.rgba16.png