summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/CeladonDeptStore6F.asm4
-rw-r--r--maps/CeladonGameCornerPrizeRoom.asm8
-rw-r--r--maps/DragonShrine.asm20
-rw-r--r--maps/EarlsPokemonAcademy.asm4
-rw-r--r--maps/GoldenrodCity.asm4
-rw-r--r--maps/GoldenrodDeptStore6F.asm4
-rw-r--r--maps/GoldenrodGameCorner.asm8
-rw-r--r--maps/GoldenrodPokeComCenter2FMobile.asm8
8 files changed, 30 insertions, 30 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index c5474c9b5..50a581c91 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -80,13 +80,13 @@ CeladonDeptStore6FVendingMachine:
jump .Start
.MenuData:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 07728ca97..3407943be 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -103,13 +103,13 @@ CeladonPrizeRoom_NoCoinCase:
end
CeladonPrizeRoom_TMMenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "TM32 1500@"
db "TM29 3500@"
@@ -189,13 +189,13 @@ CeladonGameCornerPrizeRoomPokemonVendor:
jump .loop
.MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "PIKACHU 2222@"
db "PORYGON 5555@"
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 29da128d4..6bdd57bfa 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -266,65 +266,65 @@ DragonShrineElder3Script:
end
DragonShrineQuestion1_MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $81 ; flags
+ db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Pal@"
db "Underling@"
db "Friend@"
DragonShrineQuestion2_MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 9, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $81 ; flags
+ db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Strategy@"
db "Raising@"
db "Cheating@"
DragonShrineQuestion3_MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 5, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $81 ; flags
+ db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Weak person@"
db "Tough person@"
db "Anybody@"
DragonShrineQuestion4_MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 8, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $81 ; flags
+ db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Love@"
db "Violence@"
db "Knowledge@"
DragonShrineQuestion5_MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 12, 4, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $81 ; flags
+ db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags
db 3 ; items
db "Tough@"
db "Both@"
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index cad836b6d..8f39eb85f 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -103,13 +103,13 @@ AcademyBlackboard:
jump .Loop
.BlackboardMenuData:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 11, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
dn 3, 2 ; rows, columns
db 5 ; spacing
dba .Text
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 8d3a91f2d..dcc29b99a 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -95,13 +95,13 @@ MoveTutor:
jump .Incompatible
.MoveMenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "FLAMETHROWER@"
db "THUNDERBOLT@"
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index d26c539d1..b224ce74c 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -69,13 +69,13 @@ GoldenrodVendingMachine:
jump .Start
.MenuData:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "FRESH WATER ¥200@"
db "SODA POP ¥300@"
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index b1a911a85..6db56d9bd 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -139,13 +139,13 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript:
end
GoldenrodGameCornerTMVendorMenuData:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 15, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "TM25 5500@"
db "TM14 5500@"
@@ -225,13 +225,13 @@ GoldenrodGameCornerPrizeMonVendorScript:
jump .loop
.MenuDataHeader:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 2, 17, TEXTBOX_Y - 1
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 4 ; items
db "ABRA 100@"
db "CUBONE 800@"
diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm
index 1042bf28e..3405df60a 100644
--- a/maps/GoldenrodPokeComCenter2FMobile.asm
+++ b/maps/GoldenrodPokeComCenter2FMobile.asm
@@ -49,13 +49,13 @@ UnknownScript_0x62600:
end
MenuDataHeader_0x62602:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB
db "モバイルセンター@" ; MOBILE CENTER
@@ -91,13 +91,13 @@ UnknownScript_0x6264a:
end
MenuDataHeader_0x6264c:
- db $40 ; flags
+ db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 15, 8
dw .MenuData2
db 1 ; default option
.MenuData2:
- db $80 ; flags
+ db STATICMENU_CURSOR ; flags
db 3 ; items
db "でんわ", $1f,"つかうとき@" ; Use phone
db "でんわ", $4a,"つながらないとき@" ; Don't use phone