MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-25 22:09:34 +00:00
Code Releases Wiki Activity

clarifying timer datatypes

Browse Source
This commit is contained in:
Blake Warner 2022-04-09 18:26:46 -04:00
parent 034a869409
commit b79721991a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/interface.h
View File

@ -42,7 +42,7 @@ struct InterfaceContext
/* 0x021A */ s16 heartsEnvR[2];
/* 0x021E */ s16 heartsEnvG[2];
/* 0x0222 */ s16 heartsEnvB[2];
/* 0x022A */ Timer beatingHeartOscillator;
/* 0x022A */ TimerS16 beatingHeartOscillator;
/* 0x022C */ s16 beatingHeartOscillatorDirection;
/* 0x022E */ s16 unk_22E;
/* 0x0230 */ s16 unk_230;

10
include/z64actor.h
View File

@ -199,7 +199,7 @@ struct Actor
/* 0x10C */ u8 isTargeted; // Set to true if the actor is currently being targeted by the player
/* 0x10D */ u8 targetPriority; // Lower values have higher priority. Resets to 0 when player stops targeting
/* 0x10E */ u16 textId; // Text ID to pass to link/display when interacting with the actor
/* 0x110 */ Timer freezeTimer; // Actor does not update when set. Timer decrements automatically
/* 0x110 */ TimerU16 freezeTimer; // Actor does not update when set. Timer decrements automatically
/* 0x112 */ u16 colorFilterParams; // Set color filter to red, blue, or white. Toggle opa or xlu
/* 0x114 */ u8 colorFilterTimer; // A non-zero value enables the color filter. Decrements automatically
/* 0x115 */ u8 isDrawn; // Set to true if the actor is currently being drawn. Always stays false for lens actors
@ -409,8 +409,8 @@ struct TitleCardContext
/* 0x06 */ s16 y;
/* 0x08 */ u8 width;
/* 0x09 */ u8 height;
/* 0x0A */ Timer durationTimer; // how long the title card appears for before fading
/* 0x0B */ Timer delayTimer; // how long the title card waits to appear
/* 0x0A */ TimerU8 durationTimer; // how long the title card appears for before fading
/* 0x0B */ TimerU8 delayTimer; // how long the title card waits to appear
/* 0x0C */ s16 alpha;
/* 0x0E */ s16 intensity;
}; // size = 0x10
@ -444,7 +444,7 @@ struct ActorListEntry
struct ActorContext
{
/* 0x0000 */ Timer freezeFlashTimer;
/* 0x0000 */ TimerU8 freezeFlashTimer;
/* 0x0001 */ char unk_01[0x01];
/* 0x0002 */ u8 unk_02;
/* 0x0003 */ u8 unk_03;
@ -474,7 +474,7 @@ struct struct_80034A14_arg1
{
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
/* 0x04 */ Timer unk_04;
/* 0x04 */ TimerS16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ Vec3s unk_08;
/* 0x0E */ Vec3s unk_0E;

2
include/z64message.h
View File

@ -158,7 +158,7 @@ struct MessageContext
/* 0xE3E5 */ u8 choiceIndex;
/* 0xE3E6 */ u8 choiceNum; // textboxes that are not choice textboxes have a choiceNum of 1
/* 0xE3E7 */ TimerU8 stateTimer;
/* 0xE3E8 */ Timer textDelayTimer;
/* 0xE3E8 */ TimerU16 textDelayTimer;
/* 0xE3EA */ u16 textDelay;
/* 0xE3EA */ u16 lastPlayedSong; // original references : "Ocarina_Flog" , "Ocarina_Free"
/* 0xE3EE */ u16 ocarinaMode; // original name : "ocarina_mode"

4
src/overlays/actors/ovl_player_actor/z_player.cpp
View File

@ -2504,7 +2504,7 @@ s32 func_80834E44(GlobalContext* globalCtx)
return (globalCtx->shootingGalleryStatus > 0) && CHECK_BTN_ALL(sControlInput->press.button, BTN_B);
}
s32 isNockingArrow(GlobalContext* globalCtx)
s32 Player_IsNockingArrow(GlobalContext* globalCtx)
{
return (globalCtx->shootingGalleryStatus != 0 || (oot::config().controls().enableActionButtonOverride() && oot::hid::isFirstPerson())) &&
((globalCtx->shootingGalleryStatus < 0) || CHECK_BTN_ANY(sControlInput->cur.button, BTN_A | BTN_B | BTN_CUP | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN));
@ -2659,7 +2659,7 @@ s32 func_808351D4(Player* pthis, GlobalContext* globalCtx)
func_80834EB8(pthis, globalCtx);
if((pthis->unk_836 > 0) && ((pthis->unk_860 < 0) || (!D_80853618 && !isNockingArrow(globalCtx))))
if((pthis->unk_836 > 0) && ((pthis->unk_860 < 0) || (!D_80853618 && !Player_IsNockingArrow(globalCtx))))
{
func_80833638(pthis, func_808353D8);
if(pthis->unk_860 >= 0)