mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-23 22:53:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3d-objects' into general-object

Browse Source
This commit is contained in:
coco875
2024-09-05 22:01:39 +02:00
parent a353c4d954 c15d2d66f0
commit f5347b38cc
480 changed files with 196460 additions and 209301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-format
+17 -12
View File
@@ -1,18 +1,23 @@
IndentWidth: 4
Language: Cpp
AlignAfterOpenBracket: Align
SortIncludes: false
ColumnLimit: 104
PointerAlignment: Right
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
BinPackArguments: true
BinPackParameters: true
SpaceAfterCStyleCast: true
UseTab: Never
ColumnLimit: 120
PointerAlignment: Left
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: NonAssignment
SpaceAfterCStyleCast: true
Cpp11BracedListStyle: false
IndentCaseLabels: true
BinPackArguments: true
BinPackParameters: true
AlignAfterOpenBracket: Align
AlignOperands: true
BreakBeforeTernaryOperators: true
BreakBeforeBinaryOperators: None
AllowShortBlocksOnASingleLine: true
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
AlignEscapedNewlines: Left
AlignTrailingComments: true
UseTab: Never
SortIncludes: false
.clang-tidy
+6 -3
View File
@@ -1,6 +1,9 @@
---
Checks: '-*,readability-braces-around-statements'
Checks: '-*,readability-braces-around-statements,readability-inconsistent-declaration-parameter-name'
WarningsAsErrors: ''
HeaderFilterRegex: '(src|include|enhancements)\/.*\.h$'
HeaderFilterRegex: '(src|include)\/.*\.h$'
FormatStyle: 'file'
CheckOptions:
# Require argument names to match exactly (instead of allowing a name to be a prefix/suffix of another)
# Note: 'true' is expected by clang-tidy 12+ but '1' is used for compatibility with older versions
- key: readability-inconsistent-declaration-parameter-name.Strict
value: 1
.github/workflows/clang-format.yml
+21
View File
@@ -0,0 +1,21 @@
name: clang-format Check
on: [push, pull_request]
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
strategy:
matrix:
path:
- include
- data
- courses
- src
steps:
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: "18"
check-path: ${{ matrix.path }}
exclude-regex: "gbi.h"
.github/workflows/linux-compile.yml
+1 -1
View File
@@ -27,4 +27,4 @@ jobs:
cp -r complementary_file/* .
echo "${{ secrets.AES_KEY }}" | openssl enc -d -aes-256-cbc -pass stdin -pbkdf2 -in baserom.us.z64.aes -out baserom.us.z64
make assets
make -j
make -j || ./first-diff.py
.gitignore
Executable → Regular
+3
View File
@@ -100,5 +100,8 @@ mingw64/
.ash_history
!tools/ido-recomp/*/*
# models
*.blend
# torch
torch.hash.yml
.gitmodules
+3
View File
@@ -13,3 +13,6 @@
[submodule "tools/torch"]
path = tools/torch
url = https://github.com/HarbourMasters/torch
[submodule "tools/blender/fast64"]
path = tools/blender/fast64
url = https://github.com/Fast-64/fast64.git
Makefile
+28 -5
View File
@@ -81,6 +81,7 @@ endif
ifeq ($(COMPILER),ido)
MIPSISET := -mips2
else ifeq ($(COMPILER),gcc)
DEFINES += AVOID_UB=1 NON_MATCHING=1
NON_MATCHING := 1
VERSION_ASFLAGS := --defsym AVOID_UB=1
MIPSISET := -mips3
@@ -270,7 +271,18 @@ GLOBAL_ASM_OS_O_FILES = $(foreach file,$(GLOBAL_ASM_OS_FILES),$(BUILD_DIR)/$(fil
GLOBAL_ASM_AUDIO_O_FILES = $(foreach file,$(GLOBAL_ASM_AUDIO_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
GLOBAL_ASM_RACING_O_FILES = $(foreach file,$(GLOBAL_ASM_RACING_C_FILES),$(BUILD_DIR)/$(file:.c=.o))
ifneq ($(BLENDER),)
else ifneq ($(call find-command,blender),)
BLENDER := blender
else ifeq ($(DETECTED_OS), windows)
BLENDER := "C:\Program Files\Blender Foundation\Blender 3.6\blender.exe"
endif
MODELS_JSON := $(call rwildcard,models,*.json)
MODELS_PROC := $(MODELS_JSON:%.json=%)
models/%: models/%.json
$(PYTHON) tools/blender/extract_models.py $(BLENDER) $<
#==============================================================================#
# Compiler Options #
@@ -279,13 +291,13 @@ GLOBAL_ASM_RACING_O_FILES = $(foreach file,$(GLOBAL_ASM_RACING_C_FILES),$(BUILD_
# detect prefix for MIPS toolchain
ifneq ($(CROSS),)
else ifneq ($(call find-command,mips-linux-gnu-ld),)
CROSS := mips-linux-gnu-
CROSS := mips-linux-gnu-
else ifneq ($(call find-command,mips64-linux-gnu-ld),)
CROSS := mips64-linux-gnu-
CROSS := mips64-linux-gnu-
else ifneq ($(call find-command,mips64-elf-ld),)
CROSS := mips64-elf-
CROSS := mips64-elf-
else
$(error Unable to detect a suitable MIPS toolchain installed)
$(error Unable to detect a suitable MIPS toolchain installed)
endif
AS := $(CROSS)as
@@ -433,9 +445,17 @@ doc:
@$(PRINT) "$(GREEN)Documentation generated in docs/html$(NO_COL)\n"
@$(PRINT) "$(GREEN)Results can be viewed by opening docs/html/index.html in a web browser$(NO_COL)\n"
format:
@$(PYTHON) $(TOOLS_DIR)/format.py -j $(N_THREADS)
clean:
$(RM) -r $(BUILD_DIR)
model_extract: $(MODELS_PROC)
fast64_blender:
$(BLENDER) --python tools/blender/fast64_run.py
distclean: distclean_assets
$(RM) -r $(BUILD_DIR_BASE)
$(PYTHON) extract_assets.py --clean
@@ -581,6 +601,9 @@ LDFLAGS += $(foreach elf,$(COURSE_DATA_ELFS),-R $(elf))
COURSE_DATA_TARGETS := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.mio0.o)
COURSE_DISPLAYLIST_OFILES := $(foreach dir,$(COURSE_DIRS),$(BUILD_DIR)/$(dir)/course_data.o)
$(COURSE_DISPLAYLIST_OFILES): $(BUILD_DIR)/%/course_data.o: %/course_textures.linkonly.h
%/course_data.elf: %/course_data.o %/course_displaylists.inc.elf
$(V)$(LD) -t -e 0 -Ttext=06000000 -Map $@.map -R $*/course_displaylists.inc.elf -o $@ $< --no-check-sections
@@ -633,7 +656,7 @@ $(GLOBAL_ASM_RACING_O_FILES): CC := $(PYTHON) $(TOOLS_DIR)/asm_processor/build.p
$(BUILD_DIR)/src/os/%.o: OPT_FLAGS :=
$(BUILD_DIR)/src/os/math/%.o: OPT_FLAGS := -O2
$(BUILD_DIR)/src/os/math/ll%.o: OPT_FLAGS :=
$(BUILD_DIR)/src/os/math/ll%.o: MIPSISET := -mips3 -32
$(BUILD_DIR)/src/os/math/ll%.o: MIPSISET := -mips3
$(BUILD_DIR)/src/os/ldiv.o: OPT_FLAGS := -O2
$(BUILD_DIR)/src/os/string.o: OPT_FLAGS := -O2
$(BUILD_DIR)/src/os/gu%.o: OPT_FLAGS := -O3
README.md
+2 -1
View File
@@ -95,6 +95,7 @@ Documentation generated using [Doxygen](https://www.doxygen.nl/index.html). Run
Pull requests are welcome. For major changes, please discuss in the Discord.
Run `clang-format` on your code to ensure it meets the project's coding standards.
Run `make format` to ensure it meets the project's coding standards.
If code needs to avoid formatting place `// clang-format off` before the code and `// clang-format on` after.
Official Discord: [discord.gg/DuYH3Fh](https://discord.gg/DuYH3Fh)
asm/boot.s
+45 -45
View File
@@ -19,8 +19,8 @@ glabel ipl3_entry # 0xA4000040
mtc0 $zero, $13
mtc0 $zero, $9
mtc0 $zero, $11
lui $t0, %hi(RI_MODE_REG)
addiu $t0, %lo(RI_MODE_REG)
lui $t0, %hi(PHYS_TO_K1|RI_MODE_REG)
addiu $t0, %lo(PHYS_TO_K1|RI_MODE_REG)
lw $t1, 0xc($t0)
bnez $t1, .LA4000410
nop
@@ -30,12 +30,12 @@ glabel ipl3_entry # 0xA4000040
sw $s5, 8($sp)
sw $s6, 0xc($sp)
sw $s7, 0x10($sp)
lui $t0, %hi(RI_MODE_REG)
addiu $t0, %lo(RI_MODE_REG)
lui $t0, %hi(PHYS_TO_K1|RI_MODE_REG)
addiu $t0, %lo(PHYS_TO_K1|RI_MODE_REG)
lui $t2, (0xa3f80000 >> 16)
lui $t3, (0xa3f00000 >> 16)
lui $t4, %hi(MI_MODE_REG)
addiu $t4, %lo(MI_MODE_REG)
lui $t4, %hi(PHYS_TO_K1|MI_MODE_REG)
addiu $t4, %lo(PHYS_TO_K1|MI_MODE_REG)
ori $t1, $zero, 64
sw $t1, 4($t0)
li $s1, 8000
@@ -81,8 +81,8 @@ glabel ipl3_entry # 0xA4000040
lui $s4, (0xA0000000 >> 16)
addiu $sp, $sp, -0x48
move $fp, $sp
lui $s0, %hi(MI_VERSION_REG)
lw $s0, %lo(MI_VERSION_REG)($s0)
lui $s0, %hi(PHYS_TO_K1|MI_VERSION_REG)
lw $s0, %lo(PHYS_TO_K1|MI_VERSION_REG)($s0)
lui $s1, (0x01010101 >> 16)
addiu $s1, (0x01010101 & 0xFFFF)
bne $s0, $s1, .LA4000160
@@ -232,13 +232,13 @@ glabel ipl3_entry # 0xA4000040
slt $t0, $v1, $t5
bnez $t0, .LA4000274
nop
lui $t2, %hi(RI_REFRESH_REG)
lui $t2, %hi(PHYS_TO_K1|RI_REFRESH_REG)
sll $s2, $s2, 0x13
lui $t1, (0x00063634 >> 16)
ori $t1, (0x00063634 & 0xFFFF)
or $t1, $t1, $s2
sw $t1, %lo(RI_REFRESH_REG)($t2)
lw $t1, %lo(RI_REFRESH_REG)($t2)
sw $t1, %lo(PHYS_TO_K1|RI_REFRESH_REG)($t2)
lw $t1, %lo(PHYS_TO_K1|RI_REFRESH_REG)($t2)
lui $t0, (0xA0000300 >> 16)
ori $t0, (0xA0000300 & 0xFFFF)
lui $t1, (0x0FFFFFFF >> 16)
@@ -328,24 +328,24 @@ glabel ipl3_entry # 0xA4000040
lw $t1, %lo(D_B0000008)($t3)
lui $t2, (0x1FFFFFFF >> 16)
ori $t2, (0x1FFFFFFF & 0xFFFF)
lui $at, %hi(PI_DRAM_ADDR_REG)
lui $at, %hi(PHYS_TO_K1|PI_DRAM_ADDR_REG)
and $t1, $t1, $t2
sw $t1, %lo(PI_DRAM_ADDR_REG)($at)
lui $t0, %hi(PI_STATUS_REG)
sw $t1, %lo(PHYS_TO_K1|PI_DRAM_ADDR_REG)($at)
lui $t0, %hi(PHYS_TO_K1|PI_STATUS_REG)
.LA40004D0:
lw $t0, %lo(PI_STATUS_REG)($t0)
lw $t0, %lo(PHYS_TO_K1|PI_STATUS_REG)($t0)
andi $t0, $t0, 2
bnezl $t0, .LA40004D0
lui $t0, %hi(PI_STATUS_REG)
lui $t0, %hi(PHYS_TO_K1|PI_STATUS_REG)
li $t0, 0x1000
add $t0, $t0, $t3
and $t0, $t0, $t2
lui $at, %hi(PI_CART_ADDR_REG)
sw $t0, %lo(PI_CART_ADDR_REG)($at)
lui $at, %hi(PHYS_TO_K1|PI_CART_ADDR_REG)
sw $t0, %lo(PHYS_TO_K1|PI_CART_ADDR_REG)($at)
lui $t2, 0x0010
addiu $t2, 0xFFFF
lui $at, %hi(PI_WR_LEN_REG)
sw $t2, %lo(PI_WR_LEN_REG)($at)
lui $at, %hi(PHYS_TO_K1|PI_WR_LEN_REG)
sw $t2, %lo(PHYS_TO_K1|PI_WR_LEN_REG)($at)
.LA4000514:
nop
@@ -376,8 +376,8 @@ glabel ipl3_entry # 0xA4000040
nop
nop
nop
lui $t3, %hi(PI_STATUS_REG)
lw $t3, %lo(PI_STATUS_REG)($t3)
lui $t3, %hi(PHYS_TO_K1|PI_STATUS_REG)
lw $t3, %lo(PHYS_TO_K1|PI_STATUS_REG)($t3)
andi $t3, $t3, 0x1
bnez $t3, .LA4000514
nop
@@ -451,37 +451,37 @@ halt: # checksum fail
nop
func_A4000690:
lui $t1, %hi(SP_PC)
lw $t1, %lo(SP_PC)($t1)
lui $t1, %hi(PHYS_TO_K1|SP_PC_REG)
lw $t1, %lo(PHYS_TO_K1|SP_PC_REG)($t1)
lw $s0, 0x14($sp)
lw $ra, 0x1c($sp)
beqz $t1, .LA40006BC
addiu $sp, $sp, 0x20
li $t2, 65
lui $at, %hi(SP_STATUS_REG)
sw $t2, %lo(SP_STATUS_REG)($at)
lui $at, %hi(SP_PC)
sw $zero, %lo(SP_PC)($at)
lui $at, %hi(PHYS_TO_K1|SP_STATUS_REG)
sw $t2, %lo(PHYS_TO_K1|SP_STATUS_REG)($at)
lui $at, %hi(PHYS_TO_K1|SP_PC_REG)
sw $zero, %lo(PHYS_TO_K1|SP_PC_REG)($at)
.LA40006BC:
lui $t3, (0x00AAAAAE >> 16)
ori $t3, (0x00AAAAAE & 0xFFFF)
lui $at, %hi(SP_STATUS_REG)
sw $t3, %lo(SP_STATUS_REG)($at)
lui $at, %hi(MI_INTR_MASK_REG)
lui $at, %hi(PHYS_TO_K1|SP_STATUS_REG)
sw $t3, %lo(PHYS_TO_K1|SP_STATUS_REG)($at)
lui $at, %hi(PHYS_TO_K1|MI_INTR_MASK_REG)
li $t0, 1365
sw $t0, %lo(MI_INTR_MASK_REG)($at)
lui $at, %hi(SI_STATUS_REG)
sw $zero, %lo(SI_STATUS_REG)($at)
lui $at, %hi(AI_STATUS_REG)
sw $zero, %lo(AI_STATUS_REG)($at)
lui $at, %hi(MI_MODE_REG)
sw $t0, %lo(PHYS_TO_K1|MI_INTR_MASK_REG)($at)
lui $at, %hi(PHYS_TO_K1|SI_STATUS_REG)
sw $zero, %lo(PHYS_TO_K1|SI_STATUS_REG)($at)
lui $at, %hi(PHYS_TO_K1|AI_STATUS_REG)
sw $zero, %lo(PHYS_TO_K1|AI_STATUS_REG)($at)
lui $at, %hi(PHYS_TO_K1|MI_MODE_REG)
li $t1, 2048
sw $t1, %lo(MI_MODE_REG)($at)
sw $t1, %lo(PHYS_TO_K1|MI_MODE_REG)($at)
li $t1, 2
lui $at, %hi(PI_STATUS_REG)
lui $at, %hi(PHYS_TO_K1|PI_STATUS_REG)
lui $t0, (0xA0000300 >> 16)
ori $t0, (0xA0000300 & 0xFFFF)
sw $t1, %lo(PI_STATUS_REG)($at)
sw $t1, %lo(PHYS_TO_K1|PI_STATUS_REG)($at)
sw $s7, 0x14($t0)
sw $s5, 0xc($t0)
sw $s3, 0x4($t0)
@@ -747,8 +747,8 @@ func_A4000A40:
li $k1, 1
bne $a1, $k1, .LA4000AC0
sw $t7, ($s5)
lui $k0, %hi(MI_MODE_REG)
sw $zero, %lo(MI_MODE_REG)($k0)
lui $k0, %hi(PHYS_TO_K1|MI_MODE_REG)
sw $zero, %lo(PHYS_TO_K1|MI_MODE_REG)($k0)
.LA4000AC0:
lw $ra, 0x1c($sp)
addiu $sp, $sp, 0x28
@@ -759,12 +759,12 @@ func_A4000AD0:
addiu $sp, $sp, -0x28
sw $ra, 0x1c($sp)
li $k0, 0x2000
lui $k1, %hi(MI_MODE_REG)
sw $k0, %lo(MI_MODE_REG)($k1)
lui $k1, %hi(PHYS_TO_K1|MI_MODE_REG)
sw $k0, %lo(PHYS_TO_K1|MI_MODE_REG)($k1)
move $fp, $zero
lw $fp, ($s5)
li $k0, 0x1000
sw $k0, %lo(MI_MODE_REG)($k1)
sw $k0, %lo(PHYS_TO_K1|MI_MODE_REG)($k1)
li $k1, 0x40
and $k1, $k1, $fp
srl $k1, $k1, 6
asm/eu_nonmatchings/audio_init.s
+2 -2
View File
@@ -18,7 +18,7 @@ glabel audio_init
/* BCD08 800BC108 3C04800F */ lui $a0, %hi(gAudioHeapSize)
/* BCD0C 800BC10C 8C84A710 */ lw $a0, %lo(gAudioHeapSize)($a0)
/* BCD10 800BC110 00001825 */ or $v1, $zero, $zero
/* BCD14 800BC114 3C0A803B */ lui $t2, %hi(D_803B71A0)
/* BCD14 800BC114 3C0A803B */ lui $t2, %hi(gAudioGlobalsEndMarker)
/* BCD18 800BC118 04810003 */ bgez $a0, .L800BC128
/* BCD1C 800BC11C 000478C3 */ sra $t7, $a0, 3
/* BCD20 800BC120 24810007 */ addiu $at, $a0, 0x7
@@ -40,7 +40,7 @@ glabel audio_init
/* BCD58 800BC158 AC48FFF8 */ sw $t0, -0x8($v0)
.L800BC15C:
/* BCD5C 800BC15C 2482F780 */ addiu $v0, $a0, %lo(gGfxSPTaskOutputBufferSize)
/* BCD60 800BC160 254A71A0 */ addiu $t2, $t2, %lo(D_803B71A0)
/* BCD60 800BC160 254A71A0 */ addiu $t2, $t2, %lo(gAudioGlobalsEndMarker)
/* BCD64 800BC164 01421823 */ subu $v1, $t2, $v0
/* BCD68 800BC168 000380C2 */ srl $s0, $v1, 3
/* BCD6C 800BC16C 06000008 */ bltz $s0, .L800BC190
asm/non_matchings/audio/load/audio_init.s
+2 -2
View File
@@ -26,7 +26,7 @@ glabel audio_init
/* 0BCD08 800BC108 3C04800F */ lui $a0, %hi(gAudioHeapSize) # $a0, 0x800f
/* 0BCD0C 800BC10C 8C84A5D0 */ lw $a0, %lo(gAudioHeapSize)($a0)
/* 0BCD10 800BC110 00001825 */ move $v1, $zero
/* 0BCD14 800BC114 3C0A803B */ lui $t2, %hi(D_803B71A0) # $t2, 0x803b
/* 0BCD14 800BC114 3C0A803B */ lui $t2, %hi(gAudioGlobalsEndMarker) # $t2, 0x803b
/* 0BCD18 800BC118 04810003 */ bgez $a0, .L800BC128
/* 0BCD1C 800BC11C 000478C3 */ sra $t7, $a0, 3
/* 0BCD20 800BC120 24810007 */ addiu $at, $a0, 7
@@ -48,7 +48,7 @@ glabel audio_init
/* 0BCD58 800BC158 AC48FFF8 */ sw $t0, -8($v0)
.L800BC15C:
/* 0BCD5C 800BC15C 2482F780 */ addiu $v0, $a0, %lo(gGfxSPTaskOutputBufferSize) # -0x880
/* 0BCD60 800BC160 254A71A0 */ addiu $t2, %lo(D_803B71A0) # addiu $t2, $t2, 0x71a0
/* 0BCD60 800BC160 254A71A0 */ addiu $t2, %lo(gAudioGlobalsEndMarker) # addiu $t2, $t2, 0x71a0
/* 0BCD64 800BC164 01421823 */ subu $v1, $t2, $v0
/* 0BCD68 800BC168 000380C2 */ srl $s0, $v1, 3
/* 0BCD6C 800BC16C 06000007 */ bltz $s0, .L800BC18C
asm/non_matchings/code_80091750/add_8018D9E0_entry.s
+2 -2
View File
@@ -1025,8 +1025,8 @@ glabel L8009F388
/* 0A000C 8009F40C 8FBF001C */ lw $ra, 0x1c($sp)
/* 0A0010 8009F410 804F0000 */ lb $t7, ($v0)
.L8009F414:
/* 0A0014 8009F414 3C198019 */ lui $t9, %hi(gCupCourseSelection) # $t9, 0x8019
/* 0A0018 8009F418 8339EE0B */ lb $t9, %lo(gCupCourseSelection)($t9)
/* 0A0014 8009F414 3C198019 */ lui $t9, %hi(gCourseIndexInCup) # $t9, 0x8019
/* 0A0018 8009F418 8339EE0B */ lb $t9, %lo(gCourseIndexInCup)($t9)
/* 0A001C 8009F41C 000F7080 */ sll $t6, $t7, 2
/* 0A0020 8009F420 0C02D567 */ jal func_800B559C
/* 0A0024 8009F424 01D92021 */ addu $a0, $t6, $t9
asm/non_matchings/code_80091750/func_800AB314.s
+2 -2
View File
@@ -27,10 +27,10 @@ glabel func_800AB314
/* 0ABF74 800AB374 24040001 */ li $a0, 1
/* 0ABF78 800AB378 24030003 */ li $v1, 3
/* 0ABF7C 800AB37C 108F003A */ beq $a0, $t7, .L800AB468
/* 0ABF80 800AB380 3C028019 */ lui $v0, %hi(gCupCourseSelection) # $v0, 0x8019
/* 0ABF80 800AB380 3C028019 */ lui $v0, %hi(gCourseIndexInCup) # $v0, 0x8019
/* 0ABF84 800AB384 ACC00004 */ sw $zero, 4($a2)
/* 0ABF88 800AB388 ACC00020 */ sw $zero, 0x20($a2)
/* 0ABF8C 800AB38C 2442EE0B */ addiu $v0, %lo(gCupCourseSelection) # addiu $v0, $v0, -0x11f5
/* 0ABF8C 800AB38C 2442EE0B */ addiu $v0, %lo(gCourseIndexInCup) # addiu $v0, $v0, -0x11f5
/* 0ABF90 800AB390 80580000 */ lb $t8, ($v0)
/* 0ABF94 800AB394 8FB90024 */ lw $t9, 0x24($sp)
/* 0ABF98 800AB398 8FAB0024 */ lw $t3, 0x24($sp)
asm/non_matchings/code_80091750/func_800AC458.s
+2 -2
View File
@@ -255,7 +255,7 @@ glabel L800AC7CC
/* 0AD3DC 800AC7DC ACEF001C */ sw $t7, 0x1c($a3)
/* 0AD3E0 800AC7E0 8318D9D8 */ lb $t8, %lo(D_8018D9D8)($t8)
/* 0AD3E4 800AC7E4 25EAFFFB */ addiu $t2, $t7, -5
/* 0AD3E8 800AC7E8 3C0D8019 */ lui $t5, %hi(gCupCourseSelection) # $t5, 0x8019
/* 0AD3E8 800AC7E8 3C0D8019 */ lui $t5, %hi(gCourseIndexInCup) # $t5, 0x8019
/* 0AD3EC 800AC7EC 53000003 */ beql $t8, $zero, .L800AC7FC
/* 0AD3F0 800AC7F0 8CEB001C */ lw $t3, 0x1c($a3)
/* 0AD3F4 800AC7F4 ACEA001C */ sw $t2, 0x1c($a3)
@@ -265,7 +265,7 @@ glabel L800AC7CC
/* 0AD400 800AC800 8FBF0014 */ lw $ra, 0x14($sp)
/* 0AD404 800AC804 ACEC0004 */ sw $t4, 4($a3)
/* 0AD408 800AC808 ACE0001C */ sw $zero, 0x1c($a3)
/* 0AD40C 800AC80C 81ADEE0B */ lb $t5, %lo(gCupCourseSelection)($t5)
/* 0AD40C 800AC80C 81ADEE0B */ lb $t5, %lo(gCourseIndexInCup)($t5)
/* 0AD410 800AC810 24010003 */ li $at, 3
/* 0AD414 800AC814 00002825 */ move $a1, $zero
/* 0AD418 800AC818 15A10053 */ bne $t5, $at, .L800AC968
asm/non_matchings/save/func_800B5218.s
+2 -2
View File
@@ -1,8 +1,8 @@
glabel func_800B5218
/* 0B5E18 800B5218 3C0E8019 */ lui $t6, %hi(gCupSelection) # $t6, 0x8019
/* 0B5E1C 800B521C 81CEEE09 */ lb $t6, %lo(gCupSelection)($t6)
/* 0B5E20 800B5220 3C188019 */ lui $t8, %hi(gCupCourseSelection) # $t8, 0x8019
/* 0B5E24 800B5224 8318EE0B */ lb $t8, %lo(gCupCourseSelection)($t8)
/* 0B5E20 800B5220 3C188019 */ lui $t8, %hi(gCourseIndexInCup) # $t8, 0x8019
/* 0B5E24 800B5224 8318EE0B */ lb $t8, %lo(gCourseIndexInCup)($t8)
/* 0B5E28 800B5228 3C09800F */ lui $t1, %hi(gCharacterSelections) # $t1, 0x800f
/* 0B5E2C 800B522C 812986A8 */ lb $t1, %lo(gCharacterSelections)($t1)
/* 0B5E30 800B5230 27BDFFB8 */ addiu $sp, $sp, -0x48
asm/os/__osDisableInt.s
+4 -4
View File
@@ -8,10 +8,10 @@
glabel __osDisableInt
mfc0 $t0, $12
and $t1, $t0, -2
mtc0 $t1, $12
andi $v0, $t0, 1
mfc0 $t0, C0_SR
and $t1, $t0, ~SR_IE
mtc0 $t1, C0_SR
andi $v0, $t0, SR_IE
nop
jr $ra
nop
asm/os/__osException.s
+430 -395
View File
File diff suppressed because it is too large Load Diff
asm/os/__osGetSR.s
+1 -1
View File
@@ -7,7 +7,7 @@
.section .text, "ax"
glabel __osGetSR
mfc0 $v0, $12
mfc0 $v0, C0_SR
jr $ra
nop
asm/os/__osProbeTLB.s
+15 -15
View File
@@ -8,20 +8,20 @@
.section .text, "ax"
glabel __osProbeTLB
mfc0 $t0, $10
andi $t1, $t0, 0xff
li $at, -8192
mfc0 $t0, C0_ENTRYHI
andi $t1, $t0, TLBHI_PIDMASK
li $at, TLBHI_VPN2MASK
and $t2, $a0, $at
or $t1, $t1, $t2
mtc0 $t1, $10
mtc0 $t1, C0_ENTRYHI
nop
nop
nop
tlbp
nop
nop
mfc0 $t3, $0
lui $at, 0x8000
mfc0 $t3, C0_INX
lui $at, %hi(TLBINX_PROBE)
and $t3, $t3, $at
bnez $t3, .L8032A0D8
nop
@@ -29,25 +29,25 @@ glabel __osProbeTLB
nop
nop
nop
mfc0 $t3, $5
addi $t3, $t3, 0x2000
mfc0 $t3, C0_PAGEMASK
addi $t3, $t3, DCACHE_SIZE
srl $t3, $t3, 1
and $t4, $t3, $a0
bnez $t4, .L8032A0A8
addi $t3, $t3, -1
mfc0 $v0, $2
mfc0 $v0, C0_ENTRYLO0
b .L8032A0AC
nop
.L8032A0A8:
mfc0 $v0, $3
mfc0 $v0, C0_ENTRYLO1
.L8032A0AC:
andi $t5, $v0, 2
andi $t5, $v0, TLBLO_V
beqz $t5, .L8032A0D8
nop
lui $at, (0x3FFFFFC0 >> 16) # lui $at, 0x3fff
ori $at, (0x3FFFFFC0 & 0xFFFF) # ori $at, $at, 0xffc0
lui $at, (TLBLO_PFNMASK >> 16) # lui $at, 0x3fff
ori $at, %lo(TLBLO_PFNMASK) # ori $at, $at, 0xffc0
and $v0, $v0, $at
sll $v0, $v0, 6
sll $v0, $v0, TLBLO_PFNSHIFT
and $t5, $a0, $t3
add $v0, $v0, $t5
b .L8032A0DC
@@ -55,7 +55,7 @@ glabel __osProbeTLB
.L8032A0D8:
li $v0, -1
.L8032A0DC:
mtc0 $t0, $10
mtc0 $t0, C0_ENTRYHI
jr $ra
nop
asm/os/__osRestoreInt.s
+2 -2
View File
@@ -7,9 +7,9 @@
.section .text, "ax"
glabel __osRestoreInt
mfc0 $t0, $12
mfc0 $t0, C0_SR
or $t0, $t0, $a0
mtc0 $t0, $12
mtc0 $t0, C0_SR
nop
nop
jr $ra
asm/os/__osSetCompare.s
+1 -1
View File
@@ -7,7 +7,7 @@
.section .text, "ax"
glabel __osSetCompare
mtc0 $a0, $11
mtc0 $a0, C0_COMPARE
jr $ra
nop
asm/os/__osSetSR.s
+1 -1
View File
@@ -7,7 +7,7 @@
.section .text, "ax"
glabel __osSetSR
mtc0 $a0, $12
mtc0 $a0, C0_SR
nop
jr $ra
nop
asm/os/bcopy.s
+37 -37
View File
@@ -8,28 +8,28 @@
.section .text, "ax"
glabel bcopy
beqz $a2, .L80323A4C
beqz $a2, ret
move $a3, $a1
beq $a0, $a1, .L80323A4C
beq $a0, $a1, ret
slt $at, $a1, $a0
bnezl $at, .L80323A14
bnezl $at, goforwards
slti $at, $a2, 0x10
add $v0, $a0, $a2
slt $at, $a1, $v0
beql $at, $zero, .L80323A14
beql $at, $zero, goforwards
slti $at, $a2, 0x10
b .L80323B78
b gobackwards
slti $at, $a2, 0x10
slti $at, $a2, 0x10
.L80323A14:
bnez $at, .L80323A2C
goforwards:
bnez $at, forwards_bytecopy
nop
andi $v0, $a0, 3
andi $v1, $a1, 3
beq $v0, $v1, .L80323A54
beq $v0, $v1, forwalignable
nop
.L80323A2C:
beqz $a2, .L80323A4C
forwards_bytecopy:
beqz $a2, ret
nop
addu $v1, $a0, $a2
.L80323A38:
@@ -38,31 +38,31 @@ glabel bcopy
addiu $a1, $a1, 1
bne $a0, $v1, .L80323A38
sb $v0, -1($a1)
.L80323A4C:
ret:
jr $ra
move $v0, $a3
.L80323A54:
beqz $v0, .L80323AB8
forwalignable:
beqz $v0, forwards
li $at, 1
beq $v0, $at, .L80323A9C
beq $v0, $at, forw_copy3
li $at, 2
beql $v0, $at, .L80323A88
beql $v0, $at, forw_copy2
lh $v0, ($a0)
lb $v0, ($a0)
addiu $a0, $a0, 1
addiu $a1, $a1, 1
addiu $a2, $a2, -1
b .L80323AB8
b forwards
sb $v0, -1($a1)
lh $v0, ($a0)
.L80323A88:
forw_copy2:
addiu $a0, $a0, 2
addiu $a1, $a1, 2
addiu $a2, $a2, -2
b .L80323AB8
b forwards
sh $v0, -2($a1)
.L80323A9C:
forw_copy3:
lb $v0, ($a0)
lh $v1, 1($a0)
addiu $a0, $a0, 3
@@ -70,9 +70,9 @@ glabel bcopy
addiu $a2, $a2, -3
sb $v0, -3($a1)
sh $v1, -2($a1)
.L80323AB8:
forwards:
slti $at, $a2, 0x20
bnezl $at, .L80323B18
bnezl $at, forwards_16
slti $at, $a2, 0x10
lw $v0, ($a0)
lw $v1, 4($a0)
@@ -92,11 +92,11 @@ glabel bcopy
sw $t2, -0x10($a1)
sw $t3, -0xc($a1)
sw $t4, -8($a1)
b .L80323AB8
b forwards
sw $t5, -4($a1)
.L80323B14:
slti $at, $a2, 0x10
.L80323B18:
forwards_16:
bnezl $at, .L80323B54
slti $at, $a2, 4
lw $v0, ($a0)
@@ -111,19 +111,19 @@ glabel bcopy
sw $t0, -8($a1)
b .L80323B14
sw $t1, -4($a1)
.L80323B50:
forwards_4:
slti $at, $a2, 4
.L80323B54:
bnez $at, .L80323A2C
bnez $at, forwards_bytecopy
nop
lw $v0, ($a0)
addiu $a0, $a0, 4
addiu $a1, $a1, 4
addiu $a2, $a2, -4
b .L80323B50
b forwards_4
sw $v0, -4($a1)
slti $at, $a2, 0x10
.L80323B78:
gobackwards:
add $a0, $a0, $a2
bnez $at, .L80323B94
add $a1, $a1, $a2
@@ -132,7 +132,7 @@ glabel bcopy
beq $v0, $v1, .L80323BC4
nop
.L80323B94:
beqz $a2, .L80323A4C
beqz $a2, ret
nop
addiu $a0, $a0, -1
addiu $a1, $a1, -1
@@ -147,7 +147,7 @@ glabel bcopy
move $v0, $a3
.L80323BC4:
beqz $v0, .L80323C28
beqz $v0, backwards_32
li $at, 3
beq $v0, $at, .L80323C0C
li $at, 2
@@ -157,14 +157,14 @@ glabel bcopy
addiu $a0, $a0, -1
addiu $a1, $a1, -1
addiu $a2, $a2, -1
b .L80323C28
b backwards_32
sb $v0, ($a1)
lh $v0, -2($a0)
.L80323BF8:
addiu $a0, $a0, -2
addiu $a1, $a1, -2
addiu $a2, $a2, -2
b .L80323C28
b backwards_32
sh $v0, ($a1)
.L80323C0C:
lb $v0, -1($a0)
@@ -174,7 +174,7 @@ glabel bcopy
addiu $a2, $a2, -3
sb $v0, 2($a1)
sh $v1, ($a1)
.L80323C28:
backwards_32:
slti $at, $a2, 0x20
bnezl $at, .L80323C88
slti $at, $a2, 0x10
@@ -196,9 +196,9 @@ glabel bcopy
sw $t2, 0xc($a1)
sw $t3, 8($a1)
sw $t4, 4($a1)
b .L80323C28
b backwards_32
sw $t5, ($a1)
.L80323C84:
backwards_16:
slti $at, $a2, 0x10
.L80323C88:
bnezl $at, .L80323CC4
@@ -213,9 +213,9 @@ glabel bcopy
sw $v0, 0xc($a1)
sw $v1, 8($a1)
sw $t0, 4($a1)
b .L80323C84
b backwards_16
sw $t1, ($a1)
.L80323CC0:
backwards_4:
slti $at, $a2, 4
.L80323CC4:
bnez $at, .L80323B94
@@ -224,7 +224,7 @@ glabel bcopy
addiu $a0, $a0, -4
addiu $a1, $a1, -4
addiu $a2, $a2, -4
b .L80323CC0
b backwards_4
sw $v0, ($a1)
nop
nop
asm/os/bzero.s
+9 -9
View File
@@ -11,17 +11,17 @@
glabel bzero
/* 0CE660 800CDA60 28A1000C */ slti $at, $a1, 0xc
/* 0CE664 800CDA64 1420001D */ bnez $at, .L800CDADC
/* 0CE664 800CDA64 1420001D */ bnez $at, bytezero
/* 0CE668 800CDA68 00041823 */ negu $v1, $a0
/* 0CE66C 800CDA6C 30630003 */ andi $v1, $v1, 3
/* 0CE670 800CDA70 10600003 */ beqz $v1, .L800CDA80
/* 0CE670 800CDA70 10600003 */ beqz $v1, blkzero
/* 0CE674 800CDA74 00A32823 */ subu $a1, $a1, $v1
/* 0CE678 800CDA78 A8800000 */ swl $zero, ($a0)
/* 0CE67C 800CDA7C 00832021 */ addu $a0, $a0, $v1
.L800CDA80:
blkzero:
/* 0CE680 800CDA80 2401FFE0 */ li $at, -32
/* 0CE684 800CDA84 00A13824 */ and $a3, $a1, $at
/* 0CE688 800CDA88 10E0000C */ beqz $a3, .L800CDABC
/* 0CE688 800CDA88 10E0000C */ beqz $a3, wordzero
/* 0CE68C 800CDA8C 00A72823 */ subu $a1, $a1, $a3
/* 0CE690 800CDA90 00E43821 */ addu $a3, $a3, $a0
.L800CDA94:
@@ -35,25 +35,25 @@ glabel bzero
/* 0CE6B0 800CDAB0 AC80FFF8 */ sw $zero, -8($a0)
/* 0CE6B4 800CDAB4 1487FFF7 */ bne $a0, $a3, .L800CDA94
/* 0CE6B8 800CDAB8 AC80FFFC */ sw $zero, -4($a0)
.L800CDABC:
wordzero:
/* 0CE6BC 800CDABC 2401FFFC */ li $at, -4
/* 0CE6C0 800CDAC0 00A13824 */ and $a3, $a1, $at
/* 0CE6C4 800CDAC4 10E00005 */ beqz $a3, .L800CDADC
/* 0CE6C4 800CDAC4 10E00005 */ beqz $a3, bytezero
/* 0CE6C8 800CDAC8 00A72823 */ subu $a1, $a1, $a3
/* 0CE6CC 800CDACC 00E43821 */ addu $a3, $a3, $a0
.L800CDAD0:
/* 0CE6D0 800CDAD0 24840004 */ addiu $a0, $a0, 4
/* 0CE6D4 800CDAD4 1487FFFE */ bne $a0, $a3, .L800CDAD0
/* 0CE6D8 800CDAD8 AC80FFFC */ sw $zero, -4($a0)
.L800CDADC:
/* 0CE6DC 800CDADC 18A00005 */ blez $a1, .L800CDAF4
bytezero:
/* 0CE6DC 800CDADC 18A00005 */ blez $a1, zerodone
/* 0CE6E0 800CDAE0 00000000 */ nop
/* 0CE6E4 800CDAE4 00A42821 */ addu $a1, $a1, $a0
.L800CDAE8:
/* 0CE6E8 800CDAE8 24840001 */ addiu $a0, $a0, 1
/* 0CE6EC 800CDAEC 1485FFFE */ bne $a0, $a1, .L800CDAE8
/* 0CE6F0 800CDAF0 A080FFFF */ sb $zero, -1($a0)
.L800CDAF4:
zerodone:
/* 0CE6F4 800CDAF4 03E00008 */ jr $ra
/* 0CE6F8 800CDAF8 00000000 */ nop
asm/os/osInvalDCache.s
+12 -12
View File
@@ -11,7 +11,7 @@
glabel osInvalDCache
/* 0CE780 800CDB80 18A0001F */ blez $a1, .L800CDC00
/* 0CE784 800CDB84 00000000 */ nop
/* 0CE788 800CDB88 240B2000 */ li $t3, 8192
/* 0CE788 800CDB88 240B2000 */ li $t3, DCACHE_SIZE
/* 0CE78C 800CDB8C 00AB082B */ sltu $at, $a1, $t3
/* 0CE790 800CDB90 1020001D */ beqz $at, .L800CDC08
/* 0CE794 800CDB94 00000000 */ nop
@@ -20,42 +20,42 @@ glabel osInvalDCache
/* 0CE7A0 800CDBA0 0109082B */ sltu $at, $t0, $t1
/* 0CE7A4 800CDBA4 10200016 */ beqz $at, .L800CDC00
/* 0CE7A8 800CDBA8 00000000 */ nop
/* 0CE7AC 800CDBAC 310A000F */ andi $t2, $t0, 0xf
/* 0CE7AC 800CDBAC 310A000F */ andi $t2, $t0, DCACHE_LINEMASK
/* 0CE7B0 800CDBB0 11400007 */ beqz $t2, .L800CDBD0
/* 0CE7B4 800CDBB4 2529FFF0 */ addiu $t1, $t1, -0x10
/* 0CE7B4 800CDBB4 2529FFF0 */ addiu $t1, $t1, -DCACHE_LINESIZE
/* 0CE7B8 800CDBB8 010A4023 */ subu $t0, $t0, $t2
/* 0CE7BC 800CDBBC BD150000 */ cache 0x15, ($t0)
/* 0CE7BC 800CDBBC BD150000 */ cache (C_HWBINV|CACH_PD), ($t0)
/* 0CE7C0 800CDBC0 0109082B */ sltu $at, $t0, $t1
/* 0CE7C4 800CDBC4 1020000E */ beqz $at, .L800CDC00
/* 0CE7C8 800CDBC8 00000000 */ nop
/* 0CE7CC 800CDBCC 25080010 */ addiu $t0, $t0, 0x10
/* 0CE7CC 800CDBCC 25080010 */ addiu $t0, $t0, DCACHE_LINESIZE
.L800CDBD0:
/* 0CE7D0 800CDBD0 312A000F */ andi $t2, $t1, 0xf
/* 0CE7D0 800CDBD0 312A000F */ andi $t2, $t1, DCACHE_LINEMASK
/* 0CE7D4 800CDBD4 11400006 */ beqz $t2, .L800CDBF0
/* 0CE7D8 800CDBD8 00000000 */ nop
/* 0CE7DC 800CDBDC 012A4823 */ subu $t1, $t1, $t2
/* 0CE7E0 800CDBE0 BD350010 */ cache 0x15, 0x10($t1)
/* 0CE7E0 800CDBE0 BD350010 */ cache C_HWBINV|CACH_PD, 0x10($t1)
/* 0CE7E4 800CDBE4 0128082B */ sltu $at, $t1, $t0
/* 0CE7E8 800CDBE8 14200005 */ bnez $at, .L800CDC00
/* 0CE7EC 800CDBEC 00000000 */ nop
.L800CDBF0:
/* 0CE7F0 800CDBF0 BD110000 */ cache 0x11, ($t0)
/* 0CE7F0 800CDBF0 BD110000 */ cache C_HINV|CACH_PD, ($t0)
/* 0CE7F4 800CDBF4 0109082B */ sltu $at, $t0, $t1
/* 0CE7F8 800CDBF8 1420FFFD */ bnez $at, .L800CDBF0
/* 0CE7FC 800CDBFC 25080010 */ addiu $t0, $t0, 0x10
/* 0CE7FC 800CDBFC 25080010 */ addiu $t0, $t0, DCACHE_LINESIZE
.L800CDC00:
/* 0CE800 800CDC00 03E00008 */ jr $ra
/* 0CE804 800CDC04 00000000 */ nop
.L800CDC08:
/* 0CE808 800CDC08 3C088000 */ li $t0, 0x80000000
/* 0CE808 800CDC08 3C088000 */ li $t0, KUSIZE
/* 0CE80C 800CDC0C 010B4821 */ addu $t1, $t0, $t3
/* 0CE810 800CDC10 2529FFF0 */ addiu $t1, $t1, -0x10
/* 0CE810 800CDC10 2529FFF0 */ addiu $t1, $t1, -DCACHE_LINESIZE
.L800CDC14:
/* 0CE814 800CDC14 BD010000 */ cache 1, ($t0)
/* 0CE818 800CDC18 0109082B */ sltu $at, $t0, $t1
/* 0CE81C 800CDC1C 1420FFFD */ bnez $at, .L800CDC14
/* 0CE820 800CDC20 25080010 */ addiu $t0, $t0, 0x10
/* 0CE820 800CDC20 25080010 */ addiu $t0, $t0, DCACHE_LINESIZE
/* 0CE824 800CDC24 03E00008 */ jr $ra
/* 0CE828 800CDC28 00000000 */ nop
asm/os/osInvalICache.s
+9 -9
View File
@@ -12,7 +12,7 @@
glabel osInvalICache
/* 0CE700 800CDB00 18A00011 */ blez $a1, .L800CDB48
/* 0CE704 800CDB04 00000000 */ nop
/* 0CE708 800CDB08 240B4000 */ li $t3, 16384
/* 0CE708 800CDB08 240B4000 */ li $t3, ICACHE_SIZE
/* 0CE70C 800CDB0C 00AB082B */ sltu $at, $a1, $t3
/* 0CE710 800CDB10 1020000F */ beqz $at, .L800CDB50
/* 0CE714 800CDB14 00000000 */ nop
@@ -21,27 +21,27 @@ glabel osInvalICache
/* 0CE720 800CDB20 0109082B */ sltu $at, $t0, $t1
/* 0CE724 800CDB24 10200008 */ beqz $at, .L800CDB48
/* 0CE728 800CDB28 00000000 */ nop
/* 0CE72C 800CDB2C 310A001F */ andi $t2, $t0, 0x1f
/* 0CE730 800CDB30 2529FFE0 */ addiu $t1, $t1, -0x20
/* 0CE72C 800CDB2C 310A001F */ andi $t2, $t0, ICACHE_LINEMASK
/* 0CE730 800CDB30 2529FFE0 */ addiu $t1, $t1, -ICACHE_LINESIZE
/* 0CE734 800CDB34 010A4023 */ subu $t0, $t0, $t2
.L800CDB38:
/* 0CE738 800CDB38 BD100000 */ cache 0x10, ($t0)
/* 0CE738 800CDB38 BD100000 */ cache C_HINV|CACH_PI, ($t0)
/* 0CE73C 800CDB3C 0109082B */ sltu $at, $t0, $t1
/* 0CE740 800CDB40 1420FFFD */ bnez $at, .L800CDB38
/* 0CE744 800CDB44 25080020 */ addiu $t0, $t0, 0x20
/* 0CE744 800CDB44 25080020 */ addiu $t0, $t0, ICACHE_LINESIZE
.L800CDB48:
/* 0CE748 800CDB48 03E00008 */ jr $ra
/* 0CE74C 800CDB4C 00000000 */ nop
.L800CDB50:
/* 0CE750 800CDB50 3C088000 */ li $t0, 0x80000000
/* 0CE750 800CDB50 3C088000 */ li $t0, KUSIZE
/* 0CE754 800CDB54 010B4821 */ addu $t1, $t0, $t3
/* 0CE758 800CDB58 2529FFE0 */ addiu $t1, $t1, -0x20
/* 0CE758 800CDB58 2529FFE0 */ addiu $t1, $t1, -ICACHE_LINESIZE
.L800CDB5C:
/* 0CE75C 800CDB5C BD000000 */ cache 0, ($t0)
/* 0CE75C 800CDB5C BD000000 */ cache C_IINV|CACH_PI, ($t0)
/* 0CE760 800CDB60 0109082B */ sltu $at, $t0, $t1
/* 0CE764 800CDB64 1420FFFD */ bnez $at, .L800CDB5C
/* 0CE768 800CDB68 25080020 */ addiu $t0, $t0, 0x20
/* 0CE768 800CDB68 25080020 */ addiu $t0, $t0, ICACHE_LINESIZE
/* 0CE76C 800CDB6C 03E00008 */ jr $ra
/* 0CE770 800CDB70 00000000 */ nop
asm/os/osMapTLBRdb.s
+12 -12
View File
@@ -8,26 +8,26 @@
.section .text, "ax"
glabel osMapTLBRdb
mfc0 $t0, $10
mfc0 $t0, C0_ENTRYHI
li $t1, 31
mtc0 $t1, $0
mtc0 $zero, $5
li $t2, 23
lui $t1, 0xc000
mtc0 $t1, $10
lui $t1, 0x8000
srl $t3, $t1, 6
mtc0 $t1, C0_INX
mtc0 $zero, C0_PAGEMASK
li $t2, TLBLO_UNCACHED | TLBLO_D | TLBLO_V | TLBLO_G
lui $t1, K2BASE >> 16
mtc0 $t1, C0_ENTRYHI
lui $t1, KUSIZE >> 16
srl $t3, $t1, TLBLO_PFNSHIFT
or $t3, $t3, $t2
mtc0 $t3, $2
li $t1, 1
mtc0 $t1, $3
mtc0 $t3, C0_ENTRYLO0
li $t1, TLBLO_G
mtc0 $t1, C0_ENTRYLO1
nop
tlbwi
nop
nop
nop
nop
mtc0 $t0, $10
mtc0 $t0, C0_ENTRYHI
jr $ra
nop
asm/os/osSetIntMask.s
+101 -86
View File
@@ -4,66 +4,64 @@
.include "macros.inc"
.eqv MI_INTR_MASK_REG, 0xA430000C
.set VERSION_EU_SH, 1
.section .text, "ax"
glabel osSetIntMask
.ifdef VERSION_EU_SH
mfc0 $t4, $12
andi $v0, $t4, 0xff01
mfc0 $t4, C0_SR
andi $v0, $t4, OS_IM_CPU
lui $t0, %hi(__OSGlobalIntMask) # $t0, 0x8030
addiu $t0, %lo(__OSGlobalIntMask) # addiu $t0, $t0, 0x208c
lw $t3, ($t0)
li $at, -1
xor $t0, $t3, $at
andi $t0, $t0, 0xff00
andi $t0, $t0, SR_IMASK
or $v0, $v0, $t0
.else
mfc0 $t1, $12
andi $v0, $t1, 0xff01
mfc0 $t1, C0_SR
andi $v0, $t1, OS_IM_CPU
.endif
lui $t2, %hi(MI_INTR_MASK_REG) # $t2, 0xa430
lw $t2, %lo(MI_INTR_MASK_REG)($t2)
lui $t2, %hi(PHYS_TO_K1|MI_INTR_MASK_REG) # $t2, 0xa430
lw $t2, %lo(PHYS_TO_K1|MI_INTR_MASK_REG)($t2)
.ifdef VERSION_EU_SH
beqz $t2, .L80200074
srl $t1, $t3, 0x10
li $at, -1
xor $t1, $t1, $at
andi $t1, $t1, 0x3f
andi $t1, $t1, MI_INTR_MASK
or $t2, $t2, $t1
.L80200074:
.endif
sll $t2, $t2, 0x10
or $v0, $v0, $t2
lui $at, 0x3f
lui $at, MI_INTR_MASK
and $t0, $a0, $at
.ifdef VERSION_EU_SH
and $t0, $t0, $t3
.endif
srl $t0, $t0, 0xf
lui $t2, %hi(D_800F3C10)
lui $t2, %hi(__osRcpImTable)
addu $t2, $t2, $t0
lhu $t2, %lo(D_800F3C10)($t2)
lui $at, %hi(MI_INTR_MASK_REG) # $at, 0xa430
sw $t2, %lo(MI_INTR_MASK_REG)($at)
andi $t0, $a0, 0xff01
lhu $t2, %lo(__osRcpImTable)($t2)
lui $at, %hi(PHYS_TO_K1|MI_INTR_MASK_REG) # $at, 0xa430
sw $t2, %lo(PHYS_TO_K1|MI_INTR_MASK_REG)($at)
andi $t0, $a0, OS_IM_CPU
.ifdef VERSION_EU_SH
andi $t1, $t3, 0xff00
andi $t1, $t3, SR_IMASK
and $t0, $t0, $t1
.endif
lui $at, (0xFFFF00FF >> 16) # lui $at, 0xffff
ori $at, (0xFFFF00FF & 0xFFFF) # ori $at, $at, 0xff
lui $at, %hi(~SR_IMASK) # lui $at, 0xffff
ori $at, %lo(~SR_IMASK) # ori $at, $at, 0xff
.ifdef VERSION_EU_SH
and $t4, $t4, $at
or $t4, $t4, $t0
mtc0 $t4, $12
mtc0 $t4, C0_SR
.else
and $t1, $t1, $at
or $t1, $t1, $t0
mtc0 $t1, $12
mtc0 $t1, C0_SR
.endif
nop
nop
@@ -73,68 +71,85 @@ glabel osSetIntMask
.section .rodata
glabel D_800F3C10
.half 0x0555
.half 0x0556
.half 0x0559
.half 0x055A
.half 0x0565
.half 0x0566
.half 0x0569
.half 0x056A
.half 0x0595
.half 0x0596
.half 0x0599
.half 0x059A
.half 0x05A5
.half 0x05A6
.half 0x05A9
.half 0x05AA
.half 0x0655
.half 0x0656
.half 0x0659
.half 0x065A
.half 0x0665
.half 0x0666
.half 0x0669
.half 0x066A
.half 0x0695
.half 0x0696
.half 0x0699
.half 0x069A
.half 0x06A5
.half 0x06A6
.half 0x06A9
.half 0x06AA
.half 0x0955
.half 0x0956
.half 0x0959
.half 0x095A
.half 0x0965
.half 0x0966
.half 0x0969
.half 0x096A
.half 0x0995
.half 0x0996
.half 0x0999
.half 0x099A
.half 0x09A5
.half 0x09A6
.half 0x09A9
.half 0x09AA
.half 0x0A55
.half 0x0A56
.half 0x0A59
.half 0x0A5A
.half 0x0A65
.half 0x0A66
.half 0x0A69
.half 0x0A6A
.half 0x0A95
.half 0x0A96
.half 0x0A99
.half 0x0A9A
.half 0x0AA5
.half 0x0AA6
.half 0x0AA9
.half 0x0AAA
.set MI_INTR_MASK, 0x3f
.set CLR_SP, 0x0001
.set SET_SP, 0x0002
.set CLR_SI, 0x0004
.set SET_SI, 0x0008
.set CLR_AI, 0x0010
.set SET_AI, 0x0020
.set CLR_VI, 0x0040
.set SET_VI, 0x0080
.set CLR_PI, 0x0100
.set SET_PI, 0x0200
.set CLR_DP, 0x0400
.set SET_DP, 0x0800
glabel __osRcpImTable
/* LUT to convert between MI_INTR and MI_INTR_MASK */
/* MI_INTR is status for each interrupt whereas */
/* MI_INTR_MASK has seperate bits for set/clr */
.half CLR_SP | CLR_SI | CLR_AI | CLR_VI | CLR_PI | CLR_DP
.half SET_SP | CLR_SI | CLR_AI | CLR_VI | CLR_PI | CLR_DP
.half CLR_SP | SET_SI | CLR_AI | CLR_VI | CLR_PI | CLR_DP
.half SET_SP | SET_SI | CLR_AI | CLR_VI | CLR_PI | CLR_DP
.half CLR_SP | CLR_SI | SET_AI | CLR_VI | CLR_PI | CLR_DP
.half SET_SP | CLR_SI | SET_AI | CLR_VI | CLR_PI | CLR_DP
.half CLR_SP | SET_SI | SET_AI | CLR_VI | CLR_PI | CLR_DP
.half SET_SP | SET_SI | SET_AI | CLR_VI | CLR_PI | CLR_DP
.half CLR_SP | CLR_SI | CLR_AI | SET_VI | CLR_PI | CLR_DP
.half SET_SP | CLR_SI | CLR_AI | SET_VI | CLR_PI | CLR_DP
.half CLR_SP | SET_SI | CLR_AI | SET_VI | CLR_PI | CLR_DP
.half SET_SP | SET_SI | CLR_AI | SET_VI | CLR_PI | CLR_DP
.half CLR_SP | CLR_SI | SET_AI | SET_VI | CLR_PI | CLR_DP
.half SET_SP | CLR_SI | SET_AI | SET_VI | CLR_PI | CLR_DP
.half CLR_SP | SET_SI | SET_AI | SET_VI | CLR_PI | CLR_DP
.half SET_SP | SET_SI | SET_AI | SET_VI | CLR_PI | CLR_DP
.half CLR_SP | CLR_SI | CLR_AI | CLR_VI | SET_PI | CLR_DP
.half SET_SP | CLR_SI | CLR_AI | CLR_VI | SET_PI | CLR_DP
.half CLR_SP | SET_SI | CLR_AI | CLR_VI | SET_PI | CLR_DP
.half SET_SP | SET_SI | CLR_AI | CLR_VI | SET_PI | CLR_DP
.half CLR_SP | CLR_SI | SET_AI | CLR_VI | SET_PI | CLR_DP
.half SET_SP | CLR_SI | SET_AI | CLR_VI | SET_PI | CLR_DP
.half CLR_SP | SET_SI | SET_AI | CLR_VI | SET_PI | CLR_DP
.half SET_SP | SET_SI | SET_AI | CLR_VI | SET_PI | CLR_DP
.half CLR_SP | CLR_SI | CLR_AI | SET_VI | SET_PI | CLR_DP
.half SET_SP | CLR_SI | CLR_AI | SET_VI | SET_PI | CLR_DP
.half CLR_SP | SET_SI | CLR_AI | SET_VI | SET_PI | CLR_DP
.half SET_SP | SET_SI | CLR_AI | SET_VI | SET_PI | CLR_DP
.half CLR_SP | CLR_SI | SET_AI | SET_VI | SET_PI | CLR_DP
.half SET_SP | CLR_SI | SET_AI | SET_VI | SET_PI | CLR_DP
.half CLR_SP | SET_SI | SET_AI | SET_VI | SET_PI | CLR_DP
.half SET_SP | SET_SI | SET_AI | SET_VI | SET_PI | CLR_DP
.half CLR_SP | CLR_SI | CLR_AI | CLR_VI | CLR_PI | SET_DP
.half SET_SP | CLR_SI | CLR_AI | CLR_VI | CLR_PI | SET_DP
.half CLR_SP | SET_SI | CLR_AI | CLR_VI | CLR_PI | SET_DP
.half SET_SP | SET_SI | CLR_AI | CLR_VI | CLR_PI | SET_DP
.half CLR_SP | CLR_SI | SET_AI | CLR_VI | CLR_PI | SET_DP
.half SET_SP | CLR_SI | SET_AI | CLR_VI | CLR_PI | SET_DP
.half CLR_SP | SET_SI | SET_AI | CLR_VI | CLR_PI | SET_DP
.half SET_SP | SET_SI | SET_AI | CLR_VI | CLR_PI | SET_DP
.half CLR_SP | CLR_SI | CLR_AI | SET_VI | CLR_PI | SET_DP
.half SET_SP | CLR_SI | CLR_AI | SET_VI | CLR_PI | SET_DP
.half CLR_SP | SET_SI | CLR_AI | SET_VI | CLR_PI | SET_DP
.half SET_SP | SET_SI | CLR_AI | SET_VI | CLR_PI | SET_DP
.half CLR_SP | CLR_SI | SET_AI | SET_VI | CLR_PI | SET_DP
.half SET_SP | CLR_SI | SET_AI | SET_VI | CLR_PI | SET_DP
.half CLR_SP | SET_SI | SET_AI | SET_VI | CLR_PI | SET_DP
.half SET_SP | SET_SI | SET_AI | SET_VI | CLR_PI | SET_DP
.half CLR_SP | CLR_SI | CLR_AI | CLR_VI | SET_PI | SET_DP
.half SET_SP | CLR_SI | CLR_AI | CLR_VI | SET_PI | SET_DP
.half CLR_SP | SET_SI | CLR_AI | CLR_VI | SET_PI | SET_DP
.half SET_SP | SET_SI | CLR_AI | CLR_VI | SET_PI | SET_DP
.half CLR_SP | CLR_SI | SET_AI | CLR_VI | SET_PI | SET_DP
.half SET_SP | CLR_SI | SET_AI | CLR_VI | SET_PI | SET_DP
.half CLR_SP | SET_SI | SET_AI | CLR_VI | SET_PI | SET_DP
.half SET_SP | SET_SI | SET_AI | CLR_VI | SET_PI | SET_DP
.half CLR_SP | CLR_SI | CLR_AI | SET_VI | SET_PI | SET_DP
.half SET_SP | CLR_SI | CLR_AI | SET_VI | SET_PI | SET_DP
.half CLR_SP | SET_SI | CLR_AI | SET_VI | SET_PI | SET_DP
.half SET_SP | SET_SI | CLR_AI | SET_VI | SET_PI | SET_DP
.half CLR_SP | CLR_SI | SET_AI | SET_VI | SET_PI | SET_DP
.half SET_SP | CLR_SI | SET_AI | SET_VI | SET_PI | SET_DP
.half CLR_SP | SET_SI | SET_AI | SET_VI | SET_PI | SET_DP
.half SET_SP | SET_SI | SET_AI | SET_VI | SET_PI | SET_DP
asm/os/osWritebackDCache.s
+8 -8
View File
@@ -9,18 +9,18 @@
glabel osWritebackDCache
blez $a1, .osWritebackDCacheReturn
nop
li $t3, 8192
li $t3, DCACHE_SIZE
bgeu $a1, $t3, .L80324E40
nop
move $t0, $a0
addu $t1, $a0, $a1
bgeu $t0, $t1, .osWritebackDCacheReturn
nop
andi $t2, $t0, 0xf
addiu $t1, $t1, -0x10
andi $t2, $t0, DCACHE_LINEMASK
addiu $t1, $t1, -DCACHE_LINESIZE
subu $t0, $t0, $t2
.L80324E28:
cache 0x19, ($t0)
cache C_HWB|CACH_PD, ($t0)
bltu $t0, $t1, .L80324E28
addiu $t0, $t0, 0x10
.osWritebackDCacheReturn:
@@ -28,12 +28,12 @@ glabel osWritebackDCache
nop
.L80324E40:
lui $t0, 0x8000
li $t0, KUSIZE
addu $t1, $t0, $t3
addiu $t1, $t1, -0x10
addiu $t1, $t1, -DCACHE_LINESIZE
.L80324E4C:
cache 1, ($t0)
cache C_IWBINV|CACH_PD, ($t0)
bltu $t0, $t1, .L80324E4C
addiu $t0, 0x10 # addiu $t0, $t0, 0x10
addiu $t0, DCACHE_LINESIZE # addiu $t0, $t0, 0x10
jr $ra
nop
asm/os/osWritebackDCacheAll.s
+5 -5
View File
@@ -9,15 +9,15 @@
.section .text, "ax"
glabel osWritebackDCacheAll
/* 0CE490 800CD890 3C088000 */ li $t0, 0x80000000 # $t0, 0x8000
/* 0CE494 800CD894 240A2000 */ li $t2, 8192
/* 0CE490 800CD890 3C088000 */ li $t0, KUSIZE # $t0, 0x8000
/* 0CE494 800CD894 240A2000 */ li $t2, DCACHE_SIZE
/* 0CE498 800CD898 010A4821 */ addu $t1, $t0, $t2
/* 0CE49C 800CD89C 2529FFF0 */ addiu $t1, $t1, -0x10
/* 0CE49C 800CD89C 2529FFF0 */ addiu $t1, $t1, -DCACHE_LINESIZE
.L800CD8A0:
/* 0CE4A0 800CD8A0 BD010000 */ cache 1, ($t0)
/* 0CE4A0 800CD8A0 BD010000 */ cache C_IWBINV | CACH_PD, ($t0)
/* 0CE4A4 800CD8A4 0109082B */ sltu $at, $t0, $t1
/* 0CE4A8 800CD8A8 1420FFFD */ bnez $at, .L800CD8A0
/* 0CE4AC 800CD8AC 25080010 */ addiu $t0, $t0, 0x10
/* 0CE4AC 800CD8AC 25080010 */ addiu $t0, $t0, DCACHE_LINESIZE
/* 0CE4B0 800CD8B0 03E00008 */ jr $ra
/* 0CE4B4 800CD8B4 00000000 */ nop
courses/all_course_model.h
+18 -18
View File
@@ -31,25 +31,25 @@ extern CourseVtx d_course_royal_raceway_vertex[0x2072];
extern CourseVtx d_course_sherbet_land_vertex[0xA76];
extern CourseVtx d_course_wario_stadium_vertex[0x17B3];
#define d_course_big_donut_vertex_count ARRAY_COUNT(d_course_big_donut_vertex)
#define d_course_block_fort_vertex_count ARRAY_COUNT(d_course_block_fort_vertex)
#define d_course_double_deck_vertex_count ARRAY_COUNT(d_course_double_deck_vertex)
#define d_course_skyscraper_vertex_count ARRAY_COUNT(d_course_skyscraper_vertex)
#define d_course_choco_mountain_vertex_count ARRAY_COUNT(d_course_choco_mountain_vertex)
#define d_course_frappe_snowland_vertex_count ARRAY_COUNT(d_course_frappe_snowland_vertex)
#define d_course_mario_raceway_vertex_count ARRAY_COUNT(d_course_mario_raceway_vertex)
#define d_course_toads_turnpike_vertex_count ARRAY_COUNT(d_course_toads_turnpike_vertex)
#define d_course_kalimari_desert_vertex_count ARRAY_COUNT(d_course_kalimari_desert_vertex)
#define d_course_big_donut_vertex_count ARRAY_COUNT(d_course_big_donut_vertex)
#define d_course_block_fort_vertex_count ARRAY_COUNT(d_course_block_fort_vertex)
#define d_course_double_deck_vertex_count ARRAY_COUNT(d_course_double_deck_vertex)
#define d_course_skyscraper_vertex_count ARRAY_COUNT(d_course_skyscraper_vertex)
#define d_course_choco_mountain_vertex_count ARRAY_COUNT(d_course_choco_mountain_vertex)
#define d_course_frappe_snowland_vertex_count ARRAY_COUNT(d_course_frappe_snowland_vertex)
#define d_course_mario_raceway_vertex_count ARRAY_COUNT(d_course_mario_raceway_vertex)
#define d_course_toads_turnpike_vertex_count ARRAY_COUNT(d_course_toads_turnpike_vertex)
#define d_course_kalimari_desert_vertex_count ARRAY_COUNT(d_course_kalimari_desert_vertex)
#define d_course_koopa_troopa_beach_vertex_count ARRAY_COUNT(d_course_koopa_troopa_beach_vertex)
#define d_course_luigi_raceway_vertex_count ARRAY_COUNT(d_course_luigi_raceway_vertex)
#define d_course_moo_moo_farm_vertex_count ARRAY_COUNT(d_course_moo_moo_farm_vertex)
#define d_course_banshee_boardwalk_vertex_count ARRAY_COUNT(d_course_banshee_boardwalk_vertex)
#define d_course_luigi_raceway_vertex_count ARRAY_COUNT(d_course_luigi_raceway_vertex)
#define d_course_moo_moo_farm_vertex_count ARRAY_COUNT(d_course_moo_moo_farm_vertex)
#define d_course_banshee_boardwalk_vertex_count ARRAY_COUNT(d_course_banshee_boardwalk_vertex)
#define d_course_dks_jungle_parkway_vertex_count ARRAY_COUNT(d_course_dks_jungle_parkway_vertex)
#define d_course_rainbow_road_vertex_count ARRAY_COUNT(d_course_rainbow_road_vertex)
#define d_course_yoshi_valley_vertex_count ARRAY_COUNT(d_course_yoshi_valley_vertex)
#define d_course_bowsers_castle_vertex_count ARRAY_COUNT(d_course_bowsers_castle_vertex)
#define d_course_royal_raceway_vertex_count ARRAY_COUNT(d_course_royal_raceway_vertex)
#define d_course_sherbet_land_vertex_count ARRAY_COUNT(d_course_sherbet_land_vertex)
#define d_course_wario_stadium_vertex_count ARRAY_COUNT(d_course_wario_stadium_vertex)
#define d_course_rainbow_road_vertex_count ARRAY_COUNT(d_course_rainbow_road_vertex)
#define d_course_yoshi_valley_vertex_count ARRAY_COUNT(d_course_yoshi_valley_vertex)
#define d_course_bowsers_castle_vertex_count ARRAY_COUNT(d_course_bowsers_castle_vertex)
#define d_course_royal_raceway_vertex_count ARRAY_COUNT(d_course_royal_raceway_vertex)
#define d_course_sherbet_land_vertex_count ARRAY_COUNT(d_course_sherbet_land_vertex)
#define d_course_wario_stadium_vertex_count ARRAY_COUNT(d_course_wario_stadium_vertex)
#endif // ALL_COURSE_MODEL_H
courses/all_course_offsets.h
+11 -11
View File
@@ -3,17 +3,17 @@
#include "course_offsets.h"
extern Gfx *banshee_boardwalk_dls[];
extern Gfx *bowsers_castle_dls[];
extern Gfx *choco_mountain_dls[];
extern Gfx *kalimari_desert_dls[];
extern Gfx *luigi_raceway_dls[];
extern Gfx *mario_raceway_dls[];
extern Gfx *moo_moo_farm_dls[];
extern Gfx *royal_raceway_dls[];
extern Gfx *sherbet_land_dls[];
extern Gfx *sherbet_land_dls_2[];
extern Gfx *wario_stadium_dls[];
extern Gfx* banshee_boardwalk_dls[];
extern Gfx* bowsers_castle_dls[];
extern Gfx* choco_mountain_dls[];
extern Gfx* kalimari_desert_dls[];
extern Gfx* luigi_raceway_dls[];
extern Gfx* mario_raceway_dls[];
extern Gfx* moo_moo_farm_dls[];
extern Gfx* royal_raceway_dls[];
extern Gfx* sherbet_land_dls[];
extern Gfx* sherbet_land_dls_2[];
extern Gfx* wario_stadium_dls[];
extern Gfx toads_turnpike_dl_0[];
extern Gfx toads_turnpike_dl_1[];
courses/banshee_boardwalk/course_data.c
+853 -1359
View File
File diff suppressed because it is too large Load Diff
courses/banshee_boardwalk/course_displaylists.inc.c
+944 -760
View File
File diff suppressed because it is too large Load Diff
courses/banshee_boardwalk/course_offsets.c
+57 -123
View File
@@ -28,130 +28,64 @@ extern u8 gTexture68D940[];
extern u8 gTexture685AC0[];
const course_texture banshee_boardwalk_textures[] = {
{gTexture6447C4, 0x0106, 0x0800, 0x0},
{gTexture676FB0, 0x0525, 0x0800, 0x0},
{gTexture643B3C, 0x0798, 0x0800, 0x0},
{gTexture64BB60, 0x0169, 0x0800, 0x0},
{gTexture64BCCC, 0x0450, 0x0800, 0x0},
{gTexture64FBF4, 0x0274, 0x0800, 0x0},
{gTexture651B20, 0x041D, 0x0800, 0x0},
{gTexture66262C, 0x02F7, 0x0800, 0x0},
{gTexture668728, 0x01F5, 0x0800, 0x0},
{gTexture66A3DC, 0x07C5, 0x0800, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTexture66CD64, 0x02C0, 0x0800, 0x0},
{gTexture66D698, 0x0370, 0x0800, 0x0},
{gTexture66E608, 0x05E8, 0x0800, 0x0},
{gTexture67B388, 0x03D2, 0x0800, 0x0},
{gTextureSignWelcome0, 0x0A2E, 0x1000, 0x0},
{gTextureSignWelcome1, 0x0A0A, 0x1000, 0x0},
{gTextureSignWoodenBack0, 0x06EF, 0x1000, 0x0},
{gTextureSignWoodenBack1, 0x06D1, 0x1000, 0x0},
{gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0},
{gTexture68D940, 0x057D, 0x0800, 0x0},
{gTexture685AC0, 0x07CC, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture6447C4, 0x0106, 0x0800, 0x0 },
{ gTexture676FB0, 0x0525, 0x0800, 0x0 },
{ gTexture643B3C, 0x0798, 0x0800, 0x0 },
{ gTexture64BB60, 0x0169, 0x0800, 0x0 },
{ gTexture64BCCC, 0x0450, 0x0800, 0x0 },
{ gTexture64FBF4, 0x0274, 0x0800, 0x0 },
{ gTexture651B20, 0x041D, 0x0800, 0x0 },
{ gTexture66262C, 0x02F7, 0x0800, 0x0 },
{ gTexture668728, 0x01F5, 0x0800, 0x0 },
{ gTexture66A3DC, 0x07C5, 0x0800, 0x0 },
{ gTexture66CA98, 0x02C9, 0x0800, 0x0 },
{ gTexture66CD64, 0x02C0, 0x0800, 0x0 },
{ gTexture66D698, 0x0370, 0x0800, 0x0 },
{ gTexture66E608, 0x05E8, 0x0800, 0x0 },
{ gTexture67B388, 0x03D2, 0x0800, 0x0 },
{ gTextureSignWelcome0, 0x0A2E, 0x1000, 0x0 },
{ gTextureSignWelcome1, 0x0A0A, 0x1000, 0x0 },
{ gTextureSignWoodenBack0, 0x06EF, 0x1000, 0x0 },
{ gTextureSignWoodenBack1, 0x06D1, 0x1000, 0x0 },
{ gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 },
{ gTexture68D940, 0x057D, 0x0800, 0x0 },
{ gTexture685AC0, 0x07CC, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *banshee_boardwalk_dls[] = {
d_course_banshee_boardwalk_dl_A0,
d_course_banshee_boardwalk_dl_210,
d_course_banshee_boardwalk_dl_160,
d_course_banshee_boardwalk_dl_270,
d_course_banshee_boardwalk_dl_358,
d_course_banshee_boardwalk_dl_4F0,
d_course_banshee_boardwalk_dl_408,
d_course_banshee_boardwalk_dl_540,
d_course_banshee_boardwalk_dl_620,
d_course_banshee_boardwalk_dl_7C0,
d_course_banshee_boardwalk_dl_6D0,
d_course_banshee_boardwalk_dl_870,
d_course_banshee_boardwalk_dl_940,
d_course_banshee_boardwalk_dl_AD0,
d_course_banshee_boardwalk_dl_9E0,
d_course_banshee_boardwalk_dl_B80,
d_course_banshee_boardwalk_dl_C30,
d_course_banshee_boardwalk_dl_D80,
d_course_banshee_boardwalk_dl_CD0,
d_course_banshee_boardwalk_dl_E10,
d_course_banshee_boardwalk_dl_EE0,
d_course_banshee_boardwalk_dl_1000,
d_course_banshee_boardwalk_dl_F50,
d_course_banshee_boardwalk_dl_1070,
d_course_banshee_boardwalk_dl_1160,
d_course_banshee_boardwalk_dl_12A8,
d_course_banshee_boardwalk_dl_11C8,
d_course_banshee_boardwalk_dl_12E8,
d_course_banshee_boardwalk_dl_13F0,
d_course_banshee_boardwalk_dl_1520,
d_course_banshee_boardwalk_dl_1448,
d_course_banshee_boardwalk_dl_1580,
d_course_banshee_boardwalk_dl_1678,
d_course_banshee_boardwalk_dl_17A0,
d_course_banshee_boardwalk_dl_16B8,
d_course_banshee_boardwalk_dl_1820,
d_course_banshee_boardwalk_dl_18D8,
d_course_banshee_boardwalk_dl_1A30,
d_course_banshee_boardwalk_dl_1940,
d_course_banshee_boardwalk_dl_1B00,
d_course_banshee_boardwalk_dl_1BA0,
d_course_banshee_boardwalk_dl_1CC8,
d_course_banshee_boardwalk_dl_1C20,
d_course_banshee_boardwalk_dl_1D90,
d_course_banshee_boardwalk_dl_1E28,
d_course_banshee_boardwalk_dl_1F40,
d_course_banshee_boardwalk_dl_1EA0,
d_course_banshee_boardwalk_dl_2028,
d_course_banshee_boardwalk_dl_20A0,
d_course_banshee_boardwalk_dl_21C8,
d_course_banshee_boardwalk_dl_2138,
d_course_banshee_boardwalk_dl_22D8,
d_course_banshee_boardwalk_dl_2340,
d_course_banshee_boardwalk_dl_24E8,
d_course_banshee_boardwalk_dl_2448,
d_course_banshee_boardwalk_dl_2610,
d_course_banshee_boardwalk_dl_2650,
d_course_banshee_boardwalk_dl_2790,
d_course_banshee_boardwalk_dl_2718,
d_course_banshee_boardwalk_dl_2868,
d_course_banshee_boardwalk_dl_28A8,
d_course_banshee_boardwalk_dl_2A18,
d_course_banshee_boardwalk_dl_2980,
d_course_banshee_boardwalk_dl_2AE0,
d_course_banshee_boardwalk_dl_2B88,
d_course_banshee_boardwalk_dl_2CE0,
d_course_banshee_boardwalk_dl_2C30,
d_course_banshee_boardwalk_dl_2DB0,
d_course_banshee_boardwalk_dl_2E20,
d_course_banshee_boardwalk_dl_2FA0,
d_course_banshee_boardwalk_dl_2EE0,
d_course_banshee_boardwalk_dl_3050,
d_course_banshee_boardwalk_dl_3100,
d_course_banshee_boardwalk_dl_32B0,
d_course_banshee_boardwalk_dl_3200,
d_course_banshee_boardwalk_dl_3390,
d_course_banshee_boardwalk_dl_3468,
d_course_banshee_boardwalk_dl_3660,
d_course_banshee_boardwalk_dl_35A0,
d_course_banshee_boardwalk_dl_3710,
d_course_banshee_boardwalk_dl_37F0,
d_course_banshee_boardwalk_dl_3980,
d_course_banshee_boardwalk_dl_3920,
d_course_banshee_boardwalk_dl_3A20,
d_course_banshee_boardwalk_dl_3AF8,
d_course_banshee_boardwalk_dl_3C40,
d_course_banshee_boardwalk_dl_3C00,
d_course_banshee_boardwalk_dl_3CD0,
d_course_banshee_boardwalk_dl_3D98,
d_course_banshee_boardwalk_dl_3EF0,
d_course_banshee_boardwalk_dl_3EB0,
d_course_banshee_boardwalk_dl_3F60,
d_course_banshee_boardwalk_dl_4038,
d_course_banshee_boardwalk_dl_4188,
d_course_banshee_boardwalk_dl_4118,
d_course_banshee_boardwalk_dl_41F0,
d_course_banshee_boardwalk_dl_42D0,
d_course_banshee_boardwalk_dl_4428,
d_course_banshee_boardwalk_dl_43A8,
const Gfx* banshee_boardwalk_dls[] = {
d_course_banshee_boardwalk_dl_A0, d_course_banshee_boardwalk_dl_210, d_course_banshee_boardwalk_dl_160,
d_course_banshee_boardwalk_dl_270, d_course_banshee_boardwalk_dl_358, d_course_banshee_boardwalk_dl_4F0,
d_course_banshee_boardwalk_dl_408, d_course_banshee_boardwalk_dl_540, d_course_banshee_boardwalk_dl_620,
d_course_banshee_boardwalk_dl_7C0, d_course_banshee_boardwalk_dl_6D0, d_course_banshee_boardwalk_dl_870,
d_course_banshee_boardwalk_dl_940, d_course_banshee_boardwalk_dl_AD0, d_course_banshee_boardwalk_dl_9E0,
d_course_banshee_boardwalk_dl_B80, d_course_banshee_boardwalk_dl_C30, d_course_banshee_boardwalk_dl_D80,
d_course_banshee_boardwalk_dl_CD0, d_course_banshee_boardwalk_dl_E10, d_course_banshee_boardwalk_dl_EE0,
d_course_banshee_boardwalk_dl_1000, d_course_banshee_boardwalk_dl_F50, d_course_banshee_boardwalk_dl_1070,
d_course_banshee_boardwalk_dl_1160, d_course_banshee_boardwalk_dl_12A8, d_course_banshee_boardwalk_dl_11C8,
d_course_banshee_boardwalk_dl_12E8, d_course_banshee_boardwalk_dl_13F0, d_course_banshee_boardwalk_dl_1520,
d_course_banshee_boardwalk_dl_1448, d_course_banshee_boardwalk_dl_1580, d_course_banshee_boardwalk_dl_1678,
d_course_banshee_boardwalk_dl_17A0, d_course_banshee_boardwalk_dl_16B8, d_course_banshee_boardwalk_dl_1820,
d_course_banshee_boardwalk_dl_18D8, d_course_banshee_boardwalk_dl_1A30, d_course_banshee_boardwalk_dl_1940,
d_course_banshee_boardwalk_dl_1B00, d_course_banshee_boardwalk_dl_1BA0, d_course_banshee_boardwalk_dl_1CC8,
d_course_banshee_boardwalk_dl_1C20, d_course_banshee_boardwalk_dl_1D90, d_course_banshee_boardwalk_dl_1E28,
d_course_banshee_boardwalk_dl_1F40, d_course_banshee_boardwalk_dl_1EA0, d_course_banshee_boardwalk_dl_2028,
d_course_banshee_boardwalk_dl_20A0, d_course_banshee_boardwalk_dl_21C8, d_course_banshee_boardwalk_dl_2138,
d_course_banshee_boardwalk_dl_22D8, d_course_banshee_boardwalk_dl_2340, d_course_banshee_boardwalk_dl_24E8,
d_course_banshee_boardwalk_dl_2448, d_course_banshee_boardwalk_dl_2610, d_course_banshee_boardwalk_dl_2650,
d_course_banshee_boardwalk_dl_2790, d_course_banshee_boardwalk_dl_2718, d_course_banshee_boardwalk_dl_2868,
d_course_banshee_boardwalk_dl_28A8, d_course_banshee_boardwalk_dl_2A18, d_course_banshee_boardwalk_dl_2980,
d_course_banshee_boardwalk_dl_2AE0, d_course_banshee_boardwalk_dl_2B88, d_course_banshee_boardwalk_dl_2CE0,
d_course_banshee_boardwalk_dl_2C30, d_course_banshee_boardwalk_dl_2DB0, d_course_banshee_boardwalk_dl_2E20,
d_course_banshee_boardwalk_dl_2FA0, d_course_banshee_boardwalk_dl_2EE0, d_course_banshee_boardwalk_dl_3050,
d_course_banshee_boardwalk_dl_3100, d_course_banshee_boardwalk_dl_32B0, d_course_banshee_boardwalk_dl_3200,
d_course_banshee_boardwalk_dl_3390, d_course_banshee_boardwalk_dl_3468, d_course_banshee_boardwalk_dl_3660,
d_course_banshee_boardwalk_dl_35A0, d_course_banshee_boardwalk_dl_3710, d_course_banshee_boardwalk_dl_37F0,
d_course_banshee_boardwalk_dl_3980, d_course_banshee_boardwalk_dl_3920, d_course_banshee_boardwalk_dl_3A20,
d_course_banshee_boardwalk_dl_3AF8, d_course_banshee_boardwalk_dl_3C40, d_course_banshee_boardwalk_dl_3C00,
d_course_banshee_boardwalk_dl_3CD0, d_course_banshee_boardwalk_dl_3D98, d_course_banshee_boardwalk_dl_3EF0,
d_course_banshee_boardwalk_dl_3EB0, d_course_banshee_boardwalk_dl_3F60, d_course_banshee_boardwalk_dl_4038,
d_course_banshee_boardwalk_dl_4188, d_course_banshee_boardwalk_dl_4118, d_course_banshee_boardwalk_dl_41F0,
d_course_banshee_boardwalk_dl_42D0, d_course_banshee_boardwalk_dl_4428, d_course_banshee_boardwalk_dl_43A8,
d_course_banshee_boardwalk_dl_4480,
};
courses/banshee_boardwalk/course_vertices.inc.c
+4945 -4945
View File
File diff suppressed because it is too large Load Diff
courses/big_donut/course_data.c
+9 -25
View File
@@ -22,29 +22,13 @@ Gfx d_course_big_donut_dl[] = {
// Item box spawn locations
struct ActorSpawnData d_course_big_donut_item_box_spawns[] = {
{{ -40, 222, 824 }, {0} },
{{ 125, 200, 573 }, {0} },
{{ -302, 251, 889 }, {0} },
{{ 38, 203, 654 }, {0} },
{{ 22, 207, 716 }, {0} },
{{ 110, 205, 682 }, {0} },
{{ 681, 205, 53 }, {1} },
{{ 759, 218, -253 }, {1} },
{{ 798, 221, 172 }, {1} },
{{ 557, 200, -111 }, {1} },
{{ 629, 201, -126 }, {1} },
{{ 704, 207, -137 }, {1} },
{{ -111, 200, -554 }, {2} },
{{ 72, 250, -933 }, {2} },
{{ -25, 207, -705 }, {2} },
{{ -21, 225, -843 }, {2} },
{{ -83, 220, -807 }, {2} },
{{ -49, 214, -775 }, {2} },
{{ -807, 220, 53 }, {3} },
{{ -859, 242, 300 }, {3} },
{{ -672, 207, -219 }, {3} },
{{ -885, 108, -59 }, {3} },
{{ -793, 103, -33 }, {3} },
{{ -757, 214, 166 }, {3} },
{{ -32768, 0, 0 }, {0} },
{ { -40, 222, 824 }, { 0 } }, { { 125, 200, 573 }, { 0 } }, { { -302, 251, 889 }, { 0 } },
{ { 38, 203, 654 }, { 0 } }, { { 22, 207, 716 }, { 0 } }, { { 110, 205, 682 }, { 0 } },
{ { 681, 205, 53 }, { 1 } }, { { 759, 218, -253 }, { 1 } }, { { 798, 221, 172 }, { 1 } },
{ { 557, 200, -111 }, { 1 } }, { { 629, 201, -126 }, { 1 } }, { { 704, 207, -137 }, { 1 } },
{ { -111, 200, -554 }, { 2 } }, { { 72, 250, -933 }, { 2 } }, { { -25, 207, -705 }, { 2 } },
{ { -21, 225, -843 }, { 2 } }, { { -83, 220, -807 }, { 2 } }, { { -49, 214, -775 }, { 2 } },
{ { -807, 220, 53 }, { 3 } }, { { -859, 242, 300 }, { 3 } }, { { -672, 207, -219 }, { 3 } },
{ { -885, 108, -59 }, { 3 } }, { { -793, 103, -33 }, { 3 } }, { { -757, 214, 166 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};
courses/big_donut/course_displaylists.inc.c
+59 -64
View File
@@ -7,17 +7,18 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_big_donut_packed_dl_0[] =
{
Gfx d_course_big_donut_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA),
gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture64BA50),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000000, 32, 0),
@@ -77,35 +78,33 @@ Gfx d_course_big_donut_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_210[] =
{
Gfx d_course_big_donut_packed_dl_210[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_0),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_220[] =
{
Gfx d_course_big_donut_packed_dl_220[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_210),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_230[] =
{
Gfx d_course_big_donut_packed_dl_230[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_220),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_240[] =
{
Gfx d_course_big_donut_packed_dl_240[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C00, 32, 0),
@@ -165,23 +164,23 @@ Gfx d_course_big_donut_packed_dl_240[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_450[] =
{
Gfx d_course_big_donut_packed_dl_450[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_240),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_460[] =
{
Gfx d_course_big_donut_packed_dl_460[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001800, 32, 0),
@@ -379,23 +378,23 @@ Gfx d_course_big_donut_packed_dl_460[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_AC0[] =
{
Gfx d_course_big_donut_packed_dl_AC0[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_460),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_AD0[] =
{
Gfx d_course_big_donut_packed_dl_AD0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture66ABA4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040037C0, 9, 0),
@@ -406,17 +405,18 @@ Gfx d_course_big_donut_packed_dl_AD0[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_B58[] =
{
Gfx d_course_big_donut_packed_dl_B58[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003850, 32, 0),
@@ -467,15 +467,13 @@ Gfx d_course_big_donut_packed_dl_B58[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_D20[] =
{
Gfx d_course_big_donut_packed_dl_D20[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_B58),
gsSPDisplayList(d_course_big_donut_packed_dl_AD0),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_D38[] =
{
Gfx d_course_big_donut_packed_dl_D38[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
@@ -500,23 +498,23 @@ Gfx d_course_big_donut_packed_dl_D38[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_DE8[] =
{
Gfx d_course_big_donut_packed_dl_DE8[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_D38),
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_DF8[] =
{
Gfx d_course_big_donut_packed_dl_DF8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040044D0, 16, 0),
@@ -527,17 +525,18 @@ Gfx d_course_big_donut_packed_dl_DF8[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_E80[] =
{
Gfx d_course_big_donut_packed_dl_E80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040045D0, 16, 0),
@@ -548,17 +547,18 @@ Gfx d_course_big_donut_packed_dl_E80[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_F08[] =
{
Gfx d_course_big_donut_packed_dl_F08[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040046D0, 16, 0),
@@ -569,17 +569,18 @@ Gfx d_course_big_donut_packed_dl_F08[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_F90[] =
{
Gfx d_course_big_donut_packed_dl_F90[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBDTexture67490C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040047D0, 16, 0),
@@ -590,8 +591,7 @@ Gfx d_course_big_donut_packed_dl_F90[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1018[] =
{
Gfx d_course_big_donut_packed_dl_1018[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_F90),
gsSPDisplayList(d_course_big_donut_packed_dl_F08),
gsSPDisplayList(d_course_big_donut_packed_dl_E80),
@@ -599,18 +599,13 @@ Gfx d_course_big_donut_packed_dl_1018[] =
gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1040[] =
{
gsSPDisplayList(d_course_big_donut_packed_dl_1018),
gsSPDisplayList(d_course_big_donut_packed_dl_DE8),
gsSPDisplayList(d_course_big_donut_packed_dl_D20),
gsSPDisplayList(d_course_big_donut_packed_dl_AC0),
gsSPDisplayList(d_course_big_donut_packed_dl_450),
gsSPEndDisplayList(),
Gfx d_course_big_donut_packed_dl_1040[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_1018), gsSPDisplayList(d_course_big_donut_packed_dl_DE8),
gsSPDisplayList(d_course_big_donut_packed_dl_D20), gsSPDisplayList(d_course_big_donut_packed_dl_AC0),
gsSPDisplayList(d_course_big_donut_packed_dl_450), gsSPEndDisplayList(),
};
Gfx d_course_big_donut_packed_dl_1070[] =
{
Gfx d_course_big_donut_packed_dl_1070[] = {
gsSPDisplayList(d_course_big_donut_packed_dl_1040),
gsSPEndDisplayList(),
};
courses/big_donut/course_offsets.c
+3 -5
View File
@@ -7,9 +7,7 @@ extern u8 gTexture67490C[];
extern u8 gTexture64BA50[];
const course_texture big_donut_textures[] = {
{gTexture66ABA4, 0x0312, 0x0800, 0x0},
{gTexture6747C4, 0x0145, 0x0800, 0x0},
{gTexture67490C, 0x021C, 0x0800, 0x0},
{gTexture64BA50, 0x0110, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture66ABA4, 0x0312, 0x0800, 0x0 }, { gTexture6747C4, 0x0145, 0x0800, 0x0 },
{ gTexture67490C, 0x021C, 0x0800, 0x0 }, { gTexture64BA50, 0x0110, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/big_donut/course_vertices.inc.c
+1165 -1165
View File
File diff suppressed because it is too large Load Diff
courses/block_fort/course_data.c
+13 -37
View File
@@ -17,41 +17,17 @@ Gfx d_course_block_fort_dl[] = {
// Item box spawn locations
struct ActorSpawnData d_course_block_fort_item_box_spawns[] = {
{{ -38, 0, 744 }, {0} },
{{ 29, 0, 710 }, {0} },
{{ -13, 0, 685 }, {0} },
{{ -553, 47, 543 }, {0} },
{{ -527, 47, 526 }, {0} },
{{ -141, 47, 153 }, {0} },
{{ -185, 47, 179 }, {0} },
{{ -388, 92, 366 }, {0} },
{{ -428, 92, 424 }, {0} },
{{ -724, 0, -50 }, {1} },
{{ -679, 0, -4 }, {1} },
{{ -736, 0, 37 }, {1} },
{{ -554, 47, -550 }, {1} },
{{ -530, 47, -536 }, {1} },
{{ -170, 47, -172 }, {1} },
{{ -138, 47, -133 }, {1} },
{{ -433, 92, -429 }, {1} },
{{ -379, 92, -390 }, {1} },
{{ -61, 0, -728 }, {2} },
{{ -17, 0, -670 }, {2} },
{{ 26, 0, -708 }, {2} },
{{ 549, 47, -548 }, {2} },
{{ 527, 47, -532 }, {2} },
{{ 148, 47, -146 }, {2} },
{{ 192, 47, -181 }, {2} },
{{ 471, 92, -455 }, {2} },
{{ 414, 92, -426 }, {2} },
{{ 728, 0, -36 }, {3} },
{{ 676, 0, -4 }, {3} },
{{ 700, 0, 31 }, {3} },
{{ 140, 47, 163 }, {3} },
{{ 178, 47, 201 }, {3} },
{{ 529, 47, 532 }, {3} },
{{ 554, 47, 557 }, {3} },
{{ 470, 92, 482 }, {3} },
{{ 438, 92, 442 }, {3} },
{{ -32768, 0, 0 }, {0} },
{ { -38, 0, 744 }, { 0 } }, { { 29, 0, 710 }, { 0 } }, { { -13, 0, 685 }, { 0 } },
{ { -553, 47, 543 }, { 0 } }, { { -527, 47, 526 }, { 0 } }, { { -141, 47, 153 }, { 0 } },
{ { -185, 47, 179 }, { 0 } }, { { -388, 92, 366 }, { 0 } }, { { -428, 92, 424 }, { 0 } },
{ { -724, 0, -50 }, { 1 } }, { { -679, 0, -4 }, { 1 } }, { { -736, 0, 37 }, { 1 } },
{ { -554, 47, -550 }, { 1 } }, { { -530, 47, -536 }, { 1 } }, { { -170, 47, -172 }, { 1 } },
{ { -138, 47, -133 }, { 1 } }, { { -433, 92, -429 }, { 1 } }, { { -379, 92, -390 }, { 1 } },
{ { -61, 0, -728 }, { 2 } }, { { -17, 0, -670 }, { 2 } }, { { 26, 0, -708 }, { 2 } },
{ { 549, 47, -548 }, { 2 } }, { { 527, 47, -532 }, { 2 } }, { { 148, 47, -146 }, { 2 } },
{ { 192, 47, -181 }, { 2 } }, { { 471, 92, -455 }, { 2 } }, { { 414, 92, -426 }, { 2 } },
{ { 728, 0, -36 }, { 3 } }, { { 676, 0, -4 }, { 3 } }, { { 700, 0, 31 }, { 3 } },
{ { 140, 47, 163 }, { 3 } }, { { 178, 47, 201 }, { 3 } }, { { 529, 47, 532 }, { 3 } },
{ { 554, 47, 557 }, { 3 } }, { { 470, 92, 482 }, { 3 } }, { { 438, 92, 442 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};
courses/block_fort/course_displaylists.inc.c
+134 -118
View File
@@ -7,8 +7,7 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_block_fort_packed_dl_0[] =
{
Gfx d_course_block_fort_packed_dl_0[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x04000000, 3, 0),
@@ -17,11 +16,13 @@ Gfx d_course_block_fort_packed_dl_0[] =
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000030, 20, 0),
@@ -34,17 +35,18 @@ Gfx d_course_block_fort_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_B8[] =
{
Gfx d_course_block_fort_packed_dl_B8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000170, 16, 0),
@@ -56,17 +58,18 @@ Gfx d_course_block_fort_packed_dl_B8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_148[] =
{
Gfx d_course_block_fort_packed_dl_148[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000270, 16, 0),
@@ -78,17 +81,18 @@ Gfx d_course_block_fort_packed_dl_148[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1D8[] =
{
Gfx d_course_block_fort_packed_dl_1D8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000370, 16, 0),
@@ -100,17 +104,18 @@ Gfx d_course_block_fort_packed_dl_1D8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_268[] =
{
Gfx d_course_block_fort_packed_dl_268[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000470, 32, 0),
@@ -129,17 +134,18 @@ Gfx d_course_block_fort_packed_dl_268[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_330[] =
{
Gfx d_course_block_fort_packed_dl_330[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCheckerboard),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040006F0, 32, 0),
@@ -157,8 +163,7 @@ Gfx d_course_block_fort_packed_dl_330[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_3F0[] =
{
Gfx d_course_block_fort_packed_dl_3F0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_330),
gsSPDisplayList(d_course_block_fort_packed_dl_268),
gsSPDisplayList(d_course_block_fort_packed_dl_1D8),
@@ -168,17 +173,18 @@ Gfx d_course_block_fort_packed_dl_3F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_428[] =
{
Gfx d_course_block_fort_packed_dl_428[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000930, 24, 0),
@@ -191,17 +197,18 @@ Gfx d_course_block_fort_packed_dl_428[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_4C0[] =
{
Gfx d_course_block_fort_packed_dl_4C0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000AB0, 24, 0),
@@ -214,17 +221,18 @@ Gfx d_course_block_fort_packed_dl_4C0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_558[] =
{
Gfx d_course_block_fort_packed_dl_558[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C30, 20, 0),
@@ -237,17 +245,18 @@ Gfx d_course_block_fort_packed_dl_558[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_5F0[] =
{
Gfx d_course_block_fort_packed_dl_5F0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6747C4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000D70, 18, 0),
@@ -260,8 +269,7 @@ Gfx d_course_block_fort_packed_dl_5F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_688[] =
{
Gfx d_course_block_fort_packed_dl_688[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_5F0),
gsSPDisplayList(d_course_block_fort_packed_dl_558),
gsSPDisplayList(d_course_block_fort_packed_dl_4C0),
@@ -269,17 +277,18 @@ Gfx d_course_block_fort_packed_dl_688[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_6B0[] =
{
Gfx d_course_block_fort_packed_dl_6B0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000E90, 32, 0),
@@ -303,17 +312,18 @@ Gfx d_course_block_fort_packed_dl_6B0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_7A0[] =
{
Gfx d_course_block_fort_packed_dl_7A0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001290, 16, 0),
@@ -324,17 +334,18 @@ Gfx d_course_block_fort_packed_dl_7A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_828[] =
{
Gfx d_course_block_fort_packed_dl_828[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001390, 16, 0),
@@ -345,17 +356,18 @@ Gfx d_course_block_fort_packed_dl_828[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_8B0[] =
{
Gfx d_course_block_fort_packed_dl_8B0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001490, 16, 0),
@@ -366,17 +378,18 @@ Gfx d_course_block_fort_packed_dl_8B0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_938[] =
{
Gfx d_course_block_fort_packed_dl_938[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture6442D4),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001590, 16, 0),
@@ -387,27 +400,24 @@ Gfx d_course_block_fort_packed_dl_938[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_9C0[] =
{
gsSPDisplayList(d_course_block_fort_packed_dl_938),
gsSPDisplayList(d_course_block_fort_packed_dl_8B0),
gsSPDisplayList(d_course_block_fort_packed_dl_828),
gsSPDisplayList(d_course_block_fort_packed_dl_7A0),
gsSPDisplayList(d_course_block_fort_packed_dl_6B0),
gsSPEndDisplayList(),
Gfx d_course_block_fort_packed_dl_9C0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_938), gsSPDisplayList(d_course_block_fort_packed_dl_8B0),
gsSPDisplayList(d_course_block_fort_packed_dl_828), gsSPDisplayList(d_course_block_fort_packed_dl_7A0),
gsSPDisplayList(d_course_block_fort_packed_dl_6B0), gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_9F0[] =
{
Gfx d_course_block_fort_packed_dl_9F0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001690, 12, 0),
@@ -416,7 +426,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001750, 32, 0),
@@ -448,7 +459,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001D50, 32, 0),
@@ -471,7 +483,8 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSP1Triangle(9, 11, 12, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002020, 11, 0),
@@ -483,17 +496,18 @@ Gfx d_course_block_fort_packed_dl_9F0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_C80[] =
{
Gfx d_course_block_fort_packed_dl_C80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040020D0, 12, 0),
@@ -502,7 +516,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002190, 32, 0),
@@ -534,7 +549,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP2Triangles(28, 29, 30, 0, 28, 30, 31, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002790, 30, 0),
@@ -557,7 +573,8 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSP1Triangle(15, 17, 18, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002AA0, 11, 0),
@@ -569,17 +586,18 @@ Gfx d_course_block_fort_packed_dl_C80[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_F10[] =
{
Gfx d_course_block_fort_packed_dl_F10[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002B50, 12, 0),
@@ -588,7 +606,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04002C10, 30, 0),
@@ -621,7 +640,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003210, 32, 0),
@@ -644,7 +664,8 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSP1Triangle(9, 11, 12, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040034E0, 11, 0),
@@ -656,17 +677,18 @@ Gfx d_course_block_fort_packed_dl_F10[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_11A8[] =
{
Gfx d_course_block_fort_packed_dl_11A8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003590, 12, 0),
@@ -675,7 +697,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP2Triangles(8, 9, 10, 0, 8, 10, 11, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64286C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003650, 32, 0),
@@ -714,7 +737,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04003D30, 32, 0),
@@ -740,7 +764,8 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSP1Triangle(19, 21, 22, 0),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gBFTexture64275C),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x040040A0, 17, 0),
@@ -755,8 +780,7 @@ Gfx d_course_block_fort_packed_dl_11A8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_14A0[] =
{
Gfx d_course_block_fort_packed_dl_14A0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_11A8),
gsSPDisplayList(d_course_block_fort_packed_dl_F10),
gsSPDisplayList(d_course_block_fort_packed_dl_C80),
@@ -764,8 +788,7 @@ Gfx d_course_block_fort_packed_dl_14A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_14C8[] =
{
Gfx d_course_block_fort_packed_dl_14C8[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x040041B0, 31, 0),
@@ -791,29 +814,22 @@ Gfx d_course_block_fort_packed_dl_14C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1580[] =
{
Gfx d_course_block_fort_packed_dl_1580[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_14C8),
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_1590[] =
{
gsSPDisplayList(d_course_block_fort_packed_dl_1580),
gsSPDisplayList(d_course_block_fort_packed_dl_14A0),
gsSPDisplayList(d_course_block_fort_packed_dl_9C0),
gsSPDisplayList(d_course_block_fort_packed_dl_688),
gsSPDisplayList(d_course_block_fort_packed_dl_3F0),
gsSPEndDisplayList(),
Gfx d_course_block_fort_packed_dl_1590[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_1580), gsSPDisplayList(d_course_block_fort_packed_dl_14A0),
gsSPDisplayList(d_course_block_fort_packed_dl_9C0), gsSPDisplayList(d_course_block_fort_packed_dl_688),
gsSPDisplayList(d_course_block_fort_packed_dl_3F0), gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_15C0[] =
{
Gfx d_course_block_fort_packed_dl_15C0[] = {
gsSPDisplayList(d_course_block_fort_packed_dl_1590),
gsSPEndDisplayList(),
};
Gfx d_course_block_fort_packed_dl_15D0[] =
{
Gfx d_course_block_fort_packed_dl_15D0[] = {
gsSPEndDisplayList(),
};
courses/block_fort/course_offsets.c
+4 -8
View File
@@ -10,12 +10,8 @@ extern u8 gTexture6747C4[];
extern u8 gTexture6442D4[];
const course_texture block_fort_textures[] = {
{gTexture64286C, 0x010A, 0x0800, 0x0},
{gTextureGrayCheckerboard, 0x010C, 0x0800, 0x0},
{gTextureGrayCobblestone, 0x010C, 0x0800, 0x0},
{gTexture64275C, 0x0110, 0x0800, 0x0},
{gTexture642978, 0x010D, 0x0800, 0x0},
{gTexture6747C4, 0x0145, 0x0800, 0x0},
{gTexture6442D4, 0x0138, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture64286C, 0x010A, 0x0800, 0x0 }, { gTextureGrayCheckerboard, 0x010C, 0x0800, 0x0 },
{ gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 }, { gTexture64275C, 0x0110, 0x0800, 0x0 },
{ gTexture642978, 0x010D, 0x0800, 0x0 }, { gTexture6747C4, 0x0145, 0x0800, 0x0 },
{ gTexture6442D4, 0x0138, 0x0800, 0x0 }, { 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/block_fort/course_vertices.inc.c
+1088 -1088
View File
File diff suppressed because it is too large Load Diff
courses/bowsers_castle/course_data.c
+1578 -2368
View File
File diff suppressed because it is too large Load Diff
courses/bowsers_castle/course_displaylists.inc.c
+916 -746
View File
File diff suppressed because it is too large Load Diff
courses/bowsers_castle/course_offsets.c
+66 -138
View File
@@ -32,144 +32,72 @@ extern u8 gTexture67A370[];
extern u8 gTexture67A91C[];
const course_texture bowsers_castle_textures[] = {
{gTexture64313C, 0x01B8, 0x0800, 0x0},
{gTexture6528DC, 0x0278, 0x0800, 0x0},
{gTexture66ED38, 0x010E, 0x0800, 0x0},
{gTexture676C6C, 0x0110, 0x0800, 0x0},
{gTexture676EA8, 0x0108, 0x0800, 0x0},
{gTexture679D34, 0x0106, 0x0800, 0x0},
{gTextureGrass6, 0x023B, 0x0800, 0x0},
{gTexture6522E0, 0x05FC, 0x0800, 0x0},
{gTexture651F40, 0x039F, 0x0800, 0x0},
{gTextureRoofTile, 0x0129, 0x0800, 0x0},
{gTextureSignBowser0, 0x07D0, 0x1000, 0x0},
{gTextureSignBowser1, 0x064D, 0x1000, 0x0},
{gTexture66ABA4, 0x0312, 0x0800, 0x0},
{gTexture66EBF0, 0x0146, 0x0800, 0x0},
{gTexture6733CC, 0x020E, 0x0800, 0x0},
{gTexture673118, 0x02B1, 0x0800, 0x0},
{gTexture673FF8, 0x035B, 0x0800, 0x0},
{gTexture674B28, 0x0230, 0x0800, 0x0},
{gTextureSignGreenArrow, 0x025B, 0x1000, 0x0},
{gTexture68D834, 0x010A, 0x0800, 0x0},
{gTexture676D7C, 0x012C, 0x0800, 0x0},
{gTexture67ADF0, 0x0595, 0x0800, 0x0},
{gTexture67EFEC, 0x016F, 0x0800, 0x0},
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTexture673990, 0x02D8, 0x0800, 0x0},
{gTexture67A370, 0x05AA, 0x0800, 0x0},
{gTexture67A91C, 0x04D1, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture64313C, 0x01B8, 0x0800, 0x0 },
{ gTexture6528DC, 0x0278, 0x0800, 0x0 },
{ gTexture66ED38, 0x010E, 0x0800, 0x0 },
{ gTexture676C6C, 0x0110, 0x0800, 0x0 },
{ gTexture676EA8, 0x0108, 0x0800, 0x0 },
{ gTexture679D34, 0x0106, 0x0800, 0x0 },
{ gTextureGrass6, 0x023B, 0x0800, 0x0 },
{ gTexture6522E0, 0x05FC, 0x0800, 0x0 },
{ gTexture651F40, 0x039F, 0x0800, 0x0 },
{ gTextureRoofTile, 0x0129, 0x0800, 0x0 },
{ gTextureSignBowser0, 0x07D0, 0x1000, 0x0 },
{ gTextureSignBowser1, 0x064D, 0x1000, 0x0 },
{ gTexture66ABA4, 0x0312, 0x0800, 0x0 },
{ gTexture66EBF0, 0x0146, 0x0800, 0x0 },
{ gTexture6733CC, 0x020E, 0x0800, 0x0 },
{ gTexture673118, 0x02B1, 0x0800, 0x0 },
{ gTexture673FF8, 0x035B, 0x0800, 0x0 },
{ gTexture674B28, 0x0230, 0x0800, 0x0 },
{ gTextureSignGreenArrow, 0x025B, 0x1000, 0x0 },
{ gTexture68D834, 0x010A, 0x0800, 0x0 },
{ gTexture676D7C, 0x012C, 0x0800, 0x0 },
{ gTexture67ADF0, 0x0595, 0x0800, 0x0 },
{ gTexture67EFEC, 0x016F, 0x0800, 0x0 },
{ gTexture653DB0, 0x06AE, 0x0800, 0x0 },
{ gTexture66CA98, 0x02C9, 0x0800, 0x0 },
{ gTexture673990, 0x02D8, 0x0800, 0x0 },
{ gTexture67A370, 0x05AA, 0x0800, 0x0 },
{ gTexture67A91C, 0x04D1, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *bowsers_castle_dls[] = {
d_course_bowsers_castle_dl_0,
d_course_bowsers_castle_dl_230,
d_course_bowsers_castle_dl_110,
d_course_bowsers_castle_dl_398,
d_course_bowsers_castle_dl_428,
d_course_bowsers_castle_dl_640,
d_course_bowsers_castle_dl_4F0,
d_course_bowsers_castle_dl_7A0,
d_course_bowsers_castle_dl_860,
d_course_bowsers_castle_dl_9F8,
d_course_bowsers_castle_dl_8E8,
d_course_bowsers_castle_dl_AE0,
d_course_bowsers_castle_dl_B88,
d_course_bowsers_castle_dl_D20,
d_course_bowsers_castle_dl_C08,
d_course_bowsers_castle_dl_E00,
d_course_bowsers_castle_dl_EA8,
d_course_bowsers_castle_dl_1040,
d_course_bowsers_castle_dl_F08,
d_course_bowsers_castle_dl_1138,
d_course_bowsers_castle_dl_11F0,
d_course_bowsers_castle_dl_1290,
d_course_bowsers_castle_dl_1248,
d_course_bowsers_castle_dl_12D0,
d_course_bowsers_castle_dl_1330,
d_course_bowsers_castle_dl_1370,
d_course_bowsers_castle_dl_1350,
d_course_bowsers_castle_dl_13A0,
d_course_bowsers_castle_dl_13C0,
d_course_bowsers_castle_dl_1448,
d_course_bowsers_castle_dl_13E0,
d_course_bowsers_castle_dl_1488,
d_course_bowsers_castle_dl_14B0,
d_course_bowsers_castle_dl_1590,
d_course_bowsers_castle_dl_1520,
d_course_bowsers_castle_dl_1608,
d_course_bowsers_castle_dl_1690,
d_course_bowsers_castle_dl_1788,
d_course_bowsers_castle_dl_1710,
d_course_bowsers_castle_dl_17D0,
d_course_bowsers_castle_dl_1818,
d_course_bowsers_castle_dl_18C0,
d_course_bowsers_castle_dl_1860,
d_course_bowsers_castle_dl_1928,
d_course_bowsers_castle_dl_1960,
d_course_bowsers_castle_dl_19F8,
d_course_bowsers_castle_dl_19A8,
d_course_bowsers_castle_dl_1A40,
d_course_bowsers_castle_dl_1A90,
d_course_bowsers_castle_dl_1B10,
d_course_bowsers_castle_dl_1AD8,
d_course_bowsers_castle_dl_1B58,
d_course_bowsers_castle_dl_1BB0,
d_course_bowsers_castle_dl_1C38,
d_course_bowsers_castle_dl_1C10,
d_course_bowsers_castle_dl_1C60,
d_course_bowsers_castle_dl_1C98,
d_course_bowsers_castle_dl_1DF8,
d_course_bowsers_castle_dl_1CD0,
d_course_bowsers_castle_dl_1EB0,
d_course_bowsers_castle_dl_1FA0,
d_course_bowsers_castle_dl_2130,
d_course_bowsers_castle_dl_2008,
d_course_bowsers_castle_dl_21F0,
d_course_bowsers_castle_dl_22E8,
d_course_bowsers_castle_dl_24B8,
d_course_bowsers_castle_dl_2398,
d_course_bowsers_castle_dl_2578,
d_course_bowsers_castle_dl_2688,
d_course_bowsers_castle_dl_2880,
d_course_bowsers_castle_dl_2760,
d_course_bowsers_castle_dl_2958,
d_course_bowsers_castle_dl_2A60,
d_course_bowsers_castle_dl_2C48,
d_course_bowsers_castle_dl_2B80,
d_course_bowsers_castle_dl_2D08,
d_course_bowsers_castle_dl_2DF8,
d_course_bowsers_castle_dl_2FB0,
d_course_bowsers_castle_dl_2F30,
d_course_bowsers_castle_dl_3050,
d_course_bowsers_castle_dl_3158,
d_course_bowsers_castle_dl_32C0,
d_course_bowsers_castle_dl_3230,
d_course_bowsers_castle_dl_3338,
d_course_bowsers_castle_dl_3480,
d_course_bowsers_castle_dl_35D0,
d_course_bowsers_castle_dl_3508,
d_course_bowsers_castle_dl_3678,
d_course_bowsers_castle_dl_37D8,
d_course_bowsers_castle_dl_39E0,
d_course_bowsers_castle_dl_38F8,
d_course_bowsers_castle_dl_3B00,
d_course_bowsers_castle_dl_3C08,
d_course_bowsers_castle_dl_3EA8,
d_course_bowsers_castle_dl_3D78,
d_course_bowsers_castle_dl_3FF0,
d_course_bowsers_castle_dl_40F0,
d_course_bowsers_castle_dl_4358,
d_course_bowsers_castle_dl_4278,
d_course_bowsers_castle_dl_4488,
d_course_bowsers_castle_dl_45D8,
d_course_bowsers_castle_dl_4820,
d_course_bowsers_castle_dl_4748,
d_course_bowsers_castle_dl_4998,
d_course_bowsers_castle_dl_4A98,
d_course_bowsers_castle_dl_4CE8,
d_course_bowsers_castle_dl_4C00,
d_course_bowsers_castle_dl_4EA8,
const Gfx* bowsers_castle_dls[] = {
d_course_bowsers_castle_dl_0, d_course_bowsers_castle_dl_230, d_course_bowsers_castle_dl_110,
d_course_bowsers_castle_dl_398, d_course_bowsers_castle_dl_428, d_course_bowsers_castle_dl_640,
d_course_bowsers_castle_dl_4F0, d_course_bowsers_castle_dl_7A0, d_course_bowsers_castle_dl_860,
d_course_bowsers_castle_dl_9F8, d_course_bowsers_castle_dl_8E8, d_course_bowsers_castle_dl_AE0,
d_course_bowsers_castle_dl_B88, d_course_bowsers_castle_dl_D20, d_course_bowsers_castle_dl_C08,
d_course_bowsers_castle_dl_E00, d_course_bowsers_castle_dl_EA8, d_course_bowsers_castle_dl_1040,
d_course_bowsers_castle_dl_F08, d_course_bowsers_castle_dl_1138, d_course_bowsers_castle_dl_11F0,
d_course_bowsers_castle_dl_1290, d_course_bowsers_castle_dl_1248, d_course_bowsers_castle_dl_12D0,
d_course_bowsers_castle_dl_1330, d_course_bowsers_castle_dl_1370, d_course_bowsers_castle_dl_1350,
d_course_bowsers_castle_dl_13A0, d_course_bowsers_castle_dl_13C0, d_course_bowsers_castle_dl_1448,
d_course_bowsers_castle_dl_13E0, d_course_bowsers_castle_dl_1488, d_course_bowsers_castle_dl_14B0,
d_course_bowsers_castle_dl_1590, d_course_bowsers_castle_dl_1520, d_course_bowsers_castle_dl_1608,
d_course_bowsers_castle_dl_1690, d_course_bowsers_castle_dl_1788, d_course_bowsers_castle_dl_1710,
d_course_bowsers_castle_dl_17D0, d_course_bowsers_castle_dl_1818, d_course_bowsers_castle_dl_18C0,
d_course_bowsers_castle_dl_1860, d_course_bowsers_castle_dl_1928, d_course_bowsers_castle_dl_1960,
d_course_bowsers_castle_dl_19F8, d_course_bowsers_castle_dl_19A8, d_course_bowsers_castle_dl_1A40,
d_course_bowsers_castle_dl_1A90, d_course_bowsers_castle_dl_1B10, d_course_bowsers_castle_dl_1AD8,
d_course_bowsers_castle_dl_1B58, d_course_bowsers_castle_dl_1BB0, d_course_bowsers_castle_dl_1C38,
d_course_bowsers_castle_dl_1C10, d_course_bowsers_castle_dl_1C60, d_course_bowsers_castle_dl_1C98,
d_course_bowsers_castle_dl_1DF8, d_course_bowsers_castle_dl_1CD0, d_course_bowsers_castle_dl_1EB0,
d_course_bowsers_castle_dl_1FA0, d_course_bowsers_castle_dl_2130, d_course_bowsers_castle_dl_2008,
d_course_bowsers_castle_dl_21F0, d_course_bowsers_castle_dl_22E8, d_course_bowsers_castle_dl_24B8,
d_course_bowsers_castle_dl_2398, d_course_bowsers_castle_dl_2578, d_course_bowsers_castle_dl_2688,
d_course_bowsers_castle_dl_2880, d_course_bowsers_castle_dl_2760, d_course_bowsers_castle_dl_2958,
d_course_bowsers_castle_dl_2A60, d_course_bowsers_castle_dl_2C48, d_course_bowsers_castle_dl_2B80,
d_course_bowsers_castle_dl_2D08, d_course_bowsers_castle_dl_2DF8, d_course_bowsers_castle_dl_2FB0,
d_course_bowsers_castle_dl_2F30, d_course_bowsers_castle_dl_3050, d_course_bowsers_castle_dl_3158,
d_course_bowsers_castle_dl_32C0, d_course_bowsers_castle_dl_3230, d_course_bowsers_castle_dl_3338,
d_course_bowsers_castle_dl_3480, d_course_bowsers_castle_dl_35D0, d_course_bowsers_castle_dl_3508,
d_course_bowsers_castle_dl_3678, d_course_bowsers_castle_dl_37D8, d_course_bowsers_castle_dl_39E0,
d_course_bowsers_castle_dl_38F8, d_course_bowsers_castle_dl_3B00, d_course_bowsers_castle_dl_3C08,
d_course_bowsers_castle_dl_3EA8, d_course_bowsers_castle_dl_3D78, d_course_bowsers_castle_dl_3FF0,
d_course_bowsers_castle_dl_40F0, d_course_bowsers_castle_dl_4358, d_course_bowsers_castle_dl_4278,
d_course_bowsers_castle_dl_4488, d_course_bowsers_castle_dl_45D8, d_course_bowsers_castle_dl_4820,
d_course_bowsers_castle_dl_4748, d_course_bowsers_castle_dl_4998, d_course_bowsers_castle_dl_4A98,
d_course_bowsers_castle_dl_4CE8, d_course_bowsers_castle_dl_4C00, d_course_bowsers_castle_dl_4EA8,
};
courses/bowsers_castle/course_vertices.inc.c
+9527 -9527
View File
File diff suppressed because it is too large Load Diff
courses/choco_mountain/course_data.c
+868 -1276
View File
File diff suppressed because it is too large Load Diff
courses/choco_mountain/course_displaylists.inc.c
+672 -579
View File
File diff suppressed because it is too large Load Diff
courses/choco_mountain/course_offsets.c
+54 -118
View File
@@ -24,124 +24,60 @@ extern u8 gTextureSignYoshi[];
extern u8 gTextureCheckerboardBlueGray[];
const course_texture choco_mountain_textures[] = {
{gTexture64619C, 0x0124, 0x0800, 0x0},
{gTexture64647C, 0x0829, 0x1000, 0x0},
{gTexture647F4C, 0x05BC, 0x1000, 0x0},
{gTexture64FBF4, 0x0274, 0x0800, 0x0},
{gTexture653DB0, 0x06AE, 0x0800, 0x0},
{gTexture652B54, 0x0606, 0x0800, 0x0},
{gTexture65315C, 0x04A9, 0x0800, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0},
{gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0},
{gTexture6774D8, 0x0113, 0x0800, 0x0},
{gTextureSignFallingRocks, 0x012C, 0x0800, 0x0},
{gTextureSignBackside, 0x011E, 0x0800, 0x0},
{gTexture679C04, 0x012F, 0x0800, 0x0},
{gTexture67B864, 0x014C, 0x0800, 0x0},
{gTexture67DC20, 0x03EF, 0x0800, 0x0},
{gTextureSignYoshi, 0x04DF, 0x1000, 0x0},
{gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture64619C, 0x0124, 0x0800, 0x0 },
{ gTexture64647C, 0x0829, 0x1000, 0x0 },
{ gTexture647F4C, 0x05BC, 0x1000, 0x0 },
{ gTexture64FBF4, 0x0274, 0x0800, 0x0 },
{ gTexture653DB0, 0x06AE, 0x0800, 0x0 },
{ gTexture652B54, 0x0606, 0x0800, 0x0 },
{ gTexture65315C, 0x04A9, 0x0800, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
{ gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
{ gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 },
{ gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 },
{ gTexture6774D8, 0x0113, 0x0800, 0x0 },
{ gTextureSignFallingRocks, 0x012C, 0x0800, 0x0 },
{ gTextureSignBackside, 0x011E, 0x0800, 0x0 },
{ gTexture679C04, 0x012F, 0x0800, 0x0 },
{ gTexture67B864, 0x014C, 0x0800, 0x0 },
{ gTexture67DC20, 0x03EF, 0x0800, 0x0 },
{ gTextureSignYoshi, 0x04DF, 0x1000, 0x0 },
{ gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *choco_mountain_dls[] = {
d_course_choco_mountain_dl_0,
d_course_choco_mountain_dl_150,
d_course_choco_mountain_dl_B0,
d_course_choco_mountain_dl_208,
d_course_choco_mountain_dl_2A8,
d_course_choco_mountain_dl_410,
d_course_choco_mountain_dl_330,
d_course_choco_mountain_dl_4D8,
d_course_choco_mountain_dl_588,
d_course_choco_mountain_dl_6C0,
d_course_choco_mountain_dl_618,
d_course_choco_mountain_dl_750,
d_course_choco_mountain_dl_7E8,
d_course_choco_mountain_dl_908,
d_course_choco_mountain_dl_878,
d_course_choco_mountain_dl_990,
d_course_choco_mountain_dl_A28,
d_course_choco_mountain_dl_BB8,
d_course_choco_mountain_dl_B10,
d_course_choco_mountain_dl_C40,
d_course_choco_mountain_dl_D30,
d_course_choco_mountain_dl_EA0,
d_course_choco_mountain_dl_DF8,
d_course_choco_mountain_dl_F38,
d_course_choco_mountain_dl_1000,
d_course_choco_mountain_dl_1150,
d_course_choco_mountain_dl_10A8,
d_course_choco_mountain_dl_11D8,
d_course_choco_mountain_dl_1280,
d_course_choco_mountain_dl_13E0,
d_course_choco_mountain_dl_1330,
d_course_choco_mountain_dl_1488,
d_course_choco_mountain_dl_1528,
d_course_choco_mountain_dl_16B8,
d_course_choco_mountain_dl_15E8,
d_course_choco_mountain_dl_1788,
d_course_choco_mountain_dl_1810,
d_course_choco_mountain_dl_1970,
d_course_choco_mountain_dl_18B8,
d_course_choco_mountain_dl_1A40,
d_course_choco_mountain_dl_1AC8,
d_course_choco_mountain_dl_1C18,
d_course_choco_mountain_dl_1B70,
d_course_choco_mountain_dl_1CC8,
d_course_choco_mountain_dl_1D50,
d_course_choco_mountain_dl_1E98,
d_course_choco_mountain_dl_1E08,
d_course_choco_mountain_dl_1F40,
d_course_choco_mountain_dl_1FE0,
d_course_choco_mountain_dl_2168,
d_course_choco_mountain_dl_20C8,
d_course_choco_mountain_dl_2228,
d_course_choco_mountain_dl_22D8,
d_course_choco_mountain_dl_2468,
d_course_choco_mountain_dl_23C8,
d_course_choco_mountain_dl_2538,
d_course_choco_mountain_dl_2600,
d_course_choco_mountain_dl_2780,
d_course_choco_mountain_dl_26D8,
d_course_choco_mountain_dl_2840,
d_course_choco_mountain_dl_2908,
d_course_choco_mountain_dl_2A88,
d_course_choco_mountain_dl_29B8,
d_course_choco_mountain_dl_2B38,
d_course_choco_mountain_dl_2C08,
d_course_choco_mountain_dl_2D50,
d_course_choco_mountain_dl_2C98,
d_course_choco_mountain_dl_2DE8,
d_course_choco_mountain_dl_2EA0,
d_course_choco_mountain_dl_2FD0,
d_course_choco_mountain_dl_2F28,
d_course_choco_mountain_dl_3070,
d_course_choco_mountain_dl_3120,
d_course_choco_mountain_dl_32B0,
d_course_choco_mountain_dl_31D8,
d_course_choco_mountain_dl_3368,
d_course_choco_mountain_dl_3438,
d_course_choco_mountain_dl_3618,
d_course_choco_mountain_dl_3550,
d_course_choco_mountain_dl_36F0,
d_course_choco_mountain_dl_37D0,
d_course_choco_mountain_dl_39A8,
d_course_choco_mountain_dl_38E8,
d_course_choco_mountain_dl_3A80,
d_course_choco_mountain_dl_3B60,
d_course_choco_mountain_dl_3CB8,
d_course_choco_mountain_dl_3C18,
d_course_choco_mountain_dl_3D70,
d_course_choco_mountain_dl_3E18,
d_course_choco_mountain_dl_3FA8,
d_course_choco_mountain_dl_3EE0,
d_course_choco_mountain_dl_4090,
d_course_choco_mountain_dl_4138,
d_course_choco_mountain_dl_42C8,
d_course_choco_mountain_dl_41F8,
d_course_choco_mountain_dl_43C8,
const Gfx* choco_mountain_dls[] = {
d_course_choco_mountain_dl_0, d_course_choco_mountain_dl_150, d_course_choco_mountain_dl_B0,
d_course_choco_mountain_dl_208, d_course_choco_mountain_dl_2A8, d_course_choco_mountain_dl_410,
d_course_choco_mountain_dl_330, d_course_choco_mountain_dl_4D8, d_course_choco_mountain_dl_588,
d_course_choco_mountain_dl_6C0, d_course_choco_mountain_dl_618, d_course_choco_mountain_dl_750,
d_course_choco_mountain_dl_7E8, d_course_choco_mountain_dl_908, d_course_choco_mountain_dl_878,
d_course_choco_mountain_dl_990, d_course_choco_mountain_dl_A28, d_course_choco_mountain_dl_BB8,
d_course_choco_mountain_dl_B10, d_course_choco_mountain_dl_C40, d_course_choco_mountain_dl_D30,
d_course_choco_mountain_dl_EA0, d_course_choco_mountain_dl_DF8, d_course_choco_mountain_dl_F38,
d_course_choco_mountain_dl_1000, d_course_choco_mountain_dl_1150, d_course_choco_mountain_dl_10A8,
d_course_choco_mountain_dl_11D8, d_course_choco_mountain_dl_1280, d_course_choco_mountain_dl_13E0,
d_course_choco_mountain_dl_1330, d_course_choco_mountain_dl_1488, d_course_choco_mountain_dl_1528,
d_course_choco_mountain_dl_16B8, d_course_choco_mountain_dl_15E8, d_course_choco_mountain_dl_1788,
d_course_choco_mountain_dl_1810, d_course_choco_mountain_dl_1970, d_course_choco_mountain_dl_18B8,
d_course_choco_mountain_dl_1A40, d_course_choco_mountain_dl_1AC8, d_course_choco_mountain_dl_1C18,
d_course_choco_mountain_dl_1B70, d_course_choco_mountain_dl_1CC8, d_course_choco_mountain_dl_1D50,
d_course_choco_mountain_dl_1E98, d_course_choco_mountain_dl_1E08, d_course_choco_mountain_dl_1F40,
d_course_choco_mountain_dl_1FE0, d_course_choco_mountain_dl_2168, d_course_choco_mountain_dl_20C8,
d_course_choco_mountain_dl_2228, d_course_choco_mountain_dl_22D8, d_course_choco_mountain_dl_2468,
d_course_choco_mountain_dl_23C8, d_course_choco_mountain_dl_2538, d_course_choco_mountain_dl_2600,
d_course_choco_mountain_dl_2780, d_course_choco_mountain_dl_26D8, d_course_choco_mountain_dl_2840,
d_course_choco_mountain_dl_2908, d_course_choco_mountain_dl_2A88, d_course_choco_mountain_dl_29B8,
d_course_choco_mountain_dl_2B38, d_course_choco_mountain_dl_2C08, d_course_choco_mountain_dl_2D50,
d_course_choco_mountain_dl_2C98, d_course_choco_mountain_dl_2DE8, d_course_choco_mountain_dl_2EA0,
d_course_choco_mountain_dl_2FD0, d_course_choco_mountain_dl_2F28, d_course_choco_mountain_dl_3070,
d_course_choco_mountain_dl_3120, d_course_choco_mountain_dl_32B0, d_course_choco_mountain_dl_31D8,
d_course_choco_mountain_dl_3368, d_course_choco_mountain_dl_3438, d_course_choco_mountain_dl_3618,
d_course_choco_mountain_dl_3550, d_course_choco_mountain_dl_36F0, d_course_choco_mountain_dl_37D0,
d_course_choco_mountain_dl_39A8, d_course_choco_mountain_dl_38E8, d_course_choco_mountain_dl_3A80,
d_course_choco_mountain_dl_3B60, d_course_choco_mountain_dl_3CB8, d_course_choco_mountain_dl_3C18,
d_course_choco_mountain_dl_3D70, d_course_choco_mountain_dl_3E18, d_course_choco_mountain_dl_3FA8,
d_course_choco_mountain_dl_3EE0, d_course_choco_mountain_dl_4090, d_course_choco_mountain_dl_4138,
d_course_choco_mountain_dl_42C8, d_course_choco_mountain_dl_41F8, d_course_choco_mountain_dl_43C8,
};
courses/choco_mountain/course_vertices.inc.c
+5560 -5560
View File
File diff suppressed because it is too large Load Diff
courses/courseTable.c
+300 -142
View File
@@ -4,145 +4,303 @@
#include "all_course_model.h"
#include "all_course_packed.h"
struct CourseTable gCourseTable[] = {{
_course_mario_raceway_dl_mio0SegmentRomStart, _course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart, _mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart, _course_mario_raceway_offsetsSegmentRomEnd,
d_course_mario_raceway_vertex, d_course_mario_raceway_vertex_count,
d_course_mario_raceway_packed, d_course_mario_raceway_packed_end,
mario_raceway_textures, 0, 0x0000,
}, {
_course_choco_mountain_dl_mio0SegmentRomStart, _course_choco_mountain_dl_mio0SegmentRomEnd,
_choco_mountain_vertexSegmentRomStart, _choco_mountain_vertexSegmentRomEnd,
_course_choco_mountain_offsetsSegmentRomStart, _course_choco_mountain_offsetsSegmentRomEnd,
d_course_choco_mountain_vertex, d_course_choco_mountain_vertex_count,
d_course_choco_mountain_packed, d_course_choco_mountain_packed_end,
choco_mountain_textures, 1, 0x0000,
}, {
_course_bowsers_castle_dl_mio0SegmentRomStart, _course_bowsers_castle_dl_mio0SegmentRomEnd,
_bowsers_castle_vertexSegmentRomStart, _bowsers_castle_vertexSegmentRomEnd,
_course_bowsers_castle_offsetsSegmentRomStart, _course_bowsers_castle_offsetsSegmentRomEnd,
d_course_bowsers_castle_vertex, d_course_bowsers_castle_vertex_count,
d_course_bowsers_castle_packed, d_course_bowsers_castle_packed_end,
bowsers_castle_textures, 0, 0x0000,
}, {
_course_banshee_boardwalk_dl_mio0SegmentRomStart, _course_banshee_boardwalk_dl_mio0SegmentRomEnd,
_banshee_boardwalk_vertexSegmentRomStart, _banshee_boardwalk_vertexSegmentRomEnd,
_course_banshee_boardwalk_offsetsSegmentRomStart, _course_banshee_boardwalk_offsetsSegmentRomEnd,
d_course_banshee_boardwalk_vertex, d_course_banshee_boardwalk_vertex_count,
d_course_banshee_boardwalk_packed, d_course_banshee_boardwalk_packed_end,
banshee_boardwalk_textures, 1, 0x0000,
}, {
_course_yoshi_valley_dl_mio0SegmentRomStart, _course_yoshi_valley_dl_mio0SegmentRomEnd,
_yoshi_valley_vertexSegmentRomStart, _yoshi_valley_vertexSegmentRomEnd,
_course_yoshi_valley_offsetsSegmentRomStart, _course_yoshi_valley_offsetsSegmentRomEnd,
d_course_yoshi_valley_vertex, d_course_yoshi_valley_vertex_count,
d_course_yoshi_valley_packed, d_course_yoshi_valley_packed_end,
yoshi_valley_textures, 0, 0x0000,
}, {
_course_frappe_snowland_dl_mio0SegmentRomStart, _course_frappe_snowland_dl_mio0SegmentRomEnd,
_frappe_snowland_vertexSegmentRomStart, _frappe_snowland_vertexSegmentRomEnd,
_course_frappe_snowland_offsetsSegmentRomStart, _course_frappe_snowland_offsetsSegmentRomEnd,
d_course_frappe_snowland_vertex, d_course_frappe_snowland_vertex_count,
d_course_frappe_snowland_packed, d_course_frappe_snowland_packed_end,
frappe_snowland_textures, 0, 0x0000,
}, {
_course_koopa_troopa_beach_dl_mio0SegmentRomStart, _course_koopa_troopa_beach_dl_mio0SegmentRomEnd,
_koopa_troopa_beach_vertexSegmentRomStart, _koopa_troopa_beach_vertexSegmentRomEnd,
_course_koopa_troopa_beach_offsetsSegmentRomStart, _course_koopa_troopa_beach_offsetsSegmentRomEnd,
d_course_koopa_troopa_beach_vertex, d_course_koopa_troopa_beach_vertex_count,
d_course_koopa_troopa_beach_packed, d_course_koopa_troopa_beach_packed_end,
koopa_troopa_beach_textures, 0, 0x0000,
}, {
_course_royal_raceway_dl_mio0SegmentRomStart, _course_royal_raceway_dl_mio0SegmentRomEnd,
_royal_raceway_vertexSegmentRomStart, _royal_raceway_vertexSegmentRomEnd,
_course_royal_raceway_offsetsSegmentRomStart, _course_royal_raceway_offsetsSegmentRomEnd,
d_course_royal_raceway_vertex, d_course_royal_raceway_vertex_count,
d_course_royal_raceway_packed, d_course_royal_raceway_packed_end,
royal_raceway_textures, 0, 0x0000,
}, {
_course_luigi_raceway_dl_mio0SegmentRomStart, _course_luigi_raceway_dl_mio0SegmentRomEnd,
_luigi_raceway_vertexSegmentRomStart, _luigi_raceway_vertexSegmentRomEnd,
_course_luigi_raceway_offsetsSegmentRomStart, _course_luigi_raceway_offsetsSegmentRomEnd,
d_course_luigi_raceway_vertex, d_course_luigi_raceway_vertex_count,
d_course_luigi_raceway_packed, d_course_luigi_raceway_packed_end,
luigi_raceway_textures, 0, 0x0000,
}, {
_course_moo_moo_farm_dl_mio0SegmentRomStart, _course_moo_moo_farm_dl_mio0SegmentRomEnd,
_moo_moo_farm_vertexSegmentRomStart, _moo_moo_farm_vertexSegmentRomEnd,
_course_moo_moo_farm_offsetsSegmentRomStart, _course_moo_moo_farm_offsetsSegmentRomEnd,
d_course_moo_moo_farm_vertex, d_course_moo_moo_farm_vertex_count,
d_course_moo_moo_farm_packed, d_course_moo_moo_farm_packed_end,
moo_moo_farm_textures, 0, 0x0000,
}, {
_course_toads_turnpike_dl_mio0SegmentRomStart, _course_toads_turnpike_dl_mio0SegmentRomEnd,
_toads_turnpike_vertexSegmentRomStart, _toads_turnpike_vertexSegmentRomEnd,
_course_toads_turnpike_offsetsSegmentRomStart, _course_toads_turnpike_offsetsSegmentRomEnd,
d_course_toads_turnpike_vertex, d_course_toads_turnpike_vertex_count,
d_course_toads_turnpike_packed, d_course_toads_turnpike_packed_end,
toads_turnpike_textures, 0, 0x0000,
}, {
_course_kalimari_desert_dl_mio0SegmentRomStart, _course_kalimari_desert_dl_mio0SegmentRomEnd,
_kalimari_desert_vertexSegmentRomStart, _kalimari_desert_vertexSegmentRomEnd,
_course_kalimari_desert_offsetsSegmentRomStart, _course_kalimari_desert_offsetsSegmentRomEnd,
d_course_kalimari_desert_vertex, d_course_kalimari_desert_vertex_count,
d_course_kalimari_desert_packed, d_course_kalimari_desert_packed_end,
kalimari_desert_textures, 0, 0x0000,
}, {
_course_sherbet_land_dl_mio0SegmentRomStart, _course_sherbet_land_dl_mio0SegmentRomEnd,
_sherbet_land_vertexSegmentRomStart, _sherbet_land_vertexSegmentRomEnd,
_course_sherbet_land_offsetsSegmentRomStart, _course_sherbet_land_offsetsSegmentRomEnd,
d_course_sherbet_land_vertex, d_course_sherbet_land_vertex_count,
d_course_sherbet_land_packed, d_course_sherbet_land_packed_end,
sherbet_land_textures, 0, 0x0000,
}, {
_course_rainbow_road_dl_mio0SegmentRomStart, _course_rainbow_road_dl_mio0SegmentRomEnd,
_rainbow_road_vertexSegmentRomStart, _rainbow_road_vertexSegmentRomEnd,
_course_rainbow_road_offsetsSegmentRomStart, _course_rainbow_road_offsetsSegmentRomEnd,
d_course_rainbow_road_vertex, d_course_rainbow_road_vertex_count,
d_course_rainbow_road_packed, d_course_rainbow_road_packed_end,
rainbow_road_textures, 0, 0x0000,
}, {
_course_wario_stadium_dl_mio0SegmentRomStart, _course_wario_stadium_dl_mio0SegmentRomEnd,
_wario_stadium_vertexSegmentRomStart, _wario_stadium_vertexSegmentRomEnd,
_course_wario_stadium_offsetsSegmentRomStart, _course_wario_stadium_offsetsSegmentRomEnd,
d_course_wario_stadium_vertex, d_course_wario_stadium_vertex_count,
d_course_wario_stadium_packed, d_course_wario_stadium_packed_end,
wario_stadium_textures, 0, 0x0000,
}, {
_course_block_fort_dl_mio0SegmentRomStart, _course_block_fort_dl_mio0SegmentRomEnd,
_block_fort_vertexSegmentRomStart, _block_fort_vertexSegmentRomEnd,
_course_block_fort_offsetsSegmentRomStart, _course_block_fort_offsetsSegmentRomEnd,
d_course_block_fort_vertex, d_course_block_fort_vertex_count,
d_course_block_fort_packed, d_course_block_fort_packed_end,
block_fort_textures, 0, 0x0000,
}, {
_course_skyscraper_dl_mio0SegmentRomStart, _course_skyscraper_dl_mio0SegmentRomEnd,
_skyscraper_vertexSegmentRomStart, _skyscraper_vertexSegmentRomEnd,
_course_skyscraper_offsetsSegmentRomStart, _course_skyscraper_offsetsSegmentRomEnd,
d_course_skyscraper_vertex, d_course_skyscraper_vertex_count,
d_course_skyscraper_packed, d_course_skyscraper_packed_end,
skyscraper_textures, 0, 0x0000,
}, {
_course_double_deck_dl_mio0SegmentRomStart, _course_double_deck_dl_mio0SegmentRomEnd,
_double_deck_vertexSegmentRomStart, _double_deck_vertexSegmentRomEnd,
_course_double_deck_offsetsSegmentRomStart, _course_double_deck_offsetsSegmentRomEnd,
d_course_double_deck_vertex, d_course_double_deck_vertex_count,
d_course_double_deck_packed, d_course_double_deck_packed_end,
double_deck_textures, 0, 0x0000,
}, {
_course_dks_jungle_parkway_dl_mio0SegmentRomStart, _course_dks_jungle_parkway_dl_mio0SegmentRomEnd,
_dks_jungle_parkway_vertexSegmentRomStart, _dks_jungle_parkway_vertexSegmentRomEnd,
_course_dks_jungle_parkway_offsetsSegmentRomStart, _course_dks_jungle_parkway_offsetsSegmentRomEnd,
d_course_dks_jungle_parkway_vertex, d_course_dks_jungle_parkway_vertex_count,
d_course_dks_jungle_parkway_packed, d_course_dks_jungle_parkway_packed_end,
dks_jungle_parkway_textures, 0, 0x0000,
}, {
_course_big_donut_dl_mio0SegmentRomStart, _course_big_donut_dl_mio0SegmentRomEnd,
_big_donut_vertexSegmentRomStart, _big_donut_vertexSegmentRomEnd,
_course_big_donut_offsetsSegmentRomStart, _course_big_donut_offsetsSegmentRomEnd,
d_course_big_donut_vertex, d_course_big_donut_vertex_count,
d_course_big_donut_packed, d_course_big_donut_packed_end,
big_donut_textures, 0, 0x0000,
}};
struct CourseTable gCourseTable[] = { {
_course_mario_raceway_dl_mio0SegmentRomStart,
_course_mario_raceway_dl_mio0SegmentRomEnd,
_mario_raceway_vertexSegmentRomStart,
_mario_raceway_vertexSegmentRomEnd,
_course_mario_raceway_offsetsSegmentRomStart,
_course_mario_raceway_offsetsSegmentRomEnd,
d_course_mario_raceway_vertex,
d_course_mario_raceway_vertex_count,
d_course_mario_raceway_packed,
d_course_mario_raceway_packed_end,
mario_raceway_textures,
0,
0x0000,
},
{
_course_choco_mountain_dl_mio0SegmentRomStart,
_course_choco_mountain_dl_mio0SegmentRomEnd,
_choco_mountain_vertexSegmentRomStart,
_choco_mountain_vertexSegmentRomEnd,
_course_choco_mountain_offsetsSegmentRomStart,
_course_choco_mountain_offsetsSegmentRomEnd,
d_course_choco_mountain_vertex,
d_course_choco_mountain_vertex_count,
d_course_choco_mountain_packed,
d_course_choco_mountain_packed_end,
choco_mountain_textures,
1,
0x0000,
},
{
_course_bowsers_castle_dl_mio0SegmentRomStart,
_course_bowsers_castle_dl_mio0SegmentRomEnd,
_bowsers_castle_vertexSegmentRomStart,
_bowsers_castle_vertexSegmentRomEnd,
_course_bowsers_castle_offsetsSegmentRomStart,
_course_bowsers_castle_offsetsSegmentRomEnd,
d_course_bowsers_castle_vertex,
d_course_bowsers_castle_vertex_count,
d_course_bowsers_castle_packed,
d_course_bowsers_castle_packed_end,
bowsers_castle_textures,
0,
0x0000,
},
{
_course_banshee_boardwalk_dl_mio0SegmentRomStart,
_course_banshee_boardwalk_dl_mio0SegmentRomEnd,
_banshee_boardwalk_vertexSegmentRomStart,
_banshee_boardwalk_vertexSegmentRomEnd,
_course_banshee_boardwalk_offsetsSegmentRomStart,
_course_banshee_boardwalk_offsetsSegmentRomEnd,
d_course_banshee_boardwalk_vertex,
d_course_banshee_boardwalk_vertex_count,
d_course_banshee_boardwalk_packed,
d_course_banshee_boardwalk_packed_end,
banshee_boardwalk_textures,
1,
0x0000,
},
{
_course_yoshi_valley_dl_mio0SegmentRomStart,
_course_yoshi_valley_dl_mio0SegmentRomEnd,
_yoshi_valley_vertexSegmentRomStart,
_yoshi_valley_vertexSegmentRomEnd,
_course_yoshi_valley_offsetsSegmentRomStart,
_course_yoshi_valley_offsetsSegmentRomEnd,
d_course_yoshi_valley_vertex,
d_course_yoshi_valley_vertex_count,
d_course_yoshi_valley_packed,
d_course_yoshi_valley_packed_end,
yoshi_valley_textures,
0,
0x0000,
},
{
_course_frappe_snowland_dl_mio0SegmentRomStart,
_course_frappe_snowland_dl_mio0SegmentRomEnd,
_frappe_snowland_vertexSegmentRomStart,
_frappe_snowland_vertexSegmentRomEnd,
_course_frappe_snowland_offsetsSegmentRomStart,
_course_frappe_snowland_offsetsSegmentRomEnd,
d_course_frappe_snowland_vertex,
d_course_frappe_snowland_vertex_count,
d_course_frappe_snowland_packed,
d_course_frappe_snowland_packed_end,
frappe_snowland_textures,
0,
0x0000,
},
{
_course_koopa_troopa_beach_dl_mio0SegmentRomStart,
_course_koopa_troopa_beach_dl_mio0SegmentRomEnd,
_koopa_troopa_beach_vertexSegmentRomStart,
_koopa_troopa_beach_vertexSegmentRomEnd,
_course_koopa_troopa_beach_offsetsSegmentRomStart,
_course_koopa_troopa_beach_offsetsSegmentRomEnd,
d_course_koopa_troopa_beach_vertex,
d_course_koopa_troopa_beach_vertex_count,
d_course_koopa_troopa_beach_packed,
d_course_koopa_troopa_beach_packed_end,
koopa_troopa_beach_textures,
0,
0x0000,
},
{
_course_royal_raceway_dl_mio0SegmentRomStart,
_course_royal_raceway_dl_mio0SegmentRomEnd,
_royal_raceway_vertexSegmentRomStart,
_royal_raceway_vertexSegmentRomEnd,
_course_royal_raceway_offsetsSegmentRomStart,
_course_royal_raceway_offsetsSegmentRomEnd,
d_course_royal_raceway_vertex,
d_course_royal_raceway_vertex_count,
d_course_royal_raceway_packed,
d_course_royal_raceway_packed_end,
royal_raceway_textures,
0,
0x0000,
},
{
_course_luigi_raceway_dl_mio0SegmentRomStart,
_course_luigi_raceway_dl_mio0SegmentRomEnd,
_luigi_raceway_vertexSegmentRomStart,
_luigi_raceway_vertexSegmentRomEnd,
_course_luigi_raceway_offsetsSegmentRomStart,
_course_luigi_raceway_offsetsSegmentRomEnd,
d_course_luigi_raceway_vertex,
d_course_luigi_raceway_vertex_count,
d_course_luigi_raceway_packed,
d_course_luigi_raceway_packed_end,
luigi_raceway_textures,
0,
0x0000,
},
{
_course_moo_moo_farm_dl_mio0SegmentRomStart,
_course_moo_moo_farm_dl_mio0SegmentRomEnd,
_moo_moo_farm_vertexSegmentRomStart,
_moo_moo_farm_vertexSegmentRomEnd,
_course_moo_moo_farm_offsetsSegmentRomStart,
_course_moo_moo_farm_offsetsSegmentRomEnd,
d_course_moo_moo_farm_vertex,
d_course_moo_moo_farm_vertex_count,
d_course_moo_moo_farm_packed,
d_course_moo_moo_farm_packed_end,
moo_moo_farm_textures,
0,
0x0000,
},
{
_course_toads_turnpike_dl_mio0SegmentRomStart,
_course_toads_turnpike_dl_mio0SegmentRomEnd,
_toads_turnpike_vertexSegmentRomStart,
_toads_turnpike_vertexSegmentRomEnd,
_course_toads_turnpike_offsetsSegmentRomStart,
_course_toads_turnpike_offsetsSegmentRomEnd,
d_course_toads_turnpike_vertex,
d_course_toads_turnpike_vertex_count,
d_course_toads_turnpike_packed,
d_course_toads_turnpike_packed_end,
toads_turnpike_textures,
0,
0x0000,
},
{
_course_kalimari_desert_dl_mio0SegmentRomStart,
_course_kalimari_desert_dl_mio0SegmentRomEnd,
_kalimari_desert_vertexSegmentRomStart,
_kalimari_desert_vertexSegmentRomEnd,
_course_kalimari_desert_offsetsSegmentRomStart,
_course_kalimari_desert_offsetsSegmentRomEnd,
d_course_kalimari_desert_vertex,
d_course_kalimari_desert_vertex_count,
d_course_kalimari_desert_packed,
d_course_kalimari_desert_packed_end,
kalimari_desert_textures,
0,
0x0000,
},
{
_course_sherbet_land_dl_mio0SegmentRomStart,
_course_sherbet_land_dl_mio0SegmentRomEnd,
_sherbet_land_vertexSegmentRomStart,
_sherbet_land_vertexSegmentRomEnd,
_course_sherbet_land_offsetsSegmentRomStart,
_course_sherbet_land_offsetsSegmentRomEnd,
d_course_sherbet_land_vertex,
d_course_sherbet_land_vertex_count,
d_course_sherbet_land_packed,
d_course_sherbet_land_packed_end,
sherbet_land_textures,
0,
0x0000,
},
{
_course_rainbow_road_dl_mio0SegmentRomStart,
_course_rainbow_road_dl_mio0SegmentRomEnd,
_rainbow_road_vertexSegmentRomStart,
_rainbow_road_vertexSegmentRomEnd,
_course_rainbow_road_offsetsSegmentRomStart,
_course_rainbow_road_offsetsSegmentRomEnd,
d_course_rainbow_road_vertex,
d_course_rainbow_road_vertex_count,
d_course_rainbow_road_packed,
d_course_rainbow_road_packed_end,
rainbow_road_textures,
0,
0x0000,
},
{
_course_wario_stadium_dl_mio0SegmentRomStart,
_course_wario_stadium_dl_mio0SegmentRomEnd,
_wario_stadium_vertexSegmentRomStart,
_wario_stadium_vertexSegmentRomEnd,
_course_wario_stadium_offsetsSegmentRomStart,
_course_wario_stadium_offsetsSegmentRomEnd,
d_course_wario_stadium_vertex,
d_course_wario_stadium_vertex_count,
d_course_wario_stadium_packed,
d_course_wario_stadium_packed_end,
wario_stadium_textures,
0,
0x0000,
},
{
_course_block_fort_dl_mio0SegmentRomStart,
_course_block_fort_dl_mio0SegmentRomEnd,
_block_fort_vertexSegmentRomStart,
_block_fort_vertexSegmentRomEnd,
_course_block_fort_offsetsSegmentRomStart,
_course_block_fort_offsetsSegmentRomEnd,
d_course_block_fort_vertex,
d_course_block_fort_vertex_count,
d_course_block_fort_packed,
d_course_block_fort_packed_end,
block_fort_textures,
0,
0x0000,
},
{
_course_skyscraper_dl_mio0SegmentRomStart,
_course_skyscraper_dl_mio0SegmentRomEnd,
_skyscraper_vertexSegmentRomStart,
_skyscraper_vertexSegmentRomEnd,
_course_skyscraper_offsetsSegmentRomStart,
_course_skyscraper_offsetsSegmentRomEnd,
d_course_skyscraper_vertex,
d_course_skyscraper_vertex_count,
d_course_skyscraper_packed,
d_course_skyscraper_packed_end,
skyscraper_textures,
0,
0x0000,
},
{
_course_double_deck_dl_mio0SegmentRomStart,
_course_double_deck_dl_mio0SegmentRomEnd,
_double_deck_vertexSegmentRomStart,
_double_deck_vertexSegmentRomEnd,
_course_double_deck_offsetsSegmentRomStart,
_course_double_deck_offsetsSegmentRomEnd,
d_course_double_deck_vertex,
d_course_double_deck_vertex_count,
d_course_double_deck_packed,
d_course_double_deck_packed_end,
double_deck_textures,
0,
0x0000,
},
{
_course_dks_jungle_parkway_dl_mio0SegmentRomStart,
_course_dks_jungle_parkway_dl_mio0SegmentRomEnd,
_dks_jungle_parkway_vertexSegmentRomStart,
_dks_jungle_parkway_vertexSegmentRomEnd,
_course_dks_jungle_parkway_offsetsSegmentRomStart,
_course_dks_jungle_parkway_offsetsSegmentRomEnd,
d_course_dks_jungle_parkway_vertex,
d_course_dks_jungle_parkway_vertex_count,
d_course_dks_jungle_parkway_packed,
d_course_dks_jungle_parkway_packed_end,
dks_jungle_parkway_textures,
0,
0x0000,
},
{
_course_big_donut_dl_mio0SegmentRomStart,
_course_big_donut_dl_mio0SegmentRomEnd,
_big_donut_vertexSegmentRomStart,
_big_donut_vertexSegmentRomEnd,
_course_big_donut_offsetsSegmentRomStart,
_course_big_donut_offsetsSegmentRomEnd,
d_course_big_donut_vertex,
d_course_big_donut_vertex_count,
d_course_big_donut_packed,
d_course_big_donut_packed_end,
big_donut_textures,
0,
0x0000,
} };
courses/courseTable.h
+13 -13
View File
@@ -6,19 +6,19 @@
// dlRomStart, vertexRomStart, & vertexStart, are u8* because mio0 compressed.
struct CourseTable {
u8 *dlRomStart; // 0x00 ROM start for segment 6 DL data
u8 *dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8 *vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8 *vertexRomEnd; // 0x0C ROM end for segment 7?
u8 *offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8 *offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
CourseVtx *vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8 *packedStart; // 0x20 packed display list start address
u8 *finalDisplaylistOffset; // 0x24
u32 *textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
u8* dlRomStart; // 0x00 ROM start for segment 6 DL data
u8* dlRomEnd; // 0x04 ROM end for segment 6 DL data
u8* vertexRomStart; // 0x08 ROM start for segment 4 vertex data
u8* vertexRomEnd; // 0x0C ROM end for segment 7?
u8* offsetRomStart; // 0x10 ROM start for uncompressed segment 9 texture and DL addresses
u8* offsetRomEnd; // 0x14 ROM end for uncompressed segment 9 texture and DL addresses
CourseVtx* vertexStart; // 0x18 segmented address of vertex data
u32 vertexCount; // 0x1C number of vertices in vertex data
u8* packedStart; // 0x20 packed display list start address
u8* finalDisplaylistOffset; // 0x24
u32* textures; // 0x20 segmented address of textures table
u16 unknown1; // 0x2C
u16 padding; // 0x2E
};
extern struct CourseTable gCourseTable[];
courses/dks_jungle_parkway/course_data.c
+1589 -1861
View File
File diff suppressed because it is too large Load Diff
courses/dks_jungle_parkway/course_data.h
+2 -1
View File
@@ -113,6 +113,7 @@ extern Gfx d_course_dks_jungle_parkway_dl_7008[];
extern Gfx d_course_dks_jungle_parkway_dl_7080[];
extern Gfx d_course_dks_jungle_parkway_dl_7108[];
extern TrackWaypoint d_course_dks_jungle_parkway_unknown_waypoints[];
extern TrackWaypoint d_course_dks_jungle_parkway_ferry_waypoints[];
extern TrackWaypoint d_course_dks_jungle_parkway_track_waypoints[];
extern Vtx d_course_dks_jungle_parkway_paddle_boat_model1[];
extern Vtx d_course_dks_jungle_parkway_paddle_boat_model2[];
@@ -187,7 +188,7 @@ extern u8 d_course_dks_jungle_parkway_kiwano_tlut[];
extern Vtx d_course_dks_jungle_parkway_kiwano_model[];
extern Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[];
extern Gfx d_course_dks_jungle_parkway_dl_13C30[];
extern Gfx *d_course_dks_jungle_parkway_unknown_dl_list[];
extern Gfx* d_course_dks_jungle_parkway_unknown_dl_list[];
extern struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[];
extern struct UnkActorSpawnData d_course_dks_jungle_parkway_tree_spawn[];
extern TrackSections d_course_dks_jungle_parkway_addr[];
courses/dks_jungle_parkway/course_displaylists.inc.c
+1197 -903
View File
File diff suppressed because it is too large Load Diff
courses/dks_jungle_parkway/course_offsets.c
+25 -25
View File
@@ -27,29 +27,29 @@ extern u8 gTextureWaves0[];
extern u8 gTexture683844[];
const course_texture dks_jungle_parkway_textures[] = {
{gTexture648508, 0x01FE, 0x1000, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0},
{gTexture654460, 0x0B12, 0x1000, 0x0},
{gTexture654F74, 0x0A24, 0x1000, 0x0},
{gTexture655998, 0x059F, 0x0800, 0x0},
{gTexture655F38, 0x0BB9, 0x1000, 0x0},
{gTexture656AF4, 0x0AD3, 0x1000, 0x0},
{gTexture6575C8, 0x0DA7, 0x1000, 0x0},
{gTexture658370, 0x0DBA, 0x1000, 0x0},
{gTexture65912C, 0x0DBC, 0x1000, 0x0},
{gTexture659EE8, 0x0EF5, 0x1000, 0x0},
{gTexture65ADE0, 0x0D5A, 0x1000, 0x0},
{gTexture65BB3C, 0x0D9E, 0x1000, 0x0},
{gTexture65C8DC, 0x0CF5, 0x1000, 0x0},
{gTexture65D5D4, 0x0D18, 0x1000, 0x0},
{gTexture65E2EC, 0x02B0, 0x0800, 0x0},
{gTexture65EAEC, 0x034A, 0x0800, 0x0},
{gTexture65E59C, 0x054F, 0x1000, 0x0},
{gTexture65EE38, 0x0CDE, 0x1000, 0x0},
{gTexture65FB18, 0x03EE, 0x0800, 0x0},
{gTextureSignPinkArrow, 0x0198, 0x0800, 0x0},
{gTextureWaves0, 0x04D0, 0x0800, 0x0},
{gTexture683844, 0x0655, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture648508, 0x01FE, 0x1000, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
{ gTextureWoodBridgeSlats, 0x0DAB, 0x1000, 0x0 },
{ gTexture654460, 0x0B12, 0x1000, 0x0 },
{ gTexture654F74, 0x0A24, 0x1000, 0x0 },
{ gTexture655998, 0x059F, 0x0800, 0x0 },
{ gTexture655F38, 0x0BB9, 0x1000, 0x0 },
{ gTexture656AF4, 0x0AD3, 0x1000, 0x0 },
{ gTexture6575C8, 0x0DA7, 0x1000, 0x0 },
{ gTexture658370, 0x0DBA, 0x1000, 0x0 },
{ gTexture65912C, 0x0DBC, 0x1000, 0x0 },
{ gTexture659EE8, 0x0EF5, 0x1000, 0x0 },
{ gTexture65ADE0, 0x0D5A, 0x1000, 0x0 },
{ gTexture65BB3C, 0x0D9E, 0x1000, 0x0 },
{ gTexture65C8DC, 0x0CF5, 0x1000, 0x0 },
{ gTexture65D5D4, 0x0D18, 0x1000, 0x0 },
{ gTexture65E2EC, 0x02B0, 0x0800, 0x0 },
{ gTexture65EAEC, 0x034A, 0x0800, 0x0 },
{ gTexture65E59C, 0x054F, 0x1000, 0x0 },
{ gTexture65EE38, 0x0CDE, 0x1000, 0x0 },
{ gTexture65FB18, 0x03EE, 0x0800, 0x0 },
{ gTextureSignPinkArrow, 0x0198, 0x0800, 0x0 },
{ gTextureWaves0, 0x04D0, 0x0800, 0x0 },
{ gTexture683844, 0x0655, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/dks_jungle_parkway/course_vertices.inc.c
+5679 -5679
View File
File diff suppressed because it is too large Load Diff
courses/double_deck/course_data.c
+15 -43
View File
@@ -15,47 +15,19 @@ Gfx d_course_double_deck_dl[] = {
// Item box spawn locations.
struct ActorSpawnData d_course_double_deck_item_box_spawns[] = {
{{ -331, 0, 675 }, { 0 }},
{{ 18, 30, 295 }, { 0 }},
{{ -685, 0, -279 }, { 0 }},
{{ -329, 0, 731 }, { 0 }},
{{ 17, 30, 346 }, { 0 }},
{{ -741, 0, -280 }, { 0 }},
{{ -367, 30, 13 }, { 0 }},
{{ -315, 30, 2 }, { 0 }},
{{ -625, 0, -276 }, { 0 }},
{{ -259, 30, -12 }, { 0 }},
{{ 22, 30, 245 }, { 0 }},
{{ -341, 0, 619 }, { 0 }},
{{ 350, 0, -605 }, { 1 }},
{{ 732, 0, 277 }, { 1 }},
{{ 248, 30, 48 }, { 1 }},
{{ 56, 30, -340 }, { 1 }},
{{ 670, 0, 286 }, { 1 }},
{{ 356, 0, -658 }, { 1 }},
{{ 48, 30, -283 }, { 1 }},
{{ 626, 0, 288 }, { 1 }},
{{ 292, 30, 56 }, { 1 }},
{{ 337, 30, 58 }, { 1 }},
{{ 54, 30, -248 }, { 1 }},
{{ 363, 0, -709 }, { 1 }},
{{ 341, 60, -726 }, { 2 }},
{{ 352, 60, -682 }, { 2 }},
{{ 698, 60, 430 }, { 2 }},
{{ 660, 60, 439 }, { 2 }},
{{ 280, 90, 290 }, { 2 }},
{{ 236, 90, 246 }, { 2 }},
{{ 351, 60, -632 }, { 2 }},
{{ 616, 60, 456 }, { 2 }},
{{ 324, 90, 331 }, { 2 }},
{{ -233, 90, -235 }, { 3 }},
{{ -281, 90, -280 }, { 3 }},
{{ -688, 60, -395 }, { 3 }},
{{ -735, 60, -390 }, { 3 }},
{{ -434, 60, 707 }, { 3 }},
{{ -422, 60, 663 }, { 3 }},
{{ -435, 60, 618 }, { 3 }},
{{ -626, 60, -405 }, { 3 }},
{{ -312, 90, -320 }, { 3 }},
{{ -32768, 0, 0 }, { 0 }},
{ { -331, 0, 675 }, { 0 } }, { { 18, 30, 295 }, { 0 } }, { { -685, 0, -279 }, { 0 } },
{ { -329, 0, 731 }, { 0 } }, { { 17, 30, 346 }, { 0 } }, { { -741, 0, -280 }, { 0 } },
{ { -367, 30, 13 }, { 0 } }, { { -315, 30, 2 }, { 0 } }, { { -625, 0, -276 }, { 0 } },
{ { -259, 30, -12 }, { 0 } }, { { 22, 30, 245 }, { 0 } }, { { -341, 0, 619 }, { 0 } },
{ { 350, 0, -605 }, { 1 } }, { { 732, 0, 277 }, { 1 } }, { { 248, 30, 48 }, { 1 } },
{ { 56, 30, -340 }, { 1 } }, { { 670, 0, 286 }, { 1 } }, { { 356, 0, -658 }, { 1 } },
{ { 48, 30, -283 }, { 1 } }, { { 626, 0, 288 }, { 1 } }, { { 292, 30, 56 }, { 1 } },
{ { 337, 30, 58 }, { 1 } }, { { 54, 30, -248 }, { 1 } }, { { 363, 0, -709 }, { 1 } },
{ { 341, 60, -726 }, { 2 } }, { { 352, 60, -682 }, { 2 } }, { { 698, 60, 430 }, { 2 } },
{ { 660, 60, 439 }, { 2 } }, { { 280, 90, 290 }, { 2 } }, { { 236, 90, 246 }, { 2 } },
{ { 351, 60, -632 }, { 2 } }, { { 616, 60, 456 }, { 2 } }, { { 324, 90, 331 }, { 2 } },
{ { -233, 90, -235 }, { 3 } }, { { -281, 90, -280 }, { 3 } }, { { -688, 60, -395 }, { 3 } },
{ { -735, 60, -390 }, { 3 } }, { { -434, 60, 707 }, { 3 } }, { { -422, 60, 663 }, { 3 } },
{ { -435, 60, 618 }, { 3 } }, { { -626, 60, -405 }, { 3 } }, { { -312, 90, -320 }, { 3 } },
{ { -32768, 0, 0 }, { 0 } },
};
courses/double_deck/course_displaylists.inc.c
+25 -26
View File
@@ -7,17 +7,18 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_double_deck_packed_dl_0[] =
{
Gfx d_course_double_deck_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000000, 32, 0),
@@ -77,17 +78,18 @@ Gfx d_course_double_deck_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_210[] =
{
Gfx d_course_double_deck_packed_dl_210[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04000C00, 32, 0),
@@ -131,24 +133,24 @@ Gfx d_course_double_deck_packed_dl_210[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_3A0[] =
{
Gfx d_course_double_deck_packed_dl_3A0[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_210),
gsSPDisplayList(d_course_double_deck_packed_dl_0),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_3B8[] =
{
Gfx d_course_double_deck_packed_dl_3B8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTexture642978),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001250, 32, 0),
@@ -199,8 +201,7 @@ Gfx d_course_double_deck_packed_dl_3B8[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_580[] =
{
Gfx d_course_double_deck_packed_dl_580[] = {
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x04001C50, 3, 0),
@@ -209,11 +210,13 @@ Gfx d_course_double_deck_packed_dl_580[] =
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gDDTextureGrayCobblestone),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04001C80, 32, 0),
@@ -252,27 +255,23 @@ Gfx d_course_double_deck_packed_dl_580[] =
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_708[] =
{
Gfx d_course_double_deck_packed_dl_708[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_580),
gsSPDisplayList(d_course_double_deck_packed_dl_3B8),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_720[] =
{
Gfx d_course_double_deck_packed_dl_720[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_708),
gsSPDisplayList(d_course_double_deck_packed_dl_3A0),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_738[] =
{
Gfx d_course_double_deck_packed_dl_738[] = {
gsSPDisplayList(d_course_double_deck_packed_dl_720),
gsSPEndDisplayList(),
};
Gfx d_course_double_deck_packed_dl_748[] =
{
Gfx d_course_double_deck_packed_dl_748[] = {
gsSPEndDisplayList(),
};
courses/double_deck/course_offsets.c
+3 -3
View File
@@ -5,7 +5,7 @@ extern u8 gTextureGrayCobblestone[];
extern u8 gTexture642978[];
const course_texture double_deck_textures[] = {
{gTextureGrayCobblestone, 0x010C, 0x0800, 0x0},
{gTexture642978, 0x010D, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 },
{ gTexture642978, 0x010D, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/double_deck/course_vertices.inc.c
+555 -555
View File
File diff suppressed because it is too large Load Diff
courses/frappe_snowland/course_data.c
+1309 -1943
View File
File diff suppressed because it is too large Load Diff
courses/frappe_snowland/course_data.h
+1 -1
View File
@@ -88,7 +88,7 @@ extern Gfx d_course_frappe_snowland_dl_tree[];
extern Gfx d_course_frappe_snowland_dl_76A0[];
extern struct ActorSpawnData d_course_frappe_snowland_tree_spawns[];
extern struct ActorSpawnData d_course_frappe_snowland_item_box_spawns[];
extern Gfx *d_course_frappe_snowland_dl_list[];
extern Gfx* d_course_frappe_snowland_dl_list[];
extern TrackSections d_course_frappe_snowland_addr[];
#endif
courses/frappe_snowland/course_displaylists.inc.c
+691 -644
View File
File diff suppressed because it is too large Load Diff
courses/frappe_snowland/course_offsets.c
+5 -9
View File
@@ -11,13 +11,9 @@ extern u8 gTexture679258[];
extern u8 gTexture67973C[];
const course_texture frappe_snowland_textures[] = {
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTexture66EBF0, 0x0146, 0x0800, 0x0},
{gTexture675434, 0x0245, 0x0800, 0x0},
{gTexture677F04, 0x0213, 0x0800, 0x0},
{gTexture678118, 0x0314, 0x0800, 0x0},
{gTexture679258, 0x04E3, 0x1000, 0x0},
{gTexture67973C, 0x04C6, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture6684F8, 0x010D, 0x0800, 0x0 }, { gTexture66CA98, 0x02C9, 0x0800, 0x0 },
{ gTexture66EBF0, 0x0146, 0x0800, 0x0 }, { gTexture675434, 0x0245, 0x0800, 0x0 },
{ gTexture677F04, 0x0213, 0x0800, 0x0 }, { gTexture678118, 0x0314, 0x0800, 0x0 },
{ gTexture679258, 0x04E3, 0x1000, 0x0 }, { gTexture67973C, 0x04C6, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/frappe_snowland/course_vertices.inc.c
+5529 -5529
View File
File diff suppressed because it is too large Load Diff
courses/kalimari_desert/course_data.c
+2871 -4280
View File
File diff suppressed because it is too large Load Diff
courses/kalimari_desert/course_data.h
+1 -1
View File
@@ -88,7 +88,7 @@ extern Gfx d_course_kalimari_desert_dl_66F0[];
extern Gfx d_course_kalimari_desert_dl_6838[];
extern Gfx d_course_kalimari_desert_dl_6940[];
extern TrackWaypoint d_course_kalimari_desert_unknown_waypoints[];
extern TrackWaypoint d_course_kalimari_desert_track_unknown_waypoints[];
extern TrackWaypoint d_course_kalimari_desert_train_waypoints[];
extern TrackWaypoint d_course_kalimari_desert_track_waypoints[];
extern u8 d_course_kalimari_desert_tree_tlut[];
extern Vtx d_course_kalimari_desert_cactus_model1[];
courses/kalimari_desert/course_displaylists.inc.c
+1584 -1266
View File
File diff suppressed because it is too large Load Diff
courses/kalimari_desert/course_offsets.c
+41 -107
View File
@@ -29,113 +29,47 @@ extern u8 gTextureSignKoopaAir0[];
extern u8 gTextureSignKoopaAir1[];
const course_texture kalimari_desert_textures[] = {
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
{gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0},
{gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0},
{gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0},
{gTexture67490C, 0x021C, 0x0800, 0x0},
{gTextureSignYoshi, 0x04DF, 0x1000, 0x0},
{gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0},
{gTexture646CA8, 0x073A, 0x1000, 0x0},
{gTexture6473E4, 0x05AD, 0x1000, 0x0},
{gTexture647994, 0x05B5, 0x1000, 0x0},
{gTexture668920, 0x03D9, 0x0800, 0x0},
{gTextureRailroadTrack, 0x0B5B, 0x1000, 0x0},
{gTextureRailroadCrossingTrack, 0x0208, 0x1000, 0x0},
{gTexture67291C, 0x059C, 0x0800, 0x0},
{gTextureFenceBarbedWire, 0x021E, 0x1000, 0x0},
{gTexture67D304, 0x091C, 0x1000, 0x0},
{gTexture67E010, 0x0415, 0x0800, 0x0},
{gTexture67EEAC, 0x0140, 0x0800, 0x0},
{gTextureSignShellShot0, 0x038C, 0x1000, 0x0},
{gTextureSignShellShot1, 0x0247, 0x1000, 0x0},
{gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0},
{gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture6684F8, 0x010D, 0x0800, 0x0 }, { gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 }, { gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
{ gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 }, { gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 },
{ gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 }, { gTexture67490C, 0x021C, 0x0800, 0x0 },
{ gTextureSignYoshi, 0x04DF, 0x1000, 0x0 }, { gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
{ gTexture646CA8, 0x073A, 0x1000, 0x0 }, { gTexture6473E4, 0x05AD, 0x1000, 0x0 },
{ gTexture647994, 0x05B5, 0x1000, 0x0 }, { gTexture668920, 0x03D9, 0x0800, 0x0 },
{ gTextureRailroadTrack, 0x0B5B, 0x1000, 0x0 }, { gTextureRailroadCrossingTrack, 0x0208, 0x1000, 0x0 },
{ gTexture67291C, 0x059C, 0x0800, 0x0 }, { gTextureFenceBarbedWire, 0x021E, 0x1000, 0x0 },
{ gTexture67D304, 0x091C, 0x1000, 0x0 }, { gTexture67E010, 0x0415, 0x0800, 0x0 },
{ gTexture67EEAC, 0x0140, 0x0800, 0x0 }, { gTextureSignShellShot0, 0x038C, 0x1000, 0x0 },
{ gTextureSignShellShot1, 0x0247, 0x1000, 0x0 }, { gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 },
{ gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 }, { 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *kalimari_desert_dls[] = {
d_course_kalimari_desert_dl_0,
d_course_kalimari_desert_dl_258,
d_course_kalimari_desert_dl_100,
d_course_kalimari_desert_dl_310,
d_course_kalimari_desert_dl_4A0,
d_course_kalimari_desert_dl_778,
d_course_kalimari_desert_dl_5C0,
d_course_kalimari_desert_dl_858,
d_course_kalimari_desert_dl_A58,
d_course_kalimari_desert_dl_CD0,
d_course_kalimari_desert_dl_B38,
d_course_kalimari_desert_dl_DD0,
d_course_kalimari_desert_dl_F68,
d_course_kalimari_desert_dl_1258,
d_course_kalimari_desert_dl_1030,
d_course_kalimari_desert_dl_1350,
d_course_kalimari_desert_dl_14C0,
d_course_kalimari_desert_dl_17C8,
d_course_kalimari_desert_dl_1588,
d_course_kalimari_desert_dl_18C8,
d_course_kalimari_desert_dl_1A58,
d_course_kalimari_desert_dl_1D48,
d_course_kalimari_desert_dl_1B38,
d_course_kalimari_desert_dl_1E80,
d_course_kalimari_desert_dl_2000,
d_course_kalimari_desert_dl_22D8,
d_course_kalimari_desert_dl_20E0,
d_course_kalimari_desert_dl_2458,
d_course_kalimari_desert_dl_25D0,
d_course_kalimari_desert_dl_2868,
d_course_kalimari_desert_dl_26E8,
d_course_kalimari_desert_dl_29C0,
d_course_kalimari_desert_dl_2B40,
d_course_kalimari_desert_dl_2DE8,
d_course_kalimari_desert_dl_2C88,
d_course_kalimari_desert_dl_2F30,
d_course_kalimari_desert_dl_3068,
d_course_kalimari_desert_dl_32F8,
d_course_kalimari_desert_dl_31C0,
d_course_kalimari_desert_dl_3460,
d_course_kalimari_desert_dl_3590,
d_course_kalimari_desert_dl_3818,
d_course_kalimari_desert_dl_3718,
d_course_kalimari_desert_dl_3998,
d_course_kalimari_desert_dl_3AC0,
d_course_kalimari_desert_dl_3DB8,
d_course_kalimari_desert_dl_3CA0,
d_course_kalimari_desert_dl_3FB0,
d_course_kalimari_desert_dl_40A8,
d_course_kalimari_desert_dl_4358,
d_course_kalimari_desert_dl_4280,
d_course_kalimari_desert_dl_4538,
d_course_kalimari_desert_dl_4630,
d_course_kalimari_desert_dl_49E0,
d_course_kalimari_desert_dl_4908,
d_course_kalimari_desert_dl_4BA0,
d_course_kalimari_desert_dl_4CF0,
d_course_kalimari_desert_dl_4FB0,
d_course_kalimari_desert_dl_4EF8,
d_course_kalimari_desert_dl_5100,
d_course_kalimari_desert_dl_5208,
d_course_kalimari_desert_dl_5470,
d_course_kalimari_desert_dl_53A0,
d_course_kalimari_desert_dl_55C8,
d_course_kalimari_desert_dl_5730,
d_course_kalimari_desert_dl_5978,
d_course_kalimari_desert_dl_5898,
d_course_kalimari_desert_dl_5AD0,
d_course_kalimari_desert_dl_5BE8,
d_course_kalimari_desert_dl_5DF8,
d_course_kalimari_desert_dl_5D20,
d_course_kalimari_desert_dl_5F20,
d_course_kalimari_desert_dl_6028,
d_course_kalimari_desert_dl_62F8,
d_course_kalimari_desert_dl_61B0,
d_course_kalimari_desert_dl_63E0,
d_course_kalimari_desert_dl_65B0,
d_course_kalimari_desert_dl_6838,
d_course_kalimari_desert_dl_66F0,
d_course_kalimari_desert_dl_6940,
const Gfx* kalimari_desert_dls[] = {
d_course_kalimari_desert_dl_0, d_course_kalimari_desert_dl_258, d_course_kalimari_desert_dl_100,
d_course_kalimari_desert_dl_310, d_course_kalimari_desert_dl_4A0, d_course_kalimari_desert_dl_778,
d_course_kalimari_desert_dl_5C0, d_course_kalimari_desert_dl_858, d_course_kalimari_desert_dl_A58,
d_course_kalimari_desert_dl_CD0, d_course_kalimari_desert_dl_B38, d_course_kalimari_desert_dl_DD0,
d_course_kalimari_desert_dl_F68, d_course_kalimari_desert_dl_1258, d_course_kalimari_desert_dl_1030,
d_course_kalimari_desert_dl_1350, d_course_kalimari_desert_dl_14C0, d_course_kalimari_desert_dl_17C8,
d_course_kalimari_desert_dl_1588, d_course_kalimari_desert_dl_18C8, d_course_kalimari_desert_dl_1A58,
d_course_kalimari_desert_dl_1D48, d_course_kalimari_desert_dl_1B38, d_course_kalimari_desert_dl_1E80,
d_course_kalimari_desert_dl_2000, d_course_kalimari_desert_dl_22D8, d_course_kalimari_desert_dl_20E0,
d_course_kalimari_desert_dl_2458, d_course_kalimari_desert_dl_25D0, d_course_kalimari_desert_dl_2868,
d_course_kalimari_desert_dl_26E8, d_course_kalimari_desert_dl_29C0, d_course_kalimari_desert_dl_2B40,
d_course_kalimari_desert_dl_2DE8, d_course_kalimari_desert_dl_2C88, d_course_kalimari_desert_dl_2F30,
d_course_kalimari_desert_dl_3068, d_course_kalimari_desert_dl_32F8, d_course_kalimari_desert_dl_31C0,
d_course_kalimari_desert_dl_3460, d_course_kalimari_desert_dl_3590, d_course_kalimari_desert_dl_3818,
d_course_kalimari_desert_dl_3718, d_course_kalimari_desert_dl_3998, d_course_kalimari_desert_dl_3AC0,
d_course_kalimari_desert_dl_3DB8, d_course_kalimari_desert_dl_3CA0, d_course_kalimari_desert_dl_3FB0,
d_course_kalimari_desert_dl_40A8, d_course_kalimari_desert_dl_4358, d_course_kalimari_desert_dl_4280,
d_course_kalimari_desert_dl_4538, d_course_kalimari_desert_dl_4630, d_course_kalimari_desert_dl_49E0,
d_course_kalimari_desert_dl_4908, d_course_kalimari_desert_dl_4BA0, d_course_kalimari_desert_dl_4CF0,
d_course_kalimari_desert_dl_4FB0, d_course_kalimari_desert_dl_4EF8, d_course_kalimari_desert_dl_5100,
d_course_kalimari_desert_dl_5208, d_course_kalimari_desert_dl_5470, d_course_kalimari_desert_dl_53A0,
d_course_kalimari_desert_dl_55C8, d_course_kalimari_desert_dl_5730, d_course_kalimari_desert_dl_5978,
d_course_kalimari_desert_dl_5898, d_course_kalimari_desert_dl_5AD0, d_course_kalimari_desert_dl_5BE8,
d_course_kalimari_desert_dl_5DF8, d_course_kalimari_desert_dl_5D20, d_course_kalimari_desert_dl_5F20,
d_course_kalimari_desert_dl_6028, d_course_kalimari_desert_dl_62F8, d_course_kalimari_desert_dl_61B0,
d_course_kalimari_desert_dl_63E0, d_course_kalimari_desert_dl_65B0, d_course_kalimari_desert_dl_6838,
d_course_kalimari_desert_dl_66F0, d_course_kalimari_desert_dl_6940,
};
courses/kalimari_desert/course_vertices.inc.c
+6393 -6393
View File
File diff suppressed because it is too large Load Diff
courses/koopa_troopa_beach/course_data.c
+1596 -2719
View File
File diff suppressed because it is too large Load Diff
courses/koopa_troopa_beach/course_data.h
+6 -6
View File
@@ -6,7 +6,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include "code_80004740.h"
#include "animation.h"
extern Gfx d_course_koopa_troopa_beach_dl_0[];
extern Gfx d_course_koopa_troopa_beach_dl_48[];
@@ -314,8 +314,8 @@ 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[];
extern s16 d_course_koopa_troopa_beach_unk_data2[];
extern animation_type_3_triplet d_course_koopa_troopa_beach_unk_data3[];
extern animation_type_2 d_course_koopa_troopa_beach_unk_data4;
extern AnimationLimbVector d_course_koopa_troopa_beach_unk_data3[];
extern Animation d_course_koopa_troopa_beach_unk_data4;
extern Lights1 d_course_koopa_troopa_beach_light1;
extern u8 d_course_koopa_troopa_beach_bird_wing[];
extern u8 d_course_koopa_troopa_beach_bird_eye[];
@@ -332,7 +332,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_168F0[];
extern Vtx d_course_koopa_troopa_beach_bird_wing_3_model[];
extern Gfx d_course_koopa_troopa_beach_dl_16990[];
extern u32 d_course_koopa_troopa_beach_unk4[];
extern animation_type_2 *d_course_koopa_troopa_beach_unk_data5[];
extern Animation* d_course_koopa_troopa_beach_unk_data5[];
extern u32 d_course_koopa_troopa_beach_unk_data6[];
extern Lights1 d_course_koopa_troopa_beach_light2;
extern Vtx d_course_koopa_troopa_beach_tree_model[];
@@ -367,7 +367,7 @@ extern Gfx d_course_koopa_troopa_beach_dl_18D68[];
extern struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[];
extern struct ActorSpawnData d_course_koopa_troopa_beach_tree_spawn[];
extern TrackSections d_course_koopa_troopa_beach_addr[];
extern Gfx *d_course_koopa_troopa_beach_dl_list1[];
extern Gfx *d_course_koopa_troopa_beach_dl_list2[];
extern Gfx* d_course_koopa_troopa_beach_dl_list1[];
extern Gfx* d_course_koopa_troopa_beach_dl_list2[];
#endif
courses/koopa_troopa_beach/course_displaylists.inc.c
+1498 -1212
View File
File diff suppressed because it is too large Load Diff
courses/koopa_troopa_beach/course_offsets.c
+17 -17
View File
@@ -19,21 +19,21 @@ extern u8 gTextureWaves1[];
extern u8 gTextureWaves2[];
const course_texture koopa_troopa_beach_textures[] = {
{gTexture643B3C, 0x0798, 0x0800, 0x0},
{gTexture66A3DC, 0x07C5, 0x0800, 0x0},
{gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0},
{gTexture66DD38, 0x0330, 0x1000, 0x0},
{gTexture643430, 0x0604, 0x0800, 0x0},
{gTexture660D8C, 0x0126, 0x0800, 0x0},
{gTexture6609D0, 0x03BB, 0x1000, 0x0},
{gTextureGrass12, 0x0874, 0x0800, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTexture66EBF0, 0x0146, 0x0800, 0x0},
{gTexture67BEE8, 0x02D0, 0x0800, 0x0},
{gTextureSandFinish, 0x022E, 0x0800, 0x0},
{gTextureWheelSteamEngine, 0x020F, 0x0800, 0x0},
{gTexture669570, 0x0E6B, 0x1000, 0x0},
{gTextureWaves1, 0x05C4, 0x0800, 0x0},
{gTextureWaves2, 0x0488, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture643B3C, 0x0798, 0x0800, 0x0 },
{ gTexture66A3DC, 0x07C5, 0x0800, 0x0 },
{ gTextureSignWoodRedArrow, 0x04E1, 0x1000, 0x0 },
{ gTexture66DD38, 0x0330, 0x1000, 0x0 },
{ gTexture643430, 0x0604, 0x0800, 0x0 },
{ gTexture660D8C, 0x0126, 0x0800, 0x0 },
{ gTexture6609D0, 0x03BB, 0x1000, 0x0 },
{ gTextureGrass12, 0x0874, 0x0800, 0x0 },
{ gTexture66CA98, 0x02C9, 0x0800, 0x0 },
{ gTexture66EBF0, 0x0146, 0x0800, 0x0 },
{ gTexture67BEE8, 0x02D0, 0x0800, 0x0 },
{ gTextureSandFinish, 0x022E, 0x0800, 0x0 },
{ gTextureWheelSteamEngine, 0x020F, 0x0800, 0x0 },
{ gTexture669570, 0x0E6B, 0x1000, 0x0 },
{ gTextureWaves1, 0x05C4, 0x0800, 0x0 },
{ gTextureWaves2, 0x0488, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/koopa_troopa_beach/course_vertices.inc.c
+9376 -9376
View File
File diff suppressed because it is too large Load Diff
courses/luigi_raceway/course_data.c
+1625 -3251
View File
File diff suppressed because it is too large Load Diff
courses/luigi_raceway/course_displaylists.inc.c
+2046 -1746
View File
File diff suppressed because it is too large Load Diff
courses/luigi_raceway/course_offsets.c
+82 -162
View File
@@ -44,168 +44,88 @@ extern u8 gTextureSignYoshi[];
extern u8 gTextureCheckerboardBlueGray[];
const course_texture luigi_raceway_textures[] = {
{gTextureSignShellShot0, 0x038C, 0x1000, 0x0},
{gTextureSignShellShot1, 0x0247, 0x1000, 0x0},
{gTextureCheckerboardYellowBlue, 0x013A, 0x0800, 0x0},
{gTexture64619C, 0x0124, 0x0800, 0x0},
{gTextureCheckerboardBlueGreen, 0x0139, 0x0800, 0x0},
{gTextureGrass3, 0x0372, 0x0800, 0x0},
{gTextureFlagRed, 0x019E, 0x0800, 0x0},
{gTexture65100C, 0x0120, 0x0800, 0x0},
{gTexture65112C, 0x0150, 0x0800, 0x0},
{gTexture653608, 0x07A7, 0x0800, 0x0},
{gTextureGrass11, 0x01F8, 0x0800, 0x0},
{gTextureSignLuigiFace0, 0x05C9, 0x1000, 0x0},
{gTextureSignLuigiFace1, 0x065F, 0x1000, 0x0},
{gTexture66C7A8, 0x0149, 0x0800, 0x0},
{gTexture670AC8, 0x0FBF, 0x1000, 0x0},
{gTexture671A88, 0x012D, 0x0800, 0x0},
{gTexture6735DC, 0x03B1, 0x0800, 0x0},
{gTexture673C68, 0x038D, 0x0800, 0x0},
{gTexture6747C4, 0x0145, 0x0800, 0x0},
{gTextureRoad1, 0x02D2, 0x1000, 0x0},
{gTextureRoad2, 0x02AE, 0x1000, 0x0},
{gTextureRoadFinish1, 0x026B, 0x1000, 0x0},
{gTexture67BBD8, 0x0310, 0x0800, 0x0},
{gTexture68272C, 0x01F9, 0x1000, 0x0},
{gTexture682928, 0x01F9, 0x1000, 0x0},
{gTexture682B24, 0x01F9, 0x1000, 0x0},
{gTexture682D20, 0x01F9, 0x1000, 0x0},
{gTexture682F1C, 0x01F9, 0x1000, 0x0},
{gTexture683118, 0x01F9, 0x1000, 0x0},
{gTextureSignBlue64, 0x0567, 0x1000, 0x0},
{gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0},
{gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
{gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0},
{gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0},
{gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0},
{gTextureSignYoshi, 0x04DF, 0x1000, 0x0},
{gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureSignShellShot0, 0x038C, 0x1000, 0x0 },
{ gTextureSignShellShot1, 0x0247, 0x1000, 0x0 },
{ gTextureCheckerboardYellowBlue, 0x013A, 0x0800, 0x0 },
{ gTexture64619C, 0x0124, 0x0800, 0x0 },
{ gTextureCheckerboardBlueGreen, 0x0139, 0x0800, 0x0 },
{ gTextureGrass3, 0x0372, 0x0800, 0x0 },
{ gTextureFlagRed, 0x019E, 0x0800, 0x0 },
{ gTexture65100C, 0x0120, 0x0800, 0x0 },
{ gTexture65112C, 0x0150, 0x0800, 0x0 },
{ gTexture653608, 0x07A7, 0x0800, 0x0 },
{ gTextureGrass11, 0x01F8, 0x0800, 0x0 },
{ gTextureSignLuigiFace0, 0x05C9, 0x1000, 0x0 },
{ gTextureSignLuigiFace1, 0x065F, 0x1000, 0x0 },
{ gTexture66C7A8, 0x0149, 0x0800, 0x0 },
{ gTexture670AC8, 0x0FBF, 0x1000, 0x0 },
{ gTexture671A88, 0x012D, 0x0800, 0x0 },
{ gTexture6735DC, 0x03B1, 0x0800, 0x0 },
{ gTexture673C68, 0x038D, 0x0800, 0x0 },
{ gTexture6747C4, 0x0145, 0x0800, 0x0 },
{ gTextureRoad1, 0x02D2, 0x1000, 0x0 },
{ gTextureRoad2, 0x02AE, 0x1000, 0x0 },
{ gTextureRoadFinish1, 0x026B, 0x1000, 0x0 },
{ gTexture67BBD8, 0x0310, 0x0800, 0x0 },
{ gTexture68272C, 0x01F9, 0x1000, 0x0 },
{ gTexture682928, 0x01F9, 0x1000, 0x0 },
{ gTexture682B24, 0x01F9, 0x1000, 0x0 },
{ gTexture682D20, 0x01F9, 0x1000, 0x0 },
{ gTexture682F1C, 0x01F9, 0x1000, 0x0 },
{ gTexture683118, 0x01F9, 0x1000, 0x0 },
{ gTextureSignBlue64, 0x0567, 0x1000, 0x0 },
{ gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 },
{ gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 },
{ gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
{ gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
{ gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 },
{ gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 },
{ gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 },
{ gTextureSignYoshi, 0x04DF, 0x1000, 0x0 },
{ gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *luigi_raceway_dls[] = {
d_course_luigi_raceway_dl_0,
d_course_luigi_raceway_dl_328,
d_course_luigi_raceway_dl_1A8,
d_course_luigi_raceway_dl_480,
d_course_luigi_raceway_dl_6E0,
d_course_luigi_raceway_dl_9F8,
d_course_luigi_raceway_dl_868,
d_course_luigi_raceway_dl_B48,
d_course_luigi_raceway_dl_D80,
d_course_luigi_raceway_dl_1058,
d_course_luigi_raceway_dl_EE8,
d_course_luigi_raceway_dl_1198,
d_course_luigi_raceway_dl_1398,
d_course_luigi_raceway_dl_16D8,
d_course_luigi_raceway_dl_1538,
d_course_luigi_raceway_dl_1888,
d_course_luigi_raceway_dl_1B00,
d_course_luigi_raceway_dl_1E30,
d_course_luigi_raceway_dl_1C78,
d_course_luigi_raceway_dl_1FD0,
d_course_luigi_raceway_dl_2240,
d_course_luigi_raceway_dl_2518,
d_course_luigi_raceway_dl_2348,
d_course_luigi_raceway_dl_2658,
d_course_luigi_raceway_dl_2860,
d_course_luigi_raceway_dl_2BC0,
d_course_luigi_raceway_dl_2978,
d_course_luigi_raceway_dl_2D00,
d_course_luigi_raceway_dl_2F08,
d_course_luigi_raceway_dl_32C0,
d_course_luigi_raceway_dl_2FF8,
d_course_luigi_raceway_dl_3408,
d_course_luigi_raceway_dl_3610,
d_course_luigi_raceway_dl_3928,
d_course_luigi_raceway_dl_36A8,
d_course_luigi_raceway_dl_3AB0,
d_course_luigi_raceway_dl_3C18,
d_course_luigi_raceway_dl_3EB0,
d_course_luigi_raceway_dl_3CA0,
d_course_luigi_raceway_dl_4058,
d_course_luigi_raceway_dl_4198,
d_course_luigi_raceway_dl_4440,
d_course_luigi_raceway_dl_4240,
d_course_luigi_raceway_dl_4638,
d_course_luigi_raceway_dl_4720,
d_course_luigi_raceway_dl_4A18,
d_course_luigi_raceway_dl_4828,
d_course_luigi_raceway_dl_4C60,
d_course_luigi_raceway_dl_4CF8,
d_course_luigi_raceway_dl_4FD8,
d_course_luigi_raceway_dl_4E38,
d_course_luigi_raceway_dl_5220,
d_course_luigi_raceway_dl_52D0,
d_course_luigi_raceway_dl_5558,
d_course_luigi_raceway_dl_5420,
d_course_luigi_raceway_dl_5728,
d_course_luigi_raceway_dl_57F8,
d_course_luigi_raceway_dl_5A60,
d_course_luigi_raceway_dl_5940,
d_course_luigi_raceway_dl_5BA0,
d_course_luigi_raceway_dl_5CB8,
d_course_luigi_raceway_dl_5F08,
d_course_luigi_raceway_dl_5E10,
d_course_luigi_raceway_dl_6018,
d_course_luigi_raceway_dl_6150,
d_course_luigi_raceway_dl_6350,
d_course_luigi_raceway_dl_6288,
d_course_luigi_raceway_dl_6400,
d_course_luigi_raceway_dl_6558,
d_course_luigi_raceway_dl_6608,
d_course_luigi_raceway_dl_65B0,
d_course_luigi_raceway_dl_6658,
d_course_luigi_raceway_dl_66B8,
d_course_luigi_raceway_dl_67A0,
d_course_luigi_raceway_dl_6708,
d_course_luigi_raceway_dl_6810,
d_course_luigi_raceway_dl_68C0,
d_course_luigi_raceway_dl_6A00,
d_course_luigi_raceway_dl_6930,
d_course_luigi_raceway_dl_6A90,
d_course_luigi_raceway_dl_6B58,
d_course_luigi_raceway_dl_6DA0,
d_course_luigi_raceway_dl_6C40,
d_course_luigi_raceway_dl_6EB0,
d_course_luigi_raceway_dl_6FF0,
d_course_luigi_raceway_dl_7248,
d_course_luigi_raceway_dl_7110,
d_course_luigi_raceway_dl_7388,
d_course_luigi_raceway_dl_74B0,
d_course_luigi_raceway_dl_7750,
d_course_luigi_raceway_dl_75F0,
d_course_luigi_raceway_dl_7928,
d_course_luigi_raceway_dl_7A18,
d_course_luigi_raceway_dl_7CD0,
d_course_luigi_raceway_dl_7BB0,
d_course_luigi_raceway_dl_7EE8,
d_course_luigi_raceway_dl_7FA0,
d_course_luigi_raceway_dl_8260,
d_course_luigi_raceway_dl_8158,
d_course_luigi_raceway_dl_8450,
d_course_luigi_raceway_dl_8508,
d_course_luigi_raceway_dl_8790,
d_course_luigi_raceway_dl_86F8,
d_course_luigi_raceway_dl_8958,
d_course_luigi_raceway_dl_8A70,
d_course_luigi_raceway_dl_8D68,
d_course_luigi_raceway_dl_8CC8,
d_course_luigi_raceway_dl_8F00,
d_course_luigi_raceway_dl_9058,
d_course_luigi_raceway_dl_9408,
d_course_luigi_raceway_dl_9310,
d_course_luigi_raceway_dl_95A0,
d_course_luigi_raceway_dl_97B0,
d_course_luigi_raceway_dl_9AD0,
d_course_luigi_raceway_dl_99C0,
d_course_luigi_raceway_dl_9C50,
d_course_luigi_raceway_dl_9E58,
d_course_luigi_raceway_dl_A178,
d_course_luigi_raceway_dl_A028,
d_course_luigi_raceway_dl_A320,
const Gfx* luigi_raceway_dls[] = {
d_course_luigi_raceway_dl_0, d_course_luigi_raceway_dl_328, d_course_luigi_raceway_dl_1A8,
d_course_luigi_raceway_dl_480, d_course_luigi_raceway_dl_6E0, d_course_luigi_raceway_dl_9F8,
d_course_luigi_raceway_dl_868, d_course_luigi_raceway_dl_B48, d_course_luigi_raceway_dl_D80,
d_course_luigi_raceway_dl_1058, d_course_luigi_raceway_dl_EE8, d_course_luigi_raceway_dl_1198,
d_course_luigi_raceway_dl_1398, d_course_luigi_raceway_dl_16D8, d_course_luigi_raceway_dl_1538,
d_course_luigi_raceway_dl_1888, d_course_luigi_raceway_dl_1B00, d_course_luigi_raceway_dl_1E30,
d_course_luigi_raceway_dl_1C78, d_course_luigi_raceway_dl_1FD0, d_course_luigi_raceway_dl_2240,
d_course_luigi_raceway_dl_2518, d_course_luigi_raceway_dl_2348, d_course_luigi_raceway_dl_2658,
d_course_luigi_raceway_dl_2860, d_course_luigi_raceway_dl_2BC0, d_course_luigi_raceway_dl_2978,
d_course_luigi_raceway_dl_2D00, d_course_luigi_raceway_dl_2F08, d_course_luigi_raceway_dl_32C0,
d_course_luigi_raceway_dl_2FF8, d_course_luigi_raceway_dl_3408, d_course_luigi_raceway_dl_3610,
d_course_luigi_raceway_dl_3928, d_course_luigi_raceway_dl_36A8, d_course_luigi_raceway_dl_3AB0,
d_course_luigi_raceway_dl_3C18, d_course_luigi_raceway_dl_3EB0, d_course_luigi_raceway_dl_3CA0,
d_course_luigi_raceway_dl_4058, d_course_luigi_raceway_dl_4198, d_course_luigi_raceway_dl_4440,
d_course_luigi_raceway_dl_4240, d_course_luigi_raceway_dl_4638, d_course_luigi_raceway_dl_4720,
d_course_luigi_raceway_dl_4A18, d_course_luigi_raceway_dl_4828, d_course_luigi_raceway_dl_4C60,
d_course_luigi_raceway_dl_4CF8, d_course_luigi_raceway_dl_4FD8, d_course_luigi_raceway_dl_4E38,
d_course_luigi_raceway_dl_5220, d_course_luigi_raceway_dl_52D0, d_course_luigi_raceway_dl_5558,
d_course_luigi_raceway_dl_5420, d_course_luigi_raceway_dl_5728, d_course_luigi_raceway_dl_57F8,
d_course_luigi_raceway_dl_5A60, d_course_luigi_raceway_dl_5940, d_course_luigi_raceway_dl_5BA0,
d_course_luigi_raceway_dl_5CB8, d_course_luigi_raceway_dl_5F08, d_course_luigi_raceway_dl_5E10,
d_course_luigi_raceway_dl_6018, d_course_luigi_raceway_dl_6150, d_course_luigi_raceway_dl_6350,
d_course_luigi_raceway_dl_6288, d_course_luigi_raceway_dl_6400, d_course_luigi_raceway_dl_6558,
d_course_luigi_raceway_dl_6608, d_course_luigi_raceway_dl_65B0, d_course_luigi_raceway_dl_6658,
d_course_luigi_raceway_dl_66B8, d_course_luigi_raceway_dl_67A0, d_course_luigi_raceway_dl_6708,
d_course_luigi_raceway_dl_6810, d_course_luigi_raceway_dl_68C0, d_course_luigi_raceway_dl_6A00,
d_course_luigi_raceway_dl_6930, d_course_luigi_raceway_dl_6A90, d_course_luigi_raceway_dl_6B58,
d_course_luigi_raceway_dl_6DA0, d_course_luigi_raceway_dl_6C40, d_course_luigi_raceway_dl_6EB0,
d_course_luigi_raceway_dl_6FF0, d_course_luigi_raceway_dl_7248, d_course_luigi_raceway_dl_7110,
d_course_luigi_raceway_dl_7388, d_course_luigi_raceway_dl_74B0, d_course_luigi_raceway_dl_7750,
d_course_luigi_raceway_dl_75F0, d_course_luigi_raceway_dl_7928, d_course_luigi_raceway_dl_7A18,
d_course_luigi_raceway_dl_7CD0, d_course_luigi_raceway_dl_7BB0, d_course_luigi_raceway_dl_7EE8,
d_course_luigi_raceway_dl_7FA0, d_course_luigi_raceway_dl_8260, d_course_luigi_raceway_dl_8158,
d_course_luigi_raceway_dl_8450, d_course_luigi_raceway_dl_8508, d_course_luigi_raceway_dl_8790,
d_course_luigi_raceway_dl_86F8, d_course_luigi_raceway_dl_8958, d_course_luigi_raceway_dl_8A70,
d_course_luigi_raceway_dl_8D68, d_course_luigi_raceway_dl_8CC8, d_course_luigi_raceway_dl_8F00,
d_course_luigi_raceway_dl_9058, d_course_luigi_raceway_dl_9408, d_course_luigi_raceway_dl_9310,
d_course_luigi_raceway_dl_95A0, d_course_luigi_raceway_dl_97B0, d_course_luigi_raceway_dl_9AD0,
d_course_luigi_raceway_dl_99C0, d_course_luigi_raceway_dl_9C50, d_course_luigi_raceway_dl_9E58,
d_course_luigi_raceway_dl_A178, d_course_luigi_raceway_dl_A028, d_course_luigi_raceway_dl_A320,
};
courses/luigi_raceway/course_vertices.inc.c
+5936 -5936
View File
File diff suppressed because it is too large Load Diff
courses/luigi_raceway/staff_ghost.inc.c
+208 -1049
View File
File diff suppressed because it is too large Load Diff
courses/mario_raceway/course_data.c
+772 -1163
View File
File diff suppressed because it is too large Load Diff
courses/mario_raceway/course_displaylists.inc.c
+819 -705
View File
File diff suppressed because it is too large Load Diff
courses/mario_raceway/course_offsets.c
+55 -100
View File
@@ -34,106 +34,61 @@ extern u8 gTextureSignKoopaAir0[];
extern u8 gTextureSignKoopaAir1[];
const course_texture mario_raceway_textures[] = {
{gTextureCheckerboardYellowPink, 0x0149, 0x0800, 0x0},
{gTexture64619C, 0x0124, 0x0800, 0x0},
{gTextureGrass1, 0x0125, 0x0800, 0x0},
{gTexture64BB60, 0x0169, 0x0800, 0x0},
{gTextureGrass7, 0x05DE, 0x0800, 0x0},
{gTextureGrass5, 0x023F, 0x0800, 0x0},
{gTextureFlagRed, 0x019E, 0x0800, 0x0},
{gTexture663F90, 0x0122, 0x0800, 0x0},
{gTexture6642A4, 0x0162, 0x0800, 0x0},
{gTexture6640B4, 0x01EF, 0x0800, 0x0},
{gTextureGrass10, 0x01F8, 0x0800, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
{gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0},
{gTexture66C8F4, 0x01A1, 0x0800, 0x0},
{gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0},
{gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0},
{gTexture670AC8, 0x0FBF, 0x1000, 0x0},
{gTexture674354, 0x046F, 0x0800, 0x0},
{gTextureRoad0, 0x0300, 0x1000, 0x0},
{gTextureRoadFinish0, 0x0338, 0x1000, 0x0},
{gTexture67B9B0, 0x0225, 0x0800, 0x0},
{gTextureSignYoshi, 0x04DF, 0x1000, 0x0},
{gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0},
{gTextureSignShellShot0, 0x038C, 0x1000, 0x0},
{gTextureSignShellShot1, 0x0247, 0x1000, 0x0},
{gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0},
{gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureCheckerboardYellowPink, 0x0149, 0x0800, 0x0 },
{ gTexture64619C, 0x0124, 0x0800, 0x0 },
{ gTextureGrass1, 0x0125, 0x0800, 0x0 },
{ gTexture64BB60, 0x0169, 0x0800, 0x0 },
{ gTextureGrass7, 0x05DE, 0x0800, 0x0 },
{ gTextureGrass5, 0x023F, 0x0800, 0x0 },
{ gTextureFlagRed, 0x019E, 0x0800, 0x0 },
{ gTexture663F90, 0x0122, 0x0800, 0x0 },
{ gTexture6642A4, 0x0162, 0x0800, 0x0 },
{ gTexture6640B4, 0x01EF, 0x0800, 0x0 },
{ gTextureGrass10, 0x01F8, 0x0800, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
{ gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
{ gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
{ gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 },
{ gTexture66C8F4, 0x01A1, 0x0800, 0x0 },
{ gTextureSignNintendoRed0, 0x02A6, 0x1000, 0x0 },
{ gTextureSignNintendoRed1, 0x02F7, 0x1000, 0x0 },
{ gTexture670AC8, 0x0FBF, 0x1000, 0x0 },
{ gTexture674354, 0x046F, 0x0800, 0x0 },
{ gTextureRoad0, 0x0300, 0x1000, 0x0 },
{ gTextureRoadFinish0, 0x0338, 0x1000, 0x0 },
{ gTexture67B9B0, 0x0225, 0x0800, 0x0 },
{ gTextureSignYoshi, 0x04DF, 0x1000, 0x0 },
{ gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
{ gTextureSignShellShot0, 0x038C, 0x1000, 0x0 },
{ gTextureSignShellShot1, 0x0247, 0x1000, 0x0 },
{ gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 },
{ gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *mario_raceway_dls[] = {
d_course_mario_raceway_dl_0,
d_course_mario_raceway_dl_1D0,
d_course_mario_raceway_dl_E8,
d_course_mario_raceway_dl_2C8,
d_course_mario_raceway_dl_3A8,
d_course_mario_raceway_dl_568,
d_course_mario_raceway_dl_478,
d_course_mario_raceway_dl_668,
d_course_mario_raceway_dl_750,
d_course_mario_raceway_dl_928,
d_course_mario_raceway_dl_828,
d_course_mario_raceway_dl_A00,
d_course_mario_raceway_dl_B08,
d_course_mario_raceway_dl_DC8,
d_course_mario_raceway_dl_C20,
d_course_mario_raceway_dl_F60,
d_course_mario_raceway_dl_10A8,
d_course_mario_raceway_dl_1408,
d_course_mario_raceway_dl_1210,
d_course_mario_raceway_dl_15C8,
d_course_mario_raceway_dl_1740,
d_course_mario_raceway_dl_1A30,
d_course_mario_raceway_dl_1850,
d_course_mario_raceway_dl_1B70,
d_course_mario_raceway_dl_1CF8,
d_course_mario_raceway_dl_1F68,
d_course_mario_raceway_dl_1DE0,
d_course_mario_raceway_dl_20A0,
d_course_mario_raceway_dl_21E8,
d_course_mario_raceway_dl_2418,
d_course_mario_raceway_dl_22E0,
d_course_mario_raceway_dl_2558,
d_course_mario_raceway_dl_2680,
d_course_mario_raceway_dl_28B0,
d_course_mario_raceway_dl_2790,
d_course_mario_raceway_dl_2A10,
d_course_mario_raceway_dl_2B40,
d_course_mario_raceway_dl_2DC0,
d_course_mario_raceway_dl_2C98,
d_course_mario_raceway_dl_2EF8,
d_course_mario_raceway_dl_3038,
d_course_mario_raceway_dl_32D8,
d_course_mario_raceway_dl_31F0,
d_course_mario_raceway_dl_3458,
d_course_mario_raceway_dl_35D0,
d_course_mario_raceway_dl_3830,
d_course_mario_raceway_dl_3748,
d_course_mario_raceway_dl_3960,
d_course_mario_raceway_dl_3AA0,
d_course_mario_raceway_dl_3D68,
d_course_mario_raceway_dl_3C08,
d_course_mario_raceway_dl_3EB8,
d_course_mario_raceway_dl_4038,
d_course_mario_raceway_dl_42A0,
d_course_mario_raceway_dl_4150,
d_course_mario_raceway_dl_43D8,
d_course_mario_raceway_dl_44F8,
d_course_mario_raceway_dl_4738,
d_course_mario_raceway_dl_4610,
d_course_mario_raceway_dl_4840,
d_course_mario_raceway_dl_4910,
d_course_mario_raceway_dl_4B78,
d_course_mario_raceway_dl_4A60,
d_course_mario_raceway_dl_4CD8,
d_course_mario_raceway_dl_4DC8,
d_course_mario_raceway_dl_4FF0,
d_course_mario_raceway_dl_4ED0,
d_course_mario_raceway_dl_5150,
const Gfx* mario_raceway_dls[] = {
d_course_mario_raceway_dl_0, d_course_mario_raceway_dl_1D0, d_course_mario_raceway_dl_E8,
d_course_mario_raceway_dl_2C8, d_course_mario_raceway_dl_3A8, d_course_mario_raceway_dl_568,
d_course_mario_raceway_dl_478, d_course_mario_raceway_dl_668, d_course_mario_raceway_dl_750,
d_course_mario_raceway_dl_928, d_course_mario_raceway_dl_828, d_course_mario_raceway_dl_A00,
d_course_mario_raceway_dl_B08, d_course_mario_raceway_dl_DC8, d_course_mario_raceway_dl_C20,
d_course_mario_raceway_dl_F60, d_course_mario_raceway_dl_10A8, d_course_mario_raceway_dl_1408,
d_course_mario_raceway_dl_1210, d_course_mario_raceway_dl_15C8, d_course_mario_raceway_dl_1740,
d_course_mario_raceway_dl_1A30, d_course_mario_raceway_dl_1850, d_course_mario_raceway_dl_1B70,
d_course_mario_raceway_dl_1CF8, d_course_mario_raceway_dl_1F68, d_course_mario_raceway_dl_1DE0,
d_course_mario_raceway_dl_20A0, d_course_mario_raceway_dl_21E8, d_course_mario_raceway_dl_2418,
d_course_mario_raceway_dl_22E0, d_course_mario_raceway_dl_2558, d_course_mario_raceway_dl_2680,
d_course_mario_raceway_dl_28B0, d_course_mario_raceway_dl_2790, d_course_mario_raceway_dl_2A10,
d_course_mario_raceway_dl_2B40, d_course_mario_raceway_dl_2DC0, d_course_mario_raceway_dl_2C98,
d_course_mario_raceway_dl_2EF8, d_course_mario_raceway_dl_3038, d_course_mario_raceway_dl_32D8,
d_course_mario_raceway_dl_31F0, d_course_mario_raceway_dl_3458, d_course_mario_raceway_dl_35D0,
d_course_mario_raceway_dl_3830, d_course_mario_raceway_dl_3748, d_course_mario_raceway_dl_3960,
d_course_mario_raceway_dl_3AA0, d_course_mario_raceway_dl_3D68, d_course_mario_raceway_dl_3C08,
d_course_mario_raceway_dl_3EB8, d_course_mario_raceway_dl_4038, d_course_mario_raceway_dl_42A0,
d_course_mario_raceway_dl_4150, d_course_mario_raceway_dl_43D8, d_course_mario_raceway_dl_44F8,
d_course_mario_raceway_dl_4738, d_course_mario_raceway_dl_4610, d_course_mario_raceway_dl_4840,
d_course_mario_raceway_dl_4910, d_course_mario_raceway_dl_4B78, d_course_mario_raceway_dl_4A60,
d_course_mario_raceway_dl_4CD8, d_course_mario_raceway_dl_4DC8, d_course_mario_raceway_dl_4FF0,
d_course_mario_raceway_dl_4ED0, d_course_mario_raceway_dl_5150,
};
courses/mario_raceway/course_vertices.inc.c
+5757 -5757
View File
File diff suppressed because it is too large Load Diff
courses/mario_raceway/staff_ghost.inc.c
+187 -936
View File
File diff suppressed because it is too large Load Diff
courses/moo_moo_farm/course_data.c
+1951 -1885
View File
File diff suppressed because it is too large Load Diff
courses/moo_moo_farm/course_displaylists.inc.c
+627 -762
View File
File diff suppressed because it is too large Load Diff
courses/moo_moo_farm/course_offsets.c
+61 -122
View File
@@ -32,128 +32,67 @@ extern u8 gTexture66EBF0[];
extern u8 gTextureWheelSteamEngineReal[];
const course_texture moo_moo_farm_textures[] = {
{gTextureWoodDoor0, 0x0294, 0x1000, 0x0},
{gTextureGrass2, 0x0415, 0x0800, 0x0},
{gTexture64AF50, 0x0140, 0x0800, 0x0},
{gTexture64B090, 0x0365, 0x0800, 0x0},
{gTexture64B54C, 0x038C, 0x0800, 0x0},
{gTexture64B3F8, 0x0153, 0x0800, 0x0},
{gTextureSignNintendo0, 0x0541, 0x1000, 0x0},
{gTextureSignNintendo1, 0x0512, 0x1000, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
{gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0},
{gTexture674D58, 0x030C, 0x1000, 0x0},
{gTexture675064, 0x01BB, 0x0800, 0x0},
{gTexture675220, 0x0212, 0x0800, 0x0},
{gTexture6775EC, 0x0233, 0x1000, 0x0},
{gTexture683314, 0x02DC, 0x1000, 0x0},
{gTexture68CDA0, 0x0110, 0x0800, 0x0},
{gTexture6442D4, 0x0138, 0x0800, 0x0},
{gTexture64440C, 0x029D, 0x1000, 0x0},
{gTexture6446AC, 0x0116, 0x0800, 0x0},
{gTextureMooMooFarmSignLeft, 0x0A66, 0x1000, 0x0},
{gTextureMooMooFarmSignRight, 0x0A64, 0x1000, 0x0},
{gTexture64ACAC, 0x02A3, 0x0800, 0x0},
{gTexture66D698, 0x0370, 0x0800, 0x0},
{gTexture66EBF0, 0x0146, 0x0800, 0x0},
{gTextureWheelSteamEngineReal, 0x022F, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureWoodDoor0, 0x0294, 0x1000, 0x0 },
{ gTextureGrass2, 0x0415, 0x0800, 0x0 },
{ gTexture64AF50, 0x0140, 0x0800, 0x0 },
{ gTexture64B090, 0x0365, 0x0800, 0x0 },
{ gTexture64B54C, 0x038C, 0x0800, 0x0 },
{ gTexture64B3F8, 0x0153, 0x0800, 0x0 },
{ gTextureSignNintendo0, 0x0541, 0x1000, 0x0 },
{ gTextureSignNintendo1, 0x0512, 0x1000, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
{ gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
{ gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
{ gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 },
{ gTexture674D58, 0x030C, 0x1000, 0x0 },
{ gTexture675064, 0x01BB, 0x0800, 0x0 },
{ gTexture675220, 0x0212, 0x0800, 0x0 },
{ gTexture6775EC, 0x0233, 0x1000, 0x0 },
{ gTexture683314, 0x02DC, 0x1000, 0x0 },
{ gTexture68CDA0, 0x0110, 0x0800, 0x0 },
{ gTexture6442D4, 0x0138, 0x0800, 0x0 },
{ gTexture64440C, 0x029D, 0x1000, 0x0 },
{ gTexture6446AC, 0x0116, 0x0800, 0x0 },
{ gTextureMooMooFarmSignLeft, 0x0A66, 0x1000, 0x0 },
{ gTextureMooMooFarmSignRight, 0x0A64, 0x1000, 0x0 },
{ gTexture64ACAC, 0x02A3, 0x0800, 0x0 },
{ gTexture66D698, 0x0370, 0x0800, 0x0 },
{ gTexture66EBF0, 0x0146, 0x0800, 0x0 },
{ gTextureWheelSteamEngineReal, 0x022F, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *moo_moo_farm_dls[] = {
d_course_moo_moo_farm_dl_88,
d_course_moo_moo_farm_dl_598,
d_course_moo_moo_farm_dl_338,
d_course_moo_moo_farm_dl_8A0,
d_course_moo_moo_farm_dl_B00,
d_course_moo_moo_farm_dl_FE0,
d_course_moo_moo_farm_dl_D70,
d_course_moo_moo_farm_dl_12B8,
d_course_moo_moo_farm_dl_1530,
d_course_moo_moo_farm_dl_1A20,
d_course_moo_moo_farm_dl_1790,
d_course_moo_moo_farm_dl_1D00,
d_course_moo_moo_farm_dl_1F58,
d_course_moo_moo_farm_dl_2470,
d_course_moo_moo_farm_dl_2190,
d_course_moo_moo_farm_dl_27A8,
d_course_moo_moo_farm_dl_2A10,
d_course_moo_moo_farm_dl_2F20,
d_course_moo_moo_farm_dl_2C38,
d_course_moo_moo_farm_dl_3238,
d_course_moo_moo_farm_dl_34A0,
d_course_moo_moo_farm_dl_39F8,
d_course_moo_moo_farm_dl_36B8,
d_course_moo_moo_farm_dl_3CB0,
d_course_moo_moo_farm_dl_3EB8,
d_course_moo_moo_farm_dl_4428,
d_course_moo_moo_farm_dl_4098,
d_course_moo_moo_farm_dl_46D8,
d_course_moo_moo_farm_dl_4910,
d_course_moo_moo_farm_dl_4E00,
d_course_moo_moo_farm_dl_4AD0,
d_course_moo_moo_farm_dl_5040,
d_course_moo_moo_farm_dl_5290,
d_course_moo_moo_farm_dl_5758,
d_course_moo_moo_farm_dl_5458,
d_course_moo_moo_farm_dl_5990,
d_course_moo_moo_farm_dl_5BF8,
d_course_moo_moo_farm_dl_60A8,
d_course_moo_moo_farm_dl_5DF0,
d_course_moo_moo_farm_dl_62D0,
d_course_moo_moo_farm_dl_6548,
d_course_moo_moo_farm_dl_6A70,
d_course_moo_moo_farm_dl_6778,
d_course_moo_moo_farm_dl_6CB8,
d_course_moo_moo_farm_dl_6FF0,
d_course_moo_moo_farm_dl_74C8,
d_course_moo_moo_farm_dl_7218,
d_course_moo_moo_farm_dl_7718,
d_course_moo_moo_farm_dl_7A80,
d_course_moo_moo_farm_dl_7F78,
d_course_moo_moo_farm_dl_7CD8,
d_course_moo_moo_farm_dl_81E8,
d_course_moo_moo_farm_dl_84D0,
d_course_moo_moo_farm_dl_89A0,
d_course_moo_moo_farm_dl_8728,
d_course_moo_moo_farm_dl_8C00,
d_course_moo_moo_farm_dl_8F18,
d_course_moo_moo_farm_dl_93D0,
d_course_moo_moo_farm_dl_9178,
d_course_moo_moo_farm_dl_9640,
d_course_moo_moo_farm_dl_9938,
d_course_moo_moo_farm_dl_9DF8,
d_course_moo_moo_farm_dl_9BB0,
d_course_moo_moo_farm_dl_A010,
d_course_moo_moo_farm_dl_A2C0,
d_course_moo_moo_farm_dl_A7B0,
d_course_moo_moo_farm_dl_A568,
d_course_moo_moo_farm_dl_A9C8,
d_course_moo_moo_farm_dl_ACB0,
d_course_moo_moo_farm_dl_B230,
d_course_moo_moo_farm_dl_B020,
d_course_moo_moo_farm_dl_B478,
d_course_moo_moo_farm_dl_B798,
d_course_moo_moo_farm_dl_BCE8,
d_course_moo_moo_farm_dl_BB00,
d_course_moo_moo_farm_dl_BF10,
d_course_moo_moo_farm_dl_C180,
d_course_moo_moo_farm_dl_C6D8,
d_course_moo_moo_farm_dl_C4F8,
d_course_moo_moo_farm_dl_C950,
d_course_moo_moo_farm_dl_CBC8,
d_course_moo_moo_farm_dl_D140,
d_course_moo_moo_farm_dl_CF58,
d_course_moo_moo_farm_dl_D408,
d_course_moo_moo_farm_dl_D6B0,
d_course_moo_moo_farm_dl_DC70,
d_course_moo_moo_farm_dl_DA50,
d_course_moo_moo_farm_dl_DF60,
d_course_moo_moo_farm_dl_E1D8,
d_course_moo_moo_farm_dl_E708,
d_course_moo_moo_farm_dl_E4B0,
d_course_moo_moo_farm_dl_EA18,
const Gfx* moo_moo_farm_dls[] = {
d_course_moo_moo_farm_dl_88, d_course_moo_moo_farm_dl_598, d_course_moo_moo_farm_dl_338,
d_course_moo_moo_farm_dl_8A0, d_course_moo_moo_farm_dl_B00, d_course_moo_moo_farm_dl_FE0,
d_course_moo_moo_farm_dl_D70, d_course_moo_moo_farm_dl_12B8, d_course_moo_moo_farm_dl_1530,
d_course_moo_moo_farm_dl_1A20, d_course_moo_moo_farm_dl_1790, d_course_moo_moo_farm_dl_1D00,
d_course_moo_moo_farm_dl_1F58, d_course_moo_moo_farm_dl_2470, d_course_moo_moo_farm_dl_2190,
d_course_moo_moo_farm_dl_27A8, d_course_moo_moo_farm_dl_2A10, d_course_moo_moo_farm_dl_2F20,
d_course_moo_moo_farm_dl_2C38, d_course_moo_moo_farm_dl_3238, d_course_moo_moo_farm_dl_34A0,
d_course_moo_moo_farm_dl_39F8, d_course_moo_moo_farm_dl_36B8, d_course_moo_moo_farm_dl_3CB0,
d_course_moo_moo_farm_dl_3EB8, d_course_moo_moo_farm_dl_4428, d_course_moo_moo_farm_dl_4098,
d_course_moo_moo_farm_dl_46D8, d_course_moo_moo_farm_dl_4910, d_course_moo_moo_farm_dl_4E00,
d_course_moo_moo_farm_dl_4AD0, d_course_moo_moo_farm_dl_5040, d_course_moo_moo_farm_dl_5290,
d_course_moo_moo_farm_dl_5758, d_course_moo_moo_farm_dl_5458, d_course_moo_moo_farm_dl_5990,
d_course_moo_moo_farm_dl_5BF8, d_course_moo_moo_farm_dl_60A8, d_course_moo_moo_farm_dl_5DF0,
d_course_moo_moo_farm_dl_62D0, d_course_moo_moo_farm_dl_6548, d_course_moo_moo_farm_dl_6A70,
d_course_moo_moo_farm_dl_6778, d_course_moo_moo_farm_dl_6CB8, d_course_moo_moo_farm_dl_6FF0,
d_course_moo_moo_farm_dl_74C8, d_course_moo_moo_farm_dl_7218, d_course_moo_moo_farm_dl_7718,
d_course_moo_moo_farm_dl_7A80, d_course_moo_moo_farm_dl_7F78, d_course_moo_moo_farm_dl_7CD8,
d_course_moo_moo_farm_dl_81E8, d_course_moo_moo_farm_dl_84D0, d_course_moo_moo_farm_dl_89A0,
d_course_moo_moo_farm_dl_8728, d_course_moo_moo_farm_dl_8C00, d_course_moo_moo_farm_dl_8F18,
d_course_moo_moo_farm_dl_93D0, d_course_moo_moo_farm_dl_9178, d_course_moo_moo_farm_dl_9640,
d_course_moo_moo_farm_dl_9938, d_course_moo_moo_farm_dl_9DF8, d_course_moo_moo_farm_dl_9BB0,
d_course_moo_moo_farm_dl_A010, d_course_moo_moo_farm_dl_A2C0, d_course_moo_moo_farm_dl_A7B0,
d_course_moo_moo_farm_dl_A568, d_course_moo_moo_farm_dl_A9C8, d_course_moo_moo_farm_dl_ACB0,
d_course_moo_moo_farm_dl_B230, d_course_moo_moo_farm_dl_B020, d_course_moo_moo_farm_dl_B478,
d_course_moo_moo_farm_dl_B798, d_course_moo_moo_farm_dl_BCE8, d_course_moo_moo_farm_dl_BB00,
d_course_moo_moo_farm_dl_BF10, d_course_moo_moo_farm_dl_C180, d_course_moo_moo_farm_dl_C6D8,
d_course_moo_moo_farm_dl_C4F8, d_course_moo_moo_farm_dl_C950, d_course_moo_moo_farm_dl_CBC8,
d_course_moo_moo_farm_dl_D140, d_course_moo_moo_farm_dl_CF58, d_course_moo_moo_farm_dl_D408,
d_course_moo_moo_farm_dl_D6B0, d_course_moo_moo_farm_dl_DC70, d_course_moo_moo_farm_dl_DA50,
d_course_moo_moo_farm_dl_DF60, d_course_moo_moo_farm_dl_E1D8, d_course_moo_moo_farm_dl_E708,
d_course_moo_moo_farm_dl_E4B0, d_course_moo_moo_farm_dl_EA18,
};
courses/moo_moo_farm/course_vertices.inc.c
+7972 -7973
View File
File diff suppressed because it is too large Load Diff
courses/rainbow_road/course_data.c
+1153 -2749
View File
File diff suppressed because it is too large Load Diff
courses/rainbow_road/course_data.h
+6 -6
View File
@@ -6,7 +6,7 @@
#include <actor_types.h>
#include <waypoints.h>
#include <course.h>
#include "code_80004740.h"
#include "animation.h"
extern Gfx d_course_rainbow_road_dl_0[];
extern Gfx d_course_rainbow_road_dl_80[];
@@ -90,15 +90,15 @@ extern Vtx d_course_rainbow_road_chomp_body_upper_back_model3[];
extern Gfx d_course_rainbow_road_dl_15C68[];
extern Vtx d_course_rainbow_road_chomp_eyes_model[];
extern Gfx d_course_rainbow_road_dl_15F18[];
extern s16 d_rainbow_road_chomp_jaw_animation[];
extern animation_type_3_triplet d_rainbow_road_unk1[];
extern animation_type_2 d_rainbow_road_unk2;
extern animation_type_2 *d_rainbow_road_unk3[];
extern s16 d_rainbow_road_chomp_angle[];
extern AnimationLimbVector d_rainbow_road_chomp_animation_matrix[];
extern Animation d_rainbow_road_unk2;
extern Animation* d_rainbow_road_unk3[];
extern u32 d_rainbow_road_unk4[];
extern u32 d_rainbow_road_unk5[];
extern Gfx d_course_rainbow_road_dl_16220[];
extern struct ActorSpawnData d_course_rainbow_road_item_box_spawns[];
extern TrackSections d_course_rainbow_road_addr[];
extern Gfx *d_course_rainbow_road_dl_list[];
extern Gfx* d_course_rainbow_road_dl_list[];
#endif
courses/rainbow_road/course_displaylists.inc.c
+52 -80
View File
@@ -7,8 +7,7 @@
#include "course_displaylists.inc.h"
#include "course_textures.linkonly.h"
Gfx d_course_rainbow_road_packed_dl_0[] =
{
Gfx d_course_rainbow_road_packed_dl_0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04000000, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -108,8 +107,7 @@ Gfx d_course_rainbow_road_packed_dl_0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_308[] =
{
Gfx d_course_rainbow_road_packed_dl_308[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04001500, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -162,8 +160,7 @@ Gfx d_course_rainbow_road_packed_dl_308[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_498[] =
{
Gfx d_course_rainbow_road_packed_dl_498[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04001F80, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -204,8 +201,7 @@ Gfx d_course_rainbow_road_packed_dl_498[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_5C8[] =
{
Gfx d_course_rainbow_road_packed_dl_5C8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04002780, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -253,8 +249,7 @@ Gfx d_course_rainbow_road_packed_dl_5C8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_730[] =
{
Gfx d_course_rainbow_road_packed_dl_730[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04003100, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -318,8 +313,7 @@ Gfx d_course_rainbow_road_packed_dl_730[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_918[] =
{
Gfx d_course_rainbow_road_packed_dl_918[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04003DC0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -360,8 +354,7 @@ Gfx d_course_rainbow_road_packed_dl_918[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_A48[] =
{
Gfx d_course_rainbow_road_packed_dl_A48[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x040045A0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -405,8 +398,7 @@ Gfx d_course_rainbow_road_packed_dl_A48[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_B90[] =
{
Gfx d_course_rainbow_road_packed_dl_B90[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04004E20, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -472,8 +464,7 @@ Gfx d_course_rainbow_road_packed_dl_B90[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_D88[] =
{
Gfx d_course_rainbow_road_packed_dl_D88[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04005BA0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -512,8 +503,7 @@ Gfx d_course_rainbow_road_packed_dl_D88[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_EA8[] =
{
Gfx d_course_rainbow_road_packed_dl_EA8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04006320, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -557,8 +547,7 @@ Gfx d_course_rainbow_road_packed_dl_EA8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_FF0[] =
{
Gfx d_course_rainbow_road_packed_dl_FF0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04006BA0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -608,8 +597,7 @@ Gfx d_course_rainbow_road_packed_dl_FF0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1168[] =
{
Gfx d_course_rainbow_road_packed_dl_1168[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x040075A0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -666,8 +654,7 @@ Gfx d_course_rainbow_road_packed_dl_1168[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1318[] =
{
Gfx d_course_rainbow_road_packed_dl_1318[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1168),
gsSPDisplayList(d_course_rainbow_road_packed_dl_FF0),
gsSPDisplayList(d_course_rainbow_road_packed_dl_EA8),
@@ -683,20 +670,17 @@ Gfx d_course_rainbow_road_packed_dl_1318[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1380[] =
{
Gfx d_course_rainbow_road_packed_dl_1380[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1318),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1390[] =
{
Gfx d_course_rainbow_road_packed_dl_1390[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1380),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_13A0[] =
{
Gfx d_course_rainbow_road_packed_dl_13A0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008100, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -748,8 +732,7 @@ Gfx d_course_rainbow_road_packed_dl_13A0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1528[] =
{
Gfx d_course_rainbow_road_packed_dl_1528[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008A80, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -778,8 +761,7 @@ Gfx d_course_rainbow_road_packed_dl_1528[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_15F8[] =
{
Gfx d_course_rainbow_road_packed_dl_15F8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04008F00, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -802,8 +784,7 @@ Gfx d_course_rainbow_road_packed_dl_15F8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1698[] =
{
Gfx d_course_rainbow_road_packed_dl_1698[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009300, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -830,8 +811,7 @@ Gfx d_course_rainbow_road_packed_dl_1698[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1758[] =
{
Gfx d_course_rainbow_road_packed_dl_1758[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009740, 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -865,25 +845,28 @@ Gfx d_course_rainbow_road_packed_dl_1758[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1850[] =
{
Gfx d_course_rainbow_road_packed_dl_1850[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTextureCheckerboardBlackWhite),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x04009B80, 4, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 6, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x00FC, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTextureRainbow),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 128),
gsSPVertex(0x04009BC0, 30, 0),
@@ -906,8 +889,7 @@ Gfx d_course_rainbow_road_packed_dl_1850[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1978[] =
{
Gfx d_course_rainbow_road_packed_dl_1978[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x04009EE0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -931,8 +913,7 @@ Gfx d_course_rainbow_road_packed_dl_1978[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1A20[] =
{
Gfx d_course_rainbow_road_packed_dl_1A20[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400A260, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -968,8 +949,7 @@ Gfx d_course_rainbow_road_packed_dl_1A20[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1B28[] =
{
Gfx d_course_rainbow_road_packed_dl_1B28[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400A8C0, 30, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -991,8 +971,7 @@ Gfx d_course_rainbow_road_packed_dl_1B28[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1BC0[] =
{
Gfx d_course_rainbow_road_packed_dl_1BC0[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400AC60, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
@@ -1017,8 +996,7 @@ Gfx d_course_rainbow_road_packed_dl_1BC0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1C70[] =
{
Gfx d_course_rainbow_road_packed_dl_1C70[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400B080, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -1045,8 +1023,7 @@ Gfx d_course_rainbow_road_packed_dl_1C70[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1D30[] =
{
Gfx d_course_rainbow_road_packed_dl_1D30[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400B440, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -1078,8 +1055,7 @@ Gfx d_course_rainbow_road_packed_dl_1D30[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1E18[] =
{
Gfx d_course_rainbow_road_packed_dl_1E18[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1D30),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1C70),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1BC0),
@@ -1095,15 +1071,16 @@ Gfx d_course_rainbow_road_packed_dl_1E18[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1E80[] =
{
Gfx d_course_rainbow_road_packed_dl_1E80[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_WRAP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTexture662A34),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x0400B930, 30, 0),
@@ -1123,11 +1100,13 @@ Gfx d_course_rainbow_road_packed_dl_1E80[] =
gsSP2Triangles(12, 13, 14, 0, 12, 14, 15, 0),
gsSP2Triangles(16, 17, 18, 0, 16, 18, 19, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD,
G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gRRTexture67A1B8),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 256),
gsSPVertex(0x0400BC50, 10, 0),
@@ -1138,14 +1117,12 @@ Gfx d_course_rainbow_road_packed_dl_1E80[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1FB8[] =
{
Gfx d_course_rainbow_road_packed_dl_1FB8[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1E80),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_1FC8[] =
{
Gfx d_course_rainbow_road_packed_dl_1FC8[] = {
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsSPVertex(0x0400BCF0, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -1168,14 +1145,12 @@ Gfx d_course_rainbow_road_packed_dl_1FC8[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_2068[] =
{
Gfx d_course_rainbow_road_packed_dl_2068[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_1FC8),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_2078[] =
{
Gfx d_course_rainbow_road_packed_dl_2078[] = {
gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
gsSPVertex(0x0400C0F0, 24, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
@@ -1187,14 +1162,12 @@ Gfx d_course_rainbow_road_packed_dl_2078[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20C0[] =
{
Gfx d_course_rainbow_road_packed_dl_20C0[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_2078),
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20D0[] =
{
Gfx d_course_rainbow_road_packed_dl_20D0[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_20C0),
gsSPDisplayList(d_course_rainbow_road_packed_dl_2068),
gsSPDisplayList(d_course_rainbow_road_packed_dl_1FB8),
@@ -1202,8 +1175,7 @@ Gfx d_course_rainbow_road_packed_dl_20D0[] =
gsSPEndDisplayList(),
};
Gfx d_course_rainbow_road_packed_dl_20F8[] =
{
Gfx d_course_rainbow_road_packed_dl_20F8[] = {
gsSPDisplayList(d_course_rainbow_road_packed_dl_20D0),
gsSPEndDisplayList(),
};
courses/rainbow_road/course_offsets.c
+6 -6
View File
@@ -8,10 +8,10 @@ extern u8 gTexture662A34[];
extern u8 gTextureRainbow[];
const course_texture rainbow_road_textures[] = {
{gTextureStarOutline, 0x037A, 0x0800, 0x0},
{gTexture67A1B8, 0x01B7, 0x0800, 0x0},
{gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0},
{gTexture662A34, 0x0106, 0x0800, 0x0},
{gTextureRainbow, 0x025D, 0x1000, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTextureStarOutline, 0x037A, 0x0800, 0x0 },
{ gTexture67A1B8, 0x01B7, 0x0800, 0x0 },
{ gTextureCheckerboardBlackWhite, 0x0107, 0x0800, 0x0 },
{ gTexture662A34, 0x0106, 0x0800, 0x0 },
{ gTextureRainbow, 0x025D, 0x1000, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
courses/rainbow_road/course_vertices.inc.c
+3111 -3111
View File
File diff suppressed because it is too large Load Diff
courses/royal_raceway/course_data.c
+1940 -4096
View File
File diff suppressed because it is too large Load Diff
courses/royal_raceway/course_displaylists.inc.c
+1694 -1540
View File
File diff suppressed because it is too large Load Diff
courses/royal_raceway/course_offsets.c
+89 -177
View File
@@ -47,183 +47,95 @@ extern u8 gTexture6449D4[];
extern u8 gTexture67FE0C[];
const course_texture royal_raceway_textures[] = {
{gTexture64619C, 0x0124, 0x0800, 0x0},
{gTexture645134, 0x052C, 0x0800, 0x0},
{gTextureWoodDoor1, 0x0903, 0x1000, 0x0},
{gTexture64BB60, 0x0169, 0x0800, 0x0},
{gTextureGrass3, 0x0372, 0x0800, 0x0},
{gTexture64F9E8, 0x020B, 0x1000, 0x0},
{gTextureFlagRed, 0x019E, 0x0800, 0x0},
{gTextureCrownJewelBlue, 0x0301, 0x0800, 0x0},
{gTextureCrown, 0x0106, 0x0800, 0x0},
{gTextureCrownJewelPink, 0x0313, 0x0800, 0x0},
{gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0},
{gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0},
{gTexture6684F8, 0x010D, 0x0800, 0x0},
{gTextureSignLuigis0, 0x0287, 0x1000, 0x0},
{gTextureSignLuigis1, 0x02AF, 0x1000, 0x0},
{gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0},
{gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0},
{gTexture66CA98, 0x02C9, 0x0800, 0x0},
{gTextureCheckerboardPink, 0x0157, 0x0800, 0x0},
{gTexture670AC8, 0x0FBF, 0x1000, 0x0},
{gTextureRoad0, 0x0300, 0x1000, 0x0},
{gTextureRoadFinish0, 0x0338, 0x1000, 0x0},
{gTextureSignYoshi, 0x04DF, 0x1000, 0x0},
{gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0},
{gTextureCastleBricks, 0x0B33, 0x1000, 0x0},
{gTextureCastleBridge, 0x0428, 0x0800, 0x0},
{gTextureGrass8, 0x02CB, 0x0800, 0x0},
{gTextureGrass9, 0x0421, 0x0800, 0x0},
{gTexture6646B8, 0x0298, 0x1000, 0x0},
{gTexture664408, 0x02AE, 0x1000, 0x0},
{gTextureBricksRed, 0x0C55, 0x1000, 0x0},
{gTexture665C0C, 0x059D, 0x0800, 0x0},
{gTexture6661AC, 0x01F7, 0x0800, 0x0},
{gTexture6663A4, 0x05F6, 0x0800, 0x0},
{gTexture667BAC, 0x067A, 0x0800, 0x0},
{gTextureFlagRed2, 0x0186, 0x0800, 0x0},
{gTexture66DB60, 0x01D6, 0x0800, 0x0},
{gTextureStainglassPeach0, 0x0ED1, 0x1000, 0x0},
{gTextureStainglassPeach1, 0x0DA9, 0x1000, 0x0},
{gTextureFencePostWooden, 0x083D, 0x1000, 0x0},
{gTexture648508, 0x01FE, 0x1000, 0x0},
{gTexture6449D4, 0x075D, 0x0800, 0x0},
{gTexture67FE0C, 0x02DE, 0x0800, 0x0},
{0x00000000, 0x0000, 0x0000, 0x0},
{ gTexture64619C, 0x0124, 0x0800, 0x0 },
{ gTexture645134, 0x052C, 0x0800, 0x0 },
{ gTextureWoodDoor1, 0x0903, 0x1000, 0x0 },
{ gTexture64BB60, 0x0169, 0x0800, 0x0 },
{ gTextureGrass3, 0x0372, 0x0800, 0x0 },
{ gTexture64F9E8, 0x020B, 0x1000, 0x0 },
{ gTextureFlagRed, 0x019E, 0x0800, 0x0 },
{ gTextureCrownJewelBlue, 0x0301, 0x0800, 0x0 },
{ gTextureCrown, 0x0106, 0x0800, 0x0 },
{ gTextureCrownJewelPink, 0x0313, 0x0800, 0x0 },
{ gTextureSignKoopaAir0, 0x0360, 0x1000, 0x0 },
{ gTextureSignKoopaAir1, 0x0304, 0x1000, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
{ gTextureSignLuigis0, 0x0287, 0x1000, 0x0 },
{ gTextureSignLuigis1, 0x02AF, 0x1000, 0x0 },
{ gTextureSignMarioStar0, 0x02D2, 0x1000, 0x0 },
{ gTextureSignMarioStar1, 0x02B1, 0x1000, 0x0 },
{ gTexture66CA98, 0x02C9, 0x0800, 0x0 },
{ gTextureCheckerboardPink, 0x0157, 0x0800, 0x0 },
{ gTexture670AC8, 0x0FBF, 0x1000, 0x0 },
{ gTextureRoad0, 0x0300, 0x1000, 0x0 },
{ gTextureRoadFinish0, 0x0338, 0x1000, 0x0 },
{ gTextureSignYoshi, 0x04DF, 0x1000, 0x0 },
{ gTextureCheckerboardBlueGray, 0x04A1, 0x1000, 0x0 },
{ gTextureCastleBricks, 0x0B33, 0x1000, 0x0 },
{ gTextureCastleBridge, 0x0428, 0x0800, 0x0 },
{ gTextureGrass8, 0x02CB, 0x0800, 0x0 },
{ gTextureGrass9, 0x0421, 0x0800, 0x0 },
{ gTexture6646B8, 0x0298, 0x1000, 0x0 },
{ gTexture664408, 0x02AE, 0x1000, 0x0 },
{ gTextureBricksRed, 0x0C55, 0x1000, 0x0 },
{ gTexture665C0C, 0x059D, 0x0800, 0x0 },
{ gTexture6661AC, 0x01F7, 0x0800, 0x0 },
{ gTexture6663A4, 0x05F6, 0x0800, 0x0 },
{ gTexture667BAC, 0x067A, 0x0800, 0x0 },
{ gTextureFlagRed2, 0x0186, 0x0800, 0x0 },
{ gTexture66DB60, 0x01D6, 0x0800, 0x0 },
{ gTextureStainglassPeach0, 0x0ED1, 0x1000, 0x0 },
{ gTextureStainglassPeach1, 0x0DA9, 0x1000, 0x0 },
{ gTextureFencePostWooden, 0x083D, 0x1000, 0x0 },
{ gTexture648508, 0x01FE, 0x1000, 0x0 },
{ gTexture6449D4, 0x075D, 0x0800, 0x0 },
{ gTexture67FE0C, 0x02DE, 0x0800, 0x0 },
{ 0x00000000, 0x0000, 0x0000, 0x0 },
};
const Gfx *royal_raceway_dls[] = {
d_course_royal_raceway_dl_0,
d_course_royal_raceway_dl_360,
d_course_royal_raceway_dl_258,
d_course_royal_raceway_dl_470,
d_course_royal_raceway_dl_6D0,
d_course_royal_raceway_dl_A48,
d_course_royal_raceway_dl_8E0,
d_course_royal_raceway_dl_B40,
d_course_royal_raceway_dl_DA0,
d_course_royal_raceway_dl_1180,
d_course_royal_raceway_dl_F40,
d_course_royal_raceway_dl_12C0,
d_course_royal_raceway_dl_1538,
d_course_royal_raceway_dl_1850,
d_course_royal_raceway_dl_1610,
d_course_royal_raceway_dl_19B0,
d_course_royal_raceway_dl_1BB8,
d_course_royal_raceway_dl_1E88,
d_course_royal_raceway_dl_1C40,
d_course_royal_raceway_dl_2018,
d_course_royal_raceway_dl_21A8,
d_course_royal_raceway_dl_2428,
d_course_royal_raceway_dl_2210,
d_course_royal_raceway_dl_25F0,
d_course_royal_raceway_dl_26F0,
d_course_royal_raceway_dl_29A0,
d_course_royal_raceway_dl_27B8,
d_course_royal_raceway_dl_2B78,
d_course_royal_raceway_dl_2C20,
d_course_royal_raceway_dl_2FE0,
d_course_royal_raceway_dl_2DD0,
d_course_royal_raceway_dl_31F8,
d_course_royal_raceway_dl_33B0,
d_course_royal_raceway_dl_3748,
d_course_royal_raceway_dl_3580,
d_course_royal_raceway_dl_3960,
d_course_royal_raceway_dl_3AD8,
d_course_royal_raceway_dl_3D38,
d_course_royal_raceway_dl_3BA8,
d_course_royal_raceway_dl_3ED8,
d_course_royal_raceway_dl_3FA0,
d_course_royal_raceway_dl_41D8,
d_course_royal_raceway_dl_4048,
d_course_royal_raceway_dl_4380,
d_course_royal_raceway_dl_4438,
d_course_royal_raceway_dl_45A0,
d_course_royal_raceway_dl_44C0,
d_course_royal_raceway_dl_46A0,
d_course_royal_raceway_dl_4750,
d_course_royal_raceway_dl_4930,
d_course_royal_raceway_dl_4800,
d_course_royal_raceway_dl_4A38,
d_course_royal_raceway_dl_4AE0,
d_course_royal_raceway_dl_4D00,
d_course_royal_raceway_dl_4BA8,
d_course_royal_raceway_dl_4DF8,
d_course_royal_raceway_dl_4EC0,
d_course_royal_raceway_dl_50F0,
d_course_royal_raceway_dl_4F80,
d_course_royal_raceway_dl_51D0,
d_course_royal_raceway_dl_52F0,
d_course_royal_raceway_dl_54F8,
d_course_royal_raceway_dl_53B8,
d_course_royal_raceway_dl_5598,
d_course_royal_raceway_dl_56C0,
d_course_royal_raceway_dl_5890,
d_course_royal_raceway_dl_5758,
d_course_royal_raceway_dl_5900,
d_course_royal_raceway_dl_5A40,
d_course_royal_raceway_dl_5CA0,
d_course_royal_raceway_dl_5B28,
d_course_royal_raceway_dl_5D08,
d_course_royal_raceway_dl_5EB8,
d_course_royal_raceway_dl_6118,
d_course_royal_raceway_dl_5FD8,
d_course_royal_raceway_dl_61B0,
d_course_royal_raceway_dl_6378,
d_course_royal_raceway_dl_6780,
d_course_royal_raceway_dl_6538,
d_course_royal_raceway_dl_68C8,
d_course_royal_raceway_dl_6BC0,
d_course_royal_raceway_dl_70C0,
d_course_royal_raceway_dl_6E20,
d_course_royal_raceway_dl_72B8,
d_course_royal_raceway_dl_75C0,
d_course_royal_raceway_dl_78E8,
d_course_royal_raceway_dl_7778,
d_course_royal_raceway_dl_7AD0,
d_course_royal_raceway_dl_7BD8,
d_course_royal_raceway_dl_7ED8,
d_course_royal_raceway_dl_7DB0,
d_course_royal_raceway_dl_8068,
d_course_royal_raceway_dl_81C0,
d_course_royal_raceway_dl_84A0,
d_course_royal_raceway_dl_8398,
d_course_royal_raceway_dl_8620,
d_course_royal_raceway_dl_8770,
d_course_royal_raceway_dl_88B0,
d_course_royal_raceway_dl_8838,
d_course_royal_raceway_dl_8930,
d_course_royal_raceway_dl_89F0,
d_course_royal_raceway_dl_8CD8,
d_course_royal_raceway_dl_8C58,
d_course_royal_raceway_dl_8EB8,
d_course_royal_raceway_dl_8FA8,
d_course_royal_raceway_dl_92D0,
d_course_royal_raceway_dl_9218,
d_course_royal_raceway_dl_94E8,
d_course_royal_raceway_dl_9678,
d_course_royal_raceway_dl_99A0,
d_course_royal_raceway_dl_9900,
d_course_royal_raceway_dl_9B30,
d_course_royal_raceway_dl_9D58,
d_course_royal_raceway_dl_A0A8,
d_course_royal_raceway_dl_9FE8,
d_course_royal_raceway_dl_A200,
d_course_royal_raceway_dl_A478,
d_course_royal_raceway_dl_A728,
d_course_royal_raceway_dl_A600,
d_course_royal_raceway_dl_A8A8,
d_course_royal_raceway_dl_A9D0,
d_course_royal_raceway_dl_AC28,
d_course_royal_raceway_dl_AB28,
d_course_royal_raceway_dl_AD90,
d_course_royal_raceway_dl_AE70,
d_course_royal_raceway_dl_B040,
d_course_royal_raceway_dl_AFB0,
d_course_royal_raceway_dl_B188,
d_course_royal_raceway_dl_B230,
d_course_royal_raceway_dl_B3E8,
d_course_royal_raceway_dl_B2E0,
d_course_royal_raceway_dl_B508,
const Gfx* royal_raceway_dls[] = {
d_course_royal_raceway_dl_0, d_course_royal_raceway_dl_360, d_course_royal_raceway_dl_258,
d_course_royal_raceway_dl_470, d_course_royal_raceway_dl_6D0, d_course_royal_raceway_dl_A48,
d_course_royal_raceway_dl_8E0, d_course_royal_raceway_dl_B40, d_course_royal_raceway_dl_DA0,
d_course_royal_raceway_dl_1180, d_course_royal_raceway_dl_F40, d_course_royal_raceway_dl_12C0,
d_course_royal_raceway_dl_1538, d_course_royal_raceway_dl_1850, d_course_royal_raceway_dl_1610,
d_course_royal_raceway_dl_19B0, d_course_royal_raceway_dl_1BB8, d_course_royal_raceway_dl_1E88,
d_course_royal_raceway_dl_1C40, d_course_royal_raceway_dl_2018, d_course_royal_raceway_dl_21A8,
d_course_royal_raceway_dl_2428, d_course_royal_raceway_dl_2210, d_course_royal_raceway_dl_25F0,
d_course_royal_raceway_dl_26F0, d_course_royal_raceway_dl_29A0, d_course_royal_raceway_dl_27B8,
d_course_royal_raceway_dl_2B78, d_course_royal_raceway_dl_2C20, d_course_royal_raceway_dl_2FE0,
d_course_royal_raceway_dl_2DD0, d_course_royal_raceway_dl_31F8, d_course_royal_raceway_dl_33B0,
d_course_royal_raceway_dl_3748, d_course_royal_raceway_dl_3580, d_course_royal_raceway_dl_3960,
d_course_royal_raceway_dl_3AD8, d_course_royal_raceway_dl_3D38, d_course_royal_raceway_dl_3BA8,
d_course_royal_raceway_dl_3ED8, d_course_royal_raceway_dl_3FA0, d_course_royal_raceway_dl_41D8,
d_course_royal_raceway_dl_4048, d_course_royal_raceway_dl_4380, d_course_royal_raceway_dl_4438,
d_course_royal_raceway_dl_45A0, d_course_royal_raceway_dl_44C0, d_course_royal_raceway_dl_46A0,
d_course_royal_raceway_dl_4750, d_course_royal_raceway_dl_4930, d_course_royal_raceway_dl_4800,
d_course_royal_raceway_dl_4A38, d_course_royal_raceway_dl_4AE0, d_course_royal_raceway_dl_4D00,
d_course_royal_raceway_dl_4BA8, d_course_royal_raceway_dl_4DF8, d_course_royal_raceway_dl_4EC0,
d_course_royal_raceway_dl_50F0, d_course_royal_raceway_dl_4F80, d_course_royal_raceway_dl_51D0,
d_course_royal_raceway_dl_52F0, d_course_royal_raceway_dl_54F8, d_course_royal_raceway_dl_53B8,
d_course_royal_raceway_dl_5598, d_course_royal_raceway_dl_56C0, d_course_royal_raceway_dl_5890,
d_course_royal_raceway_dl_5758, d_course_royal_raceway_dl_5900, d_course_royal_raceway_dl_5A40,
d_course_royal_raceway_dl_5CA0, d_course_royal_raceway_dl_5B28, d_course_royal_raceway_dl_5D08,
d_course_royal_raceway_dl_5EB8, d_course_royal_raceway_dl_6118, d_course_royal_raceway_dl_5FD8,
d_course_royal_raceway_dl_61B0, d_course_royal_raceway_dl_6378, d_course_royal_raceway_dl_6780,
d_course_royal_raceway_dl_6538, d_course_royal_raceway_dl_68C8, d_course_royal_raceway_dl_6BC0,
d_course_royal_raceway_dl_70C0, d_course_royal_raceway_dl_6E20, d_course_royal_raceway_dl_72B8,
d_course_royal_raceway_dl_75C0, d_course_royal_raceway_dl_78E8, d_course_royal_raceway_dl_7778,
d_course_royal_raceway_dl_7AD0, d_course_royal_raceway_dl_7BD8, d_course_royal_raceway_dl_7ED8,
d_course_royal_raceway_dl_7DB0, d_course_royal_raceway_dl_8068, d_course_royal_raceway_dl_81C0,
d_course_royal_raceway_dl_84A0, d_course_royal_raceway_dl_8398, d_course_royal_raceway_dl_8620,
d_course_royal_raceway_dl_8770, d_course_royal_raceway_dl_88B0, d_course_royal_raceway_dl_8838,
d_course_royal_raceway_dl_8930, d_course_royal_raceway_dl_89F0, d_course_royal_raceway_dl_8CD8,
d_course_royal_raceway_dl_8C58, d_course_royal_raceway_dl_8EB8, d_course_royal_raceway_dl_8FA8,
d_course_royal_raceway_dl_92D0, d_course_royal_raceway_dl_9218, d_course_royal_raceway_dl_94E8,
d_course_royal_raceway_dl_9678, d_course_royal_raceway_dl_99A0, d_course_royal_raceway_dl_9900,
d_course_royal_raceway_dl_9B30, d_course_royal_raceway_dl_9D58, d_course_royal_raceway_dl_A0A8,
d_course_royal_raceway_dl_9FE8, d_course_royal_raceway_dl_A200, d_course_royal_raceway_dl_A478,
d_course_royal_raceway_dl_A728, d_course_royal_raceway_dl_A600, d_course_royal_raceway_dl_A8A8,
d_course_royal_raceway_dl_A9D0, d_course_royal_raceway_dl_AC28, d_course_royal_raceway_dl_AB28,
d_course_royal_raceway_dl_AD90, d_course_royal_raceway_dl_AE70, d_course_royal_raceway_dl_B040,
d_course_royal_raceway_dl_AFB0, d_course_royal_raceway_dl_B188, d_course_royal_raceway_dl_B230,
d_course_royal_raceway_dl_B3E8, d_course_royal_raceway_dl_B2E0, d_course_royal_raceway_dl_B508,
};

Some files were not shown because too many files have changed in this diff Show More