From e23efa2e39979c2d2b5353ae3bddebffa6f3a606 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Mon, 17 Jun 2024 10:00:43 +0200 Subject: [PATCH] Rename struct fields and variables accordingly --- include/overlay005/field_motion_blur.h | 2 +- src/overlay005/field_motion_blur.c | 10 +++++----- src/overlay006/ov6_0223E140.c | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/overlay005/field_motion_blur.h b/include/overlay005/field_motion_blur.h index 55b1bb24f9..493cc4267a 100644 --- a/include/overlay005/field_motion_blur.h +++ b/include/overlay005/field_motion_blur.h @@ -4,7 +4,7 @@ #include "overlay005/motion_blur.h" typedef struct FieldMotionBlur { - MotionBlur * unk_00; + MotionBlur *motionBlur; } FieldMotionBlur; FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB); diff --git a/src/overlay005/field_motion_blur.c b/src/overlay005/field_motion_blur.c index 78f5083468..02beaa61ec 100644 --- a/src/overlay005/field_motion_blur.c +++ b/src/overlay005/field_motion_blur.c @@ -22,7 +22,7 @@ FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB) MI_CpuClear32(fieldMotionBlur, sizeof(FieldMotionBlur)); { - MotionBlurParams v1 = { + MotionBlurParams motionBlurParams = { GX_DISPMODE_VRAM_C, GX_BGMODE_0, GX_BG0_AS_3D, @@ -36,10 +36,10 @@ FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB) 4 }; - v1.blendCoeffA = coeffA; - v1.blendCoeffB = coeffB; + motionBlurParams.blendCoeffA = coeffA; + motionBlurParams.blendCoeffB = coeffB; - fieldMotionBlur->unk_00 = MotionBlur_New(&v1); + fieldMotionBlur->motionBlur = MotionBlur_New(&motionBlurParams); } return fieldMotionBlur; @@ -47,7 +47,7 @@ FieldMotionBlur *FieldMotionBlur_Start(int coeffA, int coeffB) void FieldMotionBlur_Stop(FieldMotionBlur **fieldMotionBlur) { - MotionBlur_Delete(&(*fieldMotionBlur)->unk_00, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); + MotionBlur_Delete(&(*fieldMotionBlur)->motionBlur, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); GX_SetBankForBG(GX_VRAM_BG_128_C); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 1); Heap_FreeToHeapExplicit(4, *fieldMotionBlur); diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index 68f92d6576..101dea8e68 100644 --- a/src/overlay006/ov6_0223E140.c +++ b/src/overlay006/ov6_0223E140.c @@ -52,7 +52,7 @@ void include_unk_ov6_02248F30(); typedef struct { FieldSystem * fieldSystem; UnkStruct_02099F80 unk_04; - MotionBlur * unk_2C; + MotionBlur * motionBlur; int unk_30; int unk_34; u32 unk_38; @@ -325,7 +325,7 @@ static void ov6_0223E140 (UnkStruct_ov6_0223E140 * param0) param0->unk_38++; break; case 1: - param0->unk_2C = ov6_0223E2BC(param0->unk_30, param0->unk_34); + param0->motionBlur = ov6_0223E2BC(param0->unk_30, param0->unk_34); param0->unk_38++; break; case 2: @@ -455,10 +455,10 @@ static void ov6_0223E2AC (BGL * param0) static MotionBlur * ov6_0223E2BC (int param0, int param1) { - MotionBlur * v0; + MotionBlur * motionBlur; { - MotionBlurParams v1 = { + MotionBlurParams motionBlurParams = { GX_DISPMODE_VRAM_C, GX_BGMODE_0, GX_BG0_AS_3D, @@ -472,13 +472,13 @@ static MotionBlur * ov6_0223E2BC (int param0, int param1) 4 }; - v1.blendCoeffA = param0; - v1.blendCoeffB = param1; + motionBlurParams.blendCoeffA = param0; + motionBlurParams.blendCoeffB = param1; - v0 = MotionBlur_New(&v1); + motionBlur = MotionBlur_New(&motionBlurParams); } - return v0; + return motionBlur; } static void ov6_0223E2E8 (UnkStruct_ov6_0223E140 * param0) @@ -490,7 +490,7 @@ static void ov6_0223E2FC (SysTask * param0, void * param1) { UnkStruct_ov6_0223E140 * v0 = param1; - MotionBlur_Delete(&v0->unk_2C, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); + MotionBlur_Delete(&v0->motionBlur, GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D); SysTask_Done(param0); }