mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity

Matched most remaining libultra files (#221)

Browse source 
* osPfsIsPlug.c and osContSetCh.c OK

* update

* __osPfsGetStatus.c OK

* removed unused asm

* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h

* controller updates

* fixed header guard

* Made suggested changes

* guLookAt.c OK

* commit

* __osPfsSelectBank.c OK

* osPfsDeleteFile.c OK

* pfsreadwritefile.c OK

* osPfsFreeBlocks.c OK

* cleaned up ospfsfreeblocks

* started pfsinitpak.c

* pfsallocatefile.c OK

* contpfs.c decompiled with 1 non matching

* osPfsFindFile.c OK

* pfsinitpak.c decompiled. one non-matching

* Actually fixed merge conflict

* sins.c OK

* cosf.c sinf.c and sins.c OK

* moved osAfterPreNMI to its own file. Renamed code_801031F0 to contquery.c

* pfschecker.c OK

* final update and rename

* Removed makefile testing thing that i accidentally added

* Made suggested changes
This commit is contained in:
Lucas Shaw 2020-07-06 17:15:01 -07:00 • committed by GitHub
parent e6ca2dfd70
commit 7e195a3562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 1769 additions and 3641 deletions
Download patch file Download diff file Expand all files Collapse all files

8
asm/code_80104D60.s
View file

@ -37,7 +37,7 @@ glabel osPfsFileState
/* B7BF58 80104DB8 10000058 */ b .L80104F1C
/* B7BF5C 80104DBC 24020005 */ li $v0, 5
.L80104DC0:
/* B7BF60 80104DC0 0C040AFC */ jal func_80102BF0
/* B7BF60 80104DC0 0C040AFC */ jal __osCheckId
/* B7BF64 80104DC4 02602025 */ move $a0, $s3
/* B7BF68 80104DC8 50400004 */ beql $v0, $zero, .L80104DDC
/* B7BF6C 80104DCC 92790065 */ lbu $t9, 0x65($s3)
@ -48,7 +48,7 @@ glabel osPfsFileState
/* B7BF7C 80104DDC 02602025 */ move $a0, $s3
/* B7BF80 80104DE0 53200008 */ beql $t9, $zero, .L80104E04
/* B7BF84 80104DE4 8E68005C */ lw $t0, 0x5c($s3)
/* B7BF88 80104DE8 0C041320 */ jal func_80104C80
/* B7BF88 80104DE8 0C041320 */ jal __osPfsSelectBank
/* B7BF8C 80104DEC 00002825 */ move $a1, $zero
/* B7BF90 80104DF0 50400004 */ beql $v0, $zero, .L80104E04
/* B7BF94 80104DF4 8E68005C */ lw $t0, 0x5c($s3)
@ -61,7 +61,7 @@ glabel osPfsFileState
/* B7BFAC 80104E0C 01103021 */ addu $a2, $t0, $s0
/* B7BFB0 80104E10 30C9FFFF */ andi $t1, $a2, 0xffff
/* B7BFB4 80104E14 01203025 */ move $a2, $t1
/* B7BFB8 80104E18 0C0417D0 */ jal osReadMempak
/* B7BFB8 80104E18 0C0417D0 */ jal __osContRamRead
/* B7BFBC 80104E1C 27A70038 */ addiu $a3, $sp, 0x38
/* B7BFC0 80104E20 10400003 */ beqz $v0, .L80104E30
/* B7BFC4 80104E24 97AA003C */ lhu $t2, 0x3c($sp)
@ -93,7 +93,7 @@ glabel osPfsFileState
/* B7C01C 80104E7C 12190008 */ beq $s0, $t9, .L80104EA0
/* B7C020 80104E80 00003025 */ move $a2, $zero
/* B7C024 80104E84 03208025 */ move $s0, $t9
/* B7C028 80104E88 0C040B31 */ jal func_80102CC4
/* B7C028 80104E88 0C040B31 */ jal __osPfsRWInode
/* B7C02C 80104E8C 332700FF */ andi $a3, $t9, 0xff
/* B7C030 80104E90 50400004 */ beql $v0, $zero, .L80104EA4
/* B7C034 80104E94 93A80035 */ lbu $t0, 0x35($sp)