diff options
| author | mzxrules <mzxrules@gmail.com> | 2022-08-03 12:58:19 -0400 |
|---|---|---|
| committer | mzxrules <mzxrules@gmail.com> | 2022-08-03 12:58:19 -0400 |
| commit | e5c6aac0067bef05f00a28fa1c2ff0334cea5d06 (patch) | |
| tree | e3a5e64b187119d07153298ad9c27f56cbbe6f50 /src/code/z_message.c | |
| parent | 723c82ce224372654e2e69d2edb071014a94298e (diff) | |
| parent | 4693978015a18165f96cbe57f8c4f7058c38c451 (diff) | |
Merge remote-tracking branch 'upstream/master' into z_map_
Diffstat (limited to 'src/code/z_message.c')
| -rw-r--r-- | src/code/z_message.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/code/z_message.c b/src/code/z_message.c index 1e76578bb..14fe241c4 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -1,5 +1,6 @@ #include "global.h" #include "message_data_static.h" +#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h" #if 0 @@ -229,7 +230,7 @@ void func_8014CCB4(PlayState* play, s16* decodedBufPos, s32* offset, f32* arg3) s32 k = *offset; f32 f = *arg3; - Font_LoadChar(play, 0x838B, k); // 0x838b = ル in JISX0213 + Font_LoadChar(play, 0x838B, k); // 0x838B = ル in JISX0213 k += FONT_CHAR_TEX_SIZE; msgCtx->decodedBuffer.wchar[t] = 0x838B; t += 1; @@ -279,7 +280,7 @@ void func_8014D62C(PlayState* play, s32* arg1, f32* arg2, s16* arg3) { if ((func_8010A0A4(play) != 0) || (play->sceneNum == 0x4F)) { phi_v0 = 0xA; } else { - phi_v0 = play->pauseCtx.unk_238[4]; + phi_v0 = play->pauseCtx.unk_238[PAUSE_WORLD_MAP]; } temp_s6 = *(&D_801D0250 + (phi_v0 * 2)); phi_s0 = 0; |