mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 06:40:15 +00:00
Decomp EnExRuppy (#331)
* PR fixes NOT MATCHING * PR fixes * Fix EnNiwGirl.h * Update z_en_niw_girl.h * Update z_en_niw_girl.c * Delete ASM * Ran format.sh and did some manual cleanup * Update z_en_ex_ruppy.c * Update z_en_ex_ruppy.c * PR fixes * Accidently left a git string in the file * PR fixes * PR fixes
This commit is contained in:
louist103
GitHub
parent
c905652f80
commit
98ca965541
19 changed files with 420 additions and 868 deletions
|
|
@ -6,9 +6,59 @@
|
|||
|
||||
struct EnDivingGame;
|
||||
|
||||
typedef void (*EnDivingGameActionFunc)(struct EnDivingGame*, GlobalContext*);
|
||||
|
||||
typedef struct EnDivingGame {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x24C];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s limbDrawTable[20];
|
||||
/* 0x0208 */ Vec3s transitionDrawTable[20];
|
||||
/* 0x0280 */ EnDivingGameActionFunc actionFunc;
|
||||
/* 0x0284 */ Vec3s vec_284;
|
||||
/* 0x028A */ Vec3s vec_28A;
|
||||
/* 0x0290 */ s16 unk_290;
|
||||
/* 0x0292 */ s16 unk_292;
|
||||
/* 0x0294 */ s16 unk_294;
|
||||
/* 0x0296 */ s16 unk_296;
|
||||
/* 0x0298 */ s16 unk_298;
|
||||
/* 0x029A */ s16 unk_29A;
|
||||
/* 0x029C */ s16 unk_29C;
|
||||
/* 0x029E */ s16 unk_29E;
|
||||
/* 0x02A0 */ s16 camId;
|
||||
/* 0x02A2 */ s16 unk_2A2;
|
||||
/* 0x02A4 */ s16 unk_2A4;
|
||||
/* 0x02A6 */ s16 unk_2A6;
|
||||
/* 0x02A8 */ s16 unk_2A8;
|
||||
/* 0x02AA */ s16 unk_2AA;
|
||||
/* 0x02AC */ char unk_2AC[0xC];
|
||||
/* 0x02B8 */ Vec3f vec_2B8;
|
||||
/* 0x02C4 */ Vec3f vec_2C4;
|
||||
/* 0x02D0 */ f32 unk_2D0;
|
||||
/* 0x02D4 */ f32 unk_2D4;
|
||||
/* 0x02D8 */ f32 unk_2D8;
|
||||
/* 0x02DC */ f32 unk_2DC;
|
||||
/* 0x02E0 */ f32 unk_2E0;
|
||||
/* 0x02E4 */ f32 unk_2E4;
|
||||
/* 0x02E8 */ f32 unk_2E8;
|
||||
/* 0x02EC */ f32 unk_2EC;
|
||||
/* 0x02F0 */ f32 unk_2F0;
|
||||
/* 0x02F4 */ f32 unk_2F4;
|
||||
/* 0x02F8 */ f32 unk_2F8;
|
||||
/* 0x02FC */ f32 unk_2FC;
|
||||
/* 0x0300 */ f32 unk_300;
|
||||
/* 0x0304 */ f32 unk_304;
|
||||
/* 0x0308 */ f32 unk_308;
|
||||
/* 0x030C */ f32 unk_30C;
|
||||
/* 0x0310 */ f32 unk_310;
|
||||
/* 0x0314 */ f32 unk_314;
|
||||
/* 0x0318 */ f32 unk_318;
|
||||
/* 0x031C */ char unk_31C;
|
||||
/* 0x031D */ u8 unk_31D;
|
||||
/* 0x031E */ char unk_31E;
|
||||
/* 0x031F */ u8 unk_31F;
|
||||
/* 0x0320 */ char unk_320[0x4];
|
||||
/* 0x0324 */ struct_80034A14_arg1 unk_324;
|
||||
/* 0x034C */ ColliderCylinder collider;
|
||||
} EnDivingGame; // size = 0x0398
|
||||
|
||||
extern const ActorInit En_Diving_Game_InitVars;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
#include "z_en_ex_ruppy.h"
|
||||
#include "vt.h"
|
||||
#include "../ovl_En_Diving_Game/z_en_diving_game.h"
|
||||
|
||||
#define FLAGS 0x00000010
|
||||
|
||||
|
|
@ -9,7 +11,23 @@ void EnExRuppy_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnExRuppy_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
void EnExRuppy_DropIntoWater(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void EnExRuppy_WaitAsCollectible(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void func_80A0B0F4(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void EnExRuppy_EnterWater(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void EnExRuppy_Sink(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void func_80A0AD88(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
void func_80A0AEE0(EnExRuppy* this, GlobalContext* globalCtx);
|
||||
|
||||
static s16 sEnExRuppyCollectibleTypes[] = {
|
||||
ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_ORANGE, ITEM00_RUPEE_PURPLE,
|
||||
};
|
||||
|
||||
static s16 D_80A0B32B[] = {
|
||||
1, 5, 20, 500, 50,
|
||||
};
|
||||
|
||||
const ActorInit En_Ex_Ruppy_InitVars = {
|
||||
ACTOR_EN_EX_RUPPY,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -21,29 +39,343 @@ const ActorInit En_Ex_Ruppy_InitVars = {
|
|||
(ActorFunc)EnExRuppy_Update,
|
||||
(ActorFunc)EnExRuppy_Draw,
|
||||
};
|
||||
*/
|
||||
|
||||
static Vec3f D_80A0B358[] = { { 0.0f, 0.1f, 0.0f }, { 0.0f, 0.0f, 0.0f } };
|
||||
static Vec3f D_80A0B370[] = { { 0.0f, 0.01f, 0.0f }, { 0.0f, 0.0f, 0.0f } };
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// Regalloc
|
||||
void EnExRuppy_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnExRuppy* this = THIS;
|
||||
s16 temp_v0;
|
||||
f32 phi_f12;
|
||||
f32 temp;
|
||||
|
||||
this->unk_152 = this->actor.params;
|
||||
// Index
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ インデックス ☆☆☆☆☆ %x" VT_RST, this->unk_152);
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 25.0f);
|
||||
switch (this->unk_152) {
|
||||
case 0:
|
||||
this->unk_160 = 0.01f;
|
||||
Actor_SetScale(&this->actor, this->unk_160);
|
||||
this->actor.room = -1;
|
||||
this->actor.gravity = 0.0f;
|
||||
// If you havnt won the diving game before you will get 5 blue ruppees.
|
||||
if (!(gSaveContext.eventChkInf[3] & 0x100)) {
|
||||
this->rupeeValue = 5;
|
||||
this->unk_150 = 1;
|
||||
} else {
|
||||
phi_f12 = 200.99f;
|
||||
if ((thisx->attachedA != NULL) && (thisx->attachedA->update != NULL)) {
|
||||
phi_f12 = 200.99f + ((EnDivingGame*)thisx->attachedA)->unk_2AA * 10.0f;
|
||||
}
|
||||
temp_v0 = Math_Rand_ZeroFloat(phi_f12);
|
||||
if ((temp_v0 >= 0) && (temp_v0 < 40)) {
|
||||
this->rupeeValue = 1;
|
||||
this->unk_150 = 0;
|
||||
} else if ((temp_v0 >= 40) && (temp_v0 < 170)) {
|
||||
this->rupeeValue = 5;
|
||||
this->unk_150 = 1;
|
||||
} else if ((temp_v0 >= 170) && (temp_v0 < 190)) {
|
||||
this->rupeeValue = 20;
|
||||
this->unk_150 = 2;
|
||||
} else if ((temp_v0 >= 190) && (temp_v0 < 200)) {
|
||||
this->rupeeValue = 50;
|
||||
this->unk_150 = 4;
|
||||
} else {
|
||||
this->unk_160 = 0.02f;
|
||||
Actor_SetScale(&this->actor, this->unk_160);
|
||||
this->rupeeValue = 500;
|
||||
this->unk_150 = 3;
|
||||
if ((thisx->attachedA != NULL) && (thisx->attachedA->update != NULL)) {
|
||||
((EnDivingGame*)thisx->attachedA)->unk_2AA = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
temp_v0 = this->actor.posRot.rot.z;
|
||||
this->actor.posRot.rot.z = 0;
|
||||
this->timer = 30;
|
||||
this->actor.shape.unk_10 = 7.0f;
|
||||
this->actor.shape.unk_08 = 700.0f;
|
||||
this->unk_15A = temp_v0;
|
||||
this->actor.flags &= ~1;
|
||||
this->actionFunc = EnExRuppy_DropIntoWater;
|
||||
break;
|
||||
case 1:
|
||||
case 2: // Giant pink ruppe that explodes when you touch it
|
||||
if (this->unk_152 == 1) {
|
||||
Actor_SetScale(thisx, 0.1f);
|
||||
this->unk_150 = 4;
|
||||
} else {
|
||||
Actor_SetScale(thisx, 0.02f);
|
||||
this->unk_150 = (s16)Math_Rand_ZeroFloat(3.99f) + 1;
|
||||
}
|
||||
this->actor.gravity = -3.0f;
|
||||
// Wow Coin
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ わーなーコイン ☆☆☆☆☆ \n" VT_RST);
|
||||
this->actor.shape.unk_10 = 6.0f;
|
||||
this->actor.shape.unk_08 = 700.0f;
|
||||
this->actor.flags &= ~1;
|
||||
this->actionFunc = EnExRuppy_WaitToBlowUp;
|
||||
break;
|
||||
case 3: // Spawned by the guard in Hyrule courtyard
|
||||
Actor_SetScale(thisx, 0.02f);
|
||||
this->unk_150 = 0;
|
||||
switch ((s16)Math_Rand_ZeroFloat(30.99f)) {
|
||||
case 0:
|
||||
this->unk_150 = 2;
|
||||
break;
|
||||
case 10:
|
||||
case 20:
|
||||
this->unk_150 = 1;
|
||||
break;
|
||||
case 30:
|
||||
break;
|
||||
}
|
||||
this->actor.gravity = -3.0f;
|
||||
// Normal rupee
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ ノーマルルピー ☆☆☆☆☆ \n" VT_RST);
|
||||
this->actor.shape.unk_10 = 6.0f;
|
||||
this->actor.shape.unk_08 = 700.0f;
|
||||
this->actor.flags &= ~1;
|
||||
this->actionFunc = EnExRuppy_WaitAsCollectible;
|
||||
break;
|
||||
case 4:
|
||||
this->actor.gravity = -3.0f;
|
||||
this->actor.flags &= ~1;
|
||||
Actor_SetScale(thisx, 0.01f);
|
||||
this->actor.shape.unk_10 = 6.0f;
|
||||
this->actor.shape.unk_08 = -700.0f;
|
||||
this->actionFunc = func_80A0B0F4;
|
||||
break;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Init.s")
|
||||
#endif
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Destroy.s")
|
||||
void EnExRuppy_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0A820.s")
|
||||
void EnExRuppy_SpawnSparkles(EnExRuppy* this, GlobalContext* globalCtx, s16 arg2, s32 arg3) {
|
||||
Vec3f sparklePos;
|
||||
Vec3f sparkleVelocity;
|
||||
Vec3f sparkleAccel;
|
||||
Color_RGBA8_n primColor;
|
||||
Color_RGBA8_n envColor;
|
||||
s32 i;
|
||||
s16 sparkleScale;
|
||||
s16 sparkleLife;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AA3C.s")
|
||||
if (arg2 <= 0) {
|
||||
arg2 = 1;
|
||||
}
|
||||
primColor.r = 255;
|
||||
primColor.g = 255;
|
||||
primColor.b = 0;
|
||||
envColor.r = 255;
|
||||
envColor.g = 255;
|
||||
envColor.b = 255;
|
||||
sparkleVelocity = D_80A0B358[arg3];
|
||||
sparkleAccel = D_80A0B370[arg3];
|
||||
sparkleScale = 3000;
|
||||
sparkleLife = 16;
|
||||
for (i = 0; i < arg2; i++) {
|
||||
if (arg3 == 1) {
|
||||
sparkleAccel.x = Math_Rand_CenteredFloat(20.0f);
|
||||
sparkleAccel.z = Math_Rand_CenteredFloat(20.0f);
|
||||
sparkleScale = 5000;
|
||||
sparkleLife = 20;
|
||||
}
|
||||
sparklePos.x = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.x;
|
||||
sparklePos.y = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + (this->actor.posRot.pos.y + this->unk_160 * 600.0f);
|
||||
sparklePos.z = (Math_Rand_ZeroOne() - 0.5f) * 10.0f + this->actor.posRot.pos.z;
|
||||
func_80028BB0(globalCtx, &sparklePos, &sparkleVelocity, &sparkleAccel, &primColor, &envColor, sparkleScale,
|
||||
sparkleLife);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AB1C.s")
|
||||
void EnExRuppy_DropIntoWater(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
this->actor.shape.rot.y = (this->actor.shape.rot.y + 1960);
|
||||
Math_SmoothScaleMaxF(&this->actor.gravity, -2.0f, 0.3f, 1.0f);
|
||||
EnExRuppy_SpawnSparkles(this, globalCtx, 2, 0);
|
||||
func_80078884(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG);
|
||||
if ((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL) &&
|
||||
(((((EnDivingGame*)this->actor.attachedA)->unk_296 == 0) || (this->actor.bgCheckFlags & 0x20)) ||
|
||||
(this->timer == 0))) {
|
||||
this->isFalling = 1;
|
||||
this->actor.speedXZ = 0.0f;
|
||||
this->actor.velocity.z = 0.0f;
|
||||
this->actor.velocity.y = 0.0f;
|
||||
this->actor.velocity.x = 0.0f;
|
||||
this->actor.gravity = 0.0f;
|
||||
func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER);
|
||||
this->actionFunc = EnExRuppy_EnterWater;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AC88.s")
|
||||
void EnExRuppy_EnterWater(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
f32 temp_f2;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AD88.s")
|
||||
if (((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL)) &&
|
||||
(((EnDivingGame*)this->actor.attachedA)->unk_2A2 == 2)) {
|
||||
this->isFalling = 0;
|
||||
this->actor.posRot.pos.x = ((Math_Rand_ZeroOne() - 0.5f) * 300.0f) + -260.0f;
|
||||
this->actor.posRot.pos.y = ((Math_Rand_ZeroOne() - 0.5f) * 200.0f) + 370.0f;
|
||||
temp_f2 = this->unk_15A * -50.0f;
|
||||
if (!(gSaveContext.eventChkInf[3] & 0x100)) {
|
||||
temp_f2 += -500.0f;
|
||||
this->actor.posRot.pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 80.0f) + temp_f2;
|
||||
} else {
|
||||
temp_f2 += -300.0f;
|
||||
this->actor.posRot.pos.z = ((Math_Rand_ZeroOne() - 0.5f) * 60.0f) + temp_f2;
|
||||
}
|
||||
this->actionFunc = EnExRuppy_Sink;
|
||||
this->actor.gravity = -1.0f;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AEE0.s")
|
||||
void EnExRuppy_Sink(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
Vec3f pos;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0AF24.s")
|
||||
if ((this->actor.bgCheckFlags & 0x20) && (15.0f < this->actor.waterY)) {
|
||||
pos = this->actor.posRot.pos;
|
||||
pos.y += this->actor.waterY;
|
||||
this->actor.velocity.y = -1.0f;
|
||||
this->actor.gravity = -0.2f;
|
||||
func_8002949C(globalCtx, &pos, 0, 0, 0, 800);
|
||||
func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER);
|
||||
this->actionFunc = func_80A0AD88;
|
||||
}
|
||||
if (((this->actor.attachedA != NULL) && (this->actor.attachedA->update != NULL) &&
|
||||
((EnDivingGame*)this->actor.attachedA)->unk_29C == 0)) {
|
||||
this->timer = 20;
|
||||
this->actionFunc = func_80A0AEE0;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B070.s")
|
||||
void func_80A0AD88(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
EnDivingGame* divingGame;
|
||||
Vec3f D_80A0B388 = { 0.0f, 0.1f, 0.0f };
|
||||
Vec3f D_80A0B394 = { 0.0f, 0.0f, 0.0f };
|
||||
f32 localConst = 30.0f;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/func_80A0B0F4.s")
|
||||
if (this->timer == 0) {
|
||||
this->timer = 10;
|
||||
func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 5.0f, 5.0f, Math_Rand_ZeroFloat(0.03f) + 0.07f);
|
||||
}
|
||||
if (this->actor.attachedA != NULL) {
|
||||
divingGame = this->actor.attachedA;
|
||||
if (divingGame->actor.update != NULL) {
|
||||
if (divingGame->unk_29C == 0) {
|
||||
this->timer = 20;
|
||||
this->actionFunc = func_80A0AEE0;
|
||||
return;
|
||||
}
|
||||
if (this->actor.xyzDistFromLinkSq < SQ(localConst)) {
|
||||
Rupees_ChangeBy(this->rupeeValue);
|
||||
func_80078884(NA_SE_SY_GET_RUPY);
|
||||
divingGame->unk_2A4++;
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
} else {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Update.s")
|
||||
void func_80A0AEE0(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
this->isFalling += 1;
|
||||
this->isFalling &= 1;
|
||||
if (this->timer == 0) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s")
|
||||
void EnExRuppy_WaitToBlowUp(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
f32 distToBlowUp;
|
||||
Vec3f point1Vec = { 0.0f, 0.1f, 0.0f };
|
||||
Vec3f zeroVector = { 0.0f, 0.0f, 0.0f };
|
||||
s16 explosionScale;
|
||||
s16 explosionScaleStep;
|
||||
distToBlowUp = 50.0f;
|
||||
if (this->unk_152 == 2) {
|
||||
distToBlowUp = 30.0f;
|
||||
}
|
||||
if (this->actor.xyzDistFromLinkSq < SQ(distToBlowUp)) {
|
||||
if (this->actor.attachedA != NULL) {
|
||||
if (this->actor.attachedA->update != NULL) {
|
||||
((EnDivingGame*)this->actor.attachedA)->transitionDrawTable[15].z = 1;
|
||||
}
|
||||
} else {
|
||||
// That idiot! error
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ そ、そんなばかな！エラー！！！！！ ☆☆☆☆☆ \n" VT_RST);
|
||||
}
|
||||
// Stupid!
|
||||
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ バカめ！ ☆☆☆☆☆ \n" VT_RST);
|
||||
explosionScale = 100;
|
||||
explosionScaleStep = 30;
|
||||
if (this->unk_152 == 2) {
|
||||
explosionScale = 20;
|
||||
explosionScaleStep = 6;
|
||||
}
|
||||
EffectSsBomb2_SpawnLayered(globalCtx, &this->actor.posRot.pos, &zeroVector, &point1Vec, explosionScale,
|
||||
explosionScaleStep);
|
||||
func_8002F71C(globalCtx, &this->actor, 2.0f, this->actor.yawTowardsLink, 0.0f);
|
||||
Audio_PlayActorSound2(&this->actor, NA_SE_IT_BOMB_EXPLOSION);
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void EnExRuppy_WaitAsCollectible(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
f32 localConst = 30.0f;
|
||||
if (this->actor.xyzDistFromLinkSq < SQ(localConst)) {
|
||||
func_80078884(NA_SE_SY_GET_RUPY);
|
||||
Item_DropCollectible(globalCtx, &this->actor.posRot.pos, (sEnExRuppyCollectibleTypes[this->unk_150] | 0x8000));
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80A0B0F4(EnExRuppy* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_15C != 0) {
|
||||
Math_SmoothScaleMaxF(&this->actor.shape.unk_08, 700.0f, 0.5f, 200.0f);
|
||||
} else {
|
||||
Math_SmoothScaleMaxF(&this->actor.shape.unk_08, -700.0f, 0.5f, 200.0f);
|
||||
}
|
||||
}
|
||||
|
||||
void EnExRuppy_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnExRuppy* this = THIS;
|
||||
|
||||
thisx->shape.rot.y += 1960;
|
||||
this->actionFunc(this, globalCtx);
|
||||
if (this->timer != 0) {
|
||||
this->timer--;
|
||||
}
|
||||
Actor_MoveForward(&this->actor);
|
||||
func_8002E4B4(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1C);
|
||||
}
|
||||
|
||||
UNK_PTR D_80A0B3B8[] = { 0x04042140, 0x04042160, 0x04042180, 0x040421C0, 0x040421A0 };
|
||||
|
||||
void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
EnExRuppy* this = THIS;
|
||||
s32 pad;
|
||||
GraphicsContext* gfxCtx;
|
||||
Gfx* dispRefs[4];
|
||||
|
||||
if (this->isFalling == 0) {
|
||||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 774);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
func_8002EBCC(thisx, globalCtx, 0);
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A0B3B8[this->unk_150]));
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, D_04042440);
|
||||
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 784);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,19 @@
|
|||
|
||||
struct EnExRuppy;
|
||||
|
||||
typedef void (*EnExRuppyActionFunc)(struct EnExRuppy*, GlobalContext*);
|
||||
|
||||
typedef struct EnExRuppy {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x18];
|
||||
/* 0x014C */ EnExRuppyActionFunc actionFunc;
|
||||
/* 0x0150 */ s16 unk_150;
|
||||
/* 0x0152 */ s16 unk_152;
|
||||
/* 0x0154 */ s16 isFalling;
|
||||
/* 0x0156 */ s16 timer;
|
||||
/* 0x0158 */ s16 rupeeValue;
|
||||
/* 0x015A */ s16 unk_15A;
|
||||
/* 0x015C */ s16 unk_15C;
|
||||
/* 0x0160 */ f32 unk_160;
|
||||
} EnExRuppy; // size = 0x0164
|
||||
|
||||
extern const ActorInit En_Ex_Ruppy_InitVars;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue