mirror of https://github.com/zeldaret/mm.git
z_en_sc_ruppe decompiled (#843)
* z_en_sc_ruppe decompiled * PR Review fixes * PR Review fixes * PR review fixes * pr review fixes * pr review fixes * Ruppe -> Rupee Co-authored-by: SonicDcer <noreply@github.com>
This commit is contained in:
Alejandro Asenjo
GitHub
parent
3997776e5b
commit
aea2e67f79
3
spec
3
spec
|
|
@ -4627,8 +4627,7 @@ beginseg
|
|||
name "ovl_En_Sc_Ruppe"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.o"
|
||||
include "build/data/ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe.data.o"
|
||||
include "build/data/ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe.reloc.o"
|
||||
include "build/src/overlays/actors//ovl_En_Sc_Ruppe/ovl_En_Sc_Ruppe_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include "z_en_sc_ruppe.h"
|
||||
#include "objects/gameplay_keep/gameplay_keep.h"
|
||||
|
||||
#define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20)
|
||||
|
||||
|
|
@ -15,10 +16,13 @@ void EnScRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnScRuppe_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_80BD6A8C(EnScRuppe* this, GlobalContext* globalCtx);
|
||||
void func_80BD6B18(EnScRuppe* this, GlobalContext* globalCtx);
|
||||
|
||||
#if 0
|
||||
typedef struct {
|
||||
/* 0x0 */ TexturePtr tex;
|
||||
/* 0x4 */ s16 amount;
|
||||
} RuppeInfo;
|
||||
|
||||
const ActorInit En_Sc_Ruppe_InitVars = {
|
||||
ACTOR_EN_SC_RUPPE,
|
||||
ACTORCAT_NPC,
|
||||
|
|
@ -31,29 +35,157 @@ const ActorInit En_Sc_Ruppe_InitVars = {
|
|||
(ActorFunc)EnScRuppe_Draw,
|
||||
};
|
||||
|
||||
// static ColliderCylinderInit sCylinderInit = {
|
||||
static ColliderCylinderInit D_80BD6E40 = {
|
||||
{ COLTYPE_NONE, AT_NONE, AC_NONE, OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER, OC2_TYPE_2, COLSHAPE_CYLINDER, },
|
||||
{ ELEMTYPE_UNK4, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
|
||||
RuppeInfo sRupeeInfo[] = {
|
||||
{ gameplay_keep_Tex_061FC0, 1 }, // Green rupee
|
||||
{ gameplay_keep_Tex_061FE0, 5 }, // Blue rupee
|
||||
{ gameplay_keep_Tex_062000, 20 }, // Red rupee
|
||||
{ gameplay_keep_Tex_062040, 200 }, // Orange rupee
|
||||
{ gameplay_keep_Tex_062020, 50 }, // Purple rupee
|
||||
{ gameplay_keep_Tex_062060, 10 }, // (unused)
|
||||
};
|
||||
|
||||
static ColliderCylinderInit sCylinderInit = {
|
||||
{
|
||||
COLTYPE_NONE,
|
||||
AT_NONE,
|
||||
AC_NONE,
|
||||
OC1_ON | OC1_NO_PUSH | OC1_TYPE_PLAYER,
|
||||
OC2_TYPE_2,
|
||||
COLSHAPE_CYLINDER,
|
||||
},
|
||||
{
|
||||
ELEMTYPE_UNK4,
|
||||
{ 0x00000000, 0x00, 0x00 },
|
||||
{ 0x00000000, 0x00, 0x00 },
|
||||
TOUCH_NONE | TOUCH_SFX_NORMAL,
|
||||
BUMP_NONE,
|
||||
OCELEM_ON,
|
||||
},
|
||||
{ 10, 30, 0, { 0, 0, 0 } },
|
||||
};
|
||||
|
||||
#endif
|
||||
void EnScRuppe_UpdateCollision(EnScRuppe* this, GlobalContext* globalCtx) {
|
||||
Collider_UpdateCylinder(&this->actor, &this->collider);
|
||||
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
|
||||
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 32.0f, 30.0f, 0.0f, 4);
|
||||
}
|
||||
|
||||
extern ColliderCylinderInit D_80BD6E40;
|
||||
s32 func_80BD697C(s16 ruppeIndex) {
|
||||
switch (ruppeIndex) {
|
||||
case RUPEE_GREEN:
|
||||
if (gSaveContext.save.weekEventReg[53] & 4) {
|
||||
gSaveContext.save.weekEventReg[53] &= (u8)~4;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case RUPEE_BLUE:
|
||||
if (gSaveContext.save.weekEventReg[53] & 0x80) {
|
||||
gSaveContext.save.weekEventReg[53] &= (u8)~0x80;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case RUPEE_RED:
|
||||
if (gSaveContext.save.weekEventReg[54] & 1) {
|
||||
gSaveContext.save.weekEventReg[54] &= (u8)~1;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case RUPEE_ORANGE:
|
||||
if (gSaveContext.save.weekEventReg[54] & 2) {
|
||||
gSaveContext.save.weekEventReg[54] &= (u8)~2;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case RUPEE_PURPLE:
|
||||
if (gSaveContext.save.weekEventReg[54] & 4) {
|
||||
gSaveContext.save.weekEventReg[54] &= (u8)~4;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
case RUPEE_UNUSED:
|
||||
if ((gSaveContext.save.weekEventReg[54] & 8)) {
|
||||
gSaveContext.save.weekEventReg[54] &= (u8)~8;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6910.s")
|
||||
void func_80BD6A8C(EnScRuppe* this, GlobalContext* globalCtx) {
|
||||
if (this->collider.base.ocFlags1 & OC1_HIT) {
|
||||
this->ruppeDisplayTime = 0;
|
||||
this->actor.gravity = 0.0f;
|
||||
Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_GET_RUPY);
|
||||
func_801159EC(sRupeeInfo[this->ruppeIndex].amount);
|
||||
this->actionFunc = func_80BD6B18;
|
||||
}
|
||||
this->actor.shape.rot.y += 0x1F4;
|
||||
Actor_MoveWithGravity(&this->actor);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD697C.s")
|
||||
void func_80BD6B18(EnScRuppe* this, GlobalContext* globalCtx) {
|
||||
Player* player = GET_PLAYER(globalCtx);
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6A8C.s")
|
||||
if (this->ruppeDisplayTime > 30) {
|
||||
if (func_80BD697C(this->ruppeIndex)) {
|
||||
Actor_MarkForDeath(&this->actor);
|
||||
}
|
||||
} else {
|
||||
f32 scale;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/func_80BD6B18.s")
|
||||
this->ruppeDisplayTime++;
|
||||
this->actor.world.pos = player->actor.world.pos;
|
||||
this->actor.world.pos.y += 40.0f;
|
||||
scale = (30.0f - this->ruppeDisplayTime) * 0.001f;
|
||||
Actor_SetScale(&this->actor, scale);
|
||||
}
|
||||
this->actor.shape.rot.y += 0x3E8;
|
||||
Actor_MoveWithGravity(&this->actor);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Init.s")
|
||||
void EnScRuppe_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnScRuppe* this = THIS;
|
||||
ColliderCylinder* collider = &this->collider;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Destroy.s")
|
||||
Collider_InitCylinder(globalCtx, collider);
|
||||
Collider_InitAndSetCylinder(globalCtx, collider, &this->actor, &sCylinderInit);
|
||||
Actor_SetScale(&this->actor, 0.03f);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 10.0f);
|
||||
this->ruppeIndex = SCRUPPE_GET_TYPE(thisx);
|
||||
if ((this->ruppeIndex < RUPEE_GREEN) || (this->ruppeIndex >= RUPEE_UNUSED)) {
|
||||
this->ruppeIndex = RUPEE_GREEN;
|
||||
}
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->actionFunc = func_80BD6A8C;
|
||||
this->actor.gravity = -0.5f;
|
||||
this->actor.shape.yOffset = 700.0f;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Update.s")
|
||||
void EnScRuppe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnScRuppe* this = THIS;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sc_Ruppe/EnScRuppe_Draw.s")
|
||||
Collider_DestroyCylinder(globalCtx, &this->collider);
|
||||
}
|
||||
|
||||
void EnScRuppe_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnScRuppe* this = THIS;
|
||||
|
||||
this->actionFunc(this, globalCtx);
|
||||
EnScRuppe_UpdateCollision(this, globalCtx);
|
||||
}
|
||||
|
||||
void EnScRuppe_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
s32* pad;
|
||||
EnScRuppe* this = THIS;
|
||||
|
||||
OPEN_DISPS(globalCtx->state.gfxCtx);
|
||||
|
||||
func_8012C28C(globalCtx->state.gfxCtx);
|
||||
func_800B8050(&this->actor, globalCtx, 0);
|
||||
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sRupeeInfo[this->ruppeIndex].tex));
|
||||
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_0622C0);
|
||||
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,17 +3,29 @@
|
|||
|
||||
#include "global.h"
|
||||
|
||||
#define SCRUPPE_GET_TYPE(thisx) ((thisx)->params & 0x1F)
|
||||
|
||||
struct EnScRuppe;
|
||||
|
||||
typedef void (*EnScRuppeActionFunc)(struct EnScRuppe*, GlobalContext*);
|
||||
|
||||
typedef struct EnScRuppe {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0x4C];
|
||||
/* 0x0144 */ ColliderCylinder collider;
|
||||
/* 0x0190 */ EnScRuppeActionFunc actionFunc;
|
||||
/* 0x0194 */ char unk_194[0x4];
|
||||
/* 0x194 */ s16 ruppeDisplayTime;
|
||||
/* 0x196 */ s16 ruppeIndex;
|
||||
} EnScRuppe; // size = 0x198
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ RUPEE_GREEN,
|
||||
/* 1 */ RUPEE_BLUE,
|
||||
/* 2 */ RUPEE_RED,
|
||||
/* 3 */ RUPEE_ORANGE,
|
||||
/* 4 */ RUPEE_PURPLE,
|
||||
/* 5 */ RUPEE_UNUSED,
|
||||
} RupeeType;
|
||||
|
||||
extern const ActorInit En_Sc_Ruppe_InitVars;
|
||||
|
||||
#endif // Z_EN_SC_RUPPE_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue