diff options
| author | Christopher Leggett <chris@leggett.dev> | 2022-07-21 19:13:04 -0400 |
|---|---|---|
| committer | Kenix3 <kenixwhisperwind@gmail.com> | 2022-07-25 19:06:05 -0400 |
| commit | 27b3644335a50459a2f92d587b16d55bb8ef57b9 (patch) | |
| tree | 661f6555614cbb4ddef8a424261eef3c813a5f10 /soh/src/code | |
| parent | b6af6845830f2efae3fac007159df4808af29e3f (diff) | |
Fixes naming discrepancy of textbox positions. (#854)
Equivalent to https://github.com/zeldaret/oot/pull/1329
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_message_PAL.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 79326ee81..af6a149c9 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -3306,13 +3306,13 @@ void Message_Update(GlobalContext* globalCtx) { 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[] = { @@ -3406,20 +3406,20 @@ void Message_Update(GlobalContext* globalCtx) { if (!msgCtx->textBoxPos) { // variable position if (YREG(15) != 0 || globalCtx->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 (globalCtx->sceneNum == SCENE_MARKET_DAY || globalCtx->sceneNum == SCENE_MARKET_NIGHT || globalCtx->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]; } |