mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Generic actor params getters (#1359)

Browse source 
* Initial PARAMS_GET macros

* NOSHIFT macro

* Use number of bits rather than raw mask values

* Add descriptions for each generic macro

* Reformat

* Adjust comment

* format

* edit en_door macro names

* edit redead macro name

* edit bdan switch macro name, and remove unneeded comments in go2

* mizushutter macro names

* remove PARAMS_GET_S, rework ishi switch flag handling

* actually remove PARAMS_GET_S

* remove PARAMS_GET2_S

* PARAMS_GET_U and PARAMS_GET_S

* format

* fix merge

* format

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Tharo 2024-08-14 20:29:43 +01:00 • committed by GitHub
parent 137e0d2a10
commit eaf955ad22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
200 changed files with 1113 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -189,13 +189,13 @@ void func_80AEADD8(EnRu1* this) {
}
u8 func_80AEADE0(EnRu1* this) {
u8 params = this->actor.params >> 8;
u8 params = PARAMS_GET_U(this->actor.params, 8, 8);
return params;
}
u8 func_80AEADF0(EnRu1* this) {
s16 params = this->actor.params;
u8 params = PARAMS_GET_U(this->actor.params, 0, 8);
return params;
}
@ -324,7 +324,7 @@ Actor* func_80AEB124(PlayState* play) {
Actor* actorIt = play->actorCtx.actorLists[ACTORCAT_BOSS].head;
while (actorIt != NULL) {
if ((actorIt->id == ACTOR_DEMO_EFFECT) && ((actorIt->params & 0xFF) == DEMO_EFFECT_JEWEL_ZORA)) {
if ((actorIt->id == ACTOR_DEMO_EFFECT) && (PARAMS_GET_U(actorIt->params, 0, 8) == DEMO_EFFECT_JEWEL_ZORA)) {
return actorIt;
}
actorIt = actorIt->next;
@ -1529,7 +1529,7 @@ void func_80AEE2F8(EnRu1* this, PlayState* play) {
floorBgId = this->actor.floorBgId;
dynaPolyActor = DynaPoly_GetActor(&play->colCtx, floorBgId);
if ((dynaPolyActor != NULL) && (dynaPolyActor->actor.id == ACTOR_BG_BDAN_SWITCH)) {
if (((dynaPolyActor->actor.params >> 8) & 0x3F) == 0x38) {
if (PARAMS_GET_U(dynaPolyActor->actor.params, 8, 6) == 0x38) {
SET_INFTABLE(INFTABLE_140);
return;
}