diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2021-12-07 14:19:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 14:19:13 -0500 |
| commit | 037c1dcad6e37f5135ead0ef2180a57ce256a267 (patch) | |
| tree | 273767379f938a8d8cef5689d1f7c2f331e158e3 /src/code | |
| parent | 15d379657459e188d7ba34f8d1e3ca40eaa86e8a (diff) | |
Cleanup more u32 being used as pointers. (#1052)
* merge master
* more u32 -> void*
* remove jenkins file
* format
* z64.h
* fix
* re cleanup z64scene.h
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_room.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_room.c b/src/code/z_room.c index c25c755a4..e4c6fe444 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -246,7 +246,7 @@ s32 func_80096238(void* data) { 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) { Gfx* displayListHead; 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.imageH = height * 4; bg->b.frameY = frameY * 4; - bg->b.imagePtr = (void*)source; + bg->b.imagePtr = source; bg->b.imageLoad = G_BGLT_LOADTILE; bg->b.imageFmt = fmt; bg->b.imageSiz = siz; |