mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

CAGED_FLAG -> CAGED_SWITCH_FLAG

Browse source 
https://github.com/zeldaret/oot/pull/2295#discussion_r1841166305
This commit is contained in:
feacur 2024-11-14 00:14:21 +01:00
parent a8dff36326
commit e2cda143b7
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -102,8 +102,8 @@ typedef enum EnGoType {
#define ENGO_GET_PATH_INDEX(this) PARAMS_GET_U((this)->actor.params, 0, 4)
#define ENGO_PATH_INDEX_NONE 0xF // likely the count of available paths
#define ENGO2_CAGED_FLAG(this) PARAMS_GET_NOMASK((this)->actor.params, 8)
#define ENGO2_IS_CAGE_OPEN(this, play) Flags_GetSwitch(play, ENGO2_CAGED_FLAG(this))
#define ENGO_CAGED_SWITCH_FLAG(this) PARAMS_GET_NOMASK((this)->actor.params, 8)
#define ENGO_IS_CAGE_OPEN(this, play) Flags_GetSwitch(play, ENGO_CAGED_SWITCH_FLAG(this))
#define ENGO_GET_SPEED_SCALE(this) (ENGO_GET_TYPE(this) == ENGO_TYPE_DMT_BIGGORON ? 0.5f : 1.0f)
@ -158,7 +158,7 @@ u16 EnGo_GetTextID(PlayState* play, Actor* thisx) {
}
}
case ENGO_TYPE_FIRE_GENERIC:
if (ENGO2_IS_CAGE_OPEN((EnGo*)thisx, play)) {
if (ENGO_IS_CAGE_OPEN((EnGo*)thisx, play)) {
return 0x3052;
} else {
return 0x3051;
@ -382,7 +382,7 @@ void EnGo_ChangeAnim(EnGo* this, s32 index) {
s32 EnGo_IsActorSpawned(EnGo* this, PlayState* play) {
if (ENGO_GET_TYPE(this) == ENGO_TYPE_DMT_BIGGORON) {
return true;
} else if (play->sceneId == SCENE_FIRE_TEMPLE && !ENGO2_IS_CAGE_OPEN(this, play) && LINK_IS_ADULT &&
} else if (play->sceneId == SCENE_FIRE_TEMPLE && !ENGO_IS_CAGE_OPEN(this, play) && LINK_IS_ADULT &&
ENGO_GET_TYPE(this) == ENGO_TYPE_FIRE_GENERIC) {
return true;
} else if (play->sceneId == SCENE_GORON_CITY && LINK_IS_ADULT && ENGO_GET_TYPE(this) == ENGO_TYPE_CITY_LINK) {
@ -515,7 +515,7 @@ s32 EnGo_FollowPath(EnGo* this, PlayState* play) {
if (ENGO_GET_TYPE(this) != ENGO_TYPE_CITY_LINK) {
return true;
} else if (ENGO2_IS_CAGE_OPEN(this, play)) {
} else if (ENGO_IS_CAGE_OPEN(this, play)) {
return true;
} else if (this->waypoint >= this->actor.shape.rot.z) {
this->waypoint = 0;
@ -783,7 +783,7 @@ void EnGo_RollingToCurledUp(EnGo* this, PlayState* play) {
}
void EnGo_RollingLink(EnGo* this, PlayState* play) {
if ((EnGo_FollowPath(this, play) == true) && ENGO2_IS_CAGE_OPEN(this, play) && (this->waypoint == 0)) {
if ((EnGo_FollowPath(this, play) == true) && ENGO_IS_CAGE_OPEN(this, play) && (this->waypoint == 0)) {
this->actor.speed = 0.0f;
EnGo_SetupAction(this, EnGo_RollingToCurledUp);
SET_INFTABLE(INFTABLE_109);

11
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -169,8 +169,8 @@ typedef enum GoronType {
} GoronType;
#define ENGO2_GET_PATH_INDEX(this) PARAMS_GET_S((this)->actor.params, 5, 5)
#define ENGO2_CAGED_FLAG(this) PARAMS_GET_S((this)->actor.params, 10, 6)
#define ENGO2_IS_CAGE_OPEN(play, this) Flags_GetSwitch(play, ENGO2_CAGED_FLAG(this))
#define ENGO2_CAGED_SWITCH_FLAG(this) PARAMS_GET_S((this)->actor.params, 10, 6)
#define ENGO2_IS_CAGE_OPEN(play, this) Flags_GetSwitch(play, ENGO2_CAGED_SWITCH_FLAG(this))
static EnGo2DustEffectData sDustEffectData[2][4] = {
{
@ -318,7 +318,7 @@ s32 EnGo2_GetDialogState(EnGo2* this, PlayState* play) {
}
u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
switch (ENGO2_CAGED_FLAG(this)) {
switch (ENGO2_CAGED_SWITCH_FLAG(this)) {
case 3:
return 0x3069;
case 5:
@ -1991,8 +1991,9 @@ void EnGo2_GoronFireGeneric(EnGo2* this, PlayState* play) {
} else {
this->animTimer = 0;
this->actor.speed = 0.0f;
if ((ENGO2_CAGED_FLAG(this) != 1) && (ENGO2_CAGED_FLAG(this) != 2) && (ENGO2_CAGED_FLAG(this) != 4) &&
(ENGO2_CAGED_FLAG(this) != 5) && (ENGO2_CAGED_FLAG(this) != 9) && (ENGO2_CAGED_FLAG(this) != 11)) {
if ((ENGO2_CAGED_SWITCH_FLAG(this) != 1) && (ENGO2_CAGED_SWITCH_FLAG(this) != 2) &&
(ENGO2_CAGED_SWITCH_FLAG(this) != 4) && (ENGO2_CAGED_SWITCH_FLAG(this) != 5) &&
(ENGO2_CAGED_SWITCH_FLAG(this) != 9) && (ENGO2_CAGED_SWITCH_FLAG(this) != 11)) {
this->goronState++;
}
this->goronState++;