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

8
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -910,8 +910,8 @@ void func_808FF898(BossGanon2* this, PlayState* play) {
if (actor->id == ACTOR_DEMO_GJ) {
DemoGj* gj = (DemoGj*)actor;
if (((actor->params & 0xFF) == 0x10) || ((actor->params & 0xFF) == 0x11) ||
((actor->params & 0xFF) == 0x16)) {
if ((PARAMS_GET_U(actor->params, 0, 8) == 0x10) || (PARAMS_GET_U(actor->params, 0, 8) == 0x11) ||
(PARAMS_GET_U(actor->params, 0, 8) == 0x16)) {
if (SQ(this->unk_218.x - gj->dyna.actor.world.pos.x) +
SQ(this->unk_218.z - gj->dyna.actor.world.pos.z) <
SQ(100.0f)) {
@ -951,8 +951,8 @@ s32 func_808FFA24(BossGanon2* this, PlayState* play) {
if (actor->id == ACTOR_DEMO_GJ) {
DemoGj* gj = (DemoGj*)actor;
if (((actor->params & 0xFF) == 0x10) || ((actor->params & 0xFF) == 0x11) ||
((actor->params & 0xFF) == 0x16)) {
if ((PARAMS_GET_U(actor->params, 0, 8) == 0x10) || (PARAMS_GET_U(actor->params, 0, 8) == 0x11) ||
(PARAMS_GET_U(actor->params, 0, 8) == 0x16)) {
if (SQ(this->actor.world.pos.x - gj->dyna.actor.world.pos.x) +
SQ(this->actor.world.pos.z - gj->dyna.actor.world.pos.z) <
SQ(200.0f)) {