pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

menu_coords macro for (x1, y1, x2, y2) order (see issue #440)

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-13 16:38:14 -05:00
parent 0197e6f23c
commit 2ab60fa8a4
47 changed files with 150 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/player_names.asm
View File

@@ -1,7 +1,6 @@
ChrisNameMenuHeader: ; 882b5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .MaleNames
db 1 ; ????
db 0 ; default option
@@ -20,8 +19,7 @@ MalePlayerNameArray: ; 882c9
KrisNameMenuHeader: ; 882e5
db $40 ; flags
db 00, 00 ; start coords
db 11, 10 ; end coords
menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .FemaleNames
db 1 ; ????
db 0 ; default option

12
data/unown_walls.asm
View File

@@ -41,18 +41,14 @@ UnownWalls: ; 8aebc
MenuDataHeaders_UnownWalls: ; 0x8aed5
; UNOWNWORDS_ESCAPE
db $40 ; flags
db 04, 03 ; start coords
db 09, 16 ; end coords
menu_coords 3, 4, 16, 9
; UNOWNWORDS_LIGHT
db $40 ; flags
db 04, 04 ; start coords
db 09, 15 ; end coords
menu_coords 4, 4, 15, 9
; UNOWNWORDS_WATER
db $40 ; flags
db 04, 04 ; start coords
db 09, 15 ; end coords
menu_coords 4, 4, 15, 9
; UNOWNWORDS_HO_OH
db $40 ; flags
db 04, 04 ; start coords
db 09, 15 ; end coords
menu_coords 4, 4, 15, 9
; 8aee9

9
engine/battle/menu.asm
View File

@@ -34,8 +34,7 @@ Function24f19: ; 24f19
BattleMenuDataHeader: ; 24f2c
db $40 ; flags
db 12, 08 ; start coords
db 17, 19 ; end coords
menu_coords 8, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f34
db 1 ; default option
; 24f34
@@ -57,8 +56,7 @@ Strings24f3d: ; 0x24f3d
MenuDataHeader_0x24f4e: ; 24f4e
db $40 ; flags
db 12, 00 ; start coords
db 17, 19 ; end coords
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f56
db 1 ; default option
; 24f56
@@ -88,8 +86,7 @@ Function24f7c: ; 24f7c
MenuDataHeader_0x24f89: ; 24f89
db $40 ; flags
db 12, 02 ; start coords
db 17, 19 ; end coords
menu_coords 2, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24f91
db 1 ; default option
; 24f91

15
engine/billspc.asm
View File

@@ -230,8 +230,7 @@ BillsPCDepositFuncCancel: ; e2537 (38:6537)
BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
db $40 ; flags
db 04, 09 ; start coords
db 13, 19 ; end coords
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe2545
@@ -491,8 +490,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
.MenuDataHeader: ; 0xe2731
db $40 ; flags
db 04, 09 ; start coords
db 13, 19 ; end coords
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData
db 1 ; default option
; 0xe2739
@@ -715,8 +713,7 @@ _MovePKMNWithoutMail: ; e2759
.MenuDataHeader: ; 0xe28c3
db $40 ; flags
db 04, 09 ; start coords
db 13, 19 ; end coords
menu_coords 9, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe28cb
@@ -2334,8 +2331,7 @@ BillsPC_ClearTilemap: ; e35e2 (38:75e2)
_ChangeBox_menudataheader: ; 0xe35f1
db $40 ; flags
db 05, 01 ; start coords
db 12, 09 ; end coords
menu_coords 1, 5, 9, 12
dw .menudata2
db 1 ; default option
; 0xe35f9
@@ -2563,8 +2559,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
.MenuDataHeader: ; 0xe377b
db $40 ; flags
db 04, 11 ; start coords
db 13, 19 ; end coords
menu_coords 11, 4, SCREEN_WIDTH - 1, 13
dw .MenuData2
db 1 ; default option
; 0xe3783

3
engine/billspctop.asm
View File

@@ -70,8 +70,7 @@ _BillsPC: ; e3fd
.MenuDataHeader: ; 0xe46f
db $40 ; flags
db 00, 00 ; start coords
db 17, 19 ; end coords
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2
db 1 ; default option

9
engine/buy_sell_toss.asm
View File

@@ -215,24 +215,21 @@ BuySell_DisplaySubtotal: ; 250d1
TossItem_MenuDataHeader: ; 0x250ed
db $40 ; flags
db 09, 15 ; start coords
db 11, 19 ; end coords
menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw ret_25097
db 0 ; default option
; 0x250f5
BuyItem_MenuDataHeader: ; 0x250f5
db $40 ; flags
db 15, 07 ; start coords
db 17, 19 ; end coords
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplayPurchasePrice
db -1 ; default option
; 0x250fd
SellItem_MenuDataHeader: ; 0x250fd
db $40 ; flags
db 15, 07 ; start coords
db 17, 19 ; end coords
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplaySellingPrice
db 0 ; default option
; 0x25105

12
engine/decorations.asm
View File

@@ -38,8 +38,7 @@ _KrisDecorationMenu: ; 0x2675c
.MenuDataHeader: ; 0x2679a
db $40 ; flags
db 00, 05 ; start coords
db 17, 19 ; end coords
menu_coords 5, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2
db 1 ; default option
; 0x267a2
@@ -424,8 +423,7 @@ PopulateDecoCategoryMenu: ; 2695b
.NonscrollingMenuDataHeader: ; 0x269b5
db $40 ; flags
db 00, 00 ; start coords
db 17, 19 ; end coords
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .NonscrollingMenuData2
db 1 ; default option
; 0x269bd
@@ -440,8 +438,7 @@ PopulateDecoCategoryMenu: ; 2695b
.ScrollingMenuDataHeader: ; 0x269c5
db $40 ; flags
db 01, 01 ; start coords
db 16, 18 ; end coords
menu_coords 1, 1, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2
dw .ScrollingMenuData2
db 1 ; default option
; 0x269cd
@@ -952,8 +949,7 @@ QueryWhichSide: ; 26e9a
MenuDataHeader_0x26eab: ; 0x26eab
db $40 ; flags
db 00, 00 ; start coords
db 07, 13 ; end coords
menu_coords 0, 0, 13, 7
dw MenuData2_0x26eb3
db 1 ; default option
; 0x26eb3

6
engine/delete_save_change_clock.asm
View File

@@ -48,8 +48,7 @@ _ResetClock: ; 4d3b1
.NoYes_MenuDataHeader: ; 0x4d40d
db $00 ; flags
db 07, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .NoYes_MenuData2
db 1 ; default option
@@ -286,8 +285,7 @@ _DeleteSaveData: ; 4d54c
.NoYesMenuDataHeader: ; 0x4d585
db $00 ; flags
db 07, 14 ; start coords
db 11, 19 ; end coords
menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

12
engine/events/buena.asm
View File

@@ -30,8 +30,7 @@ SpecialBuenasPassword: ; 8af6b
.MenuDataHeader: ; 0x8afa9
db $40 ; flags
db 00, 00 ; start coords
db 07, 10 ; end coords
menu_coords 0, 0, 10, 7
dw .MenuData2
db 1 ; default option
; 0x8afb1
@@ -226,8 +225,7 @@ PrintBlueCardBalance: ; 8b097
BlueCardBalanceMenuDataHeader: ; 0x8b0d1
db $40 ; flags
db 11, 00 ; start coords
db 13, 11 ; end coords
menu_coords 0, 11, 11, 13
; 8b0d6
Buena_PlacePrizeMenuBox: ; 8b0d6
@@ -238,8 +236,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
.menudataheader ; 0x8b0dd
db $40 ; flags
db 00, 00 ; start coords
db 11, 17 ; end coords
menu_coords 0, 0, 17, TEXTBOX_Y - 1
; 8b0e2
Buena_PrizeMenu: ; 8b0e2
@@ -271,8 +268,7 @@ Buena_PrizeMenu: ; 8b0e2
.MenuDataHeader: ; 0x8b113
db $40 ; flags
db 01, 01 ; start coords
db 09, 16 ; end coords
menu_coords 1, 1, 16, 9
dw .MenuData2
db 1 ; default option
; 0x8b11b

3
engine/events/elevator.asm
View File

@@ -189,8 +189,7 @@ Elevator_GetCurrentFloorString: ; 1353f
Elevator_MenuDataHeader: ; 0x13550
db $40 ; flags
db 01, 12 ; start coords
db 09, 18 ; end coords
menu_coords 12, 1, 18, 9
dw Elevator_MenuData2
db 1 ; default option
; 0x13558

13
engine/events/kurt.asm
View File

@@ -85,13 +85,12 @@ Kurt_SelectApricorn: ; 88055
.MenuDataHeader: ; 0x88086
db $40 ; flags
db 01, 01 ; start coords
db 10, 13 ; end coords
menu_coords 1, 1, 13, 10
dw .MenuData2
db 1 ; default option
; 0x8808e
db 0
db 0 ; XXX
.MenuData2: ; 0x8808f
db $10 ; flags
@@ -160,10 +159,12 @@ Kurt_SelectQuantity: ; 880c2
.MenuDataHeader: ; 0x8810d
db $40 ; flags
db 09, 06 ; start coords
db 12, 19 ; end coords
menu_coords 6, 9, SCREEN_WIDTH - 1, 12
db 0, 0, -1, 0 ; XXX
; XXX
dw 0
db -1
db 0
.PlaceApricornName: ; 88116
call MenuBoxCoord2Tile

3
engine/events/mom.asm
View File

@@ -729,8 +729,7 @@ Mom_HeldString: ; 166b0
MenuDataHeader_0x166b5: ; 0x166b5
db $40 ; flags
db 00, 00 ; start coords
db 10, 10 ; end coords
menu_coords 0, 0, 10, 10
dw MenuData2_0x166bd
db 1 ; default option
; 0x166bd

3
engine/events/move_tutor.asm
View File

@@ -100,5 +100,4 @@ CheckCanLearnMoveTutorMove: ; 492b9
.MenuDataHeader: ; 0x4930a
db $40 ; flags
db 12, 00 ; start coords
db 17, 19 ; end coords
menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1

6
engine/events/pokecenter_pc.asm
View File

@@ -28,8 +28,7 @@ PokemonCenterPC: ; 1559a
.TopMenu:
db $48 ; flags
db 00, 00 ; start coords
db 12, 15 ; end coords
menu_coords 0, 0, 15, 12
dw .MenuData2
db 1 ; default option
@@ -621,8 +620,7 @@ PCItemsJoypad: ; 0x15985
.PCItemsMenuData:
db %01000000
db 1, 4 ; start coords
db 10, 18 ; end coords
menu_coords 4, 1, 18, 10
dw .MenuData2
db 1 ; default option

3
engine/events/pokepic.asm
View File

@@ -43,7 +43,6 @@ ClosePokepic:: ; 24528
PokepicMenuDataHeader: ; 0x24547
db $40 ; flags
db 04, 06 ; start coords
db 13, 14 ; end coords
menu_coords 6, 4, 14, 13
dw NULL
db 1 ; default option

3
engine/events/std_scripts.asm
View File

@@ -1871,8 +1871,7 @@ CoinVendor_IntroScript: ; 0xbcde0
.MenuDataHeader:
db $40 ; flags
db 04, 00 ; start coords
db 11, 15 ; end coords
menu_coords 0, 4, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

3
engine/init_gender.asm
View File

@@ -45,8 +45,7 @@ InitGender: ; 48dcb (12:4dcb)
.MenuDataHeader: ; 0x48dfc
db $40 ; flags
db 04, 06 ; start coords
db 09, 12 ; end coords
menu_coords 6, 4, 12, 9
dw .MenuData2
db 1 ; default option
; 0x48e04

6
engine/intro_menu.asm
View File

@@ -554,8 +554,7 @@ Continue_LoadMenuHeader: ; 5ebf
.MenuDataHeader_Dex: ; 5ed9
db $40 ; flags
db 00, 00 ; start coords
db 09, 15 ; end coords
menu_coords 0, 0, 15, 9
dw .MenuData2_Dex
db 1 ; default option
; 5ee1
@@ -571,8 +570,7 @@ Continue_LoadMenuHeader: ; 5ebf
.MenuDataHeader_NoDex: ; 5efb
db $40 ; flags
db 00, 00 ; start coords
db 09, 15 ; end coords
menu_coords 0, 0, 15, 9
dw .MenuData2_NoDex
db 1 ; default option
; 5f03

6
engine/mail.asm
View File

@@ -559,8 +559,7 @@ MailboxPC: ; 0x44806
.TopMenuDataHeader: ; 0x4494c
db %01000000 ; flags
db 1, 8 ; start coords
db 10, 18 ; end coords
menu_coords 8, 1, SCREEN_WIDTH - 2, 10
dw .TopMenuData2
db 1 ; default option
@@ -575,8 +574,7 @@ MailboxPC: ; 0x44806
.SubMenuDataHeader: ; 0x44964
db %01000000 ; flags
db 0, 0 ; start coords
db 9, 13 ; end coords
menu_coords 0, 0, 13, 9
dw .SubMenuData2
db 1 ; default option

3
engine/main_menu.asm
View File

@@ -31,8 +31,7 @@ MainMenu: ; 49cdc
.MenuDataHeader: ; 49d14
db $40 ; flags
db 00, 00 ; start coords
db 07, 16 ; end coords
menu_coords 0, 0, 16, 7
dw .MenuData2
db 1 ; default option
; 49d1c

Some files were not shown because too many files have changed in this diff Show More