6 new matches (#403)

* Minor code cleanup

* Match func_800235DC

* Minor code cleanup

* Big progress on spawn_object

* Cleanup Object struct a little

* Big type and warning changes / fixes

* spawn_object 90%

* spawn_object 92%

* gThread30Message needs to be an array of 2

* Minor cleanup

* WIP func_80059BF0 and func_800A277C

* func_800A277C should be just regalloc and stack now

* Very close on func_800A277C

* Increase func_800A277C score

* Rename func_8006BD88 to get_current_map_id and fix a bug in func_800A277C

* Match func_8009ECF0

* Cleanup some warnings in func_8009ECF0

* Match func_8007C52C

* Match update_colour_cycle

* Update score

* Match get_texture_size_from_id

* Update score again

* Match load_sprite_info
This commit is contained in:
Ryan Myers
2023-09-14 16:37:32 -04:00
committed by GitHub
parent 4a2f202442
commit 34b3c51ffb
35 changed files with 1177 additions and 1220 deletions
+27 -27
View File
@@ -5,11 +5,11 @@ This repo contains a work-in-progress decompilation of Diddy Kong Racing for the
Currently, only the US 1.0 version of the game is supported. US 1.1, EU 1.0, EU 1.1, and JP are not supported at this time.
<!-- README_SCORE_SUMMARY_BEGIN -->
As of August 31, 2023, this is our current score:
As of September 14, 2023, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 52.69%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 53.21%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 26.72%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 26.77%
<!-- README_SCORE_SUMMARY_END -->
---
@@ -128,31 +128,31 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of August 31st, 2023, this is our current score:
As of September 14th, 2023, this is our current score:
```
=================================================
ADVENTURE ONE (ASM -> C Decompilation)
---------------- 52.69% Complete ----------------
# Decompiled functions: 1515
# GLOBAL_ASM remaining: 316
# NON_MATCHING functions: 13
# NON_EQUIVALENT WIP functions: 70
------------------ Game Status ------------------
Balloons: 26/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
-------------------------------------------------
We are racing the octopus boss Bubbler. (Lap 3/3)
=================================================
ADVENTURE TWO (Cleanup & Documentation)
---------------- 26.72% Complete ----------------
# Documented functions: 573
# Undocumented remaining: 990
------------------ Game Status ------------------
Balloons: 13/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
-------------------------------------------------
We are racing in Everfrost Peak. (Lap 2/3)
=================================================
========================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------- 53.21% Complete --------------------
# Decompiled functions: 1526
# GLOBAL_ASM remaining: 305
# NON_MATCHING functions: 12
# NON_EQUIVALENT WIP functions: 71
--------------------- Game Status ----------------------
Balloons: 26/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 2/4, Wizpig Amulets: 2/4
--------------------------------------------------------
We are battling in Darkwater Beach. (3 opponents remain)
========================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------- 26.77% Complete --------------------
# Documented functions: 574
# Undocumented remaining: 989
--------------------- Game Status ----------------------
Balloons: 13/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
--------------------------------------------------------
We are racing in Everfrost Peak. (Lap 3/3)
========================================================
```
<!-- README_SCORE_END -->
-219
View File
@@ -1,219 +0,0 @@
glabel func_8009ECF0
/* 09F8F0 8009ECF0 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 09F8F4 8009ECF4 AFBF0024 */ sw $ra, 0x24($sp)
/* 09F8F8 8009ECF8 AFB20020 */ sw $s2, 0x20($sp)
/* 09F8FC 8009ECFC AFB1001C */ sw $s1, 0x1c($sp)
/* 09F900 8009ED00 AFB00018 */ sw $s0, 0x18($sp)
/* 09F904 8009ED04 0C019884 */ jal get_viewport_count
/* 09F908 8009ED08 AFA40028 */ sw $a0, 0x28($sp)
/* 09F90C 8009ED0C 3C038012 */ lui $v1, %hi(gHUDNumPlayers) # $v1, 0x8012
/* 09F910 8009ED10 24636D0C */ addiu $v1, %lo(gHUDNumPlayers) # addiu $v1, $v1, 0x6d0c
/* 09F914 8009ED14 AC620000 */ sw $v0, ($v1)
/* 09F918 8009ED18 0C01994B */ jal set_active_viewports_and_max
/* 09F91C 8009ED1C 00402025 */ move $a0, $v0
/* 09F920 8009ED20 3C018012 */ lui $at, %hi(gNumActivePlayers) # $at, 0x8012
/* 09F924 8009ED24 0C01BAA4 */ jal get_settings
/* 09F928 8009ED28 A0226D37 */ sb $v0, %lo(gNumActivePlayers)($at)
/* 09F92C 8009ED2C 3C018012 */ lui $at, %hi(D_80127184) # $at, 0x8012
/* 09F930 8009ED30 0C003877 */ jal check_if_silver_coin_race
/* 09F934 8009ED34 AC227184 */ sw $v0, %lo(D_80127184)($at)
/* 09F938 8009ED38 3C018012 */ lui $at, %hi(D_80127188) # $at, 0x8012
/* 09F93C 8009ED3C A0227188 */ sb $v0, %lo(D_80127188)($at)
/* 09F940 8009ED40 0C01DB16 */ jal load_asset_section_from_rom
/* 09F944 8009ED44 24040011 */ li $a0, 17
/* 09F948 8009ED48 3C068012 */ lui $a2, %hi(D_80126CF8) # $a2, 0x8012
/* 09F94C 8009ED4C 3C118012 */ lui $s1, %hi(D_80126CF0) # $s1, 0x8012
/* 09F950 8009ED50 26316CF0 */ addiu $s1, %lo(D_80126CF0) # addiu $s1, $s1, 0x6cf0
/* 09F954 8009ED54 24C66CF8 */ addiu $a2, %lo(D_80126CF8) # addiu $a2, $a2, 0x6cf8
/* 09F958 8009ED58 00007040 */ sll $t6, $zero, 1
/* 09F95C 8009ED5C AE220000 */ sw $v0, ($s1)
/* 09F960 8009ED60 ACC00000 */ sw $zero, ($a2)
/* 09F964 8009ED64 004E7821 */ addu $t7, $v0, $t6
/* 09F968 8009ED68 85F80000 */ lh $t8, ($t7)
/* 09F96C 8009ED6C 2412FFFF */ li $s2, -1
/* 09F970 8009ED70 00401825 */ move $v1, $v0
/* 09F974 8009ED74 12580009 */ beq $s2, $t8, .L8009ED9C
/* 09F978 8009ED78 00008025 */ move $s0, $zero
/* 09F97C 8009ED7C 26190001 */ addiu $t9, $s0, 1
.L8009ED80:
/* 09F980 8009ED80 00194040 */ sll $t0, $t9, 1
/* 09F984 8009ED84 00684821 */ addu $t1, $v1, $t0
/* 09F988 8009ED88 ACD90000 */ sw $t9, ($a2)
/* 09F98C 8009ED8C 852A0000 */ lh $t2, ($t1)
/* 09F990 8009ED90 03208025 */ move $s0, $t9
/* 09F994 8009ED94 164AFFFA */ bne $s2, $t2, .L8009ED80
/* 09F998 8009ED98 26190001 */ addiu $t9, $s0, 1
.L8009ED9C:
/* 09F99C 8009ED9C 00102080 */ sll $a0, $s0, 2
/* 09F9A0 8009EDA0 00902021 */ addu $a0, $a0, $s0
/* 09F9A4 8009EDA4 0C01C327 */ jal allocate_from_main_pool_safe
/* 09F9A8 8009EDA8 3405FFFF */ li $a1, 65535
/* 09F9AC 8009EDAC 3C068012 */ lui $a2, %hi(D_80126CF8) # $a2, 0x8012
/* 09F9B0 8009EDB0 24C66CF8 */ addiu $a2, %lo(D_80126CF8) # addiu $a2, $a2, 0x6cf8
/* 09F9B4 8009EDB4 8CD00000 */ lw $s0, ($a2)
/* 09F9B8 8009EDB8 3C048012 */ lui $a0, %hi(D_80126CD8) # $a0, 0x8012
/* 09F9BC 8009EDBC 3C078012 */ lui $a3, %hi(D_80126CF4) # $a3, 0x8012
/* 09F9C0 8009EDC0 00105880 */ sll $t3, $s0, 2
/* 09F9C4 8009EDC4 24E76CF4 */ addiu $a3, %lo(D_80126CF4) # addiu $a3, $a3, 0x6cf4
/* 09F9C8 8009EDC8 24846CD8 */ addiu $a0, %lo(D_80126CD8) # addiu $a0, $a0, 0x6cd8
/* 09F9CC 8009EDCC 01626821 */ addu $t5, $t3, $v0
/* 09F9D0 8009EDD0 ACE20000 */ sw $v0, ($a3)
/* 09F9D4 8009EDD4 AC8D0000 */ sw $t5, ($a0)
/* 09F9D8 8009EDD8 1A00000F */ blez $s0, .L8009EE18
/* 09F9DC 8009EDDC 00001825 */ move $v1, $zero
/* 09F9E0 8009EDE0 00001025 */ move $v0, $zero
.L8009EDE4:
/* 09F9E4 8009EDE4 8C8E0000 */ lw $t6, ($a0)
/* 09F9E8 8009EDE8 00000000 */ nop
/* 09F9EC 8009EDEC 01C37821 */ addu $t7, $t6, $v1
/* 09F9F0 8009EDF0 A1E00000 */ sb $zero, ($t7)
/* 09F9F4 8009EDF4 8CF80000 */ lw $t8, ($a3)
/* 09F9F8 8009EDF8 24630001 */ addiu $v1, $v1, 1
/* 09F9FC 8009EDFC 0302C821 */ addu $t9, $t8, $v0
/* 09FA00 8009EE00 AF200000 */ sw $zero, ($t9)
/* 09FA04 8009EE04 8CC80000 */ lw $t0, ($a2)
/* 09FA08 8009EE08 24420004 */ addiu $v0, $v0, 4
/* 09FA0C 8009EE0C 0068082A */ slt $at, $v1, $t0
/* 09FA10 8009EE10 1420FFF4 */ bnez $at, .L8009EDE4
/* 09FA14 8009EE14 00000000 */ nop
.L8009EE18:
/* 09FA18 8009EE18 8E290000 */ lw $t1, ($s1)
/* 09FA1C 8009EE1C 24050001 */ li $a1, 1
/* 09FA20 8009EE20 85240002 */ lh $a0, 2($t1)
/* 09FA24 8009EE24 00000000 */ nop
/* 09FA28 8009EE28 308A3FFF */ andi $t2, $a0, 0x3fff
/* 09FA2C 8009EE2C 0C01F04B */ jal func_8007C12C
/* 09FA30 8009EE30 01402025 */ move $a0, $t2
/* 09FA34 8009EE34 3C078012 */ lui $a3, %hi(D_80126CF4) # $a3, 0x8012
/* 09FA38 8009EE38 24E76CF4 */ addiu $a3, %lo(D_80126CF4) # addiu $a3, $a3, 0x6cf4
/* 09FA3C 8009EE3C 8CEB0000 */ lw $t3, ($a3)
/* 09FA40 8009EE40 24050001 */ li $a1, 1
/* 09FA44 8009EE44 AD620004 */ sw $v0, 4($t3)
/* 09FA48 8009EE48 8E2C0000 */ lw $t4, ($s1)
/* 09FA4C 8009EE4C 00000000 */ nop
/* 09FA50 8009EE50 8584002E */ lh $a0, 0x2e($t4)
/* 09FA54 8009EE54 00000000 */ nop
/* 09FA58 8009EE58 308D3FFF */ andi $t5, $a0, 0x3fff
/* 09FA5C 8009EE5C 0C01F04B */ jal func_8007C12C
/* 09FA60 8009EE60 01A02025 */ move $a0, $t5
/* 09FA64 8009EE64 3C078012 */ lui $a3, %hi(D_80126CF4) # $a3, 0x8012
/* 09FA68 8009EE68 24E76CF4 */ addiu $a3, %lo(D_80126CF4) # addiu $a3, $a3, 0x6cf4
/* 09FA6C 8009EE6C 8CEE0000 */ lw $t6, ($a3)
/* 09FA70 8009EE70 24050001 */ li $a1, 1
/* 09FA74 8009EE74 ADC2005C */ sw $v0, 0x5c($t6)
/* 09FA78 8009EE78 8E2F0000 */ lw $t7, ($s1)
/* 09FA7C 8009EE7C 00000000 */ nop
/* 09FA80 8009EE80 85E40010 */ lh $a0, 0x10($t7)
/* 09FA84 8009EE84 00000000 */ nop
/* 09FA88 8009EE88 30983FFF */ andi $t8, $a0, 0x3fff
/* 09FA8C 8009EE8C 0C01F04B */ jal func_8007C12C
/* 09FA90 8009EE90 03002025 */ move $a0, $t8
/* 09FA94 8009EE94 3C078012 */ lui $a3, %hi(D_80126CF4) # $a3, 0x8012
/* 09FA98 8009EE98 24E76CF4 */ addiu $a3, %lo(D_80126CF4) # addiu $a3, $a3, 0x6cf4
/* 09FA9C 8009EE9C 8CF90000 */ lw $t9, ($a3)
/* 09FAA0 8009EEA0 24050001 */ li $a1, 1
/* 09FAA4 8009EEA4 AF220020 */ sw $v0, 0x20($t9)
/* 09FAA8 8009EEA8 8E280000 */ lw $t0, ($s1)
/* 09FAAC 8009EEAC 00000000 */ nop
/* 09FAB0 8009EEB0 85040022 */ lh $a0, 0x22($t0)
/* 09FAB4 8009EEB4 00000000 */ nop
/* 09FAB8 8009EEB8 30893FFF */ andi $t1, $a0, 0x3fff
/* 09FABC 8009EEBC 0C01F04B */ jal func_8007C12C
/* 09FAC0 8009EEC0 01202025 */ move $a0, $t1
/* 09FAC4 8009EEC4 3C078012 */ lui $a3, %hi(D_80126CF4) # $a3, 0x8012
/* 09FAC8 8009EEC8 24E76CF4 */ addiu $a3, %lo(D_80126CF4) # addiu $a3, $a3, 0x6cf4
/* 09FACC 8009EECC 8CEA0000 */ lw $t2, ($a3)
/* 09FAD0 8009EED0 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012
/* 09FAD4 8009EED4 AD420044 */ sw $v0, 0x44($t2)
/* 09FAD8 8009EED8 90636D37 */ lbu $v1, %lo(gNumActivePlayers)($v1)
/* 09FADC 8009EEDC 24010003 */ li $at, 3
/* 09FAE0 8009EEE0 10610003 */ beq $v1, $at, .L8009EEF0
/* 09FAE4 8009EEE4 3405FFFF */ li $a1, 65535
/* 09FAE8 8009EEE8 10000002 */ b .L8009EEF4
/* 09FAEC 8009EEEC 00601025 */ move $v0, $v1
.L8009EEF0:
/* 09FAF0 8009EEF0 24020004 */ li $v0, 4
.L8009EEF4:
/* 09FAF4 8009EEF4 00022100 */ sll $a0, $v0, 4
/* 09FAF8 8009EEF8 00822023 */ subu $a0, $a0, $v0
/* 09FAFC 8009EEFC 00042080 */ sll $a0, $a0, 2
/* 09FB00 8009EF00 00822023 */ subu $a0, $a0, $v0
/* 09FB04 8009EF04 0C01C327 */ jal allocate_from_main_pool_safe
/* 09FB08 8009EF08 00042140 */ sll $a0, $a0, 5
/* 09FB0C 8009EF0C 3C038012 */ lui $v1, %hi(D_80126CE0) # $v1, 0x8012
/* 09FB10 8009EF10 24636CE0 */ addiu $v1, %lo(D_80126CE0) # addiu $v1, $v1, 0x6ce0
/* 09FB14 8009EF14 244C0760 */ addiu $t4, $v0, 0x760
/* 09FB18 8009EF18 258E0760 */ addiu $t6, $t4, 0x760
/* 09FB1C 8009EF1C 25D80760 */ addiu $t8, $t6, 0x760
/* 09FB20 8009EF20 AC620000 */ sw $v0, ($v1)
/* 09FB24 8009EF24 AC6C0004 */ sw $t4, 4($v1)
/* 09FB28 8009EF28 AC6E0008 */ sw $t6, 8($v1)
/* 09FB2C 8009EF2C 0C027C0D */ jal func_8009F034
/* 09FB30 8009EF30 AC78000C */ sw $t8, 0xc($v1)
/* 09FB34 8009EF34 3C018012 */ lui $at, %hi(D_80126D64) # $at, 0x8012
/* 09FB38 8009EF38 A0206D64 */ sb $zero, %lo(D_80126D64)($at)
/* 09FB3C 8009EF3C 3C018012 */ lui $at, %hi(gWrongWayNagTimer) # $at, 0x8012
/* 09FB40 8009EF40 AC206D6C */ sw $zero, %lo(gWrongWayNagTimer)($at)
/* 09FB44 8009EF44 3C018012 */ lui $at, %hi(D_80126D48) # $at, 0x8012
/* 09FB48 8009EF48 A4206D48 */ sh $zero, %lo(D_80126D48)($at)
/* 09FB4C 8009EF4C 24020004 */ li $v0, 4
/* 09FB50 8009EF50 3C018012 */ lui $at, %hi(D_80126D66) # $at, 0x8012
/* 09FB54 8009EF54 A0226D66 */ sb $v0, %lo(D_80126D66)($at)
/* 09FB58 8009EF58 3C018012 */ lui $at, %hi(D_80126D65) # $at, 0x8012
/* 09FB5C 8009EF5C A0206D65 */ sb $zero, %lo(D_80126D65)($at)
/* 09FB60 8009EF60 3C018012 */ lui $at, %hi(gStopwatchFaceID) # $at, 0x8012
/* 09FB64 8009EF64 A0226D67 */ sb $v0, %lo(gStopwatchFaceID)($at)
/* 09FB68 8009EF68 3C018012 */ lui $at, %hi(D_80126D69) # $at, 0x8012
/* 09FB6C 8009EF6C 24190001 */ li $t9, 1
/* 09FB70 8009EF70 A0396D69 */ sb $t9, %lo(D_80126D69)($at)
/* 09FB74 8009EF74 3C018012 */ lui $at, %hi(D_80126D68) # $at, 0x8012
/* 09FB78 8009EF78 24080001 */ li $t0, 1
/* 09FB7C 8009EF7C A0286D68 */ sb $t0, %lo(D_80126D68)($at)
/* 09FB80 8009EF80 3C018012 */ lui $at, %hi(D_80126D70) # $at, 0x8012
/* 09FB84 8009EF84 A0206D70 */ sb $zero, %lo(D_80126D70)($at)
/* 09FB88 8009EF88 3C018012 */ lui $at, %hi(D_80126D7C) # $at, 0x8012
/* 09FB8C 8009EF8C A4206D7C */ sh $zero, %lo(D_80126D7C)($at)
/* 09FB90 8009EF90 3C018012 */ lui $at, %hi(D_80126D74) # $at, 0x8012
/* 09FB94 8009EF94 AC206D74 */ sw $zero, %lo(D_80126D74)($at)
/* 09FB98 8009EF98 3C018012 */ lui $at, %hi(D_80126D3C) # $at, 0x8012
/* 09FB9C 8009EF9C AC206D3C */ sw $zero, %lo(D_80126D3C)($at)
/* 09FBA0 8009EFA0 3C018012 */ lui $at, %hi(D_80126D44) # $at, 0x8012
/* 09FBA4 8009EFA4 AC206D44 */ sw $zero, %lo(D_80126D44)($at)
/* 09FBA8 8009EFA8 3C018012 */ lui $at, %hi(D_80126CD3) # $at, 0x8012
/* 09FBAC 8009EFAC A0206CD3 */ sb $zero, %lo(D_80126CD3)($at)
/* 09FBB0 8009EFB0 0C0078A7 */ jal get_misc_asset
/* 09FBB4 8009EFB4 2404003A */ li $a0, 58
/* 09FBB8 8009EFB8 3C038012 */ lui $v1, %hi(D_80127194) # $v1, 0x8012
/* 09FBBC 8009EFBC 24637194 */ addiu $v1, %lo(D_80127194) # addiu $v1, $v1, 0x7194
/* 09FBC0 8009EFC0 AC620000 */ sw $v0, ($v1)
/* 09FBC4 8009EFC4 0C01FC7A */ jal func_8007F1E8
/* 09FBC8 8009EFC8 00402025 */ move $a0, $v0
/* 09FBCC 8009EFCC 00002025 */ move $a0, $zero
/* 09FBD0 8009EFD0 0C001298 */ jal set_sound_channel_volume
/* 09FBD4 8009EFD4 24057FFF */ li $a1, 32767
/* 09FBD8 8009EFD8 24040002 */ li $a0, 2
/* 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(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)
/* 09FBF8 8009EFF8 A2000002 */ sb $zero, 2($s0)
/* 09FBFC 8009EFFC A2000003 */ sb $zero, 3($s0)
/* 09FC00 8009F000 10800003 */ beqz $a0, .L8009F010
/* 09FC04 8009F004 A212000C */ sb $s2, 0xc($s0)
/* 09FC08 8009F008 0C001223 */ jal func_8000488C
/* 09FC0C 8009F00C 00000000 */ nop
.L8009F010:
/* 09FC10 8009F010 26100010 */ addiu $s0, $s0, 0x10
/* 09FC14 8009F014 1611FFF7 */ bne $s0, $s1, .L8009EFF4
/* 09FC18 8009F018 00000000 */ nop
/* 09FC1C 8009F01C 8FBF0024 */ lw $ra, 0x24($sp)
/* 09FC20 8009F020 8FB00018 */ lw $s0, 0x18($sp)
/* 09FC24 8009F024 8FB1001C */ lw $s1, 0x1c($sp)
/* 09FC28 8009F028 8FB20020 */ lw $s2, 0x20($sp)
/* 09FC2C 8009F02C 03E00008 */ jr $ra
/* 09FC30 8009F030 27BD0028 */ addiu $sp, $sp, 0x28
+4 -4
View File
@@ -184,13 +184,13 @@ glabel func_8009F034
/* 09FE74 8009F274 3C01800F */ lui $at, %hi(D_800E86A8 + 4) # $at, 0x800f
/* 09FE78 8009F278 27186CE0 */ addiu $t8, %lo(D_80126CE0) # addiu $t8, $t8, 0x6ce0
/* 09FE7C 8009F27C 3C10800E */ lui $s0, %hi(D_800E25C4) # $s0, 0x800e
/* 09FE80 8009F280 3C098012 */ lui $t1, %hi(D_80126CF0) # $t1, 0x8012
/* 09FE80 8009F280 3C098012 */ lui $t1, %hi(gAssetHudElementIds) # $t1, 0x8012
/* 09FE84 8009F284 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 09FE88 8009F288 C42F86A8 */ lwc1 $f15, %lo(D_800E86A8)($at)
/* 09FE8C 8009F28C C42E86AC */ lwc1 $f14, %lo(D_800E86A8 + 4)($at)
/* 09FE90 8009F290 44808000 */ mtc1 $zero, $f16
/* 09FE94 8009F294 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(D_80126CF0) # addiu $t1, $t1, 0x6cf0
/* 09FE98 8009F298 25296CF0 */ addiu $t1, %lo(gAssetHudElementIds) # addiu $t1, $t1, 0x6cf0
/* 09FE9C 8009F29C 261025C4 */ addiu $s0, %lo(D_800E25C4) # addiu $s0, $s0, 0x25c4
/* 09FEA0 8009F2A0 AFB8006C */ sw $t8, 0x6c($sp)
/* 09FEA4 8009F2A4 241E0036 */ li $fp, 54
@@ -924,9 +924,9 @@ glabel func_8009F034
/* 0A0954 8009FD54 44819000 */ mtc1 $at, $f18
/* 0A0958 8009FD58 3C058012 */ lui $a1, %hi(D_80126CDC) # $a1, 0x8012
/* 0A095C 8009FD5C 8FA70090 */ lw $a3, 0x90($sp)
/* 0A0960 8009FD60 3C098012 */ lui $t1, %hi(D_80126CF0) # $t1, 0x8012
/* 0A0960 8009FD60 3C098012 */ lui $t1, %hi(gAssetHudElementIds) # $t1, 0x8012
/* 0A0964 8009FD64 44808000 */ mtc1 $zero, $f16
/* 0A0968 8009FD68 25296CF0 */ addiu $t1, %lo(D_80126CF0) # addiu $t1, $t1, 0x6cf0
/* 0A0968 8009FD68 25296CF0 */ addiu $t1, %lo(gAssetHudElementIds) # addiu $t1, $t1, 0x6cf0
/* 0A096C 8009FD6C 24A56CDC */ addiu $a1, %lo(D_80126CDC) # addiu $a1, $a1, 0x6cdc
/* 0A0970 8009FD70 3408C000 */ li $t0, 49152
/* 0A0974 8009FD74 240AFFFF */ li $t2, -1
+14 -14
View File
@@ -1,7 +1,7 @@
glabel func_800A003C
/* 0A0C3C 800A003C 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 0A0C40 800A0040 3C028012 */ lui $v0, %hi(D_80126CF8) # $v0, 0x8012
/* 0A0C44 800A0044 8C426CF8 */ lw $v0, %lo(D_80126CF8)($v0)
/* 0A0C40 800A0040 3C028012 */ lui $v0, %hi(gAssetHudElementIdsCount) # $v0, 0x8012
/* 0A0C44 800A0044 8C426CF8 */ lw $v0, %lo(gAssetHudElementIdsCount)($v0)
/* 0A0C48 800A0048 AFB00018 */ sw $s0, 0x18($sp)
/* 0A0C4C 800A004C AFBF002C */ sw $ra, 0x2c($sp)
/* 0A0C50 800A0050 AFB40028 */ sw $s4, 0x28($sp)
@@ -10,10 +10,10 @@ glabel func_800A003C
/* 0A0C5C 800A005C AFB1001C */ sw $s1, 0x1c($sp)
/* 0A0C60 800A0060 18400032 */ blez $v0, .L800A012C
/* 0A0C64 800A0064 00008025 */ move $s0, $zero
/* 0A0C68 800A0068 3C148012 */ lui $s4, %hi(D_80126CF0) # $s4, 0x8012
/* 0A0C6C 800A006C 3C128012 */ lui $s2, %hi(D_80126CF4) # $s2, 0x8012
/* 0A0C70 800A0070 26526CF4 */ addiu $s2, %lo(D_80126CF4) # addiu $s2, $s2, 0x6cf4
/* 0A0C74 800A0074 26946CF0 */ addiu $s4, %lo(D_80126CF0) # addiu $s4, $s4, 0x6cf0
/* 0A0C68 800A0068 3C148012 */ lui $s4, %hi(gAssetHudElementIds) # $s4, 0x8012
/* 0A0C6C 800A006C 3C128012 */ lui $s2, %hi(gAssetHudElements) # $s2, 0x8012
/* 0A0C70 800A0070 26526CF4 */ addiu $s2, %lo(gAssetHudElements) # addiu $s2, $s2, 0x6cf4
/* 0A0C74 800A0074 26946CF0 */ addiu $s4, %lo(gAssetHudElementIds) # addiu $s4, $s4, 0x6cf0
/* 0A0C78 800A0078 00008825 */ move $s1, $zero
/* 0A0C7C 800A007C 3413C000 */ li $s3, 49152
.L800A0080:
@@ -55,10 +55,10 @@ glabel func_800A003C
/* 0A0D00 800A0100 00000000 */ nop
/* 0A0D04 800A0104 8E4C0000 */ lw $t4, ($s2)
.L800A0108:
/* 0A0D08 800A0108 3C028012 */ lui $v0, %hi(D_80126CF8) # $v0, 0x8012
/* 0A0D08 800A0108 3C028012 */ lui $v0, %hi(gAssetHudElementIdsCount) # $v0, 0x8012
/* 0A0D0C 800A010C 01916821 */ addu $t5, $t4, $s1
/* 0A0D10 800A0110 ADA00000 */ sw $zero, ($t5)
/* 0A0D14 800A0114 8C426CF8 */ lw $v0, %lo(D_80126CF8)($v0)
/* 0A0D14 800A0114 8C426CF8 */ lw $v0, %lo(gAssetHudElementIdsCount)($v0)
/* 0A0D18 800A0118 00000000 */ nop
.L800A011C:
/* 0A0D1C 800A011C 26100001 */ addiu $s0, $s0, 1
@@ -67,17 +67,17 @@ glabel func_800A003C
/* 0A0D28 800A0128 26310004 */ addiu $s1, $s1, 4
.L800A012C:
/* 0A0D2C 800A012C 3C048012 */ lui $a0, %hi(D_80126CE0) # $a0, 0x8012
/* 0A0D30 800A0130 3C128012 */ lui $s2, %hi(D_80126CF4) # $s2, 0x8012
/* 0A0D34 800A0134 3C148012 */ lui $s4, %hi(D_80126CF0) # $s4, 0x8012
/* 0A0D30 800A0130 3C128012 */ lui $s2, %hi(gAssetHudElements) # $s2, 0x8012
/* 0A0D34 800A0134 3C148012 */ lui $s4, %hi(gAssetHudElementIds) # $s4, 0x8012
/* 0A0D38 800A0138 8C846CE0 */ lw $a0, %lo(D_80126CE0)($a0)
/* 0A0D3C 800A013C 26946CF0 */ addiu $s4, %lo(D_80126CF0) # addiu $s4, $s4, 0x6cf0
/* 0A0D3C 800A013C 26946CF0 */ addiu $s4, %lo(gAssetHudElementIds) # addiu $s4, $s4, 0x6cf0
/* 0A0D40 800A0140 0C01C450 */ jal free_from_memory_pool
/* 0A0D44 800A0144 26526CF4 */ addiu $s2, %lo(D_80126CF4) # addiu $s2, $s2, 0x6cf4
/* 0A0D44 800A0144 26526CF4 */ addiu $s2, %lo(gAssetHudElements) # addiu $s2, $s2, 0x6cf4
/* 0A0D48 800A0148 8E840000 */ lw $a0, ($s4)
/* 0A0D4C 800A014C 0C01C450 */ jal free_from_memory_pool
/* 0A0D50 800A0150 00000000 */ nop
/* 0A0D54 800A0154 3C018012 */ lui $at, %hi(D_80126CF8) # $at, 0x8012
/* 0A0D58 800A0158 AC206CF8 */ sw $zero, %lo(D_80126CF8)($at)
/* 0A0D54 800A0154 3C018012 */ lui $at, %hi(gAssetHudElementIdsCount) # $at, 0x8012
/* 0A0D58 800A0158 AC206CF8 */ sw $zero, %lo(gAssetHudElementIdsCount)($at)
/* 0A0D5C 800A015C 8E440000 */ lw $a0, ($s2)
/* 0A0D60 800A0160 0C01C450 */ jal free_from_memory_pool
/* 0A0D64 800A0164 00000000 */ nop
+7 -7
View File
@@ -30,7 +30,7 @@ glabel D_800E8738
glabel func_800A277C
/* 0A337C 800A277C 27BDFF40 */ addiu $sp, $sp, -0xc0
/* 0A3380 800A2780 AFB00020 */ sw $s0, 0x20($sp)
/* 0A3384 800A2784 3C108012 */ lui $s0, %hi(D_80126CF4) # $s0, 0x8012
/* 0A3384 800A2784 3C108012 */ lui $s0, %hi(gAssetHudElements) # $s0, 0x8012
/* 0A3388 800A2788 AFBF002C */ sw $ra, 0x2c($sp)
/* 0A338C 800A278C AFB20028 */ sw $s2, 0x28($sp)
/* 0A3390 800A2790 AFB10024 */ sw $s1, 0x24($sp)
@@ -38,14 +38,14 @@ glabel func_800A277C
/* 0A3398 800A2798 AFA500C4 */ sw $a1, 0xc4($sp)
/* 0A339C 800A279C AFA600C8 */ sw $a2, 0xc8($sp)
/* 0A33A0 800A27A0 8CAF0064 */ lw $t7, 0x64($a1)
/* 0A33A4 800A27A4 26106CF4 */ addiu $s0, %lo(D_80126CF4) # addiu $s0, $s0, 0x6cf4
/* 0A33A4 800A27A4 26106CF4 */ addiu $s0, %lo(gAssetHudElements) # addiu $s0, $s0, 0x6cf4
/* 0A33A8 800A27A8 8E030000 */ lw $v1, ($s0)
/* 0A33AC 800A27AC AFAF00A0 */ sw $t7, 0xa0($sp)
/* 0A33B0 800A27B0 8C780050 */ lw $t8, 0x50($v1)
/* 0A33B4 800A27B4 00004825 */ move $t1, $zero
/* 0A33B8 800A27B8 1700001E */ bnez $t8, .L800A2834
/* 0A33BC 800A27BC 3C198012 */ lui $t9, %hi(D_80126CF0) # $t9, 0x8012
/* 0A33C0 800A27C0 8F396CF0 */ lw $t9, %lo(D_80126CF0)($t9)
/* 0A33BC 800A27BC 3C198012 */ lui $t9, %hi(gAssetHudElementIds) # $t9, 0x8012
/* 0A33C0 800A27C0 8F396CF0 */ lw $t9, %lo(gAssetHudElementIds)($t9)
/* 0A33C4 800A27C4 240C0008 */ li $t4, 8
/* 0A33C8 800A27C8 872B0028 */ lh $t3, 0x28($t9)
/* 0A33CC 800A27CC A3AC0091 */ sb $t4, 0x91($sp)
@@ -79,8 +79,8 @@ glabel func_800A277C
/* 0A3438 800A2838 3C118012 */ lui $s1, %hi(D_80126CDC) # $s1, 0x8012
/* 0A343C 800A283C 17000016 */ bnez $t8, .L800A2898
/* 0A3440 800A2840 26316CDC */ addiu $s1, %lo(D_80126CDC) # addiu $s1, $s1, 0x6cdc
/* 0A3444 800A2844 3C198012 */ lui $t9, %hi(D_80126CF0) # $t9, 0x8012
/* 0A3448 800A2848 8F396CF0 */ lw $t9, %lo(D_80126CF0)($t9)
/* 0A3444 800A2844 3C198012 */ lui $t9, %hi(gAssetHudElementIds) # $t9, 0x8012
/* 0A3448 800A2848 8F396CF0 */ lw $t9, %lo(gAssetHudElementIds)($t9)
/* 0A344C 800A284C 240C0008 */ li $t4, 8
/* 0A3450 800A2850 872B0044 */ lh $t3, 0x44($t9)
/* 0A3454 800A2854 A3AC0089 */ sb $t4, 0x89($sp)
@@ -688,7 +688,7 @@ glabel func_800A277C
/* 0A3D44 800A3144 00000000 */ nop
/* 0A3D48 800A3148 3C108012 */ lui $s0, %hi(D_80127184) # $s0, 0x8012
/* 0A3D4C 800A314C 26107184 */ addiu $s0, %lo(D_80127184) # addiu $s0, $s0, 0x7184
/* 0A3D50 800A3150 0C01AF62 */ jal func_8006BD88
/* 0A3D50 800A3150 0C01AF62 */ jal get_current_map_id
/* 0A3D54 800A3154 AE020000 */ sw $v0, ($s0)
/* 0A3D58 800A3158 8FAE00A0 */ lw $t6, 0xa0($sp)
/* 0A3D5C 800A315C 8E190000 */ lw $t9, ($s0)
+2 -2
View File
@@ -11,8 +11,8 @@ glabel func_800A36CC
/* 0A42F0 800A36F0 0C003936 */ jal is_in_time_trial
/* 0A42F4 800A36F4 AFA7002C */ sw $a3, 0x2c($sp)
/* 0A42F8 800A36F8 10400058 */ beqz $v0, .L800A385C
/* 0A42FC 800A36FC 3C0E8012 */ lui $t6, %hi(D_80126CF4) # $t6, 0x8012
/* 0A4300 800A3700 8DCE6CF4 */ lw $t6, %lo(D_80126CF4)($t6)
/* 0A42FC 800A36FC 3C0E8012 */ lui $t6, %hi(gAssetHudElements) # $t6, 0x8012
/* 0A4300 800A3700 8DCE6CF4 */ lw $t6, %lo(gAssetHudElements)($t6)
/* 0A4304 800A3704 00000000 */ nop
/* 0A4308 800A3708 8DC20050 */ lw $v0, 0x50($t6)
/* 0A430C 800A370C 00000000 */ nop
+2 -2
View File
@@ -21,7 +21,7 @@ glabel func_800A7A60
/* 0A86AC 800A7AAC 84E60226 */ lh $a2, 0x226($a3)
/* 0A86B0 800A7AB0 E4E4022C */ swc1 $f4, 0x22c($a3)
/* 0A86B4 800A7AB4 8C790140 */ lw $t9, 0x140($v1)
/* 0A86B8 800A7AB8 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0A86B8 800A7AB8 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0A86BC 800A7ABC C7260010 */ lwc1 $f6, 0x10($t9)
/* 0A86C0 800A7AC0 00065080 */ sll $t2, $a2, 2
/* 0A86C4 800A7AC4 E4E60230 */ swc1 $f6, 0x230($a3)
@@ -30,7 +30,7 @@ glabel func_800A7A60
/* 0A86D0 800A7AD0 C5080014 */ lwc1 $f8, 0x14($t0)
/* 0A86D4 800A7AD4 3C0C8012 */ lui $t4, %hi(D_80126CD8) # $t4, 0x8012
/* 0A86D8 800A7AD8 E4E80234 */ swc1 $f8, 0x234($a3)
/* 0A86DC 800A7ADC 8D296CF4 */ lw $t1, %lo(D_80126CF4)($t1)
/* 0A86DC 800A7ADC 8D296CF4 */ lw $t1, %lo(gAssetHudElements)($t1)
/* 0A86E0 800A7AE0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
/* 0A86E4 800A7AE4 012A5821 */ addu $t3, $t1, $t2
/* 0A86E8 800A7AE8 8D620000 */ lw $v0, ($t3)
+18 -18
View File
@@ -14,8 +14,8 @@ glabel func_800AA600
/* 0AB210 800AA610 AFA500BC */ sw $a1, 0xbc($sp)
/* 0AB214 800AA614 AFA600C0 */ sw $a2, 0xc0($sp)
/* 0AB218 800AA618 84E80006 */ lh $t0, 6($a3)
/* 0AB21C 800AA61C 3C038012 */ lui $v1, %hi(D_80126CF0) # $v1, 0x8012
/* 0AB220 800AA620 8C636CF0 */ lw $v1, %lo(D_80126CF0)($v1)
/* 0AB21C 800AA61C 3C038012 */ lui $v1, %hi(gAssetHudElementIds) # $v1, 0x8012
/* 0AB220 800AA620 8C636CF0 */ lw $v1, %lo(gAssetHudElementIds)($v1)
/* 0AB224 800AA624 00087040 */ sll $t6, $t0, 1
/* 0AB228 800AA628 006E7821 */ addu $t7, $v1, $t6
/* 0AB22C 800AA62C 85F80000 */ lh $t8, ($t7)
@@ -36,8 +36,8 @@ glabel func_800AA600
/* 0AB264 800AA664 00000000 */ nop
/* 0AB268 800AA668 AFAD00A4 */ sw $t5, 0xa4($sp)
.L800AA66C:
/* 0AB26C 800AA66C 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB270 800AA670 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB26C 800AA66C 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB270 800AA670 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB274 800AA674 8D2E0000 */ lw $t6, ($t1)
/* 0AB278 800AA678 00087880 */ sll $t7, $t0, 2
/* 0AB27C 800AA67C 01CFC021 */ addu $t8, $t6, $t7
@@ -52,9 +52,9 @@ glabel func_800AA600
/* 0AB2A0 800AA6A0 308B3FFF */ andi $t3, $a0, 0x3fff
/* 0AB2A4 800AA6A4 0C01EB9D */ jal load_texture
/* 0AB2A8 800AA6A8 01602025 */ move $a0, $t3
/* 0AB2AC 800AA6AC 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB2AC 800AA6AC 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB2B0 800AA6B0 860D0006 */ lh $t5, 6($s0)
/* 0AB2B4 800AA6B4 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB2B4 800AA6B4 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB2B8 800AA6B8 8D2C0000 */ lw $t4, ($t1)
/* 0AB2BC 800AA6BC 000D7080 */ sll $t6, $t5, 2
/* 0AB2C0 800AA6C0 018E7821 */ addu $t7, $t4, $t6
@@ -68,9 +68,9 @@ glabel func_800AA600
/* 0AB2DC 800AA6DC 33043FFF */ andi $a0, $t8, 0x3fff
/* 0AB2E0 800AA6E0 0C01F04B */ jal func_8007C12C
/* 0AB2E4 800AA6E4 24050001 */ li $a1, 1
/* 0AB2E8 800AA6E8 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB2E8 800AA6E8 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB2EC 800AA6EC 860D0006 */ lh $t5, 6($s0)
/* 0AB2F0 800AA6F0 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB2F0 800AA6F0 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB2F4 800AA6F4 8D2B0000 */ lw $t3, ($t1)
/* 0AB2F8 800AA6F8 000D6080 */ sll $t4, $t5, 2
/* 0AB2FC 800AA6FC 016C7021 */ addu $t6, $t3, $t4
@@ -95,9 +95,9 @@ glabel func_800AA600
/* 0AB344 800AA744 A7A000A2 */ sh $zero, 0xa2($sp)
/* 0AB348 800AA748 0C003A95 */ jal spawn_object
/* 0AB34C 800AA74C 00002825 */ move $a1, $zero
/* 0AB350 800AA750 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB350 800AA750 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB354 800AA754 860B0006 */ lh $t3, 6($s0)
/* 0AB358 800AA758 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB358 800AA758 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB35C 800AA75C 8D2D0000 */ lw $t5, ($t1)
/* 0AB360 800AA760 000B6080 */ sll $t4, $t3, 2
/* 0AB364 800AA764 01AC7021 */ addu $t6, $t5, $t4
@@ -107,9 +107,9 @@ glabel func_800AA600
/* 0AB370 800AA770 8FA40038 */ lw $a0, 0x38($sp)
/* 0AB374 800AA774 0C017E67 */ jal func_8005F99C
/* 0AB378 800AA778 00002825 */ move $a1, $zero
/* 0AB37C 800AA77C 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB37C 800AA77C 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB380 800AA780 860F0006 */ lh $t7, 6($s0)
/* 0AB384 800AA784 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB384 800AA784 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB388 800AA788 8D390000 */ lw $t9, ($t1)
/* 0AB38C 800AA78C 000FC080 */ sll $t8, $t7, 2
/* 0AB390 800AA790 03385821 */ addu $t3, $t9, $t8
@@ -178,8 +178,8 @@ glabel func_800AA600
/* 0AB47C 800AA87C 46123100 */ add.s $f4, $f6, $f18
/* 0AB480 800AA880 E604000C */ swc1 $f4, 0xc($s0)
.L800AA884:
/* 0AB484 800AA884 3C198012 */ lui $t9, %hi(D_80126CF0) # $t9, 0x8012
/* 0AB488 800AA888 8F396CF0 */ lw $t9, %lo(D_80126CF0)($t9)
/* 0AB484 800AA884 3C198012 */ lui $t9, %hi(gAssetHudElementIds) # $t9, 0x8012
/* 0AB488 800AA888 8F396CF0 */ lw $t9, %lo(gAssetHudElementIds)($t9)
/* 0AB48C 800AA88C 0008C040 */ sll $t8, $t0, 1
/* 0AB490 800AA890 03385821 */ addu $t3, $t9, $t8
/* 0AB494 800AA894 85620000 */ lh $v0, ($t3)
@@ -525,10 +525,10 @@ glabel func_800AA600
/* 0AB9A8 800AADA8 304E4000 */ andi $t6, $v0, 0x4000
/* 0AB9AC 800AADAC 0C01A748 */ jal get_active_camera_segment
/* 0AB9B0 800AADB0 00000000 */ nop
/* 0AB9B4 800AADB4 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB9B4 800AADB4 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0AB9B8 800AADB8 AFA200A8 */ sw $v0, 0xa8($sp)
/* 0AB9BC 800AADBC 860B0006 */ lh $t3, 6($s0)
/* 0AB9C0 800AADC0 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0AB9C0 800AADC0 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0AB9C4 800AADC4 8D380000 */ lw $t8, ($t1)
/* 0AB9C8 800AADC8 000B6880 */ sll $t5, $t3, 2
/* 0AB9CC 800AADCC 860E0004 */ lh $t6, 4($s0)
@@ -596,9 +596,9 @@ glabel func_800AA600
/* 0ABABC 800AAEBC 3C073F80 */ lui $a3, 0x3f80
/* 0ABAC0 800AAEC0 0C01A521 */ jal camera_push_model_mtx
/* 0ABAC4 800AAEC4 E7B20010 */ swc1 $f18, 0x10($sp)
/* 0ABAC8 800AAEC8 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0ABAC8 800AAEC8 3C098012 */ lui $t1, %hi(gAssetHudElements) # $t1, 0x8012
/* 0ABACC 800AAECC 86190006 */ lh $t9, 6($s0)
/* 0ABAD0 800AAED0 25296CF4 */ addiu $t1, %lo(D_80126CF4) # addiu $t1, $t1, 0x6cf4
/* 0ABAD0 800AAED0 25296CF4 */ addiu $t1, %lo(gAssetHudElements) # addiu $t1, $t1, 0x6cf4
/* 0ABAD4 800AAED4 8D2F0000 */ lw $t7, ($t1)
/* 0ABAD8 800AAED8 0019C080 */ sll $t8, $t9, 2
/* 0ABADC 800AAEDC 01F85821 */ addu $t3, $t7, $t8
+1 -1
View File
@@ -1101,7 +1101,7 @@ glabel L8000D98C
/* 00E7D0 8000DBD0 240D0060 */ li $t5, 96
/* 00E7D4 8000DBD4 A26D01F7 */ sb $t5, 0x1f7($s3)
.L8000DBD8:
/* 00E7D8 8000DBD8 0C01AF62 */ jal func_8006BD88
/* 00E7D8 8000DBD8 0C01AF62 */ jal get_current_map_id
/* 00E7DC 8000DBDC 00000000 */ nop
/* 00E7E0 8000DBE0 0C006D3F */ jal func_8001B4FC
/* 00E7E4 8000DBE4 00402025 */ move $a0, $v0
+3 -3
View File
@@ -202,7 +202,7 @@ glabel func_8001AE64
/* 01BD54 8001B154 00000000 */ nop
/* 01BD58 8001B158 0C01666A */ jal func_800599A8
/* 01BD5C 8001B15C AFA80030 */ sw $t0, 0x30($sp)
/* 01BD60 8001B160 0C01AF62 */ jal func_8006BD88
/* 01BD60 8001B160 0C01AF62 */ jal get_current_map_id
/* 01BD64 8001B164 AFA20028 */ sw $v0, 0x28($sp)
/* 01BD68 8001B168 8FAF0028 */ lw $t7, 0x28($sp)
/* 01BD6C 8001B16C 8FA80030 */ lw $t0, 0x30($sp)
@@ -223,7 +223,7 @@ glabel func_8001AE64
/* 01BDA4 8001B1A4 A42EC728 */ sh $t6, %lo(D_800DC728)($at)
/* 01BDA8 8001B1A8 81180059 */ lb $t8, 0x59($t0)
/* 01BDAC 8001B1AC 3C01800E */ lui $at, %hi(D_800DC72C) # $at, 0x800e
/* 01BDB0 8001B1B0 0C01AF62 */ jal func_8006BD88
/* 01BDB0 8001B1B0 0C01AF62 */ jal get_current_map_id
/* 01BDB4 8001B1B4 A438C72C */ sh $t8, %lo(D_800DC72C)($at)
/* 01BDB8 8001B1B8 0C016661 */ jal func_80059984
/* 01BDBC 8001B1BC 00402025 */ move $a0, $v0
@@ -264,7 +264,7 @@ glabel func_8001AE64
/* 01BE38 8001B238 8FA40034 */ lw $a0, 0x34($sp)
/* 01BE3C 8001B23C 11E00008 */ beqz $t7, .L8001B260
/* 01BE40 8001B240 00000000 */ nop
/* 01BE44 8001B244 0C01AF62 */ jal func_8006BD88
/* 01BE44 8001B244 0C01AF62 */ jal get_current_map_id
/* 01BE48 8001B248 00000000 */ nop
/* 01BE4C 8001B24C 8FA50034 */ lw $a1, 0x34($sp)
/* 01BE50 8001B250 0C006CF1 */ jal func_8001B3C4
-253
View File
@@ -1,253 +0,0 @@
.late_rodata
glabel jpt_800E5688
.word L80023614, L800238A8, L80023808, L80023650, L800236DC, L800238A8, L8002363C, L80023664, L80023678, L800238A8, L800238A8, L80023790, L800238A8, L80023628, L800238A8, L8002368C, L800236F0, L800236DC, L80023678, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800236B4, L800238A8, L800236C8, L800236A0, L80023754, L80023704, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023718, L800238A8, L8002372C, L800236A0, L800238A8, L800238A8, L800238A8, L80023740, L800238A8, L80023830, L800238A8, L800238A8, L80023790, L80023790, L800238A8, L80023790, L80023790, L800236A0, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L800237E0, L80023754, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023790, L800237A4, L80023790, L800238A8, L8002386C, L800238A8, L800238A8, L80023754, L800238A8, L80023768, L80023790, L80023790, L800238A8, L8002377C, L80023790, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L800238A8, L80023858, L800238A8, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L80023790, L80023790, L80023790, L80023790, L800238A8, L800238A8, L800238A8, L800238A8, L80023880, L800238A8, L80023628, L800237B8, L80023790, L800238A8, L80023790, L80023894, L800238A8, L800237CC, L80023790
.text
glabel func_800235DC
/* 0241DC 800235DC 8C8E0040 */ lw $t6, 0x40($a0)
/* 0241E0 800235E0 AC850064 */ sw $a1, 0x64($a0)
/* 0241E4 800235E4 81CF0054 */ lb $t7, 0x54($t6)
/* 0241E8 800235E8 00001825 */ move $v1, $zero
/* 0241EC 800235EC 25F8FFFF */ addiu $t8, $t7, -1
/* 0241F0 800235F0 2F010077 */ sltiu $at, $t8, 0x77
/* 0241F4 800235F4 102000AC */ beqz $at, .L800238A8
/* 0241F8 800235F8 0018C080 */ sll $t8, $t8, 2
/* 0241FC 800235FC 3C01800E */ lui $at, %hi(jpt_800E5688) # $at, 0x800e
/* 024200 80023600 00380821 */ addu $at, $at, $t8
/* 024204 80023604 8C385688 */ lw $t8, %lo(jpt_800E5688)($at)
/* 024208 80023608 00000000 */ nop
/* 02420C 8002360C 03000008 */ jr $t8
/* 024210 80023610 00000000 */ nop
glabel L80023614
/* 024214 80023614 24030224 */ li $v1, 548
/* 024218 80023618 2401FFFC */ li $at, -4
/* 02421C 8002361C 00611024 */ and $v0, $v1, $at
/* 024220 80023620 03E00008 */ jr $ra
/* 024224 80023624 24420004 */ addiu $v0, $v0, 4
glabel L80023628
/* 024228 80023628 24030018 */ li $v1, 24
/* 02422C 8002362C 2401FFFC */ li $at, -4
/* 024230 80023630 00611024 */ and $v0, $v1, $at
/* 024234 80023634 03E00008 */ jr $ra
/* 024238 80023638 24420004 */ addiu $v0, $v0, 4
glabel L8002363C
/* 02423C 8002363C 24030018 */ li $v1, 24
/* 024240 80023640 2401FFFC */ li $at, -4
/* 024244 80023644 00611024 */ and $v0, $v1, $at
/* 024248 80023648 03E00008 */ jr $ra
/* 02424C 8002364C 24420004 */ addiu $v0, $v0, 4
glabel L80023650
/* 024250 80023650 2403000C */ li $v1, 12
/* 024254 80023654 2401FFFC */ li $at, -4
/* 024258 80023658 00611024 */ and $v0, $v1, $at
/* 02425C 8002365C 03E00008 */ jr $ra
/* 024260 80023660 24420004 */ addiu $v0, $v0, 4
glabel L80023664
/* 024264 80023664 24030010 */ li $v1, 16
/* 024268 80023668 2401FFFC */ li $at, -4
/* 02426C 8002366C 00611024 */ and $v0, $v1, $at
/* 024270 80023670 03E00008 */ jr $ra
/* 024274 80023674 24420004 */ addiu $v0, $v0, 4
glabel L80023678
/* 024278 80023678 24030014 */ li $v1, 20
/* 02427C 8002367C 2401FFFC */ li $at, -4
/* 024280 80023680 00611024 */ and $v0, $v1, $at
/* 024284 80023684 03E00008 */ jr $ra
/* 024288 80023688 24420004 */ addiu $v0, $v0, 4
glabel L8002368C
/* 02428C 8002368C 2403001C */ li $v1, 28
/* 024290 80023690 2401FFFC */ li $at, -4
/* 024294 80023694 00611024 */ and $v0, $v1, $at
/* 024298 80023698 03E00008 */ jr $ra
/* 02429C 8002369C 24420004 */ addiu $v0, $v0, 4
glabel L800236A0
/* 0242A0 800236A0 24030018 */ li $v1, 24
/* 0242A4 800236A4 2401FFFC */ li $at, -4
/* 0242A8 800236A8 00611024 */ and $v0, $v1, $at
/* 0242AC 800236AC 03E00008 */ jr $ra
/* 0242B0 800236B0 24420004 */ addiu $v0, $v0, 4
glabel L800236B4
/* 0242B4 800236B4 24030006 */ li $v1, 6
/* 0242B8 800236B8 2401FFFC */ li $at, -4
/* 0242BC 800236BC 00611024 */ and $v0, $v1, $at
/* 0242C0 800236C0 03E00008 */ jr $ra
/* 0242C4 800236C4 24420004 */ addiu $v0, $v0, 4
glabel L800236C8
/* 0242C8 800236C8 2403000C */ li $v1, 12
/* 0242CC 800236CC 2401FFFC */ li $at, -4
/* 0242D0 800236D0 00611024 */ and $v0, $v1, $at
/* 0242D4 800236D4 03E00008 */ jr $ra
/* 0242D8 800236D8 24420004 */ addiu $v0, $v0, 4
glabel L800236DC
/* 0242DC 800236DC 24030020 */ li $v1, 32
/* 0242E0 800236E0 2401FFFC */ li $at, -4
/* 0242E4 800236E4 00611024 */ and $v0, $v1, $at
/* 0242E8 800236E8 03E00008 */ jr $ra
/* 0242EC 800236EC 24420004 */ addiu $v0, $v0, 4
glabel L800236F0
/* 0242F0 800236F0 24030008 */ li $v1, 8
/* 0242F4 800236F4 2401FFFC */ li $at, -4
/* 0242F8 800236F8 00611024 */ and $v0, $v1, $at
/* 0242FC 800236FC 03E00008 */ jr $ra
/* 024300 80023700 24420004 */ addiu $v0, $v0, 4
glabel L80023704
/* 024304 80023704 2403000C */ li $v1, 12
/* 024308 80023708 2401FFFC */ li $at, -4
/* 02430C 8002370C 00611024 */ and $v0, $v1, $at
/* 024310 80023710 03E00008 */ jr $ra
/* 024314 80023714 24420004 */ addiu $v0, $v0, 4
glabel L80023718
/* 024318 80023718 24030008 */ li $v1, 8
/* 02431C 8002371C 2401FFFC */ li $at, -4
/* 024320 80023720 00611024 */ and $v0, $v1, $at
/* 024324 80023724 03E00008 */ jr $ra
/* 024328 80023728 24420004 */ addiu $v0, $v0, 4
glabel L8002372C
/* 02432C 8002372C 24030018 */ li $v1, 24
/* 024330 80023730 2401FFFC */ li $at, -4
/* 024334 80023734 00611024 */ and $v0, $v1, $at
/* 024338 80023738 03E00008 */ jr $ra
/* 02433C 8002373C 24420004 */ addiu $v0, $v0, 4
glabel L80023740
/* 024340 80023740 2403000C */ li $v1, 12
/* 024344 80023744 2401FFFC */ li $at, -4
/* 024348 80023748 00611024 */ and $v0, $v1, $at
/* 02434C 8002374C 03E00008 */ jr $ra
/* 024350 80023750 24420004 */ addiu $v0, $v0, 4
glabel L80023754
/* 024354 80023754 24030038 */ li $v1, 56
/* 024358 80023758 2401FFFC */ li $at, -4
/* 02435C 8002375C 00611024 */ and $v0, $v1, $at
/* 024360 80023760 03E00008 */ jr $ra
/* 024364 80023764 24420004 */ addiu $v0, $v0, 4
glabel L80023768
/* 024368 80023768 24030014 */ li $v1, 20
/* 02436C 8002376C 2401FFFC */ li $at, -4
/* 024370 80023770 00611024 */ and $v0, $v1, $at
/* 024374 80023774 03E00008 */ jr $ra
/* 024378 80023778 24420004 */ addiu $v0, $v0, 4
glabel L8002377C
/* 02437C 8002377C 24030010 */ li $v1, 16
/* 024380 80023780 2401FFFC */ li $at, -4
/* 024384 80023784 00611024 */ and $v0, $v1, $at
/* 024388 80023788 03E00008 */ jr $ra
/* 02438C 8002378C 24420004 */ addiu $v0, $v0, 4
glabel L80023790
/* 024390 80023790 24030048 */ li $v1, 72
/* 024394 80023794 2401FFFC */ li $at, -4
/* 024398 80023798 00611024 */ and $v0, $v1, $at
/* 02439C 8002379C 03E00008 */ jr $ra
/* 0243A0 800237A0 24420004 */ addiu $v0, $v0, 4
glabel L800237A4
/* 0243A4 800237A4 24030044 */ li $v1, 68
/* 0243A8 800237A8 2401FFFC */ li $at, -4
/* 0243AC 800237AC 00611024 */ and $v0, $v1, $at
/* 0243B0 800237B0 03E00008 */ jr $ra
/* 0243B4 800237B4 24420004 */ addiu $v0, $v0, 4
glabel L800237B8
/* 0243B8 800237B8 24030020 */ li $v1, 32
/* 0243BC 800237BC 2401FFFC */ li $at, -4
/* 0243C0 800237C0 00611024 */ and $v0, $v1, $at
/* 0243C4 800237C4 03E00008 */ jr $ra
/* 0243C8 800237C8 24420004 */ addiu $v0, $v0, 4
glabel L800237CC
/* 0243CC 800237CC 24030004 */ li $v1, 4
/* 0243D0 800237D0 2401FFFC */ li $at, -4
/* 0243D4 800237D4 00611024 */ and $v0, $v1, $at
/* 0243D8 800237D8 03E00008 */ jr $ra
/* 0243DC 800237DC 24420004 */ addiu $v0, $v0, 4
glabel L800237E0
/* 0243E0 800237E0 30B9000F */ andi $t9, $a1, 0xf
/* 0243E4 800237E4 24080010 */ li $t0, 16
/* 0243E8 800237E8 01191023 */ subu $v0, $t0, $t9
/* 0243EC 800237EC 00A24821 */ addu $t1, $a1, $v0
/* 0243F0 800237F0 24430110 */ addiu $v1, $v0, 0x110
/* 0243F4 800237F4 2401FFFC */ li $at, -4
/* 0243F8 800237F8 00611024 */ and $v0, $v1, $at
/* 0243FC 800237FC AC890064 */ sw $t1, 0x64($a0)
/* 024400 80023800 03E00008 */ jr $ra
/* 024404 80023804 24420004 */ addiu $v0, $v0, 4
glabel L80023808
/* 024408 80023808 30AA000F */ andi $t2, $a1, 0xf
/* 02440C 8002380C 240B0010 */ li $t3, 16
/* 024410 80023810 016A1023 */ subu $v0, $t3, $t2
/* 024414 80023814 00A26021 */ addu $t4, $a1, $v0
/* 024418 80023818 24430120 */ addiu $v1, $v0, 0x120
/* 02441C 8002381C 2401FFFC */ li $at, -4
/* 024420 80023820 00611024 */ and $v0, $v1, $at
/* 024424 80023824 AC8C0064 */ sw $t4, 0x64($a0)
/* 024428 80023828 03E00008 */ jr $ra
/* 02442C 8002382C 24420004 */ addiu $v0, $v0, 4
glabel L80023830
/* 024430 80023830 30AD000F */ andi $t5, $a1, 0xf
/* 024434 80023834 240E0010 */ li $t6, 16
/* 024438 80023838 01CD1023 */ subu $v0, $t6, $t5
/* 02443C 8002383C 00A27821 */ addu $t7, $a1, $v0
/* 024440 80023840 24430028 */ addiu $v1, $v0, 0x28
/* 024444 80023844 2401FFFC */ li $at, -4
/* 024448 80023848 00611024 */ and $v0, $v1, $at
/* 02444C 8002384C AC8F0064 */ sw $t7, 0x64($a0)
/* 024450 80023850 03E00008 */ jr $ra
/* 024454 80023854 24420004 */ addiu $v0, $v0, 4
glabel L80023858
/* 024458 80023858 24030060 */ li $v1, 96
/* 02445C 8002385C 2401FFFC */ li $at, -4
/* 024460 80023860 00611024 */ and $v0, $v1, $at
/* 024464 80023864 03E00008 */ jr $ra
/* 024468 80023868 24420004 */ addiu $v0, $v0, 4
glabel L8002386C
/* 02446C 8002386C 24030008 */ li $v1, 8
/* 024470 80023870 2401FFFC */ li $at, -4
/* 024474 80023874 00611024 */ and $v0, $v1, $at
/* 024478 80023878 03E00008 */ jr $ra
/* 02447C 8002387C 24420004 */ addiu $v0, $v0, 4
glabel L80023880
/* 024480 80023880 24030034 */ li $v1, 52
/* 024484 80023884 2401FFFC */ li $at, -4
/* 024488 80023888 00611024 */ and $v0, $v1, $at
/* 02448C 8002388C 03E00008 */ jr $ra
/* 024490 80023890 24420004 */ addiu $v0, $v0, 4
glabel L80023894
/* 024494 80023894 24030020 */ li $v1, 32
/* 024498 80023898 2401FFFC */ li $at, -4
/* 02449C 8002389C 00611024 */ and $v0, $v1, $at
/* 0244A0 800238A0 03E00008 */ jr $ra
/* 0244A4 800238A4 24420004 */ addiu $v0, $v0, 4
.L800238A8:
glabel L800238A8
/* 0244A8 800238A8 AC800064 */ sw $zero, 0x64($a0)
/* 0244AC 800238AC 2401FFFC */ li $at, -4
/* 0244B0 800238B0 00611024 */ and $v0, $v1, $at
/* 0244B4 800238B4 03E00008 */ jr $ra
/* 0244B8 800238B8 24420004 */ addiu $v0, $v0, 4
+1 -1
View File
@@ -14,7 +14,7 @@ glabel func_80059208
/* 059E24 80059224 AFA600C8 */ sw $a2, 0xc8($sp)
/* 059E28 80059228 10400155 */ beqz $v0, .L80059780
/* 059E2C 8005922C 8FBF001C */ lw $ra, 0x1c($sp)
/* 059E30 80059230 0C01AF62 */ jal func_8006BD88
/* 059E30 80059230 0C01AF62 */ jal get_current_map_id
/* 059E34 80059234 AFA200B4 */ sw $v0, 0xb4($sp)
/* 059E38 80059238 8FA800B4 */ lw $t0, 0xb4($sp)
/* 059E3C 8005923C 14400009 */ bnez $v0, .L80059264
@@ -67,7 +67,7 @@ glabel set_ghost_position_and_rotation
/* 05AB1C 80059F1C AFA3003C */ sw $v1, 0x3c($sp)
/* 05AB20 80059F20 AFA5005C */ sw $a1, 0x5c($sp)
/* 05AB24 80059F24 AFAD004C */ sw $t5, 0x4c($sp)
/* 05AB28 80059F28 0C01AF62 */ jal func_8006BD88
/* 05AB28 80059F28 0C01AF62 */ jal get_current_map_id
/* 05AB2C 80059F2C E7A20094 */ swc1 $f2, 0x94($sp)
/* 05AB30 80059F30 3C188012 */ lui $t8, %hi(D_8011D5AC) # $t8, 0x8012
/* 05AB34 80059F34 8718D5AC */ lh $t8, %lo(D_8011D5AC)($t8)
@@ -1,26 +0,0 @@
glabel func_8007C52C
/* 07D12C 8007C52C 04800006 */ bltz $a0, .L8007C548
/* 07D130 8007C530 3C0E8012 */ lui $t6, %hi(D_80126358) # $t6, 0x8012
/* 07D134 8007C534 8DCE6358 */ lw $t6, %lo(D_80126358)($t6)
/* 07D138 8007C538 3C0F8012 */ lui $t7, %hi(gSpriteCache) # $t7, 0x8012
/* 07D13C 8007C53C 008E082A */ slt $at, $a0, $t6
/* 07D140 8007C540 14200003 */ bnez $at, .L8007C550
/* 07D144 8007C544 00000000 */ nop
.L8007C548:
/* 07D148 8007C548 03E00008 */ jr $ra
/* 07D14C 8007C54C 00001025 */ move $v0, $zero
.L8007C550:
/* 07D150 8007C550 8DEF634C */ lw $t7, %lo(gSpriteCache)($t7)
/* 07D154 8007C554 0004C8C0 */ sll $t9, $a0, 3
/* 07D158 8007C558 01F94021 */ addu $t0, $t7, $t9
/* 07D15C 8007C55C 8D030004 */ lw $v1, 4($t0)
/* 07D160 8007C560 2401FFFF */ li $at, -1
/* 07D164 8007C564 14610003 */ bne $v1, $at, .L8007C574
/* 07D168 8007C568 00601025 */ move $v0, $v1
/* 07D16C 8007C56C 03E00008 */ jr $ra
/* 07D170 8007C570 00001025 */ move $v0, $zero
.L8007C574:
/* 07D174 8007C574 03E00008 */ jr $ra
/* 07D178 8007C578 00000000 */ nop
@@ -1,66 +0,0 @@
glabel get_texture_size_from_id
/* 07D17C 8007C57C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 07D180 8007C580 240E0004 */ li $t6, 4
/* 07D184 8007C584 308F8000 */ andi $t7, $a0, 0x8000
/* 07D188 8007C588 AFBF0014 */ sw $ra, 0x14($sp)
/* 07D18C 8007C58C AFAE0018 */ sw $t6, 0x18($sp)
/* 07D190 8007C590 11E00006 */ beqz $t7, .L8007C5AC
/* 07D194 8007C594 00001025 */ move $v0, $zero
/* 07D198 8007C598 24180002 */ li $t8, 2
/* 07D19C 8007C59C 30997FFF */ andi $t9, $a0, 0x7fff
/* 07D1A0 8007C5A0 AFB80018 */ sw $t8, 0x18($sp)
/* 07D1A4 8007C5A4 24020001 */ li $v0, 1
/* 07D1A8 8007C5A8 03202025 */ move $a0, $t9
.L8007C5AC:
/* 07D1AC 8007C5AC 00021880 */ sll $v1, $v0, 2
/* 07D1B0 8007C5B0 3C088012 */ lui $t0, %hi(gTextureAssetID) # $t0, 0x8012
/* 07D1B4 8007C5B4 01034021 */ addu $t0, $t0, $v1
/* 07D1B8 8007C5B8 8D086338 */ lw $t0, %lo(gTextureAssetID)($t0)
/* 07D1BC 8007C5BC 00000000 */ nop
/* 07D1C0 8007C5C0 0088082A */ slt $at, $a0, $t0
/* 07D1C4 8007C5C4 10200003 */ beqz $at, .L8007C5D4
/* 07D1C8 8007C5C8 00000000 */ nop
/* 07D1CC 8007C5CC 04810003 */ bgez $a0, .L8007C5DC
/* 07D1D0 8007C5D0 3C098012 */ lui $t1, %hi(gTextureAssetTable) # $t1, 0x8012
.L8007C5D4:
/* 07D1D4 8007C5D4 1000001E */ b .L8007C650
/* 07D1D8 8007C5D8 00001025 */ move $v0, $zero
.L8007C5DC:
/* 07D1DC 8007C5DC 01234821 */ addu $t1, $t1, $v1
/* 07D1E0 8007C5E0 8D296320 */ lw $t1, %lo(gTextureAssetTable)($t1)
/* 07D1E4 8007C5E4 00045080 */ sll $t2, $a0, 2
/* 07D1E8 8007C5E8 3C058012 */ lui $a1, %hi(gTempTextureHeader) # $a1, 0x8012
/* 07D1EC 8007C5EC 8CA5636C */ lw $a1, %lo(gTempTextureHeader)($a1)
/* 07D1F0 8007C5F0 012A1021 */ addu $v0, $t1, $t2
/* 07D1F4 8007C5F4 8C460000 */ lw $a2, ($v0)
/* 07D1F8 8007C5F8 8C4B0004 */ lw $t3, 4($v0)
/* 07D1FC 8007C5FC 90AC001D */ lbu $t4, 0x1d($a1)
/* 07D200 8007C600 8FA40018 */ lw $a0, 0x18($sp)
/* 07D204 8007C604 1180000A */ beqz $t4, .L8007C630
/* 07D208 8007C608 01663823 */ subu $a3, $t3, $a2
/* 07D20C 8007C60C 0C01DB9A */ jal load_asset_to_address
/* 07D210 8007C610 24070028 */ li $a3, 40
/* 07D214 8007C614 3C038012 */ lui $v1, %hi(gTempTextureHeader) # $v1, 0x8012
/* 07D218 8007C618 8C63636C */ lw $v1, %lo(gTempTextureHeader)($v1)
/* 07D21C 8007C61C 0C03186B */ jal byteswap32
/* 07D220 8007C620 24640020 */ addiu $a0, $v1, 0x20
/* 07D224 8007C624 3C058012 */ lui $a1, %hi(gTempTextureHeader) # $a1, 0x8012
/* 07D228 8007C628 8CA5636C */ lw $a1, %lo(gTempTextureHeader)($a1)
/* 07D22C 8007C62C 00403825 */ move $a3, $v0
.L8007C630:
/* 07D230 8007C630 94A30012 */ lhu $v1, 0x12($a1)
/* 07D234 8007C634 00000000 */ nop
/* 07D238 8007C638 00036A03 */ sra $t5, $v1, 8
/* 07D23C 8007C63C 31AEFFFF */ andi $t6, $t5, 0xffff
/* 07D240 8007C640 000E7880 */ sll $t7, $t6, 2
/* 07D244 8007C644 01EE7823 */ subu $t7, $t7, $t6
/* 07D248 8007C648 000F7940 */ sll $t7, $t7, 5
/* 07D24C 8007C64C 01E71021 */ addu $v0, $t7, $a3
.L8007C650:
/* 07D250 8007C650 8FBF0014 */ lw $ra, 0x14($sp)
/* 07D254 8007C654 27BD0028 */ addiu $sp, $sp, 0x28
/* 07D258 8007C658 03E00008 */ jr $ra
/* 07D25C 8007C65C 00000000 */ nop
@@ -1,107 +0,0 @@
glabel load_sprite_info
/* 07D4E0 8007C8E0 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 07D4E4 8007C8E4 AFB00018 */ sw $s0, 0x18($sp)
/* 07D4E8 8007C8E8 00808025 */ move $s0, $a0
/* 07D4EC 8007C8EC AFBF002C */ sw $ra, 0x2c($sp)
/* 07D4F0 8007C8F0 AFB40028 */ sw $s4, 0x28($sp)
/* 07D4F4 8007C8F4 AFB30024 */ sw $s3, 0x24($sp)
/* 07D4F8 8007C8F8 AFB20020 */ sw $s2, 0x20($sp)
/* 07D4FC 8007C8FC AFB1001C */ sw $s1, 0x1c($sp)
/* 07D500 8007C900 AFA50034 */ sw $a1, 0x34($sp)
/* 07D504 8007C904 AFA60038 */ sw $a2, 0x38($sp)
/* 07D508 8007C908 04800007 */ bltz $a0, .L8007C928
/* 07D50C 8007C90C AFA7003C */ sw $a3, 0x3c($sp)
/* 07D510 8007C910 3C0E8012 */ lui $t6, %hi(D_80126354) # $t6, 0x8012
/* 07D514 8007C914 8DCE6354 */ lw $t6, %lo(D_80126354)($t6)
/* 07D518 8007C918 3C088012 */ lui $t0, %hi(gSpriteOffsetTable) # $t0, 0x8012
/* 07D51C 8007C91C 008E082A */ slt $at, $a0, $t6
/* 07D520 8007C920 1420000A */ bnez $at, .L8007C94C
/* 07D524 8007C924 00104880 */ sll $t1, $s0, 2
.L8007C928:
/* 07D528 8007C928 8FAF0034 */ lw $t7, 0x34($sp)
/* 07D52C 8007C92C 00001025 */ move $v0, $zero
/* 07D530 8007C930 ADE00000 */ sw $zero, ($t7)
/* 07D534 8007C934 8FB80038 */ lw $t8, 0x38($sp)
/* 07D538 8007C938 00000000 */ nop
/* 07D53C 8007C93C AF000000 */ sw $zero, ($t8)
/* 07D540 8007C940 8FB9003C */ lw $t9, 0x3c($sp)
/* 07D544 8007C944 10000040 */ b .L8007CA48
/* 07D548 8007C948 AF200000 */ sw $zero, ($t9)
.L8007C94C:
/* 07D54C 8007C94C 8D086348 */ lw $t0, %lo(gSpriteOffsetTable)($t0)
/* 07D550 8007C950 3C138012 */ lui $s3, %hi(gCurrentSprite) # $s3, 0x8012
/* 07D554 8007C954 01091021 */ addu $v0, $t0, $t1
/* 07D558 8007C958 8C460000 */ lw $a2, ($v0)
/* 07D55C 8007C95C 8C4A0004 */ lw $t2, 4($v0)
/* 07D560 8007C960 8E736350 */ lw $s3, %lo(gCurrentSprite)($s3)
/* 07D564 8007C964 2404000C */ li $a0, 12
/* 07D568 8007C968 01463823 */ subu $a3, $t2, $a2
/* 07D56C 8007C96C 0C01DB9A */ jal load_asset_to_address
/* 07D570 8007C970 02602825 */ move $a1, $s3
/* 07D574 8007C974 926B000C */ lbu $t3, 0xc($s3)
/* 07D578 8007C978 866C0000 */ lh $t4, ($s3)
/* 07D57C 8007C97C 0C01EB9D */ jal load_texture
/* 07D580 8007C980 016C2021 */ addu $a0, $t3, $t4
/* 07D584 8007C984 1040FFE8 */ beqz $v0, .L8007C928
/* 07D588 8007C988 00402025 */ move $a0, $v0
/* 07D58C 8007C98C 904D0002 */ lbu $t5, 2($v0)
/* 07D590 8007C990 8FAF0040 */ lw $t7, 0x40($sp)
/* 07D594 8007C994 31AE000F */ andi $t6, $t5, 0xf
/* 07D598 8007C998 0C01ECAF */ jal free_texture
/* 07D59C 8007C99C ADEE0000 */ sw $t6, ($t7)
/* 07D5A0 8007C9A0 8FB10044 */ lw $s1, 0x44($sp)
/* 07D5A4 8007C9A4 0000A025 */ move $s4, $zero
/* 07D5A8 8007C9A8 AE200000 */ sw $zero, ($s1)
/* 07D5AC 8007C9AC 86630002 */ lh $v1, 2($s3)
/* 07D5B0 8007C9B0 02609025 */ move $s2, $s3
/* 07D5B4 8007C9B4 1860001A */ blez $v1, .L8007CA20
/* 07D5B8 8007C9B8 8FAB003C */ lw $t3, 0x3c($sp)
.L8007C9BC:
/* 07D5BC 8007C9BC 9250000C */ lbu $s0, 0xc($s2)
/* 07D5C0 8007C9C0 9258000D */ lbu $t8, 0xd($s2)
/* 07D5C4 8007C9C4 00000000 */ nop
/* 07D5C8 8007C9C8 0218082A */ slt $at, $s0, $t8
/* 07D5CC 8007C9CC 1020000F */ beqz $at, .L8007CA0C
/* 07D5D0 8007C9D0 00000000 */ nop
.L8007C9D4:
/* 07D5D4 8007C9D4 86790000 */ lh $t9, ($s3)
/* 07D5D8 8007C9D8 0C01F15F */ jal get_texture_size_from_id
/* 07D5DC 8007C9DC 03302021 */ addu $a0, $t9, $s0
/* 07D5E0 8007C9E0 8E280000 */ lw $t0, ($s1)
/* 07D5E4 8007C9E4 26100001 */ addiu $s0, $s0, 1
/* 07D5E8 8007C9E8 01024821 */ addu $t1, $t0, $v0
/* 07D5EC 8007C9EC AE290000 */ sw $t1, ($s1)
/* 07D5F0 8007C9F0 924A000D */ lbu $t2, 0xd($s2)
/* 07D5F4 8007C9F4 00000000 */ nop
/* 07D5F8 8007C9F8 020A082A */ slt $at, $s0, $t2
/* 07D5FC 8007C9FC 1420FFF5 */ bnez $at, .L8007C9D4
/* 07D600 8007CA00 00000000 */ nop
/* 07D604 8007CA04 86630002 */ lh $v1, 2($s3)
/* 07D608 8007CA08 00000000 */ nop
.L8007CA0C:
/* 07D60C 8007CA0C 26940001 */ addiu $s4, $s4, 1
/* 07D610 8007CA10 0283082A */ slt $at, $s4, $v1
/* 07D614 8007CA14 1420FFE9 */ bnez $at, .L8007C9BC
/* 07D618 8007CA18 26520001 */ addiu $s2, $s2, 1
/* 07D61C 8007CA1C 8FAB003C */ lw $t3, 0x3c($sp)
.L8007CA20:
/* 07D620 8007CA20 24020001 */ li $v0, 1
/* 07D624 8007CA24 AD630000 */ sw $v1, ($t3)
/* 07D628 8007CA28 8FAD0034 */ lw $t5, 0x34($sp)
/* 07D62C 8007CA2C 866C0004 */ lh $t4, 4($s3)
/* 07D630 8007CA30 00000000 */ nop
/* 07D634 8007CA34 ADAC0000 */ sw $t4, ($t5)
/* 07D638 8007CA38 8FAF0038 */ lw $t7, 0x38($sp)
/* 07D63C 8007CA3C 866E0006 */ lh $t6, 6($s3)
/* 07D640 8007CA40 00000000 */ nop
/* 07D644 8007CA44 ADEE0000 */ sw $t6, ($t7)
.L8007CA48:
/* 07D648 8007CA48 8FBF002C */ lw $ra, 0x2c($sp)
/* 07D64C 8007CA4C 8FB00018 */ lw $s0, 0x18($sp)
/* 07D650 8007CA50 8FB1001C */ lw $s1, 0x1c($sp)
/* 07D654 8007CA54 8FB20020 */ lw $s2, 0x20($sp)
/* 07D658 8007CA58 8FB30024 */ lw $s3, 0x24($sp)
/* 07D65C 8007CA5C 8FB40028 */ lw $s4, 0x28($sp)
/* 07D660 8007CA60 03E00008 */ jr $ra
/* 07D664 8007CA64 27BD0030 */ addiu $sp, $sp, 0x30
@@ -1,125 +0,0 @@
glabel update_colour_cycle
/* 07FE4C 8007F24C 8C8E0000 */ lw $t6, ($a0)
/* 07FE50 8007F250 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 07FE54 8007F254 29C10002 */ slti $at, $t6, 2
/* 07FE58 8007F258 1420006C */ bnez $at, .L8007F40C
/* 07FE5C 8007F25C 00000000 */ nop
/* 07FE60 8007F260 8C8F0008 */ lw $t7, 8($a0)
/* 07FE64 8007F264 8C83000C */ lw $v1, 0xc($a0)
/* 07FE68 8007F268 01E51021 */ addu $v0, $t7, $a1
/* 07FE6C 8007F26C 0043082A */ slt $at, $v0, $v1
/* 07FE70 8007F270 14200006 */ bnez $at, .L8007F28C
/* 07FE74 8007F274 AC820008 */ sw $v0, 8($a0)
.L8007F278:
/* 07FE78 8007F278 0043C823 */ subu $t9, $v0, $v1
/* 07FE7C 8007F27C 0323082A */ slt $at, $t9, $v1
/* 07FE80 8007F280 AC990008 */ sw $t9, 8($a0)
/* 07FE84 8007F284 1020FFFC */ beqz $at, .L8007F278
/* 07FE88 8007F288 03201025 */ move $v0, $t9
.L8007F28C:
/* 07FE8C 8007F28C 8C830004 */ lw $v1, 4($a0)
/* 07FE90 8007F290 00000000 */ nop
/* 07FE94 8007F294 000370C0 */ sll $t6, $v1, 3
/* 07FE98 8007F298 008E7821 */ addu $t7, $a0, $t6
/* 07FE9C 8007F29C 8DE50018 */ lw $a1, 0x18($t7)
/* 07FEA0 8007F2A0 00000000 */ nop
/* 07FEA4 8007F2A4 0045082A */ slt $at, $v0, $a1
/* 07FEA8 8007F2A8 14200013 */ bnez $at, .L8007F2F8
/* 07FEAC 8007F2AC 00000000 */ nop
.L8007F2B0:
/* 07FEB0 8007F2B0 8C8E0000 */ lw $t6, ($a0)
/* 07FEB4 8007F2B4 24790001 */ addiu $t9, $v1, 1
/* 07FEB8 8007F2B8 0045C023 */ subu $t8, $v0, $a1
/* 07FEBC 8007F2BC 032E082A */ slt $at, $t9, $t6
/* 07FEC0 8007F2C0 AC980008 */ sw $t8, 8($a0)
/* 07FEC4 8007F2C4 AC990004 */ sw $t9, 4($a0)
/* 07FEC8 8007F2C8 14200003 */ bnez $at, .L8007F2D8
/* 07FECC 8007F2CC 03201825 */ move $v1, $t9
/* 07FED0 8007F2D0 AC800004 */ sw $zero, 4($a0)
/* 07FED4 8007F2D4 00001825 */ move $v1, $zero
.L8007F2D8:
/* 07FED8 8007F2D8 000378C0 */ sll $t7, $v1, 3
/* 07FEDC 8007F2DC 008FC021 */ addu $t8, $a0, $t7
/* 07FEE0 8007F2E0 8F050018 */ lw $a1, 0x18($t8)
/* 07FEE4 8007F2E4 8C820008 */ lw $v0, 8($a0)
/* 07FEE8 8007F2E8 00000000 */ nop
/* 07FEEC 8007F2EC 0045082A */ slt $at, $v0, $a1
/* 07FEF0 8007F2F0 1020FFEF */ beqz $at, .L8007F2B0
/* 07FEF4 8007F2F4 00000000 */ nop
.L8007F2F8:
/* 07FEF8 8007F2F8 8C990000 */ lw $t9, ($a0)
/* 07FEFC 8007F2FC 24650001 */ addiu $a1, $v1, 1
/* 07FF00 8007F300 00B9082A */ slt $at, $a1, $t9
/* 07FF04 8007F304 00603025 */ move $a2, $v1
/* 07FF08 8007F308 14200002 */ bnez $at, .L8007F314
/* 07FF0C 8007F30C 00A03825 */ move $a3, $a1
/* 07FF10 8007F310 00003825 */ move $a3, $zero
.L8007F314:
/* 07FF14 8007F314 000670C0 */ sll $t6, $a2, 3
/* 07FF18 8007F318 008E1821 */ addu $v1, $a0, $t6
/* 07FF1C 8007F31C 8C780018 */ lw $t8, 0x18($v1)
/* 07FF20 8007F320 00027C00 */ sll $t7, $v0, 0x10
/* 07FF24 8007F324 01F8001A */ div $zero, $t7, $t8
/* 07FF28 8007F328 0007C8C0 */ sll $t9, $a3, 3
/* 07FF2C 8007F32C 00996821 */ addu $t5, $a0, $t9
/* 07FF30 8007F330 90680014 */ lbu $t0, 0x14($v1)
/* 07FF34 8007F334 91AC0014 */ lbu $t4, 0x14($t5)
/* 07FF38 8007F338 91AE0015 */ lbu $t6, 0x15($t5)
/* 07FF3C 8007F33C 0188C823 */ subu $t9, $t4, $t0
/* 07FF40 8007F340 90690015 */ lbu $t1, 0x15($v1)
/* 07FF44 8007F344 906A0016 */ lbu $t2, 0x16($v1)
/* 07FF48 8007F348 906B0017 */ lbu $t3, 0x17($v1)
/* 07FF4C 8007F34C 17000002 */ bnez $t8, .L8007F358
/* 07FF50 8007F350 00000000 */ nop
/* 07FF54 8007F354 0007000D */ break 7
.L8007F358:
/* 07FF58 8007F358 2401FFFF */ li $at, -1
/* 07FF5C 8007F35C 17010004 */ bne $t8, $at, .L8007F370
/* 07FF60 8007F360 3C018000 */ lui $at, 0x8000
/* 07FF64 8007F364 15E10002 */ bne $t7, $at, .L8007F370
/* 07FF68 8007F368 00000000 */ nop
/* 07FF6C 8007F36C 0006000D */ break 6
.L8007F370:
/* 07FF70 8007F370 AFAE0008 */ sw $t6, 8($sp)
/* 07FF74 8007F374 91AF0016 */ lbu $t7, 0x16($t5)
/* 07FF78 8007F378 00000000 */ nop
/* 07FF7C 8007F37C AFAF0004 */ sw $t7, 4($sp)
/* 07FF80 8007F380 91B80017 */ lbu $t8, 0x17($t5)
/* 07FF84 8007F384 00000000 */ nop
/* 07FF88 8007F388 AFB80000 */ sw $t8, ($sp)
/* 07FF8C 8007F38C 00002812 */ mflo $a1
/* 07FF90 8007F390 00000000 */ nop
/* 07FF94 8007F394 00000000 */ nop
/* 07FF98 8007F398 03250019 */ multu $t9, $a1
/* 07FF9C 8007F39C 00007012 */ mflo $t6
/* 07FFA0 8007F3A0 000E7C02 */ srl $t7, $t6, 0x10
/* 07FFA4 8007F3A4 01E8C021 */ addu $t8, $t7, $t0
/* 07FFA8 8007F3A8 A0980010 */ sb $t8, 0x10($a0)
/* 07FFAC 8007F3AC 8FB90008 */ lw $t9, 8($sp)
/* 07FFB0 8007F3B0 00000000 */ nop
/* 07FFB4 8007F3B4 03297023 */ subu $t6, $t9, $t1
/* 07FFB8 8007F3B8 01C50019 */ multu $t6, $a1
/* 07FFBC 8007F3BC 00007812 */ mflo $t7
/* 07FFC0 8007F3C0 000FC402 */ srl $t8, $t7, 0x10
/* 07FFC4 8007F3C4 0309C821 */ addu $t9, $t8, $t1
/* 07FFC8 8007F3C8 A0990011 */ sb $t9, 0x11($a0)
/* 07FFCC 8007F3CC 8FAE0004 */ lw $t6, 4($sp)
/* 07FFD0 8007F3D0 00000000 */ nop
/* 07FFD4 8007F3D4 01CA7823 */ subu $t7, $t6, $t2
/* 07FFD8 8007F3D8 01E50019 */ multu $t7, $a1
/* 07FFDC 8007F3DC 0000C012 */ mflo $t8
/* 07FFE0 8007F3E0 0018CC02 */ srl $t9, $t8, 0x10
/* 07FFE4 8007F3E4 032A7021 */ addu $t6, $t9, $t2
/* 07FFE8 8007F3E8 A08E0012 */ sb $t6, 0x12($a0)
/* 07FFEC 8007F3EC 8FAF0000 */ lw $t7, ($sp)
/* 07FFF0 8007F3F0 00000000 */ nop
/* 07FFF4 8007F3F4 01EBC023 */ subu $t8, $t7, $t3
/* 07FFF8 8007F3F8 03050019 */ multu $t8, $a1
/* 07FFFC 8007F3FC 0000C812 */ mflo $t9
/* 080000 8007F400 00197402 */ srl $t6, $t9, 0x10
/* 080004 8007F404 01CB7821 */ addu $t7, $t6, $t3
/* 080008 8007F408 A08F0013 */ sb $t7, 0x13($a0)
.L8007F40C:
/* 08000C 8007F40C 03E00008 */ jr $ra
/* 080010 8007F410 27BD0020 */ addiu $sp, $sp, 0x20
+44 -108
View File
@@ -310,13 +310,30 @@ typedef struct Settings {
/* 0x0117 */ u8 display_times;
} Settings;
/* Size: 8 bytes */
typedef struct LevelHeader_70_18 {
s32 unk0; //0x0000001E
u8 red; //0xFF
u8 green; //0x70
u8 blue; //0x00
u8 alpha; //0xFF
} LevelHeader_70_18;
/* Unknown size */
typedef struct LevelHeader_70 {
u8 pad0[0x10];
/* 0x10 */ u8 red;
/* 0x11 */ u8 green;
/* 0x12 */ u8 blue;
/* 0x13 */ u8 alpha;
/* 0x00 */ s32 unk0; //0x00000004
/* 0x04 */ s32 unk4; //0x00000000
/* 0x08 */ s32 unk8; //0x00000000
/* 0x0C */ s32 unkC; //0x00000000
/* 0x10 */ u8 red; //0x72
/* 0x11 */ u8 green; //0x75
/* 0x12 */ u8 blue; //0x73
/* 0x13 */ u8 alpha; //0x20
/* 0x14 */ u8 red2; //0xFF
/* 0x15 */ u8 green2; //0x00
/* 0x16 */ u8 blue2; //0x00
/* 0x17 */ u8 alpha2; //0xFF
/* 0x18 */ LevelHeader_70_18 unk18[1]; // Actual length depends on unk0
} LevelHeader_70;
// Used to update the pulsating lights in Spaceport Alpha
@@ -669,7 +686,7 @@ typedef struct ObjectHeader24 {
} ObjectHeader24;
typedef struct ObjectHeader {
u8 pad0[0x4];
/* 0x00 */ s32 unk0;
/* 0x04 */ f32 shadowScale;
/* 0x08 */ f32 unk8;
/* 0x0C */ f32 scale;
@@ -683,9 +700,12 @@ typedef struct ObjectHeader {
/* 0x2C */ f32 unk2C;
/* 0x30 */ u16 unk30;
/* 0x32 */ s16 unk32;
/* 0x32 */ s16 unk34;
/* 0x32 */ s16 unk36;
u8 pad38[5];
/* 0x34 */ s16 unk34;
/* 0x36 */ s16 unk36;
union {
/* 0x38 */ s16 unk38;
/* 0x38 */ u8 pad38[4];
};
/* 0x3D */ u8 unk3D;
/* 0x3E */ s16 unk3E;
/* 0x40 */ s16 unk40;
@@ -696,7 +716,8 @@ typedef struct ObjectHeader {
/* 0x4A */ s16 unk4A;
/* 0x4C */ s16 unk4C;
/* 0x4E */ s16 drawDistance;
u8 pad50[3];
/* 0x50 */ s16 unk50;
/* 0x52 */ s8 unk52;
/* 0x53 */ s8 modelType;
/* 0x54 */ s8 behaviorId;
/* 0x55 */ s8 numberOfModelIds; // size of array pointed by Object->unk68
@@ -743,17 +764,17 @@ typedef struct Object_44 {
} Object_44;
typedef struct ObjectInteraction {
struct Object *obj;
f32 x_position;
f32 y_position;
f32 z_position;
u8 hitboxRadius;
u8 unk11;
u8 pushForce;
u8 distance;
s16 flags;
s8 unk16;
s8 unk17;
/* 0x00 */ struct Object *obj;
/* 0x04 */ f32 x_position;
/* 0x08 */ f32 y_position;
/* 0x0C */ f32 z_position;
/* 0x10 */ u8 hitboxRadius;
/* 0x11 */ u8 unk11;
/* 0x12 */ u8 pushForce;
/* 0x13 */ u8 distance;
/* 0x14 */ s16 flags;
/* 0x16 */ s8 unk16;
/* 0x17 */ s8 unk17;
} ObjectInteraction;
typedef struct ShadowData {
@@ -762,6 +783,7 @@ typedef struct ShadowData {
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
} ShadowData;
typedef struct Object_54 {
@@ -794,20 +816,6 @@ typedef struct Object_54 {
f32 unk2C;
} Object_54;
typedef struct Object_58_4 {
u8 pad0[0x12];
u16 unk12;
} Object_58_4;
typedef struct Object_58 {
f32 unk0;
Object_58_4 *unk4;
s16 unk8;
s16 unkA;
s16 unkC;
s16 unkE;
} Object_58;
typedef f32 FakeHalfMatrix[2][4];
typedef struct Object_5C {
union {
@@ -1478,7 +1486,6 @@ typedef struct Object_64 {
Object_NPC npc;
Object_TT tt;
Object_Bridge_WhaleRamp bridge_whale_ramp;
Object_8001B7A8 obj8001B7A8;
Object_80021400_64 obj80021400_64;
Object_Log log;
Object_Fireball_Octoweapon fireball_octoweapon;
@@ -1719,78 +1726,7 @@ typedef struct Object {
/* 0x008C */ u32 unk8C;
/* 0x0090 */ u32 unk90;
/* 0x0094 */ u32 unk94;
/* 0x0098 */ Object_64 obj;
// May be a part of obj (likely Object_Player).
/* 0x02B8 */ u8 pad2A8[0x8];
/* 0x02C0 */ f32 unk2C0;
/* 0x02C4 */ u8 red;
/* 0x02C5 */ u8 blue;
/* 0x02C6 */ u8 green;
/* 0x02C7 */ u8 alpha;
/* 0x02C8 */ u32 unk2C8;
/* 0x02CC */ u32 unk2CC;
/* 0x02D0 */ u32 unk2D0;
/* 0x02D4 */ u32 unk2D4;
/* 0x02D8 */ u32 unk2D8;
/* 0x02DC */ u16 unk2DC;
/* 0x02DE */ u16 unk2DE;
/* 0x02E0 */ u16 unk2E0;
/* 0x02E2 */ u16 unk2E2;
/* 0x02E4 */ u32 unk2E4;
/* 0x02E8 */ f32 unk2E8;
/* 0x02EC */ f32 unk2EC;
/* 0x02F0 */ u32 unk2F0;
/* 0x02F4 */ f32 shadow_scale;
/* 0x02F8 */ void *unk2F8;
/* 0x02FC */ u16 unk2FC;
/* 0x02FE */ u16 unk2FE;
/* 0x0300 */ u32 unk300;
/* 0x0304 */ f32 unk0304;
/* 0x0308 */ u32 unk308;
/* 0x030C */ u32 unk30C;
/* 0x0310 */ u32 unk310;
/* 0x0314 */ u32 unk314;
/* 0x0318 */ void *nearest_obj_ptr;
/* 0x031C */ f32 unk31C;
/* 0x0320 */ f32 unk320;
/* 0x0324 */ f32 unk324;
/* 0x0328 */ u32 unk328;
/* 0x032C */ u32 unk32C;
/* 0x0330 */ u32 unk330;
/* 0x0334 */ u32 unk334;
/* 0x0338 */ u32 unk338;
/* 0x033C */ u32 unk33C;
/* 0x0340 */ u32 unk340;
/* 0x0344 */ void *unk344;
/* 0x0348 */ void *unk348;
/* 0x034C */ void *unk34C;
/* 0x0350 */ void *unk350;
/* 0x0354 */ u32 unk354;
/* 0x0358 */ u32 unk358;
/* 0x035C */ u32 unk35C;
/* 0x0360 */ u32 unk360;
/* 0x0364 */ u32 unk364;
/* 0x0368 */ u32 unk368;
/* 0x036C */ u32 unk36C;
/* 0x0370 */ void *unk370;
/* 0x0374 */ s32 unk374;
u32 unk378[174]; // Not an array. Unknown values.
/* 0x0098 */ Object_8001B7A8 obj;
} Object;
// Unused
+2 -1
View File
@@ -237,7 +237,8 @@ GLOBAL_ASM("asm/non_matchings/audiosfx/func_80004668.s")
void func_8000488C(u8 *arg0) {
ALEvent sp_18;
sp_18.type = 1024;
((u32 *)(&sp_18))[1] = (u32)arg0;
//((u32 *)(&sp_18))[1] = (u32)arg0;
sp_18.msg.osc.vs = (ALVoiceState *) arg0; //Not really a voice state, but not sure what else it is.
if (arg0) {
arg0[0x3e] &= ~(1 << 4);
alEvtqPostEvent(&(gAlSndPlayerPtr->evtq), &sp_18, 0);
+2 -2
View File
@@ -474,7 +474,7 @@ void load_level(s32 levelId, s32 numberOfPlayers, s32 entranceId, Vehicle vehicl
for (var_s0 = 0; var_s0 < 7; var_s0++) {
if ((s32) gCurrentLevelHeader->unk74[var_s0] != -1) {
gCurrentLevelHeader->unk74[var_s0] = (s8 *) get_misc_asset((s32) gCurrentLevelHeader->unk74[var_s0]);
func_8007F1E8((unk8007F1E8 *) gCurrentLevelHeader->unk74[var_s0]);
func_8007F1E8((LevelHeader_70 *) gCurrentLevelHeader->unk74[var_s0]);
}
}
@@ -605,7 +605,7 @@ void func_8006BD10(f32 arg0) {
}
}
s32 func_8006BD88(void) {
s32 get_current_map_id(void) {
return gMapId;
}

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