diff options
Diffstat (limited to 'engine/decorations.asm')
| -rwxr-xr-x | engine/decorations.asm | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/engine/decorations.asm b/engine/decorations.asm index 72a4d1aee..413a049a2 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -38,8 +38,7 @@ _KrisDecorationMenu: ; 0x2675c .MenuDataHeader: ; 0x2679a db MENU_BACKUP_TILES ; 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 MENU_BACKUP_TILES ; 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 MENU_BACKUP_TILES ; 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 MENU_BACKUP_TILES ; 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 @@ -1061,12 +1057,13 @@ INCLUDE "data/decorations/decorations.asm" DescribeDecoration:: ; 26f59 ld a, b - ld hl, JumpTable_DecorationDesc + ld hl, .JumpTable rst JumpTable ret ; 26f5f -JumpTable_DecorationDesc: ; 26f5f +.JumpTable: ; 26f5f +; entries correspond to DECODESC_* constants dw DecorationDesc_Poster dw DecorationDesc_LeftOrnament dw DecorationDesc_RightOrnament @@ -1197,7 +1194,7 @@ DecorationDesc_GiantOrnament: ; 26fdd db "@" ; 0x26feb -ToggleMaptileDecorations: ; 26feb +Special_ToggleMaptileDecorations: ; 26feb lb de, 0, 4 ld a, [Bed] call SetDecorationTile @@ -1251,7 +1248,7 @@ SetDecorationTile: ; 27037 ret ; 27043 -ToggleDecorationsVisibility: ; 27043 +Special_ToggleDecorationsVisibility: ; 27043 ld de, EVENT_KRISS_HOUSE_2F_CONSOLE ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld a, [Console] |