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 /data | |
| 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 'data')
| -rw-r--r-- | data/player_names.asm | 8 | ||||
| -rw-r--r-- | data/unown_walls.asm | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/player_names.asm b/data/player_names.asm index 47aa17529..3c5a34c77 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,12 +1,12 @@ ChrisNameMenuHeader: ; 882b5 - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames db 1 ; ???? db 0 ; default option .MaleNames: ; 882be - db $91 ; flags + db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags db 5 ; items db "NEW NAME@" MalePlayerNameArray: ; 882c9 @@ -18,14 +18,14 @@ MalePlayerNameArray: ; 882c9 db " NAME @" ; title KrisNameMenuHeader: ; 882e5 - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames db 1 ; ???? db 0 ; default option .FemaleNames: ; 882ee - db $91 ; flags + db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags db 5 ; items db "NEW NAME@" FemalePlayerNameArray: ; 882f9 diff --git a/data/unown_walls.asm b/data/unown_walls.asm index 4a7b985c7..eae376730 100644 --- a/data/unown_walls.asm +++ b/data/unown_walls.asm @@ -40,15 +40,15 @@ UnownWalls: ; 8aebc MenuDataHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 ; UNOWNWORDS_LIGHT - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 4, 4, 15, 9 ; UNOWNWORDS_WATER - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 4, 4, 15, 9 ; UNOWNWORDS_HO_OH - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 4, 4, 15, 9 ; 8aee9 |