Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2025-02-21 13:41:58 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Discover blend mode field

Browse Source
This commit is contained in:
Luciano Ciccariello 2022-10-29 01:01:45 +01:00
parent c89f46048b
commit 7316de85a6
7 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/dra.h
View File

@ -88,7 +88,7 @@ typedef struct {
/* 0x12 */ s16 unk12;
/* 0x14 */ u16 unk14;
/* 0x16 */ s16 palette;
/* 0x18 */ s8 unk18;
/* 0x18 */ s8 blendMode;
/* 0x19 */ s8 unk19;
/* 0x1A */ s16 unk1A;
/* 0x1C */ s16 unk1C;
@ -268,7 +268,7 @@ typedef struct {
/* 0x06 */ u16 palette;
/* 0x08 */ u8 unk8;
/* 0x09 */ u8 unk9;
/* 0x0A */ u8 unkA;
/* 0x0A */ u8 blendMode;
/* 0x0B */ u8 unkB;
/* 0x0C */ u32 unkC;
/* 0x10 */ u8* unk10;

18
src/st/dre/11A64.c
View File

@ -72,7 +72,7 @@ void func_80191A64(Entity* entity) {
entity->unk5A = obj->unk4.data;
entity->palette = obj->palette;
entity->unk19 = obj->unk8;
entity->unk18 = obj->unkA;
entity->blendMode = obj->blendMode;
if (obj->unkC != 0) {
entity->unk34 = obj->unkC;
@ -110,7 +110,7 @@ void func_80191D00(Entity* entity) {
} else {
func_8019B0B8(D_80180458);
entity->zPriority = D_80097408 - 20;
entity->unk18 = D_80180650[temp_s0];
entity->blendMode = D_80180650[temp_s0];
entity->hitboxHeight = D_80180630[temp_s0];
entity->animationSet = D_80180640[temp_s0];
}
@ -820,11 +820,11 @@ void func_8019C63C(Entity* entity) {
entity->animationSet = 2;
entity->animationFrameIndex = 0;
entity->animationFrameDuration = 0;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
temp_v0 = entity->subId & 0xFF00;
@ -909,7 +909,7 @@ void func_8019E5E0(Entity* entity) {
entity->animationSet = 2;
entity->accelerationY = new_var;
new_var2 = D_80181324[entity->subId];
entity->unk18 = 0x10;
entity->blendMode = 0x10;
entity->initState++;
entity->animationFrame = new_var2;
return;
@ -937,7 +937,7 @@ void func_8019E6D0(Entity* entity) {
entity->palette = 0x8195;
entity->animationSet = 5;
entity->animationFrame = 1;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
entity->unk19 = 3;
temp_v0 = D_801812E4[entity->subId];
entity->unk1A = temp_v0;
@ -1000,11 +1000,11 @@ void func_8019F070(Entity* entity) {
entity->palette = 0x8170;
entity->animationSet = 5;
entity->animationFrame = 1;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
temp_v0 = entity->subId & 0xFF00;
@ -1129,7 +1129,7 @@ void func_801A1BFC(Entity* entity) {
entity->unk5A = obj->unk4.data;
entity->palette = obj->palette;
entity->unk19 = obj->unk8;
entity->unk18 = obj->unkA;
entity->blendMode = obj->blendMode;
if (obj->unkC != 0) {
entity->unk34 = obj->unkC;

20
src/st/mad/D8C8.c
View File

@ -189,7 +189,7 @@ void func_8018E5AC(Entity* arg0) {
arg0->unk5A = temp_s0->unk4.data;
arg0->palette = temp_s0->palette;
arg0->unk19 = temp_s0->unk8;
arg0->unk18 = temp_s0->unkA;
arg0->blendMode = temp_s0->blendMode;
temp_v0 = temp_s0->unkC;
if (temp_v0 != 0) {
arg0->unk34 = temp_v0;
@ -200,7 +200,7 @@ void func_8018E5AC(Entity* arg0) {
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018E674);
void EntityCandle(Entity* entity) {
void EntityBreakable(Entity* entity) {
u16 temp_s0 = entity->subId >> 0xC;
if (entity->initState) {
AnimateEntity(D_80180644[temp_s0], entity);
@ -218,7 +218,7 @@ void EntityCandle(Entity* entity) {
} else {
InitializeEntity(D_801804F0);
entity->zPriority = D_80096EB8 - 0x14;
entity->unk18 = D_80180684[temp_s0];
entity->blendMode = D_80180684[temp_s0];
entity->hitboxHeight = D_80180664[temp_s0];
entity->animationSet = D_80180674[temp_s0];
}
@ -954,11 +954,11 @@ void func_80194218(Entity* entity) {
entity->animationSet = 2;
entity->animationFrameIndex = 0;
entity->animationFrameDuration = 0;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
temp_v0 = entity->subId & 0xFF00;
@ -1069,7 +1069,7 @@ void func_80195A54(Entity* entity) {
entity->palette = 0x8195;
entity->animationSet = 2;
entity->animationFrame = D_80180FFC[entity->subId];
entity->unk18 = 0x10;
entity->blendMode = 0x10;
entity->initState++;
return;
}
@ -1094,7 +1094,7 @@ void func_80195B44(Entity* entity) {
entity->palette = 0x8195;
entity->animationSet = 5;
entity->animationFrame = 1;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
entity->unk19 = 3;
temp_v0 = D_80180FBC[entity->subId];
entity->unk1A = temp_v0;
@ -1152,11 +1152,11 @@ void func_801964E4(Entity* entity) {
entity->palette = 0x8170;
entity->animationSet = 5;
entity->animationFrame = 1;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
temp_v0 = entity->subId & 0xFF00;
@ -1277,7 +1277,7 @@ void func_80198B00(Entity* entity) {
entity->unk5A = obj->unk4.data;
entity->palette = obj->palette;
entity->unk19 = obj->unk8;
entity->unk18 = obj->unkA;
entity->blendMode = obj->blendMode;
temp_v0 = obj->unkC;
if (temp_v0 != 0) {
entity->unk34 = temp_v0;

16
src/st/no3/377D4.c
View File

@ -9,11 +9,6 @@ extern u8* D_80180850;
extern u16 D_80180AAC[];
extern u16 D_80180B00[];
extern ObjInit2 D_80180BFC[];
extern u8* D_80180E50[];
extern u8 D_80180E70[];
extern u8 D_80180E78[];
extern u16 D_80180E80[];
extern u8 D_80180E90[];
extern s16 D_801820C4[];
extern ObjectInit* D_801D7110;
extern ObjectInit* D_801D7114;
@ -45,7 +40,7 @@ void func_801B77D4(Entity* arg0) {
arg0->unk5A = temp_s0->unk4.data1.unk1;
arg0->palette = temp_s0->palette;
arg0->unk19 = temp_s0->unk8;
arg0->unk18 = temp_s0->unkA;
arg0->blendMode = temp_s0->blendMode;
temp_v0 = temp_s0->unkC;
if (temp_v0 != 0) {
arg0->unk34 = temp_v0;
@ -57,7 +52,12 @@ void func_801B77D4(Entity* arg0) {
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", func_801B78A8);
void EntityCandle(Entity* entity) {
extern u8* D_80180E50[];
extern u8 D_80180E70[];
extern u8 D_80180E78[];
extern u16 D_80180E80[];
extern u8 D_80180E90[];
void EntityBreakable(Entity* entity) {
u16 temp_s0 = entity->subId >> 0xC;
if (entity->initState) {
AnimateEntity(D_80180E50[temp_s0], entity);
@ -75,7 +75,7 @@ void EntityCandle(Entity* entity) {
} else {
InitializeEntity(D_80180AAC);
entity->zPriority = D_80097408 - 0x14;
entity->unk18 = D_80180E90[temp_s0];
entity->blendMode = D_80180E90[temp_s0];
entity->hitboxHeight = D_80180E70[temp_s0];
entity->animationSet = D_80180E80[temp_s0];
}

4
src/st/np3/3246C.c
View File

@ -27,7 +27,7 @@ void func_801B246C(Entity* arg0) {
arg0->unk5A = temp_s0->unk4.data1.unk1;
arg0->palette = temp_s0->palette;
arg0->unk19 = temp_s0->unk8;
arg0->unk18 = temp_s0->unkA;
arg0->blendMode = temp_s0->blendMode;
temp_v0 = temp_s0->unkC;
if (temp_v0 != 0) {
arg0->unk34 = temp_v0;
@ -57,7 +57,7 @@ void EntityCandle(Entity* entity) {
} else {
InitializeEntity(D_80180A3C);
entity->zPriority = D_80097408 - 0x14;
entity->unk18 = D_80180E68[temp_s0];
entity->blendMode = D_80180E68[temp_s0];
entity->hitboxHeight = D_80180E48[temp_s0];
entity->animationSet = D_80180E58[temp_s0];
}

10
src/st/st0/27D64.c
View File

@ -23,7 +23,7 @@ void func_801A7D64(Entity* arg0) {
arg0->unk5A = temp_s0->unk4.data;
arg0->palette = temp_s0->palette;
arg0->unk19 = temp_s0->unk8;
arg0->unk18 = temp_s0->unkA;
arg0->blendMode = temp_s0->blendMode;
temp_v0 = temp_s0->unkC;
if (temp_v0 != 0) {
arg0->unk34 = temp_v0;
@ -797,11 +797,11 @@ void func_801B6B60(Entity* entity) {
entity->animationSet = 2;
entity->animationFrameIndex = 0;
entity->animationFrameDuration = 0;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
zPriority = entity->subId & 0xFF00;
@ -919,10 +919,10 @@ void EntityCutscenePhotographFire(Entity* entity) {
if (entity->subId) {
entity->unk6C = 0x10;
entity->zPriority = 0x1FB;
entity->unk18 = 0x50;
entity->blendMode = 0x50;
} else {
entity->zPriority = 0x1FE;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
}
case 1:
entity->posY.value -= 0x10000;

20
src/st/wrp/6FD0.c
View File

@ -50,7 +50,7 @@ void func_80186FD0(Entity* arg0) {
arg0->unk5A = objInit->unk4.data;
arg0->palette = objInit->palette;
arg0->unk19 = objInit->unk8;
arg0->unk18 = objInit->unkA;
arg0->blendMode = objInit->blendMode;
if (objInit->unkC != 0) {
arg0->unk34 = objInit->unkC;
@ -135,7 +135,7 @@ void func_801870B0(Entity* entity) {
}
#endif
void EntityCandle(Entity* entity) {
void EntityBreakable(Entity* entity) {
u16 temp_s0 = entity->subId >> 0xC;
if (entity->initState) {
AnimateEntity(D_801805B8[temp_s0], entity);
@ -153,7 +153,7 @@ void EntityCandle(Entity* entity) {
} else {
InitializeEntity(D_80180440);
entity->zPriority = D_80097408 - 0x14;
entity->unk18 = D_801805F8[temp_s0];
entity->blendMode = D_801805F8[temp_s0];
entity->hitboxHeight = D_801805D8[temp_s0];
entity->animationSet = D_801805E8[temp_s0];
}
@ -824,10 +824,10 @@ void func_8018D894(Entity* entity) {
entity->animationSet = 2;
entity->animationFrameIndex = 0;
entity->animationFrameDuration = 0;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
zPriority = entity->subId & 0xFF00;
@ -928,7 +928,7 @@ void func_8018F838(Entity* entity) {
entity->animationSet = 2;
entity->unk34 = 0x0C002000;
entity->accelerationY = D_80181020[entity->unk94];
entity->unk18 = 16;
entity->blendMode = 16;
entity->initState = entity->initState + 1;
entity->animationFrame = D_80181038[entity->subId];
} else {
@ -952,7 +952,7 @@ void func_8018F928(Entity* arg0) {
arg0->palette = 0x8195;
arg0->animationSet = 5;
arg0->animationFrame = 1U;
arg0->unk18 = 0x10;
arg0->blendMode = 0x10;
arg0->unk19 = 3;
temp_v0 = D_80180FF8[arg0->subId];
arg0->unk1A = temp_v0;
@ -1007,10 +1007,10 @@ void func_801902C8(Entity* entity) {
entity->palette = 0x8170;
entity->animationSet = 5;
entity->animationFrame = 1;
entity->unk18 = 0x30;
entity->blendMode = 0x30;
if (entity->subId & 0xF0) {
entity->palette = 0x8195;
entity->unk18 = 0x10;
entity->blendMode = 0x10;
}
zPriority = entity->subId & 0xFF00;
@ -1120,7 +1120,7 @@ void func_80192E54(Entity* arg0) {
arg0->unk5A = objInit->unk4.data;
arg0->palette = objInit->palette;
arg0->unk19 = objInit->unk8;
arg0->unk18 = objInit->unkA;
arg0->blendMode = objInit->blendMode;
if (objInit->unkC != 0) {
arg0->unk34 = objInit->unkC;