diff --git a/Makefile b/Makefile index d441c14c6..29cad9c99 100644 --- a/Makefile +++ b/Makefile @@ -403,7 +403,6 @@ $(BUILD_DIR)/textures/%.mio0: $(BUILD_DIR)/textures/% $(MIO0TOOL) -c $< $@ ASSET_INCLUDES := $(shell find $(ASSET_DIR)/include -type f -name "*.mk") -ASSET_DIRECTORIES := $(foreach inc,$(ASSET_INCLUDES),$(eval include $(inc))) diff --git a/asm/non_matchings/code_80057C60/func_80059560.s b/asm/non_matchings/code_80057C60/func_80059560.s index 8e4bb1fb1..3a94a8385 100644 --- a/asm/non_matchings/code_80057C60/func_80059560.s +++ b/asm/non_matchings/code_80057C60/func_80059560.s @@ -57,10 +57,10 @@ glabel func_80059560 /* 05A238 80059638 3C073F80 */ lui $a3, 0x3f80 /* 05A23C 8005963C 11200014 */ beqz $t1, .L80059690 /* 05A240 80059640 3C0A0D02 */ lui $t2, %hi(gTLUTPortraitBombKartAndQuestionMark) # $t2, 0xd02 -/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(gTexturePortraitBombKartAndQuestionMark) # $t3, 0xd02 +/* 05A244 80059644 3C0B0D02 */ lui $t3, %hi(gTexturePortraitBombKart) # $t3, 0xd02 /* 05A248 80059648 3C0C0D00 */ lui $t4, %hi(D_0D005AE0) # $t4, 0xd00 /* 05A24C 8005964C 258C5AE0 */ addiu $t4, %lo(D_0D005AE0) # addiu $t4, $t4, 0x5ae0 -/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(gTexturePortraitBombKartAndQuestionMark) # addiu $t3, $t3, -0x2928 +/* 05A250 80059650 256BD6D8 */ addiu $t3, %lo(gTexturePortraitBombKart) # addiu $t3, $t3, -0x2928 /* 05A254 80059654 254AB4D8 */ addiu $t2, %lo(gTLUTPortraitBombKartAndQuestionMark) # addiu $t2, $t2, -0x4b28 /* 05A258 80059658 240D0020 */ li $t5, 32 /* 05A25C 8005965C 240E0020 */ li $t6, 32 diff --git a/asm/non_matchings/code_80071F00/func_8007BBBC.s b/asm/non_matchings/code_80071F00/func_8007BBBC.s index d7a82d51a..33b59a731 100644 --- a/asm/non_matchings/code_80071F00/func_8007BBBC.s +++ b/asm/non_matchings/code_80071F00/func_8007BBBC.s @@ -24,8 +24,8 @@ glabel func_8007BBBC /* 07C814 8007BC14 10000037 */ b .L8007BCF4 /* 07C818 8007BC18 8FBF0024 */ lw $ra, 0x24($sp) .L8007BC1C: -/* 07C81C 8007BC1C 3C050600 */ lui $a1, %hi(D_06007BA8) # $a1, 0x600 -/* 07C820 8007BC20 24A57BA8 */ addiu $a1, %lo(D_06007BA8) # addiu $a1, $a1, 0x7ba8 +/* 07C81C 8007BC1C 3C050600 */ lui $a1, %hi(d_course_banshee_boardwalk_dl_cheep_cheep) # $a1, 0x600 +/* 07C820 8007BC20 24A57BA8 */ addiu $a1, %lo(d_course_banshee_boardwalk_dl_cheep_cheep) # addiu $a1, $a1, 0x7ba8 /* 07C824 8007BC24 0C01CD6F */ jal func_800735BC /* 07C828 8007BC28 3C064000 */ lui $a2, 0x4000 /* 07C82C 8007BC2C 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code_80071F00/func_8007DF20.s b/asm/non_matchings/code_80071F00/func_8007DF20.s index f4d081937..3fa880f31 100644 --- a/asm/non_matchings/code_80071F00/func_8007DF20.s +++ b/asm/non_matchings/code_80071F00/func_8007DF20.s @@ -18,9 +18,9 @@ glabel func_8007DF20 /* 07EB38 8007DF38 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 07EB3C 8007DF3C 44812000 */ mtc1 $at, $f4 /* 07EB40 8007DF40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07EB44 8007DF44 3C180601 */ lui $t8, %hi(D_0600A9D8) # $t8, 0x601 +/* 07EB44 8007DF44 3C180601 */ lui $t8, %hi(d_course_banshee_boardwalk_dl_trash_bin) # $t8, 0x601 /* 07EB48 8007DF48 AFBF0014 */ sw $ra, 0x14($sp) -/* 07EB4C 8007DF4C 2718A9D8 */ addiu $t8, %lo(D_0600A9D8) # addiu $t8, $t8, -0x5628 +/* 07EB4C 8007DF4C 2718A9D8 */ addiu $t8, %lo(d_course_banshee_boardwalk_dl_trash_bin) # addiu $t8, $t8, -0x5628 /* 07EB50 8007DF50 AC580070 */ sw $t8, 0x70($v0) /* 07EB54 8007DF54 AC40004C */ sw $zero, 0x4c($v0) /* 07EB58 8007DF58 A4400092 */ sh $zero, 0x92($v0) diff --git a/asm/non_matchings/code_80071F00/func_8007EC30.s b/asm/non_matchings/code_80071F00/func_8007EC30.s index be7834dde..cc6daf976 100644 --- a/asm/non_matchings/code_80071F00/func_8007EC30.s +++ b/asm/non_matchings/code_80071F00/func_8007EC30.s @@ -45,10 +45,10 @@ glabel func_8007EC30 /* 07F8D8 8007ECD8 00003825 */ move $a3, $zero .L8007ECDC: /* 07F8DC 8007ECDC 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 07F8E0 8007ECE0 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 07F8E0 8007ECE0 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 07F8E4 8007ECE4 24190040 */ li $t9, 64 /* 07F8E8 8007ECE8 AFB90010 */ sw $t9, 0x10($sp) -/* 07F8EC 8007ECEC 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 07F8EC 8007ECEC 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 07F8F0 8007ECF0 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 07F8F4 8007ECF4 02002025 */ move $a0, $s0 /* 07F8F8 8007ECF8 0C01CD11 */ jal func_80073444 @@ -57,8 +57,8 @@ glabel func_8007EC30 /* 07F904 8007ED04 44812000 */ mtc1 $at, $f4 /* 07F908 8007ED08 3C0141F0 */ li $at, 0x41F00000 # 30.000000 /* 07F90C 8007ED0C 44813000 */ mtc1 $at, $f6 -/* 07F910 8007ED10 3C080601 */ lui $t0, %hi(D_06009088) # $t0, 0x601 -/* 07F914 8007ED14 25089088 */ addiu $t0, %lo(D_06009088) # addiu $t0, $t0, -0x6f78 +/* 07F910 8007ED10 3C080601 */ lui $t0, %hi(d_course_bowsers_castle_dl_thwomp) # $t0, 0x601 +/* 07F914 8007ED14 25089088 */ addiu $t0, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t0, $t0, -0x6f78 /* 07F918 8007ED18 2409000C */ li $t1, 12 /* 07F91C 8007ED1C 3C050500 */ lui $a1, (0x05000220 >> 16) # lui $a1, 0x500 /* 07F920 8007ED20 AE280070 */ sw $t0, 0x70($s1) diff --git a/asm/non_matchings/code_80071F00/func_8007EE5C.s b/asm/non_matchings/code_80071F00/func_8007EE5C.s index 874e38393..94b5b6983 100644 --- a/asm/non_matchings/code_80071F00/func_8007EE5C.s +++ b/asm/non_matchings/code_80071F00/func_8007EE5C.s @@ -3,12 +3,12 @@ glabel func_8007EE5C /* 07FA60 8007EE60 AFBF0024 */ sw $ra, 0x24($sp) /* 07FA64 8007EE64 AFB10020 */ sw $s1, 0x20($sp) /* 07FA68 8007EE68 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 07FA6C 8007EE6C 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 07FA6C 8007EE6C 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 07FA70 8007EE70 240E0040 */ li $t6, 64 /* 07FA74 8007EE74 00808825 */ move $s1, $a0 /* 07FA78 8007EE78 AFB0001C */ sw $s0, 0x1c($sp) /* 07FA7C 8007EE7C AFAE0010 */ sw $t6, 0x10($sp) -/* 07FA80 8007EE80 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 07FA80 8007EE80 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 07FA84 8007EE84 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 07FA88 8007EE88 0C01CD11 */ jal func_80073444 /* 07FA8C 8007EE8C 24070010 */ li $a3, 16 @@ -20,8 +20,8 @@ glabel func_8007EE5C /* 07FAA4 8007EEA4 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 07FAA8 8007EEA8 44812000 */ mtc1 $at, $f4 /* 07FAAC 8007EEAC 01F88021 */ addu $s0, $t7, $t8 -/* 07FAB0 8007EEB0 3C190601 */ lui $t9, %hi(D_06009088) # $t9, 0x601 -/* 07FAB4 8007EEB4 27399088 */ addiu $t9, %lo(D_06009088) # addiu $t9, $t9, -0x6f78 +/* 07FAB0 8007EEB0 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 +/* 07FAB4 8007EEB4 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 /* 07FAB8 8007EEB8 2408000C */ li $t0, 12 /* 07FABC 8007EEBC 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 /* 07FAC0 8007EEC0 AE190070 */ sw $t9, 0x70($s0) diff --git a/asm/non_matchings/code_80071F00/func_8007FA08.s b/asm/non_matchings/code_80071F00/func_8007FA08.s index 3327fc763..9532fcbbe 100644 --- a/asm/non_matchings/code_80071F00/func_8007FA08.s +++ b/asm/non_matchings/code_80071F00/func_8007FA08.s @@ -3,13 +3,13 @@ glabel func_8007FA08 /* 08060C 8007FA0C AFBF002C */ sw $ra, 0x2c($sp) /* 080610 8007FA10 AFB10028 */ sw $s1, 0x28($sp) /* 080614 8007FA14 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 080618 8007FA18 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 080618 8007FA18 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 08061C 8007FA1C 240E0040 */ li $t6, 64 /* 080620 8007FA20 00808825 */ move $s1, $a0 /* 080624 8007FA24 AFB00024 */ sw $s0, 0x24($sp) /* 080628 8007FA28 F7B40018 */ sdc1 $f20, 0x18($sp) /* 08062C 8007FA2C AFAE0010 */ sw $t6, 0x10($sp) -/* 080630 8007FA30 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 080630 8007FA30 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 080634 8007FA34 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 080638 8007FA38 0C01CD11 */ jal func_80073444 /* 08063C 8007FA3C 24070010 */ li $a3, 16 @@ -21,8 +21,8 @@ glabel func_8007FA08 /* 080654 8007FA54 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 080658 8007FA58 44812000 */ mtc1 $at, $f4 /* 08065C 8007FA5C 01F88021 */ addu $s0, $t7, $t8 -/* 080660 8007FA60 3C190601 */ lui $t9, %hi(D_06009088) # $t9, 0x601 -/* 080664 8007FA64 27399088 */ addiu $t9, %lo(D_06009088) # addiu $t9, $t9, -0x6f78 +/* 080660 8007FA60 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 +/* 080664 8007FA64 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 /* 080668 8007FA68 2408000C */ li $t0, 12 /* 08066C 8007FA6C 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 /* 080670 8007FA70 AE190070 */ sw $t9, 0x70($s0) diff --git a/asm/non_matchings/code_80071F00/func_80080078.s b/asm/non_matchings/code_80071F00/func_80080078.s index eaca86efb..2cfb6a4f5 100644 --- a/asm/non_matchings/code_80071F00/func_80080078.s +++ b/asm/non_matchings/code_80071F00/func_80080078.s @@ -3,12 +3,12 @@ glabel func_80080078 /* 080C7C 8008007C AFBF0024 */ sw $ra, 0x24($sp) /* 080C80 80080080 AFB10020 */ sw $s1, 0x20($sp) /* 080C84 80080084 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 080C88 80080088 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 080C88 80080088 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 080C8C 8008008C 240E0040 */ li $t6, 64 /* 080C90 80080090 00808825 */ move $s1, $a0 /* 080C94 80080094 AFB0001C */ sw $s0, 0x1c($sp) /* 080C98 80080098 AFAE0010 */ sw $t6, 0x10($sp) -/* 080C9C 8008009C 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 080C9C 8008009C 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 080CA0 800800A0 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 080CA4 800800A4 0C01CD11 */ jal func_80073444 /* 080CA8 800800A8 24070010 */ li $a3, 16 @@ -20,8 +20,8 @@ glabel func_80080078 /* 080CC0 800800C0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 080CC4 800800C4 44812000 */ mtc1 $at, $f4 /* 080CC8 800800C8 01F88021 */ addu $s0, $t7, $t8 -/* 080CCC 800800CC 3C190601 */ lui $t9, %hi(D_06009088) # $t9, 0x601 -/* 080CD0 800800D0 27399088 */ addiu $t9, %lo(D_06009088) # addiu $t9, $t9, -0x6f78 +/* 080CCC 800800CC 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 +/* 080CD0 800800D0 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 /* 080CD4 800800D4 2408000C */ li $t0, 12 /* 080CD8 800800D8 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 /* 080CDC 800800DC AE190070 */ sw $t9, 0x70($s0) diff --git a/asm/non_matchings/code_80071F00/func_800802C0.s b/asm/non_matchings/code_80071F00/func_800802C0.s index 7fc17e923..5ad51dd41 100644 --- a/asm/non_matchings/code_80071F00/func_800802C0.s +++ b/asm/non_matchings/code_80071F00/func_800802C0.s @@ -10,20 +10,20 @@ glabel func_800802C0 /* 080EE0 800802E0 AFB10028 */ sw $s1, 0x28($sp) /* 080EE4 800802E4 01CF8021 */ addu $s0, $t6, $t7 /* 080EE8 800802E8 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 080EEC 800802EC 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 080EEC 800802EC 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 080EF0 800802F0 24180040 */ li $t8, 64 /* 080EF4 800802F4 00808825 */ move $s1, $a0 /* 080EF8 800802F8 F7B40018 */ sdc1 $f20, 0x18($sp) /* 080EFC 800802FC A20000D8 */ sb $zero, 0xd8($s0) /* 080F00 80080300 AFB80010 */ sw $t8, 0x10($sp) -/* 080F04 80080304 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 080F04 80080304 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 080F08 80080308 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 080F0C 8008030C 0C01CD11 */ jal func_80073444 /* 080F10 80080310 24070010 */ li $a3, 16 /* 080F14 80080314 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 080F18 80080318 44812000 */ mtc1 $at, $f4 -/* 080F1C 8008031C 3C190601 */ lui $t9, %hi(D_06009088) # $t9, 0x601 -/* 080F20 80080320 27399088 */ addiu $t9, %lo(D_06009088) # addiu $t9, $t9, -0x6f78 +/* 080F1C 8008031C 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 +/* 080F20 80080320 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 /* 080F24 80080324 2408000C */ li $t0, 12 /* 080F28 80080328 3C050500 */ lui $a1, (0x05000220 >> 16) # lui $a1, 0x500 /* 080F2C 8008032C AE190070 */ sw $t9, 0x70($s0) diff --git a/asm/non_matchings/code_80071F00/func_80080524.s b/asm/non_matchings/code_80071F00/func_80080524.s index febb5f4f5..42efc243f 100644 --- a/asm/non_matchings/code_80071F00/func_80080524.s +++ b/asm/non_matchings/code_80071F00/func_80080524.s @@ -3,12 +3,12 @@ glabel func_80080524 /* 081128 80080528 AFBF0024 */ sw $ra, 0x24($sp) /* 08112C 8008052C AFB10020 */ sw $s1, 0x20($sp) /* 081130 80080530 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 081134 80080534 3C060600 */ lui $a2, %hi(D_06007138) # $a2, 0x600 +/* 081134 80080534 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 /* 081138 80080538 240E0040 */ li $t6, 64 /* 08113C 8008053C 00808825 */ move $s1, $a0 /* 081140 80080540 AFB0001C */ sw $s0, 0x1c($sp) /* 081144 80080544 AFAE0010 */ sw $t6, 0x10($sp) -/* 081148 80080548 24C67138 */ addiu $a2, %lo(D_06007138) # addiu $a2, $a2, 0x7138 +/* 081148 80080548 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 /* 08114C 8008054C 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 /* 081150 80080550 0C01CD11 */ jal func_80073444 /* 081154 80080554 24070010 */ li $a3, 16 @@ -20,8 +20,8 @@ glabel func_80080524 /* 08116C 8008056C 01F88021 */ addu $s0, $t7, $t8 /* 081170 80080570 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 081174 80080574 44812000 */ mtc1 $at, $f4 -/* 081178 80080578 3C190601 */ lui $t9, %hi(D_06009088) # $t9, 0x601 -/* 08117C 8008057C 27399088 */ addiu $t9, %lo(D_06009088) # addiu $t9, $t9, -0x6f78 +/* 081178 80080578 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 +/* 08117C 8008057C 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 /* 081180 80080580 2408000C */ li $t0, 12 /* 081184 80080584 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 /* 081188 80080588 AE190070 */ sw $t9, 0x70($s0) diff --git a/asm/non_matchings/code_80071F00/func_80081848.s b/asm/non_matchings/code_80071F00/func_80081848.s index e4251420b..7d56bd31c 100644 --- a/asm/non_matchings/code_80071F00/func_80081848.s +++ b/asm/non_matchings/code_80071F00/func_80081848.s @@ -9,13 +9,13 @@ glabel func_80081848 /* 082448 80081848 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08244C 8008184C AFBF0024 */ sw $ra, 0x24($sp) /* 082450 80081850 AFB00020 */ sw $s0, 0x20($sp) -/* 082454 80081854 3C050601 */ lui $a1, %hi(D_0600FC70) # $a1, 0x601 -/* 082458 80081858 3C060601 */ lui $a2, %hi(D_0600FE70) # $a2, 0x601 +/* 082454 80081854 3C050601 */ lui $a1, %hi(d_course_moo_moo_farm_mole_tlut) # $a1, 0x601 +/* 082458 80081858 3C060601 */ lui $a2, %hi(d_course_moo_moo_farm_mole_frames) # $a2, 0x601 /* 08245C 8008185C 240E0040 */ li $t6, 64 /* 082460 80081860 00808025 */ move $s0, $a0 /* 082464 80081864 AFAE0010 */ sw $t6, 0x10($sp) -/* 082468 80081868 24C6FE70 */ addiu $a2, %lo(D_0600FE70) # addiu $a2, $a2, -0x190 -/* 08246C 8008186C 24A5FC70 */ addiu $a1, %lo(D_0600FC70) # addiu $a1, $a1, -0x390 +/* 082468 80081868 24C6FE70 */ addiu $a2, %lo(d_course_moo_moo_farm_mole_frames) # addiu $a2, $a2, -0x190 +/* 08246C 8008186C 24A5FC70 */ addiu $a1, %lo(d_course_moo_moo_farm_mole_tlut) # addiu $a1, $a1, -0x390 /* 082470 80081870 0C01CD11 */ jal func_80073444 /* 082474 80081874 24070020 */ li $a3, 32 /* 082478 80081878 44800000 */ mtc1 $zero, $f0 diff --git a/asm/non_matchings/code_80071F00/func_80082A4C.s b/asm/non_matchings/code_80071F00/func_80082A4C.s index 6b70cc00c..a1c46b4ab 100644 --- a/asm/non_matchings/code_80071F00/func_80082A4C.s +++ b/asm/non_matchings/code_80071F00/func_80082A4C.s @@ -9,14 +9,14 @@ glabel func_80082A4C /* 08364C 80082A4C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 083650 80082A50 AFBF0024 */ sw $ra, 0x24($sp) /* 083654 80082A54 AFB0001C */ sw $s0, 0x1c($sp) -/* 083658 80082A58 3C050601 */ lui $a1, %hi(gTLUTCrab) # $a1, 0x601 -/* 08365C 80082A5C 3C060601 */ lui $a2, %hi(D_0600D828) # $a2, 0x601 +/* 083658 80082A58 3C050601 */ lui $a1, %hi(d_course_koopa_troopa_beach_crab_tlut) # $a1, 0x601 +/* 08365C 80082A5C 3C060601 */ lui $a2, %hi(d_course_koopa_troopa_beach_crab_frames) # $a2, 0x601 /* 083660 80082A60 240E0040 */ li $t6, 64 /* 083664 80082A64 00808025 */ move $s0, $a0 /* 083668 80082A68 AFB10020 */ sw $s1, 0x20($sp) /* 08366C 80082A6C AFAE0010 */ sw $t6, 0x10($sp) -/* 083670 80082A70 24C6D828 */ addiu $a2, %lo(D_0600D828) # addiu $a2, $a2, -0x27d8 -/* 083674 80082A74 24A5D628 */ addiu $a1, %lo(gTLUTCrab) # addiu $a1, $a1, -0x29d8 +/* 083670 80082A70 24C6D828 */ addiu $a2, %lo(d_course_koopa_troopa_beach_crab_frames) # addiu $a2, $a2, -0x27d8 +/* 083674 80082A74 24A5D628 */ addiu $a1, %lo(d_course_koopa_troopa_beach_crab_tlut) # addiu $a1, $a1, -0x29d8 /* 083678 80082A78 0C01CD11 */ jal func_80073444 /* 08367C 80082A7C 24070040 */ li $a3, 64 /* 083680 80082A80 001078C0 */ sll $t7, $s0, 3 diff --git a/asm/non_matchings/code_80071F00/func_80083538.s b/asm/non_matchings/code_80071F00/func_80083538.s index 45dbd7aed..ee3d801f0 100644 --- a/asm/non_matchings/code_80071F00/func_80083538.s +++ b/asm/non_matchings/code_80071F00/func_80083538.s @@ -31,10 +31,10 @@ glabel func_80083538 /* 08416C 8008356C 01EE7823 */ subu $t7, $t7, $t6 /* 084170 80083570 000F7940 */ sll $t7, $t7, 5 /* 084174 80083574 01F88021 */ addu $s0, $t7, $t8 -/* 084178 80083578 3C020600 */ lui $v0, %hi(D_06006F20) # $v0, 0x600 -/* 08417C 8008357C 3C030600 */ lui $v1, %hi(D_06006D20) # $v1, 0x600 -/* 084180 80083580 24636D20 */ addiu $v1, %lo(D_06006D20) # addiu $v1, $v1, 0x6d20 -/* 084184 80083584 24426F20 */ addiu $v0, %lo(D_06006F20) # addiu $v0, $v0, 0x6f20 +/* 084178 80083578 3C020600 */ lui $v0, %hi(d_course_frappe_snowland_snow) # $v0, 0x600 +/* 08417C 8008357C 3C030600 */ lui $v1, %hi(d_course_frappe_snowland_snow_tlut) # $v1, 0x600 +/* 084180 80083580 24636D20 */ addiu $v1, %lo(d_course_frappe_snowland_snow_tlut) # addiu $v1, $v1, 0x6d20 +/* 084184 80083584 24426F20 */ addiu $v0, %lo(d_course_frappe_snowland_snow) # addiu $v0, $v0, 0x6f20 /* 084188 80083588 AE020064 */ sw $v0, 0x64($s0) /* 08418C 8008358C AE02006C */ sw $v0, 0x6c($s0) /* 084190 80083590 AE030060 */ sw $v1, 0x60($s0) diff --git a/asm/non_matchings/code_80071F00/func_80083FD0.s b/asm/non_matchings/code_80071F00/func_80083FD0.s index 635e0cfc6..b354a9391 100644 --- a/asm/non_matchings/code_80071F00/func_80083FD0.s +++ b/asm/non_matchings/code_80071F00/func_80083FD0.s @@ -39,8 +39,8 @@ glabel func_80083FD0 /* 084C24 80084024 A6060092 */ sh $a2, 0x92($s0) /* 084C28 80084028 0C01C8E9 */ jal func_800723A4 /* 084C2C 8008402C 00002825 */ move $a1, $zero -/* 084C30 80084030 3C020600 */ lui $v0, %hi(D_060068E8) # $v0, 0x600 -/* 084C34 80084034 244268E8 */ addiu $v0, %lo(D_060068E8) # addiu $v0, $v0, 0x68e8 +/* 084C30 80084030 3C020600 */ lui $v0, %hi(d_course_sherbet_land_ice) # $v0, 0x600 +/* 084C34 80084034 244268E8 */ addiu $v0, %lo(d_course_sherbet_land_ice) # addiu $v0, $v0, 0x68e8 /* 084C38 80084038 AE020060 */ sw $v0, 0x60($s0) /* 084C3C 8008403C AE020068 */ sw $v0, 0x68($s0) /* 084C40 80084040 0C0ADF8D */ jal random_int diff --git a/asm/non_matchings/code_80071F00/func_80085C20.s b/asm/non_matchings/code_80071F00/func_80085C20.s index da478b9f6..6d7a4eb7f 100644 --- a/asm/non_matchings/code_80071F00/func_80085C20.s +++ b/asm/non_matchings/code_80071F00/func_80085C20.s @@ -23,12 +23,12 @@ glabel func_80085C20 /* 086858 80085C58 44058000 */ mfc1 $a1, $f16 /* 08685C 80085C5C 0C022DF5 */ jal func_8008B7D4 /* 086860 80085C60 00000000 */ nop -/* 086864 80085C64 3C050600 */ lui $a1, %hi(D_06005400) # $a1, 0x600 -/* 086868 80085C68 3C060601 */ lui $a2, %hi(D_06008000) # $a2, 0x601 +/* 086864 80085C64 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_mushroom_tlut_list) # $a1, 0x600 +/* 086868 80085C68 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_mushroom) # $a2, 0x601 /* 08686C 80085C6C 240E0040 */ li $t6, 64 /* 086870 80085C70 AFAE0010 */ sw $t6, 0x10($sp) -/* 086874 80085C74 24C68000 */ addiu $a2, %lo(D_06008000) # addiu $a2, $a2, -0x8000 -/* 086878 80085C78 24A55400 */ addiu $a1, %lo(D_06005400) # addiu $a1, $a1, 0x5400 +/* 086874 80085C74 24C68000 */ addiu $a2, %lo(d_course_rainbow_road_neon_mushroom) # addiu $a2, $a2, -0x8000 +/* 086878 80085C78 24A55400 */ addiu $a1, %lo(d_course_rainbow_road_neon_mushroom_tlut_list) # addiu $a1, $a1, 0x5400 /* 08687C 80085C7C 8FA40020 */ lw $a0, 0x20($sp) /* 086880 80085C80 0C01CD11 */ jal func_80073444 /* 086884 80085C84 24070040 */ li $a3, 64 diff --git a/asm/non_matchings/code_80071F00/func_80085DB8.s b/asm/non_matchings/code_80071F00/func_80085DB8.s index 99475e1b4..b5014f7ca 100644 --- a/asm/non_matchings/code_80071F00/func_80085DB8.s +++ b/asm/non_matchings/code_80071F00/func_80085DB8.s @@ -23,12 +23,12 @@ glabel func_80085DB8 /* 0869F0 80085DF0 44058000 */ mfc1 $a1, $f16 /* 0869F4 80085DF4 0C022DF5 */ jal func_8008B7D4 /* 0869F8 80085DF8 00000000 */ nop -/* 0869FC 80085DFC 3C050600 */ lui $a1, %hi(D_06005E00) # $a1, 0x600 -/* 086A00 80085E00 3C060601 */ lui $a2, %hi(D_06009000) # $a2, 0x601 +/* 0869FC 80085DFC 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_mario_tlut_list) # $a1, 0x600 +/* 086A00 80085E00 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_mario) # $a2, 0x601 /* 086A04 80085E04 240E0040 */ li $t6, 64 /* 086A08 80085E08 AFAE0010 */ sw $t6, 0x10($sp) -/* 086A0C 80085E0C 24C69000 */ addiu $a2, %lo(D_06009000) # addiu $a2, $a2, -0x7000 -/* 086A10 80085E10 24A55E00 */ addiu $a1, %lo(D_06005E00) # addiu $a1, $a1, 0x5e00 +/* 086A0C 80085E0C 24C69000 */ addiu $a2, %lo(d_course_rainbow_road_neon_mario) # addiu $a2, $a2, -0x7000 +/* 086A10 80085E10 24A55E00 */ addiu $a1, %lo(d_course_rainbow_road_neon_mario_tlut_list) # addiu $a1, $a1, 0x5e00 /* 086A14 80085E14 8FA40020 */ lw $a0, 0x20($sp) /* 086A18 80085E18 0C01CD11 */ jal func_80073444 /* 086A1C 80085E1C 24070040 */ li $a3, 64 diff --git a/asm/non_matchings/code_80071F00/func_80085EF8.s b/asm/non_matchings/code_80071F00/func_80085EF8.s index 8219a0521..0a02e3b2a 100644 --- a/asm/non_matchings/code_80071F00/func_80085EF8.s +++ b/asm/non_matchings/code_80071F00/func_80085EF8.s @@ -22,12 +22,12 @@ glabel func_80085EF8 /* 086B2C 80085F2C 44058000 */ mfc1 $a1, $f16 /* 086B30 80085F30 0C022DF5 */ jal func_8008B7D4 /* 086B34 80085F34 00000000 */ nop -/* 086B38 80085F38 3C050600 */ lui $a1, %hi(D_06006800) # $a1, 0x600 -/* 086B3C 80085F3C 3C060601 */ lui $a2, %hi(D_0600A000) # $a2, 0x601 +/* 086B38 80085F38 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_boo_tlut_list) # $a1, 0x600 +/* 086B3C 80085F3C 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_boo) # $a2, 0x601 /* 086B40 80085F40 240E0040 */ li $t6, 64 /* 086B44 80085F44 AFAE0010 */ sw $t6, 0x10($sp) -/* 086B48 80085F48 24C6A000 */ addiu $a2, %lo(D_0600A000) # addiu $a2, $a2, -0x6000 -/* 086B4C 80085F4C 24A56800 */ addiu $a1, %lo(D_06006800) # addiu $a1, $a1, 0x6800 +/* 086B48 80085F48 24C6A000 */ addiu $a2, %lo(d_course_rainbow_road_neon_boo) # addiu $a2, $a2, -0x6000 +/* 086B4C 80085F4C 24A56800 */ addiu $a1, %lo(d_course_rainbow_road_neon_boo_tlut_list) # addiu $a1, $a1, 0x6800 /* 086B50 80085F50 8FA40020 */ lw $a0, 0x20($sp) /* 086B54 80085F54 0C01CD11 */ jal func_80073444 /* 086B58 80085F58 24070040 */ li $a3, 64 diff --git a/asm/non_matchings/code_80071F00/func_80086074.s b/asm/non_matchings/code_80071F00/func_80086074.s index 45302e346..c12373ba1 100644 --- a/asm/non_matchings/code_80071F00/func_80086074.s +++ b/asm/non_matchings/code_80071F00/func_80086074.s @@ -19,10 +19,10 @@ glabel func_80086074 /* 086CB8 800860B8 0C022DF5 */ jal func_8008B7D4 /* 086CBC 800860BC 00000000 */ nop /* 086CC0 800860C0 8FA80024 */ lw $t0, 0x24($sp) -/* 086CC4 800860C4 3C0A0600 */ lui $t2, %hi(D_06007200) # $t2, 0x600 -/* 086CC8 800860C8 3C0C0601 */ lui $t4, %hi(D_0600B000) # $t4, 0x601 -/* 086CCC 800860CC 258CB000 */ addiu $t4, %lo(D_0600B000) # addiu $t4, $t4, -0x5000 -/* 086CD0 800860D0 254A7200 */ addiu $t2, %lo(D_06007200) # addiu $t2, $t2, 0x7200 +/* 086CC4 800860C4 3C0A0600 */ lui $t2, %hi(d_course_rainbow_road_static_tluts) # $t2, 0x600 +/* 086CC8 800860C8 3C0C0601 */ lui $t4, %hi(d_course_rainbow_road_static_textures) # $t4, 0x601 +/* 086CCC 800860CC 258CB000 */ addiu $t4, %lo(d_course_rainbow_road_static_textures) # addiu $t4, $t4, -0x5000 +/* 086CD0 800860D0 254A7200 */ addiu $t2, %lo(d_course_rainbow_road_static_tluts) # addiu $t2, $t2, 0x7200 /* 086CD4 800860D4 240D0040 */ li $t5, 64 /* 086CD8 800860D8 00084A40 */ sll $t1, $t0, 9 /* 086CDC 800860DC 00085B00 */ sll $t3, $t0, 0xc diff --git a/asm/non_matchings/hud_renderer/func_80050C68.s b/asm/non_matchings/hud_renderer/func_80050C68.s index ddea16185..c10208310 100644 --- a/asm/non_matchings/hud_renderer/func_80050C68.s +++ b/asm/non_matchings/hud_renderer/func_80050C68.s @@ -51,8 +51,8 @@ glabel func_80050C68 /* 05190C 80050D0C AC530004 */ sw $s3, 4($v0) /* 051910 80050D10 AC560000 */ sw $s6, ($v0) /* 051914 80050D14 8E020000 */ lw $v0, ($s0) -/* 051918 80050D18 3C040D02 */ lui $a0, %hi(gTexturePortraitBombKartAndQuestionMark) # $a0, 0xd02 -/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(gTexturePortraitBombKartAndQuestionMark) # addiu $a0, $a0, -0x2928 +/* 051918 80050D18 3C040D02 */ lui $a0, %hi(gTexturePortraitBombKart) # $a0, 0xd02 +/* 05191C 80050D1C 2484D6D8 */ addiu $a0, %lo(gTexturePortraitBombKart) # addiu $a0, $a0, -0x2928 /* 051920 80050D20 244F0008 */ addiu $t7, $v0, 8 /* 051924 80050D24 AE0F0000 */ sw $t7, ($s0) /* 051928 80050D28 AC540004 */ sw $s4, 4($v0) diff --git a/asm/non_matchings/hud_renderer/func_800528EC.s b/asm/non_matchings/hud_renderer/func_800528EC.s index 475f0df3f..7e025f1bb 100644 --- a/asm/non_matchings/hud_renderer/func_800528EC.s +++ b/asm/non_matchings/hud_renderer/func_800528EC.s @@ -80,8 +80,8 @@ glabel func_800528EC /* 053624 80052A24 244F0008 */ addiu $t7, $v0, 8 /* 053628 80052A28 AE4F0000 */ sw $t7, ($s2) /* 05362C 80052A2C 3C18B700 */ lui $t8, 0xb700 -/* 053630 80052A30 3C040600 */ lui $a0, %hi(D_060068E8) # $a0, 0x600 -/* 053634 80052A34 248468E8 */ addiu $a0, %lo(D_060068E8) # addiu $a0, $a0, 0x68e8 +/* 053630 80052A30 3C040600 */ lui $a0, %hi(d_course_sherbet_land_ice) # $a0, 0x600 +/* 053634 80052A34 248468E8 */ addiu $a0, %lo(d_course_sherbet_land_ice) # addiu $a0, $a0, 0x68e8 /* 053638 80052A38 24050020 */ li $a1, 32 /* 05363C 80052A3C 24060020 */ li $a2, 32 /* 053640 80052A40 AC580000 */ sw $t8, ($v0) diff --git a/asm/non_matchings/hud_renderer/func_80052F20.s b/asm/non_matchings/hud_renderer/func_80052F20.s index a7232b616..73580d9b0 100644 --- a/asm/non_matchings/hud_renderer/func_80052F20.s +++ b/asm/non_matchings/hud_renderer/func_80052F20.s @@ -9,8 +9,8 @@ glabel func_80052F20 /* 053B3C 80052F3C AFA40050 */ sw $a0, 0x50($sp) /* 053B40 80052F40 000F78C0 */ sll $t7, $t7, 3 /* 053B44 80052F44 AFBF003C */ sw $ra, 0x3c($sp) -/* 053B48 80052F48 3C040600 */ lui $a0, %hi(D_06006D20) # $a0, 0x600 -/* 053B4C 80052F4C 3C050600 */ lui $a1, %hi(D_06006F20) # $a1, 0x600 +/* 053B48 80052F48 3C040600 */ lui $a0, %hi(d_course_frappe_snowland_snow_tlut) # $a0, 0x600 +/* 053B4C 80052F4C 3C050600 */ lui $a1, %hi(d_course_frappe_snowland_snow) # $a1, 0x600 /* 053B50 80052F50 01F8C821 */ addu $t9, $t7, $t8 /* 053B54 80052F54 AFBE0038 */ sw $fp, 0x38($sp) /* 053B58 80052F58 AFB70034 */ sw $s7, 0x34($sp) @@ -22,8 +22,8 @@ glabel func_80052F20 /* 053B70 80052F70 AFB1001C */ sw $s1, 0x1c($sp) /* 053B74 80052F74 AFB00018 */ sw $s0, 0x18($sp) /* 053B78 80052F78 AFB90044 */ sw $t9, 0x44($sp) -/* 053B7C 80052F7C 24A56F20 */ addiu $a1, %lo(D_06006F20) # addiu $a1, $a1, 0x6f20 -/* 053B80 80052F80 24846D20 */ addiu $a0, %lo(D_06006D20) # addiu $a0, $a0, 0x6d20 +/* 053B7C 80052F7C 24A56F20 */ addiu $a1, %lo(d_course_frappe_snowland_snow) # addiu $a1, $a1, 0x6f20 +/* 053B80 80052F80 24846D20 */ addiu $a0, %lo(d_course_frappe_snowland_snow_tlut) # addiu $a0, $a0, 0x6d20 /* 053B84 80052F84 24060020 */ li $a2, 32 /* 053B88 80052F88 0C011B98 */ jal func_80046E60 /* 053B8C 80052F8C 24070020 */ li $a3, 32 diff --git a/asm/non_matchings/hud_renderer/func_80053870.s b/asm/non_matchings/hud_renderer/func_80053870.s index 508944ad6..e0403bb63 100644 --- a/asm/non_matchings/hud_renderer/func_80053870.s +++ b/asm/non_matchings/hud_renderer/func_80053870.s @@ -174,10 +174,10 @@ glabel func_80053870 /* 054704 80053B04 AE580000 */ sw $t8, ($s2) /* 054708 80053B08 35AD0204 */ ori $t5, (0x00020204 & 0xFFFF) # ori $t5, $t5, 0x204 /* 05470C 80053B0C 3C19B700 */ lui $t9, 0xb700 -/* 054710 80053B10 3C040600 */ lui $a0, %hi(D_06006738) # $a0, 0x600 +/* 054710 80053B10 3C040600 */ lui $a0, %hi(d_course_bowsers_castle_thwomp_side) # $a0, 0x600 /* 054714 80053B14 26F75C18 */ addiu $s7, %lo(D_80165C18) # addiu $s7, $s7, 0x5c18 /* 054718 80053B18 241E00E0 */ li $fp, 224 -/* 05471C 80053B1C 24846738 */ addiu $a0, %lo(D_06006738) # addiu $a0, $a0, 0x6738 +/* 05471C 80053B1C 24846738 */ addiu $a0, %lo(d_course_bowsers_castle_thwomp_side) # addiu $a0, $a0, 0x6738 /* 054720 80053B20 24050020 */ li $a1, 32 /* 054724 80053B24 24060020 */ li $a2, 32 /* 054728 80053B28 AC590000 */ sw $t9, ($v0) diff --git a/asm/non_matchings/hud_renderer/func_80055AB8.s b/asm/non_matchings/hud_renderer/func_80055AB8.s index 70c17e647..ef26f7bdf 100644 --- a/asm/non_matchings/hud_renderer/func_80055AB8.s +++ b/asm/non_matchings/hud_renderer/func_80055AB8.s @@ -50,7 +50,7 @@ glabel func_80055AB8 /* 056778 80055B78 340B8000 */ li $t3, 32768 /* 05677C 80055B7C 258C62B0 */ addiu $t4, %lo(D_0D0062B0) # addiu $t4, $t4, 0x62b0 /* 056780 80055B80 3C063F0A */ lui $a2, (0x3F0A3D71 >> 16) # lui $a2, 0x3f0a -/* 056784 80055B84 3C070601 */ lui $a3, %hi(D_06012028) # $a3, 0x601 +/* 056784 80055B84 3C070601 */ lui $a3, %hi(d_course_rainbow_road_sphere) # $a3, 0x601 /* 056788 80055B88 240D0020 */ li $t5, 32 /* 05678C 80055B8C 240E0040 */ li $t6, 64 /* 056790 80055B90 240F0020 */ li $t7, 32 @@ -64,7 +64,7 @@ glabel func_80055AB8 /* 0567B0 80055BB0 AFAF001C */ sw $t7, 0x1c($sp) /* 0567B4 80055BB4 AFAE0018 */ sw $t6, 0x18($sp) /* 0567B8 80055BB8 AFAD0014 */ sw $t5, 0x14($sp) -/* 0567BC 80055BBC 24E72028 */ addiu $a3, %lo(D_06012028) # addiu $a3, $a3, 0x2028 +/* 0567BC 80055BBC 24E72028 */ addiu $a3, %lo(d_course_rainbow_road_sphere) # addiu $a3, $a3, 0x2028 /* 0567C0 80055BC0 34C63D71 */ ori $a2, (0x3F0A3D71 & 0xFFFF) # ori $a2, $a2, 0x3d71 /* 0567C4 80055BC4 0C011A38 */ jal func_800468E0 /* 0567C8 80055BC8 AFAC0010 */ sw $t4, 0x10($sp) diff --git a/courses/battle/big_donut/course_data.inc.c b/courses/battle/big_donut/course_data.inc.c index 7927e9a4c..2f62f8a3b 100644 --- a/courses/battle/big_donut/course_data.inc.c +++ b/courses/battle/big_donut/course_data.inc.c @@ -21,7 +21,7 @@ Gfx d_course_big_donut_dl[] = { }; // Item box spawn locations -struct ActorSpawnData d_course_big_donut_spawn_item_box[] = { +struct ActorSpawnData d_course_big_donut_item_box_spawns[] = { {{ -40, 222, 824 }, {0} }, {{ 125, 200, 573 }, {0} }, {{ -302, 251, 889 }, {0} }, diff --git a/courses/battle/block_fort/course_data.inc.c b/courses/battle/block_fort/course_data.inc.c index fb969404d..2626cc418 100644 --- a/courses/battle/block_fort/course_data.inc.c +++ b/courses/battle/block_fort/course_data.inc.c @@ -16,7 +16,7 @@ Gfx d_course_block_fort_dl[] = { }; // Item box spawn locations -struct ActorSpawnData d_course_block_fort_spawn_item_box[] = { +struct ActorSpawnData d_course_block_fort_item_box_spawns[] = { {{ -38, 0, 744 }, {0} }, {{ 29, 0, 710 }, {0} }, {{ -13, 0, 685 }, {0} }, diff --git a/courses/battle/double_deck/course_data.inc.c b/courses/battle/double_deck/course_data.inc.c index 851fccc00..5554f877b 100644 --- a/courses/battle/double_deck/course_data.inc.c +++ b/courses/battle/double_deck/course_data.inc.c @@ -14,7 +14,7 @@ Gfx d_course_double_deck_dl[] = { }; // Item box spawn locations. -struct ActorSpawnData d_course_double_deck_spawn_item_box[] = { +struct ActorSpawnData d_course_double_deck_item_box_spawns[] = { {{ -331, 0, 675 }, { 0 }}, {{ 18, 30, 295 }, { 0 }}, {{ -685, 0, -279 }, { 0 }}, diff --git a/courses/battle/skyscraper/course_data.inc.c b/courses/battle/skyscraper/course_data.inc.c index e7521a980..df256de38 100644 --- a/courses/battle/skyscraper/course_data.inc.c +++ b/courses/battle/skyscraper/course_data.inc.c @@ -25,7 +25,7 @@ Gfx d_course_skyscraper_dl[] = { }; // Item box spawn locations -struct ActorSpawnData d_course_skyscraper_spawn_item_box[] = { +struct ActorSpawnData d_course_skyscraper_item_box_spawns[] = { {{ -18, 480, 365 }, { 0 }}, {{ -272, 480, 312 }, { 0 }}, {{ -312, 480, 359 }, { 0 }}, diff --git a/courses/flower_cup/choco_mountain/course_data.inc.c b/courses/flower_cup/choco_mountain/course_data.inc.c index 2b2251e38..e73310ae6 100644 --- a/courses/flower_cup/choco_mountain/course_data.inc.c +++ b/courses/flower_cup/choco_mountain/course_data.inc.c @@ -3452,7 +3452,7 @@ Gfx d_course_choco_mountain_dl_6F88[] = gsSPEndDisplayList(), }; -Gfx d_course_choco_mountain_dl_6FE0[] = +Gfx d_course_choco_mountain_dl_falling_rock[] = { gsSPSetGeometryMode(G_LIGHTING), gsDPSetCycleType(G_CYC_2CYCLE), diff --git a/courses/flower_cup/frappe_snowland/course_data.inc.c b/courses/flower_cup/frappe_snowland/course_data.inc.c index 885bfed73..906f5a373 100644 --- a/courses/flower_cup/frappe_snowland/course_data.inc.c +++ b/courses/flower_cup/frappe_snowland/course_data.inc.c @@ -2731,7 +2731,7 @@ Vtx d_frappe_snowland_tree[] = { {{{ 25, -2, 0 }, 0, { 1023, 1945 }, {0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_frappe_snowland_dl_75A0[] = +Gfx d_course_frappe_snowland_dl_tree[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), diff --git a/courses/flower_cup/mario_raceway/course_data.inc.c b/courses/flower_cup/mario_raceway/course_data.inc.c index 131b9eb7a..79478345d 100644 --- a/courses/flower_cup/mario_raceway/course_data.inc.c +++ b/courses/flower_cup/mario_raceway/course_data.inc.c @@ -3609,7 +3609,7 @@ Vtx d_course_mario_raceway_piranha_plant_model[] = { {{{ 15, 30, 0 }, 0, { 2048, 0 }, {0xFF, 0xFF, 0xFE, 0xFF }}}, }; -Gfx d_course_mario_raceway_dl_6990[] = +Gfx d_course_mario_raceway_dl_piranha_plant[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -3628,14 +3628,14 @@ Gfx d_course_mario_raceway_dl_6990[] = }; // 0x6A28 -Vtx d_course_mario_raceway_sdfuih[4] = { +Vtx d_course_mario_raceway_tree_model[4] = { {{{ 40, 10, 0 }, 0, { 1536, 1706 }, { 0xFF, 0xFE, 0xFE, 0xFF }}}, {{{ 0, 100, 0 }, 0, { 512, -341 }, { 0xFF, 0xFE, 0xFE, 0xFF }}}, {{{ -40, 10, 0 }, 0, { -512, 1706 }, { 0xFF, 0xFE, 0xFE, 0xFF }}}, {{{ 0, -10, 0 }, 0, { 512, 2161 }, { 0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_mario_raceway_dl_6A68[] = +Gfx d_course_mario_raceway_dl_tree[] = { gsSPClearGeometryMode(G_LIGHTING), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), @@ -3646,7 +3646,7 @@ Gfx d_course_mario_raceway_dl_6A68[] = gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC), gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(d_course_mario_raceway_sdfuih, 4, 0), + gsSPVertex(d_course_mario_raceway_tree_model, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsDPSetTextureLUT(G_TT_NONE), @@ -3884,7 +3884,7 @@ Gfx d_course_mario_raceway_dl_9310[] = gsSPEndDisplayList(), }; -Gfx d_course_mario_raceway_dl_9330[] = +Gfx d_course_mario_raceway_dl_sign[] = { gsSPDisplayList(d_course_mario_raceway_dl_9310), gsSPDisplayList(d_course_mario_raceway_dl_90B0), diff --git a/courses/flower_cup/toads_turnpike/course_data.inc.c b/courses/flower_cup/toads_turnpike/course_data.inc.c index a5dc20d2c..5efc91cc2 100644 --- a/courses/flower_cup/toads_turnpike/course_data.inc.c +++ b/courses/flower_cup/toads_turnpike/course_data.inc.c @@ -8386,7 +8386,7 @@ Gfx *d_course_toads_turnpike_dl_list[] = { }; // 0x23AE0 -struct ActorSpawnData d_course_toads_turnpike_itembox_spawn[] = { +struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[] = { {{ -18, 0, -1666 }, { 0 }}, {{ -18, 0, -1748 }, { 0 }}, {{ -22, 0, -1851 }, { 0 }}, diff --git a/courses/mushroom_cup/kalimari_desert/course_data.inc.c b/courses/mushroom_cup/kalimari_desert/course_data.inc.c index 6d56d40ed..20f8c4c22 100644 --- a/courses/mushroom_cup/kalimari_desert/course_data.inc.c +++ b/courses/mushroom_cup/kalimari_desert/course_data.inc.c @@ -4578,7 +4578,7 @@ Vtx d_course_kalimari_desert_cactus_model2[] = { {{{ 6, 0, 0 }, 0, { 1024, 1638 }, {0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_kalimari_desert_dl_8528[] = +Gfx d_course_kalimari_desert_dl_cactus1[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), @@ -4597,7 +4597,7 @@ Gfx d_course_kalimari_desert_dl_8528[] = gsSPEndDisplayList(), }; -Gfx d_course_kalimari_desert_dl_8628[] = +Gfx d_course_kalimari_desert_dl_cactus2[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), @@ -4616,7 +4616,7 @@ Gfx d_course_kalimari_desert_dl_8628[] = gsSPEndDisplayList(), }; -Gfx d_course_kalimari_desert_dl_8728[] = +Gfx d_course_kalimari_desert_dl_cactus3[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), @@ -4759,7 +4759,7 @@ Vtx d_course_kalimari_desert_crossing_signal_unknown_model11[] = { }; // 0x10AE8 -Gfx d_course_kalimari_desert_dl_10AE8[] = +Gfx d_course_kalimari_desert_dl_crossing_right_active[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -4800,7 +4800,7 @@ Gfx d_course_kalimari_desert_dl_10AE8[] = gsSPEndDisplayList(), }; -Gfx d_course_kalimari_desert_dl_10C10[] = +Gfx d_course_kalimari_desert_dl_crossing_left_active[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -4841,7 +4841,7 @@ Gfx d_course_kalimari_desert_dl_10C10[] = gsSPEndDisplayList(), }; -Gfx d_course_kalimari_desert_dl_10D38[] = +Gfx d_course_kalimari_desert_dl_crossing_both_inactive[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -8327,7 +8327,7 @@ Gfx d_course_kalimari_desert_dl_22E00[] = }; // 0x22E88 -struct ActorSpawnData d_course_kalimari_desert_item_box_spawn[] = { +struct ActorSpawnData d_course_kalimari_desert_item_box_spawns[] = { {{ -856, 26, -1141 }, { 0 }}, {{ -846, 26, -1074 }, { 0 }}, {{ -844, 26, -1098 }, { 0 }}, diff --git a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c b/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c index 8687aa809..0cd41d95f 100644 --- a/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c +++ b/courses/mushroom_cup/koopa_troopa_beach/course_data.inc.c @@ -8072,7 +8072,7 @@ u8 d_course_koopa_troopa_beach_crab_tlut[] = { }; // 0xD828 -u8 d_course_koopa_troopa_beach_crab[][4096] = { +u8 d_course_koopa_troopa_beach_crab_frames[][4096] = { { #include "assets/courses/koopa_troopa_beach/gTextureCrab1.inc.c" }, @@ -8462,7 +8462,7 @@ Gfx d_course_koopa_troopa_beach_dl_185E8[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_185F8[] = +Gfx d_course_koopa_troopa_beach_dl_tree_top1[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_185E8), gsSPEndDisplayList(), @@ -8496,7 +8496,7 @@ Gfx d_course_koopa_troopa_beach_dl_186A8[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_186B8[] = +Gfx d_course_koopa_troopa_beach_dl_tree_trunk1[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_186A8), gsSPEndDisplayList(), @@ -8571,7 +8571,7 @@ Gfx d_course_koopa_troopa_beach_dl_18938[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_18948[] = +Gfx d_course_koopa_troopa_beach_dl_tree_top2[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_18938), gsSPEndDisplayList(), @@ -8605,7 +8605,7 @@ Gfx d_course_koopa_troopa_beach_dl_189F8[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_18A08[] = +Gfx d_course_koopa_troopa_beach_dl_tree_trunk2[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_189F8), gsSPEndDisplayList(), @@ -8680,7 +8680,7 @@ Gfx d_course_koopa_troopa_beach_dl_18C88[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_18C98[] = +Gfx d_course_koopa_troopa_beach_dl_tree_top3[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_18C88), gsSPEndDisplayList(), @@ -8714,7 +8714,7 @@ Gfx d_course_koopa_troopa_beach_dl_18D48[] = gsSPEndDisplayList(), }; -Gfx d_course_koopa_troopa_beach_dl_18D58[] = +Gfx d_course_koopa_troopa_beach_dl_tree_trunk3[] = { gsSPDisplayList(d_course_koopa_troopa_beach_dl_18D48), gsSPEndDisplayList(), @@ -8759,7 +8759,7 @@ Gfx d_course_koopa_troopa_beach_dl_18D68[] = }; // 0x18E78 -struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawn[] = { +struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[] = { {{ -118, 1, -977 }, { 0 }}, {{ -116, 1, -1009 }, { 0 }}, {{ -91, 1, -1021 }, { 0 }}, @@ -8920,7 +8920,7 @@ struct CourseAddrUnkStruct d_course_koopa_troopa_beach_addr[] = { { 0x00000000, 0x00000000 }, }; -Gfx *d_course_koopa_troopa_beach_dl_list[] = { +Gfx *d_course_koopa_troopa_beach_dl_list1[] = { d_course_koopa_troopa_beach_dl_90, d_course_koopa_troopa_beach_dl_278, d_course_koopa_troopa_beach_dl_188, d_course_koopa_troopa_beach_dl_3C0, d_course_koopa_troopa_beach_dl_4B0, d_course_koopa_troopa_beach_dl_6E0, @@ -8995,6 +8995,9 @@ Gfx *d_course_koopa_troopa_beach_dl_list[] = { d_course_koopa_troopa_beach_dl_A4D8, d_course_koopa_troopa_beach_dl_A780, d_course_koopa_troopa_beach_dl_A8D0, d_course_koopa_troopa_beach_dl_AB88, d_course_koopa_troopa_beach_dl_AA38, d_course_koopa_troopa_beach_dl_AC68, +}; + +Gfx *d_course_koopa_troopa_beach_dl_list2[] = { d_course_koopa_troopa_beach_dl_118, d_course_koopa_troopa_beach_dl_328, d_course_koopa_troopa_beach_dl_218, d_course_koopa_troopa_beach_dl_458, d_course_koopa_troopa_beach_dl_530, d_course_koopa_troopa_beach_dl_790, diff --git a/courses/mushroom_cup/luigi_raceway/course_data.inc.c b/courses/mushroom_cup/luigi_raceway/course_data.inc.c index f1102fa0c..a63a4731a 100644 --- a/courses/mushroom_cup/luigi_raceway/course_data.inc.c +++ b/courses/mushroom_cup/luigi_raceway/course_data.inc.c @@ -7027,7 +7027,7 @@ Gfx d_course_luigi_raceway_dl_FD40[] = }; // 0xFDE8 -struct ActorSpawnData d_course_luigi_raceway_item_box_spawn[] = { +struct ActorSpawnData d_course_luigi_raceway_item_box_spawns[] = { {{ -183, -50, -2076 }, { 0 }}, {{ -169, -50, -2078 }, { 0 }}, {{ -151, -50, -2079 }, { 0 }}, diff --git a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c b/courses/mushroom_cup/moo_moo_farm/course_data.inc.c index 5abf4c6d9..e7c7e4cc0 100644 --- a/courses/mushroom_cup/moo_moo_farm/course_data.inc.c +++ b/courses/mushroom_cup/moo_moo_farm/course_data.inc.c @@ -8487,7 +8487,7 @@ u8 d_course_moo_moo_farm_mole_tlut[] = { }; // 0xFE70 -u8 d_course_moo_moo_farm_mole[][2048] = { +u8 d_course_moo_moo_farm_mole_frames[][2048] = { { #include "assets/courses/moo_moo_farm/gTextureMole1.inc.c" }, @@ -8576,7 +8576,7 @@ Gfx d_course_moo_moo_farm_dl_13B88[] = gsSPEndDisplayList(), }; -Gfx d_course_moo_moo_farm_dl_13C00[] = +Gfx d_course_moo_moo_farm_dl_cow1[] = { gsSPDisplayList(d_course_moo_moo_farm_dl_13B88), gsDPLoadTextureBlock(0x0300A000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), @@ -8588,7 +8588,7 @@ Gfx d_course_moo_moo_farm_dl_13C00[] = gsSPEndDisplayList(), }; -Gfx d_course_moo_moo_farm_dl_13CA0[] = +Gfx d_course_moo_moo_farm_dl_cow2[] = { gsSPDisplayList(d_course_moo_moo_farm_dl_13B88), gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300B000), @@ -8608,7 +8608,7 @@ Gfx d_course_moo_moo_farm_dl_13CA0[] = gsSPEndDisplayList(), }; -Gfx d_course_moo_moo_farm_dl_13D20[] = +Gfx d_course_moo_moo_farm_dl_cow3[] = { gsSPDisplayList(d_course_moo_moo_farm_dl_13B88), gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300C000), @@ -8628,7 +8628,7 @@ Gfx d_course_moo_moo_farm_dl_13D20[] = gsSPEndDisplayList(), }; -Gfx d_course_moo_moo_farm_dl_13DA0[] = +Gfx d_course_moo_moo_farm_dl_cow4[] = { gsSPDisplayList(d_course_moo_moo_farm_dl_13B88), gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300D000), @@ -8648,7 +8648,7 @@ Gfx d_course_moo_moo_farm_dl_13DA0[] = gsSPEndDisplayList(), }; -Gfx d_course_moo_moo_farm_dl_13E20[] = +Gfx d_course_moo_moo_farm_dl_cow5[] = { gsSPDisplayList(d_course_moo_moo_farm_dl_13B88), gsDPSetTextureImage(G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0x0300E000), @@ -8669,7 +8669,7 @@ Gfx d_course_moo_moo_farm_dl_13E20[] = }; // 0x13EA0 -Vtx d_course_moo_moo_farm_mole_model[] = { +Vtx d_course_moo_moo_farm_tree_model[] = { {{{ 0, 95, 0 }, 0, { 1024, 0 }, {0xFF, 0xFF, 0xFF, 0xFF }}}, {{{ -50, 95, 0 }, 0, { 0, 0 }, {0xFF, 0xFF, 0xFF, 0xFF }}}, {{{ -50, -5, 0 }, 0, { 0, 2048 }, {0xFF, 0xFF, 0xFF, 0xFF }}}, @@ -8680,7 +8680,7 @@ Vtx d_course_moo_moo_farm_mole_model[] = { {{{ 50, -5, 0 }, 0, { 1023, 2048 }, {0xFF, 0xFF, 0xFF, 0xFF }}}, }; -Gfx d_course_moo_moo_farm_dl_13F20[] = +Gfx d_course_moo_moo_farm_dl_tree[] = { gsSPClearGeometryMode(G_LIGHTING), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), @@ -8691,7 +8691,7 @@ Gfx d_course_moo_moo_farm_dl_13F20[] = gsDPSetTile(G_IM_FMT_CI, G_IM_SIZ_8b, 4, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, 6, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, 5, G_TX_NOLOD), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x00FC), gsDPLoadTextureBlock(0x03009000, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), - gsSPVertex(d_course_moo_moo_farm_mole_model, 8, 0), + gsSPVertex(d_course_moo_moo_farm_tree_model, 8, 0), gsSP1Quadrangle(0, 1, 2, 3, 0), gsDPLoadTextureBlock(0x03009800, G_IM_FMT_CI, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSP1Quadrangle(4, 5, 6, 7, 0), @@ -8842,7 +8842,7 @@ struct ActorSpawnData d_course_moo_moo_farm_tree_spawn[] = { {{ -32768, 0, 0 }, { 0 }}, }; -struct ActorSpawnData d_course_moo_moo_farm_item_box_spawn[] = { +struct ActorSpawnData d_course_moo_moo_farm_item_box_spawns[] = { {{ -78, 13, -1056 }, { 0 }}, {{ -42, 13, -1051 }, { 0 }}, {{ -20, 13, -1053 }, { 0 }}, diff --git a/courses/special_cup/banshee_boardwalk/course_data.inc.c b/courses/special_cup/banshee_boardwalk/course_data.inc.c index 25da164af..dd907b236 100644 --- a/courses/special_cup/banshee_boardwalk/course_data.inc.c +++ b/courses/special_cup/banshee_boardwalk/course_data.inc.c @@ -3880,7 +3880,7 @@ Gfx d_course_banshee_boardwalk_dl_7B78[] = gsSPEndDisplayList(), }; -Gfx d_course_banshee_boardwalk_dl_7BA8[] = +Gfx d_course_banshee_boardwalk_dl_cheep_cheep[] = { gsSPDisplayList(d_course_banshee_boardwalk_dl_7B78), gsSPEndDisplayList(), @@ -4023,7 +4023,7 @@ Gfx d_course_banshee_boardwalk_dl_A9C8[] = gsSPEndDisplayList(), }; -Gfx d_course_banshee_boardwalk_dl_A9D8[] = +Gfx d_course_banshee_boardwalk_dl_trash_bin[] = { gsSPDisplayList(d_course_banshee_boardwalk_dl_A9C8), gsSPEndDisplayList(), @@ -4100,7 +4100,7 @@ Gfx d_course_banshee_boardwalk_dl_B308[] = }; // 0xB3D0 -struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawn[] = { +struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawns[] = { {{ -271, 12, -1629 }, { 0 }}, {{ -241, 12, -1614 }, { 0 }}, {{ -196, 12, -1585 }, { 0 }}, diff --git a/courses/special_cup/dks_jungle_parkway/course_data.inc.c b/courses/special_cup/dks_jungle_parkway/course_data.inc.c index 979f255cc..fe2ffdecd 100644 --- a/courses/special_cup/dks_jungle_parkway/course_data.inc.c +++ b/courses/special_cup/dks_jungle_parkway/course_data.inc.c @@ -5831,7 +5831,7 @@ u8 d_course_dks_jungle_parkway_tree2_trunk[] = { #include "assets/courses/dks_jungle_parkway/gTextureDksJungleParkwayTree2Trunk.inc.c" }; -Gfx d_course_dks_jungle_parkway_dl_10CC0[] = +Gfx d_course_dks_jungle_parkway_dl_tree1[] = { gsSPVertex(d_course_dks_jungle_parkway_tree_model, 8, 0), gsDPTileSync(), @@ -5873,7 +5873,7 @@ u8 d_course_dks_jungle_parkway_tree4[] = { #include "assets/courses/dks_jungle_parkway/gTextureDksJungleParkwayTree3TopLeft.inc.c" }; -Gfx d_course_dks_jungle_parkway_dl_11DC8[] = +Gfx d_course_dks_jungle_parkway_dl_tree2[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -5921,7 +5921,7 @@ u8 d_course_dks_jungle_parkway_tree5[] = { }; // 0x12EF0 -Gfx d_course_dks_jungle_parkway_dl_12EF0[] = +Gfx d_course_dks_jungle_parkway_dl_tree3[] = { gsSPVertex(d_course_dks_jungle_parkway_model4, 8, 0), gsDPTileSync(), @@ -5983,7 +5983,7 @@ Gfx d_course_dks_jungle_parkway_dl_13878[] = gsSPEndDisplayList(), }; -Gfx d_course_dks_jungle_parkway_dl_138D0[] = +Gfx d_course_dks_jungle_parkway_dl_palm_tree[] = { gsSPVertex(d_course_dks_jungle_parkway_palm_tree_model, 16, 0), gsSPClearGeometryMode(G_CULL_BACK), @@ -6022,7 +6022,7 @@ Vtx d_course_dks_jungle_parkway_kiwano_model[] = { }; // 0x13BB8 -Gfx d_course_dks_jungle_parkway_dl_13BB8[] = +Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -6100,7 +6100,7 @@ Gfx *d_course_dks_jungle_parkway_unknown_dl_list[] = { d_course_dks_jungle_parkway_dl_6F10, d_course_dks_jungle_parkway_dl_7080, d_course_dks_jungle_parkway_dl_7008, d_course_dks_jungle_parkway_dl_7108, }; -struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawn[] = { +struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[] = { {{ 561, 0, -953 }, { 0 }}, {{ 599, 0, -954 }, { 0 }}, {{ 597, 0, -917 }, { 0 }}, diff --git a/courses/special_cup/rainbow_road/course_data.inc.c b/courses/special_cup/rainbow_road/course_data.inc.c index ffbff8e60..7224a49f8 100644 --- a/courses/special_cup/rainbow_road/course_data.inc.c +++ b/courses/special_cup/rainbow_road/course_data.inc.c @@ -2903,92 +2903,82 @@ struct TrackWayPoint d_course_rainbow_road_track_waypoints[] = { }; // some textures 0x5400 -u8 d_course_rainbow_road_mushroom_tlut1[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom1.inc.c" +u8 d_course_rainbow_road_neon_mushroom_tlut_list[][512] = { + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom1.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom2.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom3.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom4.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom5.inc.c" + }, }; -u8 d_course_rainbow_road_mushroom_tlut2[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom2.inc.c" +u8 d_course_rainbow_road_neon_mario_tlut_list[][512] = { + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario1.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario2.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario3.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario4.inc.c" + }, + { + #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario5.inc.c" + }, }; -u8 d_course_rainbow_road_mushroom_tlut3[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom3.inc.c" -}; - -u8 d_course_rainbow_road_mushroom_tlut4[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom4.inc.c" -}; - -u8 d_course_rainbow_road_mushroom_tlut5[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMushroom5.inc.c" -}; - -u8 d_course_rainbow_road_mario_tlut1[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario1.inc.c" -}; - -u8 d_course_rainbow_road_mario_tlut2[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario2.inc.c" -}; - -u8 d_course_rainbow_road_mario_tlut3[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario3.inc.c" -}; - -u8 d_course_rainbow_road_mario_tlut4[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario4.inc.c" -}; - -u8 d_course_rainbow_road_mario_tlut5[] = { - #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonMario5.inc.c" -}; - -u8 d_course_rainbow_road_boo_tlut1[] = { +u8 d_course_rainbow_road_neon_boo_tlut_list[][512] = { + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo1.inc.c" -}; - -u8 d_course_rainbow_road_boo_tlut2[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo2.inc.c" -}; - -u8 d_course_rainbow_road_boo_tlut3[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo3.inc.c" -}; - -u8 d_course_rainbow_road_boo_tlut4[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo4.inc.c" -}; - -u8 d_course_rainbow_road_boo_tlut5[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBoo5.inc.c" + }, }; -u8 d_course_rainbow_road_peach_tlut[] = { +u8 d_course_rainbow_road_static_tluts[][512] = { + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonPeach.inc.c" -}; - -u8 d_course_rainbow_road_luigi_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonLuigi.inc.c" -}; - -u8 d_course_rainbow_road_donkey_kong_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonDonkeyKong.inc.c" -}; - -u8 d_course_rainbow_road_yoshi_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonYoshi.inc.c" -}; - -u8 d_course_rainbow_road_bowser_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonBowser.inc.c" -}; - -u8 d_course_rainbow_road_wario_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonWario.inc.c" -}; - -u8 d_course_rainbow_road_toad_tlut[] = { + }, + { #include "assets/courses/rainbow_road/gTLUTRainbowRoadNeonToad.inc.c" + }, }; u8 d_course_rainbow_road_neon_mushroom[] = { @@ -3003,32 +2993,28 @@ u8 d_course_rainbow_road_neon_boo[] = { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonBoo.inc.c" }; -u8 d_course_rainbow_road_neon_peach[] = { +u8 d_course_rainbow_road_static_textures[][4096] = { + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonPeach.inc.c" -}; - -u8 d_course_rainbow_road_neon_luigi[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonLuigi.inc.c" -}; - -u8 d_course_rainbow_road_neon_donkey_kong[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonDonkeyKong.inc.c" -}; - -u8 d_course_rainbow_road_neon_yoshi[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonYoshi.inc.c" -}; - -u8 d_course_rainbow_road_neon_bowser[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonBowser.inc.c" -}; - -u8 d_course_rainbow_road_neon_wario[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonWario.inc.c" -}; - -u8 d_course_rainbow_road_neon_toad[] = { + }, + { #include "assets/courses/rainbow_road/gTextureRainbowRoadNeonToad.inc.c" + }, }; // unk data @@ -3639,7 +3625,7 @@ Gfx d_course_rainbow_road_dl_16220[] = gsSPEndDisplayList(), }; -struct ActorSpawnData d_course_rainbow_road_item_box_spawn[] = { +struct ActorSpawnData d_course_rainbow_road_item_box_spawns[] = { {{ 250, 999, -5279 }, { 0 }}, {{ 256, 999, -5248 }, { 0 }}, {{ 279, 999, -5241 }, { 0 }}, diff --git a/courses/special_cup/yoshi_valley/course_data.inc.c b/courses/special_cup/yoshi_valley/course_data.inc.c index 63cfd16eb..aecac9f79 100644 --- a/courses/special_cup/yoshi_valley/course_data.inc.c +++ b/courses/special_cup/yoshi_valley/course_data.inc.c @@ -10944,7 +10944,7 @@ Vtx d_course_yoshi_valley_tree_model[] = { {{{ 0, -10, 0 }, 0, { 511, 2137 }, {0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_yoshi_valley_dl_15B48[] = +Gfx d_course_yoshi_valley_dl_tree[] = { gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), gsDPSetRenderMode(G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2), @@ -11214,7 +11214,7 @@ u8 d_course_yoshi_valley_egg[] = { #include "assets/courses/yoshi_valley/gTextureYoshiValleyEgg.inc.c" }; -Gfx d_course_yoshi_valley_dl_17FA8[] = +Gfx d_course_yoshi_valley_dl_egg_lod0[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -11271,7 +11271,7 @@ struct ActorSpawnData d_course_yoshi_valley_tree_spawn[] = { {{ -32768, 0, 0 }, { 0 }}, }; -struct ActorSpawnData d_course_yoshi_valley_item_box_spawn[] = { +struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[] = { {{ -157, 183, -1413 }, { 0 }}, {{ -180, 183, -1400 }, { 0 }}, {{ -206, 183, -1392 }, { 0 }}, diff --git a/courses/star_cup/bowsers_castle/course_data.inc.c b/courses/star_cup/bowsers_castle/course_data.inc.c index 854cf131e..66bd08668 100644 --- a/courses/star_cup/bowsers_castle/course_data.inc.c +++ b/courses/star_cup/bowsers_castle/course_data.inc.c @@ -3751,7 +3751,7 @@ struct TrackWayPoint d_course_bowsers_castle_track_waypoints[] = { }; // 82DF40_06738 -u8 d_course_bowsers_castle_thwomp[] = { +u8 d_course_bowsers_castle_thwomp_side[] = { #include "assets/courses/bowsers_castle/gTextureThwompSide.inc.c" }; @@ -3761,7 +3761,7 @@ u8 d_course_bowsers_castle_thwomp_tlut[] = { }; // 0x7138 -u8 d_course_bowsers_castle_thwomp_face[][1024] = { +u8 d_course_bowsers_castle_thwomp_faces[][1024] = { { #include "assets/courses/bowsers_castle/gTextureThwompFace1.inc.c" }, @@ -3903,7 +3903,7 @@ Gfx d_course_bowsers_castle_dl_8F38[] = 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), gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, 0x007C, 0x007C), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_bowsers_castle_thwomp), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, d_course_bowsers_castle_thwomp_side), 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), gsDPLoadSync(), @@ -3941,7 +3941,7 @@ Gfx d_course_bowsers_castle_dl_9078[] = gsSPEndDisplayList(), }; -Gfx d_course_bowsers_castle_dl_9088[] = +Gfx d_course_bowsers_castle_dl_thwomp[] = { gsSPDisplayList(d_course_bowsers_castle_dl_9078), gsSPEndDisplayList(), @@ -3954,7 +3954,7 @@ Vtx d_course_bowsers_castle_unknown_model[] = { }; -Gfx d_course_bowsers_castle_dl_90B8[] = +Gfx d_course_bowsers_castle_dl_bush[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -4055,7 +4055,7 @@ struct ActorSpawnData d_course_bowsers_castle_tree_spawn[] = { {{ -32768, 0, 0 }, {0}}, }; -struct ActorSpawnData d_course_bowsers_castle_item_box_spawn[] = { +struct ActorSpawnData d_course_bowsers_castle_item_box_spawns[] = { {{ 64, 0, -1592 }, {0}}, {{ 78, 0, -1649 }, {0}}, {{ 132, 0, -1669 }, {0}}, diff --git a/courses/star_cup/royal_raceway/course_data.inc.c b/courses/star_cup/royal_raceway/course_data.inc.c index c8bf68327..a4f46f398 100644 --- a/courses/star_cup/royal_raceway/course_data.inc.c +++ b/courses/star_cup/royal_raceway/course_data.inc.c @@ -7347,7 +7347,7 @@ Vtx d_course_royal_raceway_tree_model[] = { {{{ 0, -10, 0 }, 0, { 512, 2076 }, {0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_royal_raceway_dl_D4A0[] = +Gfx d_course_royal_raceway_dl_tree[] = { gsSPClearGeometryMode(G_LIGHTING), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), @@ -7372,7 +7372,7 @@ Vtx d_royal_raceway_peaches_castle_tree_model[] = { {{{ 0, -10, 0 }, 0, { 512, 2085 }, {0xFF, 0xFE, 0xFE, 0xFF }}}, }; -Gfx d_course_royal_raceway_dl_D578[] = +Gfx d_course_royal_raceway_dl_castle_tree[] = { gsSPClearGeometryMode(G_LIGHTING), gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), @@ -7402,7 +7402,7 @@ Vtx d_course_royal_raceway_piranha_plant_model[] = { {{{ 15, 30, 0 }, 0, { 2048, 0 }, {0xFF, 0xFF, 0xFE, 0xFF }}}, }; -Gfx d_course_royal_raceway_dl_D858[] = +Gfx d_course_royal_raceway_dl_piranha_plant[] = { gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), gsDPPipeSync(), @@ -7514,7 +7514,7 @@ struct ActorSpawnData d_course_royal_raceway_tree_spawn[] = { {{ -32768, 0, 0 }, { 0 }}, }; -struct ActorSpawnData d_course_royal_raceway_item_box_spawn[] = { +struct ActorSpawnData d_course_royal_raceway_item_box_spawns[] = { {{ -314, 2, -2006 }, { 0 }}, {{ -290, 3, -2016 }, { 0 }}, {{ -241, 5, -2057 }, { 0 }}, diff --git a/courses/star_cup/sherbet_land/course_data.inc.c b/courses/star_cup/sherbet_land/course_data.inc.c index a8569adc3..27dc16bd9 100644 --- a/courses/star_cup/sherbet_land/course_data.inc.c +++ b/courses/star_cup/sherbet_land/course_data.inc.c @@ -3912,7 +3912,7 @@ Gfx d_course_sherbet_land_dl_7208[] = gsSPEndDisplayList(), }; -Gfx d_course_sherbet_land_dl_7218[] = +Gfx d_course_sherbet_land_dl_ice_block[] = { gsSPDisplayList(d_course_sherbet_land_dl_7208), gsSPEndDisplayList(), @@ -4510,7 +4510,7 @@ Gfx d_course_sherbet_land_dl_9AE8[] = }; // 0x9B80 Spawn locations -struct ActorSpawnData d_course_sherbet_land_spawn_item_box[] = { +struct ActorSpawnData d_course_sherbet_land_item_box_spawns[] = { {{ 168, 0, -1131 }, { 0 }}, {{ 152, 0, -1111 }, { 0 }}, {{ 108, 0, -1080 }, { 0 }}, diff --git a/courses/star_cup/wario_stadium/course_data.inc.c b/courses/star_cup/wario_stadium/course_data.inc.c index fc3b8b8ec..18b1520a0 100644 --- a/courses/star_cup/wario_stadium/course_data.inc.c +++ b/courses/star_cup/wario_stadium/course_data.inc.c @@ -4856,7 +4856,7 @@ Gfx d_course_wario_stadium_dl_CA50[] = gsSPEndDisplayList(), }; -Gfx d_course_wario_stadium_dl_CA60[] = +Gfx d_course_wario_stadium_dl_sign[] = { gsSPDisplayList(d_course_wario_stadium_dl_CA50), gsSPEndDisplayList(), @@ -4897,7 +4897,7 @@ Gfx d_course_wario_stadium_dl_CA78[] = }; // 0xCB40 Spawn locations -struct ActorSpawnData d_course_wario_stadium_spawn_item_box[] = { +struct ActorSpawnData d_course_wario_stadium_item_box_spawns[] = { {{ -1652, 0, -2095 }, { -1 }}, {{ -1653, 0, -2199 }, { -1 }}, {{ -1667, 0, -2173 }, { -1 }}, diff --git a/include/course.h b/include/course.h index ef6c19cbc..5137a17c0 100644 --- a/include/course.h +++ b/include/course.h @@ -2,6 +2,7 @@ #define COURSE_H #include +#include #include /** @@ -10,7 +11,7 @@ // This could be *func(arg) instead. struct CourseAddrUnkStruct { - uintptr_t addr; + Gfx *addr; s32 value; }; diff --git a/rename_sym.sh b/rename_sym.sh index f39cb4562..06aa33053 100755 --- a/rename_sym.sh +++ b/rename_sym.sh @@ -10,4 +10,4 @@ fi #echo "Replace $1 with $2?" #read -grep -rl "$1" asm/**/*.s data/*.s src/*.c src/audio/*.c src/*.h src/os/*.{c,h} undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g" +grep -rl "$1" asm/**/*.s data/*.s src/*.c src/audio/*.c src/*.h src/os/*.{c,h} courses/**/*.{c,h} undefined_syms.txt | xargs sed -i "s/\b$1\b/$2/g" diff --git a/src/actors.c b/src/actors.c index f1ad3a44e..0a25b277c 100644 --- a/src/actors.c +++ b/src/actors.c @@ -433,19 +433,19 @@ void func_80297A50(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { switch (arg2->state) { case 0: - gSPDisplayList(gDisplayListHead++, D_06013C00); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow1); break; case 1: - gSPDisplayList(gDisplayListHead++, D_06013CA0); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow2); break; case 2: - gSPDisplayList(gDisplayListHead++, D_06013D20); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow3); break; case 3: - gSPDisplayList(gDisplayListHead++, D_06013DA0); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow4); break; case 4: - gSPDisplayList(gDisplayListHead++, D_06013E20); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow5); break; } } @@ -725,9 +725,9 @@ void func_80298328(Camera *arg0, Mat4 arg1, struct PiranhaPlant *arg2) { if (gCurrentCourseId == COURSE_MARIO_RACEWAY) { - gSPDisplayList(gDisplayListHead++, &D_06006990); + gSPDisplayList(gDisplayListHead++, &d_course_mario_raceway_dl_piranha_plant); } else { - gSPDisplayList(gDisplayListHead++, &D_0600D850); + gSPDisplayList(gDisplayListHead++, &d_course_royal_raceway_dl_piranha_plant); } } @@ -765,19 +765,19 @@ void func_802986B4(Camera *camera, Mat4 arg1, UNUSED struct Actor *actor) { if ((D_80150112 < 0x80) && (func_802B4FF8(arg1, 0) != 0)) { switch (var_s1->someId) { case 0: - gSPDisplayList(gDisplayListHead++, D_06013C00); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow1); break; case 1: - gSPDisplayList(gDisplayListHead++, D_06013CA0); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow2); break; case 2: - gSPDisplayList(gDisplayListHead++, D_06013D20); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow3); break; case 3: - gSPDisplayList(gDisplayListHead++, D_06013DA0); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow4); break; case 4: - gSPDisplayList(gDisplayListHead++, D_06013E20); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_cow5); break; } } else { @@ -913,16 +913,16 @@ dummylabel: gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); switch (test) { case 0: - gSPDisplayList(gDisplayListHead++, D_06010CC0); + gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree1); break; case 4: - gSPDisplayList(gDisplayListHead++, D_06011DC8); + gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree2); break; case 5: - gSPDisplayList(gDisplayListHead++, D_06012EF0); + gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_tree3); break; case 6: - gSPDisplayList(gDisplayListHead++, D_060138D0); + gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_palm_tree); break; } } else { break; } @@ -950,7 +950,7 @@ void func_80299144(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_06006A68); + gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_tree); } } @@ -973,7 +973,7 @@ void func_8029930C(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_06015B48); + gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_tree); } } @@ -996,7 +996,7 @@ void func_802994D4(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_0600D4A0); + gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_tree); } } @@ -1019,7 +1019,7 @@ void func_8029969C(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_06013F20); + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_dl_tree); } } @@ -1042,7 +1042,11 @@ void func_80299864(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_0600FC70); + // Why is a TLUT being used a DL here? That makes no sense + // Based on the TLUT being loaded above, this ought to be be another + // tree related DL, presumably one found in a course other than Moo Moo farm + // 0x0600FC70 + gSPDisplayList(gDisplayListHead++, d_course_moo_moo_farm_mole_tlut); } } @@ -1065,7 +1069,7 @@ void func_80299A2C(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_0600D578); + gSPDisplayList(gDisplayListHead++, d_course_royal_raceway_dl_castle_tree); } } @@ -1088,7 +1092,7 @@ void func_80299BF4(Camera *camera, Mat4 arg1, struct Actor *arg2) { if (func_802B4FF8(arg1, 0) != 0) { gDPLoadTLUT_pal256(gDisplayListHead++, D_0D004C68); - gSPDisplayList(gDisplayListHead++, D_060090C8); + gSPDisplayList(gDisplayListHead++, d_course_bowsers_castle_dl_bush); } } @@ -1110,7 +1114,7 @@ void func_80299DBC(Camera *camera, Mat4 arg1, struct Actor *arg2) { arg1[3][2] = arg2->pos[2]; if (func_802B4FF8(arg1, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_060075A0); + gSPDisplayList(gDisplayListHead++, d_course_frappe_snowland_dl_tree); } } @@ -1132,7 +1136,7 @@ void func_80299EDC(Camera *camera, Mat4 arg1, struct Actor *arg2) { arg1[3][2] = arg2->pos[2]; if (func_802B4FF8(arg1, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_06008528); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus1); } } @@ -1154,7 +1158,7 @@ void func_80299FFC(Camera *camera, Mat4 arg1, struct Actor *arg2) { arg1[3][2] = arg2->pos[2]; if (func_802B4FF8(arg1, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_06008628); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus2); } } @@ -1176,7 +1180,7 @@ void func_8029A11C(Camera *camera, Mat4 arg1, struct Actor *arg2) { arg1[3][2] = arg2->pos[2]; if (func_802B4FF8(arg1, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_06008728); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_cactus3); } } @@ -1195,7 +1199,7 @@ void func_8029A23C(UNUSED Camera *camera, Mat4 arg1, struct Actor *actor) { gDPLoadTextureBlock(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(addr), G_IM_FMT_CI, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPDisplayList(gDisplayListHead++, D_06013BB8); + gSPDisplayList(gDisplayListHead++, d_course_dks_jungle_parkway_dl_kiwano_fruit); } void func_8029A3AC(Camera *camera, Mat4 matrix, struct ShellActor *shell) { @@ -1908,7 +1912,7 @@ void func_8029CA90(Camera *camera, struct FallingRock *rock) { if (func_802B4FF8(sp4C, 0) == 0) { return; } - gSPDisplayList(gDisplayListHead++, D_06006FE0); + gSPDisplayList(gDisplayListHead++, d_course_choco_mountain_dl_falling_rock); } void place_piranha_plants(struct ActorSpawnData *spawnData) { @@ -2020,7 +2024,7 @@ void update_obj_falling_rocks(struct FallingRock *rock) { return; } if (rock->pos[1] < D_8015F8E4) { - func_8029CF0C(D_06007230, rock); + func_8029CF0C(d_course_choco_mountain_falling_rock_spawns, rock); } rock->rot[0] += (s16) ((rock->velocity[2] * 5461.0f) / 20.0f); rock->rot[2] += (s16) ((rock->velocity[0] * 5461.0f) / 20.0f); @@ -2260,7 +2264,7 @@ void place_course_actors(void) { case COURSE_MARIO_RACEWAY: place_segment_06(D_06009570); place_piranha_plants(D_06009518); - place_all_item_boxes(D_06009498); + place_all_item_boxes(d_course_mario_raceway_item_box_spawns); vec3f_set(position, 150.0f, 40.0f, -1300.0f); position[0] *= gCourseDirection; addActorToEmptySlot(position, rotation, velocity, ACTOR_MARIO_RACEWAY_SIGN); @@ -2270,53 +2274,53 @@ void place_course_actors(void) { actor->flags |= 0x4000; break; case COURSE_CHOCO_MOUNTAIN: - place_all_item_boxes(D_06007250); - place_falling_rocks(D_06007230); + place_all_item_boxes(d_course_choco_mountain_item_box_spawns); + place_falling_rocks(d_course_choco_mountain_falling_rock_spawns); break; case COURSE_BOWSER_CASTLE: place_segment_06(D_06009290); - place_all_item_boxes(D_06009370); + place_all_item_boxes(d_course_bowsers_castle_item_box_spawns); break; case COURSE_BANSHEE_BOARDWALK: - place_all_item_boxes(D_0600B3D0); + place_all_item_boxes(d_course_banshee_boardwalk_item_box_spawns); break; case COURSE_YOSHI_VALLEY: place_segment_06(D_060180A0); - place_all_item_boxes(D_06018110); + place_all_item_boxes(d_course_yoshi_valley_item_box_spawns); vec3f_set(position, -2300.0f, 0.0f, 634.0f); position[0] *= gCourseDirection; addActorToEmptySlot(position, rotation, velocity, ACTOR_YOSHI_VALLEY_EGG); break; case COURSE_FRAPPE_SNOWLAND: place_segment_06(D_06007718); - place_all_item_boxes(D_06007810); + place_all_item_boxes(d_course_frappe_snowland_item_box_spawns); break; case COURSE_KOOPA_BEACH: func_802A14BC(328.0f * gCourseDirection, 70.0f, 2541.0f); - place_all_item_boxes(D_06018E78); + place_all_item_boxes(d_course_koopa_troopa_beach_item_box_spawns); place_palm_trees(D_06018F70); break; case COURSE_ROYAL_RACEWAY: place_segment_06(D_0600DA78); - place_all_item_boxes(D_0600DB80); + place_all_item_boxes(d_course_royal_raceway_item_box_spawns); place_piranha_plants(D_0600D9F0); break; case COURSE_LUIGI_RACEWAY: place_segment_06(D_0600FE80); - place_all_item_boxes(D_0600FDE8); + place_all_item_boxes(d_course_luigi_raceway_item_box_spawns); break; case COURSE_MOO_MOO_FARM: if (gPlayerCountSelection1 != 4) { place_segment_06(D_06014330); } - place_all_item_boxes(D_060143E0); + place_all_item_boxes(d_course_moo_moo_farm_item_box_spawns); break; case COURSE_TOADS_TURNPIKE: - place_all_item_boxes(D_06023AE0); + place_all_item_boxes(d_course_toads_turnpike_item_box_spawns); break; case COURSE_KALAMARI_DESERT: place_segment_06(D_06022F08); - place_all_item_boxes(D_06022E88); + place_all_item_boxes(d_course_kalimari_desert_item_box_spawns); vec3f_set(position, -1680.0f, 2.0f, 35.0f); position[0] *= gCourseDirection; rrxing = (struct RailroadCrossing *)&gActorList[addActorToEmptySlot(position, rotation, velocity, ACTOR_RAILROAD_CROSSING)]; @@ -2336,13 +2340,13 @@ void place_course_actors(void) { rrxing->crossingId = 0; break; case COURSE_SHERBET_LAND: - place_all_item_boxes(D_06009B80); + place_all_item_boxes(d_course_sherbet_land_item_box_spawns); break; case COURSE_RAINBOW_ROAD: - place_all_item_boxes(D_06016338); + place_all_item_boxes(d_course_rainbow_road_item_box_spawns); break; case COURSE_WARIO_STADIUM: - place_all_item_boxes(D_0600CB40); + place_all_item_boxes(d_course_wario_stadium_item_box_spawns); vec3f_set(position, -131.0f, 83.0f, 286.0f); position[0] *= gCourseDirection; addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); @@ -2354,21 +2358,21 @@ void place_course_actors(void) { addActorToEmptySlot(position, rotation, velocity, ACTOR_WARIO_STADIUM_SIGN); break; case COURSE_BLOCK_FORT: - place_all_item_boxes(D_06000038); + place_all_item_boxes(d_course_block_fort_item_box_spawns); break; case COURSE_SKYSCRAPER: - place_all_item_boxes(D_06000080); + place_all_item_boxes(d_course_skyscraper_item_box_spawns); break; case COURSE_DOUBLE_DECK: - place_all_item_boxes(D_06000028); + place_all_item_boxes(d_course_double_deck_item_box_spawns); break; case COURSE_DK_JUNGLE: - place_all_item_boxes(D_06013EC0); + place_all_item_boxes(d_course_dks_jungle_parkway_item_box_spawns); init_kiwano_fruit(); func_80298D10(); break; case COURSE_BIG_DONUT: - place_all_item_boxes(D_06000058); + place_all_item_boxes(d_course_big_donut_item_box_spawns); break; } gNumPermanentActors = gNumActors; @@ -3958,7 +3962,7 @@ void func_802A269C(Camera *arg0, struct Actor *arg1) { func_802B5F74(sp38, arg1->pos, arg1->rot); if (func_802B4FF8(sp38, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_0600CA60); + gSPDisplayList(gDisplayListHead++, d_course_wario_stadium_dl_sign); } } } @@ -3994,8 +3998,8 @@ void func_802A27A0(Camera *arg0, Mat4 arg1, struct YoshiValleyEgg *egg, u16 arg3 func_802B5F74(sp60, egg->pos, sp5C); if (func_802B4FF8(sp60, 0) == 0) { return; } - gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING); - gSPDisplayList(gDisplayListHead++, D_06016D70); + gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING); + gSPDisplayList(gDisplayListHead++, D_06016D70); } else { arg1[3][0] = egg->pos[0]; arg1[3][1] = egg->pos[1]; @@ -4003,7 +4007,7 @@ void func_802A27A0(Camera *arg0, Mat4 arg1, struct YoshiValleyEgg *egg, u16 arg3 if (func_802B4FF8(arg1, 0) != 0) { gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - gSPDisplayList(gDisplayListHead++, D_06017FA8); + gSPDisplayList(gDisplayListHead++, d_course_yoshi_valley_dl_egg_lod0); } } } @@ -4014,15 +4018,16 @@ void func_802A29BC(Camera *arg0, UNUSED Mat4 arg1, struct Actor *arg2) { s16 temp = arg2->flags; if (temp & 0x800) { return; } - unk = func_802B80D0(arg0->pos, arg2->pos, arg0->rot[1], 0, D_80150130[arg0 - camera1], 16000000.0f); - if (!(unk < 0.0f)) { - gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); - gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); - func_802B5F74(sp40, arg2->pos, arg2->rot); - if (func_802B4FF8(sp40, 0) != 0) { - gSPDisplayList(gDisplayListHead++, D_06009330); - } + + unk = func_802B80D0(arg0->pos, arg2->pos, arg0->rot[1], 0, D_80150130[arg0 - camera1], 16000000.0f); + if (!(unk < 0.0f)) { + gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH); + gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); + func_802B5F74(sp40, arg2->pos, arg2->rot); + if (func_802B4FF8(sp40, 0) != 0) { + gSPDisplayList(gDisplayListHead++, d_course_mario_raceway_dl_sign); } + } } void func_802A2AD0(Camera *arg0, struct RailroadCrossing *rr_crossing) { @@ -4040,12 +4045,12 @@ void func_802A2AD0(Camera *arg0, struct RailroadCrossing *rr_crossing) { if (D_801637B8[rr_crossing->crossingId]) { if (rr_crossing->someTimer < 20) { - gSPDisplayList(gDisplayListHead++, D_06010AE8); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_right_active); } else { - gSPDisplayList(gDisplayListHead++, D_06010C10); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_left_active); } } else { - gSPDisplayList(gDisplayListHead++, D_06010D38); + gSPDisplayList(gDisplayListHead++, d_course_kalimari_desert_dl_crossing_both_inactive); } gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); } @@ -4076,23 +4081,23 @@ void func_802A2C78(Camera *arg0, UNUSED Mat4 arg1, struct Actor *arg2) { switch(arg2->unk_04) { case 0: - gSPDisplayList(gDisplayListHead++, &D_060186B8); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk1); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - gSPDisplayList(gDisplayListHead++, &D_060185F8); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top1); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); break; case 1: - gSPDisplayList(gDisplayListHead++, &D_06018A08); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk2); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - gSPDisplayList(gDisplayListHead++, &D_06018948); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top2); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); break; case 2: - gSPDisplayList(gDisplayListHead++, &D_06018D58); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_trunk3); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - gSPDisplayList(gDisplayListHead++, &D_06018C98); + gSPDisplayList(gDisplayListHead++, &d_course_koopa_troopa_beach_dl_tree_top3); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); break; diff --git a/src/actors.h b/src/actors.h index b8e4c135b..b40924865 100644 --- a/src/actors.h +++ b/src/actors.h @@ -160,56 +160,55 @@ extern f32 gCourseDirection; extern uintptr_t gSegmentTable[]; extern s16 gPlaceItemBoxes; -extern struct ActorSpawnData D_06000028[]; -extern struct ActorSpawnData D_06000038[]; -extern struct ActorSpawnData D_06000058[]; -extern struct ActorSpawnData D_06000080[]; -extern struct ActorSpawnData D_06007230[]; -extern struct ActorSpawnData D_06007250[]; +extern struct ActorSpawnData d_course_double_deck_item_box_spawns[]; +extern struct ActorSpawnData d_course_block_fort_item_box_spawns[]; +extern struct ActorSpawnData d_course_big_donut_item_box_spawns[]; +extern struct ActorSpawnData d_course_skyscraper_item_box_spawns[]; +extern struct ActorSpawnData d_course_choco_mountain_falling_rock_spawns[]; +extern struct ActorSpawnData d_course_choco_mountain_item_box_spawns[]; extern struct ActorSpawnData D_06007718[]; -extern struct ActorSpawnData D_06007810[]; +extern struct ActorSpawnData d_course_frappe_snowland_item_box_spawns[]; extern struct ActorSpawnData D_06009290[]; -extern struct ActorSpawnData D_06009370[]; -extern struct ActorSpawnData D_06009498[]; +extern struct ActorSpawnData d_course_bowsers_castle_item_box_spawns[]; +extern struct ActorSpawnData d_course_mario_raceway_item_box_spawns[]; extern struct ActorSpawnData D_06009518[]; extern struct ActorSpawnData D_06009570[]; -extern struct ActorSpawnData D_06009B80[]; -extern struct ActorSpawnData D_0600B3D0[]; -extern struct ActorSpawnData D_0600CB40[]; +extern struct ActorSpawnData d_course_sherbet_land_item_box_spawns[]; +extern struct ActorSpawnData d_course_banshee_boardwalk_item_box_spawns[]; +extern struct ActorSpawnData d_course_wario_stadium_item_box_spawns[]; extern struct ActorSpawnData D_0600D9F0[]; extern struct ActorSpawnData D_0600DA78[]; -extern struct ActorSpawnData D_0600DB80[]; -extern struct ActorSpawnData D_0600FDE8[]; +extern struct ActorSpawnData d_course_royal_raceway_item_box_spawns[]; +extern struct ActorSpawnData d_course_luigi_raceway_item_box_spawns[]; extern struct ActorSpawnData D_0600FE80[]; -extern struct ActorSpawnData D_06013EC0[]; +extern struct ActorSpawnData d_course_dks_jungle_parkway_item_box_spawns[]; extern struct ActorSpawnData D_06014200[]; extern struct ActorSpawnData D_06014330[]; -extern struct ActorSpawnData D_060143E0[]; -extern struct ActorSpawnData D_06016338[]; +extern struct ActorSpawnData d_course_moo_moo_farm_item_box_spawns[]; +extern struct ActorSpawnData d_course_rainbow_road_item_box_spawns[]; extern struct ActorSpawnData D_060180A0[]; -extern struct ActorSpawnData D_06018110[]; -extern struct ActorSpawnData D_06018E78[]; +extern struct ActorSpawnData d_course_yoshi_valley_item_box_spawns[]; +extern struct ActorSpawnData d_course_koopa_troopa_beach_item_box_spawns[]; extern struct ActorSpawnData D_06018F70[]; -extern struct ActorSpawnData D_06022E88[]; +extern struct ActorSpawnData d_course_kalimari_desert_item_box_spawns[]; extern struct ActorSpawnData D_06022F08[]; -extern struct ActorSpawnData D_06023AE0[]; +extern struct ActorSpawnData d_course_toads_turnpike_item_box_spawns[]; extern struct UnkActorSpawnData D_06013F78[]; -extern Gfx D_06006A68[]; +extern Gfx d_course_mario_raceway_dl_tree[]; extern Gfx D_06006F88[]; -extern Gfx D_06006FE0[]; -extern Gfx D_060075A0[]; -extern Gfx D_06008528[]; -extern Gfx D_06008628[]; -extern Gfx D_06008728[]; -extern Gfx D_060090C8[]; -extern Gfx D_0600D4A0[]; -extern Gfx D_0600D578[]; -extern Gfx D_0600FC70[]; -extern Gfx D_06013BB8[]; -extern Gfx D_06013F20[]; -extern Gfx D_06015B48[]; +extern Gfx d_course_choco_mountain_dl_falling_rock[]; +extern Gfx d_course_frappe_snowland_dl_tree[]; +extern Gfx d_course_kalimari_desert_dl_cactus1[]; +extern Gfx d_course_kalimari_desert_dl_cactus2[]; +extern Gfx d_course_kalimari_desert_dl_cactus3[]; +extern Gfx d_course_bowsers_castle_dl_bush[]; +extern Gfx d_course_royal_raceway_dl_tree[]; +extern Gfx d_course_royal_raceway_dl_castle_tree[]; +extern Gfx d_course_dks_jungle_parkway_dl_kiwano_fruit[]; +extern Gfx d_course_moo_moo_farm_dl_tree[]; +extern Gfx d_course_yoshi_valley_dl_tree[]; extern Gfx D_0601B978[]; extern Gfx D_0601C0F0[]; extern Gfx D_0601D160[]; @@ -264,33 +263,34 @@ extern s32 D_801625F0; extern s32 D_801625F4; extern s32 D_80162DF8; -extern Gfx D_06006990[]; -extern Gfx D_06009330[]; -extern Gfx D_0600CA60[]; -extern Gfx D_0600D850[]; +extern Gfx d_course_mario_raceway_dl_piranha_plant[]; +extern Gfx d_course_mario_raceway_dl_sign[]; +extern Gfx d_course_wario_stadium_dl_sign[]; +extern Gfx d_course_royal_raceway_dl_piranha_plant[]; extern Gfx D_0600E058[]; extern Gfx D_0600E730[]; extern Gfx D_0600FC28[]; -extern Gfx D_06010AE8[]; -extern Gfx D_06010C10[]; -extern Gfx D_06010CC0[]; -extern Gfx D_06010D38[]; -extern Gfx D_06011DC8[]; -extern Gfx D_06012EF0[]; -extern Gfx D_060138D0[]; -extern Gfx D_06013C00[]; -extern Gfx D_06013CA0[]; -extern Gfx D_06013D20[]; -extern Gfx D_06013DA0[]; -extern Gfx D_06013E20[]; +extern Gfx d_course_kalimari_desert_dl_crossing_right_active[]; +extern Gfx d_course_kalimari_desert_dl_crossing_left_active[]; +extern Gfx d_course_dks_jungle_parkway_dl_tree1[]; +extern Gfx d_course_kalimari_desert_dl_crossing_both_inactive[]; +extern Gfx d_course_dks_jungle_parkway_dl_tree2[]; +extern Gfx d_course_dks_jungle_parkway_dl_tree3[]; +extern Gfx d_course_dks_jungle_parkway_dl_palm_tree[]; +extern u8 d_course_moo_moo_farm_mole_tlut[]; +extern Gfx d_course_moo_moo_farm_dl_cow1[]; +extern Gfx d_course_moo_moo_farm_dl_cow2[]; +extern Gfx d_course_moo_moo_farm_dl_cow3[]; +extern Gfx d_course_moo_moo_farm_dl_cow4[]; +extern Gfx d_course_moo_moo_farm_dl_cow5[]; extern Gfx D_06016D70[]; -extern Gfx D_06017FA8[]; -extern Gfx D_060185F8[]; -extern Gfx D_060186B8[]; -extern Gfx D_06018948[]; -extern Gfx D_06018A08[]; -extern Gfx D_06018C98[]; -extern Gfx D_06018D58[]; +extern Gfx d_course_yoshi_valley_dl_egg_lod0[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_top1[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk1[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_top2[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk2[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_top3[]; +extern Gfx d_course_koopa_troopa_beach_dl_tree_trunk3[]; extern Gfx D_06023858[]; extern Gfx D_060238A0[]; extern Gfx D_060238E8[]; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index c87e60b61..aa48c5ba3 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -745,7 +745,7 @@ void func_80059560(s32 playerId) { if (D_801657E4 == 2) { temp_v0_2 = &D_8018CA70[playerId]; if ((temp_v0_2->unk_74 != 0) && (D_80165608 != 0)) { - func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitBombKartAndQuestionMark, (s32) gTexturePortraitBombKartAndQuestionMark, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); + func_80047910((s32) temp_v0_2->unk_6C, (s32) temp_v0_2->unk_6E, 0U, 1.0f, (s32) gTLUTPortraitBombKartAndQuestionMark, (s32) gTexturePortraitBombKart, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); } } } diff --git a/src/code_80071F00.c b/src/code_80071F00.c index d60c404be..b8f31fae7 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -4283,7 +4283,7 @@ void func_8007BB9C(s32 arg0) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_06007BA8; +extern ? d_course_banshee_boardwalk_dl_cheep_cheep; void func_8007BBBC(s32 objectIndex) { f32 temp_f0; @@ -4295,7 +4295,7 @@ void func_8007BBBC(s32 objectIndex) { temp_v0 = temp_s1->unk_0A6; switch (temp_v0) { /* irregular */ case 1: - func_800735BC(objectIndex, (s32) &D_06007BA8, 2.0f); + func_800735BC(objectIndex, (s32) &d_course_banshee_boardwalk_dl_cheep_cheep, 2.0f); func_800721C0(objectIndex, 0x00000010); temp_s1->unk_0D5 = 0; return; @@ -4347,7 +4347,7 @@ void func_8007BDA8(void) { func_8008BF18(temp_a0); } -extern Gfx D_06007BA8[]; +extern Gfx d_course_banshee_boardwalk_dl_cheep_cheep[]; // This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s. // The other entries appear to be unused. extern Vec3s D_800E634C[3]; // static? @@ -4366,7 +4366,7 @@ void func_8007BDE0(s32 objectIndex) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 1; temp_v0->unk_054 = 0; - temp_v0->unk_070 = D_06007BA8; + temp_v0->unk_070 = d_course_banshee_boardwalk_dl_cheep_cheep; temp_v0->unk_000 = 0.2f; func_80072488(objectIndex); func_8008B7D4(objectIndex, (f32) D_800E634C[0][0], (f32) ((f64) D_800E634C[0][1] + 55.0), (f32) D_800E634C[0][2]); @@ -5401,14 +5401,14 @@ void func_8007DDC0(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0600A9D8; +extern ? d_course_banshee_boardwalk_dl_trash_bin; void func_8007DF20(s32 objectIndex) { struct_80165C18_entry *sp1C; struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_070 = (s32) &D_0600A9D8; + temp_v0->unk_070 = (s32) &d_course_banshee_boardwalk_dl_trash_bin; temp_v0->unk_04C = 0; temp_v0->unk_084[7] = 0; sp1C = temp_v0; @@ -5814,8 +5814,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E63C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; void func_8007EC30(s32 objectIndex) { struct_80165C18_entry *temp_s1; @@ -5831,8 +5831,8 @@ void func_8007EC30(s32 objectIndex) { func_8008B888(objectIndex, 0U, 0xC000U, 0U); func_8008B8BC(objectIndex, 0U, 0xC000U, 0U); } - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); - temp_s1->unk_070 = (s32) &D_06009088; + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + temp_s1->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s1->unkC8 = 0x000C; temp_s1->unk_000 = 1.0f; temp_s1->unk20 = 30.0f; @@ -5893,15 +5893,15 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ED6C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; void func_8007EE5C(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &D_06009088; + temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s0->unkC8 = 0x000C; temp_s0->unk_000 = 1.0f; func_800721C0(objectIndex, 0x04000220); @@ -6213,15 +6213,15 @@ void func_8007F8D8(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; void func_8007FA08(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &D_06009088; + temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s0->unkC8 = 0x000C; temp_s0->unk_000 = 1.0f; func_800721C0(objectIndex, 0x04000220); @@ -6407,16 +6407,16 @@ void func_8007FFC0(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; void func_80080078(s32 objectIndex) { s16 temp_v0; struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &D_06009088; + temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s0->unkC8 = 0x000C; temp_s0->unk_000 = 1.0f; func_800721C0(objectIndex, 0x04000220); @@ -6494,16 +6494,16 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800801FC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; void func_800802C0(s32 objectIndex) { struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; temp_s0->unk_0D8 = 0; - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); - temp_s0->unk_070 = (s32) &D_06009088; + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s0->unk_0D2 = 0; temp_s0->unkC8 = 0x000C; temp_s0->unk_000 = 1.5f; @@ -6578,17 +6578,17 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080408.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 gTLUTWhomp; -extern s32 D_06007138; -extern ? D_06009088; +extern s32 d_course_bowsers_castle_thwomp_faces; +extern ? d_course_bowsers_castle_dl_thwomp; extern s32 gGamestate; void func_80080524(s32 objectIndex) { s16 temp_v0; struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &D_06007138, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &D_06009088; + temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; temp_s0->unkC8 = 0x000C; temp_s0->unk_0D2 = 0; temp_s0->unk_000 = 1.0f; @@ -7194,13 +7194,13 @@ void func_80081790(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_0600FE70; +extern s32 d_course_moo_moo_farm_mole_frames; void func_80081848(s32 objectIndex) { struct_80165C18_entry *sp2C; struct_80165C18_entry *temp_v0; - func_80073444(objectIndex, (s32 *) D_0600FC70, &D_0600FE70, 0x20U, (u16) 0x00000040); + func_80073444(objectIndex, d_course_moo_moo_farm_mole_tlut, d_course_moo_moo_farm_mole_frames, 0x20U, (u16) 0x00000040); temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D2 = 0; sp2C = temp_v0; @@ -7773,13 +7773,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082870.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTCrab; -extern s32 D_0600D828; +extern s32 d_course_koopa_troopa_beach_crab_tlut; +extern s32 d_course_koopa_troopa_beach_crab_frames; void func_80082A4C(s32 objectIndex) { struct_80165C18_entry *temp_s1; - func_80073444(objectIndex, &gTLUTCrab, &D_0600D828, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, &d_course_koopa_troopa_beach_crab_tlut, &d_course_koopa_troopa_beach_crab_frames, 0x40U, (u16) 0x00000040); temp_s1 = &D_80165C18[objectIndex]; temp_s1->unk_0D2 = 0; temp_s1->unk_000 = 0.15f; @@ -8130,8 +8130,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800834B8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_06006D20; -extern s32 D_06006F20; +extern s32 d_course_frappe_snowland_snow_tlut; +extern s32 d_course_frappe_snowland_snow; void func_80083538(s32 objectIndex, f32 *arg1, s32 arg2, s32 arg3) { f32 var_f6; @@ -8141,10 +8141,10 @@ void func_80083538(s32 objectIndex, f32 *arg1, s32 arg2, s32 arg3) { func_800723A4(objectIndex, 0); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_064 = &D_06006F20; - temp_s0->unk_06C = (s32) &D_06006F20; - temp_s0->unk_060 = &D_06006D20; - temp_s0->unk_068 = &D_06006D20; + temp_s0->unk_064 = &d_course_frappe_snowland_snow; + temp_s0->unk_06C = (s32) &d_course_frappe_snowland_snow; + temp_s0->unk_060 = &d_course_frappe_snowland_snow_tlut; + temp_s0->unk_068 = &d_course_frappe_snowland_snow_tlut; temp_v0 = random_int(0x0064U); var_f6 = (f32) temp_v0; if (temp_v0 < 0) { @@ -8463,7 +8463,7 @@ void func_80083F18(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_060068E8; +extern s32 d_course_sherbet_land_ice; extern u16 D_801657A2; void func_80083FD0(s32 objectIndex, s32 arg1, s16 playerId) { @@ -8480,8 +8480,8 @@ void func_80083FD0(s32 objectIndex, s32 arg1, s16 playerId) { sp20 = &gPlayerOne[playerId]; temp_s0->unk_084[7] = playerId; func_800723A4(objectIndex, 0); - temp_s0->unk_060 = &D_060068E8; - temp_s0->unk_068 = &D_060068E8; + temp_s0->unk_060 = &d_course_sherbet_land_ice; + temp_s0->unk_068 = &d_course_sherbet_land_ice; temp_s0->unk_000 = (f32) (((f64) (f32) random_int(0x01F4U) * 0.0002) + 0.04); temp_v0 = random_int(0x0032U); var_f16 = (f32) temp_v0; @@ -9300,13 +9300,13 @@ void func_80085BB4(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_06005400; -extern s32 D_06008000; +extern s32 d_course_rainbow_road_neon_mushroom_tlut_list; +extern s32 d_course_rainbow_road_neon_mushroom; extern f32 D_8018D01C; void func_80085C20(s32 objectIndex) { func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -1431.0), 827.0f, -2957.0f); - func_80073444(objectIndex, &D_06005400, &D_06008000, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, &d_course_rainbow_road_neon_mushroom_tlut_list, &d_course_rainbow_road_neon_mushroom, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } #else @@ -9357,13 +9357,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085CA0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_06005E00; -extern s32 D_06009000; +extern s32 d_course_rainbow_road_neon_mario_tlut_list; +extern s32 d_course_rainbow_road_neon_mario; extern f32 D_8018D01C; void func_80085DB8(s32 objectIndex) { func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * 799.0), 1193.0f, -5891.0f); - func_80073444(objectIndex, &D_06005E00, &D_06009000, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, &d_course_rainbow_road_neon_mario_tlut_list, &d_course_rainbow_road_neon_mario, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } #else @@ -9405,13 +9405,13 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085E38.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_06006800; -extern s32 D_0600A000; +extern s32 d_course_rainbow_road_neon_boo_tlut_list; +extern s32 d_course_rainbow_road_neon_boo; extern f32 D_8018D01C; void func_80085EF8(s32 objectIndex) { func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -2013.0), 555.0f, 0.0f); - func_80073444(objectIndex, &D_06006800, &D_0600A000, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, &d_course_rainbow_road_neon_boo_tlut_list, &d_course_rainbow_road_neon_boo, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } #else @@ -9462,8 +9462,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085F74.s") #ifdef MIPS_TO_C //generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern ? D_06007200; -extern ? D_0600B000; +extern ? d_course_rainbow_road_static_tluts; +extern ? d_course_rainbow_road_static_textures; extern f32 D_8018D01C; f32 D_800E6734[0][3]; /* unable to generate initializer */ @@ -9472,7 +9472,7 @@ void func_80086074(s32 arg0, s32 arg1) { temp_v0 = D_800E6734[arg1]; func_8008B7D4(arg0, temp_v0->unk0 * D_8018D01C, temp_v0->unk4, temp_v0->unk8); - func_80073444(arg0, (arg1 << 9) + &D_06007200, (arg1 << 0xC) + &D_0600B000, 0x40U, (u16) 0x00000040); + func_80073444(arg0, (arg1 << 9) + &d_course_rainbow_road_static_tluts, (arg1 << 0xC) + &d_course_rainbow_road_static_textures, 0x40U, (u16) 0x00000040); func_80085BB4(arg0); } #else diff --git a/src/hud_renderer.c b/src/hud_renderer.c index b3355cb46..0c2b5040e 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -3444,7 +3444,7 @@ void func_80050C68(void) { gDisplayListHead = temp_v0_8 + 8; temp_v0_8->words.w1 = 0; temp_v0_8->words.w0 = 0xE7000000; - func_800452A4(gTexturePortraitBombKartAndQuestionMark, 0x00000020, 0x00000020); + func_800452A4(gTexturePortraitBombKart, 0x00000020, 0x00000020); func_80042330(sp88 + 0x20, sp84 + 0x12, 0U, 0.6f); temp_v0_9 = gDisplayListHead; gDisplayListHead = temp_v0_9 + 8; @@ -4167,12 +4167,12 @@ void func_8005285C(s32 arg0) { D_80183E80[0] = 0; D_80183E80[1] = 0; D_80183E80[2] = 0; - func_80043500(D_80183E40, D_80183E80, 0.02f, D_06007218); + func_80043500(D_80183E40, D_80183E80, 0.02f, d_course_sherbet_land_dl_ice_block); } #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s8 D_060068E8; +extern s8 d_course_sherbet_land_ice; extern ? D_8016582C; extern s16 D_80183E80; extern s32 D_8018C3F0; @@ -4233,7 +4233,7 @@ void func_800528EC(s32 arg0) { gDisplayListHead = temp_v0_7 + 8; temp_v0_7->words.w0 = 0xB7000000; temp_v0_7->words.w1 = 0x00020204; - func_800441E0(&D_060068E8, 0x00000020, 0x00000020); + func_800441E0(&d_course_sherbet_land_ice, 0x00000020, 0x00000020); var_s3 = &D_8018C3F0; if (gPlayerCountSelection1 < 3) { var_s3_2 = &D_8018C3F0; @@ -4348,7 +4348,7 @@ void func_80052D70(s32 playerId) { D_80183E40[0] = temp_v1->pos[0]; D_80183E40[1] = temp_v1->unk_074 - 6.5; D_80183E40[2] = temp_v1->pos[2]; - func_800435A0(D_80183E40, (u16 *) D_80183E80, 0.02f, D_06007218, 0x000000FF); + func_800435A0(D_80183E40, (u16 *) D_80183E80, 0.02f, d_course_sherbet_land_dl_ice_block, 0x000000FF); } } @@ -4392,8 +4392,8 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052E30.s") #ifdef MIPS_TO_C //generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -extern ? D_06006D20; -extern ? D_06006F20; +extern ? d_course_frappe_snowland_snow_tlut; +extern ? d_course_frappe_snowland_snow; extern ? D_8018C5F0; void func_80052F20(s32 arg0) { @@ -4405,7 +4405,7 @@ void func_80052F20(s32 arg0) { struct_80165C18_entry *temp_s1; sp44 = &camera1[arg0]; - func_80046E60((s32) &D_06006D20, (s32) &D_06006F20, 0x00000020, 0x00000020); + func_80046E60((s32) &d_course_frappe_snowland_snow_tlut, (s32) &d_course_frappe_snowland_snow, 0x00000020, 0x00000020); var_s2 = D_8018C3F0; do { temp_s0 = *var_s2; @@ -4588,7 +4588,7 @@ void func_800536C8(s32 objectIndex) { //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b ? func_800534A4(s32); /* extern */ ? func_800536C8(s32); /* extern */ -extern s8 D_06006738; +extern s8 d_course_bowsers_castle_thwomp_side; extern s16 D_80165750; extern s16 D_80183E80; extern s32 D_8018C3F0; @@ -4693,7 +4693,7 @@ void func_80053870(s32 cameraId) { gDisplayListHead = temp_v0_9 + 8; temp_v0_9->words.w0 = 0xB7000000; temp_v0_9->words.w1 = 0x00020204; - func_80043D50(&D_06006738, 0x00000020, 0x00000020); + func_80043D50(&d_course_bowsers_castle_thwomp_side, 0x00000020, 0x00000020); var_a3 = &D_8018C630; do { temp_s1_3 = *var_a3; @@ -5452,7 +5452,7 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005592C.s") #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b ? func_80004DFC(s32, s32, ?, s8); /* extern */ -extern ? D_06012028; +extern ? d_course_rainbow_road_sphere; extern ? D_0D0062B0; extern ? D_0D0077D0; extern f32 D_80183E40; @@ -5481,7 +5481,7 @@ void func_80055AB8(s32 objectIndex, s32 cameraId) { D_80183E40.unk8 = temp_f14; D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, temp_a2->pos); D_80183E80.unk4 = 0x8000; - func_800468E0(&D_80183E40, &D_80183E80, 0.54f, (s32) &D_06012028, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); + func_800468E0(&D_80183E40, &D_80183E80, 0.54f, (s32) &d_course_rainbow_road_sphere, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); return; } sp34 = temp_v1; diff --git a/src/hud_renderer.h b/src/hud_renderer.h index 3d5412ef9..0f43233f4 100644 --- a/src/hud_renderer.h +++ b/src/hud_renderer.h @@ -446,7 +446,7 @@ extern Gfx *gDisplayListHead; // Stuff from undefined_syms.txt, don't know where else to put them extern u8 D_06013670[]; -extern Gfx D_06007218[]; +extern Gfx d_course_sherbet_land_dl_ice_block[]; extern Gfx D_0600F650[]; extern Gfx D_0600F960[]; extern Gfx D_0600FA20[]; diff --git a/src/render_courses.c b/src/render_courses.c index 12ff93682..1974fc75d 100644 --- a/src/render_courses.c +++ b/src/render_courses.c @@ -279,7 +279,7 @@ void func_8029122C(struct UnkStruct_800DC5EC *arg0, s32 arg1) { gDPNoOp(gDisplayListHead++); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); - load_surface_map((uintptr_t) D_06019578, arg0); + load_surface_map(d_course_koopa_troopa_beach_dl_list2, arg0); gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 1, 1, G_OFF); gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetAlphaCompare(gDisplayListHead++, G_AC_NONE); @@ -732,7 +732,7 @@ void render_koopa_troopa_beach(struct UnkStruct_800DC5EC *arg0) { gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gSPDisplayList(gDisplayListHead++, d_course_koopa_troopa_beach_packed_dl_9688); - load_surface_map((uintptr_t) koopa_troopa_beach_dls, arg0); + load_surface_map((uintptr_t) d_course_koopa_troopa_beach_dl_list1, arg0); gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK); gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_TEX_EDGE, G_RM_AA_ZB_TEX_EDGE2); diff --git a/src/render_courses.h b/src/render_courses.h index 7baaf7eb4..eecf0018e 100644 --- a/src/render_courses.h +++ b/src/render_courses.h @@ -74,7 +74,7 @@ extern Gfx banshee_boardwalk_dls[]; extern Gfx D_0600B278[]; extern Gfx yoshi_valley_dls[]; extern u8 frappe_snowland_dls[]; -extern Gfx koopa_troopa_beach_dls[]; +extern Gfx d_course_koopa_troopa_beach_dl_list1[]; extern Gfx royal_raceway_dls[]; extern Gfx luigi_raceway_dls[]; extern s32 D_801625EC; @@ -95,7 +95,7 @@ extern Gfx wario_stadium_dls[]; extern Gfx D_06009228[]; extern Gfx D_060164B8[]; -extern Gfx D_06019578[]; +extern Gfx d_course_koopa_troopa_beach_dl_list2[]; extern Gfx D_090001D0[]; extern Gfx dks_jungle_parkway_dls[]; diff --git a/undefined_syms.txt b/undefined_syms.txt index 1e9a0c70a..a8c42ae80 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -72,16 +72,12 @@ D_03007800 = 0x03007800; D_03008000 = 0x03008000; D_03008800 = 0x03008800; -gVS3pItemCurve = 0x0D008858; -gVS4pItemCurve = 0x0D008984; -gGPCpuItemCurve = 0x0D008470; - D_05FF8DB8 = 0x05FF8DB8; -D_06000028 = 0x06000028; -D_06000038 = 0x06000038; -D_06000058 = 0x06000058; -D_06000080 = 0x06000080; +d_course_double_deck_item_box_spawns = 0x06000028; +d_course_block_fort_item_box_spawns = 0x06000038; +d_course_big_donut_item_box_spawns = 0x06000058; +d_course_skyscraper_item_box_spawns = 0x06000080; D_06000224 = 0x06000224; D_060019D0 = 0x060019D0; D_06001CF8 = 0x06001CF8; @@ -98,104 +94,105 @@ gTextureSnowmanHead = 0x06004D20; D_06004DE8 = 0x06004DE8; D_06004F90 = 0x06004F90; D_060051D0 = 0x060051D0; -D_06005400 = 0x06005400; +d_course_rainbow_road_neon_mushroom_tlut_list = 0x06005400; D_06005568 = 0x06005568; D_060056A0 = 0x060056A0; D_060057B0 = 0x060057B0; D_06005908 = 0x06005908; gTLUTBoo = 0x06005C80; gTextureSnowmanBody = 0x06005D20; -D_06005E00 = 0x06005E00; -D_06006738 = 0x06006738; -D_06006800 = 0x06006800; -D_060068E8 = 0x060068E8; -D_06006990 = 0x06006990; -D_06006A68 = 0x06006A68; +d_course_rainbow_road_neon_mario_tlut_list = 0x06005E00; +d_course_bowsers_castle_thwomp_side = 0x06006738; +d_course_rainbow_road_neon_boo_tlut_list = 0x06006800; +d_course_sherbet_land_ice = 0x060068E8; +d_course_mario_raceway_dl_piranha_plant = 0x06006990; +d_course_mario_raceway_dl_tree = 0x06006A68; D_06006AC8 = 0x06006AC8; D_06006C60 = 0x06006C60; -D_06006D20 = 0x06006D20; +d_course_frappe_snowland_snow_tlut = 0x06006D20; D_06006EC0 = 0x06006EC0; -D_06006F20 = 0x06006F20; +d_course_frappe_snowland_snow = 0x06006F20; gTLUTWhomp = 0x06006F38; D_06006F88 = 0x06006F88; -D_06006FE0 = 0x06006FE0; -D_06007138 = 0x06007138; +d_course_choco_mountain_dl_falling_rock = 0x06006FE0; +d_course_bowsers_castle_thwomp_faces = 0x06007138; D_060071B0 = 0x060071B0; D_060071F0 = 0x060071F0; -D_06007200 = 0x06007200; -D_06007218 = 0x06007218; -D_06007230 = 0x06007230; -D_06007250 = 0x06007250; +d_course_rainbow_road_static_tluts = 0x06007200; +d_course_sherbet_land_dl_70E8 = 0x060070E8; +d_course_sherbet_land_dl_ice_block = 0x06007218; +d_course_choco_mountain_falling_rock_spawns = 0x06007230; +d_course_choco_mountain_item_box_spawns = 0x06007250; D_060072D0 = 0x060072D0; D_06007520 = 0x06007520; -D_060075A0 = 0x060075A0; +d_course_frappe_snowland_dl_tree = 0x060075A0; D_06007620 = 0x06007620; D_06007650 = 0x06007650; D_060076A0 = 0x060076A0; D_06007718 = 0x06007718; -D_06007810 = 0x06007810; +d_course_frappe_snowland_item_box_spawns = 0x06007810; frappe_snowland_dls = 0x06007890; D_060078C0 = 0x060078C0; D_06007978 = 0x06007978; D_060079A0 = 0x060079A0; D_06007B38 = 0x06007B38; -D_06007BA8 = 0x06007BA8; +d_course_banshee_boardwalk_dl_cheep_cheep = 0x06007BA8; gTLUTBat = 0x06007BB8; D_06007DB8 = 0x06007DB8; -D_06008000 = 0x06008000; -D_06008528 = 0x06008528; -D_06008628 = 0x06008628; -D_06008728 = 0x06008728; +d_course_rainbow_road_neon_mushroom = 0x06008000; +d_course_kalimari_desert_dl_cactus1 = 0x06008528; +d_course_kalimari_desert_dl_cactus2 = 0x06008628; +d_course_kalimari_desert_dl_cactus3 = 0x06008728; D_06008EB0 = 0x06008EB0; -D_06009000 = 0x06009000; -D_06009088 = 0x06009088; -D_060090C8 = 0x060090C8; +d_course_rainbow_road_neon_mario = 0x06009000; +d_course_bowsers_castle_dl_thwomp = 0x06009088; +d_course_bowsers_castle_dl_bush = 0x060090C8; D_06009148 = 0x06009148; D_06009228 = 0x06009228; D_06009290 = 0x06009290; -D_06009330 = 0x06009330; +d_course_mario_raceway_dl_sign = 0x06009330; D_06009348 = 0x06009348; -D_06009370 = 0x06009370; +d_course_bowsers_castle_item_box_spawns = 0x06009370; D_060093D8 = 0x060093D8; D_060093F8 = 0x060093F8; D_06009410 = 0x06009410; -D_06009498 = 0x06009498; +d_course_mario_raceway_item_box_spawns = 0x06009498; D_06009518 = 0x06009518; D_06009570 = 0x06009570; D_06009650 = 0x06009650; D_06009AC8 = 0x06009AC8; D_06009AE8 = 0x06009AE8; -D_06009B80 = 0x06009B80; +d_course_sherbet_land_item_box_spawns = 0x06009B80; D_06009C20 = 0x06009C20; -D_0600A000 = 0x0600A000; +d_course_rainbow_road_neon_boo = 0x0600A000; D_0600A540 = 0x0600A540; D_0600A6D0 = 0x0600A6D0; -D_0600A9D8 = 0x0600A9D8; +d_course_banshee_boardwalk_dl_trash_bin = 0x0600A9D8; D_0600ADE0 = 0x0600ADE0; -D_0600B000 = 0x0600B000; +d_course_rainbow_road_static_textures = 0x0600B000; D_0600B1A8 = 0x0600B1A8; D_0600B278 = 0x0600B278; D_0600B308 = 0x0600B308; -D_0600B3D0 = 0x0600B3D0; +d_course_banshee_boardwalk_item_box_spawns = 0x0600B3D0; D_0600B458 = 0x0600B458; D_0600B5B8 = 0x0600B5B8; D_0600B828 = 0x0600B828; D_0600C4B0 = 0x0600C4B0; -D_0600CA60 = 0x0600CA60; +d_course_wario_stadium_dl_sign = 0x0600CA60; D_0600CA78 = 0x0600CA78; -D_0600CB40 = 0x0600CB40; +d_course_wario_stadium_item_box_spawns = 0x0600CB40; D_0600CC38 = 0x0600CC38; -D_0600D4A0 = 0x0600D4A0; -D_0600D578 = 0x0600D578; -gTLUTCrab = 0x0600D628; +d_course_royal_raceway_dl_tree = 0x0600D4A0; +d_course_royal_raceway_dl_castle_tree = 0x0600D578; +d_course_koopa_troopa_beach_crab_tlut = 0x0600D628; D_0600D780 = 0x0600D780; -D_0600D828 = 0x0600D828; -D_0600D850 = 0x0600D850; +d_course_koopa_troopa_beach_crab_frames = 0x0600D828; +d_course_royal_raceway_dl_piranha_plant = 0x0600D850; D_0600D8E8 = 0x0600D8E8; D_0600D9C8 = 0x0600D9C8; D_0600D9F0 = 0x0600D9F0; D_0600DA78 = 0x0600DA78; -D_0600DB80 = 0x0600DB80; +d_course_royal_raceway_item_box_spawns = 0x0600DB80; D_0600DC18 = 0x0600DC18; D_0600DC28 = 0x0600DC28; D_0600DEA8 = 0x0600DEA8; @@ -210,33 +207,33 @@ D_0600F960 = 0x0600F960; D_0600FA20 = 0x0600FA20; D_0600FBE0 = 0x0600FBE0; D_0600FC28 = 0x0600FC28; -D_0600FC70 = 0x0600FC70; +d_course_moo_moo_farm_mole_tlut = 0x0600FC70; D_0600FD40 = 0x0600FD40; -D_0600FDE8 = 0x0600FDE8; -D_0600FE70 = 0x0600FE70; +d_course_luigi_raceway_item_box_spawns = 0x0600FDE8; +d_course_moo_moo_farm_mole_frames = 0x0600FE70; D_0600FE80 = 0x0600FE80; D_0600FF28 = 0x0600FF28; -D_06010AE8 = 0x06010AE8; +d_course_kalimari_desert_dl_crossing_right_active = 0x06010AE8; D_06010B58 = 0x06010B58; -D_06010C10 = 0x06010C10; -D_06010CC0 = 0x06010CC0; -D_06010D38 = 0x06010D38; -D_06011DC8 = 0x06011DC8; -D_06012028 = 0x06012028; +d_course_kalimari_desert_dl_crossing_left_active = 0x06010C10; +d_course_dks_jungle_parkway_dl_tree1 = 0x06010CC0; +d_course_kalimari_desert_dl_crossing_both_inactive = 0x06010D38; +d_course_dks_jungle_parkway_dl_tree2 = 0x06011DC8; +d_course_rainbow_road_sphere = 0x06012028; D_06012090 = 0x06012090; -D_06012EF0 = 0x06012EF0; +d_course_dks_jungle_parkway_dl_tree3 = 0x06012EF0; D_06013670 = 0x06013670; -D_060138D0 = 0x060138D0; -D_06013BB8 = 0x06013BB8; -D_06013C00 = 0x06013C00; +d_course_dks_jungle_parkway_dl_palm_tree = 0x060138D0; +d_course_dks_jungle_parkway_dl_kiwano_fruit = 0x06013BB8; +d_course_moo_moo_farm_dl_cow1 = 0x06013C00; D_06013C30 = 0x06013C30; -D_06013CA0 = 0x06013CA0; -D_06013D20 = 0x06013D20; +d_course_moo_moo_farm_dl_cow2 = 0x06013CA0; +d_course_moo_moo_farm_dl_cow3 = 0x06013D20; dks_jungle_parkway_dls = 0x06013D20; -D_06013DA0 = 0x06013DA0; -D_06013E20 = 0x06013E20; -D_06013EC0 = 0x06013EC0; -D_06013F20 = 0x06013F20; +d_course_moo_moo_farm_dl_cow4 = 0x06013DA0; +d_course_moo_moo_farm_dl_cow5 = 0x06013E20; +d_course_dks_jungle_parkway_item_box_spawns = 0x06013EC0; +d_course_moo_moo_farm_dl_tree = 0x06013F20; D_06013F78 = 0x06013F78; D_06013FF8 = 0x06013FF8; D_06014060 = 0x06014060; @@ -244,41 +241,41 @@ D_06014088 = 0x06014088; D_06014200 = 0x06014200; D_06014330 = 0x06014330; D_06014338 = 0x06014338; -D_060143E0 = 0x060143E0; +d_course_moo_moo_farm_item_box_spawns = 0x060143E0; D_060144B8 = 0x060144B8; D_06014794 = 0x06014794; D_06014798 = 0x06014798; gTLUTHedgehog = 0x06014908; gTextureHedgehog = 0x06014B08; -D_06015B48 = 0x06015B48; +d_course_yoshi_valley_dl_tree = 0x06015B48; D_0601610C = 0x0601610C; D_06016110 = 0x06016110; D_06016220 = 0x06016220; -D_06016338 = 0x06016338; +d_course_rainbow_road_item_box_spawns = 0x06016338; D_06016440 = 0x06016440; D_060164B8 = 0x060164B8; D_06016558 = 0x06016558; D_060169B0 = 0x060169B0; D_06016B60 = 0x06016B60; D_06016D70 = 0x06016D70; -D_06017FA8 = 0x06017FA8; +d_course_yoshi_valley_dl_egg_lod0 = 0x06017FA8; D_06018020 = 0x06018020; D_060180A0 = 0x060180A0; -D_06018110 = 0x06018110; +d_course_yoshi_valley_item_box_spawns = 0x06018110; D_06018240 = 0x06018240; yoshi_valley_dls = 0x060183F0; -D_060185F8 = 0x060185F8; -D_060186B8 = 0x060186B8; -D_06018948 = 0x06018948; -D_06018A08 = 0x06018A08; -D_06018C98 = 0x06018C98; -D_06018D58 = 0x06018D58; +d_course_koopa_troopa_beach_dl_tree_top1 = 0x060185F8; +d_course_koopa_troopa_beach_dl_tree_trunk1 = 0x060186B8; +d_course_koopa_troopa_beach_dl_tree_top2 = 0x06018948; +d_course_koopa_troopa_beach_dl_tree_trunk2 = 0x06018A08; +d_course_koopa_troopa_beach_dl_tree_top3 = 0x06018C98; +d_course_koopa_troopa_beach_dl_tree_trunk3 = 0x06018D58; D_06018D68 = 0x06018D68; -D_06018E78 = 0x06018E78; +d_course_koopa_troopa_beach_item_box_spawns = 0x06018E78; D_06018F70 = 0x06018F70; D_06018FD8 = 0x06018FD8; -koopa_troopa_beach_dls = 0x06019328; -D_06019578 = 0x06019578; +d_course_koopa_troopa_beach_dl_list1 = 0x06019328; +d_course_koopa_troopa_beach_dl_list2 = 0x06019578; D_0601B978 = 0x0601B978; D_0601C0F0 = 0x0601C0F0; D_0601D160 = 0x0601D160; @@ -298,7 +295,7 @@ D_06022D28 = 0x06022D28; D_06022D70 = 0x06022D70; D_06022DB8 = 0x06022DB8; D_06022E00 = 0x06022E00; -D_06022E88 = 0x06022E88; +d_course_kalimari_desert_item_box_spawns = 0x06022E88; D_06022F08 = 0x06022F08; D_06023070 = 0x06023070; D_06023858 = 0x06023858; @@ -306,7 +303,7 @@ D_060238A0 = 0x060238A0; D_060238E8 = 0x060238E8; D_06023930 = 0x06023930; toads_turnpike_dls = 0x060239A0; -D_06023AE0 = 0x06023AE0; +d_course_toads_turnpike_item_box_spawns = 0x06023AE0; D_06023B68 = 0x06023B68; wario_stadium_dls = 0x09000150; D_090001D0 = 0x090001D0; @@ -431,12 +428,14 @@ D_0D008080 = 0x0D008080; D_0D008108 = 0x0D008108; D_0D008120 = 0x0D008120; D_0D008138 = 0x0D008138; + gGrandPrixHumanItemCurve = 0x0D008150; gGrandPrixCPUItemCurve = 0x0D008470; gVersus2PlayerItemCurve = 0x0D008790; gVersus3PlayerItemCurve = 0x0D008858; gVersus4PlayerItemCurve = 0x0D008984; gBattleItemCurve = 0x0D008B14; + D_0D008B78 = 0x0D008B78; D_0D008C78 = 0x0D008C78; D_0D008C90 = 0x0D008C90; @@ -488,63 +487,69 @@ gTextureHudTypeCRankFont = 0x0D019658; gTLUTHudTypeCRankTinyFont = 0x0D019E58; gTextureHudTypeCRankTinyFont = 0x0D01A058; gTextureCharacterPortraitBorder = 0x0D01A2D8; -gTLUTPortraitMario = 0x0D01A4D8; -gTLUTPortraitLuigi = 0x0D01A6D8; -gTLUTPortraitPeach = 0x0D01A8D8; -gTLUTPortraitToad = 0x0D01AAD8; -gTLUTPortraitYoshi = 0x0D01ACD8; -gTLUTPortraitDonkeyKong = 0x0D01AED8; -gTLUTPortraitWario = 0x0D01B0D8; -gTLUTPortraitBowser = 0x0D01B2D8; + +gTLUTPortraitMario = 0x0D01A4D8; +gTLUTPortraitLuigi = 0x0D01A6D8; +gTLUTPortraitPeach = 0x0D01A8D8; +gTLUTPortraitToad = 0x0D01AAD8; +gTLUTPortraitYoshi = 0x0D01ACD8; +gTLUTPortraitDonkeyKong = 0x0D01AED8; +gTLUTPortraitWario = 0x0D01B0D8; +gTLUTPortraitBowser = 0x0D01B2D8; gTLUTPortraitBombKartAndQuestionMark = 0x0D01B4D8; -gTexturePortraitMario = 0x0D01B6D8; -gTexturePortraitLuigi = 0x0D01BAD8; -gTexturePortraitPeach = 0x0D01BED8; -gTexturePortraitToad = 0x0D01C2D8; -gTexturePortraitYoshi = 0x0D01C6D8; -gTexturePortraitDonkeyKong = 0x0D01CAD8; -gTexturePortraitWario = 0x0D01CED8; -gTexturePortraitBowser = 0x0D01D2D8; -gTexturePortraitBombKartAndQuestionMark = 0x0D01D6D8; + +gTexturePortraitMario = 0x0D01B6D8; +gTexturePortraitLuigi = 0x0D01BAD8; +gTexturePortraitPeach = 0x0D01BED8; +gTexturePortraitToad = 0x0D01C2D8; +gTexturePortraitYoshi = 0x0D01C6D8; +gTexturePortraitDonkeyKong = 0x0D01CAD8; +gTexturePortraitWario = 0x0D01CED8; +gTexturePortraitBowser = 0x0D01D2D8; +gTexturePortraitBombKart = 0x0D01D6D8; gTexturePortraitQuestionMark = 0x0D01DAD8; -gTLUTItemWindowNone = 0x0D01DED8; -gTLUTItemWindowBanana = 0x0D01E0D8; -gTLUTItemWindowBananaBunch = 0x0D01E2D8; -gTLUTItemWindowMushroom = 0x0D01E4D8; -gTLUTItemWindowDoubleMushroom = 0x0D01E6D8; -gTLUTItemWindowTripleMushroom = 0x0D01E8D8; -gTLUTItemWindowSuperMushroom = 0x0D01EAD8; -gTLUTItemWindowBlueShell = 0x0D01ECD8; -gTLUTItemWindowBoo = 0x0D01EED8; -gTLUTItemWindowGreenShell = 0x0D01F0D8; + +gTLUTItemWindowNone = 0x0D01DED8; +gTLUTItemWindowBanana = 0x0D01E0D8; +gTLUTItemWindowBananaBunch = 0x0D01E2D8; +gTLUTItemWindowMushroom = 0x0D01E4D8; +gTLUTItemWindowDoubleMushroom = 0x0D01E6D8; +gTLUTItemWindowTripleMushroom = 0x0D01E8D8; +gTLUTItemWindowSuperMushroom = 0x0D01EAD8; +gTLUTItemWindowBlueShell = 0x0D01ECD8; +gTLUTItemWindowBoo = 0x0D01EED8; +gTLUTItemWindowGreenShell = 0x0D01F0D8; gTLUTItemWindowTripleGreenShell = 0x0D01F2D8; -gTLUTItemWindowRedShell = 0x0D01F4D8; -gTLUTItemWindowTripleRedShell = 0x0D01F6D8; -gTLUTItemWindowStar = 0x0D01F8D8; -gTLUTItemWindowThunderBolt = 0x0D01FAD8; -gTLUTItemWindowFakeItemBox = 0x0D01FCD8; -gTextureItemWindowNone = 0x0D01FED8; -gTextureItemWindowBanana = 0x0D0203D8; -gTextureItemWindowBananaBunch = 0x0D0208D8; -gTextureItemWindowMushroom = 0x0D020DD8; -gTextureItemWindowDoubleMushroom = 0x0D0212D8; -gTextureItemWindowTripleMushroom = 0x0D0217D8; -gTextureItemWindowSuperMushroom = 0x0D021CD8; -gTextureItemWindowBlueShell = 0x0D0221D8; -gTextureItemWindowBoo = 0x0D0226D8; -gTextureItemWindowGreenShell = 0x0D022BD8; +gTLUTItemWindowRedShell = 0x0D01F4D8; +gTLUTItemWindowTripleRedShell = 0x0D01F6D8; +gTLUTItemWindowStar = 0x0D01F8D8; +gTLUTItemWindowThunderBolt = 0x0D01FAD8; +gTLUTItemWindowFakeItemBox = 0x0D01FCD8; + +gTextureItemWindowNone = 0x0D01FED8; +gTextureItemWindowBanana = 0x0D0203D8; +gTextureItemWindowBananaBunch = 0x0D0208D8; +gTextureItemWindowMushroom = 0x0D020DD8; +gTextureItemWindowDoubleMushroom = 0x0D0212D8; +gTextureItemWindowTripleMushroom = 0x0D0217D8; +gTextureItemWindowSuperMushroom = 0x0D021CD8; +gTextureItemWindowBlueShell = 0x0D0221D8; +gTextureItemWindowBoo = 0x0D0226D8; +gTextureItemWindowGreenShell = 0x0D022BD8; gTextureItemWindowTripleGreenShell = 0x0D0230D8; -gTextureItemWindowRedShell = 0x0D0235D8; -gTextureItemWindowTripleRedShell = 0x0D023AD8; -gTextureItemWindowStar = 0x0D023FD8; -gTextureItemWindowThunderBolt = 0x0D0244D8; -gTextureItemWindowFakeItemBox = 0x0D0249D8; -gTLUTLakituCountdown = 0x0D024ED8; +gTextureItemWindowRedShell = 0x0D0235D8; +gTextureItemWindowTripleRedShell = 0x0D023AD8; +gTextureItemWindowStar = 0x0D023FD8; +gTextureItemWindowThunderBolt = 0x0D0244D8; +gTextureItemWindowFakeItemBox = 0x0D0249D8; + +gTLUTLakituCountdown = 0x0D024ED8; gTLUTLakituCheckeredFlag = 0x0D0254D8; -gTLUTLakituSecondLap = 0x0D0256D8; -gTLUTLakituFinalLap = 0x0D0258D8; -gTLUTLakituReverse = 0x0D025AD8; -gTLUTLakituFishing = 0x0D025CD8; +gTLUTLakituSecondLap = 0x0D0256D8; +gTLUTLakituFinalLap = 0x0D0258D8; +gTLUTLakituReverse = 0x0D025AD8; +gTLUTLakituFishing = 0x0D025CD8; + D_0D028DD8 = 0x0D028DD8; D_0D0291D8 = 0x0D0291D8; D_0D0293D8 = 0x0D0293D8;