falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

`En_Sw`: last minute comment changes 

- fixed typos of "Skultula"
- moveGoldBool->goldMoveBool
- SW_TYPE_GOLD_HIDDEN_TREE also applies to spiders in crates
This commit is contained in:
blackgamma7 2025-12-03 11:43:37 -05:00
parent c2bf59c390
commit a4dde7024e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View File

@ -200,7 +200,7 @@ s32 EnSw_GoldMove(EnSw* this, PlayState* play, s32 changePoly) {
s32 ret;
ret = false;
this->moveGoldBool = true;
this->goldMoveBool = true;
posA = posB = this->actor.world.pos;
posA.x += this->surfaceNormal.x * 18.0f;
posA.y += this->surfaceNormal.y * 18.0f;
@ -394,7 +394,7 @@ s32 EnSw_CheckDamage(EnSw* this, PlayState* play) {
}
Enemy_StartFinishingBlow(play, &this->actor);
if (ENSW_GET_TYPE_EN(this) != SW_TYPE_NORMAL) {
// Gold Skultula spins in place as it dies.
// Gold Skulltula spins in place as it dies.
this->skelAnime.playSpeed = 8.0f;
if ((play->state.frames & 1) == 0) {
this->rotateMag = 0.1f;

8
src/overlays/actors/ovl_En_Sw/z_en_sw.h
View File

@ -33,7 +33,7 @@ typedef struct EnSw {
/* 0x0418 */ char unk_418[8];
/* 0x0420 */ f32 rotateMag;
/* 0x0424 */ char unk_424[0x8];
/* 0x042C */ u8 moveGoldBool; // set during EnSw_MoveGold, rever read.
/* 0x042C */ u8 goldMoveBool; // set during EnSw_GoldMove, rever read.
/* 0x0430 */ struct CollisionPoly* wallPoly;
/* 0x0434 */ Vec3f unk_434; // set during EnSW_LineTestWall, never read. another target pos?
/* 0x0440 */ s16 sfxTimer;
@ -55,10 +55,10 @@ typedef struct EnSw {
typedef enum {
SW_TYPE_NORMAL, // normal Skull(wall)tula
SW_TYPE_GOLD_DEFAULT, // normal Gold Skultula, found in dungeons
SW_TYPE_GOLD_NIGHT, // nocturnal Gold Skultula, found outside
SW_TYPE_GOLD_DEFAULT, // normal Gold Skulltula, found in dungeons
SW_TYPE_GOLD_NIGHT, // nocturnal Gold Skulltula, found outside
SW_TYPE_GOLD_HIDDEN_SOIL, // found by using bugs on soil patches
SW_TYPE_GOLD_HIDDEN_TREE, // found by hitting trees.
SW_TYPE_GOLD_HIDDEN_TREE, // found by hitting trees and crates
} EnSwType;
#endif