diff options
| author | mzxrules <mzxrules@gmail.com> | 2022-07-27 16:24:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 16:24:58 -0400 |
| commit | ffcbc0de79b00baafba7ac8ef31798c340b9ab4f (patch) | |
| tree | 1567ed55d26a0681cc073d9a80c04151a071e937 /src/code | |
| parent | 9647f50451f26fa8b96653bf792f86c6148f6d12 (diff) | |
Fix TEXTBOX_POS issue (#1329)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_message_PAL.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 08e2c7aec..eef04951f 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -3031,13 +3031,13 @@ void Message_Update(PlayState* play) { static s16 sTextboxXPositions[] = { 34, 34, 34, 34, 34, 34, }; - static s16 sTextboxMidYPositions[] = { + static s16 sTextboxLowerYPositions[] = { 142, 142, 142, 142, 174, 142, }; static s16 sTextboxUpperYPositions[] = { 38, 38, 38, 38, 174, 38, }; - static s16 sTextboxLowerYPositions[] = { + static s16 sTextboxMidYPositions[] = { 90, 90, 90, 90, 174, 90, }; static s16 sTextboxEndIconYOffset[] = { @@ -3127,32 +3127,30 @@ void Message_Update(PlayState* play) { if (!msgCtx->textBoxPos) { // variable position if (R_SCENE_CAM_TYPE != SCENE_CAM_TYPE_DEFAULT || play->sceneNum == SCENE_HAIRAL_NIWA) { if (averageY < XREG(92)) { - R_TEXTBOX_Y_TARGET = sTextboxMidYPositions[var]; + R_TEXTBOX_Y_TARGET = sTextboxLowerYPositions[var]; } else { R_TEXTBOX_Y_TARGET = sTextboxUpperYPositions[var]; } } else if (play->sceneNum == SCENE_MARKET_DAY || play->sceneNum == SCENE_MARKET_NIGHT || play->sceneNum == SCENE_MARKET_RUINS) { if (averageY < XREG(93)) { - R_TEXTBOX_Y_TARGET = sTextboxMidYPositions[var]; + R_TEXTBOX_Y_TARGET = sTextboxLowerYPositions[var]; } else { R_TEXTBOX_Y_TARGET = sTextboxUpperYPositions[var]; } } else { if (averageY < XREG(94)) { - R_TEXTBOX_Y_TARGET = sTextboxMidYPositions[var]; + R_TEXTBOX_Y_TARGET = sTextboxLowerYPositions[var]; } else { R_TEXTBOX_Y_TARGET = sTextboxUpperYPositions[var]; } } + } else if (msgCtx->textBoxPos == TEXTBOX_POS_TOP) { + R_TEXTBOX_Y_TARGET = sTextboxUpperYPositions[var]; + } else if (msgCtx->textBoxPos == TEXTBOX_POS_MIDDLE) { + R_TEXTBOX_Y_TARGET = sTextboxMidYPositions[var]; } else { - if (msgCtx->textBoxPos == TEXTBOX_POS_TOP) { - R_TEXTBOX_Y_TARGET = sTextboxUpperYPositions[var]; - } else if (msgCtx->textBoxPos == TEXTBOX_POS_BOTTOM) { - R_TEXTBOX_Y_TARGET = sTextboxLowerYPositions[var]; - } else { - R_TEXTBOX_Y_TARGET = sTextboxMidYPositions[var]; - } + R_TEXTBOX_Y_TARGET = sTextboxLowerYPositions[var]; } R_TEXTBOX_X_TARGET = sTextboxXPositions[var]; |