mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 11:00:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix most compiler warnings in the boot and code segments (#674)

Browse source 
* Less warnings in boot & code segments

* few more warnings gone

* Ran formatter

* z_view warning gone

* -> 1

* f31 -> 31

* Remove function casts

* Few more small improvements

* Separate declaration and assignment in func_80091738 and Item_Give

Co-authored-by: Thar0 <maximilianc64@gmail.com>
This commit is contained in:
Tharo 2021-02-14 00:49:40 +00:00 • committed by GitHub
parent d615ec4f31
commit f9d96d9f73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
208 changed files with 1702 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libultra_boot_O1/osGetTime.c
View file

@ -1,16 +1,15 @@
#include "global.h"
OSTime osGetTime(void) {
u32 sp34;
u32 sp30;
u64 t1;
register u32 s0;
u32 count;
u32 base;
u64 t;
register u32 prevInt = __osDisableInt();
s0 = __osDisableInt();
sp34 = osGetCount();
sp30 = sp34 - __osBaseCounter;
t1 = __osCurrentTime;
__osRestoreInt(s0);
count = osGetCount();
base = count - __osBaseCounter;
t = __osCurrentTime;
__osRestoreInt(prevInt);
return sp30 + t1;
return base + t;
}