mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 14:50:15 +00:00
Bg jya1flift (#269)
* Update ZAP2 * BgJya1flift progress * BgJya1flift Progress * Rename unknown variables * BgJya1flift Progress * Finish Decomp for BgJya1flift FInished decomp and added missing functions to functions.h * Fix struct padding * PR fixes * PR fixes * Pr Fixes
This commit is contained in:
louist103
GitHub
parent
9ddc6b5d6d
commit
4c8ed0e328
21 changed files with 181 additions and 490 deletions
|
|
@ -1,3 +1,9 @@
|
|||
/*
|
||||
* File: z_bg_jya_1flift.c
|
||||
* Overlay: ovl_Bg_Jya_1flift
|
||||
* Description: Shortcut Elevator used in the vanilla version of the Spirit Temple
|
||||
*/
|
||||
|
||||
#include "z_bg_jya_1flift.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
|
@ -9,7 +15,17 @@ void BgJya1flift_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void BgJya1flift_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void BgJya1flift_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void func_80892DB0(BgJya1flift* this);
|
||||
void func_80892DCC(BgJya1flift* this, GlobalContext* globalCtx);
|
||||
void BgJya1flift_DoNothing(BgJya1flift* this, GlobalContext* globalCtx);
|
||||
void BgJya1flift_ChangeDirection(BgJya1flift* this);
|
||||
void BgJya1flift_Move(BgJya1flift* this, GlobalContext* globalCtx);
|
||||
void func_80892E0C(BgJya1flift* this);
|
||||
void BgJya1flift_ResetMoveDelay(BgJya1flift* this);
|
||||
void BgJya1flift_DelayMove(BgJya1flift* this, GlobalContext* globalCtx);
|
||||
|
||||
u8 sHasSpawned = false;
|
||||
|
||||
const ActorInit Bg_Jya_1flift_InitVars = {
|
||||
ACTOR_BG_JYA_1FLIFT,
|
||||
ACTORTYPE_BG,
|
||||
|
|
@ -21,31 +37,164 @@ const ActorInit Bg_Jya_1flift_InitVars = {
|
|||
(ActorFunc)BgJya1flift_Update,
|
||||
(ActorFunc)BgJya1flift_Draw,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892B60.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892BE8.s")
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{ COLTYPE_UNK10, 0x00, 0x00, 0x39, 0x20, COLSHAPE_CYLINDER },
|
||||
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, 0x00, 0x00, 0x01 },
|
||||
{ 70, 80, -82, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Init.s")
|
||||
f32 finalPositions[] = { 443.0f, -50.0f };
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Destroy.s")
|
||||
static InitChainEntry sInitChain[] = {
|
||||
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneForward, 1200, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
|
||||
ICHAIN_F32(uncullZoneDownward, 1200, ICHAIN_STOP),
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DB0.s")
|
||||
extern UNK_TYPE D_060004A8;
|
||||
extern Gfx D_060001F0[];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892DCC.s")
|
||||
void BgJya1flift_InitDynapoly(BgJya1flift* this, GlobalContext* globalCtx, UNK_PTR arg2, s32 moveFlag) {
|
||||
s32 pad;
|
||||
s32 localConst;
|
||||
s32 pad2;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E0C.s")
|
||||
localConst = 0;
|
||||
DynaPolyInfo_SetActorMove(&this->dyna, moveFlag);
|
||||
DynaPolyInfo_Alloc(arg2, &localConst);
|
||||
this->dyna.dynaPolyId =
|
||||
DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localConst);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E28.s")
|
||||
if (this->dyna.dynaPolyId == 0x32) {
|
||||
// Warning : move BG login failed
|
||||
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_1flift.c", 0xB3,
|
||||
this->dyna.actor.id, this->dyna.actor.params);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E34.s")
|
||||
void BgJya1flift_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgJya1flift* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892E58.s")
|
||||
Collider_InitCylinder(globalCtx, &this->collider);
|
||||
Collider_SetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
|
||||
this->dyna.actor.colChkInfo.mass = 0xFF;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F3C.s")
|
||||
void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgJya1flift* this = THIS;
|
||||
// 1 F lift
|
||||
osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sHasSpawned, globalCtx->roomCtx.curRoom.num);
|
||||
this->hasInitialized = false;
|
||||
if (sHasSpawned) {
|
||||
Actor_Kill(thisx);
|
||||
return;
|
||||
}
|
||||
BgJya1flift_InitDynapoly(this, globalCtx, &D_060004A8, 0);
|
||||
Actor_ProcessInitChain(thisx, sInitChain);
|
||||
BgJya1flift_InitCollision(thisx, globalCtx);
|
||||
if (Flags_GetSwitch(globalCtx, (thisx->params & 0x3F))) {
|
||||
LINK_AGE_IN_YEARS == YEARS_ADULT ? BgJya1flift_ChangeDirection(this) : func_80892E0C(this);
|
||||
} else {
|
||||
func_80892DB0(this);
|
||||
}
|
||||
thisx->room = -1;
|
||||
sHasSpawned = true;
|
||||
this->hasInitialized = true;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/func_80892F50.s")
|
||||
void BgJya1flift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgJya1flift* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Update.s")
|
||||
if (this->hasInitialized) {
|
||||
sHasSpawned = false;
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s")
|
||||
void func_80892DB0(BgJya1flift* this) {
|
||||
this->actionFunc = func_80892DCC;
|
||||
this->dyna.actor.posRot.pos.y = finalPositions[0];
|
||||
}
|
||||
|
||||
void func_80892DCC(BgJya1flift* this, GlobalContext* globalCtx) {
|
||||
if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params & 0x3F))) {
|
||||
BgJya1flift_ChangeDirection(this);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80892E0C(BgJya1flift* this) {
|
||||
this->actionFunc = BgJya1flift_DoNothing;
|
||||
this->dyna.actor.posRot.pos.y = finalPositions[0];
|
||||
}
|
||||
|
||||
void BgJya1flift_DoNothing(BgJya1flift* this, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
void BgJya1flift_ChangeDirection(BgJya1flift* this) {
|
||||
this->actionFunc = BgJya1flift_Move;
|
||||
this->isMovingDown ^= true;
|
||||
this->dyna.actor.velocity.y = 0.0f;
|
||||
}
|
||||
|
||||
void BgJya1flift_Move(BgJya1flift* this, GlobalContext* globalCtx) {
|
||||
f32 tempVelocity;
|
||||
|
||||
Math_ApproxF(&this->dyna.actor.velocity.y, 6.0f, 0.4f);
|
||||
if (this->dyna.actor.velocity.y < 1.0f) {
|
||||
tempVelocity = 1.0f;
|
||||
} else {
|
||||
tempVelocity = this->dyna.actor.velocity.y;
|
||||
}
|
||||
if (fabsf(Math_SmoothScaleMaxMinF(&this->dyna.actor.posRot.pos.y, (finalPositions[this->isMovingDown]), 0.5f,
|
||||
tempVelocity, 1.0f)) < 0.001f) {
|
||||
this->dyna.actor.posRot.pos.y = finalPositions[this->isMovingDown];
|
||||
BgJya1flift_ResetMoveDelay(this);
|
||||
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
|
||||
} else {
|
||||
func_8002F974(&this->dyna.actor, NA_SE_EV_ELEVATOR_MOVE3 - SFX_FLAG);
|
||||
}
|
||||
}
|
||||
|
||||
void BgJya1flift_ResetMoveDelay(BgJya1flift* this) {
|
||||
this->actionFunc = BgJya1flift_DelayMove;
|
||||
this->moveDelay = 0;
|
||||
}
|
||||
|
||||
void BgJya1flift_DelayMove(BgJya1flift* this, GlobalContext* globalCtx) {
|
||||
this->moveDelay++;
|
||||
if (this->moveDelay >= 21) {
|
||||
BgJya1flift_ChangeDirection(this);
|
||||
}
|
||||
}
|
||||
|
||||
void BgJya1flift_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
BgJya1flift* this = THIS;
|
||||
s32 pad;
|
||||
s32 tempIsRiding;
|
||||
|
||||
// Room 0 is the first room and 6 is the room that the lift starts on
|
||||
if (globalCtx->roomCtx.curRoom.num == 6 || globalCtx->roomCtx.curRoom.num == 0) {
|
||||
this->actionFunc(this, globalCtx);
|
||||
if (globalCtx) {}
|
||||
tempIsRiding = func_8004356C(&this->dyna) ? true : false;
|
||||
if ((this->actionFunc == BgJya1flift_Move) || (this->actionFunc == BgJya1flift_DelayMove)) {
|
||||
if (tempIsRiding) {
|
||||
func_8005A77C(globalCtx->cameraPtrs[0], 0x30);
|
||||
} else if (!tempIsRiding && this->isLinkRiding) {
|
||||
func_8005A77C(globalCtx->cameraPtrs[0], 3);
|
||||
}
|
||||
}
|
||||
this->isLinkRiding = tempIsRiding;
|
||||
Collider_CylinderUpdate(thisx, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider);
|
||||
} else {
|
||||
Actor_Kill(thisx);
|
||||
}
|
||||
}
|
||||
|
||||
void BgJya1flift_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
Gfx_DrawDListOpa(globalCtx, D_060001F0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,16 @@
|
|||
|
||||
struct BgJya1flift;
|
||||
|
||||
typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, GlobalContext*);
|
||||
|
||||
typedef struct BgJya1flift {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x70];
|
||||
/* 0x0000 */ DynaPolyActor dyna;
|
||||
/* 0x0164 */ ColliderCylinder collider;
|
||||
/* 0x01B0 */ BgJya1fliftActionFunc actionFunc;
|
||||
/* 0x01B4 */ s16 moveDelay;
|
||||
/* 0x01B6 */ u8 isMovingDown;
|
||||
/* 0x01B7 */ u8 hasInitialized;
|
||||
/* 0x01B8 */ u8 isLinkRiding;
|
||||
} BgJya1flift; // size = 0x01BC
|
||||
|
||||
extern const ActorInit Bg_Jya_1flift_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue