From 17da5e7bf92c890b62b8b9ab1df61fcb0b15764f Mon Sep 17 00:00:00 2001 From: cadmic Date: Tue, 30 Jan 2024 16:43:10 -0800 Subject: z_collision_check.c OK (#1642) * Match z_collision_check.c * Disable function declarations * Remove /* OOT_DEBUG */ * Remove newlines around ifdef * Newlines * Tweak z_actor.c #if to avoid merge conflicts --- src/code/z_actor.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/code/z_actor.c') diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 73793558a..28083a5c2 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2609,9 +2609,11 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { TitleCard_Draw(play, &actorCtx->titleCtx); } +#if OOT_DEBUG if ((HREG(64) != 1) || (HREG(76) != 0)) { CollisionCheck_DrawCollision(play, &play->colChkCtx); } +#endif CLOSE_DISPS(play->state.gfxCtx, "../z_actor.c", 6563); } -- cgit v1.2.3