mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-08 15:30:14 +00:00
Elf_Msg, Elf_Msg2 OK (#317)
* matched func_809AD700, ElfMsg2_Init * func_809AD968 done * func_809AD978 and func_809AD9F4 done * func_809ADA28 done * ElfMsg2_Update Done, ElfMsg2_Draw Started * whole file decomped * Matching and all symbols defined * Formatting changes, not currently building * run format.sh * fixed typos in comments * Changes to reflect comments * C file matching, polish needed * making parenthesis usage consistent * Documenting draw function, Vtx and Gfx arrays * Added japanese translation comments * line spacing fix * renaming stuff * Early return in Draw * naming updates * Cleaning up names, comments and formatting after the merge * comment cleanup * more cleanup * More cleanup * Adding commas at end of arrays so they look nicer :) * more cleanup * removing unnecessary parentheses * comment and code changes * Name changes * Renamings * Removing documentation at top
This commit is contained in:
AdamKiddle
GitHub
parent
13891f1366
commit
7a9c51375b
31 changed files with 396 additions and 1136 deletions
|
|
@ -1,4 +1,11 @@
|
|||
/*
|
||||
* File: z_elf_msg2.c
|
||||
* Overlay: ovl_Elf_Msg2
|
||||
* Description: Targetable Navi check spot
|
||||
*/
|
||||
|
||||
#include "z_elf_msg2.h"
|
||||
#include <vt.h>
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
||||
|
|
@ -9,7 +16,10 @@ void ElfMsg2_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
s32 ElfMsg2_GetMessageId(ElfMsg2* this);
|
||||
void ElfMsg2_WaitUntilActivated(ElfMsg2* this, GlobalContext* globalCtx);
|
||||
void ElfMsg2_WaitForTextRead(ElfMsg2* this, GlobalContext* globalCtx);
|
||||
|
||||
const ActorInit Elf_Msg2_InitVars = {
|
||||
ACTOR_ELF_MSG2,
|
||||
ACTORTYPE_BG,
|
||||
|
|
@ -21,23 +31,168 @@ const ActorInit Elf_Msg2_InitVars = {
|
|||
(ActorFunc)ElfMsg2_Update,
|
||||
(ActorFunc)ElfMsg2_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD700.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD708.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 200, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Init.s")
|
||||
// Draw properties
|
||||
Gfx D_809ADC38[] = {
|
||||
gsDPPipeSync(),
|
||||
gsDPSetTextureLUT(G_TT_NONE),
|
||||
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
|
||||
gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED),
|
||||
gsDPSetRenderMode(G_RM_PASS, G_RM_AA_ZB_XLU_SURF2),
|
||||
gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
|
||||
gsSPSetGeometryMode(G_LIGHTING),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Destroy.s")
|
||||
static Vtx sCuboidVertices[] = {
|
||||
VTX(100, 0, 100, 0, 0, 0x49, 0xB7, 0x49, 0xFF), VTX(100, 0, -100, 0, 0, 0x49, 0xB7, 0xB7, 0xFF),
|
||||
VTX(-100, 0, -100, 0, 0, 0xB7, 0xB7, 0xB7, 0xFF), VTX(-100, 0, 100, 0, 0, 0xB7, 0xB7, 0x49, 0xFF),
|
||||
VTX(100, 100, 100, 0, 0, 0x49, 0x49, 0x49, 0xFF), VTX(100, 100, -100, 0, 0, 0x49, 0x49, 0xB7, 0xFF),
|
||||
VTX(-100, 100, -100, 0, 0, 0xB7, 0x49, 0xB7, 0xFF), VTX(-100, 100, 100, 0, 0, 0xB7, 0x49, 0x49, 0xFF),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD968.s")
|
||||
// Cuboid polygons
|
||||
Gfx D_809ADCF8[] = {
|
||||
gsSPVertex(sCuboidVertices, 8, 0), gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
|
||||
gsSP2Triangles(4, 5, 6, 0, 4, 6, 7, 0), gsSP2Triangles(0, 1, 4, 0, 1, 4, 5, 0),
|
||||
gsSP2Triangles(1, 2, 5, 0, 2, 5, 6, 0), gsSP2Triangles(2, 3, 6, 0, 3, 6, 7, 0),
|
||||
gsSP2Triangles(3, 0, 7, 0, 0, 7, 4, 0), gsSPEndDisplayList(),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD978.s")
|
||||
void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809AD9F4.s")
|
||||
/**
|
||||
* Checks a scene flag - if flag is set, the actor is killed and function returns 1. Otherwise returns 0.
|
||||
* Can also set a switch flag from params while killing.
|
||||
*/
|
||||
s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) {
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/func_809ADA28.s")
|
||||
if ((this->actor.posRot.rot.y > 0) && (this->actor.posRot.rot.y < 0x41) &&
|
||||
(Flags_GetSwitch(globalCtx, this->actor.posRot.rot.y - 1))) {
|
||||
// "Mutual destruction"
|
||||
LOG_STRING("共倒れ", "../z_elf_msg2.c", 171);
|
||||
if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
|
||||
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
} else if ((this->actor.posRot.rot.y == -1) && (Flags_GetClear(globalCtx, this->actor.room))) {
|
||||
// "Mutual destruction 2"
|
||||
LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182);
|
||||
if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
|
||||
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
} else if (((this->actor.params >> 8) & 0x3F) == 0x3F) {
|
||||
return 0;
|
||||
} else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) {
|
||||
// "Mutual destruction"
|
||||
LOG_STRING("共倒れ", "../z_elf_msg2.c", 192);
|
||||
Actor_Kill(&this->actor);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Update.s")
|
||||
void ElfMsg2_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ElfMsg2* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s")
|
||||
osSyncPrintf(VT_FGCOL(CYAN) " Elf_Msg2_Actor_ct %04x\n\n" VT_RST, this->actor.params);
|
||||
if (!ElfMsg2_KillCheck(this, globalCtx)) {
|
||||
if ((this->actor.posRot.rot.x > 0) && (this->actor.posRot.rot.x < 8)) {
|
||||
this->actor.unk_1F = this->actor.posRot.rot.x - 1;
|
||||
}
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
if (this->actor.posRot.rot.y >= 0x41) {
|
||||
ElfMsg2_SetupAction(this, ElfMsg2_WaitUntilActivated);
|
||||
} else {
|
||||
ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextRead);
|
||||
this->actor.flags |= 0x00040001; // Make actor targetable and Navi-checkable
|
||||
this->actor.textId = ElfMsg2_GetMessageId(this);
|
||||
}
|
||||
this->actor.shape.rot.x = this->actor.shape.rot.y = this->actor.shape.rot.z = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ElfMsg2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
s32 ElfMsg2_GetMessageId(ElfMsg2* this) {
|
||||
return (this->actor.params & 0xFF) + 0x100;
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs while Navi text is up. Kills the actor upon closing the text box unless rot.z == 1, can also set a switch flag
|
||||
* from params.
|
||||
*/
|
||||
void ElfMsg2_WaitForTextClose(ElfMsg2* this, GlobalContext* globalCtx) {
|
||||
s32 switchFlag;
|
||||
|
||||
if (func_8002F334(&this->actor, globalCtx)) {
|
||||
if (this->actor.posRot.rot.z != 1) {
|
||||
Actor_Kill(&this->actor);
|
||||
switchFlag = (this->actor.params >> 8) & 0x3F;
|
||||
if (switchFlag != 0x3F) {
|
||||
Flags_SetSwitch(globalCtx, switchFlag);
|
||||
}
|
||||
} else {
|
||||
ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextRead);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs while Navi text is not up.
|
||||
*/
|
||||
void ElfMsg2_WaitForTextRead(ElfMsg2* this, GlobalContext* globalCtx) {
|
||||
if (func_8002F194(&this->actor, globalCtx)) {
|
||||
ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextClose);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Idles until a switch flag is set, at which point the actor becomes interactable
|
||||
*/
|
||||
void ElfMsg2_WaitUntilActivated(ElfMsg2* this, GlobalContext* globalCtx) {
|
||||
// If (y >= 0x41) && (y <= 0x80), Idles until switch flag (actor.posRot.rot.y - 0x41) is set
|
||||
// If (y > 0x80), Idles forever (Bug?)
|
||||
if ((this->actor.posRot.rot.y >= 0x41) && (this->actor.posRot.rot.y <= 0x80) &&
|
||||
(Flags_GetSwitch(globalCtx, (this->actor.posRot.rot.y - 0x41)))) {
|
||||
ElfMsg2_SetupAction(this, ElfMsg2_WaitForTextRead);
|
||||
this->actor.flags |= 0x00040001; // Make actor targetable and Navi-checkable
|
||||
this->actor.textId = ElfMsg2_GetMessageId(this);
|
||||
}
|
||||
}
|
||||
|
||||
void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ElfMsg2* this = THIS;
|
||||
if (!ElfMsg2_KillCheck(this, globalCtx)) {
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
}
|
||||
|
||||
void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
GraphicsContext* gfxCtx;
|
||||
Gfx* dispRefs[4];
|
||||
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_elf_msg2.c", 355);
|
||||
if (R_NAVI_MSG_REGION_ALPHA == 0) {
|
||||
return;
|
||||
}
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, D_809ADC38);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, D_809ADCF8);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@
|
|||
|
||||
struct ElfMsg2;
|
||||
|
||||
typedef void (*ElfMsg2ActionFunc)(struct ElfMsg2*, GlobalContext*);
|
||||
|
||||
typedef struct ElfMsg2 {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x4];
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ ElfMsg2ActionFunc actionFunc;
|
||||
} ElfMsg2; // size = 0x0150
|
||||
|
||||
extern const ActorInit Elf_Msg2_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue