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
This commit is contained in:
@@ -277,14 +277,14 @@ Function89261: ; 89261
|
||||
; 892a3
|
||||
|
||||
MenuDataHeader_0x892a3: ; 0x892a3
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 10, 5, 15, 9
|
||||
dw MenuData2_0x892ab
|
||||
db 1 ; default option
|
||||
; 0x892ab
|
||||
|
||||
MenuData2_0x892ab: ; 0x892ab
|
||||
db $c0 ; flags
|
||||
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
|
||||
db 2 ; items
|
||||
db "はい@"
|
||||
db "いいえ@"
|
||||
@@ -2831,7 +2831,7 @@ Function8a116: ; 8a116 (22:6116)
|
||||
; 8a176 (22:6176)
|
||||
|
||||
MenuDataHeader_0x8a176: ; 0x8a176
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
|
||||
; 8a17b
|
||||
|
||||
@@ -2853,14 +2853,14 @@ Function8a17b: ; 8a17b (22:617b)
|
||||
; 8a19a (22:619a)
|
||||
|
||||
MenuDataHeader_0x8a19a: ; 0x8a19a
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 14, 0, SCREEN_WIDTH - 1, 6
|
||||
dw MenuData2_0x8a1a2
|
||||
db 1 ; default option
|
||||
; 0x8a1a2
|
||||
|
||||
MenuData2_0x8a1a2: ; 0x8a1a2
|
||||
db $e0 ; flags
|
||||
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING | STATICMENU_WRAP ; flags
|
||||
db 3 ; items
|
||||
db "ひらく@"
|
||||
db "すてる@"
|
||||
@@ -3012,7 +3012,7 @@ Function8a2aa: ; 8a2aa (22:62aa)
|
||||
; 8a2ef (22:62ef)
|
||||
|
||||
MenuDataHeader_0x8a2ef: ; 0x8a2ef
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
|
||||
; 8a2f4
|
||||
|
||||
@@ -3173,14 +3173,14 @@ Unknown_8a408: db 1, 2, -1
|
||||
Unknown_8a40b: db 1, 2, 3, -1
|
||||
|
||||
MenuDataHeader_0x8a40f: ; 0x8a40f
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 2, 10, TEXTBOX_Y - 1
|
||||
dw MenuData2_0x8a417
|
||||
db 1 ; default option
|
||||
; 0x8a417
|
||||
|
||||
MenuData2_0x8a417: ; 0x8a417
|
||||
db $a0 ; flags
|
||||
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
|
||||
db 4 ; items
|
||||
db "めいしりスト@"
|
||||
db "じぶんの めいし@"
|
||||
@@ -3189,14 +3189,14 @@ MenuData2_0x8a417: ; 0x8a417
|
||||
; 0x8a435
|
||||
|
||||
MenuDataHeader_0x8a435: ; 0x8a435
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 2, 10, 9
|
||||
dw MenuData2_0x8a43d
|
||||
db 1 ; default option
|
||||
; 0x8a43d
|
||||
|
||||
MenuData2_0x8a43d: ; 0x8a43d
|
||||
db $a0 ; flags
|
||||
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
|
||||
db 3 ; items
|
||||
db "めいしりスト@"
|
||||
db "じぶんの めいし@"
|
||||
@@ -3914,7 +3914,7 @@ Jumptable_8a9c5: ; 8a9c5 (22:69c5)
|
||||
; 8a9c9 (22:69c9)
|
||||
|
||||
MenuDataHeader_0x8a9c9: ; 0x8a9c9
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 11, 4, 18, TEXTBOX_Y - 1
|
||||
; 8a9ce
|
||||
|
||||
@@ -3943,14 +3943,14 @@ Function8a9ce: ; 8a9ce (22:69ce)
|
||||
; 8a9f2 (22:69f2)
|
||||
|
||||
MenuDataHeader_0x8a9f2: ; 0x8a9f2
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 11, 4, 18, TEXTBOX_Y - 1
|
||||
dw MenuData2_0x8a9fa
|
||||
db 1 ; default option
|
||||
; 0x8a9fa
|
||||
|
||||
MenuData2_0x8a9fa: ; 0x8a9fa
|
||||
db $a0 ; flags
|
||||
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
|
||||
db 3 ; items
|
||||
db "へんしゅう@"
|
||||
db "みる@"
|
||||
|
Reference in New Issue
Block a user