izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

I can't stop I can't stop I can't stop I can't stop (#389)

Browse Source 
* yo I finally went and figured out what the majority of unk6 is lmao

* rename entry

* man honestly game.c is a mess they really did just throw every old thing here

* Name some initialiser funcs

* more

* destroyed another temp struct

* potassium

* tweak

* pain

* it never ends

* a new pain arises

* Update README.md

* quick fixes

* add colour macro
This commit is contained in:
Fazana
2023-05-01 14:32:25 +01:00
committed by GitHub
parent 3f37109e59
commit 444afbb470
39 changed files with 1288 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+4 -4
View File
@@ -144,14 +144,14 @@ As of April 28, 2023, this is our current score:
We are racing the octopus boss Bubbler. (Lap 1/3)
=================================================
ADVENTURE TWO (Cleanup & Documentation)
---------------- 25.19% Complete ----------------
# Documented functions: 516
# Undocumented remaining: 1048
---------------- 25.60% Complete ----------------
# Documented functions: 541
# Undocumented remaining: 1023
------------------ Game Status ------------------
Balloons: 12/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
-------------------------------------------------
We are racing Taj in the Car Challenge. (Lap 2/3)
We are racing Taj in the Car Challenge. (Lap 3/3)
=================================================
```
<!-- README_SCORE_END -->
asm/non_matchings/game/func_8006DCF8.s
+405 -405
View File
File diff suppressed because it is too large Load Diff
asm/non_matchings/game_ui/func_8009ECF0.s
+2 -2
View File
@@ -195,8 +195,8 @@ glabel func_8009ECF0
/* 09FBDC 8009EFDC 0C001298 */ jal set_sound_channel_volume
/* 09FBE0 8009EFE0 24057FFF */ li $a1, 32767
/* 09FBE4 8009EFE4 3C10800E */ lui $s0, %hi(D_800E2770) # $s0, 0x800e
/* 09FBE8 8009EFE8 3C11800E */ lui $s1, %hi(D_800E2790) # $s1, 0x800e
/* 09FBEC 8009EFEC 26312790 */ addiu $s1, %lo(D_800E2790) # addiu $s1, $s1, 0x2790
/* 09FBE8 8009EFE8 3C11800E */ lui $s1, %hi(gShowCourseDirections) # $s1, 0x800e
/* 09FBEC 8009EFEC 26312790 */ addiu $s1, %lo(gShowCourseDirections) # addiu $s1, $s1, 0x2790
/* 09FBF0 8009EFF0 26102770 */ addiu $s0, %lo(D_800E2770) # addiu $s0, $s0, 0x2770
.L8009EFF4:
/* 09FBF4 8009EFF4 8E040004 */ lw $a0, 4($s0)
asm/non_matchings/game_ui/func_800A0BD4.s
+2 -2
View File
@@ -25,8 +25,8 @@ glabel func_800A0BD4
/* 0A1830 800A0C30 00000000 */ nop
.L800A0C34:
/* 0A1834 800A0C34 3C10800E */ lui $s0, %hi(D_800E2770) # $s0, 0x800e
/* 0A1838 800A0C38 3C13800E */ lui $s3, %hi(D_800E2790) # $s3, 0x800e
/* 0A183C 800A0C3C 26732790 */ addiu $s3, %lo(D_800E2790) # addiu $s3, $s3, 0x2790
/* 0A1838 800A0C38 3C13800E */ lui $s3, %hi(gShowCourseDirections) # $s3, 0x800e
/* 0A183C 800A0C3C 26732790 */ addiu $s3, %lo(gShowCourseDirections) # addiu $s3, $s3, 0x2790
/* 0A1840 800A0C40 26102770 */ addiu $s0, %lo(D_800E2770) # addiu $s0, $s0, 0x2770
/* 0A1844 800A0C44 2414007F */ li $s4, 127
/* 0A1848 800A0C48 2412007F */ li $s2, 127
asm/non_matchings/object_models/func_8005F99C.s
+2 -2
View File
@@ -63,8 +63,8 @@ glabel func_8005F99C
/* 060678 8005FA78 AFA40050 */ sw $a0, 0x50($sp)
/* 06067C 8005FA7C ACD80000 */ sw $t8, ($a2)
.L8005FA80:
/* 060680 8005FA80 3C198012 */ lui $t9, %hi(D_8011D620) # $t9, 0x8012
/* 060684 8005FA84 8F39D620 */ lw $t9, %lo(D_8011D620)($t9)
/* 060680 8005FA80 3C198012 */ lui $t9, %hi(gObjectModelTable) # $t9, 0x8012
/* 060684 8005FA84 8F39D620 */ lw $t9, %lo(gObjectModelTable)($t9)
/* 060688 8005FA88 00134080 */ sll $t0, $s3, 2
/* 06068C 8005FA8C 03281021 */ addu $v0, $t9, $t0
/* 060690 8005FA90 8C500000 */ lw $s0, ($v0)
asm/non_matchings/object_models/func_80061A00.s
+4 -4
View File
@@ -1,7 +1,7 @@
glabel func_80061A00
/* 062600 80061A00 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 062604 80061A04 3C0E8012 */ lui $t6, %hi(D_8011D638) # $t6, 0x8012
/* 062608 80061A08 8DCED638 */ lw $t6, %lo(D_8011D638)($t6)
/* 062604 80061A04 3C0E8012 */ lui $t6, %hi(gAnimationTable) # $t6, 0x8012
/* 062608 80061A08 8DCED638 */ lw $t6, %lo(gAnimationTable)($t6)
/* 06260C 80061A0C 00057840 */ sll $t7, $a1, 1
/* 062610 80061A10 AFBF003C */ sw $ra, 0x3c($sp)
/* 062614 80061A14 AFBE0038 */ sw $fp, 0x38($sp)
@@ -50,8 +50,8 @@ glabel func_80061A00
/* 0626B0 80061AB0 0010A080 */ sll $s4, $s0, 2
/* 0626B4 80061AB4 00008825 */ move $s1, $zero
.L80061AB8:
/* 0626B8 80061AB8 3C088012 */ lui $t0, %hi(D_8011D63C) # $t0, 0x8012
/* 0626BC 80061ABC 8D08D63C */ lw $t0, %lo(D_8011D63C)($t0)
/* 0626B8 80061AB8 3C088012 */ lui $t0, %hi(gObjectAnimationTable) # $t0, 0x8012
/* 0626BC 80061ABC 8D08D63C */ lw $t0, %lo(gObjectAnimationTable)($t0)
/* 0626C0 80061AC0 24040020 */ li $a0, 32
/* 0626C4 80061AC4 01141021 */ addu $v0, $t0, $s4
/* 0626C8 80061AC8 8C520000 */ lw $s2, ($v0)
asm/non_matchings/objects/func_8000B020.s
+4 -4
View File
@@ -114,10 +114,10 @@ glabel func_8000B020
/* 00BDD8 8000B1D8 02E02025 */ move $a0, $s7
/* 00BDDC 8000B1DC 0C003A95 */ jal spawn_object
/* 00BDE0 8000B1E0 00002825 */ move $a1, $zero
/* 00BDE4 8000B1E4 3C01800E */ lui $at, %hi(D_800DC75C) # $at, 0x800e
/* 00BDE4 8000B1E4 3C01800E */ lui $at, %hi(gShieldEffectObject) # $at, 0x800e
/* 00BDE8 8000B1E8 3C108012 */ lui $s0, %hi(D_8011B078) # $s0, 0x8012
/* 00BDEC 8000B1EC 3C118012 */ lui $s1, %hi(gSceneCurrDisplayList) # $s1, 0x8012
/* 00BDF0 8000B1F0 AC22C75C */ sw $v0, %lo(D_800DC75C)($at)
/* 00BDF0 8000B1F0 AC22C75C */ sw $v0, %lo(gShieldEffectObject)($at)
/* 00BDF4 8000B1F4 2631B0A0 */ addiu $s1, %lo(gSceneCurrDisplayList) # addiu $s1, $s1, -0x4f60
/* 00BDF8 8000B1F8 2610B078 */ addiu $s0, %lo(D_8011B078) # addiu $s0, $s0, -0x4f88
.L8000B1FC:
@@ -144,7 +144,7 @@ glabel func_8000B020
/* 00BE4C 8000B24C 0C003A95 */ jal spawn_object
/* 00BE50 8000B250 00002825 */ move $a1, $zero
/* 00BE54 8000B254 8FBF003C */ lw $ra, 0x3c($sp)
/* 00BE58 8000B258 3C01800E */ lui $at, %hi(D_800DC764) # $at, 0x800e
/* 00BE58 8000B258 3C01800E */ lui $at, %hi(gMagnetEffectObject) # $at, 0x800e
/* 00BE5C 8000B25C C7B50010 */ lwc1 $f21, 0x10($sp)
/* 00BE60 8000B260 C7B40014 */ lwc1 $f20, 0x14($sp)
/* 00BE64 8000B264 8FB0001C */ lw $s0, 0x1c($sp)
@@ -155,7 +155,7 @@ glabel func_8000B020
/* 00BE78 8000B278 8FB50030 */ lw $s5, 0x30($sp)
/* 00BE7C 8000B27C 8FB60034 */ lw $s6, 0x34($sp)
/* 00BE80 8000B280 8FB70038 */ lw $s7, 0x38($sp)
/* 00BE84 8000B284 AC22C764 */ sw $v0, %lo(D_800DC764)($at)
/* 00BE84 8000B284 AC22C764 */ sw $v0, %lo(gMagnetEffectObject)($at)
/* 00BE88 8000B288 03E00008 */ jr $ra
/* 00BE8C 8000B28C 27BD0068 */ addiu $sp, $sp, 0x68
asm/non_matchings/objects/func_8000B750.s
+1 -1
View File
@@ -214,7 +214,7 @@ glabel func_8000B750
/* 00C660 8000BA60 AFAA0038 */ sw $t2, 0x38($sp)
/* 00C664 8000BA64 0C01C0C8 */ jal f32_vec3_apply_object_rotation
/* 00C668 8000BA68 E7A8007C */ swc1 $f8, 0x7c($sp)
/* 00C66C 8000BA6C 0C004558 */ jal func_80011560
/* 00C66C 8000BA6C 0C004558 */ jal ignore_bounds_check
/* 00C670 8000BA70 00000000 */ nop
/* 00C674 8000BA74 8FA20080 */ lw $v0, 0x80($sp)
/* 00C678 8000BA78 C7AA0074 */ lwc1 $f10, 0x74($sp)
asm/non_matchings/objects/func_8000BADC.s
+2 -2
View File
@@ -300,8 +300,8 @@ glabel func_8000BADC
/* 00CB04 8000BF04 1420FF2F */ bnez $at, .L8000BBC4
/* 00CB08 8000BF08 26520004 */ addiu $s2, $s2, 4
.L8000BF0C:
/* 00CB0C 8000BF0C 3C04800E */ lui $a0, %hi(D_800DC764) # $a0, 0x800e
/* 00CB10 8000BF10 8C84C764 */ lw $a0, %lo(D_800DC764)($a0)
/* 00CB0C 8000BF0C 3C04800E */ lui $a0, %hi(gMagnetEffectObject) # $a0, 0x800e
/* 00CB10 8000BF10 8C84C764 */ lw $a0, %lo(gMagnetEffectObject)($a0)
/* 00CB14 8000BF14 00000000 */ nop
/* 00CB18 8000BF18 10800004 */ beqz $a0, .L8000BF2C
/* 00CB1C 8000BF1C 8FBF002C */ lw $ra, 0x2c($sp)
asm/non_matchings/objects/func_8000CC7C.s
+1 -1
View File
@@ -1376,7 +1376,7 @@ glabel L8000D98C
.L8000DFCC:
/* 00EBCC 8000DFCC 12400012 */ beqz $s2, .L8000E018
/* 00EBD0 8000DFD0 8FAE0130 */ lw $t6, 0x130($sp)
/* 00EBD4 8000DFD4 0C00E4C8 */ jal func_80039320
/* 00EBD4 8000DFD4 0C00E4C8 */ jal set_taj_voice_line
/* 00EBD8 8000DFD8 24040250 */ li $a0, 592
/* 00EBDC 8000DFDC 96F80014 */ lhu $t8, 0x14($s7)
/* 00EBE0 8000DFE0 264E001F */ addiu $t6, $s2, 0x1f
asm/non_matchings/objects/func_8001C6C4.s
-2
View File
@@ -1,6 +1,4 @@
.late_rodata
glabel D_800E5644
.float 50000.0
glabel D_800E5648
.double 1.2
glabel D_800E5650
asm/non_matchings/racer/func_80049794.s
+8 -8
View File
@@ -104,15 +104,15 @@ glabel func_80049794
/* 04A450 80049850 820C01D7 */ lb $t4, 0x1d7($s0)
/* 04A454 80049854 2401000C */ li $at, 12
/* 04A458 80049858 118100A0 */ beq $t4, $at, .L80049ADC
/* 04A45C 8004985C 3C028012 */ lui $v0, %hi(D_8011D5AE) # $v0, 0x8012
/* 04A460 80049860 8042D5AE */ lb $v0, %lo(D_8011D5AE)($v0)
/* 04A464 80049864 3C198012 */ lui $t9, %hi(D_8011D5B0) # $t9, 0x8012
/* 04A45C 8004985C 3C028012 */ lui $v0, %hi(gRacerWaveCount) # $v0, 0x8012
/* 04A460 80049860 8042D5AE */ lb $v0, %lo(gRacerWaveCount)($v0)
/* 04A464 80049864 3C198012 */ lui $t9, %hi(gRacerCurrentWave) # $t9, 0x8012
/* 04A468 80049868 1040009C */ beqz $v0, .L80049ADC
/* 04A46C 8004986C 2443FFFF */ addiu $v1, $v0, -1
/* 04A470 80049870 0460001A */ bltz $v1, .L800498DC
/* 04A474 80049874 00602025 */ move $a0, $v1
/* 04A478 80049878 3C0D8012 */ lui $t5, %hi(D_8011D5B0) # $t5, 0x8012
/* 04A47C 8004987C 8DADD5B0 */ lw $t5, %lo(D_8011D5B0)($t5)
/* 04A478 80049878 3C0D8012 */ lui $t5, %hi(gRacerCurrentWave) # $t5, 0x8012
/* 04A47C 8004987C 8DADD5B0 */ lw $t5, %lo(gRacerCurrentWave)($t5)
/* 04A480 80049880 00047080 */ sll $t6, $a0, 2
/* 04A484 80049884 3C0140A0 */ li $at, 0x40A00000 # 5.000000
/* 04A488 80049888 01AE1021 */ addu $v0, $t5, $t6
@@ -138,7 +138,7 @@ glabel func_80049794
/* 04A4D4 800498D4 4501FFF6 */ bc1t .L800498B0
/* 04A4D8 800498D8 00000000 */ nop
.L800498DC:
/* 04A4DC 800498DC 8F39D5B0 */ lw $t9, %lo(D_8011D5B0)($t9)
/* 04A4DC 800498DC 8F39D5B0 */ lw $t9, %lo(gRacerCurrentWave)($t9)
/* 04A4E0 800498E0 00042880 */ sll $a1, $a0, 2
/* 04A4E4 800498E4 C62C0010 */ lwc1 $f12, 0x10($s1)
/* 04A4E8 800498E8 14830003 */ bne $a0, $v1, .L800498F8
@@ -207,8 +207,8 @@ glabel func_80049794
/* 04A5D0 800499D0 1041000F */ beq $v0, $at, .L80049A10
/* 04A5D4 800499D4 00000000 */ nop
/* 04A5D8 800499D8 1122000D */ beq $t1, $v0, .L80049A10
/* 04A5DC 800499DC 3C0E8012 */ lui $t6, %hi(D_8011D5B0) # $t6, 0x8012
/* 04A5E0 800499E0 8DCED5B0 */ lw $t6, %lo(D_8011D5B0)($t6)
/* 04A5DC 800499DC 3C0E8012 */ lui $t6, %hi(gRacerCurrentWave) # $t6, 0x8012
/* 04A5E0 800499E0 8DCED5B0 */ lw $t6, %lo(gRacerCurrentWave)($t6)
/* 04A5E4 800499E4 3C01800E */ lui $at, %hi(D_800E64B0 + 4) # $at, 0x800e
/* 04A5E8 800499E8 01C57821 */ addu $t7, $t6, $a1
/* 04A5EC 800499EC 8DF80004 */ lw $t8, 4($t7)
asm/non_matchings/unknown_0255E0/func_8002C0C4.s
+8 -8
View File
@@ -23,10 +23,10 @@ glabel func_8002C0C4
/* 02CD00 8002C100 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 02CD04 8002C104 0C01C327 */ jal allocate_from_main_pool_safe
/* 02CD08 8002C108 02A02025 */ move $a0, $s5
/* 02CD0C 8002C10C 3C038012 */ lui $v1, %hi(D_8011D30C) # $v1, 0x8012
/* 02CD0C 8002C10C 3C038012 */ lui $v1, %hi(gTrackModelHeap) # $v1, 0x8012
/* 02CD10 8002C110 3C11800E */ lui $s1, %hi(gCurrentLevelModel) # $s1, 0x800e
/* 02CD14 8002C114 2631C918 */ addiu $s1, %lo(gCurrentLevelModel) # addiu $s1, $s1, -0x36e8
/* 02CD18 8002C118 2463D30C */ addiu $v1, %lo(D_8011D30C) # addiu $v1, $v1, -0x2cf4
/* 02CD18 8002C118 2463D30C */ addiu $v1, %lo(gTrackModelHeap) # addiu $v1, $v1, -0x2cf4
/* 02CD1C 8002C11C 3C05FFFF */ lui $a1, (0xFFFF00FF >> 16) # lui $a1, 0xffff
/* 02CD20 8002C120 AC620000 */ sw $v0, ($v1)
/* 02CD24 8002C124 AE220000 */ sw $v0, ($s1)
@@ -45,8 +45,8 @@ glabel func_8002C0C4
/* 02CD58 8002C158 AC20D378 */ sw $zero, %lo(D_8011D378)($at)
/* 02CD5C 8002C15C 0C01DB16 */ jal load_asset_section_from_rom
/* 02CD60 8002C160 2404001A */ li $a0, 26
/* 02CD64 8002C164 3C148012 */ lui $s4, %hi(D_8011D310) # $s4, 0x8012
/* 02CD68 8002C168 2694D310 */ addiu $s4, %lo(D_8011D310) # addiu $s4, $s4, -0x2cf0
/* 02CD64 8002C164 3C148012 */ lui $s4, %hi(gLevelModelTable) # $s4, 0x8012
/* 02CD68 8002C168 2694D310 */ addiu $s4, %lo(gLevelModelTable) # addiu $s4, $s4, -0x2cf0
/* 02CD6C 8002C16C AE820000 */ sw $v0, ($s4)
/* 02CD70 8002C170 8C4F0000 */ lw $t7, ($v0)
/* 02CD74 8002C174 2403FFFF */ li $v1, -1
@@ -293,12 +293,12 @@ glabel func_8002C0C4
.L8002C510:
/* 02D110 8002C510 0C01C42C */ jal set_free_queue_state
/* 02D114 8002C514 00002025 */ move $a0, $zero
/* 02D118 8002C518 3C048012 */ lui $a0, %hi(D_8011D30C) # $a0, 0x8012
/* 02D11C 8002C51C 8C84D30C */ lw $a0, %lo(D_8011D30C)($a0)
/* 02D118 8002C518 3C048012 */ lui $a0, %hi(gTrackModelHeap) # $a0, 0x8012
/* 02D11C 8002C51C 8C84D30C */ lw $a0, %lo(gTrackModelHeap)($a0)
/* 02D120 8002C520 0C01C450 */ jal free_from_memory_pool
/* 02D124 8002C524 00000000 */ nop
/* 02D128 8002C528 3C058012 */ lui $a1, %hi(D_8011D30C) # $a1, 0x8012
/* 02D12C 8002C52C 8CA5D30C */ lw $a1, %lo(D_8011D30C)($a1)
/* 02D128 8002C528 3C058012 */ lui $a1, %hi(gTrackModelHeap) # $a1, 0x8012
/* 02D12C 8002C52C 8CA5D30C */ lw $a1, %lo(gTrackModelHeap)($a1)
/* 02D130 8002C530 3C06FFFF */ lui $a2, (0xFFFF00FF >> 16) # lui $a2, 0xffff
/* 02D134 8002C534 34C600FF */ ori $a2, (0xFFFF00FF & 0xFFFF) # ori $a2, $a2, 0xff
/* 02D138 8002C538 0C01C3BE */ jal allocate_at_address_in_main_pool
asm/non_matchings/unknown_032760/func_8003F2E8.s
+1 -1
View File
@@ -259,7 +259,7 @@ glabel func_8003F2E8
/* 04028C 8003F68C E600000C */ swc1 $f0, 0xc($s0)
/* 040290 8003F690 E6000010 */ swc1 $f0, 0x10($s0)
/* 040294 8003F694 E6000014 */ swc1 $f0, 0x14($s0)
/* 040298 8003F698 0C004558 */ jal func_80011560
/* 040298 8003F698 0C004558 */ jal ignore_bounds_check
/* 04029C 8003F69C AFA80038 */ sw $t0, 0x38($sp)
/* 0402A0 8003F6A0 8FB80040 */ lw $t8, 0x40($sp)
/* 0402A4 8003F6A4 02002025 */ move $a0, $s0
asm/non_matchings/unknown_032760/obj_init_fish.s
+1 -1
View File
@@ -117,7 +117,7 @@ glabel obj_init_fish
/* 0379D8 80036DD8 E6280014 */ swc1 $f8, 0x14($s1)
/* 0379DC 80036DDC E7AE0030 */ swc1 $f14, 0x30($sp)
/* 0379E0 80036DE0 46045401 */ sub.s $f16, $f10, $f4
/* 0379E4 80036DE4 0C004558 */ jal func_80011560
/* 0379E4 80036DE4 0C004558 */ jal ignore_bounds_check
/* 0379E8 80036DE8 E7B0002C */ swc1 $f16, 0x2c($sp)
/* 0379EC 80036DEC 8FA50030 */ lw $a1, 0x30($sp)
/* 0379F0 80036DF0 8FA7002C */ lw $a3, 0x2c($sp)
asm/non_matchings/unknown_032760/obj_loop_butterfly.s
+1 -1
View File
@@ -366,7 +366,7 @@ glabel L80040E54
/* 041D68 80041168 45000015 */ bc1f .L800411C0
/* 041D6C 8004116C 00000000 */ nop
/* 041D70 80041170 AFA8003C */ sw $t0, 0x3c($sp)
/* 041D74 80041174 0C004558 */ jal func_80011560
/* 041D74 80041174 0C004558 */ jal ignore_bounds_check
/* 041D78 80041178 E7A20090 */ swc1 $f2, 0x90($sp)
/* 041D7C 8004117C C7A20090 */ lwc1 $f2, 0x90($sp)
/* 041D80 80041180 C7A80094 */ lwc1 $f8, 0x94($sp)
asm/non_matchings/unknown_032760/obj_loop_fish.s
+1 -1
View File
@@ -170,7 +170,7 @@ glabel obj_loop_fish
/* 037F4C 8003734C E6320010 */ swc1 $f18, 0x10($s1)
/* 037F50 80037350 E6320014 */ swc1 $f18, 0x14($s1)
/* 037F54 80037354 E7AC006C */ swc1 $f12, 0x6c($sp)
/* 037F58 80037358 0C004558 */ jal func_80011560
/* 037F58 80037358 0C004558 */ jal ignore_bounds_check
/* 037F5C 8003735C E7A20064 */ swc1 $f2, 0x64($sp)
/* 037F60 80037360 C7A20064 */ lwc1 $f2, 0x64($sp)
/* 037F64 80037364 C7AC006C */ lwc1 $f12, 0x6c($sp)
include/level_object_entries.h
+11 -7
View File
@@ -10,6 +10,10 @@ typedef struct LevelObjectEntryCommon {
typedef struct LevelObjectEntry_Racer {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ s16 angleZ;
/* 0x0A */ s16 angleX;
/* 0x0C */ s16 angleY;
/* 0x0E */ s16 playerIndex;
} LevelObjectEntry_Racer;
typedef struct LevelObjectEntry_Scenery {
@@ -110,7 +114,7 @@ typedef struct LevelObjectEntry_SetupPoint {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ u8 unk8;
/* 0x09 */ u8 unk9;
/* 0x0A */ u8 unkA;
/* 0x0A */ u8 angleY;
} LevelObjectEntry_SetupPoint;
typedef struct LevelObjectEntry_Dino_Whale {
@@ -308,10 +312,10 @@ typedef struct LevelObjectEntry_EggCreator {
typedef struct LevelObjectEntry_CharacterFlag {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ s16 unk8;
/* 0x0A */ s16 unkA;
/* 0x0C */ s16 unkC;
/* 0x0E */ s16 unkE;
/* 0x08 */ s16 angleZ;
/* 0x0A */ s16 radius;
/* 0x0C */ s16 angleY;
/* 0x0E */ s16 playerIndex;
} LevelObjectEntry_CharacterFlag;
/*
@@ -571,11 +575,11 @@ typedef struct LevelObjectEntry_SilverCoinAdv2 {
typedef struct LevelObjectEntry_TTDoor {
/* 0x00 */ LevelObjectEntryCommon common;
/* 0x08 */ u8 unk8;
/* 0x08 */ u8 angleY;
/* 0x09 */ u8 unk9;
/* 0x0A */ u8 unkA;
/* 0x0B */ u8 unkB;
/* 0x0C */ u8 unkC;
/* 0x0C */ u8 radius;
/* 0x0D */ u8 padD;
/* 0x0E */ s8 doorID;
} LevelObjectEntry_TTDoor;
include/macros.h
+3
View File
@@ -65,4 +65,7 @@
// Used to suppress warnings in the ./generate_ctx.sh script.
#define INCONSISTENT
// Used to make a u32 colour value look clearer. Transforms 0xFF0000FF to 255, 0, 0, 255
#define COLOUR_RGBA32(r, g, b, a) (((r << 24) | (g << 16) | (b << 8) | a))
#endif
include/structs.h
+12 -12
View File
@@ -362,7 +362,7 @@ typedef struct LevelHeader {
/* 0x44 */ u8 unk44[0x5];
/* 0x49 */ s8 unk49;
/* 0x49 */ s8 skyDome;
/* 0x4A */ s8 playerIndex;
/* 0x4B */ s8 laps;
/* 0x4C */ s8 race_type;
@@ -1127,8 +1127,8 @@ typedef struct Object_Racer {
/* 0x176 */ s16 unk176;
/* 0x178 */ void *magnetSoundMask;
/* 0x17C */ s32 shieldSoundMask;
/* 0x180 */ s32 unk180; // Soundmask for banana pickup, whether that's the only use I do not yet know.
/* 0x184 */ s8 unk184;
/* 0x180 */ s32 bananaSoundMask;
/* 0x184 */ s8 magnetModelID;
/* 0x185 */ s8 bananas;
/* 0x186 */ u8 unk186;
/* 0x187 */ s8 attackType;
@@ -1140,8 +1140,8 @@ typedef struct Object_Racer {
/* 0x190 */ s16 courseCheckpoint;
/* 0x192 */ s8 checkpoint;
/* 0x193 */ s8 lap;
/* 0x194 */ s8 unk194;
/* 0x195 */ s8 unk195;
/* 0x194 */ s8 countLap;
/* 0x195 */ s8 magnetLevel3;
/* 0x196 */ s16 unk196;
/* 0x198 */ s16 unk198;
/* 0x19A */ s16 unk19A;
@@ -1189,10 +1189,10 @@ typedef struct Object_Racer {
/* 0x1DC */ u8 wheel_surfaces[4];
/* 0x1E0 */ s8 unk1E0;
/* 0x1E1 */ s8 steerAngle;
/* 0x1E2 */ s8 unk1E2;
/* 0x1E2 */ s8 groundedWheels;
/* 0x1E3 */ s8 unk1E3;
/* 0x1E4 */ s8 unk1E4;
/* 0x1E5 */ s8 unk1E5;
/* 0x1E5 */ s8 waterTimer; // Set to a value, then counts down when leaving water.
/* 0x1E6 */ s8 drift_direction;
/* 0x1E7 */ s8 miscAnimCounter;
/* 0x1E8 */ s8 unk1E8;
@@ -1231,8 +1231,8 @@ typedef struct Object_Racer {
/* 0x20B */ u8 unk20B;
/* 0x20C */ u8 throttleReleased;
/* 0x20D */ u8 unk20D;
/* 0x20E */ u16 unk20E;
/* 0x210 */ u8 unk210;
/* 0x20E */ u16 delaySoundID;
/* 0x210 */ u8 delaySoundTimer;
/* 0x211 */ s8 unk211;
/* 0x212 */ s8 unk212;
/* 0x213 */ s8 unk213;
@@ -1240,7 +1240,7 @@ typedef struct Object_Racer {
/* 0x215 */ s8 unk215;
/* 0x216 */ u8 unk216;
/* 0x217 */ u8 unk217;
/* 0x218 */ void *unk218;
/* 0x218 */ s32 weaponSoundMask;
/* 0x21C */ s32 unk21C;
/* 0x220 */ s32 unk220;
} Object_Racer;
@@ -1264,7 +1264,7 @@ typedef struct Object_ModeChange {
} Object_ModeChange;
typedef struct Object_Door {
/* 0x00 */ f32 unk0;
/* 0x00 */ f32 homeY;
/* 0x04 */ u8 pad4[0x4];
/* 0x08 */ s32 unk8;
/* 0x0A */ s16 padA;
@@ -1605,7 +1605,7 @@ typedef struct ObjectTransform {
/* 0x0000 */ s16 y_rotation;
/* 0x0002 */ s16 x_rotation;
/* 0x0004 */ s16 z_rotation;
/* 0x0006 */ s16 unk6; // Flags?
/* 0x0006 */ s16 flags;
/* 0x0008 */ f32 scale;
/* 0x000C */ f32 x_position;
/* 0x0010 */ f32 y_position;

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