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

More various labellings (#446)

Browse Source 
* bumble

* rumble done basically

* printf is looking better now too

* racer stuff

* model offsets

* two wave things

* obj id

* fix object ids

* randomly remembered to fix alignment on these

* fix ids part 2

* format

* fix warning

* identify baseline table

* boss race IDs

* lots of hud

* last of the current feasible hud stuff

* Update README.md

* this name

* neat

* I randomly remembered why this exists

* anti tamper define

* object elevation

* ai nodes

* particle emitters

* objects

* spectate cams

* gost

* michael bay

* door

* okay thats enough

* gost

* fix build errors

* format

* Update include/level_object_entries.h

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/objects.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2024-05-03 17:24:00 +01:00
committed by GitHub
co-authored by Ryan Myers
parent b92f46a46c
commit 69fe4d3b3d
69 changed files with 2139 additions and 1745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -3
View File
@@ -16,14 +16,16 @@ ifeq ($(VERSION),us_1.0)
DEFINES += VERSION_US_1_0=1
DEFINES += F3DDKR_GBI=1
endif
ifeq ($(NON_MATCHING),1)
DEFINES += NON_MATCHING=1
endif
ifeq ($(NON_EQUIVALENT),1)
DEFINES += NON_EQUIVALENT=1
DEFINES += NON_MATCHING=1
NON_MATCHING = 1
endif
ifeq ($(NON_MATCHING),1)
DEFINES += NON_MATCHING=1
else
DEFINES += ANTI_TAMPER=1
endif
# Whether to hide commands or not
VERBOSE ?= 0
README.md
+25 -25
View File
@@ -9,7 +9,7 @@ As of January 26, 2024, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 66.48%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 36.75%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 39.38%
<!-- README_SCORE_SUMMARY_END -->
---
@@ -126,31 +126,31 @@ s32 is_drumstick_unlocked(void) {
```
<!-- README_SCORE_BEGIN -->
As of April 29, 2024, this is our current score:
As of May 3, 2024, this is our current score:
```
=================================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------- 66.48% Complete (69.07% NON_MATCHING) -------------
# Decompiled functions: 1681
# GLOBAL_ASM remaining: 164
# NON_MATCHING functions: 15
# NON_EQUIVALENT WIP functions: 55
-------------------------- Game Status --------------------------
Balloons: 31/47, Keys: 3/4, Trophies: 3/5
T.T. Amulets: 3/4, Wizpig Amulets: 3/4
-----------------------------------------------------------------
We are racing in Windmill Plains. (Lap 3/3)
=================================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------------ 36.75% Complete ------------------------
# Documented functions: 863
# Undocumented remaining: 705
-------------------------- Game Status --------------------------
Balloons: 18/47, Keys: 2/4, Trophies: 1/5
T.T. Amulets: 2/4, Wizpig Amulets: 1/4
-----------------------------------------------------------------
We are collecting silver coins in Walrus Cove. (2/8 silver coins)
=================================================================
=====================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 66.48% Complete (69.07% NON_MATCHING) ---------------
# Decompiled functions: 1681
# GLOBAL_ASM remaining: 164
# NON_MATCHING functions: 15
# NON_EQUIVALENT WIP functions: 55
---------------------------- Game Status ----------------------------
Balloons: 31/47, Keys: 3/4, Trophies: 3/5
T.T. Amulets: 3/4, Wizpig Amulets: 3/4
---------------------------------------------------------------------
We are racing in Windmill Plains. (Lap 3/3)
=====================================================================
ADVENTURE TWO (Cleanup & Documentation)
-------------------------- 39.38% Complete --------------------------
# Documented functions: 942
# Undocumented remaining: 626
---------------------------- Game Status ----------------------------
Balloons: 19/47, Keys: 2/4, Trophies: 1/5
T.T. Amulets: 2/4, Wizpig Amulets: 1/4
---------------------------------------------------------------------
We are collecting silver coins in Snowball Valley. (8/8 silver coins)
=====================================================================
```
<!-- README_SCORE_END -->
asm/assets/assets.s
+6 -6
View File
@@ -8502,8 +8502,8 @@ glabel ASSET_MISC_RACER_HANDLING
.incbin "./build/us_1.0/assets/misc/racer_stats/racer_handling_data.bin"
glabel ASSET_MISC_RACER_UNUSED_11
.incbin "./build/us_1.0/assets/misc/racer_stats/racer_unused_11_data.bin"
glabel ASSET_MISC_12
.incbin "./build/us_1.0/assets/misc/unlabeled/asset_misc_12.bin"
glabel ASSET_MISC_BALLOON_DATA
.incbin "./build/us_1.0/assets/misc/unlabeled/balloon_data.bin"
glabel ASSET_MISC_13
.incbin "./build/us_1.0/assets/misc/unlabeled/asset_misc_13.bin"
glabel ASSET_MISC_14
@@ -8526,8 +8526,8 @@ glabel ASSET_MISC_MAGNET_DATA
.incbin "./build/us_1.0/assets/misc/unlabeled/magnet_data.bin"
glabel ASSET_MISC_23
.incbin "./build/us_1.0/assets/misc/unlabeled/asset_misc_23.bin"
glabel ASSET_MISC_24
.incbin "./build/us_1.0/assets/misc/unlabeled/asset_misc_24.bin"
glabel ASSET_MISC_GHOST_UNLOCK_TIMES
.incbin "./build/us_1.0/assets/misc/unlabeled/ghost_unlock_times.bin"
glabel ASSET_MISC_25
.incbin "./build/us_1.0/assets/misc/unlabeled/asset_misc_25.bin"
glabel ASSET_MISC_TRACKS_MENU_IDS
@@ -8636,7 +8636,7 @@ glabel ASSET_MISC_TABLE
.word (ASSET_MISC_RACER_WEIGHT - ASSET_MISC) / 4
.word (ASSET_MISC_RACER_HANDLING - ASSET_MISC) / 4
.word (ASSET_MISC_RACER_UNUSED_11 - ASSET_MISC) / 4
.word (ASSET_MISC_12 - ASSET_MISC) / 4
.word (ASSET_MISC_BALLOON_DATA - ASSET_MISC) / 4
.word (ASSET_MISC_13 - ASSET_MISC) / 4
.word (ASSET_MISC_14 - ASSET_MISC) / 4
.word (ASSET_MISC_15 - ASSET_MISC) / 4
@@ -8648,7 +8648,7 @@ glabel ASSET_MISC_TABLE
.word (ASSET_MISC_SHIELD_DATA - ASSET_MISC) / 4
.word (ASSET_MISC_MAGNET_DATA - ASSET_MISC) / 4
.word (ASSET_MISC_23 - ASSET_MISC) / 4
.word (ASSET_MISC_24 - ASSET_MISC) / 4
.word (ASSET_MISC_GHOST_UNLOCK_TIMES - ASSET_MISC) / 4
.word (ASSET_MISC_25 - ASSET_MISC) / 4
.word (ASSET_MISC_TRACKS_MENU_IDS - ASSET_MISC) / 4
.word (ASSET_MISC_HUB_AREA_IDS - ASSET_MISC) / 4
asm/non_matchings/audio_spatial/func_80008174.s
+4 -4
View File
@@ -58,7 +58,7 @@ glabel func_80008174
/* 008E34 80008234 A0400012 */ sb $zero, 0x12($v0)
/* 008E38 80008238 10800003 */ beqz $a0, .L80008248
/* 008E3C 8000823C 00000000 */ nop
/* 008E40 80008240 0C001223 */ jal func_8000488C
/* 008E40 80008240 0C001223 */ jal sound_stop
/* 008E44 80008244 00000000 */ nop
.L80008248:
/* 008E48 80008248 968E0000 */ lhu $t6, ($s4)
@@ -90,7 +90,7 @@ glabel func_80008174
/* 008EA8 800082A8 00000000 */ nop
/* 008EAC 800082AC 14400005 */ bnez $v0, .L800082C4
/* 008EB0 800082B0 00000000 */ nop
/* 008EB4 800082B4 0C001223 */ jal func_8000488C
/* 008EB4 800082B4 0C001223 */ jal sound_stop
/* 008EB8 800082B8 00000000 */ nop
/* 008EBC 800082BC 10000006 */ b .L800082D8
/* 008EC0 800082C0 AE200178 */ sw $zero, 0x178($s1)
@@ -180,7 +180,7 @@ glabel func_80008174
/* 008FF8 800083F8 14E8FFDF */ bne $a3, $t0, .L80008378
/* 008FFC 800083FC 24C600C0 */ addiu $a2, $a2, 0xc0
/* 009000 80008400 8FBF003C */ lw $ra, 0x3c($sp)
/* 009004 80008404 3C018012 */ lui $at, %hi(D_8011AC18) # $at, 0x8012
/* 009004 80008404 3C018012 */ lui $at, %hi(gAudioLinesOff) # $at, 0x8012
/* 009008 80008408 C7B50018 */ lwc1 $f21, 0x18($sp)
/* 00900C 8000840C C7B4001C */ lwc1 $f20, 0x1c($sp)
/* 009010 80008410 8FB00020 */ lw $s0, 0x20($sp)
@@ -190,7 +190,7 @@ glabel func_80008174
/* 009020 80008420 8FB40030 */ lw $s4, 0x30($sp)
/* 009024 80008424 8FB50034 */ lw $s5, 0x34($sp)
/* 009028 80008428 8FB60038 */ lw $s6, 0x38($sp)
/* 00902C 8000842C A020AC18 */ sb $zero, %lo(D_8011AC18)($at)
/* 00902C 8000842C A020AC18 */ sb $zero, %lo(gAudioLinesOff)($at)
/* 009030 80008430 03E00008 */ jr $ra
/* 009034 80008434 27BD0040 */ addiu $sp, $sp, 0x40
asm/non_matchings/audio_spatial/func_80008438.s
+4 -4
View File
@@ -422,7 +422,7 @@ glabel func_80008438
/* 009650 80008A50 00000000 */ nop
/* 009654 80008A54 10800008 */ beqz $a0, .L80008A78
/* 009658 80008A58 00000000 */ nop
/* 00965C 80008A5C 0C001223 */ jal func_8000488C
/* 00965C 80008A5C 0C001223 */ jal sound_stop
/* 009660 80008A60 00000000 */ nop
/* 009664 80008A64 92220011 */ lbu $v0, 0x11($s1)
/* 009668 80008A68 00000000 */ nop
@@ -774,7 +774,7 @@ glabel func_80008438
/* 009B6C 80008F6C 00000000 */ nop
/* 009B70 80008F70 10800015 */ beqz $a0, .L80008FC8
/* 009B74 80008F74 8FAB0260 */ lw $t3, 0x260($sp)
/* 009B78 80008F78 0C001223 */ jal func_8000488C
/* 009B78 80008F78 0C001223 */ jal sound_stop
/* 009B7C 80008F7C 00000000 */ nop
/* 009B80 80008F80 10000011 */ b .L80008FC8
/* 009B84 80008F84 8FAB0260 */ lw $t3, 0x260($sp)
@@ -804,11 +804,11 @@ glabel func_80008438
/* 009BD8 80008FD8 1581FEC7 */ bne $t4, $at, .L80008AF8
/* 009BDC 80008FDC 24420180 */ addiu $v0, $v0, 0x180
/* 009BE0 80008FE0 8FAE024C */ lw $t6, 0x24c($sp)
/* 009BE4 80008FE4 3C0D8012 */ lui $t5, %hi(D_8011AC18) # $t5, 0x8012
/* 009BE4 80008FE4 3C0D8012 */ lui $t5, %hi(gAudioLinesOff) # $t5, 0x8012
/* 009BE8 80008FE8 29C1000B */ slti $at, $t6, 0xb
/* 009BEC 80008FEC 14200015 */ bnez $at, .L80009044
/* 009BF0 80008FF0 00000000 */ nop
/* 009BF4 80008FF4 91ADAC18 */ lbu $t5, %lo(D_8011AC18)($t5)
/* 009BF4 80008FF4 91ADAC18 */ lbu $t5, %lo(gAudioLinesOff)($t5)
/* 009BF8 80008FF8 00000000 */ nop
/* 009BFC 80008FFC 15A00011 */ bnez $t5, .L80009044
/* 009C00 80009000 00000000 */ nop
asm/non_matchings/audio_vehicle/func_80005254.s
+1 -1
View File
@@ -591,7 +591,7 @@ glabel func_80005254
/* 006684 80005A84 00000000 */ nop
/* 006688 80005A88 1080000C */ beqz $a0, .L80005ABC
/* 00668C 80005A8C 8FB900A4 */ lw $t9, 0xa4($sp)
/* 006690 80005A90 0C001223 */ jal func_8000488C
/* 006690 80005A90 0C001223 */ jal sound_stop
/* 006694 80005A94 00000000 */ nop
/* 006698 80005A98 8E380000 */ lw $t8, ($s1)
/* 00669C 80005A9C 00000000 */ nop
asm/non_matchings/audio_vehicle/func_800063EC.s
+1 -1
View File
@@ -480,7 +480,7 @@ glabel func_800063EC
/* 0076A4 80006AA4 00000000 */ nop
/* 0076A8 80006AA8 10800004 */ beqz $a0, .L80006ABC
/* 0076AC 80006AAC 8FBF0014 */ lw $ra, 0x14($sp)
/* 0076B0 80006AB0 0C001223 */ jal func_8000488C
/* 0076B0 80006AB0 0C001223 */ jal sound_stop
/* 0076B4 80006AB4 00000000 */ nop
/* 0076B8 80006AB8 8FBF0014 */ lw $ra, 0x14($sp)
.L80006ABC:
asm/non_matchings/audio_vehicle/func_80006FC8.s
+6 -6
View File
@@ -338,7 +338,7 @@ glabel func_80006FC8
/* 00806C 8000746C 00000000 */ nop
/* 008070 80007470 10800014 */ beqz $a0, .L800074C4
/* 008074 80007474 00000000 */ nop
/* 008078 80007478 0C001223 */ jal func_8000488C
/* 008078 80007478 0C001223 */ jal sound_stop
/* 00807C 8000747C 00000000 */ nop
/* 008080 80007480 8E8A0000 */ lw $t2, ($s4)
/* 008084 80007484 00000000 */ nop
@@ -351,7 +351,7 @@ glabel func_80006FC8
/* 00809C 8000749C 00000000 */ nop
/* 0080A0 800074A0 10800008 */ beqz $a0, .L800074C4
/* 0080A4 800074A4 00000000 */ nop
/* 0080A8 800074A8 0C001223 */ jal func_8000488C
/* 0080A8 800074A8 0C001223 */ jal sound_stop
/* 0080AC 800074AC 00000000 */ nop
/* 0080B0 800074B0 8E8B0000 */ lw $t3, ($s4)
/* 0080B4 800074B4 00000000 */ nop
@@ -437,7 +437,7 @@ glabel func_80006FC8
/* 0081D8 800075D8 00000000 */ nop
/* 0081DC 800075DC 10800047 */ beqz $a0, .L800076FC
/* 0081E0 800075E0 00000000 */ nop
/* 0081E4 800075E4 0C001223 */ jal func_8000488C
/* 0081E4 800075E4 0C001223 */ jal sound_stop
/* 0081E8 800075E8 00000000 */ nop
/* 0081EC 800075EC 8E990000 */ lw $t9, ($s4)
/* 0081F0 800075F0 10000042 */ b .L800076FC
@@ -449,7 +449,7 @@ glabel func_80006FC8
/* 008204 80007604 00000000 */ nop
/* 008208 80007608 16400008 */ bnez $s2, .L8000762C
/* 00820C 8000760C 00000000 */ nop
/* 008210 80007610 0C001223 */ jal func_8000488C
/* 008210 80007610 0C001223 */ jal sound_stop
/* 008214 80007614 00000000 */ nop
/* 008218 80007618 8E880000 */ lw $t0, ($s4)
/* 00821C 8000761C 00000000 */ nop
@@ -892,7 +892,7 @@ glabel func_80006FC8
/* 008860 80007C60 29610008 */ slti $at, $t3, 8
/* 008864 80007C64 1020000A */ beqz $at, .L80007C90
/* 008868 80007C68 00000000 */ nop
/* 00886C 80007C6C 0C001223 */ jal func_8000488C
/* 00886C 80007C6C 0C001223 */ jal sound_stop
/* 008870 80007C70 00000000 */ nop
/* 008874 80007C74 8E6E0000 */ lw $t6, ($s3)
/* 008878 80007C78 00000000 */ nop
@@ -989,7 +989,7 @@ glabel func_80006FC8
/* 0089C8 80007DC8 00000000 */ nop
/* 0089CC 80007DCC 1080000C */ beqz $a0, .L80007E00
/* 0089D0 80007DD0 240A003C */ li $t2, 60
/* 0089D4 80007DD4 0C001223 */ jal func_8000488C
/* 0089D4 80007DD4 0C001223 */ jal sound_stop
/* 0089D8 80007DD8 00000000 */ nop
/* 0089DC 80007DDC 8E380000 */ lw $t8, ($s1)
/* 0089E0 80007DE0 24190001 */ li $t9, 1
asm/non_matchings/game_ui/func_8009F034.s
+1 -1
View File
@@ -143,7 +143,7 @@ glabel func_8009F034
/* 09FDE4 8009F1E4 25F8FFFC */ addiu $t8, $t7, -4
/* 09FDE8 8009F1E8 AC780000 */ sw $t8, ($v1)
.L8009F1EC:
/* 09FDEC 8009F1EC 0C006D90 */ jal get_time_trial_ghost
/* 09FDEC 8009F1EC 0C006D90 */ jal timetrial_ghost_staff
/* 09FDF0 8009F1F0 00000000 */ nop
/* 09FDF4 8009F1F4 14400004 */ bnez $v0, .L8009F208
/* 09FDF8 8009F1F8 240C0001 */ li $t4, 1
asm/non_matchings/game_ui/func_800A277C.s
+2 -2
View File
@@ -730,11 +730,11 @@ glabel func_800A277C
/* 0A3DE0 800A31E0 0C000741 */ jal sound_play
/* 0A3DE4 800A31E4 24A56D40 */ addiu $a1, %lo(gHUDVoiceSoundMask) # addiu $a1, $a1, 0x6d40
.L800A31E8:
/* 0A3DE8 800A31E8 0C006CA2 */ jal func_8001B288
/* 0A3DE8 800A31E8 0C006CA2 */ jal timetrial_valid_player_ghost
/* 0A3DEC 800A31EC 00000000 */ nop
/* 0A3DF0 800A31F0 1040004F */ beqz $v0, .L800A3330
/* 0A3DF4 800A31F4 8FAA00A0 */ lw $t2, 0xa0($sp)
/* 0A3DF8 800A31F8 0C006CB8 */ jal func_8001B2E0
/* 0A3DF8 800A31F8 0C006CB8 */ jal timetrial_player_ghost
/* 0A3DFC 800A31FC 00000000 */ nop
/* 0A3E00 800A3200 1040004A */ beqz $v0, .L800A332C
/* 0A3E04 800A3204 00408025 */ move $s0, $v0
asm/non_matchings/game_ui/func_800A6254.s
+1 -1
View File
@@ -641,7 +641,7 @@ glabel L800A691C
/* 0A7790 800A6B90 1000000A */ b .L800A6BBC
/* 0A7794 800A6B94 00000000 */ nop
.L800A6B98:
/* 0A7798 800A6B98 0C006D90 */ jal get_time_trial_ghost
/* 0A7798 800A6B98 0C006D90 */ jal timetrial_ghost_staff
/* 0A779C 800A6B9C AFA70070 */ sw $a3, 0x70($sp)
/* 0A77A0 800A6BA0 8FA70070 */ lw $a3, 0x70($sp)
/* 0A77A4 800A6BA4 14400005 */ bnez $v0, .L800A6BBC
asm/non_matchings/menu/func_80092188.s
+2 -2
View File
@@ -442,7 +442,7 @@ glabel L80092740
/* 0933BC 800927BC 00000000 */ nop
/* 0933C0 800927C0 10800009 */ beqz $a0, .L800927E8
/* 0933C4 800927C4 244EFFFF */ addiu $t6, $v0, -1
/* 0933C8 800927C8 0C001223 */ jal func_8000488C
/* 0933C8 800927C8 0C001223 */ jal sound_stop
/* 0933CC 800927CC 00000000 */ nop
/* 0933D0 800927D0 3C038012 */ lui $v1, %hi(D_80126830) # $v1, 0x8012
/* 0933D4 800927D4 3C02800E */ lui $v0, %hi(gTracksMenuTimeTrialHighlightIndex) # $v0, 0x800e
@@ -466,7 +466,7 @@ glabel L80092740
/* 093414 80092814 24180001 */ li $t8, 1
/* 093418 80092818 10800003 */ beqz $a0, .L80092828
/* 09341C 8009281C AFB80034 */ sw $t8, 0x34($sp)
/* 093420 80092820 0C001223 */ jal func_8000488C
/* 093420 80092820 0C001223 */ jal sound_stop
/* 093424 80092824 00000000 */ nop
.L80092828:
/* 093428 80092828 00002025 */ move $a0, $zero
asm/non_matchings/object_functions/obj_loop_butterfly.s
+7 -7
View File
@@ -102,7 +102,7 @@ glabel L80040D30
/* 041984 80040D84 AFA8003C */ sw $t0, 0x3c($sp)
/* 041988 80040D88 AFAF0014 */ sw $t7, 0x14($sp)
/* 04198C 80040D8C AFAE0010 */ sw $t6, 0x10($sp)
/* 041990 80040D90 0C005B7A */ jal func_80016DE8
/* 041990 80040D90 0C005B7A */ jal obj_dist_racer
/* 041994 80040D94 46802320 */ cvt.s.w $f12, $f4
/* 041998 80040D98 0002C400 */ sll $t8, $v0, 0x10
/* 04199C 80040D9C 8FA8003C */ lw $t0, 0x3c($sp)
@@ -129,7 +129,7 @@ glabel L80040D30
/* 0419EC 80040DEC 44065000 */ mfc1 $a2, $f10
/* 0419F0 80040DF0 AFA8003C */ sw $t0, 0x3c($sp)
/* 0419F4 80040DF4 AFB80010 */ sw $t8, 0x10($sp)
/* 0419F8 80040DF8 0C005B1A */ jal func_80016C68
/* 0419F8 80040DF8 0C005B1A */ jal obj_butterfly_node
/* 0419FC 80040DFC 46804320 */ cvt.s.w $f12, $f8
/* 041A00 80040E00 8FA8003C */ lw $t0, 0x3c($sp)
/* 041A04 80040E04 10400005 */ beqz $v0, .L80040E1C
@@ -299,7 +299,7 @@ glabel L80040E54
/* 041C64 80041064 AFA8003C */ sw $t0, 0x3c($sp)
/* 041C68 80041068 AFB80014 */ sw $t8, 0x14($sp)
/* 041C6C 8004106C AFAF0010 */ sw $t7, 0x10($sp)
/* 041C70 80041070 0C005B7A */ jal func_80016DE8
/* 041C70 80041070 0C005B7A */ jal obj_dist_racer
/* 041C74 80041074 46803320 */ cvt.s.w $f12, $f6
/* 041C78 80041078 0002CC00 */ sll $t9, $v0, 0x10
/* 041C7C 8004107C 8FA8003C */ lw $t0, 0x3c($sp)
@@ -327,7 +327,7 @@ glabel L80040E54
/* 041CD0 800410D0 AFA90038 */ sw $t1, 0x38($sp)
/* 041CD4 800410D4 AFA8003C */ sw $t0, 0x3c($sp)
/* 041CD8 800410D8 AFB90010 */ sw $t9, 0x10($sp)
/* 041CDC 800410DC 0C005B1A */ jal func_80016C68
/* 041CDC 800410DC 0C005B1A */ jal obj_butterfly_node
/* 041CE0 800410E0 46804320 */ cvt.s.w $f12, $f8
/* 041CE4 800410E4 8FA8003C */ lw $t0, 0x3c($sp)
/* 041CE8 800410E8 8FA90038 */ lw $t1, 0x38($sp)
@@ -464,7 +464,7 @@ glabel L800411E4
/* 041EE0 800412E0 AFA8003C */ sw $t0, 0x3c($sp)
/* 041EE4 800412E4 AFAD0014 */ sw $t5, 0x14($sp)
/* 041EE8 800412E8 AFAC0010 */ sw $t4, 0x10($sp)
/* 041EEC 800412EC 0C005B7A */ jal func_80016DE8
/* 041EEC 800412EC 0C005B7A */ jal obj_dist_racer
/* 041EF0 800412F0 46805320 */ cvt.s.w $f12, $f10
/* 041EF4 800412F4 00027400 */ sll $t6, $v0, 0x10
/* 041EF8 800412F8 8FA8003C */ lw $t0, 0x3c($sp)
@@ -493,7 +493,7 @@ glabel L800411E4
/* 041F50 80041350 A7AA0072 */ sh $t2, 0x72($sp)
/* 041F54 80041354 AFA8003C */ sw $t0, 0x3c($sp)
/* 041F58 80041358 AFAD0010 */ sw $t5, 0x10($sp)
/* 041F5C 8004135C 0C005B1A */ jal func_80016C68
/* 041F5C 8004135C 0C005B1A */ jal obj_butterfly_node
/* 041F60 80041360 46804320 */ cvt.s.w $f12, $f8
/* 041F64 80041364 8FA8003C */ lw $t0, 0x3c($sp)
/* 041F68 80041368 87AA0072 */ lh $t2, 0x72($sp)
@@ -685,7 +685,7 @@ glabel L8004153C
/* 04221C 8004161C AFAD0014 */ sw $t5, 0x14($sp)
/* 042220 80041620 E7B0007C */ swc1 $f16, 0x7c($sp)
/* 042224 80041624 AFA8003C */ sw $t0, 0x3c($sp)
/* 042228 80041628 0C005B7A */ jal func_80016DE8
/* 042228 80041628 0C005B7A */ jal obj_dist_racer
/* 04222C 8004162C AFAC0010 */ sw $t4, 0x10($sp)
/* 042230 80041630 00022C00 */ sll $a1, $v0, 0x10
/* 042234 80041634 00021C00 */ sll $v1, $v0, 0x10
asm/non_matchings/objects/func_8000CC7C.s
+19 -19
View File
@@ -89,8 +89,8 @@ glabel func_8000CC7C
/* 00D998 8000CD98 3C0B8012 */ lui $t3, %hi(D_8011ADC5) # $t3, 0x8012
/* 00D99C 8000CD9C 256BADC5 */ addiu $t3, %lo(D_8011ADC5) # addiu $t3, $t3, -0x523b
/* 00D9A0 8000CDA0 816E0000 */ lb $t6, ($t3)
/* 00D9A4 8000CDA4 3C0C8012 */ lui $t4, %hi(D_8011AE82) # $t4, 0x8012
/* 00D9A8 8000CDA8 258CAE82 */ addiu $t4, %lo(D_8011AE82) # addiu $t4, $t4, -0x517e
/* 00D9A4 8000CDA4 3C0C8012 */ lui $t4, %hi(gPrevTimeTrialVehicle) # $t4, 0x8012
/* 00D9A8 8000CDA8 258CAE82 */ addiu $t4, %lo(gPrevTimeTrialVehicle) # addiu $t4, $t4, -0x517e
/* 00D9AC 8000CDAC AFA20128 */ sw $v0, 0x128($sp)
/* 00D9B0 8000CDB0 A58E0000 */ sh $t6, ($t4)
/* 00D9B4 8000CDB4 92F80049 */ lbu $t8, 0x49($s7)
@@ -1020,12 +1020,12 @@ glabel L8000D98C
/* 00E694 8000DA94 26B50004 */ addiu $s5, $s5, 4
/* 00E698 8000DA98 00009025 */ move $s2, $zero
.L8000DA9C:
/* 00E69C 8000DA9C 3C15800E */ lui $s5, %hi(gGhostObj) # $s5, 0x800e
/* 00E6A0 8000DAA0 26B5C718 */ addiu $s5, %lo(gGhostObj) # addiu $s5, $s5, -0x38e8
/* 00E6A4 8000DAA4 0C0166D3 */ jal free_tt_ghost_data
/* 00E69C 8000DA9C 3C15800E */ lui $s5, %hi(gGhostObjStaff) # $s5, 0x800e
/* 00E6A0 8000DAA0 26B5C718 */ addiu $s5, %lo(gGhostObjStaff) # addiu $s5, $s5, -0x38e8
/* 00E6A4 8000DAA4 0C0166D3 */ jal timetrial_free_staff_ghost
/* 00E6A8 8000DAA8 AEA00000 */ sw $zero, ($s5)
/* 00E6AC 8000DAAC 3C118012 */ lui $s1, %hi(D_8011AD38) # $s1, 0x8012
/* 00E6B0 8000DAB0 2631AD38 */ addiu $s1, %lo(D_8011AD38) # addiu $s1, $s1, -0x52c8
/* 00E6AC 8000DAAC 3C118012 */ lui $s1, %hi(gTimeTrialContPak) # $s1, 0x8012
/* 00E6B0 8000DAB0 2631AD38 */ addiu $s1, %lo(gTimeTrialContPak) # addiu $s1, $s1, -0x52c8
/* 00E6B4 8000DAB4 2418FFFF */ li $t8, -1
/* 00E6B8 8000DAB8 AE380000 */ sw $t8, ($s1)
/* 00E6BC 8000DABC 3C0F8012 */ lui $t7, %hi(gIsTimeTrial) # $t7, 0x8012
@@ -1037,14 +1037,14 @@ glabel L8000D98C
/* 00E6D4 8000DAD4 24010001 */ li $at, 1
/* 00E6D8 8000DAD8 15A1006D */ bne $t5, $at, .L8000DC90
/* 00E6DC 8000DADC 00000000 */ nop
/* 00E6E0 8000DAE0 0C016651 */ jal func_80059944
/* 00E6E0 8000DAE0 0C016651 */ jal timetrial_reset_player_ghost
/* 00E6E4 8000DAE4 00000000 */ nop
/* 00E6E8 8000DAE8 0C006D9A */ jal func_8001B668
/* 00E6E8 8000DAE8 0C006D9A */ jal timetrial_init_player_ghost
/* 00E6EC 8000DAEC 00002025 */ move $a0, $zero
/* 00E6F0 8000DAF0 3C10800E */ lui $s0, %hi(D_800DC728) # $s0, 0x800e
/* 00E6F0 8000DAF0 3C10800E */ lui $s0, %hi(gTimeTrialVehicle) # $s0, 0x800e
/* 00E6F4 8000DAF4 AE220000 */ sw $v0, ($s1)
/* 00E6F8 8000DAF8 3C01800E */ lui $at, %hi(gHasGhostToSave) # $at, 0x800e
/* 00E6FC 8000DAFC 2610C728 */ addiu $s0, %lo(D_800DC728) # addiu $s0, $s0, -0x38d8
/* 00E6FC 8000DAFC 2610C728 */ addiu $s0, %lo(gTimeTrialVehicle) # addiu $s0, $s0, -0x38d8
/* 00E700 8000DB00 A020C730 */ sb $zero, %lo(gHasGhostToSave)($at)
/* 00E704 8000DB04 860E0000 */ lh $t6, ($s0)
/* 00E708 8000DB08 00000000 */ nop
@@ -1053,12 +1053,12 @@ glabel L8000D98C
/* 00E714 8000DB14 00000000 */ nop
/* 00E718 8000DB18 A6000000 */ sh $zero, ($s0)
.L8000DB1C:
/* 00E71C 8000DB1C 0C006CA2 */ jal func_8001B288
/* 00E71C 8000DB1C 0C006CA2 */ jal timetrial_valid_player_ghost
/* 00E720 8000DB20 00000000 */ nop
/* 00E724 8000DB24 1040002C */ beqz $v0, .L8000DBD8
/* 00E728 8000DB28 3C19800E */ lui $t9, %hi(D_800DC72C) # $t9, 0x800e
/* 00E728 8000DB28 3C19800E */ lui $t9, %hi(gTimeTrialCharacter) # $t9, 0x800e
/* 00E72C 8000DB2C 860F0000 */ lh $t7, ($s0)
/* 00E730 8000DB30 8739C72C */ lh $t9, %lo(D_800DC72C)($t9)
/* 00E730 8000DB30 8739C72C */ lh $t9, %lo(gTimeTrialCharacter)($t9)
/* 00E734 8000DB34 000F6880 */ sll $t5, $t7, 2
/* 00E738 8000DB38 01AF6821 */ addu $t5, $t5, $t7
/* 00E73C 8000DB3C 000D7080 */ sll $t6, $t5, 2
@@ -1091,10 +1091,10 @@ glabel L8000D98C
/* 00E7A8 8000DBA8 3C01800E */ lui $at, %hi(D_800E5178) # $at, 0x800e
/* 00E7AC 8000DBAC C4245178 */ lwc1 $f4, %lo(D_800E5178)($at)
/* 00E7B0 8000DBB0 8C4E0050 */ lw $t6, 0x50($v0)
/* 00E7B4 8000DBB4 3C038012 */ lui $v1, %hi(D_8011AD34) # $v1, 0x8012
/* 00E7B4 8000DBB4 3C038012 */ lui $v1, %hi(gGhostObjPlayer) # $v1, 0x8012
/* 00E7B8 8000DBB8 E5C40000 */ swc1 $f4, ($t6)
/* 00E7BC 8000DBBC 8C59004C */ lw $t9, 0x4c($v0)
/* 00E7C0 8000DBC0 2463AD34 */ addiu $v1, %lo(D_8011AD34) # addiu $v1, $v1, -0x52cc
/* 00E7C0 8000DBC0 2463AD34 */ addiu $v1, %lo(gGhostObjPlayer) # addiu $v1, $v1, -0x52cc
/* 00E7C4 8000DBC4 A7200014 */ sh $zero, 0x14($t9)
/* 00E7C8 8000DBC8 AC620000 */ sw $v0, ($v1)
/* 00E7CC 8000DBCC 8C530064 */ lw $s3, 0x64($v0)
@@ -1103,7 +1103,7 @@ glabel L8000D98C
.L8000DBD8:
/* 00E7D8 8000DBD8 0C01AF62 */ jal get_current_map_id
/* 00E7DC 8000DBDC 00000000 */ nop
/* 00E7E0 8000DBE0 0C006D3F */ jal func_8001B4FC
/* 00E7E0 8000DBE0 0C006D3F */ jal timetrial_init_staff_ghost
/* 00E7E4 8000DBE4 00402025 */ move $a0, $v0
/* 00E7E8 8000DBE8 10400029 */ beqz $v0, .L8000DC90
/* 00E7EC 8000DBEC 3C188012 */ lui $t8, %hi(gMapDefaultVehicle) # $t8, 0x8012
@@ -1320,8 +1320,8 @@ glabel L8000D98C
/* 00EAF8 8000DEF8 1653FFF5 */ bne $s2, $s3, .L8000DED0
/* 00EAFC 8000DEFC AC40003C */ sw $zero, 0x3c($v0)
.L8000DF00:
/* 00EB00 8000DF00 3C018012 */ lui $at, %hi(D_8011AD4E) # $at, 0x8012
/* 00EB04 8000DF04 A420AD4E */ sh $zero, %lo(D_8011AD4E)($at)
/* 00EB00 8000DF00 3C018012 */ lui $at, %hi(gRaceEndTimer) # $at, 0x8012
/* 00EB04 8000DF04 A420AD4E */ sh $zero, %lo(gRaceEndTimer)($at)
/* 00EB08 8000DF08 3C018012 */ lui $at, %hi(D_8011ADB4) # $at, 0x8012
/* 00EB0C 8000DF0C AC20ADB4 */ sw $zero, %lo(D_8011ADB4)($at)
/* 00EB10 8000DF10 0C0274CC */ jal set_next_taj_challenge_menu
asm/non_matchings/objects/func_800101AC.s
+9 -9
View File
@@ -303,13 +303,13 @@ glabel L800105A8
/* 0111C8 800105C8 1000000C */ b .L800105FC
/* 0111CC 800105CC 24140012 */ li $s4, 18
glabel L800105D0
/* 0111D0 800105D0 0C02B220 */ jal func_800AC880
/* 0111D0 800105D0 0C02B220 */ jal lensflare_remove
/* 0111D4 800105D4 02C02025 */ move $a0, $s6
/* 0111D8 800105D8 86C50048 */ lh $a1, 0x48($s6)
/* 0111DC 800105DC 10000007 */ b .L800105FC
/* 0111E0 800105E0 24140012 */ li $s4, 18
glabel L800105E4
/* 0111E4 800105E4 0C02B3E6 */ jal func_800ACF98
/* 0111E4 800105E4 0C02B3E6 */ jal lensflare_override_remove
/* 0111E8 800105E8 02C02025 */ move $a0, $s6
/* 0111EC 800105EC 86C50048 */ lh $a1, 0x48($s6)
/* 0111F0 800105F0 10000002 */ b .L800105FC
@@ -342,7 +342,7 @@ glabel L8001063C
/* 011248 80010648 00000000 */ nop
/* 01124C 8001064C 10800006 */ beqz $a0, .L80010668
/* 011250 80010650 24010001 */ li $at, 1
/* 011254 80010654 0C001223 */ jal func_8000488C
/* 011254 80010654 0C001223 */ jal sound_stop
/* 011258 80010658 00000000 */ nop
/* 01125C 8001065C 86C50048 */ lh $a1, 0x48($s6)
/* 011260 80010660 00000000 */ nop
@@ -358,35 +358,35 @@ glabel L80010664
/* 01127C 8001067C 00000000 */ nop
/* 011280 80010680 10400003 */ beqz $v0, .L80010690
/* 011284 80010684 00000000 */ nop
/* 011288 80010688 0C001223 */ jal func_8000488C
/* 011288 80010688 0C001223 */ jal sound_stop
/* 01128C 8001068C 00402025 */ move $a0, $v0
.L80010690:
/* 011290 80010690 8E020010 */ lw $v0, 0x10($s0)
/* 011294 80010694 00000000 */ nop
/* 011298 80010698 10400003 */ beqz $v0, .L800106A8
/* 01129C 8001069C 00000000 */ nop
/* 0112A0 800106A0 0C001223 */ jal func_8000488C
/* 0112A0 800106A0 0C001223 */ jal sound_stop
/* 0112A4 800106A4 00402025 */ move $a0, $v0
.L800106A8:
/* 0112A8 800106A8 8E020014 */ lw $v0, 0x14($s0)
/* 0112AC 800106AC 00000000 */ nop
/* 0112B0 800106B0 10400003 */ beqz $v0, .L800106C0
/* 0112B4 800106B4 00000000 */ nop
/* 0112B8 800106B8 0C001223 */ jal func_8000488C
/* 0112B8 800106B8 0C001223 */ jal sound_stop
/* 0112BC 800106BC 00402025 */ move $a0, $v0
.L800106C0:
/* 0112C0 800106C0 8E02001C */ lw $v0, 0x1c($s0)
/* 0112C4 800106C4 00000000 */ nop
/* 0112C8 800106C8 10400003 */ beqz $v0, .L800106D8
/* 0112CC 800106CC 00000000 */ nop
/* 0112D0 800106D0 0C001223 */ jal func_8000488C
/* 0112D0 800106D0 0C001223 */ jal sound_stop
/* 0112D4 800106D4 00402025 */ move $a0, $v0
.L800106D8:
/* 0112D8 800106D8 8E020020 */ lw $v0, 0x20($s0)
/* 0112DC 800106DC 00000000 */ nop
/* 0112E0 800106E0 10400003 */ beqz $v0, .L800106F0
/* 0112E4 800106E4 00000000 */ nop
/* 0112E8 800106E8 0C001223 */ jal func_8000488C
/* 0112E8 800106E8 0C001223 */ jal sound_stop
/* 0112EC 800106EC 00402025 */ move $a0, $v0
.L800106F0:
/* 0112F0 800106F0 8E040024 */ lw $a0, 0x24($s0)
@@ -407,7 +407,7 @@ glabel L80010664
/* 011324 80010724 00000000 */ nop
/* 011328 80010728 10800003 */ beqz $a0, .L80010738
/* 01132C 8001072C 00000000 */ nop
/* 011330 80010730 0C001223 */ jal func_8000488C
/* 011330 80010730 0C001223 */ jal sound_stop
/* 011334 80010734 00000000 */ nop
.L80010738:
/* 011338 80010738 0C001AB2 */ jal racer_sound_free
asm/non_matchings/objects/func_80010994.s
+9 -9
View File
@@ -405,16 +405,16 @@ glabel func_80010994
.L80010F58:
/* 011B58 80010F58 0C0079BB */ jal func_8001E6EC
/* 011B5C 80010F5C 00002025 */ move $a0, $zero
/* 011B60 80010F60 3C188012 */ lui $t8, %hi(D_8011AEF7) # $t8, 0x8012
/* 011B64 80010F64 8318AEF7 */ lb $t8, %lo(D_8011AEF7)($t8)
/* 011B60 80010F60 3C188012 */ lui $t8, %hi(gTajRaceInit) # $t8, 0x8012
/* 011B64 80010F64 8318AEF7 */ lb $t8, %lo(gTajRaceInit)($t8)
/* 011B68 80010F68 00000000 */ nop
/* 011B6C 80010F6C 13000003 */ beqz $t8, .L80010F7C
/* 011B70 80010F70 00000000 */ nop
/* 011B74 80010F74 0C008A52 */ jal func_80022948
/* 011B74 80010F74 0C008A52 */ jal mode_init_taj_race
/* 011B78 80010F78 00000000 */ nop
.L80010F7C:
/* 011B7C 80010F7C 3C108012 */ lui $s0, %hi(D_8011ADAC) # $s0, 0x8012
/* 011B80 80010F80 2610ADAC */ addiu $s0, %lo(D_8011ADAC) # addiu $s0, $s0, -0x5254
/* 011B7C 80010F7C 3C108012 */ lui $s0, %hi(gPathUpdateOff) # $s0, 0x8012
/* 011B80 80010F80 2610ADAC */ addiu $s0, %lo(gPathUpdateOff) # addiu $s0, $s0, -0x5254
/* 011B84 80010F84 8E190000 */ lw $t9, ($s0)
/* 011B88 80010F88 00000000 */ nop
/* 011B8C 80010F8C 17200009 */ bnez $t9, .L80010FB4
@@ -423,17 +423,17 @@ glabel func_80010994
/* 011B98 80010F98 00000000 */ nop
/* 011B9C 80010F9C 0C005FA6 */ jal func_80017E98
/* 011BA0 80010FA0 00000000 */ nop
/* 011BA4 80010FA4 0C006F15 */ jal func_8001BC54
/* 011BA4 80010FA4 0C006F15 */ jal spectate_update
/* 011BA8 80010FA8 00000000 */ nop
/* 011BAC 80010FAC 0C007A4F */ jal func_8001E93C
/* 011BB0 80010FB0 00000000 */ nop
.L80010FB4:
/* 011BB4 80010FB4 3C078012 */ lui $a3, %hi(gNumRacers) # $a3, 0x8012
/* 011BB8 80010FB8 8CE7AEF0 */ lw $a3, %lo(gNumRacers)($a3)
/* 011BBC 80010FBC 3C098012 */ lui $t1, %hi(D_8011AD4E) # $t1, 0x8012
/* 011BBC 80010FBC 3C098012 */ lui $t1, %hi(gRaceEndTimer) # $t1, 0x8012
/* 011BC0 80010FC0 10E00010 */ beqz $a3, .L80011004
/* 011BC4 80010FC4 00000000 */ nop
/* 011BC8 80010FC8 8529AD4E */ lh $t1, %lo(D_8011AD4E)($t1)
/* 011BC8 80010FC8 8529AD4E */ lh $t1, %lo(gRaceEndTimer)($t1)
/* 011BCC 80010FCC 00000000 */ nop
/* 011BD0 80010FD0 15200007 */ bnez $t1, .L80010FF0
/* 011BD4 80010FD4 00000000 */ nop
@@ -444,7 +444,7 @@ glabel func_80010994
/* 011BE8 80010FE8 10000006 */ b .L80011004
/* 011BEC 80010FEC 00000000 */ nop
.L80010FF0:
/* 011BF0 80010FF0 0C006A3D */ jal func_8001A8F4
/* 011BF0 80010FF0 0C006A3D */ jal race_transition_adventure
/* 011BF4 80010FF4 02802025 */ move $a0, $s4
/* 011BF8 80010FF8 3C078012 */ lui $a3, %hi(gNumRacers) # $a3, 0x8012
/* 011BFC 80010FFC 8CE7AEF0 */ lw $a3, %lo(gNumRacers)($a3)
asm/non_matchings/objects/func_80019808.s
+4 -4
View File
@@ -471,7 +471,7 @@ glabel func_80019808
/* 01AABC 80019EBC 2406FFFF */ li $a2, -1
/* 01AAC0 80019EC0 0C01B06B */ jal push_level_property_stack
/* 01AAC4 80019EC4 24E7FFFF */ addiu $a3, $a3, -1
/* 01AAC8 80019EC8 0C006A35 */ jal func_8001A8D4
/* 01AAC8 80019EC8 0C006A35 */ jal race_finish_adventure
/* 01AACC 80019ECC 02802025 */ move $a0, $s4
.L80019ED0:
/* 01AAD0 80019ED0 3C018012 */ lui $at, %hi(D_8011ADB4) # $at, 0x8012
@@ -792,7 +792,7 @@ glabel func_80019808
/* 01AF4C 8001A34C 3C0F8012 */ lui $t7, %hi(D_8011AD3C) # $t7, 0x8012
/* 01AF50 8001A350 13000005 */ beqz $t8, .L8001A368
/* 01AF54 8001A354 00000000 */ nop
/* 01AF58 8001A358 0C008B86 */ jal func_80022E18
/* 01AF58 8001A358 0C008B86 */ jal mode_end_taj_race
/* 01AF5C 8001A35C 00002025 */ move $a0, $zero
/* 01AF60 8001A360 10000114 */ b .L8001A7B4
/* 01AF64 8001A364 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1088,7 +1088,7 @@ glabel func_80019808
/* 01B384 8001A784 25D90001 */ addiu $t9, $t6, 1
/* 01B388 8001A788 A4590000 */ sh $t9, ($v0)
.L8001A78C:
/* 01B38C 8001A78C 0C006A35 */ jal func_8001A8D4
/* 01B38C 8001A78C 0C006A35 */ jal race_finish_adventure
/* 01B390 8001A790 02802025 */ move $a0, $s4
.L8001A794:
/* 01B394 8001A794 3C018012 */ lui $at, %hi(D_8011ADB4) # $at, 0x8012
@@ -1096,7 +1096,7 @@ glabel func_80019808
/* 01B39C 8001A79C AC35ADB4 */ sw $s5, %lo(D_8011ADB4)($at)
/* 01B3A0 8001A7A0 14540004 */ bne $v0, $s4, .L8001A7B4
/* 01B3A4 8001A7A4 8FBF0034 */ lw $ra, 0x34($sp)
/* 01B3A8 8001A7A8 0C006B99 */ jal func_8001AE64
/* 01B3A8 8001A7A8 0C006B99 */ jal race_finish_time_trial
/* 01B3AC 8001A7AC 00000000 */ nop
.L8001A7B0:
/* 01B3B0 8001A7B0 8FBF0034 */ lw $ra, 0x34($sp)
asm/non_matchings/objects/func_8001C6C4.s
+1 -1
View File
@@ -62,7 +62,7 @@ glabel func_8001C6C4
/* 01D384 8001C784 8FBF005C */ lw $ra, 0x5c($sp)
.L8001C788:
/* 01D388 8001C788 AFA50080 */ sw $a1, 0x80($sp)
/* 01D38C 8001C78C 0C007485 */ jal func_8001D214
/* 01D38C 8001C78C 0C007485 */ jal ainode_get
/* 01D390 8001C790 AFA6006C */ sw $a2, 0x6c($sp)
/* 01D394 8001C794 8FA50080 */ lw $a1, 0x80($sp)
/* 01D398 8001C798 8FA6006C */ lw $a2, 0x6c($sp)
asm/non_matchings/objects/func_8001CC48.s
+2 -2
View File
@@ -6,12 +6,12 @@ glabel func_8001CC48
/* 01D858 8001CC58 00A08025 */ move $s0, $a1
/* 01D85C 8001CC5C 28810080 */ slti $at, $a0, 0x80
/* 01D860 8001CC60 14200003 */ bnez $at, .L8001CC70
/* 01D864 8001CC64 3C0E8012 */ lui $t6, %hi(D_8011AF04) # $t6, 0x8012
/* 01D864 8001CC64 3C0E8012 */ lui $t6, %hi(gAINodes) # $t6, 0x8012
.L8001CC68:
/* 01D868 8001CC68 1000002C */ b .L8001CD1C
/* 01D86C 8001CC6C 240200FF */ li $v0, 255
.L8001CC70:
/* 01D870 8001CC70 8DCEAF04 */ lw $t6, %lo(D_8011AF04)($t6)
/* 01D870 8001CC70 8DCEAF04 */ lw $t6, %lo(gAINodes)($t6)
/* 01D874 8001CC74 00047880 */ sll $t7, $a0, 2
/* 01D878 8001CC78 01CFC021 */ addu $t8, $t6, $t7
/* 01D87C 8001CC7C 8F020000 */ lw $v0, ($t8)
asm/non_matchings/objects/func_8001CD28.s
+2 -2
View File
@@ -26,8 +26,8 @@ glabel func_8001CD28
/* 01D984 8001CD84 1420FFF9 */ bnez $at, .L8001CD6C
/* 01D988 8001CD88 ADE00000 */ sw $zero, ($t7)
/* 01D98C 8001CD8C 8FAE0378 */ lw $t6, 0x378($sp)
/* 01D990 8001CD90 3C038012 */ lui $v1, %hi(D_8011AF04) # $v1, 0x8012
/* 01D994 8001CD94 8C63AF04 */ lw $v1, %lo(D_8011AF04)($v1)
/* 01D990 8001CD90 3C038012 */ lui $v1, %hi(gAINodes) # $v1, 0x8012
/* 01D994 8001CD94 8C63AF04 */ lw $v1, %lo(gAINodes)($v1)
/* 01D998 8001CD98 000E7880 */ sll $t7, $t6, 2
/* 01D99C 8001CD9C 006F2021 */ addu $a0, $v1, $t7
/* 01D9A0 8001CDA0 8C820000 */ lw $v0, ($a0)

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