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:
@@ -103,13 +103,13 @@ CeladonPrizeRoom_NoCoinCase:
|
||||
end
|
||||
|
||||
CeladonPrizeRoom_TMMenuDataHeader:
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 2, 15, TEXTBOX_Y - 1
|
||||
dw .MenuData2
|
||||
db 1 ; default option
|
||||
|
||||
.MenuData2:
|
||||
db $80 ; flags
|
||||
db STATICMENU_CURSOR ; flags
|
||||
db 4 ; items
|
||||
db "TM32 1500@"
|
||||
db "TM29 3500@"
|
||||
@@ -189,13 +189,13 @@ CeladonGameCornerPrizeRoomPokemonVendor:
|
||||
jump .loop
|
||||
|
||||
.MenuDataHeader:
|
||||
db $40 ; flags
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 2, 17, TEXTBOX_Y - 1
|
||||
dw .MenuData2
|
||||
db 1 ; default option
|
||||
|
||||
.MenuData2:
|
||||
db $80 ; flags
|
||||
db STATICMENU_CURSOR ; flags
|
||||
db 4 ; items
|
||||
db "PIKACHU 2222@"
|
||||
db "PORYGON 5555@"
|
||||
|
Reference in New Issue
Block a user