mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-13 19:35:28 +00:00
Decompile most effect files in "code" (#144)
- `z_effect`: Matched and essentially all documented. - `z_eff_spark.c`: Decompiled (1 non matching left) and mostly documented. - `z_eff_shield_particle.c`: Matched and mostly documented. - `z_eff_blure.c`: Decompiled (5 non matchings left) and partially documented. - `z_effect_soft_sprite.c`: Matched and mostly documented. - `z_eff_ss_dead.c`: Matched but not documented. - `z_effect_soft_sprite_dlftbls.c`: "Matched" (only data, contains the effect ss overlay table). - `z_effect_soft_sprite_old_init.c`: Not decompiled, but functions are categorized by effect ss overlay. And they should be decompiled at the same time as their corresponding effect ss in the future. Other changes: - Added a lot of types/enums to `z64effect.h`and moved+renamed some structs from `z64.h` to this header - Added effect ss overlay segments to `segment_symbols.h` and effect ss init vars to `initvars.h` - Added a macro called `VTX_T` to generate a `Vtx_t` in the same style as `VTX` - Fixed `flg_set.c` .bss to be in the right file - Removed `tools/overlayhelpers/batchdisasm` since it's no longer relevant - Removed unused leftover asm from recent PRs
This commit is contained in:
Roman971
GitHub
parent
785011c33c
commit
e29b77919b
227 changed files with 3739 additions and 8132 deletions
|
|
@ -1,139 +1,343 @@
|
|||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
#include <vt.h>
|
||||
|
||||
extern ParticleOverlay sParticleOverlayTable[37];
|
||||
EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info"
|
||||
|
||||
void Effect_SS_Delete(LoadedParticleEntry* particle);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s")
|
||||
|
||||
void Effect_SS_Clear(GlobalContext* globalCtx) {
|
||||
void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize) {
|
||||
u32 i;
|
||||
LoadedParticleEntry* iter;
|
||||
ParticleOverlay* iter2;
|
||||
EffectSs* effectSs;
|
||||
EffectSsOverlay* overlay;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) {
|
||||
overlay = &gEffectSsOverlayTable[i];
|
||||
osSyncPrintf("effect index %3d:size=%6dbyte romsize=%6dbyte\n", i,
|
||||
(u32)overlay->vramEnd - (u32)overlay->vramStart, overlay->vromEnd - overlay->vromStart);
|
||||
}
|
||||
|
||||
sEffectSsInfo.table =
|
||||
GameState_AllocEnd(&globalCtx->state, tableSize * sizeof(EffectSs), "../z_effect_soft_sprite.c", 289);
|
||||
if (sEffectSsInfo.table == NULL) {
|
||||
__assert("EffectSS2Info.data_table != NULL", "../z_effect_soft_sprite.c", 290);
|
||||
}
|
||||
|
||||
sEffectSsInfo.searchStartIndex = 0;
|
||||
sEffectSsInfo.tableSize = tableSize;
|
||||
|
||||
for (effectSs = &sEffectSsInfo.table[0]; effectSs < &sEffectSsInfo.table[sEffectSsInfo.tableSize]; effectSs++) {
|
||||
EffectSs_Reset(effectSs);
|
||||
}
|
||||
|
||||
overlay = &gEffectSsOverlayTable[0];
|
||||
for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) {
|
||||
overlay->loadedRamAddr = NULL;
|
||||
overlay++;
|
||||
}
|
||||
}
|
||||
|
||||
void EffectSs_ClearAll(GlobalContext* globalCtx) {
|
||||
u32 i;
|
||||
EffectSs* effectSs;
|
||||
EffectSsOverlay* overlay;
|
||||
void* addr;
|
||||
|
||||
EffectSS2Info.data_table = NULL;
|
||||
EffectSS2Info.searchIndex = 0;
|
||||
EffectSS2Info.size = 0;
|
||||
sEffectSsInfo.table = NULL;
|
||||
sEffectSsInfo.searchStartIndex = 0;
|
||||
sEffectSsInfo.tableSize = 0;
|
||||
|
||||
for (iter = EffectSS2Info.data_table; iter < EffectSS2Info.data_table + EffectSS2Info.size; iter++) {
|
||||
Effect_SS_Delete(iter);
|
||||
// This code doesn't actually work, since table was just set to NULL and tableSize to 0
|
||||
for (effectSs = &sEffectSsInfo.table[0]; effectSs < &sEffectSsInfo.table[sEffectSsInfo.tableSize]; effectSs++) {
|
||||
EffectSs_Delete(effectSs);
|
||||
}
|
||||
|
||||
// Free memory from loaded particle overlays
|
||||
iter2 = &sParticleOverlayTable[0];
|
||||
for (i = 0; i < ARRAY_COUNT(sParticleOverlayTable); i++) {
|
||||
addr = iter2->loadedRamAddr;
|
||||
overlay = &gEffectSsOverlayTable[0];
|
||||
for (i = 0; i < ARRAY_COUNT(gEffectSsOverlayTable); i++) {
|
||||
addr = overlay->loadedRamAddr;
|
||||
|
||||
if (addr != NULL) {
|
||||
ZeldaArena_FreeDebug(addr, D_801357DC, 337);
|
||||
ZeldaArena_FreeDebug(addr, "../z_effect_soft_sprite.c", 337);
|
||||
}
|
||||
|
||||
(iter2++)->loadedRamAddr = NULL;
|
||||
overlay->loadedRamAddr = NULL;
|
||||
overlay++;
|
||||
}
|
||||
}
|
||||
|
||||
void Effect_SS_Delete(LoadedParticleEntry* particle) {
|
||||
if (particle->flags & 2) {
|
||||
func_800F89E8(&particle->position);
|
||||
void EffectSs_Delete(EffectSs* effectSs) {
|
||||
if (effectSs->flags & 2) {
|
||||
func_800F89E8(&effectSs->pos);
|
||||
}
|
||||
|
||||
if (particle->flags & 4) {
|
||||
func_800F89E8(&particle->unk_2C);
|
||||
if (effectSs->flags & 4) {
|
||||
func_800F89E8(&effectSs->unk_2C);
|
||||
}
|
||||
|
||||
Effect_SS_ResetEntry(particle);
|
||||
EffectSs_Reset(effectSs);
|
||||
}
|
||||
|
||||
void Effect_SS_ResetEntry(LoadedParticleEntry* particle) {
|
||||
void EffectSs_Reset(EffectSs* effectSs) {
|
||||
u32 i;
|
||||
|
||||
particle->type = 0x25;
|
||||
particle->acceleration.z = 0;
|
||||
particle->acceleration.y = 0;
|
||||
particle->acceleration.x = 0;
|
||||
particle->velocity.z = 0;
|
||||
particle->velocity.y = 0;
|
||||
particle->velocity.x = 0;
|
||||
particle->unk_34 = 0;
|
||||
particle->unk_30 = 0;
|
||||
particle->unk_2C = 0;
|
||||
particle->position.z = 0;
|
||||
particle->position.y = 0;
|
||||
particle->position.x = 0;
|
||||
particle->life = -1;
|
||||
particle->flags = 0;
|
||||
particle->priority = 128;
|
||||
particle->draw = NULL;
|
||||
particle->update = NULL;
|
||||
particle->unk_38 = 0;
|
||||
particle->unk_3C = 0;
|
||||
effectSs->type = EFFECT_SS_TYPE_MAX;
|
||||
effectSs->accel.x = effectSs->accel.y = effectSs->accel.z = 0;
|
||||
effectSs->velocity.x = effectSs->velocity.y = effectSs->velocity.z = 0;
|
||||
effectSs->unk_2C.x = effectSs->unk_2C.y = effectSs->unk_2C.z = 0;
|
||||
effectSs->pos.x = effectSs->pos.y = effectSs->pos.z = 0;
|
||||
effectSs->life = -1;
|
||||
effectSs->flags = 0;
|
||||
effectSs->priority = 128;
|
||||
effectSs->draw = NULL;
|
||||
effectSs->update = NULL;
|
||||
effectSs->unk_38 = 0;
|
||||
effectSs->unk_3C = 0;
|
||||
|
||||
for (i = 0; i != 13; i++) {
|
||||
particle->unk_40[i] = 0;
|
||||
for (i = 0; i < ARRAY_COUNT(effectSs->regs); i++) {
|
||||
effectSs->regs[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027704.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s")
|
||||
|
||||
void Effect_SS_UpdateParticle(GlobalContext* globalCtx, s32 index) {
|
||||
LoadedParticleEntry* particle = &EffectSS2Info.data_table[index];
|
||||
|
||||
if (particle->update != NULL) {
|
||||
particle->velocity.x += particle->acceleration.x;
|
||||
particle->velocity.y += particle->acceleration.y;
|
||||
particle->velocity.z += particle->acceleration.z;
|
||||
|
||||
particle->position.x += particle->velocity.x;
|
||||
particle->position.y += particle->velocity.y;
|
||||
particle->position.z += particle->velocity.z;
|
||||
|
||||
particle->update(globalCtx, index, particle);
|
||||
}
|
||||
}
|
||||
|
||||
void Effect_SS_UpdateAllParticles(GlobalContext* globalCtx) {
|
||||
s32 EffectSs_FindSlot(s32 priority, s32* pIndex) {
|
||||
s32 foundFree;
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < EffectSS2Info.size; i++) {
|
||||
if (EffectSS2Info.data_table[i].life > -1) {
|
||||
EffectSS2Info.data_table[i].life--;
|
||||
if (sEffectSsInfo.searchStartIndex >= sEffectSsInfo.tableSize) {
|
||||
sEffectSsInfo.searchStartIndex = 0;
|
||||
}
|
||||
|
||||
if (EffectSS2Info.data_table[i].life < 0) {
|
||||
Effect_SS_Delete(&EffectSS2Info.data_table[i]);
|
||||
// Search for a free slot
|
||||
i = sEffectSsInfo.searchStartIndex;
|
||||
foundFree = false;
|
||||
while (true) {
|
||||
if (sEffectSsInfo.table[i].life == -1) {
|
||||
foundFree = true;
|
||||
break;
|
||||
}
|
||||
|
||||
i++;
|
||||
|
||||
if (i >= sEffectSsInfo.tableSize) {
|
||||
i = 0; // Loop around the whole table
|
||||
}
|
||||
|
||||
// After a full loop, break out
|
||||
if (i == sEffectSsInfo.searchStartIndex) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (foundFree == true) {
|
||||
*pIndex = i;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// If all slots are in use, search for a slot with a lower priority
|
||||
// Note that a lower priority is representend by a higher value
|
||||
i = sEffectSsInfo.searchStartIndex;
|
||||
while (true) {
|
||||
// Equal priority should only be considered "lower" if flag 0 is set
|
||||
if ((priority <= sEffectSsInfo.table[i].priority) &&
|
||||
!((priority == sEffectSsInfo.table[i].priority) && (sEffectSsInfo.table[i].flags & 1))) {
|
||||
break;
|
||||
}
|
||||
|
||||
i++;
|
||||
|
||||
if (i >= sEffectSsInfo.tableSize) {
|
||||
i = 0; // Loop around the whole table
|
||||
}
|
||||
|
||||
// After a full loop, return 1 to indicate that we failed to find a suitable slot
|
||||
if (i == sEffectSsInfo.searchStartIndex) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
*pIndex = i;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void EffectSs_Insert(GlobalContext* globalCtx, EffectSs* effectSs) {
|
||||
s32 index;
|
||||
|
||||
if (func_800C0D28(globalCtx) != 1) {
|
||||
if (EffectSs_FindSlot(effectSs->priority, &index) == 0) {
|
||||
sEffectSsInfo.searchStartIndex = index + 1;
|
||||
sEffectSsInfo.table[index] = *effectSs;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// original name: "EffectSoftSprite2_makeEffect"
|
||||
void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* initParams) {
|
||||
s32 index;
|
||||
u32 overlaySize;
|
||||
EffectSsOverlay* overlayEntry;
|
||||
EffectSsInit* initInfo;
|
||||
|
||||
overlayEntry = &gEffectSsOverlayTable[type];
|
||||
|
||||
if (type >= EFFECT_SS_TYPE_MAX) {
|
||||
__assert("type < EFFECT_SS2_TYPE_LAST_LABEL", "../z_effect_soft_sprite.c", 556);
|
||||
}
|
||||
|
||||
if (EffectSs_FindSlot(priority, &index) != 0) {
|
||||
// Abort because we couldn't find a suitable slot to add this effect in
|
||||
return;
|
||||
}
|
||||
|
||||
sEffectSsInfo.searchStartIndex = index + 1;
|
||||
overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart;
|
||||
|
||||
if (overlayEntry->vramStart == NULL) {
|
||||
// Translates to: "Not an overlay"
|
||||
osSyncPrintf("EffectSoftSprite2_makeEffect():オーバーレイではありません。\n");
|
||||
initInfo = overlayEntry->initInfo;
|
||||
} else {
|
||||
if (overlayEntry->loadedRamAddr == NULL) {
|
||||
overlayEntry->loadedRamAddr = ZeldaArena_MallocRDebug(overlaySize, "../z_effect_soft_sprite.c", 585);
|
||||
|
||||
if (overlayEntry->loadedRamAddr == NULL) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
// Translates to: "The memory of %d byte cannot be secured. Therefore, the program cannot be loaded.
|
||||
// What a dangerous situation! Naturally, effects will not produced either."
|
||||
osSyncPrintf("EffectSoftSprite2_makeEffect():zelda_malloc_r()により,%"
|
||||
"dbyteのメモリ確保ができま\nせん。そのため、プログラムのロードも\n出来ません。ただいま危険"
|
||||
"な状態です！\nもちろん,エフェクトも出ません。\n",
|
||||
overlaySize);
|
||||
osSyncPrintf(VT_RST);
|
||||
return;
|
||||
}
|
||||
|
||||
Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd,
|
||||
overlayEntry->loadedRamAddr);
|
||||
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("EFFECT SS OVL:SegRom %08x %08x, Seg %08x %08x, RamStart %08x, type: %d\n",
|
||||
overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd,
|
||||
overlayEntry->loadedRamAddr, type);
|
||||
osSyncPrintf(VT_RST);
|
||||
}
|
||||
|
||||
initInfo = (void*)(u32)((overlayEntry->initInfo != NULL)
|
||||
? (void*)((u32)overlayEntry->initInfo -
|
||||
(s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr))
|
||||
: NULL);
|
||||
}
|
||||
|
||||
if (initInfo->init == NULL) {
|
||||
// Translates to: "Effects have already been loaded, but the constructor is NULL so the addition will not occur.
|
||||
// Please fix this. (Waste of memory) %08x %d"
|
||||
osSyncPrintf("EffectSoftSprite2_makeEffect():すでにエフェクトはロード済みで\nすが,"
|
||||
"コンストラクターがNULLなので追加をやめます。\n直してください。（メモリーの無駄) %08x %d\n",
|
||||
initInfo, type);
|
||||
return;
|
||||
}
|
||||
|
||||
// Delete the previous effect in the slot, in case the slot wasn't free
|
||||
EffectSs_Delete(&sEffectSsInfo.table[index]);
|
||||
|
||||
sEffectSsInfo.table[index].type = type;
|
||||
sEffectSsInfo.table[index].priority = priority;
|
||||
|
||||
if (initInfo->init(globalCtx, index, &sEffectSsInfo.table[index], initParams) == 0) {
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
// Translates to: "Construction failed for some reason. The constructor returned an error.
|
||||
// Ceasing effect addition."
|
||||
osSyncPrintf("EffectSoftSprite2_makeEffect():"
|
||||
"何らかの理由でコンストラクト失敗。コンストラクターがエラーを返しました。エフェクトの追加を中"
|
||||
"止します。\n");
|
||||
osSyncPrintf(VT_RST);
|
||||
EffectSs_Reset(&sEffectSsInfo.table[index]);
|
||||
}
|
||||
}
|
||||
|
||||
void EffectSs_Update(GlobalContext* globalCtx, s32 index) {
|
||||
EffectSs* effectSs = &sEffectSsInfo.table[index];
|
||||
|
||||
if (effectSs->update != NULL) {
|
||||
effectSs->velocity.x += effectSs->accel.x;
|
||||
effectSs->velocity.y += effectSs->accel.y;
|
||||
effectSs->velocity.z += effectSs->accel.z;
|
||||
|
||||
effectSs->pos.x += effectSs->velocity.x;
|
||||
effectSs->pos.y += effectSs->velocity.y;
|
||||
effectSs->pos.z += effectSs->velocity.z;
|
||||
|
||||
effectSs->update(globalCtx, index, effectSs);
|
||||
}
|
||||
}
|
||||
|
||||
void EffectSs_UpdateAll(GlobalContext* globalCtx) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < sEffectSsInfo.tableSize; i++) {
|
||||
if (sEffectSsInfo.table[i].life > -1) {
|
||||
sEffectSsInfo.table[i].life--;
|
||||
|
||||
if (sEffectSsInfo.table[i].life < 0) {
|
||||
EffectSs_Delete(&sEffectSsInfo.table[i]);
|
||||
}
|
||||
}
|
||||
|
||||
if (EffectSS2Info.data_table[i].life > -1) {
|
||||
Effect_SS_UpdateParticle(globalCtx, i);
|
||||
if (sEffectSsInfo.table[i].life > -1) {
|
||||
EffectSs_Update(globalCtx, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Effect_SS_DrawParticle(GlobalContext* globalCtx, s32 index) {
|
||||
LoadedParticleEntry* particle = &EffectSS2Info.data_table[index];
|
||||
void EffectSs_Draw(GlobalContext* globalCtx, s32 index) {
|
||||
EffectSs* effectSs = &sEffectSsInfo.table[index];
|
||||
|
||||
if (particle->draw != NULL) {
|
||||
particle->draw(globalCtx, index, particle);
|
||||
if (effectSs->draw != NULL) {
|
||||
effectSs->draw(globalCtx, index, effectSs);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s")
|
||||
// original name: "EffectSoftSprite2_disp"
|
||||
void EffectSs_DrawAll(GlobalContext* globalCtx) {
|
||||
LightMapper* lightMapper;
|
||||
s32 i;
|
||||
|
||||
lightMapper = Lights_CreateMapper(&globalCtx->lightCtx, globalCtx->state.gfxCtx);
|
||||
func_8007A474(lightMapper, globalCtx->lightCtx.lightsHead, 0);
|
||||
func_80079EFC(lightMapper, globalCtx->state.gfxCtx);
|
||||
|
||||
for (i = 0; i < sEffectSsInfo.tableSize; i++) {
|
||||
if (sEffectSsInfo.table[i].life > -1) {
|
||||
if ((sEffectSsInfo.table[i].pos.x > 32000.0f) || (sEffectSsInfo.table[i].pos.x < -32000.0f) ||
|
||||
(sEffectSsInfo.table[i].pos.y > 32000.0f) || (sEffectSsInfo.table[i].pos.y < -32000.0f) ||
|
||||
(sEffectSsInfo.table[i].pos.z > 32000.0f) || (sEffectSsInfo.table[i].pos.z < -32000.0f)) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
// Translates to: "Since the position is outside the area, delete it.
|
||||
// Effect label No. %d: Please respond by the program.
|
||||
// Here is ==> pos (%f, %f, %f) and the label is in z_effect_soft_sprite_dlftbls.decl."
|
||||
osSyncPrintf("EffectSoftSprite2_disp():位置が領域外のため "
|
||||
"削除します。エフェクトラベルNo.%d:プログラムの方で対応をお願いします。ここです ==> "
|
||||
"pos(%f, %f, %f)で、ラベルはz_effect_soft_sprite_dlftbls.declにあります。\n",
|
||||
sEffectSsInfo.table[i].type, sEffectSsInfo.table[i].pos.x, sEffectSsInfo.table[i].pos.y,
|
||||
sEffectSsInfo.table[i].pos.z);
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
// Translates to: "If you are using pos for something else, consult me."
|
||||
osSyncPrintf("もし、posを別のことに使っている場合相談に応じます。\n");
|
||||
osSyncPrintf(VT_RST);
|
||||
|
||||
EffectSs_Delete(&sEffectSsInfo.table[i]);
|
||||
} else {
|
||||
EffectSs_Draw(globalCtx, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2) {
|
||||
s16 ret = !arg2 ? arg1 : (arg0 + (s32)((f32)(arg1 - arg0) / arg2));
|
||||
s16 ret = (arg2 == 0) ? arg1 : (arg0 + (s32)((arg1 - arg0) / (f32)arg2));
|
||||
return ret;
|
||||
}
|
||||
|
||||
s16 func_80027E34(s16 a0, s16 a1, f32 a2) {
|
||||
return (a1 - a0) * a2 + a0;
|
||||
s16 func_80027E34(s16 arg0, s16 arg1, f32 arg2) {
|
||||
return (arg1 - arg0) * arg2 + arg0;
|
||||
}
|
||||
|
||||
u8 func_80027E84(u8 a0, u8 a1, f32 a2) {
|
||||
return a2 * ((f32)a1 - (f32)a0) + a0;
|
||||
u8 func_80027E84(u8 arg0, u8 arg1, f32 arg2) {
|
||||
return arg2 * ((f32)arg1 - (f32)arg0) + arg0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue