mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 14:50:15 +00:00
ovl_Item_Etcetera OK (#281)
* started item_etcetera * ovl_Item_Etcetera OK * z_item_etcetera cleanup * fixed * removed padding * z_item_etcetera updates * made suggested changes * change member in enum
This commit is contained in:
Lucas Shaw
GitHub
parent
b35f2007ad
commit
c3421dda0c
19 changed files with 207 additions and 643 deletions
|
|
@ -13,8 +13,17 @@
|
|||
void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_DrawThroughLens(Actor* thisx, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void func_80B8598C(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx);
|
||||
|
||||
/*
|
||||
const ActorInit Item_Etcetera_InitVars = {
|
||||
ACTOR_ITEM_ETCETERA,
|
||||
ACTORTYPE_PROP,
|
||||
|
|
@ -26,29 +35,186 @@ const ActorInit Item_Etcetera_InitVars = {
|
|||
(ActorFunc)ItemEtcetera_Update,
|
||||
NULL,
|
||||
};
|
||||
*/
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B855F0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Init.s")
|
||||
static s16 sObjectIds[] = {
|
||||
OBJECT_GI_BOTTLE, OBJECT_GI_BOTTLE_LETTER, OBJECT_GI_SHIELD_2, OBJECT_GI_ARROWCASE, OBJECT_GI_SCALE,
|
||||
OBJECT_GI_SCALE, OBJECT_GI_KEY, OBJECT_GI_M_ARROW, OBJECT_GI_RUPY, OBJECT_GI_RUPY,
|
||||
OBJECT_GI_RUPY, OBJECT_GI_RUPY, OBJECT_GI_HEARTS, OBJECT_GI_KEY,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Destroy.s")
|
||||
// Indexes passed to the item table in z_draw.c
|
||||
static s16 sDrawItemIndexes[] = {
|
||||
0x0000, 0x0044, 0x002B, 0x0015, 0x0029, 0x002A, 0x0001, 0x005F, 0x006C, 0x006D, 0x006E, 0x0070, 0x0013, 0x0001,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B857D0.s")
|
||||
static s16 sGetItemIds[] = {
|
||||
GI_BOTTLE, GI_LETTER_RUTO, GI_SHIELD_HYLIAN, GI_QUIVER_40, GI_SCALE_SILVER, GI_SCALE_GOLD, GI_KEY_SMALL,
|
||||
GI_ARROW_FIRE, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID, GI_INVALID,
|
||||
};
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85824.s")
|
||||
void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionFunc) {
|
||||
this->actionFunc = actionFunc;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B858B4.s")
|
||||
void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ItemEtcetera* this = THIS;
|
||||
s32 pad;
|
||||
s32 type;
|
||||
s32 objBankIndex;
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B8598C.s")
|
||||
type = this->actor.params & 0xFF;
|
||||
osSyncPrintf("no = %d\n", type);
|
||||
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIds[type]);
|
||||
osSyncPrintf("bank_ID = %d\n", objBankIndex);
|
||||
if (objBankIndex < 0) {
|
||||
__assert("0", "../z_item_etcetera.c", 241);
|
||||
} else {
|
||||
this->objBankIndex = objBankIndex;
|
||||
}
|
||||
this->drawId = sDrawItemIndexes[type];
|
||||
this->getItemId = sGetItemIds[type];
|
||||
this->futureActionFunc = func_80B85824;
|
||||
this->drawFunc = ItemEtcetera_Draw;
|
||||
Actor_SetScale(&this->actor, 0.25f);
|
||||
ItemEtcetera_SetupAction(this, func_80B857D0);
|
||||
switch (type) {
|
||||
case ITEM_ETCETERA_LETTER:
|
||||
Actor_SetScale(&this->actor, 0.5f);
|
||||
this->futureActionFunc = func_80B858B4;
|
||||
if (gSaveContext.eventChkInf[3] & 2) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
break;
|
||||
case ITEM_ETCETERA_ARROW_FIRE:
|
||||
this->futureActionFunc = ItemEtcetera_UpdateFireArrow;
|
||||
Actor_SetScale(&this->actor, 0.5f);
|
||||
this->actor.draw = NULL;
|
||||
this->actor.shape.unk_08 = 50.0f;
|
||||
break;
|
||||
case ITEM_ETCETERA_RUPEE_GREEN_CHEST_GAME:
|
||||
case ITEM_ETCETERA_RUPEE_BLUE_CHEST_GAME:
|
||||
case ITEM_ETCETERA_RUPEE_RED_CHEST_GAME:
|
||||
case ITEM_ETCETERA_RUPEE_PURPLE_CHEST_GAME:
|
||||
case ITEM_ETCETERA_HEART_PIECE_CHEST_GAME:
|
||||
case ITEM_ETCETERA_KEY_SMALL_CHEST_GAME:
|
||||
Actor_SetScale(&this->actor, 0.5f);
|
||||
this->futureActionFunc = func_80B85B28;
|
||||
this->drawFunc = ItemEtcetera_DrawThroughLens;
|
||||
this->actor.posRot.pos.y += 15.0f;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85A98.s")
|
||||
void ItemEtcetera_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B28.s")
|
||||
void func_80B857D0(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) {
|
||||
this->actor.objBankIndex = this->objBankIndex;
|
||||
this->actor.draw = this->drawFunc;
|
||||
this->actionFunc = this->futureActionFunc;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85B6C.s")
|
||||
void func_80B85824(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (func_8002F410(&this->actor, globalCtx) != 0) {
|
||||
if ((this->actor.params & 0xFF) == 1) {
|
||||
gSaveContext.eventChkInf[3] |= 2;
|
||||
Flags_SetSwitch(globalCtx, 0xB);
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
} else {
|
||||
func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/ItemEtcetera_Update.s")
|
||||
void func_80B858B4(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (func_8002F410(&this->actor, globalCtx) != 0) {
|
||||
if ((this->actor.params & 0xFF) == 1) {
|
||||
gSaveContext.eventChkInf[3] |= 2;
|
||||
Flags_SetSwitch(globalCtx, 0xB);
|
||||
}
|
||||
Actor_Kill(&this->actor);
|
||||
} else {
|
||||
if (0) {} // Necessary to match
|
||||
func_8002F434(&this->actor, globalCtx, this->getItemId, 30.0f, 50.0f);
|
||||
if ((globalCtx->gameplayFrames & 0xD) == 0) {
|
||||
func_800293E4(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85C64.s")
|
||||
void func_80B8598C(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Item_Etcetera/func_80B85CB8.s")
|
||||
static Vec3f D_80B85D74 = { 0.0f, 0.2f, 0.0f };
|
||||
static Vec3f D_80B85D80 = { 0.0f, 0.05f, 0.0f };
|
||||
|
||||
static Color_RGB8 D_80B85D8C = { 255, 255, 255 };
|
||||
static Color_RGB8 D_80B85D90 = { 255, 50, 50 };
|
||||
|
||||
Vec3f vec;
|
||||
|
||||
D_80B85D74.x = Math_Rand_CenteredFloat(3.0f);
|
||||
D_80B85D74.z = Math_Rand_CenteredFloat(3.0f);
|
||||
D_80B85D74.y = -0.05f;
|
||||
D_80B85D80.y = -0.025f;
|
||||
vec.x = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.x;
|
||||
vec.y = (Math_Rand_ZeroOne() * 6.0f) + this->actor.posRot.pos.y;
|
||||
vec.z = Math_Rand_CenteredFloat(12.0f) + this->actor.posRot.pos.z;
|
||||
func_80028BB0(globalCtx, &vec, &D_80B85D74, &D_80B85D80, &D_80B85D8C, &D_80B85D90, 0x1388, 0x10);
|
||||
}
|
||||
|
||||
void ItemEtcetera_MoveFireArrowDown(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 0.0f, 5);
|
||||
Actor_MoveForward(&this->actor);
|
||||
if (!(this->actor.bgCheckFlags & 1)) {
|
||||
func_80B8598C(this, globalCtx);
|
||||
}
|
||||
this->actor.shape.rot.y += 0x400;
|
||||
func_80B85824(this, globalCtx);
|
||||
}
|
||||
|
||||
void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}
|
||||
|
||||
void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx) {
|
||||
if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.npcActions[0] != NULL)) {
|
||||
LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action,
|
||||
"../z_item_etcetera.c", 441);
|
||||
if (globalCtx->csCtx.npcActions[0]->action == 2) {
|
||||
this->actor.draw = ItemEtcetera_Draw;
|
||||
this->actor.gravity = -0.1f;
|
||||
this->actor.minVelocityY = -4.0f;
|
||||
this->actionFunc = ItemEtcetera_MoveFireArrowDown;
|
||||
}
|
||||
} else {
|
||||
this->actor.gravity = -0.1f;
|
||||
this->actor.minVelocityY = -4.0f;
|
||||
this->actionFunc = ItemEtcetera_MoveFireArrowDown;
|
||||
}
|
||||
}
|
||||
|
||||
void ItemEtcetera_Update(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ItemEtcetera* this = THIS;
|
||||
this->actionFunc(this, globalCtx);
|
||||
}
|
||||
|
||||
void ItemEtcetera_DrawThroughLens(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ItemEtcetera* this = THIS;
|
||||
if (globalCtx->actorCtx.unk_03 != 0) {
|
||||
func_8002EBCC(&this->actor, globalCtx, 0);
|
||||
func_8002ED80(&this->actor, globalCtx, 0);
|
||||
func_800694A0(globalCtx, this->drawId);
|
||||
}
|
||||
}
|
||||
|
||||
void ItemEtcetera_Draw(Actor* thisx, GlobalContext* globalCtx) {
|
||||
ItemEtcetera* this = THIS;
|
||||
|
||||
func_8002EBCC(&this->actor, globalCtx, 0);
|
||||
func_8002ED80(&this->actor, globalCtx, 0);
|
||||
func_800694A0(globalCtx, this->drawId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,35 @@
|
|||
|
||||
struct ItemEtcetera;
|
||||
|
||||
typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, GlobalContext*);
|
||||
|
||||
typedef struct ItemEtcetera {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x14];
|
||||
/* 0x014C */ ItemEtceteraActionFunc futureActionFunc;
|
||||
/* 0x0150 */ s16 drawId;
|
||||
/* 0x0152 */ s16 getItemId;
|
||||
/* 0x0154 */ u8 objBankIndex;
|
||||
/* 0x0158 */ ActorFunc drawFunc;
|
||||
/* 0x015C */ ItemEtceteraActionFunc actionFunc;
|
||||
} ItemEtcetera; // size = 0x0160
|
||||
|
||||
typedef enum {
|
||||
/* 0x00 */ ITEM_ETCETERA_BOTTLE,
|
||||
/* 0x01 */ ITEM_ETCETERA_LETTER,
|
||||
/* 0x02 */ ITEM_ETCETERA_SHIELD_HYLIAN,
|
||||
/* 0x03 */ ITEM_ETCETERA_QUIVER,
|
||||
/* 0x04 */ ITEM_ETCETERA_SCALE_SILVER,
|
||||
/* 0x05 */ ITEM_ETCETERA_SCALE_GOLD,
|
||||
/* 0x06 */ ITEM_ETCETERA_KEY_SMALL,
|
||||
/* 0x07 */ ITEM_ETCETERA_ARROW_FIRE,
|
||||
/* 0x08 */ ITEM_ETCETERA_RUPEE_GREEN_CHEST_GAME,
|
||||
/* 0x09 */ ITEM_ETCETERA_RUPEE_BLUE_CHEST_GAME,
|
||||
/* 0x0A */ ITEM_ETCETERA_RUPEE_RED_CHEST_GAME,
|
||||
/* 0x0B */ ITEM_ETCETERA_RUPEE_PURPLE_CHEST_GAME,
|
||||
/* 0x0C */ ITEM_ETCETERA_HEART_PIECE_CHEST_GAME,
|
||||
/* 0x0D */ ITEM_ETCETERA_KEY_SMALL_CHEST_GAME
|
||||
} ItemEtceteraType;
|
||||
|
||||
extern const ActorInit Item_Etcetera_InitVars;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue