mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 05:19:36 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup more u32 being used as pointers. (#1052)

Browse source 
* merge master

* more u32 -> void*

* remove jenkins file

* format

* z64.h

* fix

* re cleanup z64scene.h
This commit is contained in:
louist103 2021-12-07 14:19:13 -05:00 committed by GitHub
parent 15d3796574
commit 037c1dcad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -1170,7 +1170,7 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a);
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
void func_80095974(GraphicsContext* gfxCtx); void func_80095974(GraphicsContext* gfxCtx);
void func_80095AA0(GlobalContext* globalCtx, Room* room, Input* arg2, UNK_TYPE arg3); void func_80095AA0(GlobalContext* globalCtx, Room* room, Input* arg2, UNK_TYPE arg3);
void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0,
u16 tlutCount, f32 frameX, f32 frameY); u16 tlutCount, f32 frameX, f32 frameY);
void func_80096FD4(GlobalContext* globalCtx, Room* room); void func_80096FD4(GlobalContext* globalCtx, Room* room);
u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx); u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx);

6
include/z64.h
View file

@ -868,12 +868,12 @@ typedef struct {
typedef struct { typedef struct {
/* 0x00 */ u8 type; /* 0x00 */ u8 type;
/* 0x01 */ u8 format; // 1 = single, 2 = multi /* 0x01 */ u8 format; // 1 = single, 2 = multi
/* 0x04 */ void* dlist; /* 0x04 */ Gfx* dlist;
union { union {
struct { struct {
/* 0x08 */ u32 source; /* 0x08 */ void* source;
/* 0x0C */ u32 unk_0C; /* 0x0C */ u32 unk_0C;
/* 0x10 */ u32 tlut; /* 0x10 */ void* tlut;
/* 0x14 */ u16 width; /* 0x14 */ u16 width;
/* 0x16 */ u16 height; /* 0x16 */ u16 height;
/* 0x18 */ u8 fmt; /* 0x18 */ u8 fmt;

15
include/z64scene.h
View file

@ -194,15 +194,14 @@ typedef struct {
typedef struct { typedef struct {
MeshHeaderBase base; MeshHeaderBase base;
u8 numEntries; u8 numEntries;
Gfx* dListStart; Gfx* dListStart;
Gfx* dListEnd; Gfx* dListEnd;
} MeshHeader0; } MeshHeader0;
typedef struct { typedef struct {
u32 opaqueDList; Gfx* opaqueDList;
u32 translucentDList; Gfx* translucentDList;
} MeshEntry0; } MeshEntry0;
typedef struct { typedef struct {
@ -213,7 +212,7 @@ typedef struct {
typedef struct { typedef struct {
MeshHeader1Base base; MeshHeader1Base base;
u32 imagePtr; // 0x08 void* imagePtr; // 0x08
u32 unknown; // 0x0C u32 unknown; // 0x0C
u32 unknown2; // 0x10 u32 unknown2; // 0x10
u16 bgWidth; // 0x14 u16 bgWidth; // 0x14
@ -227,13 +226,13 @@ typedef struct {
typedef struct { typedef struct {
MeshHeader1Base base; MeshHeader1Base base;
u8 bgCnt; u8 bgCnt;
u32 bgRecordPtr; void* bgRecordPtr;
} MeshHeader1Multi; } MeshHeader1Multi;
typedef struct { typedef struct {
u16 unknown; // 0x00 u16 unknown; // 0x00
s8 bgID; // 0x02 s8 bgID; // 0x02
u32 imagePtr; // 0x04 void* imagePtr; // 0x04
u32 unknown2; // 0x08 u32 unknown2; // 0x08
u32 unknown3; // 0x0C u32 unknown3; // 0x0C
u16 bgWidth; // 0x10 u16 bgWidth; // 0x10
@ -247,8 +246,8 @@ typedef struct {
typedef struct { typedef struct {
s16 playerXMax, playerZMax; s16 playerXMax, playerZMax;
s16 playerXMin, playerZMin; s16 playerXMin, playerZMin;
u32 opaqueDList; Gfx* opaqueDList;
u32 translucentDList; Gfx* translucentDList;
} MeshEntry2; } MeshEntry2;
typedef struct { typedef struct {

4
src/code/z_room.c
View file

@ -246,7 +246,7 @@ s32 func_80096238(void* data) {
return 0; return 0;
} }
void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0,
u16 tlutCount, f32 frameX, f32 frameY) { u16 tlutCount, f32 frameX, f32 frameY) {
Gfx* displayListHead; Gfx* displayListHead;
uObjBg* bg; uObjBg* bg;
@ -263,7 +263,7 @@ void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 heigh
bg->b.imageY = 0; bg->b.imageY = 0;
bg->b.imageH = height * 4; bg->b.imageH = height * 4;
bg->b.frameY = frameY * 4; bg->b.frameY = frameY * 4;
bg->b.imagePtr = (void*)source; bg->b.imagePtr = source;
bg->b.imageLoad = G_BGLT_LOADTILE; bg->b.imageLoad = G_BGLT_LOADTILE;
bg->b.imageFmt = fmt; bg->b.imageFmt = fmt;
bg->b.imageSiz = siz; bg->b.imageSiz = siz;