From b6362cacbe5cf2d7ad541ce14d24ebb11417a8fe Mon Sep 17 00:00:00 2001
From: engineer124 <47598039+engineer124@users.noreply.github.com>
Date: Sat, 18 Jun 2022 18:37:31 -0700
Subject: [PATCH] ClearTag cleanup (#830)
---
assets/xml/objects/gameplay_keep.xml | 18 +++++-----
.../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 34 +++++++++++++------
.../actors/ovl_En_Clear_Tag/z_en_clear_tag.h | 12 -------
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index f73e9252f4..6b624857f3 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -1044,15 +1044,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index beb2f2d174..bfc6102b0d 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -11,6 +11,18 @@
#define THIS ((EnClearTag*)thisx)
+typedef enum {
+ /* 0x00 */ CLEAR_TAG_EFFECT_AVAILABLE,
+ /* 0x01 */ CLEAR_TAG_EFFECT_DEBRIS,
+ /* 0x02 */ CLEAR_TAG_EFFECT_FIRE, // never set to, remnant of OoT
+ /* 0x03 */ CLEAR_TAG_EFFECT_SMOKE,
+ /* 0x04 */ CLEAR_TAG_EFFECT_FLASH,
+ /* 0x05 */ CLEAR_TAG_EFFECT_LIGHT_RAYS,
+ /* 0x06 */ CLEAR_TAG_EFFECT_SHOCKWAVE,
+ /* 0x07 */ CLEAR_TAG_EFFECT_SPLASH,
+ /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE,
+} ClearTagEffectType;
+
void EnClearTag_Init(Actor* thisx, GlobalContext* globalCtx);
void EnClearTag_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnClearTag_Update(Actor* thisx, GlobalContext* globalCtx);
@@ -82,15 +94,15 @@ static f32 sLightRayMaxScale[] = {
25.0f, 100.0f, 48.0f, 20.0f, 32.0f,
};
-static TexturePtr sSplashTex[] = {
- gExplosionSplashTex1,
- gExplosionSplashTex2,
- gExplosionSplashTex3,
- gExplosionSplashTex4,
- gExplosionSplashTex5,
- gExplosionSplashTex6,
- gExplosionSplashTex7,
- gExplosionSplashTex8,
+static TexturePtr sWaterSplashTextures[] = {
+ gEffWaterSplash1Tex,
+ gEffWaterSplash2Tex,
+ gEffWaterSplash3Tex,
+ gEffWaterSplash4Tex,
+ gEffWaterSplash5Tex,
+ gEffWaterSplash6Tex,
+ gEffWaterSplash7Tex,
+ gEffWaterSplash8Tex,
NULL,
NULL,
NULL,
@@ -972,7 +984,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 200);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
- gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sSplashTex[effect->actionTimer]));
+ gSPSegment(POLY_XLU_DISP++, 0x08, Lib_SegmentedToVirtual(sWaterSplashTextures[effect->actionTimer]));
func_8012C9BC(gfxCtx);
gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK);
isMaterialApplied++;
@@ -996,7 +1008,7 @@ void EnClearTag_DrawEffects(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateXFApply(effect->rotationX);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, gExplosionSplashDL);
+ gSPDisplayList(POLY_XLU_DISP++, gEffWaterSplashDL);
}
}
}
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index 61c4a638bd..a2d188cba8 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -5,18 +5,6 @@
struct EnClearTag;
-typedef enum {
- /* 0x00 */ CLEAR_TAG_EFFECT_AVAILABLE,
- /* 0x01 */ CLEAR_TAG_EFFECT_DEBRIS,
- /* 0x02 */ CLEAR_TAG_EFFECT_FIRE, // never set to, remnant of OoT
- /* 0x03 */ CLEAR_TAG_EFFECT_SMOKE,
- /* 0x04 */ CLEAR_TAG_EFFECT_FLASH,
- /* 0x05 */ CLEAR_TAG_EFFECT_LIGHT_RAYS,
- /* 0x06 */ CLEAR_TAG_EFFECT_SHOCKWAVE,
- /* 0x07 */ CLEAR_TAG_EFFECT_SPLASH,
- /* 0x08 */ CLEAR_TAG_EFFECT_ISOLATED_SMOKE,
-} ClearTagEffectType;
-
typedef struct EnClearTagEffect {
/* 0x00 */ u8 type;
/* 0x01 */ u8 actionTimer;