summaryrefslogtreecommitdiff
path: root/src/code/z_construct.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code/z_construct.c')
-rw-r--r--src/code/z_construct.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index 374665d38..fa0f4a38d 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -19,17 +19,17 @@ void Interface_Init(PlayState* play) {
View_Init(&interfaceCtx->view, play->state.gfxCtx);
interfaceCtx->unk_1EC = interfaceCtx->unk_1EE = interfaceCtx->unk_1F0 = 0;
+ interfaceCtx->unk_1F4 = 0.0f;
interfaceCtx->unk_1FA = interfaceCtx->unk_261 = interfaceCtx->unk_1FC = 0;
interfaceCtx->unk_22E = 0;
interfaceCtx->lensMagicConsumptionTimer = 16;
- interfaceCtx->unk_1F4 = 0.0f;
interfaceCtx->unk_228 = XREG(95);
- interfaceCtx->minimapAlpha = 0;
- interfaceCtx->unk_260 = 0;
interfaceCtx->unk_244 = interfaceCtx->aAlpha = interfaceCtx->bAlpha = interfaceCtx->cLeftAlpha =
interfaceCtx->cDownAlpha = interfaceCtx->cRightAlpha = interfaceCtx->healthAlpha = interfaceCtx->startAlpha =
interfaceCtx->magicAlpha = 0;
+ interfaceCtx->minimapAlpha = 0;
+ interfaceCtx->unk_260 = 0;
parameterSize = (uintptr_t)_parameter_staticSegmentRomEnd - (uintptr_t)_parameter_staticSegmentRomStart;
@@ -204,7 +204,7 @@ void Interface_Init(PlayState* play) {
void Message_Init(PlayState* play) {
MessageContext* msgCtx = &play->msgCtx;
- s32 pad;
+ Font* font = &msgCtx->font;
Message_SetTables();
@@ -224,7 +224,7 @@ void Message_Init(PlayState* play) {
PRINTF(T("吹き出しgame_alloc=%x\n", "Textbox game_alloc=%x\n"), TEXTBOX_SEGMENT_SIZE);
ASSERT(msgCtx->textboxSegment != NULL, "message->fukidashiSegment != NULL", "../z_construct.c", 352);
- Font_LoadOrderedFont(&play->msgCtx.font);
+ Font_LoadOrderedFont(font);
YREG(31) = 0;
}
@@ -484,7 +484,11 @@ void Regs_InitDataImpl(void) {
R_TEXTBOX_X_TARGET = 54;
R_TEXTBOX_Y_TARGET = 48;
R_TEXTBOX_WIDTH_TARGET = 128;
+#if !PLATFORM_IQUE
R_TEXTBOX_HEIGHT_TARGET = 64;
+#else
+ R_TEXTBOX_HEIGHT_TARGET = 74;
+#endif
R_TEXTBOX_TEXWIDTH_TARGET = 2048;
R_TEXTBOX_TEXHEIGHT_TARGET = 512;
XREG(78) = 96;