diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CeladonDeptStore6F.asm | 3 | ||||
| -rw-r--r-- | maps/CeladonGameCornerPrizeRoom.asm | 6 | ||||
| -rw-r--r-- | maps/DragonShrine.asm | 15 | ||||
| -rw-r--r-- | maps/EarlsPokemonAcademy.asm | 3 | ||||
| -rw-r--r-- | maps/GoldenrodCity.asm | 3 | ||||
| -rw-r--r-- | maps/GoldenrodDeptStore6F.asm | 3 | ||||
| -rw-r--r-- | maps/GoldenrodGameCorner.asm | 6 | ||||
| -rw-r--r-- | maps/GoldenrodPokeComCenter2FMobile.asm | 6 |
8 files changed, 15 insertions, 30 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 8789ebc6b..8f67c1dae 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -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 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3e66a0e6b..07728ca97 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -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 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index d9089313d..19c1011d5 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -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 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 62ef5b16b..cad836b6d 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -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 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 5ce8b92cc..8d3a91f2d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -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 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index a20b74133..89c628684 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -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 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index dd3203ac7..b1a911a85 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -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 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 1696a014f..1042bf28e 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -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 |