diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-09-02 15:34:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-02 15:34:29 -0400 |
| commit | 4fa13e4132cf8adb2f07bb34927e62e525c8cc79 (patch) | |
| tree | 5f00c923350f9386a7f46b0c50b888c878d7eacf /src/code/z_play.c | |
| parent | 9cceea48f31bdeea1c2933a1f64a74b60b80f17a (diff) | |
Move libultra function declarations to libultra headers (#1196)
* Delete unused headers
* Move PR and io to ultra64
* move headers to ultra64
* more cleanups
* more reorganizing
* i think that should be all
* format
* ifdef guards cleanup
* Add IO_READ and IO_WRITE macros for future use
* warnings
* review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* warnings again
* warn
* ifdef guards
* fix merge
* fix merge
* fix merge
* bss
* padutils.h
* bss
* bss
* bss
* fix merge
* bss
* bss
* bss
* fix merge
* fixes
* fixes
* bss
* bss
* fix merge
* fix
* fix
* fix includepaths
* fix paths
* bss
* fix
* ultra64/ -> PR/
* header guards
* fix ehader guards
* fix
* fix++
* format
* bss is borken
* prevent 2
* :despair:
* bss
* rename assert to dbg_hungup
* fix
* a
* fix
* bss
* fix
* bss
* bss
---------
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'src/code/z_play.c')
| -rw-r--r-- | src/code/z_play.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c index ccbf1f0c4..48fbb1f2d 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -32,6 +32,7 @@ u8 sMotionBlurStatus; #include "overlays/gamestates/ovl_opening/z_opening.h" #include "overlays/gamestates/ovl_file_choose/z_file_select.h" #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" +#include "debug.h" s32 gDbgCamEnabled = false; u8 D_801D0D54 = false; @@ -335,11 +336,11 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) { default: fbdemoType = -1; - __assert("../z_play.c", 1420); + _dbg_hungup("../z_play.c", 1420); } } else { fbdemoType = -1; - __assert("../z_play.c", 1423); + _dbg_hungup("../z_play.c", 1423); } transitionCtx->transitionType = transitionType; |