From 95d27c2e56f07a2256296161869b7e768ff8e077 Mon Sep 17 00:00:00 2001 From: VicSevenT Date: Wed, 31 Dec 2025 13:13:17 -0600 Subject: [PATCH] Update format symbol names --- asm/main_rodata_020908D4.s | 12 ++++++------ src/item_util_2.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asm/main_rodata_020908D4.s b/asm/main_rodata_020908D4.s index 701ccd94..99dea3cb 100644 --- a/asm/main_rodata_020908D4.s +++ b/asm/main_rodata_020908D4.s @@ -2933,19 +2933,19 @@ _02098070: .byte 0x45, 0x2F, 0x73, 0x74, 0x5F, 0x69, 0x32, 0x6E .byte 0x5F, 0x6A, 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00 #endif - .global ITEM_NAME_FORMAT_CSU -ITEM_NAME_FORMAT_CSU: // "[CS:U]%s[CR]" + .global ITEM_NAME_FORMAT_YELLOW +ITEM_NAME_FORMAT_YELLOW: // "[CS:U]%s[CR]" .byte 0x5B, 0x43, 0x53, 0x3A, 0x55, 0x5D, 0x25, 0x73 .byte 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00, 0x00 - .global ITEM_NAME_FORMAT_CSZ -ITEM_NAME_FORMAT_CSZ: // "[CS:Z]%s[CR]" + .global ITEM_NAME_FORMAT_INDIGO +ITEM_NAME_FORMAT_INDIGO: // "[CS:Z]%s[CR]" .byte 0x5B, 0x43, 0x53, 0x3A, 0x5A, 0x5D, 0x25, 0x73 .byte 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00, 0x00 .global ITEM_NAME_FORMAT_PLAIN ITEM_NAME_FORMAT_PLAIN: // "%s" .byte 0x25, 0x73, 0x00, 0x00 - .global ITEM_NAME_FORMAT_CSI -ITEM_NAME_FORMAT_CSI: // "[CS:I]%s[CR]" + .global ITEM_NAME_FORMAT_CREAM +ITEM_NAME_FORMAT_CREAM: // "[CS:I]%s[CR]" .byte 0x5B, 0x43, 0x53, 0x3A .byte 0x49, 0x5D, 0x25, 0x73, 0x5B, 0x43, 0x52, 0x5D, 0x00, 0x00, 0x00, 0x00 .global KECLEON_SHOP_ITEM_TABLE_LISTS_1 diff --git a/src/item_util_2.c b/src/item_util_2.c index 2f8c4e75..c0a7fa70 100644 --- a/src/item_util_2.c +++ b/src/item_util_2.c @@ -4,10 +4,10 @@ #include "main_0202593C.h" extern struct item_data_entry *ITEM_DATA_TABLE_PTRS[3]; -extern const char ITEM_NAME_FORMAT_CSU; -extern const char ITEM_NAME_FORMAT_CSZ; +extern const char ITEM_NAME_FORMAT_YELLOW; +extern const char ITEM_NAME_FORMAT_INDIGO; extern const char ITEM_NAME_FORMAT_PLAIN; -extern const char ITEM_NAME_FORMAT_CSI; +extern const char ITEM_NAME_FORMAT_CREAM; extern char* SprintfStatic__0200E808_EU(char*, const char*, ...); extern u8* strcpy(u8*, u8*); @@ -63,7 +63,7 @@ void GetItemNameFormatted(char* name, s16 item_id, s32 flag1, s32 flag2) category = ITEM_DATA_TABLE_PTRS[ITEM_DATA_TABLE_PTRS_INDEX][EnsureValidItem(item_id)].category; if ((flag2 != 0) || ((u8)(category + 0xF4) <= 2)) { if (flag1 != 0) { - GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_CSU, raw_name); + GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_YELLOW, raw_name); return; } strcpy(name, raw_name); @@ -71,14 +71,14 @@ void GetItemNameFormatted(char* name, s16 item_id, s32 flag1, s32 flag2) } if (category == CATEGORY_EXCLUSIVE_ITEMS) { if (flag1 != 0) { - GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_CSZ, raw_name); + GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_INDIGO, raw_name); return; } GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_PLAIN, raw_name); return; } if (flag1 != 0) { - GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_CSI, raw_name); + GET_ITEM_NAME_FORMATTED_SPRINTF(name, &ITEM_NAME_FORMAT_CREAM, raw_name); return; }