Merge branch 'master' of https://github.com/Reonu/HackerSM64 into develop/merge-master-2.0.1-into-2.1.0

2026-01-21 10:17:19 -08:00 · 2022-06-28 12:43:02 -07:00
parent 1166d7441d 62d6ee135f
commit e6d68e6d76
89 changed files with 3205 additions and 1095 deletions
--- a/actors/flyguy/flyguy_face.custom.rgba16.png
+++ b/actors/flyguy/flyguy_face.custom.rgba16.png
--- 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
--- 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
--- a/actors/warp_pipe/warp_pipe_side.custom.rgba16.png
+++ b/actors/warp_pipe/warp_pipe_side.custom.rgba16.png