diff options
| author | cadmic <cadmic24@gmail.com> | 2024-02-03 07:59:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-03 10:59:25 -0500 |
| commit | 178e95ae50fb1b21dffc38e3dedc7b6e3b83ed5f (patch) | |
| tree | dff80581bb83a2082ae779d23c024e37e1837e9f /src/code/db_camera.c | |
| parent | d9a1148d13d1b0b32ea89e8dbafb58aae8cc8919 (diff) | |
Give debug_malloc.c the same treatment as system_malloc.c and z_malloc.c (#1700)
Diffstat (limited to 'src/code/db_camera.c')
| -rw-r--r-- | src/code/db_camera.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 795b6f5ef..242609295 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1538,18 +1538,18 @@ char DebugCamera_InitCut(s32 idx, DebugCamSub* sub) { D_80161250[0x3F + sDebugCamCuts[idx].letter] = 'O'; i = sub->nPoints * sizeof(CutsceneCameraPoint); - sDebugCamCuts[idx].lookAt = DebugArena_MallocDebug(i, "../db_camera.c", 2748); + sDebugCamCuts[idx].lookAt = DEBUG_ARENA_MALLOC(i, "../db_camera.c", 2748); if (sDebugCamCuts[idx].lookAt == NULL) { // "Debug camera memory allocation failure" PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2751); return '?'; } - sDebugCamCuts[idx].position = DebugArena_MallocDebug(i, "../db_camera.c", 2754); + sDebugCamCuts[idx].position = DEBUG_ARENA_MALLOC(i, "../db_camera.c", 2754); if (sDebugCamCuts[idx].position == NULL) { // "Debug camera memory allocation failure" PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2757); - DebugArena_FreeDebug(sDebugCamCuts[idx].lookAt, "../db_camera.c", 2758); + DEBUG_ARENA_FREE(sDebugCamCuts[idx].lookAt, "../db_camera.c", 2758); sDebugCamCuts[idx].lookAt = NULL; return '?'; } @@ -1572,8 +1572,8 @@ void DebugCamera_ResetCut(s32 idx, s32 shouldFree) { } if (shouldFree) { - DebugArena_FreeDebug(sDebugCamCuts[idx].lookAt, "../db_camera.c", 2784); - DebugArena_FreeDebug(sDebugCamCuts[idx].position, "../db_camera.c", 2785); + DEBUG_ARENA_FREE(sDebugCamCuts[idx].lookAt, "../db_camera.c", 2784); + DEBUG_ARENA_FREE(sDebugCamCuts[idx].position, "../db_camera.c", 2785); } sDebugCamCuts[idx].letter = '?'; @@ -1623,7 +1623,7 @@ s32 DebugCamera_LoadCallback(char* c) { if (sDebugCamCuts[i].letter != '?') { size = sDebugCamCuts[i].nPoints * sizeof(CutsceneCameraPoint); - sDebugCamCuts[i].lookAt = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2844); + sDebugCamCuts[i].lookAt = DEBUG_ARENA_MALLOC(ALIGN32(size), "../db_camera.c", 2844); if (sDebugCamCuts[i].lookAt == NULL) { // "Debug camera memory allocation failure" PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2847); @@ -1634,7 +1634,7 @@ s32 DebugCamera_LoadCallback(char* c) { } off += ALIGN32(size); - sDebugCamCuts[i].position = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2855); + sDebugCamCuts[i].position = DEBUG_ARENA_MALLOC(ALIGN32(size), "../db_camera.c", 2855); if (sDebugCamCuts[i].position == NULL) { // "Debug camera memory allocation failure" PRINTF("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2858); |