7 files changed, 34 insertions, 34 deletions
diff --git a/assets/objects/gameplay_keep/eff_fire.c b/assets/objects/gameplay_keep/eff_fire.c
index 7d95baaae..752737141 100644
--- a/assets/objects/gameplay_keep/eff_fire.c
+++ b/assets/objects/gameplay_keep/eff_fire.c
@@ -13,10 +13,10 @@ Gfx gEffFire2DL[24] = {
 #include "assets/objects/gameplay_keep/gEffFire2DL.inc.c"
 };
 
-u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)] = {
-#include "assets/objects/gameplay_keep/gDecorativeFlameMaskTex.i4.inc.c"
+u64 gEffFire1Tex[TEX_LEN(u64, gEffFire1Tex_WIDTH, gEffFire1Tex_HEIGHT, 4)] = {
+#include "assets/objects/gameplay_keep/gEffFire1Tex.i4.inc.c"
 };
 
-u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)] = {
-#include "assets/objects/gameplay_keep/gDecorativeFlameTex.i8.inc.c"
+u64 gEffFire2Tex[TEX_LEN(u64, gEffFire2Tex_WIDTH, gEffFire2Tex_HEIGHT, 8)] = {
+#include "assets/objects/gameplay_keep/gEffFire2Tex.i8.inc.c"
 };
diff --git a/assets/objects/gameplay_keep/eff_fire.h b/assets/objects/gameplay_keep/eff_fire.h
index cf3aee7eb..df53344fc 100644
--- a/assets/objects/gameplay_keep/eff_fire.h
+++ b/assets/objects/gameplay_keep/eff_fire.h
@@ -7,11 +7,11 @@
 extern Vtx gEffFireVtx[];
 extern Gfx gEffFire1DL[24];
 extern Gfx gEffFire2DL[24];
-#define gDecorativeFlameMaskTex_WIDTH 32
-#define gDecorativeFlameMaskTex_HEIGHT 128
-extern u64 gDecorativeFlameMaskTex[TEX_LEN(u64, gDecorativeFlameMaskTex_WIDTH, gDecorativeFlameMaskTex_HEIGHT, 4)];
-#define gDecorativeFlameTex_WIDTH 32
-#define gDecorativeFlameTex_HEIGHT 64
-extern u64 gDecorativeFlameTex[TEX_LEN(u64, gDecorativeFlameTex_WIDTH, gDecorativeFlameTex_HEIGHT, 8)];
+#define gEffFire1Tex_WIDTH 32
+#define gEffFire1Tex_HEIGHT 128
+extern u64 gEffFire1Tex[TEX_LEN(u64, gEffFire1Tex_WIDTH, gEffFire1Tex_HEIGHT, 4)];
+#define gEffFire2Tex_WIDTH 32
+#define gEffFire2Tex_HEIGHT 64
+extern u64 gEffFire2Tex[TEX_LEN(u64, gEffFire2Tex_WIDTH, gEffFire2Tex_HEIGHT, 8)];
 
 #endif
diff --git a/assets/objects/gameplay_keep/gFishInAirAnim.c b/assets/objects/gameplay_keep/gFishInAirAnim.c
new file mode 100644
index 000000000..edd8b8084
--- /dev/null
+++ b/assets/objects/gameplay_keep/gFishInAirAnim.c
@@ -0,0 +1,13 @@
+#include "gFishInAirAnim.h"
+
+s16 gFishInAirFrameData[] = {
+#include "assets/objects/gameplay_keep/gFishInAirFrameData.inc.c"
+};
+
+JointIndex gFishInAirJointIndices[] = {
+#include "assets/objects/gameplay_keep/gFishInAirJointIndices.inc.c"
+};
+
+AnimationHeader gFishInAirAnim = {
+#include "assets/objects/gameplay_keep/gFishInAirAnim.inc.c"
+};
diff --git a/assets/objects/gameplay_keep/gFishInAirAnim.h b/assets/objects/gameplay_keep/gFishInAirAnim.h
new file mode 100644
index 000000000..da6c526f1
--- /dev/null
+++ b/assets/objects/gameplay_keep/gFishInAirAnim.h
@@ -0,0 +1,10 @@
+#ifndef GAMEPLAY_KEEP_GFISHINAIRANIM_H
+#define GAMEPLAY_KEEP_GFISHINAIRANIM_H
+
+#include "animation.h"
+
+extern s16 gFishInAirFrameData[];
+extern JointIndex gFishInAirJointIndices[];
+extern AnimationHeader gFishInAirAnim;
+
+#endif
diff --git a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
deleted file mode 100644
index 7579f0ca9..000000000
--- a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "gFishOutOfWaterAnim.h"
-
-s16 gFishOutOfWaterFrameData[] = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterFrameData.inc.c"
-};
-
-JointIndex gFishOutOfWaterJointIndices[] = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterJointIndices.inc.c"
-};
-
-AnimationHeader gFishOutOfWaterAnim = {
-#include "assets/objects/gameplay_keep/gFishOutOfWaterAnim.inc.c"
-};
diff --git a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h b/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
deleted file mode 100644
index e96f71039..000000000
--- a/assets/objects/gameplay_keep/gFishOutOfWaterAnim.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
-#define GAMEPLAY_KEEP_GFISHOUTOFWATERANIM_H
-
-#include "animation.h"
-
-extern s16 gFishOutOfWaterFrameData[];
-extern JointIndex gFishOutOfWaterJointIndices[];
-extern AnimationHeader gFishOutOfWaterAnim;
-
-#endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h
index 3419f2567..b9abeab52 100644
--- a/assets/objects/gameplay_keep/gameplay_keep.h
+++ b/assets/objects/gameplay_keep/gameplay_keep.h
@@ -44,7 +44,7 @@
 #include "gameplay_keep_0x16A50.h"
 #include "hilite4_tex.h"
 #include "gameplay_keep_0x173D0.h"
-#include "gFishOutOfWaterAnim.h"
+#include "gFishInAirAnim.h"
 #include "gameplay_keep_0x18610.h"
 #include "gFishInWaterAnim.h"
 #include "eff_shockwave.h"