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

@@ -81,8 +81,7 @@ CeladonDeptStore6FVendingMachine:
.MenuData:
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -104,8 +104,7 @@ CeladonPrizeRoom_NoCoinCase:
CeladonPrizeRoom_TMMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -191,8 +190,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -267,8 +267,7 @@ DragonShrineElder3Script:
DragonShrineQuestion1_MenuDataHeader:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -281,8 +280,7 @@ DragonShrineQuestion1_MenuDataHeader:
DragonShrineQuestion2_MenuDataHeader:
db $40 ; flags
db 04, 09 ; start coords
db 11, 19 ; end coords
menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -295,8 +293,7 @@ DragonShrineQuestion2_MenuDataHeader:
DragonShrineQuestion3_MenuDataHeader:
db $40 ; flags
db 04, 05 ; start coords
db 11, 19 ; end coords
menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -309,8 +306,7 @@ DragonShrineQuestion3_MenuDataHeader:
DragonShrineQuestion4_MenuDataHeader:
db $40 ; flags
db 04, 08 ; start coords
db 11, 19 ; end coords
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -323,8 +319,7 @@ DragonShrineQuestion4_MenuDataHeader:
DragonShrineQuestion5_MenuDataHeader:
db $40 ; flags
db 04, 12 ; start coords
db 11, 19 ; end coords
menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -104,8 +104,7 @@ AcademyBlackboard:
.BlackboardMenuData:
db $40 ; flags
db 00, 00 ; start coords
db 08, 11 ; end coords
menu_coords 0, 0, 11, 8
dw .MenuData2
db 1 ; default option

View File

@@ -96,8 +96,7 @@ MoveTutor:
.MoveMenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -70,8 +70,7 @@ GoldenrodVendingMachine:
.MenuData:
db $40 ; flags
db 02, 00 ; start coords
db 11, 19 ; end coords
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -140,8 +140,7 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
GoldenrodGameCornerTMVendorMenuData:
db $40 ; flags
db 02, 00 ; start coords
db 11, 15 ; end coords
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
@@ -227,8 +226,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
.MenuDataHeader:
db $40 ; flags
db 02, 00 ; start coords
db 11, 17 ; end coords
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option

View File

@@ -50,8 +50,7 @@ UnknownScript_0x62600:
MenuDataHeader_0x62602:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option
@@ -93,8 +92,7 @@ UnknownScript_0x6264a:
MenuDataHeader_0x6264c:
db $40 ; flags
db 00, 00 ; start coords
db 08, 15 ; end coords
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option