Add ymls for Torch code generator (#497)

* Add torch

* update jenkinsfile

.gitignore

@@ -45,14 +45,18 @@ doxygen/doxygen/*
 docs/html/*
 xml/*
 /build/*
-# decomp permuter
+# Decomp permuter
 /nonmatchings/*
 *.dump
 *.mio0
 *.z64
 *.map
 .assets-local.txt
 
+# Torch
+include/assets/*
+tools/torch/*
+
 # no context header for now, until it's greenlit for the repo
 context_gen_header.h
 contexts/*
@@ -64,6 +68,7 @@ expected/*
 
 # Assets. Generally ignored, but ones with "custom" in the name are fine.
 /bin/*
+/modding/*
 /courses/**/*linkonly*
 /textures/**/*.png
 /textures/**/*.bin
@@ -73,6 +78,7 @@ expected/*
 /assets/**/*.mio0
 /assets/**/*.raw
 /assets/**/*.inc.c
+/assets/code/*
 /music/**/*.m64
 /sound/**/*.m64
 /sound/**/*.aiff

Jenkinsfile

@@ -30,6 +30,7 @@ pipeline {
     }
     stage('Build U Source') {
       steps {
+        sh 'make assets -j4'
         sh 'make -j4 VERSION=us'
       }
     }

Makefile

@@ -212,7 +212,8 @@ DATA_DIR       := data
 INCLUDE_DIRS   := include
 
 # Directories containing source files
-SRC_DIRS       := src src/data src/buffers src/racing src/ending src/audio src/debug src/os src/os/math courses
+SRC_ASSETS_DIR := assets/code/ceremony_data assets/code/startup_logo assets/code/data_800E45C0 assets/code/data_segment2 assets/code/data_800E8700 assets/code/common_data
+SRC_DIRS       := src src/data src/buffers src/racing src/ending src/audio src/debug src/os src/os/math courses assets/code/ceremony_data assets/code/startup_logo $(SRC_ASSETS_DIR)
 ASM_DIRS       := asm asm/os asm/unused $(DATA_DIR) $(DATA_DIR)/sound_data $(DATA_DIR)/karts
 
 
@@ -223,7 +224,7 @@ TEXTURE_DIRS := textures/common
 
 ALL_DIRS = $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) $(COURSE_DIRS) include $(ASM_DIRS) $(TEXTURES_DIR)/raw \
 	$(TEXTURES_DIR)/standalone $(TEXTURES_DIR)/startup_logo $(TEXTURES_DIR)/crash_screen $(TEXTURES_DIR)/trophy $(TEXTURES_DIR)/courses        \
-	$(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(BIN_DIR))
+	$(TEXTURE_DIRS) $(TEXTURE_DIRS)/tlut $(BIN_DIR)) assets/course_metadata
 
 # file dependencies generated by splitter
 MAKEFILE_SPLIT = Makefile.split
@@ -233,7 +234,7 @@ include $(MAKEFILE_SPLIT)
 # 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
-C_FILES := $(filter-out $(EUC_JP_FILES),$(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.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.
 COURSE_FILES := $(foreach dir,$(COURSE_DIRS),$(filter-out %.inc.c,$(wildcard $(dir)/*.c)))
@@ -355,6 +356,7 @@ BIN2C                 := $(PYTHON) $(TOOLS_DIR)/bin2c.py
 EXTRACT_DATA_FOR_MIO  := $(TOOLS_DIR)/extract_data_for_mio
 ASSET_EXTRACT         := $(PYTHON) $(TOOLS_DIR)/new_extract_assets.py
 LINKONLY_GENERATOR    := $(PYTHON) $(TOOLS_DIR)/linkonly_generator.py
+TORCH                 := tools/torch/torch
 EMULATOR               = mupen64plus
 EMU_FLAGS              = --noosd
 LOADER                 = loader64
@@ -395,6 +397,12 @@ ifeq ($(COMPARE),1)
 	@$(SHA1SUM) -c $(TARGET).sha1 > $(NULL_OUT) && $(PRINT) "$(TARGET): $(GREEN)OK$(NO_COL)\n" || ($(PRINT) "$(YELLOW)Building the ROM file has succeeded, but does not match the original ROM.\nThis is expected, and not an error, if you are making modifications.\nTo silence this message, use 'make COMPARE=0.' $(NO_COL)\n" && $(FALSE))
 endif
 
+assets:
+	@echo "Extracting torch assets..."
+	@$(TORCH) code $(BASEROM) -v
+	@$(TORCH) header $(BASEROM)
+	@$(TORCH) modding export $(BASEROM)
+
 doc:
 	$(PYTHON) $(TOOLS_DIR)/doxygen_symbol_gen.py
 	doxygen
@@ -477,7 +485,7 @@ $(TEXTURE_FILES_TLUT):
 	$(V)$(N64GRAPHICS) -i $(BUILD_DIR)/$@.inc.c -g $@.png -f $(lastword $(subst ., ,$@)) -s u8 -c $(lastword $(subst ., ,$(subst .$(lastword $(subst ., ,$(TEXTURE_FILES_TLUT))), ,$(TEXTURE_FILES_TLUT)))) -p $(BUILD_DIR)/$@.tlut.inc.c
 
 # common textures
-$(BUILD_DIR)/src/data/common_textures.o: src/data/common_textures.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT)
+$(BUILD_DIR)/assets/code/common_data/common_data.o: assets/code/common_data/common_data.c $(TEXTURE_FILES) $(TEXTURE_FILES_TLUT)
 	@$(PRINT) "$(GREEN)Compiling Common Textures:  $(BLUE)$@ $(NO_COL)\n"
 	@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
 	$(V)$(CC) -c $(CFLAGS) -o $@ $<
@@ -622,7 +630,7 @@ endif
 # Compile Trophy and Podium Models                                             #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.elf
+LDFLAGS += -R $(BUILD_DIR)/assets/code/ceremony_data/ceremony_data.elf
 
 %/ceremony_data.elf: %/ceremony_data.o
 	$(V)$(LD) -t -e 0 -Ttext=0B000000 -Map $@.map -o $@ $< --no-check-sections
@@ -642,7 +650,7 @@ LDFLAGS += -R $(BUILD_DIR)/src/ending/ceremony_data.elf
 # Compile Startup Logo                                                         #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/data/startup_logo.elf
+LDFLAGS += -R $(BUILD_DIR)/assets/code/startup_logo/startup_logo.elf
 
 %/startup_logo.elf: %/startup_logo.o
 	$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -o $@ $< --no-check-sections
@@ -661,19 +669,19 @@ LDFLAGS += -R $(BUILD_DIR)/src/data/startup_logo.elf
 # Compile Common Textures                                                      #
 #==============================================================================#
 
-LDFLAGS += -R $(BUILD_DIR)/src/data/common_textures.elf
+LDFLAGS += -R $(BUILD_DIR)/assets/code/common_data/common_data.elf
 
-%/common_textures.elf: %/common_textures.o
+%/common_data.elf: %/common_data.o
 	$(V)$(LD) -t -e 0 -Ttext=0D000000 -Map $@.map -o $@ $< --no-check-sections
 
-%/common_textures.bin: %/common_textures.elf
+%/common_data.bin: %/common_data.elf
 	$(V)$(EXTRACT_DATA_FOR_MIO) $< $@
 
-%/common_textures.mio0: %/common_textures.bin
+%/common_data.mio0: %/common_data.bin
 	@$(PRINT) "$(GREEN)Compressing Common Textures:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(MIO0TOOL) -c $< $@
 
-%/common_textures.mio0.s: %/common_textures.mio0
+%/common_data.mio0.s: %/common_data.mio0
 	$(PRINT) ".include \"macros.inc\"\n\n.section .data\n\n.balign 4\n\n.incbin \"$<\"\n\n" > $@
 
 
@@ -688,7 +696,7 @@ $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT)
 	$(V)$(CPP) $(CPPFLAGS) -DBUILD_DIR=$(BUILD_DIR) -MMD -MP -MT $@ -MF $@.d -o $@ $<
 
 # Link MK64 ELF file
-$(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/src/data/startup_logo.mio0.o $(BUILD_DIR)/src/ending/ceremony_data.mio0.o $(BUILD_DIR)/src/data/common_textures.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt
+$(ELF): $(O_FILES) $(COURSE_DATA_TARGETS) $(BUILD_DIR)/$(LD_SCRIPT) $(BUILD_DIR)/assets/code/startup_logo/startup_logo.mio0.o $(BUILD_DIR)/assets/code/ceremony_data/ceremony_data.mio0.o $(BUILD_DIR)/assets/code/common_data/common_data.mio0.o $(COURSE_GEOGRAPHY_TARGETS) undefined_syms.txt
 	@$(PRINT) "$(GREEN)Linking ELF file:  $(BLUE)$@ $(NO_COL)\n"
 	$(V)$(LD) $(LDFLAGS) -o $@
 
@@ -706,7 +714,7 @@ $(BUILD_DIR)/$(TARGET).objdump: $(ELF)
 	$(OBJDUMP) -D $< > $@
 
 
-.PHONY: all clean distclean distclean_assets default diff test load
+.PHONY: all clean distclean distclean_assets default diff test load assets
 # with no prerequisites, .SECONDARY causes no intermediate target to be removed
 .SECONDARY:
 

README.md

@@ -35,6 +35,10 @@ Game code progress consists of `main`, `ending` and `racing`.
 ```
 git submodule update --init --recursive
 ```
+Extract assets
+```
+make assets -j
+```
 ```
 make -j
 ```

asm/non_matchings/code_80005FD0/func_80009B60.s

@@ -26,11 +26,11 @@ glabel D_800ECFC8
 glabel func_80009B60
 /* 00A760 80009B60 3C0E800E */  lui   $t6, %hi(gCurrentCourseId)
 /* 00A764 80009B64 85CEC5A0 */  lh    $t6, %lo(gCurrentCourseId)($t6)
-/* 00A768 80009B68 3C01800E */  lui   $at, %hi(gKartAICourseMaximumWaypointSeparation)
+/* 00A768 80009B68 3C01800E */  lui   $at, %hi(gKartAICourseMaximumSeparation)
 /* 00A76C 80009B6C 3C0A8016 */  lui   $t2, %hi(D_80163100) # $t2, 0x8016
 /* 00A770 80009B70 000E7880 */  sll   $t7, $t6, 2
 /* 00A774 80009B74 002F0821 */  addu  $at, $at, $t7
-/* 00A778 80009B78 C424CA4C */  lwc1  $f4, %lo(gKartAICourseMaximumWaypointSeparation)($at)
+/* 00A778 80009B78 C424CA4C */  lwc1  $f4, %lo(gKartAICourseMaximumSeparation)($at)
 /* 00A77C 80009B7C 27BDFF30 */  addiu $sp, $sp, -0xd0
 /* 00A780 80009B80 254A3100 */  addiu $t2, %lo(D_80163100) # addiu $t2, $t2, 0x3100
 /* 00A784 80009B84 4600218D */  trunc.w.s $f6, $f4
@@ -1195,7 +1195,7 @@ glabel func_80009B60
 /* 00B854 8000AC54 4600218D */  trunc.w.s $f6, $f4
 /* 00B858 8000AC58 44055000 */  mfc1  $a1, $f10
 /* 00B85C 8000AC5C 3C0B800E */  lui   $t3, %hi(gCurrentCourseId)
-/* 00B860 8000AC60 3C03800E */  lui   $v1, %hi(D_800DCA20)
+/* 00B860 8000AC60 3C03800E */  lui   $v1, %hi(gKartAISteeringSensitivity)
 /* 00B864 8000AC64 00057C00 */  sll   $t7, $a1, 0x10
 /* 00B868 8000AC68 44023000 */  mfc1  $v0, $f6
 /* 00B86C 8000AC6C 000F6403 */  sra   $t4, $t7, 0x10
@@ -1223,7 +1223,7 @@ glabel func_80009B60
 /* 00B8BC 8000ACBC 000B6040 */  sll   $t4, $t3, 1
 /* 00B8C0 8000ACC0 006C1821 */  addu  $v1, $v1, $t4
 /* 00B8C4 8000ACC4 10410006 */  beq   $v0, $at, .L8000ACE0
-/* 00B8C8 8000ACC8 8463CA20 */   lh    $v1, %lo(D_800DCA20)($v1)
+/* 00B8C8 8000ACC8 8463CA20 */   lh    $v1, %lo(gKartAISteeringSensitivity)($v1)
 /* 00B8CC 8000ACCC 24010003 */  li    $at, 3
 /* 00B8D0 8000ACD0 50410014 */  beql  $v0, $at, .L8000AD24
 /* 00B8D4 8000ACD4 3C013F00 */   lui   $at, 0x3f00

asm/non_matchings/code_80091750/func_8009F5E0.s

@@ -341,8 +341,8 @@ glabel L8009F8B8
 /* 0A04FC 8009F8FC 100003F1 */  b     .L800A08C4
 /* 0A0500 8009F900 AE020000 */   sw    $v0, ($s0)
 glabel L8009F904
-/* 0A0504 8009F904 3C11800E */  lui   $s1, %hi(D_800E7574) # $s1, 0x800e
-/* 0A0508 8009F908 26317574 */  addiu $s1, %lo(D_800E7574) # addiu $s1, $s1, 0x7574
+/* 0A0504 8009F904 3C11800E */  lui   $s1, %hi(gCourseNamesDup) # $s1, 0x800e
+/* 0A0508 8009F908 26317574 */  addiu $s1, %lo(gCourseNamesDup) # addiu $s1, $s1, 0x7574
 /* 0A050C 8009F90C 0C024C0D */  jal   get_string_width
 /* 0A0510 8009F910 8E240000 */   lw    $a0, ($s1)
 /* 0A0514 8009F914 244A0005 */  addiu $t2, $v0, 5
@@ -1228,13 +1228,13 @@ glabel L800A05C4
 /* 0A11D4 800A05D4 3C013F80 */  li    $at, 0x3F800000 # 1.000000
 /* 0A11D8 800A05D8 44819000 */  mtc1  $at, $f18
 /* 0A11DC 800A05DC C6300024 */  lwc1  $f16, 0x24($s1)
-/* 0A11E0 800A05E0 3C06800E */  lui   $a2, %hi(D_800E7524)
+/* 0A11E0 800A05E0 3C06800E */  lui   $a2, %hi(gCourseNames)
 /* 0A11E4 800A05E4 00194880 */  sll   $t1, $t9, 2
 /* 0A11E8 800A05E8 00C93021 */  addu  $a2, $a2, $t1
 /* 0A11EC 800A05EC 8E24000C */  lw    $a0, 0xc($s1)
 /* 0A11F0 800A05F0 8E250010 */  lw    $a1, 0x10($s1)
 /* 0A11F4 800A05F4 8E27001C */  lw    $a3, 0x1c($s1)
-/* 0A11F8 800A05F8 8CC67524 */  lw    $a2, %lo(D_800E7524)($a2)
+/* 0A11F8 800A05F8 8CC67524 */  lw    $a2, %lo(gCourseNames)($a2)
 /* 0A11FC 800A05FC E7B20014 */  swc1  $f18, 0x14($sp)
 /* 0A1200 800A0600 0C024CC9 */  jal   func_80093324
 /* 0A1204 800A0604 E7B00010 */   swc1  $f16, 0x10($sp)

asm/non_matchings/code_80091750/func_800A1FB0.s

@@ -488,7 +488,7 @@ glabel L800A23DC
 /* 0A3204 800A2604 24010002 */   li    $at, 2
 .L800A2608:
 /* 0A3208 800A2608 80620005 */  lb    $v0, 5($v1)
-/* 0A320C 800A260C 3C06800E */  lui   $a2, %hi(D_800E75C4)
+/* 0A320C 800A260C 3C06800E */  lui   $a2, %hi(gCourseNamesDup2)
 /* 0A3210 800A2610 E7B40014 */  swc1  $f20, 0x14($sp)
 /* 0A3214 800A2614 04410003 */  bgez  $v0, .L800A2624
 /* 0A3218 800A2618 00024083 */   sra   $t0, $v0, 2
@@ -511,7 +511,7 @@ glabel L800A23DC
 /* 0A3254 800A2654 000D7080 */  sll   $t6, $t5, 2
 /* 0A3258 800A2658 00CE3021 */  addu  $a2, $a2, $t6
 /* 0A325C 800A265C 0C024CC9 */  jal   func_80093324
-/* 0A3260 800A2660 8CC675C4 */   lw    $a2, %lo(D_800E75C4)($a2)
+/* 0A3260 800A2660 8CC675C4 */   lw    $a2, %lo(gCourseNamesDup2)($a2)
 /* 0A3264 800A2664 24010002 */  li    $at, 2
 .L800A2668:
 /* 0A3268 800A2668 02208025 */  move  $s0, $s1
@@ -681,7 +681,7 @@ glabel L800A26A8
 /* 0A34C0 800A28C0 24010002 */   li    $at, 2
 .L800A28C4:
 /* 0A34C4 800A28C4 80620005 */  lb    $v0, 5($v1)
-/* 0A34C8 800A28C8 3C06800E */  lui   $a2, %hi(D_800E75C4)
+/* 0A34C8 800A28C8 3C06800E */  lui   $a2, %hi(gCourseNamesDup2)
 /* 0A34CC 800A28CC E7B40014 */  swc1  $f20, 0x14($sp)
 /* 0A34D0 800A28D0 04410003 */  bgez  $v0, .L800A28E0
 /* 0A34D4 800A28D4 00026883 */   sra   $t5, $v0, 2
@@ -704,7 +704,7 @@ glabel L800A26A8
 /* 0A3510 800A2910 00085080 */  sll   $t2, $t0, 2
 /* 0A3514 800A2914 00CA3021 */  addu  $a2, $a2, $t2
 /* 0A3518 800A2918 0C024CC9 */  jal   func_80093324
-/* 0A351C 800A291C 8CC675C4 */   lw    $a2, %lo(D_800E75C4)($a2)
+/* 0A351C 800A291C 8CC675C4 */   lw    $a2, %lo(gCourseNamesDup2)($a2)
 /* 0A3520 800A2920 24010002 */  li    $at, 2
 .L800A2924:
 /* 0A3524 800A2924 02208025 */  move  $s0, $s1
@@ -899,7 +899,7 @@ glabel L800A29D0
 /* 0A37DC 800A2BDC 24010002 */   li    $at, 2
 .L800A2BE0:
 /* 0A37E0 800A2BE0 80620005 */  lb    $v0, 5($v1)
-/* 0A37E4 800A2BE4 3C06800E */  lui   $a2, %hi(D_800E75C4)
+/* 0A37E4 800A2BE4 3C06800E */  lui   $a2, %hi(gCourseNamesDup2)
 /* 0A37E8 800A2BE8 E7B40014 */  swc1  $f20, 0x14($sp)
 /* 0A37EC 800A2BEC 04410003 */  bgez  $v0, .L800A2BFC
 /* 0A37F0 800A2BF0 00026083 */   sra   $t4, $v0, 2
@@ -922,7 +922,7 @@ glabel L800A29D0
 /* 0A382C 800A2C2C 00194080 */  sll   $t0, $t9, 2
 /* 0A3830 800A2C30 00C83021 */  addu  $a2, $a2, $t0
 /* 0A3834 800A2C34 0C024CC9 */  jal   func_80093324
-/* 0A3838 800A2C38 8CC675C4 */   lw    $a2, %lo(D_800E75C4)($a2)
+/* 0A3838 800A2C38 8CC675C4 */   lw    $a2, %lo(gCourseNamesDup2)($a2)
 /* 0A383C 800A2C3C 24010002 */  li    $at, 2
 .L800A2C40:
 /* 0A3840 800A2C40 02208025 */  move  $s0, $s1

assets.json

@@ -184,7 +184,6 @@
 "bin/gTextureMenu100cc.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8080C0", "0x0"]}},
 "bin/gTextureMenu150cc.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8082C0", "0x0"]}},
 "bin/gTextureMenuExtra.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8084C0", "0x0"]}},
-
 "bin/gTextureMenuWithoutItem.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8086C0", "0x0"]}},
 "bin/gTextureMenuWithItem.rgba16.tkmk00": {"meta":{"size":"0x300"}, "offsets": {"us":["0x8089C0", "0x0"]}},
 "bin/gTextureMenuBegin.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x808CC0", "0x0"]}},

config.yml

@@ -0,0 +1,30 @@
+579c48e211ae952530ffc8738709f078d5dd215e:
+  name: Mario Kart 64 [US]
+  path: yamls/us
+  config:
+    gbi: F3DEX_MK64
+    sort: OFFSET
+    enums: 
+      - include/defines.h
+    output:
+      binary: mkcube.otr
+      headers: include/assets
+      code: assets/code
+  metadata: [yamls/courses]
+  segments:
+    - 0x000000
+    - 0x000000
+    - 0x12AAE0
+    - 0x000000
+    - 0x000000
+    - 0x000000
+    - 0x825800
+    - 0x000000
+    - 0x000000
+    - 0x88CD70
+    - 0x729A30
+    - 0x821D10
+    - 0x7FA3C0
+    - 0x132B50
+    - 0x000000
+    - 0x145470

courses/frappe_snowland/course_data.c

@@ -1964,7 +1964,7 @@ Gfx d_course_frappe_snowland_dl_33E0[] =
     gsSPEndDisplayList(),
 };
 
-TrackWaypoint d_course_frappe_unknown_waypoints[] = {
+TrackWaypoint d_course_frappe_snowland_unknown_waypoints[] = {
     {-4, 0, -259, 0},
     {-4, 0, -282, 0},
     {-10, 0, -526, 0},
@@ -2040,7 +2040,7 @@ TrackWaypoint d_course_frappe_unknown_waypoints[] = {
     {-32768, 0, 0, 0},
 };
 
-TrackWaypoint d_course_frappe_track_waypoints[] = {
+TrackWaypoint d_course_frappe_snowland_track_waypoints[] = {
     {-4, 0, -270, 1},
     {-4, 0, -290, 1},
     {-4, 0, -310, 2},

courses/frappe_snowland/course_data.h

@@ -75,8 +75,8 @@ extern Gfx d_course_frappe_snowland_dl_3198[];
 extern Gfx d_course_frappe_snowland_dl_3270[];
 extern Gfx d_course_frappe_snowland_dl_3328[];
 extern Gfx d_course_frappe_snowland_dl_33E0[];
-extern TrackWaypoint d_course_frappe_unknown_waypoints[];
-extern TrackWaypoint d_course_frappe_track_waypoints[];
+extern TrackWaypoint d_course_frappe_snowland_unknown_waypoints[];
+extern TrackWaypoint d_course_frappe_snowland_track_waypoints[];
 extern u8 d_course_frappe_snowland_snowman_tlut[];
 extern u8 d_course_frappe_snowland_snowman_head[];
 extern u8 d_course_frappe_snowland_snowman_body[];

courses/koopa_troopa_beach/course_data.c

@@ -6766,7 +6766,7 @@ Gfx d_course_koopa_troopa_beach_dl_AD40[] =
 };
 
 // 0xADE0 path
-TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[] = {
+TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints[] = {
     {-34, 0, 103, 0},
     {-34, 0, 60, 0},
     {-38, 0, -184, 0},
@@ -6893,7 +6893,7 @@ TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints1[] = {
     {-32768, 0, 0, 0},
 };
 
-TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[] = {
+TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[] = {
     {-34, 1, 81, 1},
     {-34, 1, 61, 1},
     {-34, 1, 41, 1},
@@ -7505,7 +7505,7 @@ TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[] = {
     {-32768, -32768, -32768, 0},
 };
 
-TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[] = {
+TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[] = {
     {-29, 1, 88, 1},
     {-29, 1, 68, 1},
     {-29, 1, 48, 1},

courses/koopa_troopa_beach/course_data.h

@@ -306,10 +306,10 @@ extern Gfx d_course_koopa_troopa_beach_dl_AB88[];
 extern Gfx d_course_koopa_troopa_beach_dl_AC10[];
 extern Gfx d_course_koopa_troopa_beach_dl_AC68[];
 extern Gfx d_course_koopa_troopa_beach_dl_AD40[];
-extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints0[];
+extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints[];
 extern TrackWaypoint d_course_koopa_troopa_beach_unknown_waypoints1[];
-extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints0[];
-extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints1[];
+extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints[];
+extern TrackWaypoint d_course_koopa_troopa_beach_track_waypoints_2[];
 extern u8 d_course_koopa_troopa_beach_crab_tlut[];
 extern u8 d_course_koopa_troopa_beach_crab_frames[][4096];
 extern u32 d_course_koopa_troopa_beach_unk_data1[];