mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-07 14:03:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous libultra header fixes (#2139)

Browse Source 
* Miscellaneous libultra header fixes

* Fix bss?

* Reword RCP timeout
This commit is contained in:
cadmic
2024-09-06 05:46:44 -07:00
committed by GitHub
parent 53b2110373
commit 2ce648a7c6
19 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ultra64/convert.h
-3
View File
@@ -15,7 +15,4 @@
#define OS_PHYSICAL_TO_K0(x) (void*)(((u32)(x)+0x80000000))
#define OS_PHYSICAL_TO_K1(x) (void*)(((u32)(x)+0xA0000000))
#define OS_MSEC_TO_CYCLES(n) OS_USEC_TO_CYCLES((n) * 1000)
#define OS_SEC_TO_CYCLES(n) OS_MSEC_TO_CYCLES((n) * 1000)
#endif
include/ultra64/rcp.h
+1 -1
View File
@@ -529,7 +529,7 @@
#define VI_CTRL_ANTIALIAS_MODE_2 0x00200 // Bit [9:8] anti-alias mode: AA disabled, resampling enabled, operate as if everything is covered
#define VI_CTRL_ANTIALIAS_MODE_3 0x00300 // Bit [9:8] anti-alias mode: AA disabled, resampling disabled, replicate pixels
#define VI_CTRL_PIXEL_ADV_MASK 0x0F000 // [15:12] pixel advance mode
#define VI_CTRL_PIXEL_ADV(n) (((n) << 12) & VI_CTRL_PIXEL_ADV_MASK) // Bit [15:12] pixel advance mode: Always 3 on N64
#define VI_CTRL_PIXEL_ADV_3 0x03000 // Bit [15:12] pixel advance mode: Always 3 on N64
#define VI_CTRL_DITHER_FILTER_ON 0x10000 // 16: dither-filter mode
/*
include/variables.h
+4 -4
View File
@@ -7,10 +7,10 @@
extern Mtx D_01000000;
extern u32 osTvType;
extern u32 osRomBase;
extern u32 osResetType;
extern u32 osCicId;
extern void* osRomBase;
extern s32 osTvType;
extern s32 osResetType;
extern s32 osCicId;
extern u32 osMemSize;
extern u8 osAppNMIBuffer[0x40];
include/z64math.h
+5
View File
@@ -7,6 +7,11 @@
#define SQ(x) ((x)*(x))
#define VEC_SET(V,X,Y,Z) (V).x=(X);(V).y=(Y);(V).z=(Z)
typedef union FloatInt {
f32 f;
u32 i;
} FloatInt;
typedef struct Vec2f {
f32 x, y;
} Vec2f; // size = 0x08