diff options
Diffstat (limited to 'engine/mart.asm')
| -rwxr-xr-x | engine/mart.asm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index 4a8d9e17b..07d385f6d 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3 BuyMenuLoop: ; 15cef - farcall PlaceMoneyTopRight + farcall Special_PlaceMoneyTopRight call UpdateSprites ld hl, MenuDataHeader_Buy call CopyMenuDataHeader @@ -525,7 +525,7 @@ StandardMartAskPurchaseQuantity: ; 15d97 MartConfirmPurchase: ; 15d97 - predef PartyMonItemName + predef Predef_PartyMonItemName ld a, MARTTEXT_COSTS_THIS_MUCH call LoadBuyMenuText call YesNoBox @@ -618,8 +618,7 @@ Text_Mart_CostsThisMuch: ; 0x15e13 MenuDataHeader_Buy: ; 0x15e18 db $40 ; flags - db 03, 01 ; start coords - db 11, 19 ; end coords + menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .menudata2 db 1 ; default option ; 0x15e20 @@ -785,7 +784,7 @@ SellMenu: ; 15eb3 farcall DepositSellInitPackBuffers .loop farcall DepositSellPack - ld a, [wcf66] + ld a, [wPackUsedItem] and a jp z, .quit call .TryToSellItem @@ -797,7 +796,7 @@ SellMenu: ; 15eb3 ret ; 15ed3 -.NothingToSell: ; unreferenced +.Unreferenced_NothingToSell: ld hl, .NothingToSellText call MenuTextBoxBackup and a @@ -864,7 +863,7 @@ SellMenu: ; 15eb3 ld a, [wMartItemID] ld hl, NumItems call TossItem - predef PartyMonItemName + predef Predef_PartyMonItemName hlcoord 1, 14 lb bc, 3, 18 call ClearBox @@ -892,7 +891,7 @@ Text_Mart_ICanPayThisMuch: ; 0x15f78 db "@" ; 0x15f7d -DummyString ; 15f7d +.UnusedString15f7d: ; 15f7d db "!ダミー!@" Text_Mart_HowMayIHelpYou: ; 0x15f83 @@ -903,8 +902,7 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83 MenuDataHeader_BuySell: ; 0x15f88 db $40 ; flags - db 00, 00 ; start coords - db 08, 07 ; end coords + menu_coords 0, 0, 7, 8 dw .menudata2 db 1 ; default option ; 0x15f90 |