diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-01-29 21:27:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 15:27:29 -0500 |
| commit | 9f169a67cd684b4bbabf1e9e81a637f9ce9d0805 (patch) | |
| tree | f6ed233d64aed810c8ac7f0b23d010346cd7360f /include | |
| parent | 68b41d6b0d5983594373a3d8996ad40b1b8a6b32 (diff) | |
Match ``game.c`` - OK (#1644)
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/macros.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/functions.h b/include/functions.h index 67a4c2d2e..26d8ee609 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1299,9 +1299,7 @@ void func_800C213C(PreRender* this, Gfx** gfxP); void PreRender_RestoreFramebuffer(PreRender* this, Gfx** gfxP); void PreRender_CopyImageRegion(PreRender* this, Gfx** gfxP); void PreRender_ApplyFilters(PreRender* this); -void GameState_FaultPrint(void); void GameState_SetFBFilter(Gfx** gfxP); -void GameState_DrawInputDisplay(u16 input, Gfx** gfxP); void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx); void GameState_SetFrameBuffer(GraphicsContext* gfxCtx); void GameState_ReqPadData(GameState* gameState); @@ -1312,7 +1310,9 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g void GameState_Destroy(GameState* gameState); GameStateFunc GameState_GetInit(GameState* gameState); u32 GameState_IsRunning(GameState* gameState); +#ifdef OOT_DEBUG void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line); +#endif void func_800C55D0(GameAlloc* this); void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, s32 line); void* GameAlloc_Malloc(GameAlloc* this, u32 size); diff --git a/include/macros.h b/include/macros.h index 05fa693e2..53b597b4c 100644 --- a/include/macros.h +++ b/include/macros.h @@ -191,6 +191,8 @@ extern struct GraphicsContext* __gfxCtx; #define ZELDA_ARENA_FREE(size, file, line) ZeldaArena_FreeDebug(size, file, line) #define LOG_UTILS_CHECK_NULL_POINTER(exp, ptr, file, line) LogUtils_CheckNullPointer(exp, ptr, file, line) #define LOG_UTILS_CHECK_VALID_POINTER(exp, ptr, file, line) LogUtils_CheckValidPointer(exp, ptr, file, line) +#define HUNGUP_AND_CRASH(file, line) Fault_AddHungupAndCrash(file, line) +#define GAME_ALLOC_MALLOC(alloc, size, file, line) GameAlloc_MallocDebug(alloc, size, file, line) #else @@ -219,6 +221,8 @@ extern struct GraphicsContext* __gfxCtx; #define ZELDA_ARENA_FREE(size, file, line) ZeldaArena_Free(size) #define LOG_UTILS_CHECK_NULL_POINTER(exp, ptr, file, line) (void)0 #define LOG_UTILS_CHECK_VALID_POINTER(exp, ptr, file, line) (void)0 +#define HUNGUP_AND_CRASH(file, line) LogUtils_HungupThread(file, line) +#define GAME_ALLOC_MALLOC(alloc, size, file, line) GameAlloc_Malloc(alloc, size) #endif /* OOT_DEBUG */ |