Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-26 20:06:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge

Browse Source 
Conflicts:
	include/item.h
	src/battle_ai_script_commands.c
	src/battle_main.c
	src/battle_pyramid_bag.c
	src/battle_script_commands.c
	src/battle_util.c
	src/item.c
	src/item_menu.c
	src/item_use.c
	src/pokemon.c
	src/pokemon_summary_screen.c
	src/shop.c
This commit is contained in:
Hedara
2025-05-24 21:24:56 +02:00
parent 3ecd8afab0 b31a73f990
commit 2e4833240f
32 changed files with 235 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/apprentice.c
View File

@@ -1047,7 +1047,7 @@ static void ApprenticeBufferString(void)
StringCopy(stringDst, GetMoveName(gApprenticeQuestionData->move2));
break;
case APPRENTICE_BUFF_ITEM:
StringCopy(stringDst, ItemId_GetName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data));
StringCopy(stringDst, GetItemName(PLAYER_APPRENTICE.questions[CURRENT_QUESTION_NUM].data));
break;
case APPRENTICE_BUFF_NAME:
TVShowConvertInternationalString(text, GetApprenticeNameInLanguage(PLAYER_APPRENTICE.id, GAME_LANGUAGE), GAME_LANGUAGE);