mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-13 02:10:57 +00:00
7551dc2b71
* door context * renames * done * fix unintended change * all nb gone * more nb gone * merge fishing * fix size commentX * door changes suggested by dragorn * fix accidental semicolon * another * change all texture pointers to void* * error fix and format * Update src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * fix ostime * correct mistake in SkyboxContext * probably fix nonmatching * Update include/z64.h Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * roman's suggestions, fix incorrect type definition in z64scene.h * typo in struct * make typedef use u8 array * forgot one * pull in master and format.sh Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
15 lines
275 B
C
15 lines
275 B
C
#include "global.h"
|
|
|
|
OSTime osGetTime(void) {
|
|
u32 count;
|
|
u32 base;
|
|
OSTime t;
|
|
register u32 prevInt = __osDisableInt();
|
|
|
|
count = osGetCount();
|
|
base = count - __osBaseCounter;
|
|
t = __osCurrentTime;
|
|
__osRestoreInt(prevInt);
|
|
|
|
return base + t;
|
|
}
|