summaryrefslogtreecommitdiff
path: root/src/code/z_vimode.c
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-09-02 15:34:29 -0400
committerGitHub <noreply@github.com>2023-09-02 15:34:29 -0400
commit4fa13e4132cf8adb2f07bb34927e62e525c8cc79 (patch)
tree5f00c923350f9386a7f46b0c50b888c878d7eacf /src/code/z_vimode.c
parent9cceea48f31bdeea1c2933a1f64a74b60b80f17a (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_vimode.c')
-rw-r--r--src/code/z_vimode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index 778c89c14..8e3d1c59f 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -1,6 +1,7 @@
#include "global.h"
+#include "debug.h"
#include "z64vimode.h"
-#include "ultra64/viint.h"
+#include "PR/viint.h"
typedef struct {
/* 0x00 */ u32 burst;
@@ -143,7 +144,7 @@ void ViMode_Configure(OSViMode* viMode, s32 type, s32 tvType, s32 loRes, s32 ant
viMode->fldRegs[0].vBurst = ptr->vBurst;
viMode->fldRegs[1].vBurst = ptr->vBurst;
} else {
- __assert("../z_vimode.c", 216);
+ _dbg_hungup("../z_vimode.c", 216);
}
viMode->comRegs.hStart += (leftAdjust << 16) + (s16)rightAdjust;