Merge 'Use separate text component for multiworld item recipient' (#2035)

Author: cjohnson57

ASM/build/asm_symbols.txt

@@ -2,6 +2,29 @@
 #include "stdbool.h"
 #include "save.h"
 
+// no support for kana since they're not part of the message charset
+char FILENAME_ENCODING[256] = {
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', 'A', 'B', 'C', 'D', 'E',
+    'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+    'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+    'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', ' ',
+    '?', '?', '!', ':', '-', '(', ')', '?', '?', ',', '.', '/', '?', '?', '?', '?',
+    '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',
+};
+
+extern uint8_t PLAYER_NAMES[256][8];
+extern uint8_t PLAYER_NAME_ID;
+
 // Helper function for adding characters to the decoded message buffer
 void Message_AddCharacter(MessageContext *msgCtx, void *pFont, uint32_t *pDecodedBufPos, uint32_t *pCharTexIdx, uint8_t charToAdd) {
     uint32_t decodedBufPosVal = *pDecodedBufPos;
@@ -43,6 +66,18 @@ void Message_AddString(MessageContext *msgCtx, void *pFont, uint32_t *pDecodedBu
     }
 }
 
+// Helper function for adding a filename to the decoded message buffer. Filenames use a different character set from other text.
+void Message_AddFileName(MessageContext *msgCtx, void *pFont, uint32_t *pDecodedBufPos, uint32_t *pCharTexIdx, uint8_t *filenameToAdd) {
+    int end = 8;
+    while (filenameToAdd[end - 1] == 0xDF) {
+        // trim trailing space
+        end--;
+    }
+    for (int i = 0; i < end; i++) {
+        Message_AddCharacter(msgCtx, pFont, pDecodedBufPos, pCharTexIdx, FILENAME_ENCODING[filenameToAdd[i]]);
+    }
+}
+
 // Hack to add additional text control codes.
 // If additional codes need to be read after the primary code, increment msgCtx->msgBufPos and index msgRaw
 // To add a new control code:
@@ -75,6 +110,12 @@ bool Message_Decode_Additional_Control_Codes(uint8_t currChar, uint32_t *pDecode
             (*pDecodedBufPos)--;
             return true;
         }
+        case 0xF2: {
+            // Outgoing item filename
+            Message_AddFileName(msgCtx, pFont, pDecodedBufPos, pCharTexIdx, PLAYER_NAMES[PLAYER_NAME_ID]);
+            (*pDecodedBufPos)--;
+            return true;
+        }
         default: {
             return false;
         }

ASM/build/bundle.o

@@ -65,7 +65,6 @@ RANDO_CONTEXT:
 .include "scarecrow.asm"
 .include "empty_bomb.asm"
 .include "initial_save.asm"
-.include "textbox.asm"
 .include "fishing.asm"
 .include "bgs_fix.asm"
 .include "chus_in_logic.asm"

ASM/build/c_symbols.txt

@@ -1587,37 +1587,6 @@ nop
 .orga 0xB55A64 ; In memory 800DFB04
     jal     save_scarecrow_song
 
-;==================================================================================================
-; Override Player Name Text
-;==================================================================================================
-
-; Replaces
-;   lui   t2,0x8012
-;   addu  t2,t2,s3
-;   lbu   t2,-23053(t2)
-.orga 0xB51694
-    jal     get_name_char_1
-    ;addi    a0, s3, -1
-    ;ori     t2, v0, 0
-
-; Replaces
-;   lui   s0,0x8012
-;   addu  s0,s0,s2
-;   lbu   s0,-23052(s0)
-.orga 0xB516C4
-    jal     get_name_char_2
-    ;ori     a0, s2, 0
-    ;ori     s0, v0, 0
-
-; Replaces
-;   lw      s6,48(sp)
-;   lw      s7,52(sp)
-;   lw      s8,56(sp)
-.orga 0xB52784
-    jal     reset_player_name_id
-    nop
-    lw      ra, 0x3C (sp)
-
 ;==================================================================================================
 ; Text Fixes
 ;==================================================================================================