diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-08 19:59:00 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-08 20:56:19 -0500 |
| commit | c5bcb67bb871a445b20bbc0c226bc290dc5ba6bc (patch) | |
| tree | 69245ce8d6204218292c0e0a30f58bf31673032e /src/trader.c | |
| parent | 4fa88f1a8fb21f4f6491446d8137853ed08825db (diff) | |
Label decoration_inventory
Diffstat (limited to 'src/trader.c')
| -rw-r--r-- | src/trader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trader.c b/src/trader.c index e8fe743f8..f8606d499 100644 --- a/src/trader.c +++ b/src/trader.c @@ -188,7 +188,7 @@ void ScrSpecial_DoesPlayerHaveNoDecorations(void) for (i = 0; i < 8; i++) { - if (sub_8134194(i)) + if (GetNumDecorationsInInventoryCategory(i)) { gSpecialVar_Result = FALSE; return; @@ -201,7 +201,7 @@ void ScrSpecial_IsDecorationFull(void) { gSpecialVar_Result = FALSE; if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category - && sub_8133F9C(gDecorations[gSpecialVar_0x8004].category) == -1) + && FindFreeDecorationInventorySlot(gDecorations[gSpecialVar_0x8004].category) == -1) { sub_80FE7D4(gStringVar2, gDecorations[gSpecialVar_0x8004].category); gSpecialVar_Result = TRUE; @@ -248,7 +248,7 @@ void ScrSpecial_TraderDoDecorationTrade(void) { struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader; - sub_81340A8(gSpecialVar_0x8006); + RemoveDecorationFromInventory(gSpecialVar_0x8006); GiveDecoration(gSpecialVar_0x8004); StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName); trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006; |