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/mon_menu.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/mon_menu.asm')
| -rwxr-xr-x | engine/mon_menu.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index 7dc2a2393..d7e8446d0 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -55,7 +55,7 @@ MonSubmenu: ; 24d19 ; 24d3f .MenuDataHeader: ; 24d3f - db $40 ; tile backup + db MENU_BACKUP_TILES ; flags menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw 0 db 1 ; default option @@ -77,7 +77,7 @@ MonSubmenu: ; 24d19 MonMenuLoop: ; 24d59 .loop - ld a, $a0 ; flags + ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags ld [wMenuData2Flags], a ld a, [Buffer1] ; items ld [wMenuData2Items], a @@ -324,14 +324,14 @@ BattleMonMenu: ; 24e99 ; 24ed4 MenuDataHeader_0x24ed4: ; 24ed4 - db $00 ; flags + db 0 ; flags menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw MenuData2_0x24edc db 1 ; default option ; 24edc MenuData2_0x24edc: ; 24edc - db $c0 ; flags + db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags db 3 ; items db "SWITCH@" db "STATS@" |