mirror of
https://github.com/zeldaret/mm.git
synced 2026-06-02 10:09:58 -04:00
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>
This commit is contained in:
+3
-2
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user