Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)

Browse Source 
# 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:
Remy Oukaour
2018-01-14 23:43:51 -05:00
parent dfcca93b45 d38ed29a46
commit 14c8cf5b48
51 changed files with 571 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/billspc.asm
View File

@@ -229,14 +229,14 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537)
; e253d (38:653d)
BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe2545
.MenuData2: ; 0xe2545 (38:6545)
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "DEPOSIT@"
db "STATS@"
@@ -488,14 +488,14 @@ BillsPC_Withdraw: ; e2675 (38:6675)
; e2731 (38:6731)
.MenuDataHeader: ; 0xe2731
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
; 0xe2739
.MenuData: ; 0xe2739
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "WITHDRAW@"
db "STATS@"
@@ -711,14 +711,14 @@ _MovePKMNWithoutMail: ; e2759
; e28c3
.MenuDataHeader: ; 0xe28c3
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe28cb
.MenuData2: ; 0xe28cb
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 3 ; items
db "MOVE@"
db "STATS@"
@@ -2329,14 +2329,14 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2)
; e35f1 (38:75f1)
_ChangeBox_menudataheader: ; 0xe35f1
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 1, 5, 9, 12
dw .menudata2
db 1 ; default option
; 0xe35f9
.menudata2 ; 0xe35f9
db $22 ; flags
db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags
db 4, 0
db 1
dba .boxes
@@ -2557,14 +2557,14 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
hlcoord 11, 7 ; unused
.MenuDataHeader: ; 0xe377b
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 11, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe3783
.MenuData2: ; 0xe3783
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "SWITCH@"
db "NAME@"