mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 06:54:14 -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
@@ -11,6 +11,7 @@
|
||||
#include "z64vismono.h"
|
||||
#include "z64viszbuf.h"
|
||||
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
|
||||
#include "debug.h"
|
||||
|
||||
s32 gFramerateDivisor = 1;
|
||||
f32 gFramerateDivisorF = 1.0f;
|
||||
@@ -168,7 +169,7 @@ void GameState_InitArena(GameState* gameState, size_t size) {
|
||||
}
|
||||
|
||||
THA_Init(&gameState->heap, NULL, 0);
|
||||
__assert("../game.c", 1035);
|
||||
_dbg_hungup("../game.c", 1035);
|
||||
}
|
||||
|
||||
void GameState_Realloc(GameState* gameState, size_t size) {
|
||||
@@ -192,7 +193,7 @@ void GameState_Realloc(GameState* gameState, size_t size) {
|
||||
THA_Init(&gameState->heap, gameArena, size);
|
||||
} else {
|
||||
THA_Init(&gameState->heap, NULL, 0);
|
||||
__assert("../game.c", 1074);
|
||||
_dbg_hungup("../game.c", 1074);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user