mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +00:00
Bg_toki_hikari all functions matching (#781)
* starting toki_hikari * func_808BA018 matched and some work on other func * init and draw matched, one to go * matched final function, removed ASM, updated spec * adding suggested changes
This commit is contained in:
Parker Burnett
GitHub
parent
07d54bd6d3
commit
7306d13897
15 changed files with 164 additions and 1023 deletions
|
|
@ -1,3 +1,9 @@
|
|||
/*
|
||||
* File: z_bg_toki_hikari.c
|
||||
* Overlay: ovl_Toki_Hikari
|
||||
* Description: Temple of Time Windows
|
||||
*/
|
||||
|
||||
#include "z_bg_toki_hikari.h"
|
||||
|
||||
#define FLAGS 0x00000020
|
||||
|
|
@ -9,14 +15,20 @@ void BgTokiHikari_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void BgTokiHikari_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgTokiHikari_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern UNK_TYPE D_06000880;
|
||||
extern UNK_TYPE D_060009C0;
|
||||
extern UNK_TYPE D_06000A10;
|
||||
extern UNK_TYPE D_06007E20;
|
||||
extern UNK_TYPE D_06007EE0;
|
||||
extern UNK_TYPE D_06008190;
|
||||
void BgTokiHikari_DoNothing(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
void func_808BA204(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
void func_808BA22C(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
void func_808BA274(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx);
|
||||
|
||||
extern Gfx D_06000880[];
|
||||
extern Gfx D_060009C0[];
|
||||
extern Gfx D_06000A10[];
|
||||
extern Gfx D_06007E20[];
|
||||
extern Gfx D_06007EE0[];
|
||||
extern Gfx D_06008190[];
|
||||
|
||||
/*
|
||||
const ActorInit Bg_Toki_Hikari_InitVars = {
|
||||
ACTOR_BG_TOKI_HIKARI,
|
||||
ACTORCAT_BG,
|
||||
|
|
@ -28,23 +40,152 @@ const ActorInit Bg_Toki_Hikari_InitVars = {
|
|||
(ActorFunc)BgTokiHikari_Update,
|
||||
(ActorFunc)BgTokiHikari_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Init.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Destroy.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808B9F98.s")
|
||||
void BgTokiHikari_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgTokiHikari* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Update.s")
|
||||
switch (this->actor.params) {
|
||||
case 0:
|
||||
Actor_ProcessInitChain(&this->actor, sInitChain);
|
||||
this->actionFunc = BgTokiHikari_DoNothing;
|
||||
break;
|
||||
case 1:
|
||||
if (!(gSaveContext.eventChkInf[4] & 0x800)) {
|
||||
this->actionFunc = func_808BA204;
|
||||
this->unk_14C = 0.0f;
|
||||
} else {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/BgTokiHikari_Draw.s")
|
||||
void BgTokiHikari_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s")
|
||||
void BgTokiHikari_DoNothing(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA204.s")
|
||||
void BgTokiHikari_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgTokiHikari* this = THIS;
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA22C.s")
|
||||
void BgTokiHikari_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgTokiHikari* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA274.s")
|
||||
switch (this->actor.params) {
|
||||
case 0:
|
||||
func_808BA018(this, globalCtx);
|
||||
break;
|
||||
case 1:
|
||||
func_808BA2CC(this, globalCtx);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s")
|
||||
void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 246);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 252),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
if (LINK_IS_ADULT) {
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06008190);
|
||||
} else {
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06007E20);
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(POLY_XLU_DISP++, 8,
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32));
|
||||
|
||||
gSPSegment(POLY_XLU_DISP++, 9,
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32));
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 278),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06007EE0);
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 284);
|
||||
}
|
||||
|
||||
void func_808BA204(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
if (globalCtx->unk_11D30[1] != 0) {
|
||||
this->actionFunc = func_808BA22C;
|
||||
}
|
||||
}
|
||||
|
||||
void func_808BA22C(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_14C < 1.0f) {
|
||||
this->unk_14C += 0.05f;
|
||||
} else {
|
||||
this->unk_14C = 1.0f;
|
||||
this->actionFunc = func_808BA274;
|
||||
}
|
||||
}
|
||||
|
||||
void func_808BA274(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_14C > 0.2f) {
|
||||
this->unk_14C -= 0.025f;
|
||||
} else {
|
||||
this->unk_14C = 0.0f;
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) {
|
||||
s32 pad[2];
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 350);
|
||||
Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW);
|
||||
Matrix_Scale(0.32f, 0.32f, this->unk_14C * 7.0f, MTXMODE_APPLY);
|
||||
Matrix_RotateZ(M_PI, MTXMODE_APPLY);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
Matrix_Push();
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->unk_14C * 255.0f, (u8)(155.0f * this->unk_14C) + 100,
|
||||
this->unk_14C * 255.0f, this->unk_14C * 255.0f);
|
||||
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 155.0f) + 100, (u8)(255.0f * this->unk_14C), 0, 128);
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 382),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPSegment(POLY_XLU_DISP++, 0x08,
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -2 * (globalCtx->gameplayFrames & 0x7F), 0, 0x20, 0x40, 1,
|
||||
(globalCtx->gameplayFrames & 0x7F) * 4, 0, 0x20, 0x40));
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000880);
|
||||
Matrix_Pop();
|
||||
Matrix_Push();
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(this->unk_14C * 200.0f));
|
||||
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
|
||||
(u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 415),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_060009C0);
|
||||
Matrix_Pop();
|
||||
Matrix_Push();
|
||||
gDPPipeSync(POLY_XLU_DISP++);
|
||||
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(this->unk_14C * 200.0f));
|
||||
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
|
||||
(u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
|
||||
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 437),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000A10);
|
||||
Matrix_Pop();
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 443);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,12 @@
|
|||
|
||||
struct BgTokiHikari;
|
||||
|
||||
typedef void (*BgTokiHikariActionFunc)(struct BgTokiHikari*, GlobalContext*);
|
||||
|
||||
typedef struct BgTokiHikari {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x8];
|
||||
/* 0x014C */ f32 unk_14C;
|
||||
/* 0x0150 */ BgTokiHikariActionFunc actionFunc;
|
||||
} BgTokiHikari; // size = 0x0154
|
||||
|
||||
extern const ActorInit Bg_Toki_Hikari_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue