summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2024-05-04 19:31:07 -0600
committerGitHub <noreply@github.com>2024-05-04 19:31:07 -0600
commit95079ffd232dc8835678a73b5bbc2f015e662658 (patch)
tree5e04ced0c956d15e42fb51297cb31d1b142e4d2f
parent66441f546150f4c381aae5a2e1739e0c4c3209d4 (diff)
Remove two fake vars (#12)
* Removed two fake vars
-rw-r--r--src/code_80091750.c30
-rw-r--r--src/code_80091750.h2
2 files changed, 14 insertions, 18 deletions
diff --git a/src/code_80091750.c b/src/code_80091750.c
index 1058529bf..43a0fe2ed 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -67,10 +67,8 @@ s32 gNumD_8018E768Entries;
struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
s32 gCycleFlashMenu;
s8 D_8018E7AC[5];
-u32 D_8018E7B8[4];
-u32 D_8018E7C8;
-u32 D_8018E7D0[4];
-s32 D_8018E7E0;
+u32 D_8018E7B8[5];
+u32 D_8018E7D0[5];
struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE];
struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE];
s8 D_8018E838[4]; // Import to C was required for matching.
@@ -3546,7 +3544,7 @@ void func_80099184(MkTexture *arg0) {
UNUSED s32 temp_s3;
MkTexture *texture = arg0;
UNUSED struct_8018E118_entry *thing;
-
+
while (texture->textureData != NULL) {
var_a1 = 0;
for (var_v0 = 0; var_v0 < gNumD_8018E118Entries; var_v0++) {
@@ -5234,11 +5232,11 @@ void func_8009DAA8(void) {
u32 var_t0;
D_8018E7D0[4]++;
- if (D_8018E7D0[4] >= (D_8018E7C8 + 1)) {
+ if (D_8018E7D0[4] >= (D_8018E7B8[4] + 1)) {
func_8009CE64(4);
}
gDPPipeSync(gDisplayListHead++);
- var_t0 = (D_8018E7D0[4] * 255) / D_8018E7C8;
+ var_t0 = (D_8018E7D0[4] * 255) / D_8018E7B8[4];
if ((s32) var_t0 >= 0x100) {
var_t0 = 0x000000FF;
}
@@ -5255,8 +5253,8 @@ void func_8009DB8C(void) {
D_8018E7D0[4]++;
// why?
var_v1 = D_8018E7D0[4];
- if ((u32) var_v1 >= D_8018E7C8) {
- if ((u32) var_v1 == D_8018E7C8) {
+ if ((u32) var_v1 >= D_8018E7B8[4]) {
+ if ((u32) var_v1 == D_8018E7B8[4]) {
for (var_s0 = 0; var_s0 < 0x4B0; var_s0++) {
D_8018D9B8[var_s0] = 1;
}
@@ -5266,8 +5264,8 @@ void func_8009DB8C(void) {
} else {
var_s0 = 0;
var_s3 = 0;
- while (var_s3 < (0x4B0U / D_8018E7C8)) {
- if ((D_8018D9B8[var_s0] == 0) && (random_int((0x4B0U - D_8018E7D0[4]) / D_8018E7C8) == 0)) {
+ while (var_s3 < (0x4B0U / D_8018E7B8[4])) {
+ if ((D_8018D9B8[var_s0] == 0) && (random_int((0x4B0U - D_8018E7D0[4]) / D_8018E7B8[4]) == 0)) {
var_s3 += 1;
D_8018D9B8[var_s0] = 1;
}
@@ -5289,7 +5287,7 @@ void func_8009DB8C(void) {
}
}
gDPPipeSync(gDisplayListHead++);
- var_v1 = (D_8018E7D0[4] * 255) / D_8018E7C8;
+ var_v1 = (D_8018E7D0[4] * 255) / D_8018E7B8[4];
if (var_v1 >= 0x100) {
var_v1 = 0x000000FF;
}
@@ -5306,7 +5304,7 @@ void func_8009DEF8(u32 arg0, u32 arg1) {
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0xFFU;
}
- D_8018E7E0 = 0;
+ D_8018E7D0[4] = 0;
}
}
@@ -5328,7 +5326,7 @@ void func_8009DF8C(u32 arg0, u32 arg1) {
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0xFFU;
}
- D_8018E7E0 = 0;
+ D_8018E7D0[4] = 0;
}
}
@@ -5385,7 +5383,7 @@ void func_8009E0F0(s32 arg0) {
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0x000000FF;
}
- D_8018E7E0 = 0;
+ D_8018E7D0[4] = 0;
for (var_v0 = 0; var_v0 < 0x4B0; var_v0++) {
D_8018D9B8[var_v0] = 0;
}
@@ -5399,7 +5397,7 @@ void func_8009E17C(u32 arg0) {
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0x000000FFU;
}
- D_8018E7E0 = 0;
+ D_8018E7D0[4] = 0;
}
}
diff --git a/src/code_80091750.h b/src/code_80091750.h
index 59c6459a6..157fc607c 100644
--- a/src/code_80091750.h
+++ b/src/code_80091750.h
@@ -437,9 +437,7 @@ extern struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
extern s32 gCycleFlashMenu;
extern s8 D_8018E7AC[];
extern u32 D_8018E7B8[];
-extern u32 D_8018E7C8;
extern u32 D_8018E7D0[];
-extern s32 D_8018E7E0;
extern struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE];
extern struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE];
extern s8 gTextColor;