diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-01-14 11:59:56 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-01-14 11:59:56 +0100 |
| commit | 11d67567d2c0182864a755a7bebcff0f29e877d6 (patch) | |
| tree | 9c3b4bf77d321161340ac22374b81b4ede493f26 /maps | |
| parent | 066cc91b136b7266288b832bfa212123400ed758 (diff) | |
Use constants for menu flags
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/CeladonDeptStore6F.asm | 4 | ||||
| -rw-r--r-- | maps/CeladonGameCornerPrizeRoom.asm | 8 | ||||
| -rw-r--r-- | maps/DragonShrine.asm | 20 | ||||
| -rw-r--r-- | maps/EarlsPokemonAcademy.asm | 4 | ||||
| -rw-r--r-- | maps/GoldenrodCity.asm | 4 | ||||
| -rw-r--r-- | maps/GoldenrodDeptStore6F.asm | 4 | ||||
| -rw-r--r-- | maps/GoldenrodGameCorner.asm | 8 | ||||
| -rw-r--r-- | maps/GoldenrodPokeComCenter2FMobile.asm | 8 |
8 files changed, 30 insertions, 30 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index c94ef993e..01dfa6642 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -80,14 +80,14 @@ CeladonDeptStore6FVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords 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 7f74c684f..681d144b4 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -104,14 +104,14 @@ CeladonPrizeRoom_NoCoinCase: CeladonPrizeRoom_TMMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM32 1500@" db "TM29 3500@" @@ -193,14 +193,14 @@ GoldenrodGameCornerPokemonVendor: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords 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 1df424ca1..98b57b4de 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -267,14 +267,14 @@ ElderScript_0x18d20d: MenuDataHeader_0x18d215: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Pal@" db "Underling@" @@ -282,14 +282,14 @@ MenuDataHeader_0x18d215: MenuDataHeader_0x18d234: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 09 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Strategy@" db "Raising@" @@ -297,14 +297,14 @@ MenuDataHeader_0x18d234: MenuDataHeader_0x18d258: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 05 ; start coords db 11, 19 ; end coords 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@" @@ -312,14 +312,14 @@ MenuDataHeader_0x18d258: MenuDataHeader_0x18d283: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 08 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $81 ; flags + db STATICMENU_CURSOR | STATICMENU_DISABLE_B ; flags db 3 ; items db "Love@" db "Violence@" @@ -327,14 +327,14 @@ MenuDataHeader_0x18d283: MenuDataHeader_0x18d2a5: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 04, 12 ; start coords db 11, 19 ; end coords 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 3ed66a713..fcaab3039 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -103,14 +103,14 @@ AcademyBlackboard: jump .Loop .BlackboardMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 11 ; end coords 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 8e324a9bb..a2b3f676b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -96,14 +96,14 @@ MoveTutor: .MoveMenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords 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 82d04ccc8..b9ccc3663 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -69,14 +69,14 @@ GoldenrodVendingMachine: jump .Start .MenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 19 ; end coords 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 fc0216504..9314207fa 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -140,14 +140,14 @@ GoldenrodGameCornerPrizeVendor_NoCoinCaseScript: GoldenrodGameCornerTMVendorMenuData: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 4 ; items db "TM25 5500@" db "TM14 5500@" @@ -229,14 +229,14 @@ GoldenrodGameCornerPrizeMonVendorScript: .MenuDataHeader: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 02, 00 ; start coords db 11, 17 ; end coords 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 a3e639409..1cf7e6f6d 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -50,14 +50,14 @@ UnknownScript_0x62600: MenuDataHeader_0x62602: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords dw .MenuData2 db 1 ; default option .MenuData2: - db $80 ; flags + db STATICMENU_CURSOR ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB db "モバイルセンター@" ; MOBILE CENTER @@ -95,14 +95,14 @@ UnknownScript_0x6264a: MenuDataHeader_0x6264c: - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 08, 15 ; end coords 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 |
