rename code_80091750 to menu_item

Makefile

@@ -244,7 +244,7 @@ include $(MAKEFILE_SPLIT)
 # These are files that need to be encoded into EUC-JP in order for the ROM to match
 # We filter them out from the regular C_FILES since we don't need nor want the
 # UTF-8 versions getting compiled
-EUC_JP_FILES := src/ending/credits.c src/code_80005FD0.c src/code_80091750.c
+EUC_JP_FILES := src/ending/credits.c src/code_80005FD0.c src/menu_item.c
 C_FILES := $(filter-out %.inc.c,$(filter-out $(EUC_JP_FILES),$(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))))
 S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
 # Include source files in courses/course_name/files.c but exclude .inc.c files.

ctx_includes.c

@@ -73,7 +73,7 @@
 #include "src/update_objects.h"
 #include "src/code_80086E70.h"
 #include "src/code_80091440.h"
-#include "src/code_80091750.h"
+#include "src/menu_item.h"
 #include "src/code_800AF9B0.h"
 #include <assets/common_data.h>
 #include <assets/data_800E45C0.h>

enhancements/flycam.patch

@@ -27,7 +27,7 @@ index 70f4820..f36f11c 100644
           BUILD_DIR/src/debug/crash_screen_enhancement.o(.rodata);
           BUILD_DIR/src/debug/debug.o(.rodata);
 @@ -311,6 +314,7 @@ SECTIONS
-       BUILD_DIR/src/code_80091750.jp.o(.bss);
+       BUILD_DIR/src/menu_item.jp.o(.bss);
        BUILD_DIR/src/code_800AF9B0.o(.bss);
        BUILD_DIR/src/menus.o(.bss);
 +      BUILD_DIR/src/flycam.o(.bss);

m2c_helper.sh

@@ -5,7 +5,7 @@
 # Utility to aid in the generation of m2c output for specific functions
 #
 # example usages:
-#  m2c_helper.sh code_80091750 func_800AAC18
+#  m2c_helper.sh menu_item func_800AAC18
 #  m2c_helper.sh audio/load audio_init
 #
 # Be sure to set DISASSEMBLY_FILE to a filename you are comfortable with.

mk64.ld

@@ -71,7 +71,7 @@ SECTIONS
       BUILD_DIR/src/code_80086E70.o(.text*);
       BUILD_DIR/src/effects.o(.text*);
       BUILD_DIR/src/code_80091440.o(.text*);
-      BUILD_DIR/src/code_80091750.jp.o(.text*);
+      BUILD_DIR/src/menu_item.jp.o(.text*);
       BUILD_DIR/src/code_800AF9B0.o(.text*);
       BUILD_DIR/src/menus.o(.text*);
       BUILD_DIR/src/save.o(.text*);
@@ -232,7 +232,7 @@ SECTIONS
       BUILD_DIR/src/data/some_data.o(.data*);
       BUILD_DIR/src/effects.o(.data*);
       BUILD_DIR/src/code_80091440.o(.data*);
-      BUILD_DIR/src/code_80091750.jp.o(.data*);
+      BUILD_DIR/src/menu_item.jp.o(.data*);
       BUILD_DIR/src/code_800AF9B0.o(.data*);
       BUILD_DIR/src/menus.o(.data*);
       BUILD_DIR/src/save.o(.data*);
@@ -284,7 +284,7 @@ SECTIONS
       BUILD_DIR/src/code_80086E70.o(.rodata*);
       BUILD_DIR/src/effects.o(.rodata*);
       BUILD_DIR/src/code_80091440.o(.rodata*);
-      BUILD_DIR/src/code_80091750.jp.o(.rodata*);
+      BUILD_DIR/src/menu_item.jp.o(.rodata*);
       BUILD_DIR/src/code_800AF9B0.o(.rodata*);
       BUILD_DIR/src/menus.o(.rodata*);
       BUILD_DIR/src/save.o(.rodata*);
@@ -335,7 +335,7 @@ SECTIONS
       BUILD_DIR/src/code_80057C60.o(.bss*);
       BUILD_DIR/src/code_80057C60_var.o(.bss*);
       BUILD_DIR/src/effects.o(.bss*);
-      BUILD_DIR/src/code_80091750.jp.o(.bss*);
+      BUILD_DIR/src/menu_item.jp.o(.bss*);
       BUILD_DIR/src/code_800AF9B0.o(.bss*);
       BUILD_DIR/src/menus.o(.bss*);
       BUILD_DIR/src/save.o(.bss*);

safe_gcc.mk

@@ -7,7 +7,7 @@ SAFE_C_FILES :=    \
     build/us/src/code_80091440.o    \
     build/us/src/effects.o    \
     build/us/src/code_80057C60_var.o    \
-    build/us/src/code_80091750.o    \
+    build/us/src/menu_item.o    \
     build/us/src/code_800029B0.o    \
     build/us/src/animation.o    \
     build/us/src/player_controller.o    \

src/audio/external.c

@@ -11,7 +11,7 @@
 #include "audio/port_eu.h"
 #include "code_800029B0.h"
 #include "code_80005FD0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 
 s8 D_8018EF10;
 UnkStruct8018EF18 D_8018EF18[16];

src/buffers.h

@@ -23,7 +23,7 @@ typedef struct {
 
 /*
  * In render_player, spawn_players, and staff_ghosts D_802BFB80 is the arraySize8 entry
- * But in code_80091750 its the arraySize4 entry
+ * But in menu_item its the arraySize4 entry
  * The only way to unify those 2 things is to use a union
  */
 typedef union {

src/code_800029B0.c

@@ -12,7 +12,7 @@
 #include <defines.h>
 #include "collision.h"
 #include "memory.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "skybox_and_splitscreen.h"
 #include "code_8006E9C0.h"
 #include "spawn_players.h"

src/code_80005FD0.c

@@ -24,7 +24,7 @@
 #include <common_structs.h>
 #include "main.h"
 #include "menus.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "audio/external.h"
 #include "ending/podium_ceremony_actors.h"
 #include "spawn_players.h"

src/code_8006E9C0.c

@@ -22,7 +22,7 @@
 #include "menus.h"
 #include "data/other_textures.h"
 #include "render_objects.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "src/data/some_data.h"
 #include "effects.h"
 
@@ -127,7 +127,8 @@ u8* dma_copy_base_misc_textures(u8* devAddr, u8* baseAddress, u32 size, u32 offs
 }
 
 void load_game_logo(void) {
-    gGameLogoAddress = dma_copy_base_misc_textures((u8*) &gTextureLogoMarioKart64, (u8*) gMenuTextureBuffer, 0x79E1, 0x20000);
+    gGameLogoAddress =
+        dma_copy_base_misc_textures((u8*) &gTextureLogoMarioKart64, (u8*) gMenuTextureBuffer, 0x79E1, 0x20000);
 }
 
 // Some kind of initalization for the Item Window part of the HUD

src/code_800AF9B0.c

@@ -4,7 +4,7 @@
 
 #include "code_800AF9B0.h"
 
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "memory.h"
 #include "main.h"
 #include "math_util.h"

src/data/textures.c

@@ -2,7 +2,7 @@
  * @file textures.c
  * @brief Texture data.
  * start in ram 0x801978D0
- * look like link to code_80091750
+ * look like link to menu_item
  */
 #include "textures.h"
 

src/debug/all_variables.h

@@ -22,7 +22,7 @@
 #include <code_80086E70.h>
 #include <effects.h>
 #include <code_80091440.h>
-#include <code_80091750.h>
+#include <menu_item.h>
 #include <code_800AF9B0.h>
 #include <save.h>
 #include <code_80280000.h>

src/effects.c

@@ -16,7 +16,7 @@
 #include "effects.h"
 #include "audio/external.h"
 #include "spawn_players.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 
 s32 D_8018D900[8];
 s16 D_8018D920[8];

src/ending/ceremony_and_credits.c

@@ -18,7 +18,7 @@
 #include "audio/external.h"
 #include <sounds.h>
 #include "podium_ceremony_actors.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_80057C60.h"
 #include "defines.h"
 

src/ending/code_80280000.c

@@ -14,7 +14,7 @@
 #include "code_80280000.h"
 #include "code_80281780.h"
 #include "skybox_and_splitscreen.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_8006E9C0.h"
 #include "code_800029B0.h"
 #include "ceremony_and_credits.h"

src/ending/code_80281780.c

@@ -16,7 +16,7 @@
 #include "collision.h"
 #include "code_80281C40.h"
 #include "code_800029B0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "main.h"
 #include "menus.h"
 #include "render_courses.h"

src/ending/code_80281C40.c

@@ -8,7 +8,7 @@
 #include "skybox_and_splitscreen.h"
 #include "render_objects.h"
 #include "code_80057C60.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "podium_ceremony_actors.h"
 #include "ceremony_and_credits.h"
 #include "podium_ceremony_actors.h"

src/main.c

@@ -27,7 +27,7 @@
 #include "code_800029B0.h"
 #include "code_80280000.h"
 #include "podium_ceremony_actors.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_80057C60.h"
 #include "profiler.h"
 #include "player_controller.h"

src/menu_item.c

@@ -6,7 +6,7 @@
 #include <PR/ultratypes.h>
 #include <sounds.h>
 #include "code_800029B0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_80005FD0.h"
 #include "code_8006E9C0.h"
 #include "menus.h"
@@ -56,7 +56,7 @@ s8 D_8018D9D9;
 MenuItem gMenuItems[MENU_ITEMS_MAX];
 struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE];
 struct_8018E060_entry D_8018E060[D_8018E060_SIZE];
-UNUSED u8 code_80091750_bss_padding0[8];
+UNUSED u8 menu_item_bss_padding0[8];
 struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE];
 s32 sMenuTextureBufferIndex;
 TextureMap sMenuTextureMap[TEXTURE_MAP_MAX];
@@ -89,7 +89,7 @@ s32 gControllerPak1MaxWriteableFiles;
 s32 gControllerPak1NumPagesFree;
 s32 gControllerPak1FileNote;
 s32 gControllerPak2FileNote;
-s32 code_80091750_bss_pad2;
+s32 menu_item_bss_pad2;
 ALIGNED8 SaveData gSaveData;
 
 u8 D_8018ED90;
@@ -1136,7 +1136,7 @@ f64 func_8009195C(f64 arg0) {
     return func_80091A6C((temp_f2 + arg0) / (temp_f2 - arg0), temp_f10);
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009195C.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_8009195C.s")
 #endif
 
 /**
@@ -2995,7 +2995,7 @@ Gfx* func_80096CD8(Gfx* displayListHead, s32 arg1, s32 arg2, u32 width, u32 arg4
     return displayListHead;
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80096CD8.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_80096CD8.s")
 #endif
 
 #ifdef NON_MATCHING
@@ -3106,7 +3106,7 @@ Gfx* func_80097274(Gfx* displayListHead, s8 arg1, s32 arg2, s32 arg3, s32 arg4,
     return displayListHead;
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80097274.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_80097274.s")
 #endif
 
 Gfx* func_80097A14(Gfx* displayListHead, s8 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, u8* arg8,
@@ -3689,7 +3689,7 @@ void func_80099AEC(void) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099AEC.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_80099AEC.s")
 #endif
 
 void func_80099E54(void) {
@@ -3799,7 +3799,7 @@ void func_80099EC4(void) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099EC4.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_80099EC4.s")
 #endif
 
 void func_8009A238(MenuTexture* arg0, s32 arg1) {
@@ -5762,7 +5762,7 @@ void load_menu_item_ui(s32 type, s32 column, s32 row, s8 priority) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/load_menu_item_ui.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/load_menu_item_ui.s")
 #endif
 
 #ifdef NON_MATCHING
@@ -6321,7 +6321,7 @@ void render_menus(MenuItem* arg0) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/render_menus.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/render_menus.s")
 #endif
 
 // GLOBAL_ASM("print_rodata.S")
@@ -7044,7 +7044,7 @@ void func_800A1FB0(MenuItem* arg0) {
     func_800A66A8(arg0, (Unk_D_800E70A0*) &spE0);
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1FB0.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_800A1FB0.s")
 #endif
 
 void func_800A2D1C(MenuItem* arg0) {
@@ -7607,7 +7607,7 @@ void render_player_time(s32 recordType, s32 column, s32 row) {
     print_text1_center_mode_1(column + 0x78, row, D_800E76A8[characterId], 0, 0.65f, 0.65f);
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/render_player_time.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/render_player_time.s")
 #endif
 
 void render_menu_titem_announce_ghost(MenuItem* arg0) {
@@ -10398,7 +10398,7 @@ void func_800AB314(MenuItem* arg0) {
     }
 }
 #else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AB314.s")
+GLOBAL_ASM("asm/non_matchings/menu_item/func_800AB314.s")
 #endif
 
 void func_800AB904(MenuItem* arg0) {

src/menus.c

@@ -11,7 +11,7 @@
 #include "audio/external.h"
 #include "code_800029B0.h"
 #include "code_80005FD0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_800AF9B0.h"
 #include "save.h"
 #include "staff_ghosts.h"

src/racing/actors_extended.c

@@ -7,7 +7,7 @@
 #include "memory.h"
 #include "waypoints.h"
 #include "code_80005FD0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "collision.h"
 #include "actors.h"
 #include "actors_extended.h"

src/racing/race_logic.c

@@ -11,7 +11,7 @@
 #include "code_800029B0.h"
 #include "code_80057C60.h"
 #include "update_objects.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_80005FD0.h"
 #include "spawn_players.h"
 #include "audio/external.h"

src/racing/skybox_and_splitscreen.c

@@ -11,7 +11,7 @@
 #include <assets/common_data.h>
 #include "render_player.h"
 #include "code_80057C60.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "actors.h"
 #include "render_courses.h"
 #include "math_util.h"

src/render_objects.c

@@ -25,7 +25,7 @@
 #include "code_8006E9C0.h"
 #include "render_objects.h"
 #include "update_objects.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "collision.h"
 #include "main.h"
 #include "menus.h"
@@ -1537,13 +1537,11 @@ void render_texture_rectangle(s32 x, s32 y, s32 width, s32 height, s32 s, s32 w,
 
     // If no cycle mode is set, render texture rectangle in copy mode
     if (mode == 0) {
-        gSPTextureRectangle(gDisplayListHead++, xl, yl, xh, yh, G_TX_RENDERTILE, s << 5, (w << 5), 4 << 10,
-                            1 << 10);
+        gSPTextureRectangle(gDisplayListHead++, xl, yl, xh, yh, G_TX_RENDERTILE, s << 5, (w << 5), 4 << 10, 1 << 10);
         return;
     }
     // Render texture rectangle in default cycle mode (1 cycle or 2 cycle)
-    gSPTextureRectangle(gDisplayListHead++, xl, yl, xh2, yh2, G_TX_RENDERTILE, s << 5, (w << 5), 1 << 10,
-                        1 << 10);
+    gSPTextureRectangle(gDisplayListHead++, xl, yl, xh2, yh2, G_TX_RENDERTILE, s << 5, (w << 5), 1 << 10, 1 << 10);
 }
 
 void render_texture_rectangle_from_base(s32 x, s32 y, s32 width, s32 height, s32 mode) {
@@ -4689,7 +4687,8 @@ UNUSED void func_800573DC(void) {
 }
 
 void func_800573E4(s32 x, s32 y, s8 str) {
-    render_texture_rectangle(x, y, 8, 8, (((str % 16) * 8) << 16) >> 16, (((unsigned short) (str / 16)) << 19) >> 16, 0);
+    render_texture_rectangle(x, y, 8, 8, (((str % 16) * 8) << 16) >> 16, (((unsigned short) (str / 16)) << 19) >> 16,
+                             0);
 }
 
 void debug_wrap_text(s32* x, s32* y) {

src/save.c

@@ -4,7 +4,7 @@
 
 #include "save.h"
 
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "menus.h"
 #include "save_data.h"
 #include "staff_ghosts.h"

src/spawn_players.c

@@ -21,7 +21,7 @@
 #include "main.h"
 #include "menus.h"
 #include "render_player.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "effects.h"
 #include "decode.h"
 

src/staff_ghosts.c

@@ -10,7 +10,7 @@
 #include "save.h"
 #include "staff_ghosts.h"
 #include "code_8006E9C0.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "code_80057C60.h"
 #include "kart_dma.h"
 

src/update_objects.c

@@ -26,7 +26,7 @@
 #include "collision.h"
 #include "effects.h"
 #include "code_80091440.h"
-#include "code_80091750.h"
+#include "menu_item.h"
 #include "podium_ceremony_actors.h"
 #include "courses/all_course_data.h"
 #include <assets/ceremony_data.h>

tools/yaml/mk64.eu1.yaml

@@ -70,7 +70,7 @@ segments:
       - [0x87A50, c, code_80086E70]
       - [0x8CDB0, c, effects]
       - [0x920A0, c, code_800914A0]
-      - [0x92350, c, code_80091750]
+      - [0x92350, c, menu_item]
       - [0xB05B0, c, code_800AF9B0]
       - [0xB0F50, c, menus]
       - [0xB51E0, c, save]

tools/yaml/mk64.us.yaml

@@ -69,7 +69,7 @@ segments:
       - [0x87A70, c, code_80086E70]
       - [0x8CDD0, c, effects]
       - [0x920C0, c, code_800914A0]
-      - [0x92350, c, code_80091750]
+      - [0x92350, c, menu_item]
       - [0xB05B0, c, code_800AF9B0]
       - [0xB0F50, c, menus]
       - [0xB51E0, c, save]