From 037c1dcad6e37f5135ead0ef2180a57ce256a267 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Tue, 7 Dec 2021 14:19:13 -0500 Subject: Cleanup more u32 being used as pointers. (#1052) * merge master * more u32 -> void* * remove jenkins file * format * z64.h * fix * re cleanup z64scene.h --- src/code/z_room.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/code') 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; -- cgit v1.2.3