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

Document EnGo2 .unk_216 as .reverseWaypoint

Browse source
This commit is contained in:
feacur 2024-11-11 21:42:03 +01:00
parent 4ecd12d93c
commit 50d3b84115
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1440,7 +1440,7 @@ s32 EnGo2_IsGoronFireGeneric(EnGo2* this) {
} }
s32 EnGo2_IsGoronLinkReversing(EnGo2* this) { s32 EnGo2_IsGoronLinkReversing(EnGo2* this) {
if (PARAMS_GET_S(this->actor.params, 0, 5) != GORON_CITY_LINK || (this->waypoint >= this->unk_216) || if (PARAMS_GET_S(this->actor.params, 0, 5) != GORON_CITY_LINK || (this->waypoint >= this->reverseWaypoint) ||
!EnGo2_IsWakingUp(this)) { !EnGo2_IsWakingUp(this)) {
return false; return false;
} }
@ -1562,7 +1562,7 @@ void EnGo2_Init(Actor* thisx, PlayState* play) {
this->isUncurled = false; this->isUncurled = false;
this->goronState = 0; this->goronState = 0;
this->waypoint = 0; this->waypoint = 0;
this->unk_216 = this->actor.shape.rot.z; this->reverseWaypoint = this->actor.shape.rot.z;
this->trackingMode = NPC_TRACKING_NONE; this->trackingMode = NPC_TRACKING_NONE;
this->path = Path_GetByIndex(play, PARAMS_GET_S(this->actor.params, 5, 5), 0x1F); this->path = Path_GetByIndex(play, PARAMS_GET_S(this->actor.params, 5, 5), 0x1F);
switch (PARAMS_GET_S(this->actor.params, 0, 5)) { switch (PARAMS_GET_S(this->actor.params, 0, 5)) {

2
src/overlays/actors/ovl_En_Go2/z_en_go2.h
View file

@ -86,7 +86,7 @@ typedef struct EnGo2 {
/* 0x0213 */ u8 eyeMouthTexState; // 0, 1, 2, 3 /* 0x0213 */ u8 eyeMouthTexState; // 0, 1, 2, 3
/* 0x0214 */ u8 eyeTexIndex; /* 0x0214 */ u8 eyeTexIndex;
/* 0x0215 */ u8 mouthTexIndex; /* 0x0215 */ u8 mouthTexIndex;
/* 0x0216 */ u8 unk_216; // Set to z rotation, checked by waypoint /* 0x0216 */ u8 reverseWaypoint; // Set to z rotation, checked by waypoint
/* 0x0218 */ f32 interactRange; /* 0x0218 */ f32 interactRange;
/* 0x021C */ char unk_21C[0x04]; /* 0x021C */ char unk_21C[0x04];
/* 0x0220 */ f32 /* 0x0220 */ f32