diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/mart.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/mart.asm')
| -rwxr-xr-x | engine/mart.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index b091c9ef1..55c184737 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -252,7 +252,7 @@ GetMartItemPrice: ; 15be5 ; Return the price of item a in BCD at hl and in tiles at StringBuffer1. push hl ld [CurItem], a - callba GetItemPrice + farcall GetItemPrice pop hl GetMartPrice: ; 15bf0 @@ -344,7 +344,7 @@ INCLUDE "data/items/bargain_shop.asm" BuyMenu: ; 15c62 call FadeToMenu - callba BlankScreen + farcall BlankScreen xor a ld [wMenuScrollPositionBackup], a ld a, 1 @@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef - callba PlaceMoneyTopRight + farcall PlaceMoneyTopRight call UpdateSprites ld hl, MenuDataHeader_Buy call CopyMenuDataHeader @@ -519,7 +519,7 @@ StandardMartAskPurchaseQuantity: ld [wItemQuantityBuffer], a ld a, MARTTEXT_HOW_MANY call LoadBuyMenuText - callba SelectQuantityToBuy + farcall SelectQuantityToBuy call ExitMenu ret ; 15d97 @@ -579,7 +579,7 @@ RooftopSaleAskPurchaseQuantity: call .GetSalePrice ld a, 99 ld [wItemQuantityBuffer], a - callba RooftopSale_SelectQuantityToBuy + farcall RooftopSale_SelectQuantityToBuy call ExitMenu ret ; 15df9 @@ -782,9 +782,9 @@ Text_Pharmacist_ComeAgain: ; 0x15eae SellMenu: ; 15eb3 call DisableSpriteUpdates - callba DepositSellInitPackBuffers + farcall DepositSellInitPackBuffers .loop - callba DepositSellPack + farcall DepositSellPack ld a, [wcf66] and a jp z, .quit @@ -812,7 +812,7 @@ SellMenu: ; 15eb3 .TryToSellItem: ; 15ee0 - callba CheckItemMenu + farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .dw rst JumpTable @@ -835,7 +835,7 @@ SellMenu: ; 15eb3 .try_sell ; 15efd - callba _CheckTossableItem + farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .okay_to_sell @@ -847,8 +847,8 @@ SellMenu: ; 15eb3 .okay_to_sell ld hl, Text_Mart_SellHowMany call PrintText - callba PlaceMoneyAtTopLeftOfTextbox - callba SelectQuantityToSell + farcall PlaceMoneyAtTopLeftOfTextbox + farcall SelectQuantityToSell call ExitMenu jr c, .declined hlcoord 1, 14 @@ -871,7 +871,7 @@ SellMenu: ; 15eb3 ld hl, Text_Mart_SoldForAmount call PrintTextBoxText call PlayTransactionSound - callba PlaceMoneyBottomLeft + farcall PlaceMoneyBottomLeft call JoyWaitAorB .declined |