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

4
engine/events/elevator.asm
View File

@@ -188,14 +188,14 @@ Elevator_GetCurrentFloorString: ; 1353f
; 13550
Elevator_MenuDataHeader: ; 0x13550
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 12, 1, 18, 9
dw Elevator_MenuData2
db 1 ; default option
; 0x13558
Elevator_MenuData2: ; 0x13558
db $10 ; flags
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 0 ; rows, columns
db 1 ; horizontal spacing
dbw 0, CurElevator

12
engine/events/kurt.asm
View File

@@ -84,7 +84,7 @@ Kurt_SelectApricorn: ; 88055
; 88086
.MenuDataHeader: ; 0x88086
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 1, 1, 13, 10
dw .MenuData2
db 1 ; default option
@@ -93,7 +93,7 @@ Kurt_SelectApricorn: ; 88055
db 0 ; XXX
.MenuData2: ; 0x8808f
db $10 ; flags
db SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 7
db 1
dbw 0, Buffer1
@@ -158,12 +158,10 @@ Kurt_SelectQuantity: ; 880c2
; 8810d
.MenuDataHeader: ; 0x8810d
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 6, 9, SCREEN_WIDTH - 1, 12
; unused
dw 0
db -1
dw NULL
db -1 ; default option
db 0
.PlaceApricornName: ; 88116

4
engine/events/mom.asm
View File

@@ -728,14 +728,14 @@ Mom_HeldString: ; 166b0
; 166b5
MenuDataHeader_0x166b5: ; 0x166b5
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, 10
dw MenuData2_0x166bd
db 1 ; default option
; 0x166bd
MenuData2_0x166bd: ; 0x166bd
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 4 ; items
db "GET@"
db "SAVE@"

2
engine/events/move_tutor.asm
View File

@@ -99,5 +99,5 @@ CheckCanLearnMoveTutorMove: ; 492b9
ret
.MenuDataHeader: ; 0x4930a
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1

12
engine/events/pokecenter_pc.asm
View File

@@ -27,13 +27,13 @@ Special_PokemonCenterPC: ; 1559a
ret
.TopMenu:
db $48 ; flags
db MENU_BACKUP_TILES | MENU_NO_CLICK_SFX ; flags
menu_coords 0, 0, 15, 12
dw .MenuData2
db 1 ; default option
.MenuData2:
db $a0 ; flags
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; items
dw .WhichPC
dw PlaceNthMenuStrings
@@ -231,14 +231,14 @@ Function15715: ; 15715
; 15736
KrissPCMenuData: ; 0x15736
db %01000000
db MENU_BACKUP_TILES ; flags
db 0, 0 ; top left corner coords (y, x)
db 12, 15 ; bottom right corner coords (y, x)
dw .KrissPCMenuData2
db 1 ; default selected option
.KrissPCMenuData2:
db %10100000 ; bit7
db STATICMENU_CURSOR | STATICMENU_WRAP ; flags
db 0 ; # items?
dw .KrissPCMenuList1
dw PlaceNthMenuStrings
@@ -619,13 +619,13 @@ PCItemsJoypad: ; 0x15985
ret
.PCItemsMenuData:
db %01000000
db MENU_BACKUP_TILES ; flags
menu_coords 4, 1, 18, 10
dw .MenuData2
db 1 ; default option
.MenuData2:
db %10110000
db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 8 ; rows/cols?
db 2 ; horizontal spacing?
dbw 0, PCItems

2
engine/events/pokepic.asm
View File

@@ -42,7 +42,7 @@ ClosePokepic:: ; 24528
ret
PokepicMenuDataHeader: ; 0x24547
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 6, 4, 14, 13
dw NULL
db 1 ; default option

4
engine/events/std_scripts.asm
View File

@@ -1870,13 +1870,13 @@ CoinVendor_IntroScript: ; 0xbcde0
.MenuDataHeader:
db $40 ; flags
db MENU_BACKUP_TILES ; flags
menu_coords 0, 4, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
db $80 ; flags
db STATICMENU_CURSOR ; flags
db 3 ; items
db " 50 : ¥1000@"
db "500 : ¥10000@"