mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-16 04:43:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

some rename

Browse Source
This commit is contained in:
coco875
2024-09-17 09:44:18 +02:00
parent 6da6598cc6
commit 4915880dd5
7 changed files with 635 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+576 -566
View File
File diff suppressed because it is too large Load Diff
src/code_80091750.h
+13 -13
View File
@@ -22,9 +22,9 @@ it last longer See `func_80096CD8` for the actual drawing of the static
*/
typedef struct {
/* 0x00 */ s32 type; // id maybe?
/* 0x04 */ s32 cursor; // sound mode, maybe some other stuff
/* 0x08 */ s32 unk8; // This is used but I can't tell what for
/* 0x00 */ s32 type; // id maybe?
/* 0x04 */ s32 state; // sound mode, maybe some other stuff
/* 0x08 */ s32 unk8; // This is used but I can't tell what for
/* 0x0C */ s32 column;
/* 0x10 */ s32 row;
/* 0x14 */ u8 priority; // priority/depth/z-level. Higher values are drawn on top of lower values
@@ -124,8 +124,8 @@ s32 get_string_width(char*);
void set_text_color(s32);
void func_800930E4(s32, s32, char*);
void print_text0(s32, s32, char*, s32, f32, f32, s32);
void func_80093324(s32, s32, char*, s32, f32, f32);
void func_80093358(s32, s32, char*, s32, f32, f32);
void print_text_mode_1(s32, s32, char*, s32, f32, f32);
void print_text_mode_2(s32, s32, char*, s32, f32, f32);
void print_text1(s32, s32, char*, s32, f32, f32, s32);
void func_800936B8(s32, s32, char*, s32, f32, f32);
void draw_text(s32, s32, char*, s32, f32, f32);
@@ -494,7 +494,7 @@ extern char* gDebugCourseNames[];
extern const s8 gPerCupIndexByCourseId[]; // D_800EFD50
extern const s8 D_800EFD64[];
extern s8 gCupSelectionByCourseId[];
extern char* D_800E7678[];
extern char* gCupText[];
extern char* gDebugCharacterNames[];
extern char* D_800E76A8[];
extern char* D_800E76CC[];
@@ -502,12 +502,12 @@ extern char* D_800E76DC[];
extern char* gDebugScreenModeNames[];
extern char* gDebugSoundModeNames[];
extern char* gSoundModeNames[]; // D_800E7710
extern char* D_800E7720[];
extern char* D_800E7728[];
extern char* D_800E7730;
extern char* D_800E7734[];
extern char* gWinLoseText[];
extern char* gBestTimeText[];
extern char* gLapTimeText;
extern char* gPrefixTimeText[];
extern char* D_800E7744[];
extern char* gTextPauseButton[];
extern char* gMenuText[];
extern char* D_800E7778[];
extern char D_800E7780[];
extern char* D_800E77A0[];
@@ -517,7 +517,7 @@ extern char D_800E77D8[];
extern char* sCourseLengths[];
extern char* D_800E7834[];
extern char* D_800E7840[];
extern char* D_800E7848[];
extern char* gEraseBestGhostText[];
extern char* D_800E7860[];
extern char* D_800E7868[];
extern char* D_800E7878[];
@@ -545,7 +545,7 @@ extern char* D_800E7A80[];
extern char* D_800E7A88[];
extern char* D_800E7A98;
extern char* D_800E7A9C[];
extern char* D_800E7AA4[];
extern char* gPlaceText[];
extern const s8 gGPPointRewards[];
extern const s8 D_800F0B1C[];
extern const s8 D_800F0B28[];
src/menus.c
+11 -11
View File
@@ -252,20 +252,20 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp2C = true;
sp38->unk8 = -1;
}
if (sp2C && gSoundMode != sp38->cursor) {
if (sp2C && gSoundMode != sp38->state) {
gSaveData.main.saveInfo.soundMode = gSoundMode;
write_save_data_grand_prix_points_and_sound_mode();
update_save_data_backup();
sp38->cursor = gSoundMode;
sp38->state = gSoundMode;
}
if (btnAndStick & B_BUTTON) {
func_8009E280();
play_sound2(SOUND_MENU_GO_BACK);
if (gSoundMode != sp38->cursor) {
if (gSoundMode != sp38->state) {
gSaveData.main.saveInfo.soundMode = gSoundMode;
write_save_data_grand_prix_points_and_sound_mode();
update_save_data_backup();
sp38->cursor = gSoundMode;
sp38->state = gSoundMode;
}
return;
}
@@ -305,7 +305,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
switch (sp2C) {
case PFS_INVALID_DATA:
D_8018EDEC = 0x46;
sp38->cursor = 0;
sp38->state = 0;
play_sound2(SOUND_MENU_SELECT);
break;
case PFS_NO_ERROR:
@@ -482,7 +482,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
D_8018EDEC = 0x38;
} else {
D_8018EDEC = 0x3A;
sp38->cursor = 0;
sp38->state = 0;
}
play_sound2(SOUND_MENU_SELECT);
}
@@ -534,7 +534,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
} else {
D_8018EDEC = 0x3A;
play_sound2(SOUND_MENU_SELECT);
sp38->cursor = 0;
sp38->state = 0;
}
}
// return?
@@ -542,9 +542,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x3A: {
if (arg1 == 0) {
sp38->cursor += 1;
sp38->state += 1;
}
if (sp38->cursor >= 3) {
if (sp38->state >= 3) {
D_8018EDEC = 0x3B;
}
break;
@@ -576,9 +576,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x46: {
if (arg1 == 0) {
sp38->cursor += 1;
sp38->state += 1;
}
if (sp38->cursor >= 3) {
if (sp38->state >= 3) {
D_8018EDEC = 0x47;
}
break;