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

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

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

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

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

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

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

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

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

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