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

14
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
View file

@ -29,18 +29,12 @@ ActorProfile Obj_Roomtimer_Profile = {
void ObjRoomtimer_Init(Actor* thisx, PlayState* play) {
ObjRoomtimer* this = (ObjRoomtimer*)thisx;
s16 params = this->actor.params;
this->switchFlag = (params >> 10) & 0x3F;
this->actor.params = params & 0x3FF;
params = this->actor.params;
this->switchFlag = PARAMS_GET_U(this->actor.params, 10, 6);
this->actor.params = PARAMS_GET_U(this->actor.params, 0, 10);
if (params != 0x3FF) {
if (params > 600) {
this->actor.params = 600;
} else {
this->actor.params = params;
}
if (this->actor.params != 0x3FF) {
this->actor.params = CLAMP_MAX(this->actor.params, 600);
}
this->actionFunc = func_80B9D054;