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

continue rename

Browse Source
This commit is contained in:
coco875
2024-09-23 09:43:05 +02:00
parent 97be909a6e
commit 7c85cac331
7 changed files with 2235 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+282 -251
View File
File diff suppressed because it is too large Load Diff
src/code_80091750.h
+60 -60
View File
@@ -27,9 +27,9 @@ typedef struct {
/* 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
// If equal, later entries in gMenuItems are on top
/* 0x15 */ u8 visible; // active? If 1 its displayed, if 0 its not
/* 0x14 */ u8 priority; // priority/depth/z-level. Higher values are drawn on top of lower values
// If equal, later entries in gMenuItems are on top
/* 0x15 */ bool8 visible; // active? If 1 its displayed, if 0 its not
// These seem to be generic space available for use by the struct, no 1 purpose for any given member
/* 0x16 */ s16 unk16; // Potentially unused
/* 0x18 */ s32 D_8018DEE0_index; // Index in D_8018DEE0, an array of some other struct type
@@ -49,12 +49,12 @@ typedef struct {
} struct_8018DEE0_entry; // size = 0x18
typedef struct {
/* 0x0 */ MkTexture* texture;
/* 0x0 */ MenuTexture* texture;
/* 0x4 */ s32 unk_4;
} struct_8018E060_entry; // size = 0x8
typedef struct {
/* 0x0 */ MkTexture* mk64Texture;
/* 0x0 */ MenuTexture* mk64Texture;
/* 0x4 */ s16 unk4;
/* 0x6 */ s16 unk6;
} struct_8018E0E8_entry; // size = 0x8
@@ -71,7 +71,7 @@ typedef struct {
} TextureMap; // size = 0x08
typedef struct {
/* 0x00 */ MkTexture* textures;
/* 0x00 */ MenuTexture* textures;
/* 0x04 */ Gfx* displayList;
} struct_8018E768_entry; // size = 0x08
@@ -120,9 +120,9 @@ enum D_8018D9E0_type {
UNUSED_TYPE_004,
START_MENU_TEXT_BOX,
MAIN_MENU_GAME_SELECT = 0xA,
D_8018D9E0_TYPE_00B,
D_8018D9E0_TYPE_00C,
D_8018D9E0_TYPE_00D,
MAIN_MENU_1P_GAME,
MAIN_MENU_2P_GAME,
MAIN_MENU_3P_GAME,
MAIN_MENU_4P_GAME,
MAIN_MENU_OK,
MAIN_MENU_OPTION,
@@ -137,17 +137,17 @@ enum D_8018D9E0_type {
MAIN_MENU_TIME_TRIALS_DATA,
D_8018D9E0_TYPE_01B = 0x1B,
MAIN_MENU_BACKGROUND = 0x23,
D_8018D9E0_TYPE_024,
D_8018D9E0_TYPE_025,
CHARACTER_SELECT_BACKGROUND,
COURSE_SELECT_BACKGROUND,
CHARACTER_SELECT_MENU_PLAYER_SELECT_BANNER = 0x2A,
CHARACTER_SELECT_MENU_MARIO,
D_8018D9E0_TYPE_02C,
D_8018D9E0_TYPE_02D,
D_8018D9E0_TYPE_02E,
D_8018D9E0_TYPE_02F,
D_8018D9E0_TYPE_030,
D_8018D9E0_TYPE_031,
D_8018D9E0_TYPE_032,
CHARACTER_SELECT_MENU_LUIGI,
CHARACTER_SELECT_MENU_TOAD,
CHARACTER_SELECT_MENU_PEACH,
CHARACTER_SELECT_MENU_YOSHI,
CHARACTER_SELECT_MENU_DK,
CHARACTER_SELECT_MENU_WARIO,
CHARACTER_SELECT_MENU_BOWSER,
CHARACTER_SELECT_MENU_OK,
CHARACTER_SELECT_MENU_1P_CURSOR,
CHARACTER_SELECT_MENU_2P_CURSOR,
@@ -163,9 +163,9 @@ enum D_8018D9E0_type {
D_8018D9E0_TYPE_050 = 0x50,
COURSE_SELECT_MAP_SELECT = 0x52,
COURSE_SELECT_MUSHROOM_CUP,
D_8018D9E0_TYPE_054,
D_8018D9E0_TYPE_055,
D_8018D9E0_TYPE_056,
COURSE_SELECT_FLOWER_CUP,
COURSE_SELECT_STAR_CUP,
COURSE_SELECT_SPECIAL_CUP,
D_8018D9E0_TYPE_058 = 0x58,
COURSE_SELECT_COURSE_NAMES,
D_8018D9E0_TYPE_05A,
@@ -400,19 +400,19 @@ Gfx* func_80098FC8(Gfx*, s32, s32, s32, s32);
void dma_copy_base_729a30(u64*, size_t, void*);
void dma_copy_base_7fa3c0(u64*, size_t, void*);
void func_80099110(void);
void load_menu_img(MkTexture*);
void load_menu_img(MenuTexture*);
void* segmented_to_virtual_dupe(const void*);
void* segmented_to_virtual_dupe_2(const void*);
void load_img_wrap(MkTexture*);
void load_menu_img2(MkTexture*, s32);
void func_80099958(MkTexture*, s32, s32);
void load_img_wrap(MenuTexture*);
void load_menu_img2(MenuTexture*, s32);
void func_80099958(MenuTexture*, s32, s32);
void func_80099E54(void);
void func_80099E60(MkTexture*, s32, s32);
void func_80099E60(MenuTexture*, s32, s32);
void func_80099EC4(void);
void func_80099A70(void);
void func_80099A94(MkTexture*, s32);
void func_80099A94(MenuTexture*, s32);
void func_80099AEC(void);
void func_8009A238(MkTexture*, s32);
void func_8009A238(MenuTexture*, s32);
void func_8009A2F0(struct_8018E0E8_entry*);
void func_8009A344(void);
s32 animate_character_select_menu(MkAnimation*);
@@ -422,8 +422,8 @@ void func_8009A640(s32, s32, s32, MkAnimation*);
void func_8009A6D4(void);
void func_8009A76C(s32, s32, s32, s32);
void func_8009A7EC(s32, s32, s32, s32, s32);
MkTexture* func_8009A878(struct_8018DEE0_entry*);
MkTexture* func_8009A944(struct_8018DEE0_entry*, s32);
MenuTexture* func_8009A878(struct_8018DEE0_entry*);
MenuTexture* func_8009A944(struct_8018DEE0_entry*, s32);
void func_8009A9FC(s32, s32, u32, s32);
void func_8009AB7C(s32);
void func_8009AD78(s32, s32);
@@ -431,13 +431,13 @@ void convert_img_to_greyscale(s32, u32);
void adjust_img_colour(s32, s32, s32, s32, s32);
u16* func_8009B8C4(u64*);
void func_8009B938(void);
void func_8009B954(MkTexture*);
void func_8009B954(MenuTexture*);
void func_8009B998(void);
Gfx* func_8009B9D0(Gfx*, MkTexture*);
Gfx* func_8009BA74(Gfx*, MkTexture*, s32, s32);
Gfx* func_8009BC9C(Gfx*, MkTexture*, s32, s32, s32, s32);
Gfx* print_letter(Gfx*, MkTexture*, f32, f32, s32, f32, f32);
Gfx* func_8009C204(Gfx*, MkTexture*, s32, s32, s32);
Gfx* func_8009B9D0(Gfx*, MenuTexture*);
Gfx* func_8009BA74(Gfx*, MenuTexture*, s32, s32);
Gfx* func_8009BC9C(Gfx*, MenuTexture*, s32, s32, s32, s32);
Gfx* print_letter(Gfx*, MenuTexture*, f32, f32, s32, f32, f32);
Gfx* func_8009C204(Gfx*, MenuTexture*, s32, s32, s32);
Gfx* func_8009C434(Gfx*, struct_8018DEE0_entry*, s32, s32, s32);
Gfx* func_8009C708(Gfx*, struct_8018DEE0_entry*, s32, s32, s32, s32);
void func_8009C918(void);
@@ -475,7 +475,7 @@ void func_8009E5BC(void);
void func_8009E5FC(s32);
void func_8009E620(void);
void add_ui_element(s32, s32, s32, s8);
void func_8009F5E0(MenuItem*);
void menu_item_render(MenuItem*);
void func_800A08D8(u8, s32, s32);
s32 func_800A095C(char*, s32, s32, s32);
void func_800A09E0(MenuItem*);
@@ -486,7 +486,7 @@ void func_800A0EB8(MenuItem*, s32);
void func_800A0FA4(MenuItem*, s32);
void func_800A10CC(MenuItem*);
void func_800A11D0(MenuItem*, s32, s32);
void func_800A12BC(MenuItem*, MkTexture*);
void func_800A12BC(MenuItem*, MenuTexture*);
void func_800A1350(MenuItem*);
void func_800A143C(MenuItem*, s32);
void func_800A1500(MenuItem*);
@@ -779,32 +779,32 @@ extern const s8 D_800F0B50[];
extern const s8 D_800F0B54[];
extern RGBA16 D_800E7AC8[];
extern RGBA16 D_800E7AE8[];
extern MkTexture* D_800E7AF8[];
extern MkTexture* D_800E7D0C[];
extern MenuTexture* D_800E7AF8[];
extern MenuTexture* D_800E7D0C[];
extern MkAnimation* D_800E7D34[];
extern MkTexture* D_800E7D4C[];
extern MkTexture* D_800E7D54[];
extern MkTexture* D_800E7D74[];
extern MkTexture* D_800E7DC4[];
extern MenuTexture* gMenuTexturesBackground[];
extern MenuTexture* D_800E7D54[];
extern MenuTexture* D_800E7D74[];
extern MenuTexture* D_800E7DC4[];
extern MkAnimation* D_800E7E14[];
extern MkAnimation* D_800E7E20[];
extern MkAnimation* D_800E7E34[];
extern MkTexture* gGlyphTextureLUT[];
extern MkTexture* D_800E7FF0[];
extern MkTexture* D_800E80A0[];
extern MkTexture* D_800E8114[];
extern MkTexture* D_800E8174[];
extern MkTexture* D_800E817C[];
extern MkTexture* D_800E81E4[];
extern MkTexture* D_800E822C[];
extern MkTexture* D_800E8234[];
extern MkTexture* D_800E824C[];
extern MkTexture* D_800E8254[];
extern MkTexture* D_800E8274[];
extern MkTexture* D_800E8294[];
extern MkTexture* D_800E82B4[];
extern MkTexture* D_800E82C4[];
extern MkTexture* D_800E82F4[];
extern MenuTexture* gGlyphTextureLUT[];
extern MenuTexture* D_800E7FF0[];
extern MenuTexture* D_800E80A0[];
extern MenuTexture* D_800E8114[];
extern MenuTexture* D_800E8174[];
extern MenuTexture* D_800E817C[];
extern MenuTexture* D_800E81E4[];
extern MenuTexture* D_800E822C[];
extern MenuTexture* D_800E8234[];
extern MenuTexture* D_800E824C[];
extern MenuTexture* D_800E8254[];
extern MenuTexture* D_800E8274[];
extern MenuTexture* D_800E8294[];
extern MenuTexture* D_800E82B4[];
extern MenuTexture* gMenuTexturesTrackSelection[];
extern MenuTexture* D_800E82F4[];
extern MkAnimation* D_800E8320[];
extern MkAnimation* D_800E8340[];
extern MkAnimation* D_800E8360[];
src/data/textures.c
+1253 -1253
View File
File diff suppressed because it is too large Load Diff
src/menus.c
+1 -1
View File
@@ -1380,7 +1380,7 @@ void main_menu_act(struct Controller* controller, u16 arg1) {
// L800B3068
if (btnAndStick & D_JPAD) {
sp24 = false;
if (func_800B555C()) {
if (has_terminate_150cc()) {
if (sp28 < gGameModePlayerColumnExtra[gPlayerCount - 1][D_800E86AC[gPlayerCount - 1] + 1]) {
sp24 = true;
}
src/save.c
+7 -7
View File
@@ -423,21 +423,21 @@ u8 func_800B5508(s32 cup, s32 ccGrandPrixPoints, s32 points_scored) {
// Check if all 4 cups have gold cups scored
// for a given CC mode
s32 func_800B5530(s32 cc_mode) {
bool has_terminate_cc_mode(s32 cc_mode) {
if (gSaveData.main.saveInfo.grandPrixPoints[cc_mode] == 0xFF) {
return 1;
return true;
}
return 0;
return false;
}
// Check if the 150CC mode has all 4 gold cups
s32 func_800B555C(void) {
return func_800B5530(CC_150);
s32 has_terminate_150cc(void) {
return has_terminate_cc_mode(CC_150);
}
// Check if the Extra mode has all 4 gold cups
s32 func_800B557C(void) {
return func_800B5530(CC_EXTRA);
s32 has_terminate_cc_extra(void) {
return has_terminate_cc_mode(CC_EXTRA);
}
void func_800B559C(s32 arg0) {
src/save.h
+3 -3
View File
@@ -54,9 +54,9 @@ void func_800B5404(s32, s32);
u8 func_800B54C0(s32, s32);
u8 func_800B54EC(s32, s32);
u8 func_800B5508(s32, s32, s32);
s32 func_800B5530(s32);
s32 func_800B555C(void);
s32 func_800B557C(void);
s32 has_terminate_cc_mode(s32);
s32 has_terminate_150cc(void);
s32 has_terminate_cc_extra(void);
void func_800B559C(s32);
s32 func_800B578C(s32);
s32 func_800B5888(s32);
src/textures.h
+629 -629
View File
File diff suppressed because it is too large Load Diff