summaryrefslogtreecommitdiff
path: root/src/code/z_message_PAL.c
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2022-11-17 02:57:02 +0000
committerGitHub <noreply@github.com>2022-11-16 21:57:02 -0500
commit7ecafcfe7d357ff1cbcf49ce4d87a9efedae552e (patch)
treeba036ae7cdce859adb4e0f036fcc28284be22423 /src/code/z_message_PAL.c
parent40639e698d0b4681d088194dc72a6a3b910e7d13 (diff)
More documentation for `z_std_dma.c` (#1415)
* More documentation for z_std_dma * uintptr casts for rom symbols in z64animation.h and z_kanfont.c * Format * Suggested changes, more defines for static texture sizes * PI Interface -> PI * Further suggested changes * Format * Comments about item_name and map_name texture assumptions
Diffstat (limited to 'src/code/z_message_PAL.c')
-rw-r--r--src/code/z_message_PAL.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c
index 189ab1eee..7dce3ecb6 100644
--- a/src/code/z_message_PAL.c
+++ b/src/code/z_message_PAL.c
@@ -1166,18 +1166,19 @@ void Message_LoadItemIcon(PlayState* play, u16 itemId, s16 y) {
R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem32XOffsets[gSaveContext.language];
R_TEXTBOX_ICON_YPOS = y + 6;
R_TEXTBOX_ICON_SIZE = 32;
- DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
- (uintptr_t)_icon_item_staticSegmentRomStart + (itemId * 0x1000), 0x1000,
- "../z_message_PAL.c", 1473);
+ DmaMgr_RequestSyncDebug(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
+ (uintptr_t)_icon_item_staticSegmentRomStart + (itemId * ICON_ITEM_TEX_SIZE),
+ ICON_ITEM_TEX_SIZE, "../z_message_PAL.c", 1473);
// "Item 32-0"
osSyncPrintf("アイテム32-0\n");
} else {
R_TEXTBOX_ICON_XPOS = R_TEXT_INIT_XPOS - sIconItem24XOffsets[gSaveContext.language];
R_TEXTBOX_ICON_YPOS = y + 10;
R_TEXTBOX_ICON_SIZE = 24;
- DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
- (uintptr_t)_icon_item_24_staticSegmentRomStart + (itemId - ITEM_MEDALLION_FOREST) * 0x900,
- 0x900, "../z_message_PAL.c", 1482);
+ DmaMgr_RequestSyncDebug(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
+ (uintptr_t)_icon_item_24_staticSegmentRomStart +
+ (itemId - ITEM_MEDALLION_FOREST) * ICON_ITEM_24_TEX_SIZE,
+ ICON_ITEM_24_TEX_SIZE, "../z_message_PAL.c", 1482);
// "Item 24"
osSyncPrintf("アイテム24=%d (%d) {%d}\n", itemId, itemId - ITEM_KOKIRI_EMERALD, 84);
}
@@ -1534,14 +1535,14 @@ void Message_Decode(PlayState* play) {
msgCtx->textboxBackgroundBackColorIdx = font->msgBuf[msgCtx->msgBufPos + 2] & 0xF;
msgCtx->textboxBackgroundYOffsetIdx = (font->msgBuf[msgCtx->msgBufPos + 3] & 0xF0) >> 4;
msgCtx->textboxBackgroundUnkArg = font->msgBuf[msgCtx->msgBufPos + 3] & 0xF;
- DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE,
- (uintptr_t)_message_texture_staticSegmentRomStart +
- msgCtx->textboxBackgroundIdx * 0x900,
- 0x900, "../z_message_PAL.c", 1830);
- DmaMgr_SendRequest1(msgCtx->textboxSegment + MESSAGE_STATIC_TEX_SIZE + 0x900,
- (uintptr_t)_message_texture_staticSegmentRomStart +
- (msgCtx->textboxBackgroundIdx + 1) * 0x900,
- 0x900, "../z_message_PAL.c", 1834);
+ DmaMgr_RequestSyncDebug(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", 1830);
+ DmaMgr_RequestSyncDebug(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", 1834);
msgCtx->msgBufPos += 3;
R_TEXTBOX_BG_YPOS = R_TEXTBOX_Y + 8;
numLines = 2;
@@ -1636,24 +1637,24 @@ void Message_OpenText(PlayState* play, u16 textId) {
if (sTextIsCredits) {
Message_FindCreditsMessage(play, textId);
msgCtx->msgLength = font->msgLength;
- DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset,
- font->msgLength, "../z_message_PAL.c", 1954);
+ DmaMgr_RequestSyncDebug(font->msgBuf, (uintptr_t)_staff_message_data_staticSegmentRomStart + font->msgOffset,
+ font->msgLength, "../z_message_PAL.c", 1954);
} else {
if (gSaveContext.language == LANGUAGE_ENG) {
Message_FindMessage(play, textId);
msgCtx->msgLength = font->msgLength;
- DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset,
- font->msgLength, "../z_message_PAL.c", 1966);
+ DmaMgr_RequestSyncDebug(font->msgBuf, (uintptr_t)_nes_message_data_staticSegmentRomStart + font->msgOffset,
+ font->msgLength, "../z_message_PAL.c", 1966);
} else if (gSaveContext.language == LANGUAGE_GER) {
Message_FindMessage(play, textId);
msgCtx->msgLength = font->msgLength;
- DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset,
- font->msgLength, "../z_message_PAL.c", 1978);
+ DmaMgr_RequestSyncDebug(font->msgBuf, (uintptr_t)_ger_message_data_staticSegmentRomStart + font->msgOffset,
+ font->msgLength, "../z_message_PAL.c", 1978);
} else {
Message_FindMessage(play, textId);
msgCtx->msgLength = font->msgLength;
- DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset,
- font->msgLength, "../z_message_PAL.c", 1990);
+ DmaMgr_RequestSyncDebug(font->msgBuf, (uintptr_t)_fra_message_data_staticSegmentRomStart + font->msgOffset,
+ font->msgLength, "../z_message_PAL.c", 1990);
}
}
msgCtx->textBoxProperties = font->charTexBuf[0];
@@ -1663,10 +1664,10 @@ void Message_OpenText(PlayState* play, u16 textId) {
// "Text Box Type"
osSyncPrintf("吹き出し種類=%d\n", msgCtx->textBoxType);
if (textBoxType < TEXTBOX_TYPE_NONE_BOTTOM) {
- DmaMgr_SendRequest1(msgCtx->textboxSegment,
- (uintptr_t)_message_staticSegmentRomStart +
- (messageStaticIndices[textBoxType] * MESSAGE_STATIC_TEX_SIZE),
- MESSAGE_STATIC_TEX_SIZE, "../z_message_PAL.c", 2006);
+ DmaMgr_RequestSyncDebug(msgCtx->textboxSegment,
+ (uintptr_t)_message_staticSegmentRomStart +
+ (messageStaticIndices[textBoxType] * MESSAGE_STATIC_TEX_SIZE),
+ MESSAGE_STATIC_TEX_SIZE, "../z_message_PAL.c", 2006);
if (textBoxType == TEXTBOX_TYPE_BLACK) {
msgCtx->textboxColorRed = 0;
msgCtx->textboxColorGreen = 0;