mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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

4
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -151,9 +151,9 @@ void EnRd_Init(Actor* thisx, PlayState* play) {
this->actor.colChkInfo.mass = MASS_HEAVY;
this->actor.colChkInfo.health = 8;
this->alpha = this->unk_31D = 255;
this->rdFlags = REDEAD_GET_FLAGS(thisx);
this->rdFlags = REDEAD_GET_RDFLAGS(thisx);
if (this->actor.params & 0x80) {
if (PARAMS_GET_NOSHIFT(this->actor.params, 7, 1)) {
this->actor.params |= 0xFF00;
} else {
this->actor.params &= 0xFF;

2
src/overlays/actors/ovl_En_Rd/z_en_rd.h
View file

@ -8,7 +8,7 @@ struct EnRd;
typedef void (*EnRdActionFunc)(struct EnRd*, PlayState*);
#define REDEAD_GET_FLAGS(thisx) (((thisx)->params & 0xFF00) >> 8)
#define REDEAD_GET_RDFLAGS(thisx) PARAMS_GET_S((thisx)->params, 8, 8)
typedef enum RedeadGibdoLimb {
/* 0 */ REDEAD_GIBDO_LIMB_NONE,