mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixup weird horse flags usage (#1214)

Browse source 
* wip: refactor flag defines for `eventInf[0]`

* Cleanup attempt

* run formatter

* remove spacing in enum indices comments

* Add line breaks

* Macros +`()` -`;`
This commit is contained in:
Dragorn421 2022-05-09 00:17:10 +02:00 • committed by GitHub
parent 3b0e095ee6
commit 6cd8029cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 146 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -71,8 +71,8 @@ void func_80B13AA0(EnTa* this, EnTaActionFunc arg1, EnTaUnkFunc arg2) {
void func_80B13AAC(EnTa* this, GlobalContext* globalCtx) {
u16 faceReaction = Text_GetFaceReaction(globalCtx, 24);
if (GET_EVENTINF(EVENTINF_0A)) {
if (GET_EVENTINF(EVENTINF_08)) {
if (GET_EVENTINF(EVENTINF_HORSES_0A)) {
if (GET_EVENTINF(EVENTINF_HORSES_08)) {
if (GET_ITEMGETINF(ITEMGETINF_02)) {
this->actor.textId = 0x2088;
} else {
@ -81,7 +81,7 @@ void func_80B13AAC(EnTa* this, GlobalContext* globalCtx) {
} else {
this->actor.textId = 0x2085;
}
CLEAR_EVENTINF(EVENTINF_08);
CLEAR_EVENTINF(EVENTINF_HORSES_08);
} else if (faceReaction == 0) {
if (GET_INFTABLE(INFTABLE_7E)) {
if (GET_ITEMGETINF(ITEMGETINF_02)) {
@ -193,12 +193,12 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->actor.world.pos.y + 40.0f, this->actor.world.pos.z - 30.0f, 0, 0, 0, 0xD);
func_80B13AAC(this, globalCtx);
if (GET_EVENTINF(EVENTINF_0A)) {
if (GET_EVENTINF(EVENTINF_HORSES_0A)) {
func_80B13AA0(this, func_80B16608, func_80B16938);
Animation_Change(&this->skelAnime, &gTalonSitWakeUpAnim, 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim) - 1.0f,
Animation_GetLastFrame(&gTalonSitWakeUpAnim), ANIMMODE_ONCE, 0.0f);
CLEAR_EVENTINF(EVENTINF_0A);
CLEAR_EVENTINF(EVENTINF_HORSES_0A);
} else {
func_80B13AA0(this, func_80B16504, func_80B16854);
this->eyeIndex = 0;
@ -665,7 +665,7 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
globalCtx->nextEntranceIndex = 0x5E4;
if (GET_EVENTINF(EVENTINF_08)) {
if (GET_EVENTINF(EVENTINF_HORSES_08)) {
globalCtx->transitionType = TRANS_TYPE_CIRCLE(TCA_STARBURST, TCC_WHITE, TCS_FAST);
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
@ -674,7 +674,7 @@ void func_80B15424(EnTa* this, GlobalContext* globalCtx) {
}
globalCtx->transitionTrigger = TRANS_TRIGGER_START;
SET_EVENTINF(EVENTINF_0A);
SET_EVENTINF(EVENTINF_HORSES_0A);
this->actionFunc = func_80B153D4;
this->unk_2CC = 22;
}
@ -708,7 +708,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
-10.0f);
this->unk_2E0 &= ~0x10;
this->unk_2E0 &= ~0x100;
SET_EVENTINF(EVENTINF_08);
SET_EVENTINF(EVENTINF_HORSES_08);
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
this->unk_2E0 &= ~0x200;
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
@ -746,7 +746,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
Message_StartTextbox(globalCtx, 0x2081, &this->actor);
this->actionFunc = func_80B15424;
func_80B14E28(this, globalCtx);
CLEAR_EVENTINF(EVENTINF_08);
CLEAR_EVENTINF(EVENTINF_HORSES_08);
this->unk_2E0 |= 0x80;
Animation_Change(&this->skelAnime, &gTalonSitHandsUpAnim, 1.0f, 8.0f, 29.0f, ANIMMODE_ONCE, -10.0f);
this->unk_2E0 &= ~0x10;