From cc7c519d0fd98c04393532993acab0f0786577a9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 31 Oct 2024 14:15:12 +0100 Subject: [PATCH] gSpeakerNameBuffer and gSpeakerNameSeparator --- asm/code_809A560.s | 8 ++++---- data/data_80D47B8.s | 4 ++-- include/string_format.h | 2 +- src/code_802DB28.c | 4 ++-- src/dungeon_message.c | 12 ++++++------ src/felicity_bank.c | 4 ++-- src/friend_rescue.c | 4 ++-- src/gulpin_shop_801FB50.c | 4 ++-- src/kangaskhan_storage1.c | 4 ++-- src/kecleon_bros1.c | 10 +++++----- src/makuhita_dojo1.c | 4 ++-- src/mission_reward.c | 4 ++-- src/post_office_guide1.c | 4 ++-- src/string_format.c | 10 +++++----- src/thank_you_wonder_mail.c | 4 ++-- src/wigglytuff_shop3.c | 4 ++-- src/wonder_mail.c | 2 +- src/wonder_mail_2.c | 4 ++-- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/asm/code_809A560.s b/asm/code_809A560.s index 695ddcf56..feb225a31 100644 --- a/asm/code_809A560.s +++ b/asm/code_809A560.s @@ -1049,7 +1049,7 @@ _0809B09A: .align 2, 0 _0809B0D4: .4byte gUnknown_3001B64 _0809B0D8: .4byte gUnknown_8116148 -_0809B0DC: .4byte gUnknown_202E5D8 +_0809B0DC: .4byte gSpeakerNameBuffer _0809B0E0: .4byte gFormattedSpeechBubble _0809B0E4: ldr r0, _0809B134 @@ -1094,7 +1094,7 @@ _0809B128: movs r0, 0x21 b _0809B14A .align 2, 0 -_0809B134: .4byte gUnknown_202E5D8 +_0809B134: .4byte gSpeakerNameBuffer _0809B138: .4byte gUnknown_8116188 _0809B13C: .4byte gFormatBuffer_Names _0809B140: .4byte sub_809B428 @@ -1346,7 +1346,7 @@ _0809B2F6: bl strcpy b _0809B32A .align 2, 0 -_0809B310: .4byte gUnknown_202E5D8 +_0809B310: .4byte gSpeakerNameBuffer _0809B314: .4byte gFormattedSpeechBubble _0809B318: ldr r0, _0809B3D0 @@ -1447,7 +1447,7 @@ _0809B3C0: lsls r0, 16 b _0809B3EA .align 2, 0 -_0809B3D0: .4byte gUnknown_202E5D8 +_0809B3D0: .4byte gSpeakerNameBuffer _0809B3D4: .4byte gUnknown_8116188 _0809B3D8: .4byte gFormatBuffer_Names _0809B3DC: .4byte gUnknown_3001B64 diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s index 62c1e1cef..3cc9971d1 100644 --- a/data/data_80D47B8.s +++ b/data/data_80D47B8.s @@ -36,8 +36,8 @@ gUnknown_80D48DC: @ 80D48DC .byte 0x07, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .global gUnknown_80D48F4 -gUnknown_80D48F4: @ 80D48F4 + .global gSpeakerNameSeparator +gSpeakerNameSeparator: @ 80D48F4 .byte 0x3A, 0x20, 0x00, 0x00 @ maybe just a colon and space .global gUnknown_80D48F8 diff --git a/include/string_format.h b/include/string_format.h index a360dba9b..2d773502e 100644 --- a/include/string_format.h +++ b/include/string_format.h @@ -45,7 +45,7 @@ extern s32 gFormatArgs[10]; extern u8 gFormatBuffer_Items[4][FORMAT_BUFFER_LEN]; extern u8 gFormatBuffer_Monsters[10][FORMAT_BUFFER_LEN]; extern u8 gFormatBuffer_Names[10][FORMAT_BUFFER_LEN]; -extern u8 gUnknown_202E5D8[FORMAT_BUFFER_LEN]; +extern u8 gSpeakerNameBuffer[FORMAT_BUFFER_LEN]; extern u8 gFormatBuffer_FriendArea[FRIEND_AREA_BUFFER_LEN]; void sub_8014144(void); diff --git a/src/code_802DB28.c b/src/code_802DB28.c index bf2abbc05..0197d58ca 100644 --- a/src/code_802DB28.c +++ b/src/code_802DB28.c @@ -13,7 +13,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; static EWRAM_DATA_2 struct unkStruct_203B2FC *sUnknown_203B2FC = {0}; @@ -116,7 +116,7 @@ static void sub_802DC9C(void) switch (sUnknown_203B2FC->state) { case 0: - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, sUnknown_203B2FC->jobInfo->clientSpecies); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, sUnknown_203B2FC->jobInfo->clientSpecies); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], sUnknown_203B2FC->jobInfo->clientSpecies); speciesText = GetMonSpecies(sUnknown_203B2FC->jobInfo->clientSpecies); strcpy(gFormatBuffer_Monsters[0], speciesText); diff --git a/src/dungeon_message.c b/src/dungeon_message.c index 13effc1d7..3e4500f6b 100644 --- a/src/dungeon_message.c +++ b/src/dungeon_message.c @@ -50,7 +50,7 @@ extern u8 gUnknown_203B434; extern void (*gUnknown_203B08C)(s32); extern void (*gUnknown_203B084)(s32 a0); extern void (*gUnknown_203B080)(s32 a0); -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; extern UnkTextStruct1 gUnknown_2027370[4]; extern s32 gUnknown_202EDCC; extern u8 gFontPalette[]; @@ -458,24 +458,24 @@ void DisplayDungeonDialogue(const struct DungeonDialogueStruct *dialogueInfo) switch (dialogueInfo->unk4) { case 425: dialogueMonId = leaderId; - sprintfStatic(gUnknown_202E5D8, gUnknown_80F7AFC, gFormatBuffer_Monsters); + sprintfStatic(gSpeakerNameBuffer, gUnknown_80F7AFC, gFormatBuffer_Monsters); break; case 426: dialogueMonId = partnerId; - sprintfStatic(gUnknown_202E5D8, gUnknown_80F7AFC, gFormatBuffer_Monsters[1]); + sprintfStatic(gSpeakerNameBuffer, gUnknown_80F7AFC, gFormatBuffer_Monsters[1]); break; case 427: dialogueMonId = MONSTER_NONE; - strcpy(gUnknown_202E5D8, gUnknown_80F7B04); + strcpy(gSpeakerNameBuffer, gUnknown_80F7B04); break; default: dialogueMonId = dialogueInfo->unk4; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, dialogueMonId); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, dialogueMonId); break; } if (dialogueInfo->unk0 == 2 || dialogueInfo->unk0 == 3) { - strcpy(gUnknown_202E5D8, gUnknown_80F7B04); + strcpy(gSpeakerNameBuffer, gUnknown_80F7B04); } while (1) { diff --git a/src/felicity_bank.c b/src/felicity_bank.c index 46f79fb5c..cbefb67d0 100644 --- a/src/felicity_bank.c +++ b/src/felicity_bank.c @@ -13,7 +13,7 @@ static EWRAM_DATA_2 FelicityBankWork *sFelicityBankWork = {0}; -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; #include "data/felicity_bank.h" @@ -59,7 +59,7 @@ bool8 CreateFelicityBank(s32 mode) sFelicityBankWork = MemoryAlloc(sizeof(FelicityBankWork), 8); sFelicityBankWork->menuAction = 0; sFelicityBankWork->mode = mode; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PERSIAN); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PERSIAN); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_PERSIAN); monName = GetMonSpecies(MONSTER_PERSIAN); strcpy(gFormatBuffer_Monsters[6], monName); diff --git a/src/friend_rescue.c b/src/friend_rescue.c index bea103414..7cf839a8b 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -323,7 +323,7 @@ u32 CreateFriendRescueMenu(void) gUnknown_203B33C->unk530 = 0; gUnknown_203B33C->unk218 = -1; gUnknown_203B33C->speciesNum = -1; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0],monName); for(counter = 0; counter < 0x36; counter++){ @@ -2914,7 +2914,7 @@ void sub_80352A4(void) if ( sub_802F298() == 3) { sub_802F2C0(); - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0], monName); mailIndex = GetMailIndex(6, gUnknown_203B33C->unk420); diff --git a/src/gulpin_shop_801FB50.c b/src/gulpin_shop_801FB50.c index bde6bdc8b..a565bdeda 100644 --- a/src/gulpin_shop_801FB50.c +++ b/src/gulpin_shop_801FB50.c @@ -22,7 +22,7 @@ EWRAM_DATA_2 unkStruct_203B27C *gUnknown_203B27C = {0}; -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; #include "data/gulpin_shop_801FB50.h" @@ -88,7 +88,7 @@ bool8 sub_801FB50(u32 mode) gUnknown_203B27C->menuAction4 = 0; gUnknown_203B27C->mode = mode; gUnknown_203B27C->unk15 = FALSE; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_GULPIN); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_GULPIN); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_GULPIN); name = GetMonSpecies(MONSTER_GULPIN); strcpy(gFormatBuffer_Monsters[6], name); diff --git a/src/kangaskhan_storage1.c b/src/kangaskhan_storage1.c index f3753911e..092b348a1 100644 --- a/src/kangaskhan_storage1.c +++ b/src/kangaskhan_storage1.c @@ -14,7 +14,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; EWRAM_DATA_2 struct KangaskhanStorageWork *gKangaskhanStorageWork = {0}; @@ -55,7 +55,7 @@ bool8 CreateKangaskhanStorage(u32 mode) gKangaskhanStorageWork->menuAction2 = 0; gKangaskhanStorageWork->menuAction3 = 0; gKangaskhanStorageWork->mode = mode; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_KANGASKHAN); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_KANGASKHAN); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_KANGASKHAN); monName = GetMonSpecies(MONSTER_KANGASKHAN); strcpy(gFormatBuffer_Monsters[6], monName); diff --git a/src/kecleon_bros1.c b/src/kecleon_bros1.c index 1d721c625..261a120ea 100644 --- a/src/kecleon_bros1.c +++ b/src/kecleon_bros1.c @@ -18,7 +18,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; static EWRAM_DATA_2 KecleonBrosWork1 *sKecleonBrosWork1 = {0}; @@ -72,7 +72,7 @@ bool8 CreateKecleonBros(u32 mode) case KECLEON_BROS_MODE_ITEMS_AWAKE: sKecleonBrosWork1->isKecleonItemShop = TRUE; sKecleonBrosWork1->monPortraitPtr = &sKecleonBrosWork1->monPortrait; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_KECLEON); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_KECLEON); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_KECLEON); monName = GetMonSpecies(MONSTER_KECLEON); strcpy(gFormatBuffer_Monsters[6], monName); @@ -80,7 +80,7 @@ bool8 CreateKecleonBros(u32 mode) case KECLEON_BROS_MODE_ITEMS_ASLEEP: sKecleonBrosWork1->isKecleonItemShop = TRUE; sKecleonBrosWork1->monPortraitPtr = NULL; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_KECLEON); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_KECLEON); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_KECLEON); monName = GetMonSpecies(MONSTER_KECLEON); strcpy(gFormatBuffer_Monsters[6], monName); @@ -88,7 +88,7 @@ bool8 CreateKecleonBros(u32 mode) case KECLEON_BROS_MODE_WARES_AWAKE: sKecleonBrosWork1->isKecleonItemShop = FALSE; sKecleonBrosWork1->monPortraitPtr = &sKecleonBrosWork1->monPortrait; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_KECLEON); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_KECLEON); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_KECLEON); monName = GetMonSpecies(MONSTER_KECLEON); strcpy(gFormatBuffer_Monsters[6], monName); @@ -96,7 +96,7 @@ bool8 CreateKecleonBros(u32 mode) case KECLEON_BROS_MODE_WARES_ASLEEP: sKecleonBrosWork1->isKecleonItemShop = FALSE; sKecleonBrosWork1->monPortraitPtr = NULL; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_KECLEON); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_KECLEON); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_KECLEON); monName = GetMonSpecies(MONSTER_KECLEON); strcpy(gFormatBuffer_Monsters[6], monName); diff --git a/src/makuhita_dojo1.c b/src/makuhita_dojo1.c index 73f0a50dc..bf193124f 100644 --- a/src/makuhita_dojo1.c +++ b/src/makuhita_dojo1.c @@ -15,7 +15,7 @@ #include "text1.h" #include "text2.h" -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; static EWRAM_DATA_2 MakuhitaDojoWork1 *sMakuhitaDojoWork1 = {0}; @@ -91,7 +91,7 @@ bool8 MakuhitaDojo_New(u32 mode) else sMakuhitaDojoWork1->monPortraitPtr = &sMakuhitaDojoWork1->monPortrait; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_MAKUHITA); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_MAKUHITA); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_MAKUHITA); monName = GetMonSpecies(MONSTER_MAKUHITA); strcpy(gFormatBuffer_Monsters[6], monName); diff --git a/src/mission_reward.c b/src/mission_reward.c index 8547da8d3..684e156aa 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -30,7 +30,7 @@ struct unkStruct_203B310 EWRAM_DATA_2 struct unkStruct_203B310 *gUnknown_203B310 = {0}; extern u8 gFormatBuffer_FriendArea[]; -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; enum FriendRewardStates { @@ -125,7 +125,7 @@ u32 sub_802F204(unkStruct_802F204 *r0, bool8 displayClientSprite) // NOTE: dumb var to get correct ordering preload = gUnknown_203B310; - strcpy(gUnknown_202E5D8, preload->unk10->clientName); + strcpy(gSpeakerNameBuffer, preload->unk10->clientName); PrintPokeNameToBuffer(gFormatBuffer_Monsters[0], GetPlayerPokemonStruct()); gUnknown_203B310->monPortrait.faceFile = GetDialogueSpriteDataPtr(gUnknown_203B310->unk10->clientSpecies); diff --git a/src/post_office_guide1.c b/src/post_office_guide1.c index 679e80a16..41d4ea0cd 100644 --- a/src/post_office_guide1.c +++ b/src/post_office_guide1.c @@ -22,7 +22,7 @@ enum PostOfficeStates RETURN_TO_GET_HELP, }; -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; static EWRAM_DATA_2 PostOfficeWork *sPostOfficeHelper = {0}; @@ -49,7 +49,7 @@ bool8 CreateHelperPelipperMenu(s16 speciesID) xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE); sPostOfficeHelper = MemoryAlloc(sizeof(PostOfficeWork), 8); - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, species_32); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, species_32); monName = GetMonSpecies(species_32); strcpy(gFormatBuffer_Monsters[0], monName); sPostOfficeHelper->monPortrait.faceFile = NULL; diff --git a/src/string_format.c b/src/string_format.c index 5375d8b1a..0b4333af7 100644 --- a/src/string_format.c +++ b/src/string_format.c @@ -114,7 +114,7 @@ extern const u8 gUnknown_80D4900[]; extern const u8 gUnknown_80D4904[]; extern const u8 gUnknown_80D4908[]; extern const u8 gUnknown_80D4910[]; -extern const u8 gUnknown_80D48F4[]; +extern const u8 gSpeakerNameSeparator[]; extern void SetCharacterMask(int a0); extern void sub_8008274(s32 a0, const u8 *compressedData, s32 a2); @@ -134,8 +134,8 @@ EWRAM_DATA u8 gFormatBuffer_Items[4][FORMAT_BUFFER_LEN] = {0}; EWRAM_DATA u8 gFormatBuffer_Monsters[10][FORMAT_BUFFER_LEN] = {0}; // 'n' which probably stands for 'name', available through n0 to n9 EWRAM_DATA u8 gFormatBuffer_Names[10][FORMAT_BUFFER_LEN] = {0}; -// Seems to be a general buffer -EWRAM_DATA u8 gUnknown_202E5D8[FORMAT_BUFFER_LEN] = {0}; +// Current textbox's speaker's name +EWRAM_DATA u8 gSpeakerNameBuffer[FORMAT_BUFFER_LEN] = {0}; // 'h' - Friend Area buffer. This buffer seems larger than others. It's possible it actually has the same length, but there were some unused buffers right after it. EWRAM_DATA u8 gFormatBuffer_FriendArea[FRIEND_AREA_BUFFER_LEN] = {0}; @@ -705,8 +705,8 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags) r10 = FALSE; r9 = FALSE; if (flags & 8) { - AppendString(gUnknown_202E5D8, &dst, dstMax, flags); - AppendString(gUnknown_80D48F4, &dst, dstMax, flags); + AppendString(gSpeakerNameBuffer, &dst, dstMax, flags); + AppendString(gSpeakerNameSeparator, &dst, dstMax, flags); } } else if (r9) { diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 1bba01aac..610df0dea 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -243,7 +243,7 @@ u32 CreateThankYouMailPelipper(void) sUnknown_203B2C4 = MemoryAlloc(sizeof(WonderMailStruct_203B2C4), 8); MemoryFill8((u8 *)sUnknown_203B2C4, 0, sizeof(WonderMailStruct_203B2C4)); - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0], monName); faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); @@ -1225,7 +1225,7 @@ void sub_802AB98(void) { case 3: sub_802F2C0(); - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0], monName); DeleteMailAtIndex(GetMailIndex(6, sUnknown_203B2C4->unk430)); diff --git a/src/wigglytuff_shop3.c b/src/wigglytuff_shop3.c index 7e2a645b2..f8a107f0a 100644 --- a/src/wigglytuff_shop3.c +++ b/src/wigglytuff_shop3.c @@ -18,7 +18,7 @@ #include "wigglytuff_shop2.h" #include "wigglytuff_shop3.h" -extern u8 gUnknown_202E5D8[]; +extern u8 gSpeakerNameBuffer[]; extern u8 gFormatBuffer_FriendArea[]; static EWRAM_DATA_2 WigglytuffShop3Work *sWigglytuffShop3Work = {0}; @@ -63,7 +63,7 @@ bool8 CreateWigglytuffShop(u32 mode) sWigglytuffShop3Work->menuAction1 = 0; sWigglytuffShop3Work->menuAction2 = 0; sWigglytuffShop3Work->mode = mode; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_WIGGLYTUFF); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_WIGGLYTUFF); CopyYellowMonsterNametoBuffer(gFormatBuffer_Monsters[7], MONSTER_WIGGLYTUFF); str = GetMonSpecies(MONSTER_WIGGLYTUFF); strcpy(gFormatBuffer_Monsters[6], str); diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 9a566c99d..106dcb875 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -195,7 +195,7 @@ u32 sub_8027F88(void) sUnknown_203B2C0->unk53C = 0; sUnknown_203B2C0->mailIndex = -1; sUnknown_203B2C0->speciesNum = -1; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0], monName); faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 6f6f7ed96..0697ac6da 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -83,7 +83,7 @@ s32 sub_802B2D4(void) sUnknown_203B2C8 = MemoryAlloc(sizeof(struct unkStruct_203B2C8),8); MemoryFill8((u8 *)sUnknown_203B2C8,0,sizeof(struct unkStruct_203B2C8)); sUnknown_203B2C8->unk1 = -1; - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); sUnknown_203B2C8->monPortrait.faceFile = faceFile; sUnknown_203B2C8->monPortrait.faceData = (void *) faceFile->data; @@ -214,7 +214,7 @@ void sub_802B57C(void) if (sub_802F298() == 3) { sub_802F2C0(); - CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gFormatBuffer_Monsters[0], monName); sub_802B548(2);