mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-31 07:20:14 -05:00
Code Issues Projects Releases Wiki Activity

Fix animation in Ganon that is causing an OOB access during animation (#1764)

Browse Source 
* Fix animation in Ganon that is causing an OOB access during animation

* Fix function args
This commit is contained in:
Rozelette 2022-10-13 08:18:31 -05:00 committed by GitHub
parent 7906d70485
commit 7878b8f3e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View File

@ -577,6 +577,14 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON_ANIME3, false); BossGanon2_SetObjectSegment(this, globalCtx, OBJECT_GANON_ANIME3, false);
func_8002DF54(globalCtx, &this->actor, 0x54); func_8002DF54(globalCtx, &this->actor, 0x54);
this->unk_314 = 3; this->unk_314 = 3;
// At this point, the actor has Ganon's skeleton but is still playing an animation for Ganondorf. This
// causes issues when trying to access the limb posotions as Ganon has more limbs than Ganondorf. When
// animating, data from past the end of the animation data is accessed. This is a hack solution so
// that we are at least playing an animation meant for Ganon. There is no visible change since Ganon is
// off-screen. There is actually 1 frame where he is visible, and in the vanilla game he is an
// explosion of limbs since half of them are in random positions from the junk data accessed.
Animation_PlayOnce(&this->skelAnime, &gGanonUncurlAndFlailAnim);
} }
// fake, tricks the compiler into using stack the way we need it to // fake, tricks the compiler into using stack the way we need it to
if (zero) { if (zero) {