From fca5307ea908606c40c051d4c366ed8dcf077258 Mon Sep 17 00:00:00 2001 From: Maide <34639600+Kelebek1@users.noreply.github.com> Date: Wed, 16 Aug 2023 19:11:19 +0100 Subject: m_play (#50) * m_play * Some warnings * lots of function renames from the gcn version * fix warnings * format * a * a * PR * PR2 --------- Co-authored-by: Maide Co-authored-by: angie --- src/code/game.c | 3 +++ src/code/m_actor.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/code') diff --git a/src/code/game.c b/src/code/game.c index 1c634ba..03677a8 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -107,6 +107,9 @@ void game_debug_draw_last(GameState* gameState, GraphicsContext* gfxCtx) { gfxclose(gfxHead, gfx); POLY_OPA_DISP = gfx; + do { + } while (0); + CLOSE_DISPS(gfxCtx); } diff --git a/src/code/m_actor.c b/src/code/m_actor.c index f5c2091..6419d42 100644 --- a/src/code/m_actor.c +++ b/src/code/m_actor.c @@ -264,7 +264,7 @@ void Actor_draw(PlayState* play, Actor* actor) { OPEN_DISPS(play->state.gfxCtx); light = Global_light_read(&play->lightCtx, play->state.gfxCtx); - LightsN_list_check(light, play->lightCtx.unk_0, (actor->flags & ACTOR_FLAG_400000) ? NULL : &actor->world.pos); + LightsN_list_check(light, play->lightCtx.listHead, (actor->flags & ACTOR_FLAG_400000) ? NULL : &actor->world.pos); LightsN_disp(light, play->state.gfxCtx); Matrix_softcv3_load(actor->world.pos.x, actor->world.pos.y + actor->shape.unk_08 * actor->scale.y, @@ -1121,7 +1121,7 @@ Hilite* Setpos_HiliteReflect_init(Vec3f* object, PlayState* play) { sp24.x = play->kankyo.unk_02; sp24.y = play->kankyo.unk_03; sp24.z = play->kankyo.unk_04; - return HiliteReflect_init(object, &play->unk_1960, &sp24, play->state.gfxCtx); + return HiliteReflect_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx); } Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, PlayState* play) { @@ -1130,7 +1130,7 @@ Hilite* Setpos_HiliteReflect_xlu_init(Vec3f* object, PlayState* play) { sp24.x = play->kankyo.unk_02; sp24.y = play->kankyo.unk_03; sp24.z = play->kankyo.unk_04; - return HiliteReflect_xlu_init(object, &play->unk_1960, &sp24, play->state.gfxCtx); + return HiliteReflect_xlu_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx); } Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, PlayState* play) { @@ -1139,5 +1139,5 @@ Hilite* Setpos_HiliteReflect_light_init(Vec3f* object, PlayState* play) { sp24.x = play->kankyo.unk_02; sp24.y = play->kankyo.unk_03; sp24.z = play->kankyo.unk_04; - return HiliteReflect_xlu_init(object, &play->unk_1960, &sp24, play->state.gfxCtx); + return HiliteReflect_xlu_init(object, &play->unk_1938.unk_028, &sp24, play->state.gfxCtx); } -- cgit v1.2.3