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

18
engine/events/buena.asm
View File

@@ -29,7 +29,7 @@ Special_BuenasPassword: ; 8af6b
; 8afa9
.MenuDataHeader: ; 0x8afa9
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 7
dw .MenuData2
db 1 ; default option
@@ -38,7 +38,7 @@ Special_BuenasPassword: ; 8af6b
db 0
.MenuData2: ; 0x8afb2
db $81 ; flags
db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 0 ; items
dw .PasswordIndices
dw .PlacePasswordChoices
@@ -46,7 +46,11 @@ Special_BuenasPassword: ; 8af6b
.PasswordIndices: ; 8afb8
db NUM_PASSWORDS_PER_CATEGORY
db 0, 1, 2
x = 0
rept NUM_PASSWORDS_PER_CATEGORY
db x
x = x + 1
endr
db -1
.PlacePasswordChoices: ; 8afbd
@@ -224,7 +228,7 @@ PrintBlueCardBalance: ; 8b097
; 8b0d1
BlueCardBalanceMenuDataHeader: ; 0x8b0d1
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 11, 11, 13
; 8b0d6
@@ -235,7 +239,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
; 8b0dd
.menudataheader ; 0x8b0dd
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 17, TEXTBOX_Y - 1
; 8b0e2
@@ -267,7 +271,7 @@ Buena_PrizeMenu: ; 8b0e2
; 8b113
.MenuDataHeader: ; 0x8b113
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, 16, 9
dw .MenuData2
db 1 ; default option
@@ -276,7 +280,7 @@ Buena_PrizeMenu: ; 8b0e2
db 0
.MenuData2: ; 0x8b11c
db $10 ; flags
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 13 ; rows, columns
db 1 ; spacing
dba .indices