diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 22:56:36 -0500 |
| commit | 5c28d05bb40b47f084a34eb732da92c899e18db6 (patch) | |
| tree | b7e427bbb988bfdc51e347a87f6ab663c1f45a7b /engine/mart.asm | |
| parent | 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 (diff) | |
| parent | 2c789b64b1bfa9ec33d805d06ad3a7141e3871f1 (diff) | |
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
Diffstat (limited to 'engine/mart.asm')
| -rwxr-xr-x | engine/mart.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index d4af8fb61..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 @@ -796,7 +796,7 @@ SellMenu: ; 15eb3 ret ; 15ed3 -.NothingToSell: ; unreferenced +.Unreferenced_NothingToSell: ld hl, .NothingToSellText call MenuTextBoxBackup and a @@ -863,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 @@ -891,7 +891,7 @@ Text_Mart_ICanPayThisMuch: ; 0x15f78 db "@" ; 0x15f7d -DummyString ; 15f7d +.UnusedString15f7d: ; 15f7d db "!ダミー!@" Text_Mart_HowMayIHelpYou: ; 0x15f83 |