summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/battle/menu.asm9
-rwxr-xr-xengine/billspc.asm15
-rwxr-xr-xengine/billspctop.asm3
-rwxr-xr-xengine/buy_sell_toss.asm9
-rwxr-xr-xengine/decorations.asm12
-rwxr-xr-xengine/delete_save_change_clock.asm6
-rw-r--r--engine/events/buena.asm12
-rwxr-xr-xengine/events/elevator.asm3
-rw-r--r--engine/events/kurt.asm13
-rw-r--r--engine/events/mom.asm3
-rw-r--r--engine/events/move_tutor.asm3
-rwxr-xr-xengine/events/pokecenter_pc.asm6
-rwxr-xr-xengine/events/pokepic.asm3
-rw-r--r--engine/events/std_scripts.asm3
-rwxr-xr-xengine/init_gender.asm3
-rwxr-xr-xengine/intro_menu.asm6
-rwxr-xr-xengine/mail.asm6
-rwxr-xr-xengine/main_menu.asm3
-rwxr-xr-xengine/mart.asm6
-rw-r--r--engine/menu_2.asm6
-rwxr-xr-xengine/mon_menu.asm6
-rw-r--r--engine/pack.asm57
-rwxr-xr-xengine/slot_machine.asm3
-rwxr-xr-xengine/start_menu.asm12
24 files changed, 72 insertions, 136 deletions
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index 07d3e6081..e44d92f83 100755
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@@ -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
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 00bd49f06..7be68ba36 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -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
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index c36cbe45d..0d2ba5e9d 100755
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -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
diff --git a/engine/buy_sell_toss.asm b/engine/buy_sell_toss.asm
index 37bee86b1..b46fc1c27 100755
--- a/engine/buy_sell_toss.asm
+++ b/engine/buy_sell_toss.asm
@@ -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
diff --git a/engine/decorations.asm b/engine/decorations.asm
index bd9eb0251..92ede0db6 100755
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -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
diff --git a/engine/delete_save_change_clock.asm b/engine/delete_save_change_clock.asm
index e77874e1c..6e9a37b71 100755
--- a/engine/delete_save_change_clock.asm
+++ b/engine/delete_save_change_clock.asm
@@ -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
diff --git a/engine/events/buena.asm b/engine/events/buena.asm
index 3987487a9..cfe543a19 100644
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@@ -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
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index 35e95fa3c..77e74b11e 100755
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
@@ -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
diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm
index 3cabfd6f1..8ab28cddf 100644
--- a/engine/events/kurt.asm
+++ b/engine/events/kurt.asm
@@ -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
diff --git a/engine/events/mom.asm b/engine/events/mom.asm
index 296f3ad6f..8a61a57d8 100644
--- a/engine/events/mom.asm
+++ b/engine/events/mom.asm
@@ -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
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm
index 802b9ef21..7b475c169 100644
--- a/engine/events/move_tutor.asm
+++ b/engine/events/move_tutor.asm
@@ -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
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 8d0300aa4..f7c8a01a3 100755
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -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
diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm
index 82016403b..aa950b255 100755
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
@@ -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
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 708165046..6e76c6189 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -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
diff --git a/engine/init_gender.asm b/engine/init_gender.asm
index f38139b2e..2c1a5a2ef 100755
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -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
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 08e004e1b..31e19778c 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -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
diff --git a/engine/mail.asm b/engine/mail.asm
index c860693be..c2ecb7548 100755
--- a/engine/mail.asm
+++ b/engine/mail.asm
@@ -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
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index cbd516cd7..92a3da6bb 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -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
diff --git a/engine/mart.asm b/engine/mart.asm
index 96423cfec..d4af8fb61 100755
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -618,8 +618,7 @@ Text_Mart_CostsThisMuch: ; 0x15e13
MenuDataHeader_Buy: ; 0x15e18
db $40 ; flags
- db 03, 01 ; start coords
- db 11, 19 ; end coords
+ menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .menudata2
db 1 ; default option
; 0x15e20
@@ -903,8 +902,7 @@ Text_Mart_HowMayIHelpYou: ; 0x15f83
MenuDataHeader_BuySell: ; 0x15f88
db $40 ; flags
- db 00, 00 ; start coords
- db 08, 07 ; end coords
+ menu_coords 0, 0, 7, 8
dw .menudata2
db 1 ; default option
; 0x15f90
diff --git a/engine/menu_2.asm b/engine/menu_2.asm
index fc1b511b0..cbced7320 100644
--- a/engine/menu_2.asm
+++ b/engine/menu_2.asm
@@ -54,15 +54,13 @@ PlaceMoneyDataHeader: ; 24b01
MenuDataHeader_0x24b15: ; 0x24b15
db $40 ; flags
- db 00, 11 ; start coords
- db 02, 19 ; end coords
+ menu_coords 11, 0, SCREEN_WIDTH - 1, 2
dw NULL
db 1 ; default option
MenuDataHeader_0x24b1d: ; 0x24b1d
db $40 ; flags
- db 11, 00 ; start coords
- db 13, 08 ; end coords
+ menu_coords 0, 11, 8, 13
dw NULL
db 1 ; default option
diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm
index e3570ab70..7dc2a2393 100755
--- a/engine/mon_menu.asm
+++ b/engine/mon_menu.asm
@@ -56,8 +56,7 @@ MonSubmenu: ; 24d19
.MenuDataHeader: ; 24d3f
db $40 ; tile backup
- db 00, 06 ; start coords
- db 17, 19 ; end coords
+ menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw 0
db 1 ; default option
; 24d47
@@ -326,8 +325,7 @@ BattleMonMenu: ; 24e99
MenuDataHeader_0x24ed4: ; 24ed4
db $00 ; flags
- db 11, 11 ; start coords
- db 17, 19 ; end coords
+ menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData2_0x24edc
db 1 ; default option
; 24edc
diff --git a/engine/pack.asm b/engine/pack.asm
index 323592d39..7dd900617 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -163,8 +163,7 @@ Pack: ; 10000
; 10124 (4:4124)
.MenuDataHeader1: ; 0x10124
db $40 ; flags
- db 07, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2_1
db 1 ; default option
; 0x1012c
@@ -184,8 +183,7 @@ Pack: ; 10000
.MenuDataHeader2: ; 0x1013b
db $40 ; flags
- db 05, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2_2
db 1 ; default option
; 0x10143
@@ -324,8 +322,7 @@ Pack: ; 10000
; 10249 (4:4249)
MenuDataHeader_UsableKeyItem: ; 0x10249
db $40 ; flags
- db 01, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10251
@@ -350,8 +347,7 @@ Jumptable_UseGiveTossRegisterQuit: ; 1026a
MenuDataHeader_UsableItem: ; 0x10274
db $40 ; flags
- db 03, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x1027c
@@ -374,8 +370,7 @@ Jumptable_UseGiveTossQuit: ; 10291
MenuDataHeader_UnusableItem: ; 0x10299
db %01000000 ; flags
- db 07, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x102a1
@@ -394,8 +389,7 @@ Jumptable_UseQuit: ; 102ac
MenuDataHeader_UnusableKeyItem: ; 0x102b0
db %01000000 ; flags
- db 05, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x102b8
@@ -416,8 +410,7 @@ Jumptable_UseRegisterQuit: ; 102c7
MenuDataHeader_HoldableKeyItem: ; 0x102cd
db $40 ; flags
- db 03, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x102d5
@@ -440,8 +433,7 @@ Jumptable_GiveTossRegisterQuit: ; 102ea
MenuDataHeader_HoldableItem: ; 0x102f2
db $40 ; flags
- db 05, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x102fa
@@ -858,8 +850,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
; 10601 (4:4601)
.UsableMenuDataHeader: ; 0x10601
db $40 ; flags
- db 07, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UsableMenuData2
db 1 ; default option
; 0x10609
@@ -878,8 +869,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
.UnusableMenuDataHeader: ; 0x10618
db $40 ; flags
- db 09, 13 ; start coords
- db 11, 19 ; end coords
+ menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UnusableMenuData2
db 1 ; default option
; 0x10620
@@ -1170,8 +1160,7 @@ TutorialPack: ; 107bb
; 107ef (4:47ef)
.ItemsMenuDataHeader: ; 0x107ef
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .ItemsMenuData2
db 1 ; default option
; 0x107f7
@@ -1194,8 +1183,7 @@ TutorialPack: ; 107bb
; 1080e (4:480e)
.KeyItemsMenuDataHeader: ; 0x1080e
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .KeyItemsMenuData2
db 1 ; default option
; 0x10816
@@ -1227,8 +1215,7 @@ TutorialPack: ; 107bb
; 10842 (4:4842)
.BallsMenuDataHeader: ; 0x10842
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .BallsMenuData2
db 1 ; default option
; 0x1084a
@@ -1553,8 +1540,7 @@ Pack_InitColors: ; 10a40
ItemsPocketMenuDataHeader: ; 0x10a4f
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10a57
@@ -1571,8 +1557,7 @@ ItemsPocketMenuDataHeader: ; 0x10a4f
PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10a6f
@@ -1589,8 +1574,7 @@ PC_Mart_ItemsPocketMenuDataHeader: ; 0x10a67
KeyItemsPocketMenuDataHeader: ; 0x10a7f
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10a87
@@ -1607,8 +1591,7 @@ KeyItemsPocketMenuDataHeader: ; 0x10a7f
PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10a9f
@@ -1625,8 +1608,7 @@ PC_Mart_KeyItemsPocketMenuDataHeader: ; 0x10a97
BallsPocketMenuDataHeader: ; 0x10aaf
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10ab7
@@ -1643,8 +1625,7 @@ BallsPocketMenuDataHeader: ; 0x10aaf
PC_Mart_BallsPocketMenuDataHeader: ; 0x10ac7
db $40 ; flags
- db 01, 07 ; start coords
- db 11, 19 ; end coords
+ menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
; 0x10acf
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index c47e5261e..d8086a5be 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -1871,8 +1871,7 @@ Slots_AskBet: ; 9307c (24:707c)
.MenuDataHeader: ; 0x930d6
db $40 ; flags
- db 10, 14 ; start coords
- db 17, 19 ; end coords
+ menu_coords 14, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2
db 1 ; default option
; 0x930de
diff --git a/engine/start_menu.asm b/engine/start_menu.asm
index 91d6caff9..efb7b80f9 100755
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -153,15 +153,13 @@ StartMenu:: ; 125cd
.MenuDataHeader:
db $40 ; tile backup
- db 0, 10 ; start coords
- db 17, 19 ; end coords
+ menu_coords 10, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default selection
.ContestMenuDataHeader:
db $40 ; tile backup
- db 2, 10 ; start coords
- db 17, 19 ; end coords
+ menu_coords 10, 2, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData
db 1 ; default selection
@@ -977,8 +975,7 @@ TakePartyItem: ; 12c60
GiveTakeItemMenuData: ; 12c9b
db %01010000
- db 12, 12 ; start coords
- db 17, 19 ; end coords
+ menu_coords 12, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .Items
db 1 ; default option
@@ -1166,8 +1163,7 @@ MonMailAction: ; 12d45
.MenuDataHeader:
db $40 ; flags
- db 10, 12 ; start coords
- db 17, 19 ; end coords
+ menu_coords 12, 10, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw .MenuData2
db 1 ; default option
; 0x12dd1
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 06:03:51 +0000