Merge pull request #173 from Ryan-Myers/master

Match many libultra functions, and more (Score 16.16% complete!)
This commit is contained in:
David Benepe
2021-09-29 21:00:11 -05:00
committed by GitHub
303 changed files with 5670 additions and 82434 deletions
+3
View File
@@ -0,0 +1,3 @@
[submodule "tools/ido-static-recomp"]
path = tools/ido-static-recomp
url = https://github.com/Emill/ido-static-recomp
+15 -14
View File
@@ -43,11 +43,18 @@ endif
########## Recomp ##########
RECOMP_PROJECT := ./tools/ido-static-recomp/
DUMMY != ls $(RECOMP_PROJECT)ido >/dev/null || echo FAIL
ifeq ($(DUMMY),FAIL)
$(error Missing submodule ido-static-recomp. Please run 'git submodule update --init')
endif
# List of IDO tools required for the repo.
# NOTE: If you are adding a tool here, make sure to update the Makefile in `/tools/ido-static-recomp/`!
RECOMP_TOOLS := cc cfe uopt ugen as1 ujoin uld usplit umerge
RECOMP_DIR := ./tools/ido5.3_recomp/
RECOMP_DIR := $(RECOMP_PROJECT)build5.3/out/
RECOMP_TOOLS_PATHS = $(addprefix $(RECOMP_DIR),$(RECOMP_TOOLS))
# Checks if all the recomp tools exist.
@@ -55,7 +62,7 @@ $(foreach p,$(RECOMP_TOOLS_PATHS),$(if $(wildcard $(p)),,$(info $(p) does not ex
# If any of the tools do not exist, then recomp needs to run to build them.
ifeq ($(runRecomp),yes)
DUMMY != make -s -C tools/ido-static-recomp >&2 || echo FAIL
DUMMY != cd $(RECOMP_PROJECT) && python3 build.py ido/5.3 -O2 && cd ../../ >&2 || echo FAIL
endif
######## Extract Assets & Microcode ########
@@ -100,7 +107,7 @@ endif
endif
AS = $(CROSS)as
CC := tools/ido5.3_recomp/cc
CC := $(RECOMP_DIR)cc
CPP := cpp -P -Wno-trigraphs
LD = $(CROSS)ld
OBJDUMP = $(CROSS)objdump
@@ -113,7 +120,7 @@ C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
ASFLAGS = -mtune=vr4300 -march=vr4300 -mabi=32 $(foreach d,$(DEFINES),--defsym $(d))
INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I src -I .
INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I src -I . -I include/libc
CFLAGS = -c -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed $(OPT_FLAGS) $(MIPSISET) $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS)
LDFLAGS = undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/dkr.map
@@ -260,16 +267,10 @@ $(BUILD_DIR)/lib/src/al/%.o: OPT_FLAGS := -O3
$(BUILD_DIR)/lib/src/os/%.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/os/osViMgr.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/os/osCreatePiManager.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/unknown_0C91A0.o : OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D29F0.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0CDE90.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D3160.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D3360.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0D5EC0.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
$(BUILD_DIR)/lib/src/osEepromWrite.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/osEepromRead.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/osSetTimer.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/libc/xprintf.o : OPT_FLAGS := -O3
$(BUILD_DIR)/lib/src/al/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
#$(BUILD_DIR)/lib/src/libc/llcvt.o: OPT_FLAGS :=
#$(BUILD_DIR)/lib/src/libc/llcvt.o: MIPSISET := -mips3 32
$(BUILD_DIR)/lib/%.o: MIPSISET := -mips2
$(BUILD_DIR)/lib/src/mips1/%.o: MIPSISET := -mips1
+24 -23
View File
@@ -113,30 +113,31 @@ s32 is_drumstick_unlocked(void) {
}
```
As of August 23rd 2021, this is our current score:
As of September 27th 2021, this is our current score:
```
=======================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------- 14.63% Complete -------------------
# Decompiled functions: 900
# GLOBAL_ASM remaining: 880
# NON_MATCHING functions: 106
--------------------- Game Status ---------------------
Balloons: 8/47, Keys: 1/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
-------------------------------------------------------
We are collecting eggs in Fire Mountain. (1/3 Eggs)
=======================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------- 0.77% Complete -------------------
# Documented functions: 62
# Undocumented remaining: 1718
--------------------- Game Status ---------------------
Balloons: 0/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
-------------------------------------------------------
We are collecting the first balloon on Timber's Island.
=======================================================
==================================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------------ 16.16% Complete -------------------------
# Decompiled functions: 934
# GLOBAL_ASM remaining: 848
# NON_MATCHING functions: 104
-------------------------- Game Status ---------------------------
Balloons: 8/47, Keys: 1/4, Trophies: 0/5
T.T. Amulets: 1/4, Wizpig Amulets: 0/4
------------------------------------------------------------------
We are collecting silver coins in Ancient Lake. (5/8 silver coins)
==================================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------------ 0.80% Complete -------------------------
# Documented functions: 65
# Undocumented remaining: 1717
-------------------------- Game Status ---------------------------
Balloons: 0/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
------------------------------------------------------------------
We are collecting the first balloon on Timber's Island.
==================================================================
```
---
+4 -4
View File
@@ -40,24 +40,24 @@ glabel func_80069F64
/* 06ABB8 80069FB8 02E08025 */ move $s0, $s7
.L80069FBC:
/* 06ABBC 80069FBC 86050000 */ lh $a1, ($s0)
/* 06ABC0 80069FC0 0C032755 */ jal func_800C9D54
/* 06ABC0 80069FC0 0C032755 */ jal rmonPrintf
/* 06ABC4 80069FC4 02602025 */ move $a0, $s3
/* 06ABC8 80069FC8 86050020 */ lh $a1, 0x20($s0)
/* 06ABCC 80069FCC 02802025 */ move $a0, $s4
/* 06ABD0 80069FD0 30AEFFFF */ andi $t6, $a1, 0xffff
/* 06ABD4 80069FD4 0C032755 */ jal func_800C9D54
/* 06ABD4 80069FD4 0C032755 */ jal rmonPrintf
/* 06ABD8 80069FD8 01C02825 */ move $a1, $t6
/* 06ABDC 80069FDC 26310002 */ addiu $s1, $s1, 2
/* 06ABE0 80069FE0 1635FFF6 */ bne $s1, $s5, .L80069FBC
/* 06ABE4 80069FE4 26100002 */ addiu $s0, $s0, 2
/* 06ABE8 80069FE8 0C032755 */ jal func_800C9D54
/* 06ABE8 80069FE8 0C032755 */ jal rmonPrintf
/* 06ABEC 80069FEC 03C02025 */ move $a0, $fp
/* 06ABF0 80069FF0 26D60004 */ addiu $s6, $s6, 4
/* 06ABF4 80069FF4 24010010 */ li $at, 16
/* 06ABF8 80069FF8 16C1FFEE */ bne $s6, $at, .L80069FB4
/* 06ABFC 80069FFC 26F70008 */ addiu $s7, $s7, 8
/* 06AC00 8006A000 3C04800E */ lui $a0, %hi(D_800E7088) # $a0, 0x800e
/* 06AC04 8006A004 0C032755 */ jal func_800C9D54
/* 06AC04 8006A004 0C032755 */ jal rmonPrintf
/* 06AC08 8006A008 24847088 */ addiu $a0, %lo(D_800E7088) # addiu $a0, $a0, 0x7088
/* 06AC0C 8006A00C 8FBF003C */ lw $ra, 0x3c($sp)
/* 06AC10 8006A010 8FB00018 */ lw $s0, 0x18($sp)
-51
View File
@@ -1,51 +0,0 @@
glabel func_8006A10C
/* 06AD0C 8006A10C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 06AD10 8006A110 AFBF0014 */ sw $ra, 0x14($sp)
/* 06AD14 8006A114 3C048012 */ lui $a0, %hi(D_801210E0) # $a0, 0x8012
/* 06AD18 8006A118 3C058012 */ lui $a1, %hi(D_801210F8) # $a1, 0x8012
/* 06AD1C 8006A11C 24A510F8 */ addiu $a1, %lo(D_801210F8) # addiu $a1, $a1, 0x10f8
/* 06AD20 8006A120 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0
/* 06AD24 8006A124 0C032208 */ jal osCreateMesgQueue
/* 06AD28 8006A128 24060001 */ li $a2, 1
/* 06AD2C 8006A12C 3C068012 */ lui $a2, %hi(D_801210FC) # $a2, 0x8012
/* 06AD30 8006A130 8CC610FC */ lw $a2, %lo(D_801210FC)($a2)
/* 06AD34 8006A134 3C058012 */ lui $a1, %hi(D_801210E0) # $a1, 0x8012
/* 06AD38 8006A138 24A510E0 */ addiu $a1, %lo(D_801210E0) # addiu $a1, $a1, 0x10e0
/* 06AD3C 8006A13C 0C0332EC */ jal osSetEventMesg
/* 06AD40 8006A140 24040005 */ li $a0, 5
/* 06AD44 8006A144 3C048012 */ lui $a0, %hi(D_801210E0) # $a0, 0x8012
/* 06AD48 8006A148 3C068012 */ lui $a2, %hi(D_80121100) # $a2, 0x8012
/* 06AD4C 8006A14C 24C61100 */ addiu $a2, %lo(D_80121100) # addiu $a2, $a2, 0x1100
/* 06AD50 8006A150 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0
/* 06AD54 8006A154 0C033308 */ jal osContInit
/* 06AD58 8006A158 27A50023 */ addiu $a1, $sp, 0x23
/* 06AD5C 8006A15C 3C048012 */ lui $a0, %hi(D_801210E0) # $a0, 0x8012
/* 06AD60 8006A160 0C0333F8 */ jal osContStartReadData
/* 06AD64 8006A164 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0
/* 06AD68 8006A168 0C01A90D */ jal func_8006A434
/* 06AD6C 8006A16C 00000000 */ nop
/* 06AD70 8006A170 93A20023 */ lbu $v0, 0x23($sp)
/* 06AD74 8006A174 3C03800E */ lui $v1, %hi(D_800DD300) # $v1, 0x800e
/* 06AD78 8006A178 2463D300 */ addiu $v1, %lo(D_800DD300) # addiu $v1, $v1, -0x2d00
/* 06AD7C 8006A17C 304E0001 */ andi $t6, $v0, 1
/* 06AD80 8006A180 11C00009 */ beqz $t6, .L8006A1A8
/* 06AD84 8006A184 AC600000 */ sw $zero, ($v1)
/* 06AD88 8006A188 3C0F8012 */ lui $t7, %hi(D_80121100+3) # $t7, 0x8012
/* 06AD8C 8006A18C 91EF1103 */ lbu $t7, %lo(D_80121100+3)($t7)
/* 06AD90 8006A190 00000000 */ nop
/* 06AD94 8006A194 31F80008 */ andi $t8, $t7, 8
/* 06AD98 8006A198 17000004 */ bnez $t8, .L8006A1AC
/* 06AD9C 8006A19C 24190001 */ li $t9, 1
/* 06ADA0 8006A1A0 10000004 */ b .L8006A1B4
/* 06ADA4 8006A1A4 00001025 */ move $v0, $zero
.L8006A1A8:
/* 06ADA8 8006A1A8 24190001 */ li $t9, 1
.L8006A1AC:
/* 06ADAC 8006A1AC AC790000 */ sw $t9, ($v1)
/* 06ADB0 8006A1B0 2402FFFF */ li $v0, -1
.L8006A1B4:
/* 06ADB4 8006A1B4 8FBF0014 */ lw $ra, 0x14($sp)
/* 06ADB8 8006A1B8 27BD0028 */ addiu $sp, $sp, 0x28
/* 06ADBC 8006A1BC 03E00008 */ jr $ra
/* 06ADC0 8006A1C0 00000000 */ nop
@@ -70,7 +70,7 @@ glabel func_80072718
/* 073404 80072804 02603025 */ move $a2, $s3
/* 073408 80072808 0000C812 */ mflo $t9
/* 07340C 8007280C 02D92821 */ addu $a1, $s6, $t9
/* 073410 80072810 0C01C837 */ jal func_800720DC
/* 073410 80072810 0C01C837 */ jal osMotorInit
/* 073414 80072814 00000000 */ nop
/* 073418 80072818 1040000E */ beqz $v0, .L80072854
/* 07341C 8007281C 3C0E8012 */ lui $t6, %hi(D_801241E5) # $t6, 0x8012
@@ -159,11 +159,11 @@ glabel func_80072718
/* 07354C 8007294C 02603025 */ move $a2, $s3
/* 073550 80072950 00006012 */ mflo $t4
/* 073554 80072954 02CC9021 */ addu $s2, $s6, $t4
/* 073558 80072958 0C01C837 */ jal func_800720DC
/* 073558 80072958 0C01C837 */ jal osMotorInit
/* 07355C 8007295C 02402825 */ move $a1, $s2
/* 073560 80072960 14400003 */ bnez $v0, .L80072970
/* 073564 80072964 00000000 */ nop
/* 073568 80072968 0C01C74C */ jal func_80071D30
/* 073568 80072968 0C01C74C */ jal osMotorStop
/* 07356C 8007296C 02402025 */ move $a0, $s2
.L80072970:
/* 073570 80072970 3C04800E */ lui $a0, %hi(D_800DE48C) # $a0, 0x800e
@@ -191,7 +191,7 @@ glabel func_80072718
/* 0735C4 800729C4 A6000008 */ sh $zero, 8($s0)
/* 0735C8 800729C8 00004812 */ mflo $t1
/* 0735CC 800729CC 02C92021 */ addu $a0, $s6, $t1
/* 0735D0 800729D0 0C01C74C */ jal func_80071D30
/* 0735D0 800729D0 0C01C74C */ jal osMotorStop
/* 0735D4 800729D4 00000000 */ nop
/* 0735D8 800729D8 3C04800E */ lui $a0, %hi(D_800DE48C) # $a0, 0x800e
/* 0735DC 800729DC 8C84E48C */ lw $a0, %lo(D_800DE48C)($a0)
@@ -225,7 +225,7 @@ glabel func_80072718
/* 073644 80072A44 A6090008 */ sh $t1, 8($s0)
/* 073648 80072A48 00005012 */ mflo $t2
/* 07364C 80072A4C 02CA2021 */ addu $a0, $s6, $t2
/* 073650 80072A50 0C01C74C */ jal func_80071D30
/* 073650 80072A50 0C01C74C */ jal osMotorStop
/* 073654 80072A54 00000000 */ nop
/* 073658 80072A58 3C04800E */ lui $a0, %hi(D_800DE48C) # $a0, 0x800e
/* 07365C 80072A5C 8C84E48C */ lw $a0, %lo(D_800DE48C)($a0)
@@ -249,7 +249,7 @@ glabel func_80072718
/* 0736A0 80072AA0 02770019 */ multu $s3, $s7
/* 0736A4 80072AA4 00006812 */ mflo $t5
/* 0736A8 80072AA8 02CD2021 */ addu $a0, $s6, $t5
/* 0736AC 80072AAC 0C01C796 */ jal func_80071E58
/* 0736AC 80072AAC 0C01C796 */ jal osMotorStart
/* 0736B0 80072AB0 00000000 */ nop
/* 0736B4 80072AB4 928E0000 */ lbu $t6, ($s4)
/* 0736B8 80072AB8 02A2A825 */ or $s5, $s5, $v0
@@ -269,7 +269,7 @@ glabel func_80072718
/* 0736EC 80072AEC 02770019 */ multu $s3, $s7
/* 0736F0 80072AF0 00004012 */ mflo $t0
/* 0736F4 80072AF4 02C82021 */ addu $a0, $s6, $t0
/* 0736F8 80072AF8 0C01C74C */ jal func_80071D30
/* 0736F8 80072AF8 0C01C74C */ jal osMotorStop
/* 0736FC 80072AFC 00000000 */ nop
/* 073700 80072B00 92890000 */ lbu $t1, ($s4)
/* 073704 80072B04 02205027 */ not $t2, $s1
@@ -291,7 +291,7 @@ glabel func_80072718
/* 073740 80072B40 02770019 */ multu $s3, $s7
/* 073744 80072B44 00007012 */ mflo $t6
/* 073748 80072B48 02CE2021 */ addu $a0, $s6, $t6
/* 07374C 80072B4C 0C01C796 */ jal func_80071E58
/* 07374C 80072B4C 0C01C796 */ jal osMotorStart
/* 073750 80072B50 00000000 */ nop
/* 073754 80072B54 928F0000 */ lbu $t7, ($s4)
/* 073758 80072B58 02A2A825 */ or $s5, $s5, $v0
@@ -312,7 +312,7 @@ glabel func_80072718
/* 07378C 80072B8C 02770019 */ multu $s3, $s7
/* 073790 80072B90 00005012 */ mflo $t2
/* 073794 80072B94 02CA2021 */ addu $a0, $s6, $t2
/* 073798 80072B98 0C01C74C */ jal func_80071D30
/* 073798 80072B98 0C01C74C */ jal osMotorStop
/* 07379C 80072B9C 00000000 */ nop
/* 0737A0 80072BA0 928B0000 */ lbu $t3, ($s4)
/* 0737A4 80072BA4 02206027 */ not $t4, $s1
@@ -22,7 +22,7 @@ glabel func_800758DC
/* 07652C 8007592C 27184018 */ addiu $t8, %lo(pfs) # addiu $t8, $t8, 0x4018
/* 076530 80075930 000F78C0 */ sll $t7, $t7, 3
/* 076534 80075934 01F82821 */ addu $a1, $t7, $t8
/* 076538 80075938 0C01C837 */ jal func_800720DC
/* 076538 80075938 0C01C837 */ jal osMotorInit
/* 07653C 8007593C 02A03025 */ move $a2, $s5
/* 076540 80075940 14400004 */ bnez $v0, .L80075954
/* 076544 80075944 0015C880 */ sll $t9, $s5, 2
@@ -76,7 +76,7 @@ glabel func_800758DC
/* 0765EC 800759EC 02602825 */ move $a1, $s3
/* 0765F0 800759F0 8E840000 */ lw $a0, ($s4)
/* 0765F4 800759F4 02A03025 */ move $a2, $s5
/* 0765F8 800759F8 0C01C837 */ jal func_800720DC
/* 0765F8 800759F8 0C01C837 */ jal osMotorInit
/* 0765FC 800759FC AFA30040 */ sw $v1, 0x40($sp)
/* 076600 80075A00 8FA30040 */ lw $v1, 0x40($sp)
/* 076604 80075A04 14400004 */ bnez $v0, .L80075A18
@@ -95,7 +95,7 @@ glabel func_800758DC
/* 076630 80075A30 14520008 */ bne $v0, $s2, .L80075A54
/* 076634 80075A34 02602825 */ move $a1, $s3
/* 076638 80075A38 8E840000 */ lw $a0, ($s4)
/* 07663C 80075A3C 0C01C837 */ jal func_800720DC
/* 07663C 80075A3C 0C01C837 */ jal osMotorInit
/* 076640 80075A40 02A03025 */ move $a2, $s5
/* 076644 80075A44 14400003 */ bnez $v0, .L80075A54
/* 076648 80075A48 00000000 */ nop
@@ -87,7 +87,7 @@ glabel func_80075B18
/* 076860 80075C60 1441000A */ bne $v0, $at, .L80075C8C
/* 076864 80075C64 02402825 */ move $a1, $s2
/* 076868 80075C68 8E840000 */ lw $a0, ($s4)
/* 07686C 80075C6C 0C01C837 */ jal func_800720DC
/* 07686C 80075C6C 0C01C837 */ jal osMotorInit
/* 076870 80075C70 02003025 */ move $a2, $s0
/* 076874 80075C74 14400006 */ bnez $v0, .L80075C90
/* 076878 80075C78 00131840 */ sll $v1, $s3, 1
@@ -83,7 +83,7 @@ glabel func_80075E60
/* 076B8C 80075F8C AFA40064 */ sw $a0, 0x64($sp)
/* 076B90 80075F90 8FA50064 */ lw $a1, 0x64($sp)
/* 076B94 80075F94 AE020000 */ sw $v0, ($s0)
/* 076B98 80075F98 0C034138 */ jal memzero
/* 076B98 80075F98 0C034138 */ jal bzero
/* 076B9C 80075F9C 00402025 */ move $a0, $v0
/* 076BA0 80075FA0 8FAB0068 */ lw $t3, 0x68($sp)
/* 076BA4 80075FA4 8E030000 */ lw $v1, ($s0)
@@ -1,22 +0,0 @@
glabel func_800C018C
/* 0C0D8C 800C018C 3C02800E */ lui $v0, %hi(D_800E31B0) # $v0, 0x800e
/* 0C0D90 800C0190 944231B0 */ lhu $v0, %lo(D_800E31B0)($v0)
/* 0C0D94 800C0194 00000000 */ nop
/* 0C0D98 800C0198 0002702B */ sltu $t6, $zero, $v0
/* 0C0D9C 800C019C 15C0000C */ bnez $t6, .L800C01D0
/* 0C0DA0 800C01A0 01C01025 */ move $v0, $t6
/* 0C0DA4 800C01A4 3C02800E */ lui $v0, %hi(D_800E31B4) # $v0, 0x800e
/* 0C0DA8 800C01A8 944231B4 */ lhu $v0, %lo(D_800E31B4)($v0)
/* 0C0DAC 800C01AC 00000000 */ nop
/* 0C0DB0 800C01B0 0002782B */ sltu $t7, $zero, $v0
/* 0C0DB4 800C01B4 11E00006 */ beqz $t7, .L800C01D0
/* 0C0DB8 800C01B8 01E01025 */ move $v0, $t7
/* 0C0DBC 800C01BC 3C02800E */ lui $v0, %hi(D_800E31BC) # $v0, 0x800e
/* 0C0DC0 800C01C0 804231BC */ lb $v0, %lo(D_800E31BC)($v0)
/* 0C0DC4 800C01C4 00000000 */ nop
/* 0C0DC8 800C01C8 0002C02B */ sltu $t8, $zero, $v0
/* 0C0DCC 800C01CC 03001025 */ move $v0, $t8
.L800C01D0:
/* 0C0DD0 800C01D0 03E00008 */ jr $ra
/* 0C0DD4 800C01D4 00000000 */ nop
+1 -1
View File
@@ -16,7 +16,7 @@ glabel gzip_huft_build
/* 0C6EAC 800C62AC AFA60600 */ sw $a2, 0x600($sp)
/* 0C6EB0 800C62B0 AFA70604 */ sw $a3, 0x604($sp)
/* 0C6EB4 800C62B4 24050044 */ li $a1, 68
/* 0C6EB8 800C62B8 0C034138 */ jal memzero
/* 0C6EB8 800C62B8 0C034138 */ jal bzero
/* 0C6EBC 800C62BC 02202025 */ move $a0, $s1
/* 0C6EC0 800C62C0 8FAE05FC */ lw $t6, 0x5fc($sp)
/* 0C6EC4 800C62C4 0240F025 */ move $fp, $s2
+1 -1
View File
@@ -21,7 +21,7 @@ glabel func_80065E30
/* 066A7C 80065E7C 132B0003 */ beq $t9, $t3, .L80065E8C
.L80065E80:
/* 066A80 80065E80 3C04800E */ lui $a0, %hi(D_800E6ED0) # $a0, 0x800e
/* 066A84 80065E84 0C032755 */ jal func_800C9D54
/* 066A84 80065E84 0C032755 */ jal rmonPrintf
/* 066A88 80065E88 24846ED0 */ addiu $a0, %lo(D_800E6ED0) # addiu $a0, $a0, 0x6ed0
.L80065E8C:
/* 066A8C 80065E8C 8FBF0014 */ lw $ra, 0x14($sp)
+2 -2
View File
@@ -55,7 +55,7 @@ glabel func_800862C4
/* 086F94 80086394 8E8D0000 */ lw $t5, ($s4)
/* 086F98 80086398 000E7900 */ sll $t7, $t6, 4
/* 086F9C 8008639C 01AFC821 */ addu $t9, $t5, $t7
/* 086FA0 800863A0 0C01CF13 */ jal func_80073C4C
/* 086FA0 800863A0 0C01CF13 */ jal get_s32_256
/* 086FA4 800863A4 A3300006 */ sb $s0, 6($t9)
/* 086FA8 800863A8 8E490000 */ lw $t1, ($s2)
/* 086FAC 800863AC 8E8A0000 */ lw $t2, ($s4)
@@ -81,7 +81,7 @@ glabel func_800862C4
/* 086FF8 800863F8 8E8C0000 */ lw $t4, ($s4)
/* 086FFC 800863FC 00185900 */ sll $t3, $t8, 4
/* 087000 80086400 018B7021 */ addu $t6, $t4, $t3
/* 087004 80086404 0C01CF15 */ jal func_80073C54
/* 087004 80086404 0C01CF15 */ jal get_s32_512
/* 087008 80086408 A1D30001 */ sb $s3, 1($t6)
/* 08700C 8008640C 8E4F0000 */ lw $t7, ($s2)
/* 087010 80086410 8E990000 */ lw $t9, ($s4)
+4 -4
View File
@@ -36,7 +36,7 @@ glabel L80086834
/* 087444 80086844 8C846A04 */ lw $a0, %lo(D_80126A04)($a0)
/* 087448 80086848 0C021872 */ jal func_800861C8
/* 08744C 8008684C 02002825 */ move $a1, $s0
/* 087450 80086850 0C01CF13 */ jal func_80073C4C
/* 087450 80086850 0C01CF13 */ jal get_s32_256
/* 087454 80086854 00000000 */ nop
/* 087458 80086858 3C068012 */ lui $a2, %hi(D_80126A04) # $a2, 0x8012
/* 08745C 8008685C 8CC66A04 */ lw $a2, %lo(D_80126A04)($a2)
@@ -51,7 +51,7 @@ glabel L80086834
/* 087480 80086880 10000062 */ b .L80086A0C
/* 087484 80086884 00401825 */ move $v1, $v0
glabel L80086888
/* 087488 80086888 0C01CF15 */ jal func_80073C54
/* 087488 80086888 0C01CF15 */ jal get_s32_512
/* 08748C 8008688C 00000000 */ nop
/* 087490 80086890 3C068012 */ lui $a2, %hi(D_80126A04) # $a2, 0x8012
/* 087494 80086894 8CC66A04 */ lw $a2, %lo(D_80126A04)($a2)
@@ -70,7 +70,7 @@ glabel L800868C0
/* 0874C4 800868C4 8C846A04 */ lw $a0, %lo(D_80126A04)($a0)
/* 0874C8 800868C8 0C021872 */ jal func_800861C8
/* 0874CC 800868CC 02002825 */ move $a1, $s0
/* 0874D0 800868D0 0C01CF13 */ jal func_80073C4C
/* 0874D0 800868D0 0C01CF13 */ jal get_s32_256
/* 0874D4 800868D4 00000000 */ nop
/* 0874D8 800868D8 3C0C8012 */ lui $t4, %hi(D_80126BD4) # $t4, 0x8012
/* 0874DC 800868DC 8D8C6BD4 */ lw $t4, %lo(D_80126BD4)($t4)
@@ -101,7 +101,7 @@ glabel L80086920
/* 08753C 8008693C 8E0C0000 */ lw $t4, ($s0)
/* 087540 80086940 00000000 */ nop
/* 087544 80086944 258B0001 */ addiu $t3, $t4, 1
/* 087548 80086948 0C01CF15 */ jal func_80073C54
/* 087548 80086948 0C01CF15 */ jal get_s32_512
/* 08754C 8008694C AE0B0000 */ sw $t3, ($s0)
/* 087550 80086950 3C0F8012 */ lui $t7, %hi(D_80126BD4) # $t7, 0x8012
/* 087554 80086954 8DEF6BD4 */ lw $t7, %lo(D_80126BD4)($t7)
@@ -264,7 +264,7 @@ glabel menu_audio_options_loop
.L8008502C:
/* 085C2C 8008502C 0C0002CA */ jal func_80000B28
/* 085C30 80085030 00000000 */ nop
/* 085C34 80085034 0C0002F8 */ jal func_80000BE0
/* 085C34 80085034 0C0002F8 */ jal set_music_player_voice_limit
/* 085C38 80085038 24040018 */ li $a0, 24
/* 085C3C 8008503C 0C0002CD */ jal play_music
/* 085C40 80085040 24040018 */ li $a0, 24
@@ -310,7 +310,7 @@ glabel menu_audio_options_loop
/* 085CD4 800850D4 00000000 */ nop
/* 085CD8 800850D8 0C0002CA */ jal func_80000B28
/* 085CDC 800850DC 00000000 */ nop
/* 085CE0 800850E0 0C0002F8 */ jal func_80000BE0
/* 085CE0 800850E0 0C0002F8 */ jal set_music_player_voice_limit
/* 085CE4 800850E4 24040018 */ li $a0, 24
/* 085CE8 800850E8 92040003 */ lbu $a0, 3($s0)
/* 085CEC 800850EC 0C0002CD */ jal play_music
@@ -525,7 +525,7 @@ glabel menu_track_select_init
/* 08FB7C 8008EF7C 2610F760 */ addiu $s0, %lo(D_800DF760) # addiu $s0, $s0, -0x8a0
/* 08FB80 8008EF80 AC206848 */ sw $zero, %lo(D_80126848)($at)
/* 08FB84 8008EF84 AE000000 */ sw $zero, ($s0)
/* 08FB88 8008EF88 0C0002F8 */ jal func_80000BE0
/* 08FB88 8008EF88 0C0002F8 */ jal set_music_player_voice_limit
/* 08FB8C 8008EF8C 24040018 */ li $a0, 24
/* 08FB90 8008EF90 0C000307 */ jal func_80000C1C
/* 08FB94 8008EF94 00000000 */ nop
@@ -303,7 +303,7 @@ glabel menu_trophy_race_rankings_init
.L80098E5C:
/* 099A5C 80098E5C 0C03105C */ jal func_800C4170
/* 099A60 80098E60 24040002 */ li $a0, 2
/* 099A64 80098E64 0C0002F8 */ jal func_80000BE0
/* 099A64 80098E64 0C0002F8 */ jal set_music_player_voice_limit
/* 099A68 80098E68 24040018 */ li $a0, 24
/* 099A6C 80098E6C 0C0002CD */ jal play_music
/* 099A70 80098E70 24040018 */ li $a0, 24
@@ -77,7 +77,7 @@ glabel menu_trophy_race_round_init
/* 098F80 80098380 AC2B0980 */ sw $t3, %lo(D_800E0980)($at)
/* 098F84 80098384 0C03105C */ jal func_800C4170
/* 098F88 80098388 24040002 */ li $a0, 2
/* 098F8C 8009838C 0C0002F8 */ jal func_80000BE0
/* 098F8C 8009838C 0C0002F8 */ jal set_music_player_voice_limit
/* 098F90 80098390 24040018 */ li $a0, 24
/* 098F94 80098394 0C0002CD */ jal play_music
/* 098F98 80098398 24040018 */ li $a0, 24
@@ -1,7 +1,7 @@
glabel func_800B71B0
/* 0B7DB0 800B71B0 27BDF7B8 */ addiu $sp, $sp, -0x848
/* 0B7DB4 800B71B4 AFBF001C */ sw $ra, 0x1c($sp)
/* 0B7DB8 800B71B8 0C03491C */ jal func_800D2470
/* 0B7DB8 800B71B8 0C03491C */ jal __osGetActiveQueue
/* 0B7DBC 800B71BC 00000000 */ nop
/* 0B7DC0 800B71C0 8C4E0004 */ lw $t6, 4($v0)
/* 0B7DC4 800B71C4 2404FFFF */ li $a0, -1
@@ -8,7 +8,7 @@ glabel func_800B7460
/* 0B8078 800B7478 00027100 */ sll $t6, $v0, 4
/* 0B807C 800B747C 05C1008A */ bgez $t6, .L800B76A8
/* 0B8080 800B7480 27A40840 */ addiu $a0, $sp, 0x840
/* 0B8084 800B7484 0C034138 */ jal memzero
/* 0B8084 800B7484 0C034138 */ jal bzero
/* 0B8088 800B7488 240501B0 */ li $a1, 432
/* 0B808C 800B748C 3C028013 */ lui $v0, %hi(D_80129FB0) # $v0, 0x8013
/* 0B8090 800B7490 24429FB0 */ addiu $v0, %lo(D_80129FB0) # addiu $v0, $v0, -0x6050
@@ -41,7 +41,7 @@ glabel func_800B7460
/* 0B80FC 800B74FC 0C032768 */ jal bcopy
/* 0B8100 800B7500 AFAC0884 */ sw $t4, 0x884($sp)
/* 0B8104 800B7504 27A40240 */ addiu $a0, $sp, 0x240
/* 0B8108 800B7508 0C034138 */ jal memzero
/* 0B8108 800B7508 0C034138 */ jal bzero
/* 0B810C 800B750C 24050200 */ li $a1, 512
/* 0B8110 800B7510 27A40038 */ addiu $a0, $sp, 0x38
/* 0B8114 800B7514 0C009165 */ jal func_80024594

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