diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:43:51 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:43:51 -0500 |
| commit | 14c8cf5b4817d1cb5446349bd04949186f73093c (patch) | |
| tree | f694884e9edfc21ff8f96d1d830212b7d4e98cfe /engine/mart.asm | |
| parent | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (diff) | |
| parent | d38ed29a4679936cb97bd95833e49700fee80030 (diff) | |
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
# Conflicts:
# data/player_names.asm
# engine/battle/menu.asm
# engine/billspc.asm
# engine/billspctop.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/delete_save_change_clock.asm
# engine/events/buena.asm
# engine/events/elevator.asm
# engine/events/kurt.asm
# engine/events/mom.asm
# engine/events/move_tutor.asm
# engine/events/pokecenter_pc.asm
# engine/events/pokepic.asm
# engine/events/std_scripts.asm
# engine/events/unown_walls.asm
# engine/init_gender.asm
# engine/intro_menu.asm
# engine/mail.asm
# engine/main_menu.asm
# engine/mart.asm
# engine/menu_2.asm
# engine/mon_menu.asm
# engine/pack.asm
# engine/slot_machine.asm
# engine/start_menu.asm
# home/menu.asm
# maps/CeladonDeptStore6F.asm
# maps/CeladonGameCornerPrizeRoom.asm
# maps/DragonShrine.asm
# maps/EarlsPokemonAcademy.asm
# maps/GoldenrodCity.asm
# maps/GoldenrodDeptStore6F.asm
# maps/GoldenrodGameCorner.asm
# maps/GoldenrodPokeComCenter2FMobile.asm
# mobile/mobile_12.asm
# mobile/mobile_12_2.asm
# mobile/mobile_22.asm
# mobile/mobile_22_2.asm
# mobile/mobile_40.asm
# mobile/mobile_45.asm
# mobile/mobile_45_sprite_engine.asm
# mobile/mobile_46.asm
# mobile/mobile_5c.asm
# mobile/mobile_5f.asm
# mobile/mobile_menu.asm
Diffstat (limited to 'engine/mart.asm')
| -rwxr-xr-x | engine/mart.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index 07d385f6d..2f1b9c6a6 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -617,14 +617,14 @@ Text_Mart_CostsThisMuch: ; 0x15e13 ; 0x15e18 MenuDataHeader_Buy: ; 0x15e18 - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1 dw .menudata2 db 1 ; default option ; 0x15e20 .menudata2 ; 0x15e20 - db $30 ; pointers + db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags db 4, 8 ; rows, columns db 1 ; horizontal spacing dbw 0, CurMart @@ -901,14 +901,14 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83 ; 0x15f88 MenuDataHeader_BuySell: ; 0x15f88 - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 7, 8 dw .menudata2 db 1 ; default option ; 0x15f90 .menudata2 ; 0x15f90 - db $80 ; strings + db STATICMENU_CURSOR ; strings db 3 ; items db "BUY@" db "SELL@" |