From 8d2eeb28e3a3071f1badb0f1903186b81940c063 Mon Sep 17 00:00:00 2001 From: Owlenuff Date: Fri, 4 Oct 2024 09:18:05 +0200 Subject: [PATCH] Replace hardcoded value with asset constant in particleEmitter_setSprite method --- include/enums.h | 15 ++++++++------- src/core2/code_66FB0.c | 6 +++--- src/core2/code_6D270.c | 2 +- src/core2/code_DB010.c | 18 +++++++++--------- src/cutscenes/code_0.c | 28 ++++++++++++++-------------- src/lair/code_AD70.c | 6 +++--- 6 files changed, 38 insertions(+), 37 deletions(-) diff --git a/include/enums.h b/include/enums.h index b6f5d409..5a28a7a4 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3314,7 +3314,7 @@ enum asset_e // 427 (Wooden Plank) ASSET_428_MODEL_BOSS_BOOM_BOX = 0x428, ASSET_429_MODEL_CC_KEY, - // 42a (Smoke 2D?) + ASSET_42A_UNKNOWN, // 42a (Smoke 2D?) // 42b (Orange Triangle?) ASSET_42C_MODEL_BURIED_TREASURE = 0x42C, ASSET_42D_MODEL_QUARRIE = 0x42D, @@ -3391,14 +3391,14 @@ enum asset_e // 472 Blank Picture // 473 Mumbo The BBQ King! He Bares Coconuts! // 474 Roysten The Grill Master! - // 475 (Heart 2D?) - ASSET_476_SPRITE_BLUE_GLOW = 0x476, + ASSET_475_UNKNOWN = 0x475,// 475 (Heart 2D?) + ASSET_476_SPRITE_BLUE_GLOW, ASSET_477_SPRITE_YELLOW_GLOW, // 478 (Yellow Glow?) // 479 Bikini Girl // 47a (Brown Ball?) ASSET_47B_MODEL_ROCK = 0x47b, - // 47c (Snoring Z 2D?) + ASSET_47C_UNKNOWN,// 47c (Snoring Z 2D?) // Unused // Unused ASSET_47F_MODEL_XMAS_GIFT_BLUE = 0x47F, @@ -3791,7 +3791,7 @@ enum asset_e // Unused // 606 Red Mushroom // 607 Green Mushroom - // 608 White Circle + ASSET_608_UNKNOWN = 0x608, // 608 White Circle // 609 Mushroom (2D) // Unused // Unused @@ -3994,6 +3994,7 @@ enum asset_e ASSET_6DA_SPRITE_HOURGLASS, ASSET_6DB_SPRITE_SKULL_HOURGLASS, ASSET_6DC_SPRITE_XMAS_TREE_TIMER, + ASSET_6DD_UNKNOWN, SPRITE_DIALOG_FONT_ALPHAMASK = 0x6eb, SPRITE_BOLD_FONT_LETTERS_ALPHAMASK, @@ -4017,8 +4018,8 @@ enum asset_e ASSET_711_SPRITE_SPARKLE_DARK_BLUE, ASSET_712_SPRITE_SPARKLE_GREEN, ASSET_713_SPRITE_SPARKLE_YELLOW, - - ASSET_715_SPRITE_SPARKLE_RED = 0x715, + ASSET_714_SPRITE_UNKNOWN, + ASSET_715_SPRITE_SPARKLE_RED, ASSET_716_SPRITE_SPARKLE_WHITE, ASSET_717_SPRITE_SPARKLE_YELLOW_2, ASSET_718_SPRITE_SPARKLE_WHITE_2, diff --git a/src/core2/code_66FB0.c b/src/core2/code_66FB0.c index 43cf98e8..e967bf7d 100644 --- a/src/core2/code_66FB0.c +++ b/src/core2/code_66FB0.c @@ -23,14 +23,14 @@ s32 D_80368860[] = { }; s32 D_8036889C[] = { - 0x608, + ASSET_608_UNKNOWN, ASSET_702_SPRITE_UNKNOWN, - 0x712, + ASSET_712_SPRITE_SPARKLE_GREEN, ASSET_713_SPRITE_SPARKLE_YELLOW, ASSET_717_SPRITE_SPARKLE_YELLOW_2, ASSET_710_SPRITE_SPARKLE_PURPLE, ASSET_711_SPRITE_SPARKLE_DARK_BLUE, - 0x714, + ASSET_714_SPRITE_UNKNOWN, ASSET_715_SPRITE_SPARKLE_RED, ASSET_716_SPRITE_SPARKLE_WHITE, ASSET_718_SPRITE_SPARKLE_WHITE_2, diff --git a/src/core2/code_6D270.c b/src/core2/code_6D270.c index 251a0712..9337fe8a 100644 --- a/src/core2/code_6D270.c +++ b/src/core2/code_6D270.c @@ -49,7 +49,7 @@ ParticleEmitter *func_802F4274(f32 arg0[3]) { if (sp20 != 0) { func_802EFAB0(temp_v0, sp20, sp2C[1]); } - particleEmitter_setSprite(temp_v0, 0x42A); + particleEmitter_setSprite(temp_v0, ASSET_42A_UNKNOWN); particleEmitter_setAlpha(temp_v0, 0xFF); particleEmitter_setFade(temp_v0, 0, 0.78f); particleEmitter_setStartingFrameRange(temp_v0, 0, 0); diff --git a/src/core2/code_DB010.c b/src/core2/code_DB010.c index cb7019a1..4baf535a 100644 --- a/src/core2/code_DB010.c +++ b/src/core2/code_DB010.c @@ -62,7 +62,7 @@ void func_80362084(f32 position[3]) { ParticleEmitter *pCtrl; pCtrl = partEmitMgr_newEmitter(1U); - particleEmitter_setSprite(pCtrl, 0x702); + particleEmitter_setSprite(pCtrl, ASSET_702_SPRITE_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 3, 5); particleEmitter_setRGB(pCtrl, D_8037337C); particleEmitter_setAlpha(pCtrl, 0xA0); @@ -86,7 +86,7 @@ void func_8036215C(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0xFU); - particleEmitter_setSprite(pCtrl, 0x700); + particleEmitter_setSprite(pCtrl, ASSET_700_SPRITE_DUST); particleEmitter_setStartingFrameRange(pCtrl, 3, 4); particleEmitter_setRGB(pCtrl, D_803733E8); particleEmitter_setAlpha(pCtrl, 0x28); @@ -105,7 +105,7 @@ void func_803621F0(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0x12U); - particleEmitter_setSprite(pCtrl, 0x702); + particleEmitter_setSprite(pCtrl, ASSET_702_SPRITE_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 3, 5); particleEmitter_setAlpha(pCtrl, 0xD2); particleEmitter_setPosition(pCtrl, arg0); @@ -162,7 +162,7 @@ void func_80362404(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U); - particleEmitter_setSprite(pCtrl, 0x6DD); + particleEmitter_setSprite(pCtrl, ASSET_6DD_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 2, 2); particleEmitter_setPosition(pCtrl, arg0); particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_80373604); @@ -179,7 +179,7 @@ void func_8036247C(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setRGB(pCtrl, &D_80373634); particleEmitter_setAlpha(pCtrl, 0x64); @@ -196,7 +196,7 @@ void func_80362510(Actor *actor) { f32 sp30[3]; pCtrl = partEmitMgr_newEmitter(0x19U); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 0, 5); particleEmitter_setRGB(pCtrl, D_803736A0); particleEmitter_setAlpha(pCtrl, 0x1E); @@ -224,7 +224,7 @@ void func_80362680(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U); - particleEmitter_setSprite(pCtrl, 0x45A); + particleEmitter_setSprite(pCtrl, ASSET_45A_SPRITE_GREEN_GLOW); particleEmitter_setStartingFrameRange(pCtrl, 2, 2); particleEmitter_setPosition(pCtrl, arg0); particleEmitter_setPositionAndVelocityRanges(pCtrl, &D_8037370C); @@ -241,7 +241,7 @@ void func_803626F8(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(1U); - particleEmitter_setSprite(pCtrl, 0x713); + particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setPosition(pCtrl, arg0); particleEmitter_setVelocityAccelerationAndPositionRanges(pCtrl, &D_8037376C); @@ -259,7 +259,7 @@ void func_80362770(f32 arg0[3]) { ParticleEmitter *pCtrl = partEmitMgr_newEmitter(0x10U); - particleEmitter_setSprite(pCtrl, 0x714); + particleEmitter_setSprite(pCtrl, ASSET_714_SPRITE_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 7, 8); particleEmitter_setRGB(pCtrl, &D_803737B4); particleEmitter_setPosition(pCtrl, arg0); diff --git a/src/cutscenes/code_0.c b/src/cutscenes/code_0.c index 1b78d781..18a8916b 100644 --- a/src/cutscenes/code_0.c +++ b/src/cutscenes/code_0.c @@ -260,7 +260,7 @@ void func_8038702C(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(8U); - particleEmitter_setSprite(pCtrl, 0x712); + particleEmitter_setSprite(pCtrl, ASSET_712_SPRITE_SPARKLE_GREEN); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); func_8034A174((struct5Bs *)sp44->marker->unk44, 5, sp34); particleEmitter_setPosition(pCtrl, sp34); @@ -281,7 +281,7 @@ void func_80387170(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(8); - particleEmitter_setSprite(pCtrl, 0x712); + particleEmitter_setSprite(pCtrl, ASSET_712_SPRITE_SPARKLE_GREEN); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); func_8034A174((struct5Bs *)sp44->marker->unk44, 6, sp34); particleEmitter_setPosition(pCtrl, sp34); @@ -306,7 +306,7 @@ void func_803872B4(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(4); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0x82); func_8034A174((struct5Bs *)sp44->marker->unk44, 7, sp34); @@ -329,7 +329,7 @@ void func_80387364(s32 arg0) { sp34 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setRGB(pCtrl, D_8038D4A0); particleEmitter_setAlpha(pCtrl, 0x82); @@ -348,7 +348,7 @@ void func_80387424(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(8); - particleEmitter_setSprite(pCtrl, 0x713); + particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0x64); func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); @@ -386,7 +386,7 @@ void func_80387680(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(11); - particleEmitter_setSprite(pCtrl, 0x70B); + particleEmitter_setSprite(pCtrl, ASSET_70B_SPRITE_BUBBLE_2); func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); particleEmitter_setPosition(pCtrl, sp34); particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f); @@ -409,7 +409,7 @@ void func_803877A0(s32 arg0) { sp34 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x475); + particleEmitter_setSprite(pCtrl, ASSET_475_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setRGB(pCtrl, D_8038D584); particleEmitter_setAlpha(pCtrl, 0xFF); @@ -480,7 +480,7 @@ void func_80387B58(s32 arg0) { sp44 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x702); + particleEmitter_setSprite(pCtrl, ASSET_702_SPRITE_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0x3C); particleEmitter_setAngularVelocityRange(pCtrl, -60.0f, -60.0f, -60.0f, 60.0f, 60.0f, 60.0f); @@ -509,7 +509,7 @@ void func_80387C64(s32 arg0) { func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); if (ml_isZero_vec3f(sp34) == 0) { pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setRGB(pCtrl, D_8038D6A0); particleEmitter_setAlpha(pCtrl, 0x64); @@ -536,7 +536,7 @@ void func_80387D88(s32 arg0) { func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); if (ml_isZero_vec3f(sp34) == 0) { pCtrl = partEmitMgr_newEmitter(25); - particleEmitter_setSprite(pCtrl, 0x713); + particleEmitter_setSprite(pCtrl, ASSET_713_SPRITE_SPARKLE_YELLOW); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0xFF); particleEmitter_setAngularVelocityRange(pCtrl, -60.0f, -60.0f, -60.0f, 60.0f, 60.0f, 60.0f); @@ -563,7 +563,7 @@ void func_80387E9C(s32 arg0) { func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); if (ml_isZero_vec3f(sp34) == 0) { pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0xC8); particleEmitter_setRGB(pCtrl, D_8038D76C); @@ -591,7 +591,7 @@ void func_80387FC0(s32 arg0) { func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); if (ml_isZero_vec3f(sp34) == 0) { pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0x64); particleEmitter_setAngularVelocityRange(pCtrl, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); @@ -616,7 +616,7 @@ void func_803880C8(s32 arg0) { sp34 = marker_getActor(reinterpret_cast(ActorMarker *,arg0)); pCtrl = partEmitMgr_newEmitter(1); - particleEmitter_setSprite(pCtrl, 0x47C); + particleEmitter_setSprite(pCtrl, ASSET_47C_UNKNOWN); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setRGB(pCtrl, D_8038D838); particleEmitter_setAlpha(pCtrl, 0x82); @@ -644,7 +644,7 @@ void func_803881CC(s32 arg0) { func_8034A174((struct5Bs *) sp44->marker->unk44, 5, sp34); if (ml_isZero_vec3f(sp34) == 0) { pCtrl = partEmitMgr_newEmitter(2); - particleEmitter_setSprite(pCtrl, 0x70D); + particleEmitter_setSprite(pCtrl, ASSET_70D_SPRITE_SMOKE_1); particleEmitter_setStartingFrameRange(pCtrl, 1, 6); particleEmitter_setAlpha(pCtrl, 0x50); particleEmitter_setAngularVelocityRange(pCtrl, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); diff --git a/src/lair/code_AD70.c b/src/lair/code_AD70.c index 5fc77a21..3170920a 100644 --- a/src/lair/code_AD70.c +++ b/src/lair/code_AD70.c @@ -55,7 +55,7 @@ s32 D_80394BD4[3] = {0xff, 0x80, 0x80}; void func_80391160(f32 pos[3], u32 count) { ParticleEmitter *p = partEmitMgr_newEmitter(count); - particleEmitter_setSprite(p, 0x70E); + particleEmitter_setSprite(p, ASSET_70E_SPRITE_SMOKE_2); particleEmitter_setRGB(p, D_80394AD4); particleEmitter_setAlpha(p, 0xEB); particleEmitter_setStartingFrameRange(p, 0, 7); @@ -99,7 +99,7 @@ void func_8039137C(f32 pos[3], u32 count, enum asset_e sprite) void func_8039144C(f32 pos[3], u32 count) { ParticleEmitter *p = partEmitMgr_newEmitter(count); - particleEmitter_setSprite(p, 0x713); + particleEmitter_setSprite(p, ASSET_713_SPRITE_SPARKLE_YELLOW); particleEmitter_setPosition(p, pos); particleEmitter_setSpawnPositionRange(p, -40, -40, -40, 40, 40, 40); particleEmitter_setDrawMode(p, 4); @@ -115,7 +115,7 @@ void func_8039144C(f32 pos[3], u32 count) void func_803915A4(f32 pos[3], s32 count, f32 scale) { ParticleEmitter *p = partEmitMgr_newEmitter(count); - particleEmitter_setSprite(p, 0x4A0); + particleEmitter_setSprite(p, ASSET_4A0_SPRITE_EXPLOSION); particleEmitter_setFade(p, 0.1f, 0.2f); particleEmitter_setDrawMode(p, PART_EMIT_NO_LOOP); particleEmitter_setStartingFrameRange(p, 2, 8);