diff options
| author | Random06457 <28494085+Random06457@users.noreply.github.com> | 2023-11-24 13:24:04 +0100 |
|---|---|---|
| committer | Random06457 <28494085+Random06457@users.noreply.github.com> | 2023-11-24 13:57:39 +0100 |
| commit | c9de309f805ca4c36bf4b9691aae057bd52b265e (patch) | |
| tree | 7601a498ff22034468d52c14f32ce3c33036f7c3 | |
| parent | bf803995dae4d568a00ba40b79810f22c61a8b06 (diff) | |
fix oob accesses in goroiwa
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mm/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/mm/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 4eb6a72e3..2abb6784e 100644 --- a/mm/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/mm/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -90,17 +90,15 @@ static Gfx* D_80942E0C[][3] = { static Color_RGBA8 D_80942E30[] = { { 190, 195, 200, 255 }, { 170, 130, 90, 255 }, + { 250, 250, 250, 255 }, }; -static Color_RGBA8 D_80942E38 = { 250, 250, 250, 255 }; - static Color_RGBA8 D_80942E3C[] = { { 130, 135, 140, 255 }, { 100, 60, 20, 255 }, + { 180, 180, 180, 255 }, }; -static Color_RGBA8 D_80942E44 = { 180, 180, 180, 255 }; - static Vec3f D_80942E48 = { 0.0f, 0.0f, 0.0f }; static Vec3f D_80942E54 = { 0.0f, 0.3f, 0.0f }; static Vec3f D_80942E60 = { 0.0f, 1.0f, 0.0f }; @@ -910,7 +908,8 @@ void func_80940E38(EnGoroiwa* this, PlayState* play) { sp48.y = this->actor.world.pos.y + 20.0f; sp48.z = (Math_CosS(sp46) * sp54) + this->actor.world.pos.z; - func_800B0E48(play, &sp48, &D_80942E48, &D_80942E54, &D_80942E38, &D_80942E44, + func_800B0E48(play, &sp48, &D_80942E48, &D_80942E54, &D_80942E30[ENGOROIWA_C000_2], + &D_80942E3C[ENGOROIWA_C000_2], (Rand_ZeroOne() * 600.0f) + (600.0f * (this->actor.scale.x + 0.1f) * 0.5f), (s32)(Rand_ZeroOne() * 50.0f) + 30); } @@ -938,8 +937,8 @@ void func_80941060(EnGoroiwa* this, PlayState* play) { spAC.y = spA0.y * -0.06f; spAC.z = spA0.z * -0.06f; - func_800B0E48(play, &sp94, &spA0, &spAC, &D_80942E38, &D_80942E44, (s32)(Rand_ZeroOne() * 30.0f) + 15, - (s32)(Rand_ZeroOne() * 40.0f) + 30); + func_800B0E48(play, &sp94, &spA0, &spAC, &D_80942E30[ENGOROIWA_C000_2], &D_80942E3C[ENGOROIWA_C000_2], + (s32)(Rand_ZeroOne() * 30.0f) + 15, (s32)(Rand_ZeroOne() * 40.0f) + 30); } } |