Kart 64: Tournament Edition changes + documentation

.gitignore

@@ -105,3 +105,6 @@ mingw64/
 
 # torch
 torch.hash.yml
+
+# makefile
+Makefile

Makefile

@@ -33,7 +33,7 @@ $(eval $(call validate-option,COMPILER,ido gcc))
 DEBUG ?= 0
 
 # Avoid undefined behavior. Enables shiftability when making changes
-AVOID_UB ?= 0
+AVOID_UB ?= 1
 
 # Compile with GCC
 GCC ?= 0
@@ -101,7 +101,7 @@ endif
 # NON_MATCHING - whether to build a matching, identical copy of the ROM
 #   1 - enable some alternate, more portable code that does not produce a matching ROM
 #   0 - build a matching ROM
-NON_MATCHING ?= 0
+NON_MATCHING ?= 1
 $(eval $(call validate-option,NON_MATCHING,0 1))
 
 ifeq ($(TARGET_N64),0)
@@ -122,7 +122,7 @@ endif
 # COMPARE - whether to verify the SHA-1 hash of the ROM after building
 #   1 - verifies the SHA-1 hash of the selected version of the game
 #   0 - does not verify the hash
-COMPARE ?= 1
+COMPARE ?= 0
 $(eval $(call validate-option,COMPARE,0 1))
 
 
@@ -789,4 +789,4 @@ MAKEFLAGS += --no-builtin-rules
 -include $(DEP_FILES)
 
 
-print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
+print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true

README.md

@@ -1,4 +1,52 @@
-# Mario Kart 64   
+# Refactor of Mario Kart 64 Multiplayer ROM Hack (Tournament Edition)
+Refactor of Mario Kart 64 ROM hack with configuration menu
+
+## Features
+### TITLE MENU Options
+- Widescreen: 4:3(default) / 16:9
+- Game Pacing: Default/original (15-30fps) / 30fps (emulator) / 60fps
+- MP Music: (Default) / Enabled
+- VS Detail: Original / High
+  - Multiplayer DKJP Boat: Enabled / Disabled
+  - Multiplayer KD Train: Original / Full
+- Track Selection: Original / Kaillera / Random
+- Practice mode: Default / Enabled
+- Extra mode: Disabled(Default) / Enabled
+- Force Minimap: Default / Prog view / Map
+- Anti-aliasing: Default / Disabled
+
+### NON-MENU FEATURES
+- Tie-logic: Same-frame finishes now determined by in-game timer instead of player port
+- Lightning: Now a single white flash instead of many alterating blue and white flashes
+- VS timer: Players' finish time are displayed on the VS points screen
+- Sounds: No c-up or c-right sounds during VS races
+- Slow pause: players must hold pause for roughly .5 sec to mitigate accidental pauses
+
+
+### VS MATCH RANKING Screen
+- Include total score by player as 2/1/0 (3P) or 3/2/1/0 (4P)
+- Include ability to adjust VS scores if all players hold L + R bumpers and use C-UP and C-DOWN to adjust scores
+
+## TODO
+### TITLE MENU Options
+- 200cc
+- Course Z Scaler: Original / Minimum / Maximum
+- Randomizer
+- Improve practice mode bots
+
+## NON-MENU Stuff
+- Patch shortcuts
+- Update microcode + optimize code so that 4p runs at 30fps on console + fix jumbotron
+- internal rollback netcode for future online play
+- storing item stats for each VS race, export data somehow
+- DKR-inspired timer for 3p/4p vs mode 
+- Amped Up-style practice bots
+
+### CREDITS
+- Megamech + the mk64 decomp team, and abitalive
+- Please credit Climatee, Zserf, and dntn31 if you decided to fork this specific repo
+
+## Building (Windows)
 This decompilation of Mario Kart 64 pursues historical and educational elements within the game found via taking it apart and putting it back together. Inspiration to do so not only emanates from the game's hardware and technology but also its immensely positive effects on the cultures and families of nearly every nationality.
 
 This repository does not contain assets. Compiling requires asset extraction from a prior copy of the game.

asm/rom_header.s

@@ -14,7 +14,7 @@
 .word  0x2E92DA52               /* Checksum 2 */
 .word  0x00000000               /* Unknown */
 .word  0x00000000               /* Unknown */
-.ascii "MARIOKART64         "   /* Internal ROM name */
+.ascii "MARIOKART64         "   /* Internal ROM name. Change to MK64 NETPLAY for netplay builds */
 .word  0x00000000               /* Unknown */
 .word  0x0000004E               /* Cartridge */
 .ascii "KT"                     /* Cartridge ID */

assets/blueshell.json

@@ -1,11 +1,11 @@
 {
 "common_tlut_blue_shell":     {"output_dir": "blueshell", "rom_offset": "0x132B50", "block_offset": "0x05038", "width": 16, "height": 16, "type": "rgba16"},
-"gTextureBlueShell0": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell1": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell2": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell3": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell4": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell5": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell6": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
-"gTextureBlueShell7": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}
+"texture_blue_shell_0": {"output_dir": "blueshell", "rom_offset": "0x68FE20", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_1": {"output_dir": "blueshell", "rom_offset": "0x69004C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_2": {"output_dir": "blueshell", "rom_offset": "0x690284", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_3": {"output_dir": "blueshell", "rom_offset": "0x6904C4", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_4": {"output_dir": "blueshell", "rom_offset": "0x690708", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_5": {"output_dir": "blueshell", "rom_offset": "0x690960", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_6": {"output_dir": "blueshell", "rom_offset": "0x690BBC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"},
+"texture_blue_shell_7": {"output_dir": "blueshell", "rom_offset": "0x690DF8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_blue_shell"}
 }

assets/course_outlines.json

@@ -1,22 +1,22 @@
 {
-"gTextureCourseOutlineMarioRaceway":     {"output_dir": "course_outlines", "rom_offset": "0x720C0C", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineChocoMountain":    {"output_dir": "course_outlines", "rom_offset": "0x720ED0", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineBowsersCastle":    {"output_dir": "course_outlines", "rom_offset": "0x7211D8", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineBansheeBoardwalk": {"output_dir": "course_outlines", "rom_offset": "0x72143C", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineYoshiValley":      {"output_dir": "course_outlines", "rom_offset": "0x721634", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineFrappeSnowland":   {"output_dir": "course_outlines", "rom_offset": "0x721A58", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineKoopaTroopaBeach": {"output_dir": "course_outlines", "rom_offset": "0x721CD0", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineRoyalRaceway":     {"output_dir": "course_outlines", "rom_offset": "0x721F38", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineLuigiRaceway":     {"output_dir": "course_outlines", "rom_offset": "0x722210", "width":  64, "height": 96, "type": "i4"},
-"gTextureCourseOutlineMooMooFarm":       {"output_dir": "course_outlines", "rom_offset": "0x72248C", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineToadsTurnpike":    {"output_dir": "course_outlines", "rom_offset": "0x7226C4", "width": 128, "height": 64, "type": "i4"},
-"gTextureCourseOutlineKalimariDesert":   {"output_dir": "course_outlines", "rom_offset": "0x7229C0", "width":  64, "height": 96, "type": "i4"},
-"gTextureCourseOutlineSherbetLand":      {"output_dir": "course_outlines", "rom_offset": "0x722D2C", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineRainbowRoad":      {"output_dir": "course_outlines", "rom_offset": "0x723034", "width":  64, "height": 96, "type": "i4"},
-"gTextureCourseOutlineWarioStadium":     {"output_dir": "course_outlines", "rom_offset": "0x723370", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineBlockFort":        {"output_dir": "course_outlines", "rom_offset": "0x723644", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineSkyscraper":       {"output_dir": "course_outlines", "rom_offset": "0x7238E4", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineDoubleDeck":       {"output_dir": "course_outlines", "rom_offset": "0x723B18", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineDksJungleParkway": {"output_dir": "course_outlines", "rom_offset": "0x723C9C", "width":  64, "height": 64, "type": "i4"},
-"gTextureCourseOutlineBigDonut":         {"output_dir": "course_outlines", "rom_offset": "0x723F84", "width":  64, "height": 64, "type": "i4"}
+"minimap_mario_raceway":     {"output_dir": "course_outlines", "rom_offset": "0x720C0C", "width":  64, "height": 64, "type": "i4"},
+"minimap_choco_mountain":    {"output_dir": "course_outlines", "rom_offset": "0x720ED0", "width":  64, "height": 64, "type": "i4"},
+"minimap_bowsers_castle":    {"output_dir": "course_outlines", "rom_offset": "0x7211D8", "width":  64, "height": 64, "type": "i4"},
+"minimap_banshee_boardwalk": {"output_dir": "course_outlines", "rom_offset": "0x72143C", "width":  64, "height": 64, "type": "i4"},
+"minimap_yoshi_valley":      {"output_dir": "course_outlines", "rom_offset": "0x721634", "width":  64, "height": 64, "type": "i4"},
+"minimap_frappe_snowland":   {"output_dir": "course_outlines", "rom_offset": "0x721A58", "width":  64, "height": 64, "type": "i4"},
+"minimap_koopa_troopa_beach": {"output_dir": "course_outlines", "rom_offset": "0x721CD0", "width":  64, "height": 64, "type": "i4"},
+"minimap_royal_raceway":     {"output_dir": "course_outlines", "rom_offset": "0x721F38", "width":  64, "height": 64, "type": "i4"},
+"minimap_luigi_raceway":     {"output_dir": "course_outlines", "rom_offset": "0x722210", "width":  64, "height": 96, "type": "i4"},
+"minimap_moo_moo_farm":       {"output_dir": "course_outlines", "rom_offset": "0x72248C", "width":  64, "height": 64, "type": "i4"},
+"minimap_toads_turnpike":    {"output_dir": "course_outlines", "rom_offset": "0x7226C4", "width": 128, "height": 64, "type": "i4"},
+"minimap_kalimari_desert":   {"output_dir": "course_outlines", "rom_offset": "0x7229C0", "width":  64, "height": 96, "type": "i4"},
+"minimap_sherbet_land":      {"output_dir": "course_outlines", "rom_offset": "0x722D2C", "width":  64, "height": 64, "type": "i4"},
+"minimap_rainbow_road":      {"output_dir": "course_outlines", "rom_offset": "0x723034", "width":  64, "height": 96, "type": "i4"},
+"minimap_wario_stadium":     {"output_dir": "course_outlines", "rom_offset": "0x723370", "width":  64, "height": 64, "type": "i4"},
+"minimap_block_fort":        {"output_dir": "course_outlines", "rom_offset": "0x723644", "width":  64, "height": 64, "type": "i4"},
+"minimap_skyscraper":       {"output_dir": "course_outlines", "rom_offset": "0x7238E4", "width":  64, "height": 64, "type": "i4"},
+"minimap_double_deck":       {"output_dir": "course_outlines", "rom_offset": "0x723B18", "width":  64, "height": 64, "type": "i4"},
+"minimap_dks_jungle_parkway": {"output_dir": "course_outlines", "rom_offset": "0x723C9C", "width":  64, "height": 64, "type": "i4"},
+"minimap_big_donut":         {"output_dir": "course_outlines", "rom_offset": "0x723F84", "width":  64, "height": 64, "type": "i4"}
 }

assets/greenshell.json

@@ -1,11 +1,11 @@
 {
 "common_tlut_green_shell":     {"output_dir": "greenshell", "rom_offset": "0x132B50", "block_offset": "0x04E38", "width": 16, "height": 16, "type": "rgba16"},
-"gTextureGreenShell0": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell1": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell2": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell3": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell4": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell5": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell6": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
-"gTextureGreenShell7": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}
+"texture_green_shell_0": {"output_dir": "greenshell", "rom_offset": "0x68EB50", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_1": {"output_dir": "greenshell", "rom_offset": "0x68EDA0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_2": {"output_dir": "greenshell", "rom_offset": "0x68EFF0", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_3": {"output_dir": "greenshell", "rom_offset": "0x68F248", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_4": {"output_dir": "greenshell", "rom_offset": "0x68F4A8", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_5": {"output_dir": "greenshell", "rom_offset": "0x68F700", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_6": {"output_dir": "greenshell", "rom_offset": "0x68F96C", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"},
+"texture_green_shell_7": {"output_dir": "greenshell", "rom_offset": "0x68FBCC", "width": 32, "height": 32, "type": "ci8", "tlut": "common_tlut_green_shell"}
 }

assets/include/blueshell.mk

@@ -3,14 +3,14 @@ BLUESHELL_DIR := assets/blueshell
 BLUESHELL_PALETTE := $(BLUESHELL_DIR)/common_tlut_blue_shell.png
 
 BLUESHELL_FRAMES := \
-$(BLUESHELL_DIR)/gTextureBlueShell0.png \
-$(BLUESHELL_DIR)/gTextureBlueShell1.png \
-$(BLUESHELL_DIR)/gTextureBlueShell2.png \
-$(BLUESHELL_DIR)/gTextureBlueShell3.png \
-$(BLUESHELL_DIR)/gTextureBlueShell4.png \
-$(BLUESHELL_DIR)/gTextureBlueShell5.png \
-$(BLUESHELL_DIR)/gTextureBlueShell6.png \
-$(BLUESHELL_DIR)/gTextureBlueShell7.png
+$(BLUESHELL_DIR)/texture_blue_shell_0.png \
+$(BLUESHELL_DIR)/texture_blue_shell_1.png \
+$(BLUESHELL_DIR)/texture_blue_shell_2.png \
+$(BLUESHELL_DIR)/texture_blue_shell_3.png \
+$(BLUESHELL_DIR)/texture_blue_shell_4.png \
+$(BLUESHELL_DIR)/texture_blue_shell_5.png \
+$(BLUESHELL_DIR)/texture_blue_shell_6.png \
+$(BLUESHELL_DIR)/texture_blue_shell_7.png
 
 BLUESHELL_EXPORT_SENTINEL := $(BLUESHELL_DIR)/.export
 

assets/include/course_outlines.mk

@@ -1,26 +1,26 @@
 COURSE_OUTLINE_DIR := assets/course_outlines
 
 COURSE_OUTLINE_PNG := \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineMarioRaceway.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineChocoMountain.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBowsersCastle.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBansheeBoardwalk.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineYoshiValley.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineFrappeSnowland.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineKoopaTroopaBeach.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineRoyalRaceway.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineLuigiRaceway.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineMooMooFarm.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineToadsTurnpike.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineKalimariDesert.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineSherbetLand.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineRainbowRoad.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineWarioStadium.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBlockFort.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineSkyscraper.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineDoubleDeck.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineDksJungleParkway.png \
-$(COURSE_OUTLINE_DIR)/gTextureCourseOutlineBigDonut.png
+$(COURSE_OUTLINE_DIR)/minimap_mario_raceway.png \
+$(COURSE_OUTLINE_DIR)/minimap_choco_mountain.png \
+$(COURSE_OUTLINE_DIR)/minimap_bowsers_castle.png \
+$(COURSE_OUTLINE_DIR)/minimap_banshee_boardwalk.png \
+$(COURSE_OUTLINE_DIR)/minimap_yoshi_valley.png \
+$(COURSE_OUTLINE_DIR)/minimap_frappe_snowland.png \
+$(COURSE_OUTLINE_DIR)/minimap_koopa_troopa_beach.png \
+$(COURSE_OUTLINE_DIR)/minimap_royal_raceway.png \
+$(COURSE_OUTLINE_DIR)/minimap_luigi_raceway.png \
+$(COURSE_OUTLINE_DIR)/minimap_moo_moo_farm.png \
+$(COURSE_OUTLINE_DIR)/minimap_toads_turnpike.png \
+$(COURSE_OUTLINE_DIR)/minimap_kalimari_desert.png \
+$(COURSE_OUTLINE_DIR)/minimap_sherbet_land.png \
+$(COURSE_OUTLINE_DIR)/minimap_rainbow_road.png \
+$(COURSE_OUTLINE_DIR)/minimap_wario_stadium.png \
+$(COURSE_OUTLINE_DIR)/minimap_block_fort.png \
+$(COURSE_OUTLINE_DIR)/minimap_skyscraper.png \
+$(COURSE_OUTLINE_DIR)/minimap_double_deck.png \
+$(COURSE_OUTLINE_DIR)/minimap_dks_jungle_parkway.png \
+$(COURSE_OUTLINE_DIR)/minimap_big_donut.png
 
 COURSE_OUTLINE_EXPORT_SENTINEL := $(COURSE_OUTLINE_DIR)/.export
 

assets/include/greenshell.mk

@@ -3,14 +3,14 @@ GREENSHELL_DIR := assets/greenshell
 GREENSHELL_PALETTE := $(GREENSHELL_DIR)/common_tlut_green_shell.png
 
 GREENSHELL_FRAMES := \
-$(GREENSHELL_DIR)/gTextureGreenShell0.png \
-$(GREENSHELL_DIR)/gTextureGreenShell1.png \
-$(GREENSHELL_DIR)/gTextureGreenShell2.png \
-$(GREENSHELL_DIR)/gTextureGreenShell3.png \
-$(GREENSHELL_DIR)/gTextureGreenShell4.png \
-$(GREENSHELL_DIR)/gTextureGreenShell5.png \
-$(GREENSHELL_DIR)/gTextureGreenShell6.png \
-$(GREENSHELL_DIR)/gTextureGreenShell7.png
+$(GREENSHELL_DIR)/texture_green_shell_0.png \
+$(GREENSHELL_DIR)/texture_green_shell_1.png \
+$(GREENSHELL_DIR)/texture_green_shell_2.png \
+$(GREENSHELL_DIR)/texture_green_shell_3.png \
+$(GREENSHELL_DIR)/texture_green_shell_4.png \
+$(GREENSHELL_DIR)/texture_green_shell_5.png \
+$(GREENSHELL_DIR)/texture_green_shell_6.png \
+$(GREENSHELL_DIR)/texture_green_shell_7.png
 
 GREENSHELL_EXPORT_SENTINEL := $(GREENSHELL_DIR)/.export
 

data/course_player_selection.s

@@ -822,7 +822,7 @@ glabel gTextureP4BorderGreen
 .incbin "textures/raw/p4_border_green.rgba16"
 
 .align 2, 0x00
-glabel gTextureSmallGreenTriangle
+glabel texture_small_green_triangle
 .incbin "textures/raw/small_green_triangle.rgba16"
 
 .align 2, 0x00