diff options
| author | cadmic <cadmic24@gmail.com> | 2024-01-30 16:43:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 19:43:10 -0500 |
| commit | 17da5e7bf92c890b62b8b9ab1df61fcb0b15764f (patch) | |
| tree | 31d7c98ecfad079193761d727b99c0885f4305f2 /src/code/z_actor.c | |
| parent | 77c9c97ff9c1ca822e8f72575cd6a02eabc1b716 (diff) | |
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
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |