4 new matches and some potentially tricky merges (#415)

* Match func_8006DCF8

* use enums

* Match func_8002FD74

* Match func_8008B4C8

* Documenting...

* WIP func_8008B758

* Nearly have func_8008B758

* Match func_8008B758

* Renaming, documenting, and cleanup

* Warning Fixes

* Update score
This commit is contained in:
Ryan Myers
2023-10-06 10:34:59 -04:00
committed by GitHub
parent 2149dedfd4
commit 4d3a6bf21b
13 changed files with 415 additions and 1258 deletions
+3
View File
@@ -5,6 +5,9 @@
// Interestingly, there's two unused ID's for each set, implying two characters that were cut.
#define SOUND_VOICE_CHARACTER_POSITIVE SOUND_VOICE_KRUNCH_POSITIVE1
#define SOUND_VOICE_CHARACTER_NEGATIVE SOUND_VOICE_KRUNCH_NEGATIVE1
#define SOUND_VOICE_CHARACTER_DESELECTED SOUND_VOICE_KRUNCH_EHH
#define SOUND_VOICE_CHARACTER_SELECTED SOUND_VOICE_KRUNCH_POSITIVE6
#define SOUND_VOICE_CHARACTER_SELECT SOUND_VOICE_KRUNCH_SELECT
#define SOUND_HORN_CHARACTER SOUND_HORN_KRUNCH
#define SOUND_NUMBER_OF_RACERS 8
+16 -5
View File
@@ -166,11 +166,22 @@ typedef struct MenuElement {
/* 0x14 */ u16 *numberU16; // Pointer to a number to be displayed on the screen.
/* 0x14 */ s32 value; // Some value for elementType == 5
} unk14_a;
// Element Background Color/Transparency
/* 0x18 */ s16 backgroundRed;
/* 0x1A */ s16 backgroundGreen;
/* 0x1C */ s16 backgroundBlue;
/* 0x1E */ s16 backgroundAlpha; // 0x0000 = No background, 0x00FF = full background color.
union {
struct {
// Element Background Color/Transparency
/* 0x18 */ s16 backgroundRed;
/* 0x1A */ s16 backgroundGreen;
/* 0x1C */ s16 backgroundBlue;
/* 0x1E */ s16 backgroundAlpha; // 0x0000 = No background, 0x00FF = full background color.
} background;
struct {
// Texture Size
/* 0x18 */ s16 width;
/* 0x1A */ s16 height;
/* 0x1C */ s16 borderWidth;
/* 0x1E */ s16 borderHeight;
} texture;
} details;
} MenuElement;
#define TEX_FORMAT_RGBA32 0