From cf4dc98cc934cdb62ed8b5001602468fac6dfeb3 Mon Sep 17 00:00:00 2001 From: cadmic Date: Fri, 15 Nov 2024 10:18:05 -0800 Subject: [PATCH] Use debug macros even in N64-only code (#2298) * Use debug macros even in N64-only code * Use UNK_FILE/UNK_LINE instead --- include/unk.h | 5 +- src/boot/z_std_dma.c | 4 +- src/code/code_n64dd_800AD410.c | 4 +- src/code/z_kanfont.c | 12 +++-- src/code/z_map_exp.c | 8 ++-- src/code/z_message.c | 48 +++++++++---------- src/code/z_play.c | 2 +- .../ovl_file_choose/z_file_choose.c | 12 ++--- .../ovl_file_choose/z_file_nameset.c | 6 +-- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 36 +++++++------- 10 files changed, 70 insertions(+), 67 deletions(-) diff --git a/include/unk.h b/include/unk.h index e28f2bd8cd..f8498b72dd 100644 --- a/include/unk.h +++ b/include/unk.h @@ -11,6 +11,9 @@ #define UNK_FUN_PTR(name) void(*name)(void) #define UNK_ARGS #define UNK_SIZE 1 -#define UNK_LINE 1 + +// Unknown filename and line number for debug macros +#define UNK_FILE "" +#define UNK_LINE 0 #endif diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index d609ce6f10..b8eaecf74e 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -541,11 +541,9 @@ s32 DmaMgr_RequestAsync(DmaRequest* req, void* ram, uintptr_t vrom, size_t size, #if OOT_DEBUG if ((ram == NULL) || (osMemSize < OS_K0_TO_PHYSICAL(ram) + size) || (vrom & 1) || (vrom > 0x4000000) || (size == 0) || (size & 1)) { - // The line numbers for `DMA_ERROR` are only used in retail builds, but this usage was removed so - // its line number is unknown. //! @bug `req` is passed to `DMA_ERROR` without rom, ram and size being set DMA_ERROR(req, NULL, "ILLIGAL DMA-FUNCTION CALL", T("パラメータ異常です", "Parameter error"), "../z_std_dma.c", - 0, 0, 0); + UNK_LINE, UNK_LINE, UNK_LINE); } #endif diff --git a/src/code/code_n64dd_800AD410.c b/src/code/code_n64dd_800AD410.c index 66dcc3cc76..979a95afbb 100644 --- a/src/code/code_n64dd_800AD410.c +++ b/src/code/code_n64dd_800AD410.c @@ -11,8 +11,8 @@ vu8 D_80121214; void func_800AD410(void) { if (!D_80121210) { - DmaMgr_RequestSync(_n64ddSegmentStart, (uintptr_t)_n64ddSegmentRomStart, - _n64ddSegmentRomEnd - _n64ddSegmentRomStart); + DMA_REQUEST_SYNC(_n64ddSegmentStart, (uintptr_t)_n64ddSegmentRomStart, + _n64ddSegmentRomEnd - _n64ddSegmentRomStart, UNK_FILE, UNK_LINE); bzero(_n64ddSegmentBssStart, _n64ddSegmentBssEnd - _n64ddSegmentBssStart); D_80121210 = true; D_80121211 = func_801C6E80(); diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index a4ae98c5b1..4093f775a9 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -8,8 +8,9 @@ */ void Font_LoadCharWide(Font* font, u16 character, u16 codePointIndex) { #if OOT_NTSC - DmaMgr_RequestSync(&font->charTexBuf[codePointIndex], - (uintptr_t)_kanjiSegmentRomStart + Kanji_OffsetFromShiftJIS(character), FONT_CHAR_TEX_SIZE); + DMA_REQUEST_SYNC(&font->charTexBuf[codePointIndex], + (uintptr_t)_kanjiSegmentRomStart + Kanji_OffsetFromShiftJIS(character), FONT_CHAR_TEX_SIZE, + "../z_kanfont.c", UNK_LINE); #endif } @@ -53,7 +54,8 @@ void Font_LoadOrderedFont(Font* font) { #if OOT_NTSC len = (u32)size / 2; - DmaMgr_RequestSync(font->msgBufWide, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, size); + DMA_REQUEST_SYNC(font->msgBufWide, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, size, + "../z_kanfont.c", UNK_LINE); fontBufIndex = 0; for (codePointIndex = 0; font->msgBufWide[codePointIndex] != MESSAGE_WIDE_END; codePointIndex++) { @@ -63,8 +65,8 @@ void Font_LoadOrderedFont(Font* font) { if (font->msgBufWide[codePointIndex] != MESSAGE_WIDE_NEWLINE) { offset = Kanji_OffsetFromShiftJIS(font->msgBufWide[codePointIndex]); - DmaMgr_RequestSync(&font->fontBuf[fontBufIndex * 8], (uintptr_t)_kanjiSegmentRomStart + offset, - FONT_CHAR_TEX_SIZE); + DMA_REQUEST_SYNC(&font->fontBuf[fontBufIndex * 8], (uintptr_t)_kanjiSegmentRomStart + offset, + FONT_CHAR_TEX_SIZE, "../z_kanfont.c", UNK_LINE); fontBufIndex += FONT_CHAR_TEX_SIZE / 8; } } diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index ee72c9a501..1c82288b7a 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -167,10 +167,10 @@ void Map_InitData(PlayState* play, s16 room) { #if PLATFORM_N64 if ((B_80121220 != NULL) && (B_80121220->unk_28 != NULL) && B_80121220->unk_28(play)) { } else { - DmaMgr_RequestSync(play->interfaceCtx.mapSegment, - (uintptr_t)_map_i_staticSegmentRomStart + - ((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * MAP_I_TEX_SIZE), - MAP_I_TEX_SIZE); + DMA_REQUEST_SYNC(play->interfaceCtx.mapSegment, + (uintptr_t)_map_i_staticSegmentRomStart + + ((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * MAP_I_TEX_SIZE), + MAP_I_TEX_SIZE, "../z_map_exp.c", UNK_LINE); } #else DMA_REQUEST_SYNC(play->interfaceCtx.mapSegment, diff --git a/src/code/z_message.c b/src/code/z_message.c index 4b00e17449..75ccc2c089 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -2036,14 +2036,14 @@ void Message_Decode(PlayState* play) { msgCtx->textboxBackgroundBackColorIdx = (font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF00) >> 8; msgCtx->textboxBackgroundYOffsetIdx = (font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF0) >> 4; msgCtx->textboxBackgroundUnkArg = font->msgBufWide[msgCtx->msgBufPos + 2] & 0xF; - DmaMgr_RequestSync(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, - (uintptr_t)_message_texture_staticSegmentRomStart + - msgCtx->textboxBackgroundIdx * MESSAGE_TEXTURE_STATIC_TEX_SIZE, - MESSAGE_TEXTURE_STATIC_TEX_SIZE); - DmaMgr_RequestSync(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + MESSAGE_TEXTURE_STATIC_TEX_SIZE, - (uintptr_t)_message_texture_staticSegmentRomStart + - (msgCtx->textboxBackgroundIdx + 1) * MESSAGE_TEXTURE_STATIC_TEX_SIZE, - MESSAGE_TEXTURE_STATIC_TEX_SIZE); + DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE, + (uintptr_t)_message_texture_staticSegmentRomStart + + msgCtx->textboxBackgroundIdx * MESSAGE_TEXTURE_STATIC_TEX_SIZE, + MESSAGE_TEXTURE_STATIC_TEX_SIZE, "../z_message_PAL.c", UNK_LINE); + DMA_REQUEST_SYNC(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + MESSAGE_TEXTURE_STATIC_TEX_SIZE, + (uintptr_t)_message_texture_staticSegmentRomStart + + (msgCtx->textboxBackgroundIdx + 1) * MESSAGE_TEXTURE_STATIC_TEX_SIZE, + MESSAGE_TEXTURE_STATIC_TEX_SIZE, "../z_message_PAL.c", UNK_LINE); numLines = 2; msgCtx->msgBufPos += 2; R_TEXTBOX_BG_YPOS = R_TEXTBOX_Y + 8; @@ -2528,8 +2528,8 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_60 != NULL) && B_80121220->unk_60(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset, @@ -2544,12 +2544,12 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_64 != NULL) && B_80121220->unk_64(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_jpn_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); #endif } else { Message_FindMessageNES(play, textId); @@ -2558,12 +2558,12 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_68 != NULL) && B_80121220->unk_68(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); #endif } #else @@ -2574,8 +2574,8 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_64 != NULL) && B_80121220->unk_64(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset, @@ -2589,8 +2589,8 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_64 != NULL) && B_80121220->unk_68(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset, @@ -2604,8 +2604,8 @@ void Message_OpenText(PlayState* play, u16 textId) { if ((B_80121220 != NULL) && (B_80121220->unk_64 != NULL) && B_80121220->unk_6C_PAL(&play->msgCtx.font)) { } else { - DmaMgr_RequestSync(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset, - font->msgLength); + DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset, + font->msgLength, "../z_message_PAL.c", UNK_LINE); } #else DMA_REQUEST_SYNC(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset, diff --git a/src/code/z_play.c b/src/code/z_play.c index 3cfedca3de..bfca2ab4ff 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1505,7 +1505,7 @@ void* Play_LoadFileFromDiskDrive(PlayState* this, RomFile* file) { void* allocp; size = file->vromEnd - file->vromStart; - allocp = THA_AllocTailAlign16(&this->state.tha, size); + allocp = GAME_STATE_ALLOC(&this->state, size, "../z_play.c", UNK_LINE); func_801C7C1C(allocp, file->vromStart, size); return allocp; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index ef4d6cd779..77d2bf3b20 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -163,7 +163,7 @@ void FileSelect_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 center s32 pad; s32 i; - OPEN_DISPS(gfxCtx, "../z_file_choose.c", 0); + OPEN_DISPS(gfxCtx, "../z_file_choose.c", UNK_LINE); Gfx_SetupDL_56Opa(gfxCtx); @@ -210,7 +210,7 @@ void FileSelect_DrawImageRGBA32(GraphicsContext* gfxCtx, s16 centerX, s16 center } } - CLOSE_DISPS(gfxCtx, "../z_file_choose.c", 0); + CLOSE_DISPS(gfxCtx, "../z_file_choose.c", UNK_LINE); } void FileSelect_DrawInitialLanguageMenu(FileSelectState* this) { @@ -219,7 +219,7 @@ void FileSelect_DrawInitialLanguageMenu(FileSelectState* this) { s32 y1; s32 y2; - OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 0); + OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", UNK_LINE); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 70 + WREG(0)); FileSelect_DrawImageRGBA32(this->state.gfxCtx, 160, 85 + WREG(1), (u8*)gTitleZeldaShieldLogoTex, 160, 160); @@ -294,7 +294,7 @@ void FileSelect_DrawInitialLanguageMenu(FileSelectState* this) { y1 = y2; } - CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 0); + CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", UNK_LINE); } #endif @@ -2334,8 +2334,8 @@ void FileSelect_Init(GameState* thisx) { #if OOT_PAL_N64 size = gObjectTable[OBJECT_MAG].vromEnd - gObjectTable[OBJECT_MAG].vromStart; - this->objectMagSegment = GAME_STATE_ALLOC(&this->state, size, "../z_file_choose.c", 0); - DMA_REQUEST_SYNC(this->objectMagSegment, gObjectTable[OBJECT_MAG].vromStart, size, "../z_file_choose.c", 0); + this->objectMagSegment = GAME_STATE_ALLOC(&this->state, size, "../z_file_choose.c", UNK_LINE); + DMA_REQUEST_SYNC(this->objectMagSegment, gObjectTable[OBJECT_MAG].vromStart, size, "../z_file_choose.c", UNK_LINE); #endif Matrix_Init(&this->state); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index c800fda301..d78a044745 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -16,7 +16,7 @@ void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) { #if OOT_NTSC void FileSelect_DrawCharacterTransition(GraphicsContext* gfxCtx, void* texture1, void* texture2, s16 vtx) { - OPEN_DISPS(gfxCtx, "", 0); + OPEN_DISPS(gfxCtx, "../z_file_nameset_PAL.c", UNK_LINE); gDPLoadTextureBlock_4b(POLY_OPA_DISP++, texture1, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -24,7 +24,7 @@ void FileSelect_DrawCharacterTransition(GraphicsContext* gfxCtx, void* texture1, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0); - CLOSE_DISPS(gfxCtx, "", 0); + CLOSE_DISPS(gfxCtx, "../z_file_nameset_PAL.c", UNK_LINE); } #endif @@ -1877,7 +1877,7 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { #if OOT_PAL_N64 Matrix_Push(); Matrix_Translate(0.0f, 0.8f, 0.0f, MTXMODE_APPLY); - MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, this->state.gfxCtx, "../z_file_nameset_PAL.c", 0); + MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, this->state.gfxCtx, "../z_file_nameset_PAL.c", UNK_LINE); gSPVertex(POLY_OPA_DISP++, gOptionsDividerLanguageVtx, 4, 0); gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); Matrix_Pop(); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index c47e8c2114..272ba33db4 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -3698,12 +3698,12 @@ void KaleidoScope_Update(PlayState* play) { #if OOT_NTSC if (gSaveContext.language == LANGUAGE_JPN) { size = (uintptr_t)_icon_item_jpn_staticSegmentRomEnd - (uintptr_t)_icon_item_jpn_staticSegmentRomStart; - DmaMgr_RequestSync(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_jpn_staticSegmentRomStart, - size); + DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_jpn_staticSegmentRomStart, size, + "../z_kaleido_scope_PAL.c", UNK_LINE); } else { size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; - DmaMgr_RequestSync(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, - size); + DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size, + "../z_kaleido_scope_PAL.c", UNK_LINE); } #else if (gSaveContext.language == LANGUAGE_ENG) { @@ -3734,17 +3734,17 @@ void KaleidoScope_Update(PlayState* play) { if (((void)0, gSaveContext.worldMapArea) < WORLD_MAP_AREA_MAX) { #if OOT_NTSC if (gSaveContext.language == LANGUAGE_JPN) { - DmaMgr_RequestSync(pauseCtx->nameSegment + MAX(MAP_NAME_TEX1_SIZE, ITEM_NAME_TEX_SIZE), - (uintptr_t)_map_name_staticSegmentRomStart + - (((void)0, gSaveContext.worldMapArea) * MAP_NAME_TEX2_SIZE) + - 24 * MAP_NAME_TEX1_SIZE + 22 * LANGUAGE_JPN * MAP_NAME_TEX2_SIZE, - MAP_NAME_TEX2_SIZE); + DMA_REQUEST_SYNC(pauseCtx->nameSegment + MAX(MAP_NAME_TEX1_SIZE, ITEM_NAME_TEX_SIZE), + (uintptr_t)_map_name_staticSegmentRomStart + + (((void)0, gSaveContext.worldMapArea) * MAP_NAME_TEX2_SIZE) + + 24 * MAP_NAME_TEX1_SIZE + 22 * LANGUAGE_JPN * MAP_NAME_TEX2_SIZE, + MAP_NAME_TEX2_SIZE, "../z_kaleido_scope_PAL.c", UNK_LINE); } else { - DmaMgr_RequestSync(pauseCtx->nameSegment + MAX(MAP_NAME_TEX1_SIZE, ITEM_NAME_TEX_SIZE), - (uintptr_t)_map_name_staticSegmentRomStart + - (((void)0, gSaveContext.worldMapArea) * MAP_NAME_TEX2_SIZE) + - 24 * MAP_NAME_TEX1_SIZE + 22 * LANGUAGE_ENG * MAP_NAME_TEX2_SIZE, - MAP_NAME_TEX2_SIZE); + DMA_REQUEST_SYNC(pauseCtx->nameSegment + MAX(MAP_NAME_TEX1_SIZE, ITEM_NAME_TEX_SIZE), + (uintptr_t)_map_name_staticSegmentRomStart + + (((void)0, gSaveContext.worldMapArea) * MAP_NAME_TEX2_SIZE) + + 24 * MAP_NAME_TEX1_SIZE + 22 * LANGUAGE_ENG * MAP_NAME_TEX2_SIZE, + MAP_NAME_TEX2_SIZE, "../z_kaleido_scope_PAL.c", UNK_LINE); } #else if (gSaveContext.language == LANGUAGE_ENG) { @@ -4295,12 +4295,12 @@ void KaleidoScope_Update(PlayState* play) { #if OOT_NTSC if (gSaveContext.language == LANGUAGE_JPN) { size = (uintptr_t)_icon_item_jpn_staticSegmentRomEnd - (uintptr_t)_icon_item_jpn_staticSegmentRomStart; - DmaMgr_RequestSync(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_jpn_staticSegmentRomStart, - size); + DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_jpn_staticSegmentRomStart, size, + "../z_kaleido_scope_PAL.c", UNK_LINE); } else { size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; - DmaMgr_RequestSync(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, - size); + DMA_REQUEST_SYNC(pauseCtx->iconItemLangSegment, (uintptr_t)_icon_item_nes_staticSegmentRomStart, size, + "../z_kaleido_scope_PAL.c", UNK_LINE); } #else if (gSaveContext.language == LANGUAGE_ENG) {