diff --git a/include/message_data_static.h b/include/message_data_static.h index 20427197fe..b803203821 100644 --- a/include/message_data_static.h +++ b/include/message_data_static.h @@ -21,8 +21,8 @@ typedef enum { typedef enum { /* 0 */ TEXTBOX_POS_VARIABLE, /* 1 */ TEXTBOX_POS_TOP, - /* 2 */ TEXTBOX_POS_BOTTOM, - /* 3 */ TEXTBOX_POS_MIDDLE + /* 2 */ TEXTBOX_POS_MIDDLE, + /* 3 */ TEXTBOX_POS_BOTTOM } TextBoxPosition; typedef struct { diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 08e2c7aec4..eef04951ff 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]; diff --git a/tools/msgdis.py b/tools/msgdis.py index 823da66705..95b1a34706 100644 --- a/tools/msgdis.py +++ b/tools/msgdis.py @@ -254,8 +254,8 @@ textbox_type = { textbox_ypos = { 0: "TEXTBOX_POS_VARIABLE", 1: "TEXTBOX_POS_TOP", - 2: "TEXTBOX_POS_BOTTOM", - 3: "TEXTBOX_POS_MIDDLE", + 2: "TEXTBOX_POS_MIDDLE", + 3: "TEXTBOX_POS_BOTTOM", } # message entry tables vrom addresses