summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorkrimtonz <33664508+krimtonz@users.noreply.github.com>2020-09-14 11:17:34 -0500
committerGitHub <noreply@github.com>2020-09-14 12:17:34 -0400
commit4d9f83da1b65a8b3f15a8ab5be26eb4f11908d4c (patch)
treecd6c84f185a06a2a5d0709ef1e5115e81f7e747b /src/code
parent2fd56429ebbeb70c25a6835d05e9165d172f25ee (diff)
Decompiles ovl_En_St (#349)
* decompile and match En_St * document ovl_En_St * Implement OPEN_DISPS, and remove useless comments * styling updates, inline some declarations * PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types * remove pointer from EnSt_SetupAction
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_eff_blure.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index af4df1dad..8f256bcc5 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -116,22 +116,22 @@ void EffectBlure_Init1(void* thisx, void* initParamsx) {
if ((this != NULL) && (initParams != NULL)) {
EffectBlure_InitElements(this);
- this->p1StartColor.r = initParams->p1StartColor.r;
- this->p2StartColor.r = initParams->p2StartColor.r;
- this->p1EndColor.r = initParams->p1EndColor.r;
- this->p2EndColor.r = initParams->p2EndColor.r;
- this->p1StartColor.g = initParams->p1StartColor.g;
- this->p2StartColor.g = initParams->p2StartColor.g;
- this->p1EndColor.g = initParams->p1EndColor.g;
- this->p2EndColor.g = initParams->p2EndColor.g;
- this->p1StartColor.b = initParams->p1StartColor.b;
- this->p2StartColor.b = initParams->p2StartColor.b;
- this->p1EndColor.b = initParams->p1EndColor.b;
- this->p2EndColor.b = initParams->p2EndColor.b;
- this->p1StartColor.a = initParams->p1StartColor.a;
- this->p2StartColor.a = initParams->p2StartColor.a;
- this->p1EndColor.a = initParams->p1EndColor.a;
- this->p2EndColor.a = initParams->p2EndColor.a;
+ this->p1StartColor.r = initParams->p1StartColor[0];
+ this->p2StartColor.r = initParams->p2StartColor[0];
+ this->p1EndColor.r = initParams->p1EndColor[0];
+ this->p2EndColor.r = initParams->p2EndColor[0];
+ this->p1StartColor.g = initParams->p1StartColor[1];
+ this->p2StartColor.g = initParams->p2StartColor[1];
+ this->p1EndColor.g = initParams->p1EndColor[1];
+ this->p2EndColor.g = initParams->p2EndColor[1];
+ this->p1StartColor.b = initParams->p1StartColor[2];
+ this->p2StartColor.b = initParams->p2StartColor[2];
+ this->p1EndColor.b = initParams->p1EndColor[2];
+ this->p2EndColor.b = initParams->p2EndColor[2];
+ this->p1StartColor.a = initParams->p1StartColor[3];
+ this->p2StartColor.a = initParams->p2StartColor[3];
+ this->p1EndColor.a = initParams->p1EndColor[3];
+ this->p2EndColor.a = initParams->p2EndColor[3];
this->elemDuration = initParams->elemDuration;
this->unkFlag = initParams->unkFlag;
this->calcMode = initParams->calcMode;
@@ -157,22 +157,22 @@ void EffectBlure_Init2(void* thisx, void* initParamsx) {
if ((this != NULL) && (initParams != NULL)) {
EffectBlure_InitElements(this);
- this->p1StartColor.r = initParams->p1StartColor.r;
- this->p2StartColor.r = initParams->p2StartColor.r;
- this->p1EndColor.r = initParams->p1EndColor.r;
- this->p2EndColor.r = initParams->p2EndColor.r;
- this->p1StartColor.g = initParams->p1StartColor.g;
- this->p2StartColor.g = initParams->p2StartColor.g;
- this->p1EndColor.g = initParams->p1EndColor.g;
- this->p2EndColor.g = initParams->p2EndColor.g;
- this->p1StartColor.b = initParams->p1StartColor.b;
- this->p2StartColor.b = initParams->p2StartColor.b;
- this->p1EndColor.b = initParams->p1EndColor.b;
- this->p2EndColor.b = initParams->p2EndColor.b;
- this->p1StartColor.a = initParams->p1StartColor.a;
- this->p2StartColor.a = initParams->p2StartColor.a;
- this->p1EndColor.a = initParams->p1EndColor.a;
- this->p2EndColor.a = initParams->p2EndColor.a;
+ this->p1StartColor.r = initParams->p1StartColor[0];
+ this->p2StartColor.r = initParams->p2StartColor[0];
+ this->p1EndColor.r = initParams->p1EndColor[0];
+ this->p2EndColor.r = initParams->p2EndColor[0];
+ this->p1StartColor.g = initParams->p1StartColor[1];
+ this->p2StartColor.g = initParams->p2StartColor[1];
+ this->p1EndColor.g = initParams->p1EndColor[1];
+ this->p2EndColor.g = initParams->p2EndColor[1];
+ this->p1StartColor.b = initParams->p1StartColor[2];
+ this->p2StartColor.b = initParams->p2StartColor[2];
+ this->p1EndColor.b = initParams->p1EndColor[2];
+ this->p2EndColor.b = initParams->p2EndColor[2];
+ this->p1StartColor.a = initParams->p1StartColor[3];
+ this->p2StartColor.a = initParams->p2StartColor[3];
+ this->p1EndColor.a = initParams->p1EndColor[3];
+ this->p2EndColor.a = initParams->p2EndColor[3];
this->elemDuration = initParams->elemDuration;
this->unkFlag = initParams->unkFlag;
this->calcMode = initParams->calcMode;