falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some rename

This commit is contained in:
coco875 2025-01-31 19:09:24 +01:00
parent 2c242cba2e
commit 3254a38af4
3 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
src/menu_items.c
View File

@ -67,9 +67,9 @@ Gfx* sGfxPtr;
s32 gNumD_8018E768Entries;
struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
s32 gCycleFlashMenu;
s8 D_8018E7AC[5];
u32 D_8018E7B8[5];
u32 D_8018E7D0[4];
s8 gTransitionType[5];
u32 gTransitionDuration[5];
u32 gCurrentTransitionTime[4];
s32 D_8018E7E0;
struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE];
struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE];
@ -1338,7 +1338,7 @@ void func_80091B78(void) {
unref_8018EE0C = 0;
for (i = 0; i < 5; i++) {
D_8018E7AC[i] = 0;
gTransitionType[i] = 0;
}
for (i = 0; i < 4; i++) {
@ -1434,7 +1434,7 @@ void func_80091FA4(void) {
sGPPointsCopy = get_next_available_memory_addr(4);
for (i = 0; i < 5; i++) {
D_8018E7AC[i] = 0;
gTransitionType[i] = 0;
}
for (i = 0; i < 4; i++) {
@ -2244,7 +2244,7 @@ void func_80093E60(void) {
sGPPointsCopy = get_next_available_memory_addr(4U);
for (i = 0; i < 5; i++) {
D_8018E7AC[i] = 0;
gTransitionType[i] = 0;
}
for (i = 0; i < 4; i++) {
@ -2569,7 +2569,7 @@ void setup_menus(void) {
void func_80095574(void) {
s32 var_v0;
if ((unref_8018EE0C < 3) || (D_8018E7AC[4] != 0)) {
if ((unref_8018EE0C < 3) || (gTransitionType[4] != 0)) {
handle_menus_default();
}
if (gDebugMenuSelection > DEBUG_MENU_DISABLED) { // If not disabled
@ -3345,12 +3345,12 @@ Gfx* func_800987D0(Gfx* displayListHead, u32 arg1, u32 arg2, u32 width, u32 heig
f32 temp_f18;
f32 temp_f24;
if (D_8018E7B8[0] == 0) {
D_8018E7B8[0] = 1;
if (gTransitionDuration[0] == 0) {
gTransitionDuration[0] = 1;
}
temp_f24 = sins(((D_8018E7D0[0] * 0x4E20) / D_8018E7B8[0]) % 20000U);
temp_f0 = coss(((D_8018E7D0[0] * 0x4E20) / D_8018E7B8[0]) % 20000U);
temp_f18 = (((f32) D_8018E7D0[0] * 0.5) / D_8018E7B8[0]) + 1.0;
temp_f24 = sins(((gCurrentTransitionTime[0] * 0x4E20) / gTransitionDuration[0]) % 20000U);
temp_f0 = coss(((gCurrentTransitionTime[0] * 0x4E20) / gTransitionDuration[0]) % 20000U);
temp_f18 = (((f32) gCurrentTransitionTime[0] * 0.5) / gTransitionDuration[0]) + 1.0;
columnCopy = column;
for (var_v0_2 = arg2; (u32) var_v0_2 < height; var_v0_2 += 0x20) {
for (var_a2 = arg1; (u32) var_a2 < width; var_a2 += 0x20) {
@ -4381,7 +4381,7 @@ Gfx* render_menu_textures(Gfx* arg0, MenuTexture* arg1, s32 column, s32 row) {
}
temp_v0_3 = (u8*) func_8009B8C4(temp_v0->textureData);
if (temp_v0_3 != 0) {
if (D_8018E7AC[4] != 4) {
if (gTransitionType[4] != 4) {
arg0 =
func_80095E10(arg0, var_s4, 0x00000400, 0x00000400, 0, 0, temp_v0->width, temp_v0->height,
temp_v0->dX + column, temp_v0->dY + row, temp_v0_3, temp_v0->width, temp_v0->height);
@ -4658,9 +4658,9 @@ void func_8009CA6C(s32 arg0) {
if ((arg0 != 4) && (gIsGamePaused != 0)) {
var_a1 = 1;
}
switch (D_8018E7AC[arg0]) {
switch (gTransitionType[arg0]) {
case 1:
func_8009CDDC(arg0, var_a1);
draw_black_fade_in(arg0, var_a1);
return;
case 2:
func_8009D958(arg0, var_a1);
@ -4678,7 +4678,7 @@ void func_8009CA6C(s32 arg0) {
func_8009D978(arg0, var_a1);
return;
case 8:
func_8009CDFC(arg0, var_a1);
draw_white_fade_in(arg0, var_a1);
break;
case 0:
default:
@ -4687,7 +4687,7 @@ void func_8009CA6C(s32 arg0) {
}
}
void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) {
void draw_fade_in(s32 arg0, s32 arg1, s32 arg2) {
RGBA16* color;
s16 x, y, w, h;
UNUSED s32 pad[3];
@ -4716,25 +4716,27 @@ void func_8009CBE4(s32 arg0, s32 arg1, s32 arg2) {
h = unk->screenHeight;
}
color = &D_800E7AE8[arg2];
gDisplayListHead = draw_box(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, color->red,
color->green, color->blue, 0xFF - (D_8018E7D0[arg0] * 0xFF / D_8018E7B8[arg0]));
gDisplayListHead =
draw_box(gDisplayListHead, x - (w / 2), y - (h / 2), (w / 2) + x, (h / 2) + y, color->red, color->green,
color->blue, 0xFF - (gCurrentTransitionTime[arg0] * 0xFF / gTransitionDuration[arg0]));
if ((arg1 == 0) && (D_8018E7D0[arg0] += 1, (D_8018E7D0[arg0] >= D_8018E7B8[arg0]))) {
if ((arg1 == 0) &&
(gCurrentTransitionTime[arg0] += 1, (gCurrentTransitionTime[arg0] >= gTransitionDuration[arg0]))) {
if (gGamestate == 4) {
D_8018E7AC[arg0] = 6;
gTransitionType[arg0] = 6;
return;
}
D_8018E7AC[arg0] = 0;
gTransitionType[arg0] = 0;
unref_8018EE0C = 0;
}
}
void func_8009CDDC(s32 arg0, s32 arg1) {
func_8009CBE4(arg0, arg1, 0);
void draw_black_fade_in(s32 arg0, s32 arg1) {
draw_fade_in(arg0, arg1, 0);
}
void func_8009CDFC(s32 arg0, s32 arg1) {
func_8009CBE4(arg0, arg1, 1);
void draw_white_fade_in(s32 arg0, s32 arg1) {
draw_fade_in(arg0, arg1, 1);
}
void func_8009CE1C(void) {
@ -4771,9 +4773,9 @@ void func_8009CE64(s32 arg0) {
gMenuSelection = 0x0000000B;
}
} else if (gGamestate == 4) {
if (D_8018E7AC[arg0] == 2) {
if (gTransitionType[arg0] == 2) {
if (arg0 != 4) {
D_8018E7AC[arg0] = 5;
gTransitionType[arg0] = 5;
} else {
var_a1 = 0;
temp_v0 = find_menu_items(0x000000B0);
@ -4836,7 +4838,7 @@ void func_8009CE64(s32 arg0) {
var_a1 = 1;
break;
default: /* switch 1 */
D_8018E7AC[arg0] = 5;
gTransitionType[arg0] = 5;
break;
}
if (var_a1 != 0) {
@ -4875,14 +4877,14 @@ void func_8009CE64(s32 arg0) {
break;
}
} else {
D_8018E7AC[arg0] = 5;
gTransitionType[arg0] = 5;
}
}
}
}
}
} else {
D_8018E7AC[arg0] = 0;
gTransitionType[arg0] = 0;
if (gDebugMenuSelection != DEBUG_MENU_OPTION_SELECTED) {
switch (gMenuFadeType) { /* switch 3 */
case MENU_FADE_TYPE_MAIN: /* switch 3 */
@ -5098,7 +5100,7 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) {
var_ra = D_8015F480[arg0].screenWidth;
sp44 = D_8015F480[arg0].screenHeight;
}
var_t2 = (D_8018E7D0[arg0] * 0xFF) / D_8018E7B8[arg0];
var_t2 = (gCurrentTransitionTime[arg0] * 0xFF) / gTransitionDuration[arg0];
if (var_t2 >= 0x100) {
var_t2 = 0x000000FF;
}
@ -5113,8 +5115,8 @@ void func_8009D77C(s32 arg0, s32 arg1, s32 arg2) {
gDisplayListHead = draw_box(gDisplayListHead, var_t3 - temp_v1, var_t4 - temp_t8, someMath0, someMath1,
temp_v0_2->red, temp_v0_2->green, temp_v0_2->blue, var_t2);
if (arg1 == 0) {
D_8018E7D0[arg0]++;
if ((D_8018E7B8[arg0] + 1) < D_8018E7D0[arg0]) {
gCurrentTransitionTime[arg0]++;
if ((gTransitionDuration[arg0] + 1) < gCurrentTransitionTime[arg0]) {
func_8009CE64(arg0);
}
}
@ -5168,12 +5170,12 @@ void func_8009D998(s32 arg0) {
void func_8009DAA8(void) {
u32 var_t0;
D_8018E7D0[4]++;
if (D_8018E7D0[4] >= (D_8018E7B8[4] + 1)) {
gCurrentTransitionTime[4]++;
if (gCurrentTransitionTime[4] >= (gTransitionDuration[4] + 1)) {
func_8009CE64(4);
}
gDPPipeSync(gDisplayListHead++);
var_t0 = (D_8018E7D0[4] * 255) / D_8018E7B8[4];
var_t0 = (gCurrentTransitionTime[4] * 255) / gTransitionDuration[4];
if ((s32) var_t0 >= 0x100) {
var_t0 = 0x000000FF;
}
@ -5187,11 +5189,11 @@ void func_8009DB8C(void) {
u32 var_s3;
s32 var_v1;
D_8018E7D0[4]++;
gCurrentTransitionTime[4]++;
// why?
var_v1 = D_8018E7D0[4];
if ((u32) var_v1 >= D_8018E7B8[4]) {
if ((u32) var_v1 == D_8018E7B8[4]) {
var_v1 = gCurrentTransitionTime[4];
if ((u32) var_v1 >= gTransitionDuration[4]) {
if ((u32) var_v1 == gTransitionDuration[4]) {
for (var_s0 = 0; var_s0 < 0x4B0; var_s0++) {
sTKMK00_LowResBuffer[var_s0] = 1;
}
@ -5201,8 +5203,9 @@ void func_8009DB8C(void) {
} else {
var_s0 = 0;
var_s3 = 0;
while (var_s3 < (0x4B0U / D_8018E7B8[4])) {
if ((sTKMK00_LowResBuffer[var_s0] == 0) && (random_int((0x4B0U - D_8018E7D0[4]) / D_8018E7B8[4]) == 0)) {
while (var_s3 < (0x4B0U / gTransitionDuration[4])) {
if ((sTKMK00_LowResBuffer[var_s0] == 0) &&
(random_int((0x4B0U - gCurrentTransitionTime[4]) / gTransitionDuration[4]) == 0)) {
var_s3 += 1;
sTKMK00_LowResBuffer[var_s0] = 1;
}
@ -5224,7 +5227,7 @@ void func_8009DB8C(void) {
}
}
gDPPipeSync(gDisplayListHead++);
var_v1 = (D_8018E7D0[4] * 255) / D_8018E7B8[4];
var_v1 = (gCurrentTransitionTime[4] * 255) / gTransitionDuration[4];
if (var_v1 >= 0x100) {
var_v1 = 0x000000FF;
}
@ -5235,11 +5238,11 @@ void func_8009DEF8(u32 arg0, u32 arg1) {
if (arg0 == 0) {
arg0 = 1;
}
if ((D_8018E7AC[4] != 1) && (D_8018E7AC[4] != 6)) {
D_8018E7AC[4] = arg1;
D_8018E7B8[4] = arg0;
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0xFFU;
if ((gTransitionType[4] != 1) && (gTransitionType[4] != 6)) {
gTransitionType[4] = arg1;
gTransitionDuration[4] = arg0;
if (gTransitionDuration[4] >= 0x100U) {
gTransitionDuration[4] = 0xFFU;
}
D_8018E7E0 = 0;
}
@ -5257,11 +5260,11 @@ void func_8009DF8C(u32 arg0, u32 arg1) {
if (arg0 == 0) {
arg0 = 1;
}
if ((D_8018E7AC[4] != 2) && (D_8018E7AC[4] != 5)) {
D_8018E7AC[4] = arg1;
D_8018E7B8[4] = arg0;
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0xFFU;
if ((gTransitionType[4] != 2) && (gTransitionType[4] != 5)) {
gTransitionType[4] = arg1;
gTransitionDuration[4] = arg0;
if (gTransitionDuration[4] >= 0x100U) {
gTransitionDuration[4] = 0xFFU;
}
D_8018E7E0 = 0;
}
@ -5282,14 +5285,14 @@ void func_8009E020(s32 arg0, s32 arg1) {
arg1 = 1;
}
temp = D_8018E7AC[arg0];
temp = gTransitionType[arg0];
if ((temp != 1) && (temp != 6)) {
D_8018E7AC[arg0] = 1;
D_8018E7B8[arg0] = arg1;
gTransitionType[arg0] = 1;
gTransitionDuration[arg0] = arg1;
if ((u32) arg1 >= 0x100U) {
D_8018E7B8[arg0] = 0xFF;
gTransitionDuration[arg0] = 0xFF;
}
D_8018E7D0[arg0] = 0;
gCurrentTransitionTime[arg0] = 0;
}
}
@ -5300,25 +5303,25 @@ void func_8009E088(s32 arg0, s32 arg1) {
arg1 = 1;
}
temp = D_8018E7AC[arg0];
temp = gTransitionType[arg0];
if ((temp != 2) && (temp != 5)) {
D_8018E7AC[arg0] = 2;
D_8018E7B8[arg0] = arg1;
gTransitionType[arg0] = 2;
gTransitionDuration[arg0] = arg1;
if ((u32) arg1 >= 0x100U) {
D_8018E7B8[arg0] = 0xFF;
gTransitionDuration[arg0] = 0xFF;
}
D_8018E7D0[arg0] = 0;
gCurrentTransitionTime[arg0] = 0;
}
}
void func_8009E0F0(s32 arg0) {
s32 var_v0;
if (D_8018E7AC[4] != 3) {
D_8018E7AC[4] = 3;
D_8018E7B8[4] = arg0;
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0x000000FF;
if (gTransitionType[4] != 3) {
gTransitionType[4] = 3;
gTransitionDuration[4] = arg0;
if (gTransitionDuration[4] >= 0x100U) {
gTransitionDuration[4] = 0x000000FF;
}
D_8018E7E0 = 0;
for (var_v0 = 0; var_v0 < 0x4B0; var_v0++) {
@ -5328,11 +5331,11 @@ void func_8009E0F0(s32 arg0) {
}
void func_8009E17C(u32 arg0) {
if (D_8018E7AC[4] != 4) {
D_8018E7AC[4] = 4;
D_8018E7B8[4] = arg0;
if (D_8018E7B8[4] >= 0x100U) {
D_8018E7B8[4] = 0x000000FFU;
if (gTransitionType[4] != 4) {
gTransitionType[4] = 4;
gTransitionDuration[4] = arg0;
if (gTransitionDuration[4] >= 0x100U) {
gTransitionDuration[4] = 0x000000FFU;
}
D_8018E7E0 = 0;
}

12
src/menu_items.h
View File

@ -455,9 +455,9 @@ Gfx* func_8009C708(Gfx*, struct_8018DEE0_entry*, s32, s32, s32, s32);
void func_8009C918(void);
void func_8009CA2C(void);
void func_8009CA6C(s32);
void func_8009CBE4(s32, s32, s32);
void func_8009CDDC(s32, s32);
void func_8009CDFC(s32, s32);
void draw_fade_in(s32, s32, s32);
void draw_black_fade_in(s32, s32);
void draw_white_fade_in(s32, s32);
void func_8009CE1C(void);
void func_8009CE64(s32);
void func_8009D77C(s32, s32, s32);
@ -676,9 +676,9 @@ extern Gfx* sGfxPtr;
extern s32 gNumD_8018E768Entries;
extern struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
extern s32 gCycleFlashMenu;
extern s8 D_8018E7AC[];
extern u32 D_8018E7B8[];
extern u32 D_8018E7D0[];
extern s8 gTransitionType[];
extern u32 gTransitionDuration[];
extern u32 gCurrentTransitionTime[];
extern s32 D_8018E7E0;
extern struct UnkStruct_8018E7E8 D_8018E7E8[D_8018E7E8_SIZE];
extern struct UnkStruct_8018E7E8 D_8018E810[D_8018E810_SIZE];

3
src/menus.c
View File

@ -2040,7 +2040,8 @@ void set_sound_mode(void) {
* interacted while a fade transition is active
*/
bool is_screen_being_faded(void) {
if ((D_8018E7AC[4] == 2) || (D_8018E7AC[4] == 3) || (D_8018E7AC[4] == 4) || (D_8018E7AC[4] == 7)) {
if ((gTransitionType[4] == 2) || (gTransitionType[4] == 3) || (gTransitionType[4] == 4) ||
(gTransitionType[4] == 7)) {
return true;
}
return false;