summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-13 16:38:14 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-13 16:38:14 -0500
commit2ab60fa8a49dfe9e20ebb620471ba4c2ca64a4aa (patch)
treee5a1991206d3bb76c259cc14061993e83651d4bf /data
parent0197e6f23c0db6baf11aa1e610521f78b6352605 (diff)
menu_coords macro for (x1, y1, x2, y2) order (see issue #440)
Diffstat (limited to 'data')
-rw-r--r--data/player_names.asm6
-rw-r--r--data/unown_walls.asm12
2 files changed, 6 insertions, 12 deletions
diff --git a/data/player_names.asm b/data/player_names.asm
index 87c341652..47aa17529 100644
--- a/data/player_names.asm
+++ b/data/player_names.asm
@@ -1,7 +1,6 @@
ChrisNameMenuHeader: ; 882b5
db $40 ; flags
- db 00, 00 ; start coords
- db 11, 10 ; end coords
+ menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .MaleNames
db 1 ; ????
db 0 ; default option
@@ -20,8 +19,7 @@ MalePlayerNameArray: ; 882c9
KrisNameMenuHeader: ; 882e5
db $40 ; flags
- db 00, 00 ; start coords
- db 11, 10 ; end coords
+ menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .FemaleNames
db 1 ; ????
db 0 ; default option
diff --git a/data/unown_walls.asm b/data/unown_walls.asm
index 4e971f9b0..4a7b985c7 100644
--- a/data/unown_walls.asm
+++ b/data/unown_walls.asm
@@ -41,18 +41,14 @@ UnownWalls: ; 8aebc
MenuDataHeaders_UnownWalls: ; 0x8aed5
; UNOWNWORDS_ESCAPE
db $40 ; flags
- db 04, 03 ; start coords
- db 09, 16 ; end coords
+ menu_coords 3, 4, 16, 9
; UNOWNWORDS_LIGHT
db $40 ; flags
- db 04, 04 ; start coords
- db 09, 15 ; end coords
+ menu_coords 4, 4, 15, 9
; UNOWNWORDS_WATER
db $40 ; flags
- db 04, 04 ; start coords
- db 09, 15 ; end coords
+ menu_coords 4, 4, 15, 9
; UNOWNWORDS_HO_OH
db $40 ; flags
- db 04, 04 ; start coords
- db 09, 15 ; end coords
+ menu_coords 4, 4, 15, 9
; 8aee9