ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 23:23:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TM reusability shortcomings (#2930)

Browse Source
This commit is contained in:
Bassoonian 2023-04-19 17:01:00 +02:00 committed by GitHub
parent d5b36c7c60
commit 52ce399240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/strings.h
View File

@ -1025,8 +1025,8 @@ extern const u8 gText_ThrowInPremierBall[];
extern const u8 gText_ShopBuy[]; extern const u8 gText_ShopBuy[];
extern const u8 gText_ShopSell[]; extern const u8 gText_ShopSell[];
extern const u8 gText_ShopQuit[]; extern const u8 gText_ShopQuit[];
extern const u8 gText_ThatItemIsSoldOut[];
extern const u8 gText_SoldOut[]; extern const u8 gText_SoldOut[];
extern const u8 gText_SoldOut2[];
extern const u8 gText_OhABite[]; extern const u8 gText_OhABite[];
extern const u8 gText_PokemonOnHook[]; extern const u8 gText_PokemonOnHook[];

4
src/shop.c
View File

@ -640,7 +640,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y)
} }
if (ItemId_GetImportance(itemId) && (CheckBagHasItem(itemId, 1) || CheckPCHasItem(itemId, 1))) if (ItemId_GetImportance(itemId) && (CheckBagHasItem(itemId, 1) || CheckPCHasItem(itemId, 1)))
StringCopy(gStringVar4, gText_SoldOut2); StringCopy(gStringVar4, gText_SoldOut);
else else
StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1); StringExpandPlaceholders(gStringVar4, gText_PokedollarVar1);
x = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 120); x = GetStringRightAlignXOffset(FONT_NARROW, gStringVar4, 120);
@ -993,7 +993,7 @@ static void Task_BuyMenu(u8 taskId)
sShopData->totalCost = gDecorations[itemId].price; sShopData->totalCost = gDecorations[itemId].price;
if (ItemId_GetImportance(itemId) && (CheckBagHasItem(itemId, 1) || CheckPCHasItem(itemId, 1))) if (ItemId_GetImportance(itemId) && (CheckBagHasItem(itemId, 1) || CheckPCHasItem(itemId, 1)))
BuyMenuDisplayMessage(taskId, gText_SoldOut, BuyMenuReturnToItemList); BuyMenuDisplayMessage(taskId, gText_ThatItemIsSoldOut, BuyMenuReturnToItemList);
else if (!IsEnoughMoney(&gSaveBlock1Ptr->money, sShopData->totalCost)) else if (!IsEnoughMoney(&gSaveBlock1Ptr->money, sShopData->totalCost))
{ {
BuyMenuDisplayMessage(taskId, gText_YouDontHaveMoney, BuyMenuReturnToItemList); BuyMenuDisplayMessage(taskId, gText_YouDontHaveMoney, BuyMenuReturnToItemList);

4
src/strings.c
View File

@ -341,8 +341,8 @@ const u8 gText_Var1DisdainfullyAteVar2[] = _("{STR_VAR_1} disdainfully ate the\n
const u8 gText_ShopBuy[] = _("BUY"); const u8 gText_ShopBuy[] = _("BUY");
const u8 gText_ShopSell[] = _("SELL"); const u8 gText_ShopSell[] = _("SELL");
const u8 gText_ShopQuit[] = _("QUIT"); const u8 gText_ShopQuit[] = _("QUIT");
const u8 gText_SoldOut[] = _("I'm sorry, but that item is sold out.\p"); const u8 gText_ThatItemIsSoldOut[] = _("I'm sorry, but that item is sold out.{PAUSE_UNTIL_PRESS}");
const u8 gText_SoldOut2[] = _("SOLD OUT"); const u8 gText_SoldOut[] = _("SOLD OUT");
const u8 gText_InBagVar1[] = _("IN BAG: {STR_VAR_1}"); const u8 gText_InBagVar1[] = _("IN BAG: {STR_VAR_1}");
const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_QuitShopping[] = _("Quit shopping.");
const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?");