diff --git a/assets/xml/misc/scene_texture_01.xml b/assets/xml/misc/scene_texture_01.xml index edbb2d1c41..3786840cef 100644 --- a/assets/xml/misc/scene_texture_01.xml +++ b/assets/xml/misc/scene_texture_01.xml @@ -16,7 +16,7 @@ - + diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 49b2eacb92..5881fcb37e 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -941,7 +941,7 @@ - + diff --git a/assets/xml/objects/object_an1.xml b/assets/xml/objects/object_an1.xml index 927fa848aa..186659d462 100644 --- a/assets/xml/objects/object_an1.xml +++ b/assets/xml/objects/object_an1.xml @@ -71,7 +71,7 @@ - + diff --git a/assets/xml/objects/object_az.xml b/assets/xml/objects/object_az.xml index 42e5bdc612..5dfc80e0bf 100644 --- a/assets/xml/objects/object_az.xml +++ b/assets/xml/objects/object_az.xml @@ -113,6 +113,8 @@ + + diff --git a/assets/xml/objects/object_bigslime.xml b/assets/xml/objects/object_bigslime.xml index 93c2ef8078..d238a306ad 100644 --- a/assets/xml/objects/object_bigslime.xml +++ b/assets/xml/objects/object_bigslime.xml @@ -97,9 +97,9 @@ - + - + diff --git a/assets/xml/objects/object_boss02.xml b/assets/xml/objects/object_boss02.xml index 0f2fdd0529..c4987796df 100644 --- a/assets/xml/objects/object_boss02.xml +++ b/assets/xml/objects/object_boss02.xml @@ -23,6 +23,9 @@ + + + @@ -68,7 +71,7 @@ - + diff --git a/assets/xml/objects/object_boss03.xml b/assets/xml/objects/object_boss03.xml index 0b4ab9aa2d..e1dab018d4 100644 --- a/assets/xml/objects/object_boss03.xml +++ b/assets/xml/objects/object_boss03.xml @@ -27,7 +27,7 @@ - + @@ -92,7 +92,7 @@ - + diff --git a/assets/xml/objects/object_boss_hakugin.xml b/assets/xml/objects/object_boss_hakugin.xml index 7c7232ecf3..d97f36d163 100644 --- a/assets/xml/objects/object_boss_hakugin.xml +++ b/assets/xml/objects/object_boss_hakugin.xml @@ -51,7 +51,7 @@ - + diff --git a/assets/xml/objects/object_botihasira.xml b/assets/xml/objects/object_botihasira.xml index 0a22127609..5a0bfcfc54 100644 --- a/assets/xml/objects/object_botihasira.xml +++ b/assets/xml/objects/object_botihasira.xml @@ -5,7 +5,7 @@ - + diff --git a/assets/xml/objects/object_box.xml b/assets/xml/objects/object_box.xml index 8bb2b7efef..ad524705ef 100644 --- a/assets/xml/objects/object_box.xml +++ b/assets/xml/objects/object_box.xml @@ -2,9 +2,9 @@ - + - + @@ -47,7 +47,7 @@ - + diff --git a/assets/xml/objects/object_cs.xml b/assets/xml/objects/object_cs.xml index cc9dfbe745..8a422593f2 100644 --- a/assets/xml/objects/object_cs.xml +++ b/assets/xml/objects/object_cs.xml @@ -68,7 +68,7 @@ - + diff --git a/assets/xml/objects/object_ds2.xml b/assets/xml/objects/object_ds2.xml index 0eb35db79a..95108d7270 100644 --- a/assets/xml/objects/object_ds2.xml +++ b/assets/xml/objects/object_ds2.xml @@ -14,7 +14,9 @@ - + + + diff --git a/assets/xml/objects/object_ds2n.xml b/assets/xml/objects/object_ds2n.xml index e4757de312..1640f71f47 100644 --- a/assets/xml/objects/object_ds2n.xml +++ b/assets/xml/objects/object_ds2n.xml @@ -46,7 +46,7 @@ - + @@ -87,7 +87,5 @@ - - diff --git a/assets/xml/objects/object_fall2.xml b/assets/xml/objects/object_fall2.xml index 12299ab743..70c8ca2d4c 100644 --- a/assets/xml/objects/object_fall2.xml +++ b/assets/xml/objects/object_fall2.xml @@ -11,7 +11,8 @@ - + + diff --git a/assets/xml/objects/object_gk.xml b/assets/xml/objects/object_gk.xml index 40abd45a2b..730c1412a7 100644 --- a/assets/xml/objects/object_gk.xml +++ b/assets/xml/objects/object_gk.xml @@ -55,7 +55,17 @@ - + + + + + + + + + + + diff --git a/assets/xml/objects/object_iknv_obj.xml b/assets/xml/objects/object_iknv_obj.xml index 5c54c71da4..e0c45a7a02 100644 --- a/assets/xml/objects/object_iknv_obj.xml +++ b/assets/xml/objects/object_iknv_obj.xml @@ -29,7 +29,7 @@ - + diff --git a/assets/xml/objects/object_kamejima.xml b/assets/xml/objects/object_kamejima.xml index 272a541be8..5696838214 100644 --- a/assets/xml/objects/object_kamejima.xml +++ b/assets/xml/objects/object_kamejima.xml @@ -13,7 +13,7 @@ - + @@ -27,6 +27,8 @@ + + diff --git a/assets/xml/objects/object_mnk.xml b/assets/xml/objects/object_mnk.xml index 794069ee72..a98e0e4f42 100644 --- a/assets/xml/objects/object_mnk.xml +++ b/assets/xml/objects/object_mnk.xml @@ -86,7 +86,7 @@ - + diff --git a/assets/xml/objects/object_nwc.xml b/assets/xml/objects/object_nwc.xml index 8c67159cef..db13b596ab 100644 --- a/assets/xml/objects/object_nwc.xml +++ b/assets/xml/objects/object_nwc.xml @@ -15,7 +15,7 @@ - + diff --git a/assets/xml/objects/object_shn.xml b/assets/xml/objects/object_shn.xml index 3e39b2eff0..a1f78cc2c9 100644 --- a/assets/xml/objects/object_shn.xml +++ b/assets/xml/objects/object_shn.xml @@ -36,7 +36,7 @@ - + @@ -120,6 +120,6 @@ - + diff --git a/assets/xml/objects/object_skb.xml b/assets/xml/objects/object_skb.xml index 952870aa8d..2a31e34f4a 100644 --- a/assets/xml/objects/object_skb.xml +++ b/assets/xml/objects/object_skb.xml @@ -5,11 +5,11 @@ - + - + - + @@ -58,7 +58,7 @@ - + diff --git a/assets/xml/objects/object_trt.xml b/assets/xml/objects/object_trt.xml index 6f2933c3e7..10d8312ca3 100644 --- a/assets/xml/objects/object_trt.xml +++ b/assets/xml/objects/object_trt.xml @@ -66,7 +66,7 @@ - + diff --git a/assets/xml/objects/object_um.xml b/assets/xml/objects/object_um.xml index aac86a9a7f..7a2bd082d8 100644 --- a/assets/xml/objects/object_um.xml +++ b/assets/xml/objects/object_um.xml @@ -30,7 +30,7 @@ - + diff --git a/assets/xml/objects/object_zl4.xml b/assets/xml/objects/object_zl4.xml index 2c5eff1ef2..d3b64f8c76 100644 --- a/assets/xml/objects/object_zl4.xml +++ b/assets/xml/objects/object_zl4.xml @@ -159,6 +159,6 @@ - + diff --git a/assets/xml/overlays/ovl_En_Mm2.xml b/assets/xml/overlays/ovl_En_Mm2.xml index 979b8fc5a2..54924131b6 100644 --- a/assets/xml/overlays/ovl_En_Mm2.xml +++ b/assets/xml/overlays/ovl_En_Mm2.xml @@ -8,6 +8,7 @@ + diff --git a/linker_scripts/undefined_syms.ld b/linker_scripts/undefined_syms.ld index 0a04d9db2e..952057f635 100644 --- a/linker_scripts/undefined_syms.ld +++ b/linker_scripts/undefined_syms.ld @@ -141,21 +141,16 @@ D_01000000 = 0x01000000; // segment 0x02 -D_02002460 = 0x02002460; -D_02003F20 = 0x02003F20; - // segment 0x03 // segment 0x04 -D_0401ED00 = 0x0401ED00; D_04023348 = 0x04023348; D_040233B8 = 0x040233B8; D_04023428 = 0x04023428; D_04051180 = 0x04051180; D_04051238 = 0x04051238; D_0406AB30 = 0x0406AB30; -D_0407D590 = 0x0407D590; // segment 0x05 @@ -314,8 +309,6 @@ D_08000000 = 0x08000000; // segment 0x0C -D_0C000000 = 0x0C000000; - // segment 0x0D // segment 0x0E diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 79892053e5..b3af6c1461 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -68,7 +68,7 @@ TriNorm D_801EF638; */ f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* at, ColliderInfo* atInfo, Collider* ac, ColliderInfo* acInfo, u32* effect) { - static f32 damageMultipliers[] = { + static f32 sDamageMultipliers[] = { 0.0f, 1.0f, 2.0f, 0.5f, 0.25f, 3.0f, 4.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, }; u32 dmgFlags; @@ -88,7 +88,7 @@ f32 CollisionCheck_GetDamageAndEffectOnBumper(Collider* at, ColliderInfo* atInfo dmgFlags >>= 1; } - damage *= damageMultipliers[ac->actor->colChkInfo.damageTable->attack[i] & 0xF]; + damage *= sDamageMultipliers[ac->actor->colChkInfo.damageTable->attack[i] & 0xF]; *effect = (ac->actor->colChkInfo.damageTable->attack[i] >> 4) & 0xF; } return damage; @@ -116,11 +116,11 @@ s32 CollisionCheck_GetToucherDamage(Collider* at, ColliderInfo* atInfo, Collider } s32 Collider_InitBase(struct PlayState* play, Collider* collider) { - static Collider defaultCollider = { + static Collider sDefaultCollider = { NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COLTYPE_HIT3, COLSHAPE_MAX, }; - *collider = defaultCollider; + *collider = sDefaultCollider; return 1; } @@ -183,9 +183,9 @@ void Collider_ResetOCBase(struct PlayState* play, Collider* collider) { } s32 Collider_InitTouch(struct PlayState* play, ColliderTouch* touch) { - static ColliderTouch defaultColliderTouch = { 0x00000000, 0, 0 }; + static ColliderTouch sDefaultColliderTouch = { 0x00000000, 0, 0 }; - *touch = defaultColliderTouch; + *touch = sDefaultColliderTouch; return 1; } @@ -204,9 +204,9 @@ void Collider_ResetATInfoUnk(struct PlayState* play, ColliderInfo* info) { } s32 Collider_InitBump(struct PlayState* play, ColliderBump* bump) { - static ColliderBump defaultColliderBump = { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }; + static ColliderBump sDefaultColliderBump = { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }; - *bump = defaultColliderBump; + *bump = sDefaultColliderBump; return 1; } @@ -222,7 +222,7 @@ s32 Collider_SetBump(struct PlayState* play, ColliderBump* bump, ColliderBumpIni } s32 Collider_InitInfo(struct PlayState* play, ColliderInfo* info) { - static ColliderInfo defaultColliderInfo = { + static ColliderInfo sDefaultColliderInfo = { { 0, 0, 0 }, { 0xF7CFFFFF, 0, 0, { 0, 0, 0 } }, ELEMTYPE_UNK0, TOUCH_NONE, BUMP_NONE, OCELEM_NONE, @@ -230,7 +230,7 @@ s32 Collider_InitInfo(struct PlayState* play, ColliderInfo* info) { NULL, NULL, }; - *info = defaultColliderInfo; + *info = sDefaultColliderInfo; Collider_InitTouch(play, &info->toucher); Collider_InitBump(play, &info->bumper); return 1; @@ -273,14 +273,14 @@ void Collider_ResetOCInfo(struct PlayState* play, ColliderInfo* info) { } s32 Collider_InitJntSphElementDim(struct PlayState* play, ColliderJntSphElementDim* dim) { - static ColliderJntSphElementDim defaultColliderJntSphElementDim = { + static ColliderJntSphElementDim sDefaultColliderJntSphElementDim = { { { 0, 0, 0 }, 0 }, { { 0, 0, 0 }, 0 }, 0.0f, 0, }; - *dim = defaultColliderJntSphElementDim; + *dim = sDefaultColliderJntSphElementDim; return 1; } @@ -502,9 +502,9 @@ s32 Collider_ResetJntSphOC(struct PlayState* play, Collider* collider) { } s32 Collider_InitCylinderDim(struct PlayState* play, Cylinder16* dim) { - static Cylinder16 defaultColliderCylinderDim = { 0, 0, 0, { 0, 0, 0 } }; + static Cylinder16 sDefaultColliderCylinderDim = { 0, 0, 0, { 0, 0, 0 } }; - *dim = defaultColliderCylinderDim; + *dim = sDefaultColliderCylinderDim; return 1; } @@ -613,12 +613,12 @@ s32 Collider_ResetCylinderOC(struct PlayState* play, Collider* collider) { } s32 Collider_InitTrisElementDim(struct PlayState* play, TriNorm* dim) { - static TriNorm defaultColliderTrisElementDim = { + static TriNorm sDefaultColliderTrisElementDim = { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }, { { 0.0f, 0.0f, 0.0f }, 0.0f }, }; - *dim = defaultColliderTrisElementDim; + *dim = sDefaultColliderTrisElementDim; return 1; } @@ -830,14 +830,14 @@ s32 Collider_ResetTrisOC(struct PlayState* play, Collider* collider) { } s32 Collider_InitQuadDim(struct PlayState* play, ColliderQuadDim* dim) { - static ColliderQuadDim defaultColliderQuadDim = { + static ColliderQuadDim sDefaultColliderQuadDim = { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }, { 0, 0, 0 }, { 0, 0, 0 }, 1.0E38f, }; - *dim = defaultColliderQuadDim; + *dim = sDefaultColliderQuadDim; return 1; } @@ -3313,11 +3313,11 @@ void CollisionCheck_OC(struct PlayState* play, CollisionCheckContext* colCtxt) { * Initializes CollisionCheckInfo to default values */ void CollisionCheck_InitInfo(CollisionCheckInfo* info) { - static CollisionCheckInfo defaultColChkInfo = { + static CollisionCheckInfo sDefaultColChkInfo = { NULL, { 0.0f, 0.0f, 0.0f }, 10, 10, 0, MASS_IMMOVABLE, 8, 0, 0, 0, 0, }; - *info = defaultColChkInfo; + *info = sDefaultColChkInfo; } /** @@ -3872,7 +3872,7 @@ void CollisionCheck_SpawnWaterDroplets(struct PlayState* play, Vec3f* v) { * Spawns streaks of light from hits against solid objects */ void CollisionCheck_SpawnShieldParticles(struct PlayState* play, Vec3f* v) { - static EffectShieldParticleInit shieldParticleInitMetal = { + static EffectShieldParticleInit sShieldParticleInitMetal = { 16, { 0, 0, 0 }, { 0, 200, 255, 255 }, @@ -3890,14 +3890,14 @@ void CollisionCheck_SpawnShieldParticles(struct PlayState* play, Vec3f* v) { }; s32 effectIndex; - shieldParticleInitMetal.position.x = v->x; - shieldParticleInitMetal.position.y = v->y; - shieldParticleInitMetal.position.z = v->z; - shieldParticleInitMetal.lightPoint.x = shieldParticleInitMetal.position.x; - shieldParticleInitMetal.lightPoint.y = shieldParticleInitMetal.position.y; - shieldParticleInitMetal.lightPoint.z = shieldParticleInitMetal.position.z; + sShieldParticleInitMetal.position.x = v->x; + sShieldParticleInitMetal.position.y = v->y; + sShieldParticleInitMetal.position.z = v->z; + sShieldParticleInitMetal.lightPoint.x = sShieldParticleInitMetal.position.x; + sShieldParticleInitMetal.lightPoint.y = sShieldParticleInitMetal.position.y; + sShieldParticleInitMetal.lightPoint.z = sShieldParticleInitMetal.position.z; - Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &shieldParticleInitMetal); + Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &sShieldParticleInitMetal); } /** @@ -3927,7 +3927,7 @@ void CollisionCheck_SpawnShieldParticlesMetal2(struct PlayState* play, Vec3f* v) * Spawns streaks of light and makes a wooden sound */ void CollisionCheck_SpawnShieldParticlesWood(struct PlayState* play, Vec3f* v, Vec3f* pos) { - static EffectShieldParticleInit shieldParticleInitWood = { + static EffectShieldParticleInit sShieldParticleInitWood = { 16, { 0, 0, 0 }, { 0, 200, 255, 255 }, @@ -3945,14 +3945,14 @@ void CollisionCheck_SpawnShieldParticlesWood(struct PlayState* play, Vec3f* v, V }; s32 effectIndex; - shieldParticleInitWood.position.x = v->x; - shieldParticleInitWood.position.y = v->y; - shieldParticleInitWood.position.z = v->z; - shieldParticleInitWood.lightPoint.x = shieldParticleInitWood.position.x; - shieldParticleInitWood.lightPoint.y = shieldParticleInitWood.position.y; - shieldParticleInitWood.lightPoint.z = shieldParticleInitWood.position.z; + sShieldParticleInitWood.position.x = v->x; + sShieldParticleInitWood.position.y = v->y; + sShieldParticleInitWood.position.z = v->z; + sShieldParticleInitWood.lightPoint.x = sShieldParticleInitWood.position.x; + sShieldParticleInitWood.lightPoint.y = sShieldParticleInitWood.position.y; + sShieldParticleInitWood.lightPoint.z = sShieldParticleInitWood.position.z; - Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &shieldParticleInitWood); + Effect_Add(play, &effectIndex, EFFECT_SHIELD_PARTICLE, 0, 1, &sShieldParticleInitWood); Audio_PlaySfx_AtPos(pos, NA_SE_IT_REFLECTION_WOOD); } diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 8a8ceda614..b2dfa1352f 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -362,15 +362,15 @@ void func_8095E204(EnIshi* this, PlayState* play) { } } -s32 func_8095E2B0(EnIshi* this, PlayState* play) { +s32 EnIshi_IsUnderwater(EnIshi* this, PlayState* play) { s32 pad; WaterBox* waterBox; - f32 sp2C; - s32 sp28; + f32 waterSurface; + s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp2C, &waterBox, - &sp28) && - (this->actor.world.pos.y < sp2C)) { + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface, + &waterBox, &bgId) && + (this->actor.world.pos.y < waterSurface)) { return true; } return false; @@ -421,7 +421,7 @@ void EnIshi_Init(Actor* thisx, PlayState* play) { return; } - if (func_8095E2B0(this, play)) { + if (EnIshi_IsUnderwater(this, play)) { this->unk_197 |= 1; } diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index ba2eb7cc1e..617ddecc54 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -24,7 +24,7 @@ void EnKusa_DropCollectible(EnKusa* this, PlayState* play); void EnKusa_UpdateVelY(EnKusa* this); void EnKusa_RandScaleVecToZero(Vec3f* vec, f32 scaleFactor); void EnKusa_SetScaleSmall(EnKusa* this); -s32 EnKusa_GetWaterBox(EnKusa* this, PlayState* play); +s32 EnKusa_IsUnderwater(EnKusa* this, PlayState* play); void EnKusa_SetupWaitObject(EnKusa* this); void EnKusa_WaitObject(EnKusa* this, PlayState* play); void EnKusa_WaitForInteract(EnKusa* this, PlayState* play); @@ -338,15 +338,15 @@ void EnKusa_SpawnBugs(EnKusa* this, PlayState* play) { } } -s32 EnKusa_GetWaterBox(EnKusa* this, PlayState* play) { +s32 EnKusa_IsUnderwater(EnKusa* this, PlayState* play) { s32 pad; WaterBox* waterBox; - f32 ySurface; + f32 waterSurface; s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &ySurface, + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface, &waterBox, &bgId) && - (this->actor.world.pos.y < ySurface)) { + (this->actor.world.pos.y < waterSurface)) { return true; } return false; @@ -390,7 +390,7 @@ void EnKusa_Init(Actor* thisx, PlayState* play) { Actor_Kill(&this->actor); return; } - if (EnKusa_GetWaterBox(this, play)) { + if (EnKusa_IsUnderwater(this, play)) { this->isInWater |= 1; } diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index 6e7bcc8eb2..7eb57fd8f1 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -676,7 +676,7 @@ void func_80A69D3C(EnMushi2* this) { } } -s32 func_80A69EE4(EnMushi2* this, PlayState* play) { +s32 EnMushi2_IsUnderwater(EnMushi2* this, PlayState* play) { s32 pad; WaterBox* waterBox; f32 waterSurface; @@ -757,7 +757,7 @@ void EnMushi2_Init(Actor* thisx, PlayState* play) { Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderElements); func_80A68808(this); this->actor.colChkInfo.mass = 30; - sp3C = func_80A69EE4(this, play); + sp3C = EnMushi2_IsUnderwater(this, play); if ((sp3C == 0) && func_80A68860(this, play) && func_80A68910(this, play) && (ENMUSHI2_GET_3(&this->actor) == ENMUSHI2_0)) { diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index 7d397a1c06..2ff64cb2cd 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -126,15 +126,15 @@ void func_80ACBA10(ObjAqua* this) { Matrix_MtxFToYXZRot(&sp2C, &this->actor.shape.rot, false); } -s32 func_80ACBA60(ObjAqua* this, PlayState* play) { +s32 ObjAqua_IsUnderwater(ObjAqua* this, PlayState* play) { s32 pad; WaterBox* waterBox; - f32 ySurface; + f32 waterSurface; s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &ySurface, + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface, &waterBox, &bgId) && - (this->actor.world.pos.y < ySurface)) { + (this->actor.world.pos.y < waterSurface)) { return true; } return false; @@ -157,7 +157,7 @@ void ObjAqua_Init(Actor* thisx, PlayState* play) { this->actor.shape.shadowAlpha = 140; this->alpha = 255; - if (func_80ACBA60(this, play)) { + if (ObjAqua_IsUnderwater(this, play)) { for (i = 0; i < 8; i++) { EffectSsBubble_Spawn(play, &this->actor.world.pos, -4.0f, 4.0f, 4.0f, (Rand_ZeroOne() * 0.09f) + 0.03f); } diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 3a18ee915f..0c454d1dfd 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -146,15 +146,15 @@ s32 func_80939470(Actor* thisx) { return false; } -s32 func_8093951C(ObjBombiwa* this, PlayState* play) { +s32 ObjBombiwa_IsUnderwater(ObjBombiwa* this, PlayState* play) { s32 pad; WaterBox* waterBox; - f32 sp2C; - s32 sp28; + f32 waterSurface; + s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp2C, &waterBox, - &sp28) && - (this->actor.world.pos.y < sp2C)) { + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface, + &waterBox, &bgId) && + (this->actor.world.pos.y < waterSurface)) { return true; } return false; @@ -200,7 +200,7 @@ void ObjBombiwa_Init(Actor* thisx, PlayState* play) { ActorShape_Init(&this->actor.shape, -200.0f, D_8093A998[sp34].unk_04, 9.8f); this->actor.world.pos.y = this->actor.home.pos.y + 20.0f; this->actor.draw = D_8093A998[sp34].unk_08; - if (func_8093951C(this, play)) { + if (ObjBombiwa_IsUnderwater(this, play)) { this->unk_203 |= 1; } func_80939EE0(this); diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index 8cbe9aacf3..5934f1bbc0 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -91,11 +91,11 @@ s32 ObjGrassUnit_SpawnObjGrassCarry1(Actor* this, PlayState* play) { s32 ObjGrassUnit_IsUnderwater(PlayState* play, Vec3f* pos) { WaterBox* waterBox; - f32 ySurface; + f32 waterSurface; s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, pos->x, pos->z, &ySurface, &waterBox, &bgId) && - (pos->y < ySurface)) { + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, pos->x, pos->z, &waterSurface, &waterBox, &bgId) && + (pos->y < waterSurface)) { return true; } return false; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 38a5282299..c493084149 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -146,15 +146,15 @@ void func_809A13A0(ObjHamishi* this, PlayState* play) { BgCheck_EntityRaycastFloor5(&play->colCtx, &this->actor.floorPoly, &sp24, &this->actor, &sp28); } -s32 func_809A1408(ObjHamishi* this, PlayState* play) { +s32 ObjHamishi_IsUnderwater(ObjHamishi* this, PlayState* play) { s32 pad; WaterBox* waterBox; - f32 sp2C; - s32 sp28; + f32 waterSurface; + s32 bgId; - if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &sp2C, &waterBox, - &sp28) && - (this->actor.world.pos.y < sp2C)) { + if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterSurface, + &waterBox, &bgId) && + (this->actor.world.pos.y < waterSurface)) { return true; } return false; @@ -187,7 +187,7 @@ void ObjHamishi_Init(Actor* thisx, PlayState* play) { this->actor.shape.yOffset = 80.0f; - if (func_809A1408(this, play)) { + if (ObjHamishi_IsUnderwater(this, play)) { this->unk_1A2 |= 1; } } diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index c8ff529b64..e50c7f56ea 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -7260,7 +7260,7 @@ 0x8093517C:("EnKusa_SetScaleSmall",), 0x809351A0:("EnKusa_SpawnFragments",), 0x809354F8:("EnKusa_SpawnBugs",), - 0x809355A4:("EnKusa_GetWaterBox",), + 0x809355A4:("EnKusa_IsUnderwater",), 0x8093561C:("EnKusa_InitCollider",), 0x80935674:("EnKusa_Init",), 0x80935898:("EnKusa_Destroy",), @@ -7347,7 +7347,7 @@ 0x80938F50:("func_80938F50",), 0x809393B0:("func_809393B0",), 0x80939470:("func_80939470",), - 0x8093951C:("func_8093951C",), + 0x8093951C:("ObjBombiwa_IsUnderwater",), 0x80939594:("func_80939594",), 0x809395FC:("ObjBombiwa_Init",), 0x80939768:("ObjBombiwa_Destroy",), @@ -7770,7 +7770,7 @@ 0x8095E14C:("func_8095E14C",), 0x8095E180:("func_8095E180",), 0x8095E204:("func_8095E204",), - 0x8095E2B0:("func_8095E2B0",), + 0x8095E2B0:("EnIshi_IsUnderwater",), 0x8095E328:("EnIshi_Init",), 0x8095E580:("EnIshi_Destroy",), 0x8095E5AC:("func_8095E5AC",), @@ -8660,7 +8660,7 @@ 0x809A0F78:("func_809A0F78",), 0x809A10F4:("func_809A10F4",), 0x809A13A0:("func_809A13A0",), - 0x809A1408:("func_809A1408",), + 0x809A1408:("ObjHamishi_IsUnderwater",), 0x809A1480:("ObjHamishi_Init",), 0x809A15A0:("ObjHamishi_Destroy",), 0x809A15CC:("ObjHamishi_Update",), @@ -10883,7 +10883,7 @@ 0x80A69ADC:("func_80A69ADC",), 0x80A69CE0:("func_80A69CE0",), 0x80A69D3C:("func_80A69D3C",), - 0x80A69EE4:("func_80A69EE4",), + 0x80A69EE4:("EnMushi2_IsUnderwater",), 0x80A69F5C:("func_80A69F5C",), 0x80A6A024:("func_80A6A024",), 0x80A6A058:("func_80A6A058",), @@ -12060,7 +12060,7 @@ 0x80ACB7F4:("func_80ACB7F4",), 0x80ACB940:("func_80ACB940",), 0x80ACBA10:("func_80ACBA10",), - 0x80ACBA60:("func_80ACBA60",), + 0x80ACBA60:("ObjAqua_IsUnderwater",), 0x80ACBAD8:("ObjAqua_Init",), 0x80ACBC44:("ObjAqua_Destroy",), 0x80ACBC70:("func_80ACBC70",),