diff options
| author | Thomas Rohloff <v10lator@myway.de> | 2025-07-04 13:10:26 +0200 |
|---|---|---|
| committer | Thomas Rohloff <v10lator@myway.de> | 2025-07-04 13:10:26 +0200 |
| commit | fd5acc8c9a15c3fa471b129dceaf2d535a58f35d (patch) | |
| tree | 2b1c4c434492285f61b76a9e7327f65c6a085abb /src/engine/objects | |
| parent | d737a47e16c55d54e6acedadb05dd1cb7b9d770b (diff) | |
| parent | 67090b39a764e8a77a95acf01a2d83959dad82c7 (diff) | |
Merge remote-tracking branch 'upstream/main' into docker
Diffstat (limited to 'src/engine/objects')
| -rw-r--r-- | src/engine/objects/Lakitu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/objects/Lakitu.cpp b/src/engine/objects/Lakitu.cpp index 28159b7b3..8088e89c8 100644 --- a/src/engine/objects/Lakitu.cpp +++ b/src/engine/objects/Lakitu.cpp @@ -393,7 +393,7 @@ void OLakitu::func_80079860(s32 playerId) { void OLakitu::func_8007993C(s32 objectIndex, Player* player) { if (player->unk_0CA & 4) { func_800722A4(objectIndex, 2); - gObjectList[objectIndex].primAlpha = player->unk_0C6; + gObjectList[objectIndex].primAlpha = player->alpha; return; } func_800722CC(objectIndex, 2); @@ -784,7 +784,7 @@ void OLakitu::func_8007A778(s32 objectIndex) { Player* player = &gPlayers[_playerId]; Camera* camera = &cameras[_playerId]; u16 rot = 0x8000 - camera->rot[1]; - + gObjectList[objectIndex].pos[0] = (player->pos[0] + (coss(rot) * (gObjectList[objectIndex].origin_pos[0] + gObjectList[objectIndex].offset[0]))) - |