mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 01:34:18 +00:00
Code Issues Projects Releases Wiki Activity

Add missing HS_FISHING constant (#2256)

Browse source 
* Add missing HS_FISHING constant

* It's actually doubly-bugged lol

* Format
This commit is contained in:
cadmic 2024-10-03 19:50:06 -07:00 committed by GitHub
parent 801fe22153
commit 089a2c4c0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/code/z_message.c
View file

@ -1915,7 +1915,7 @@ void Message_Decode(PlayState* play) {
decodedBufPos--; decodedBufPos--;
} else if (curCharWide == MESSAGE_WIDE_HIGHSCORE) { } else if (curCharWide == MESSAGE_WIDE_HIGHSCORE) {
value = HIGH_SCORE(font->msgBufWide[++msgCtx->msgBufPos] & 0xFF); value = HIGH_SCORE(font->msgBufWide[++msgCtx->msgBufPos] & 0xFF);
if ((font->msgBufWide[msgCtx->msgBufPos] & 0xFF) == 2) { if ((font->msgBufWide[msgCtx->msgBufPos] & 0xFF) == HS_FISHING) {
if (LINK_AGE_IN_YEARS == YEARS_CHILD) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
value &= 0x7F; value &= 0x7F;
} else { } else {
@ -2277,10 +2277,13 @@ void Message_Decode(PlayState* play) {
} else if (curChar == MESSAGE_HIGHSCORE) { } else if (curChar == MESSAGE_HIGHSCORE) {
value = HIGH_SCORE((u8)font->msgBuf[++msgCtx->msgBufPos]); value = HIGH_SCORE((u8)font->msgBuf[++msgCtx->msgBufPos]);
PRINTF(T("ランキング＝%d\n", "Highscore=%d\n"), font->msgBuf[msgCtx->msgBufPos]); PRINTF(T("ランキング＝%d\n", "Highscore=%d\n"), font->msgBuf[msgCtx->msgBufPos]);
if ((font->msgBuf[msgCtx->msgBufPos] & 0xFF) == 2) { if ((font->msgBuf[msgCtx->msgBufPos] & 0xFF) == HS_FISHING) {
if (LINK_AGE_IN_YEARS == YEARS_CHILD) { if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
value &= 0x7F; value &= 0x7F;
} else { } else {
//! @bug Should use msgBuf instead of msgBufWide (copy-paste error from Japanese text
//! handling?), and the mask is applied to the high score index instead of the high score value
//! so this always shows HIGH_SCORE(0). Only the PRINTF is wrong, the following line is correct.
PRINTF("HI_SCORE( kanfont->mbuff.nes_mes_buf[message->rdp] & 0xff000000 ) = %x\n", PRINTF("HI_SCORE( kanfont->mbuff.nes_mes_buf[message->rdp] & 0xff000000 ) = %x\n",
HIGH_SCORE(font->msgBufWide[msgCtx->msgBufPos] & 0xFF000000)); HIGH_SCORE(font->msgBufWide[msgCtx->msgBufPos] & 0xFF000000));
value = ((HIGH_SCORE((u8)font->msgBuf[msgCtx->msgBufPos]) & 0xFF000000) >> 0x18) & 0x7F; value = ((HIGH_SCORE((u8)font->msgBuf[msgCtx->msgBufPos]) & 0xFF000000) >> 0x18) & 0x7F;