kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Replace hardcoded value with asset constant in particleEmitter_setSprite method

Browse Source
This commit is contained in:
Owlenuff
2024-10-04 09:18:05 +02:00
parent 8b326a11cc
commit 8d2eeb28e3
6 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core2/code_66FB0.c
View File

@@ -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,

2
src/core2/code_6D270.c
View File

@@ -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);

18
src/core2/code_DB010.c
View File

@@ -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);